Commit e52669b7 authored by Jeffrey Lee's avatar Jeffrey Lee

Remove ARM2 NOPs

Detail:
  kernel/s/k_body, s/initmodule - Remove NOPs from after PSR manipulation macros; the macros now fully take care of ARM2 & StrongARM compatibility for us
Admin:
  Tested PlingSystem build on (ARM3) RISC OS 3.1
  Requires HdrSrc-2_63 for ARM2 compatibility


Version 5.92. Tagged as 'RISC_OSLib-5_92'
parent 3aebb5f2
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.91"
Module_Version SETA 591
Module_MajorVersion SETS "5.92"
Module_Version SETA 592
Module_MinorVersion SETS ""
Module_Date SETS "24 May 2016"
Module_ApplicationDate SETS "24-May-16"
Module_Date SETS "28 May 2016"
Module_ApplicationDate SETS "28-May-16"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.91"
Module_HelpVersion SETS "5.91 (24 May 2016)"
Module_FullVersion SETS "5.92"
Module_HelpVersion SETS "5.92 (28 May 2016)"
END
/* (5.91)
/* (5.92)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.91
#define Module_MajorVersion_CMHG 5.92
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 May 2016
#define Module_Date_CMHG 28 May 2016
#define Module_MajorVersion "5.91"
#define Module_Version 591
#define Module_MajorVersion "5.92"
#define Module_Version 592
#define Module_MinorVersion ""
#define Module_Date "24 May 2016"
#define Module_Date "28 May 2016"
#define Module_ApplicationDate "24-May-16"
#define Module_ApplicationDate "28-May-16"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.91"
#define Module_HelpVersion "5.91 (24 May 2016)"
#define Module_LibraryVersionInfo "5:91"
#define Module_FullVersion "5.92"
#define Module_HelpVersion "5.92 (28 May 2016)"
#define Module_LibraryVersionInfo "5:92"
......@@ -399,7 +399,6 @@ uwb_size # 0
BNE %B02
WritePSRc 0, r5 ; back to user mode
[ DDE
NOP
SWI XDDEUtils_GetCLSize
MOVVS r0, #0
CMP r0, #0
......@@ -416,8 +415,6 @@ uwb_size # 0
SWI XDDEUtils_GetCl
MOV r6, r1
04
|
NOP
]
STR r6, [v6, #O_ArgString]
......@@ -1162,7 +1159,6 @@ FatalErrorY
MOV r0, #0
STRB r0, [v6, #O_callbackInactive]
WritePSRc 0, lr
NOP
BL RestoreOSHandlers
ADD v5, v6, #O_registerDump
FatalErrorX
......@@ -1461,7 +1457,6 @@ UpCallHandler
STMFD sp!, {r0-r3, v1-v6, sl, fp, lr}
MOV v6, r12
WritePSRc PSRUSRMode, r0
NOP
LDR sl, [v6, #O_rootStackChunk]
LDR sp, [sl, #SC_size]
ADD sp, sl, sp
......
......@@ -229,7 +229,6 @@ LI_ItemSize # 0
BHI Failed
CLRPSR F_bit:OR:I_bit, lr ; ensure IRQs enabled
NOP
; Check memory constraints work:
; lr = end of required workspace (data + stack), ie stack top for non-modules
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment