Commit 189a7be0 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Stubs were using some 26/32-bit switching macros, which is invalid for a...

Stubs were using some 26/32-bit switching macros, which is invalid for a component that has to work on all OS versions. Changed to use 26/32-bit neutral code. Stubs issued in first 32-bit library release were using 26-bit forms, but they should only go wrong on a 32-bit system in failure cases

(such as the SharedCLibrary being unplugged).

Version 5.25. Tagged as 'RISC_OSLib-5_25'
parent c359fc77
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.24"
Module_Version SETA 524
Module_MajorVersion SETS "5.25"
Module_Version SETA 525
Module_MinorVersion SETS ""
Module_Date SETS "22 Nov 2000"
Module_ApplicationDate2 SETS "22-Nov-00"
Module_ApplicationDate4 SETS "22-Nov-2000"
Module_Date SETS "30 Nov 2000"
Module_ApplicationDate2 SETS "30-Nov-00"
Module_ApplicationDate4 SETS "30-Nov-2000"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.24"
Module_HelpVersion SETS "5.24 (22 Nov 2000)"
Module_FullVersion SETS "5.25"
Module_HelpVersion SETS "5.25 (30 Nov 2000)"
END
/* (5.24)
/* (5.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.24
#define Module_MajorVersion_CMHG 5.25
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Nov 2000
#define Module_Date_CMHG 30 Nov 2000
#define Module_MajorVersion "5.24"
#define Module_Version 524
#define Module_MajorVersion "5.25"
#define Module_Version 525
#define Module_MinorVersion ""
#define Module_Date "22 Nov 2000"
#define Module_Date "30 Nov 2000"
#define Module_ApplicationDate2 "22-Nov-00"
#define Module_ApplicationDate4 "22-Nov-2000"
#define Module_ApplicationDate2 "30-Nov-00"
#define Module_ApplicationDate4 "30-Nov-2000"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.24"
#define Module_HelpVersion "5.24 (22 Nov 2000)"
#define Module_FullVersion "5.25"
#define Module_HelpVersion "5.25 (30 Nov 2000)"
......@@ -284,8 +284,14 @@ LookupError
MOV r0, #0
STR r0, [r9]
MOV r0, r1
[ {CONFIG}=26
LDMIA sp!, {lr}
RETURNVS
ORRS pc, lr, #V_bit
|
CMP r0, #&80000000
CMNVC r0, #&80000000 ; Set V bit
LDMIA sp!, {pc}
]
EXPORT |_clib_initialisemodule|
|_clib_initialisemodule|
......@@ -294,8 +300,12 @@ LookupError
LDMVSIA sp!, {pc}
STMFD sp!, {r9} ; save preserved private word ptr
BL |_clib_initialise|
CLRV
[ {CONFIG}=26
LDMFD sp!, {r0, pc}^ ; return saved private word ptr
|
ADDS r0, r0, #0 ; clear V
LDMFD sp!, {r0, pc} ; return saved private word ptr
]
EXPORT |_clib_entermodule|
|_clib_entermodule|
......
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