Skip to content

GitLab

Commit 3a09e401 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Another 32-bit fix. 

Detail:
  The UpCall handler was using MOVEQS pc, lr to pass on the vector in
    some cases.
  Fixed a non-internationalised build bug - missing condition in macro.
Admin:
  Built.

Version 0.51. Tagged as 'DeviceFS-0_51'
parent ac70132b
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 24 deletions
VersionASM
View file @ 3a09e401
......@@ -9,12 +9,16 @@
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
Module_MajorVersion SETS "0.50"
Module_Version SETA 50
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.51"
Module_Version SETA 51
Module_MinorVersion SETS ""
Module_Date SETS "17 Oct 2000"
Module_ApplicationDate2 SETS "17-Oct-00"
Module_ApplicationDate4 SETS "17-Oct-2000"
Module_FullVersion SETS "0.50"
Module_HelpVersion SETS "0.50 (17 Oct 2000)"
Module_Date SETS "29 Nov 2000"
Module_ApplicationDate2 SETS "29-Nov-00"
Module_ApplicationDate4 SETS "29-Nov-2000"
Module_ComponentName SETS "DeviceFS"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/DeviceFS"
Module_FullVersion SETS "0.51"
Module_HelpVersion SETS "0.51 (29 Nov 2000)"
END
VersionNum
View file @ 3a09e401
/* (0.50)
/* (0.51)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.50
#define Module_MajorVersion_CMHG 0.51
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Oct 2000
#define Module_Date_CMHG 29 Nov 2000
#define Module_MajorVersion "0.50"
#define Module_Version 50
#define Module_MajorVersion "0.51"
#define Module_Version 51
#define Module_MinorVersion ""
#define Module_Date "17 Oct 2000"
#define Module_Date "29 Nov 2000"
#define Module_ApplicationDate2 "17-Oct-00"
#define Module_ApplicationDate4 "17-Oct-2000"
#define Module_ApplicationDate2 "29-Nov-00"
#define Module_ApplicationDate4 "29-Nov-2000"
#define Module_FullVersion "0.50"
#define Module_HelpVersion "0.50 (17 Oct 2000)"
#define Module_ComponentName "DeviceFS"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/DeviceFS"
#define Module_FullVersion "0.51"
#define Module_HelpVersion "0.51 (29 Nov 2000)"
s/DeviceFS
View file @ 3a09e401
......@@ -353,12 +353,9 @@ module_start & 0
& ModuleFlags -module_start
]
help = "DeviceFS", 9, "$Module_MajorVersion ($Module_Date)"
help = "DeviceFS", 9, "$Module_HelpVersion"
[ debug
= " Development version"
]
[ Module_MinorVersion <> ""
= " Module_MinorVersion"
]
= 0
......@@ -399,7 +396,7 @@ set_filetype = "Set File$Type_FCC Device", 0 ; setup variable
MakeErrorBlock DeviceFS_MustBeBuffered
[ :LNOT: No32bitCode
ModuleFlags DCD 1 ; 32-bit compatible
ModuleFlags DCD ModuleFlag_32bit
]
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -1619,7 +1616,7 @@ UpCall ROUT
00
TEQ r3, #0 ; end of the files list?
Pull "r0-r4,pr", EQ
MOVEQS pc, lr ; yes, so unstack and then exit
MOVEQ pc, lr ; yes, so unstack and then exit
LDR lr, [r3, #file_BufferHandle]
TEQ lr, r1 ; is it our buffer?
......
s/Errors
View file @ 3a09e401
......@@ -23,7 +23,7 @@ $label DoError $cc
[ international
$label B$cc MakeError
|
$label RETURNVS
$label RETURNVS $cc
]
MEND
......
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