Commit e7d1a472 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Some OS_SynchroniseCodeArea calls weren't quite passing the correct address ranges.

Version 2.66. Tagged as 'FileSwitch-2_66'
parent 3a6c3d47
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.65"
Module_Version SETA 265
Module_MajorVersion SETS "2.66"
Module_Version SETA 266
Module_MinorVersion SETS ""
Module_Date SETS "12 Dec 2002"
Module_ApplicationDate SETS "12-Dec-02"
Module_Date SETS "01 Jul 2004"
Module_ApplicationDate SETS "01-Jul-04"
Module_ComponentName SETS "FileSwitch"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/FileSwitch"
Module_FullVersion SETS "2.65"
Module_HelpVersion SETS "2.65 (12 Dec 2002)"
Module_FullVersion SETS "2.66"
Module_HelpVersion SETS "2.66 (01 Jul 2004)"
END
/* (2.65)
/* (2.66)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 2.65
#define Module_MajorVersion_CMHG 2.66
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Dec 2002
#define Module_Date_CMHG 01 Jul 2004
#define Module_MajorVersion "2.65"
#define Module_Version 265
#define Module_MajorVersion "2.66"
#define Module_Version 266
#define Module_MinorVersion ""
#define Module_Date "12 Dec 2002"
#define Module_Date "01 Jul 2004"
#define Module_ApplicationDate "12-Dec-02"
#define Module_ApplicationDate "01-Jul-04"
#define Module_ComponentName "FileSwitch"
#define Module_ComponentPath "RiscOS/Sources/FileSys/FileSwitch"
#define Module_FullVersion "2.65"
#define Module_HelpVersion "2.65 (12 Dec 2002)"
#define Module_LibraryVersionInfo "2:65"
#define Module_FullVersion "2.66"
#define Module_HelpVersion "2.66 (01 Jul 2004)"
#define Module_LibraryVersionInfo "2:66"
......@@ -784,20 +784,17 @@ int_DoLoadFile Entry "r0,r1,r2,r3,r5,r7"
BEQ %FT01
[ debugsarm
DREG r5, "R5 is "
DREG r3, "R3 is "
DREG r2, "R2 is "
DREG r4, "R4 is "
DLINE "IMB thingy called here"
]
Push "r0-r2"
MOV r0, #1
MOV r1, r3
ADD r2, r3, r4
MOV r1, r2
ADD r2, r2, r4
SWI XOS_SynchroniseCodeAreas
; Yes, I know OS_SynchroniseCodeAreas never returns an error, but
; it did for me. :-(
SUBS r0, r0, #0 ; Clear the V bit just in case.
Pull "r0-r2"
MOV r5, #0
SUBS r5, r5, r5 ; Clear the V bit just in case.
STRB r5, codeflag ;Reset it
01
]
......@@ -825,9 +822,12 @@ int_DoLoadFile Entry "r0,r1,r2,r3,r5,r7"
STMIA r14, {r3,r4}
MOV r0, #OSGBPB_ReadFromPTR
Push "r1"
[ StrongARM
Push "r3,r4"
]
BL Xfer_ReadBytes
Pull "r1"
[ StrongARM
Pull "r3,r4"
LDRB r5, codeflag
CMP r5, #0
BEQ %FT01
......@@ -837,20 +837,18 @@ int_DoLoadFile Entry "r0,r1,r2,r3,r5,r7"
DREG r4, "R4 is "
DLINE "Bleep! IMB called here"
]
Push "r0-r2"
MOV r0, #1
MOV r1, r3
ADD r2, r3, r4
SWI XOS_SynchroniseCodeAreas
; Yes, I know OS_SynchroniseCodeAreas never returns an error, but
; it did for me. :-(
SUBS r0, r0, #0 ; Clear the V bit just in case.
Pull "r0-r2"
MOV r5, #0
SUBS r5, r5, r5 ; Clear the V bit just in case.
STRB r5, codeflag ;Reset it
01
]
CLRV ; So V bit doesn't joggle the elbow of CloseThisFile
Pull "r1"
[ debugosfile
DREG r1, "Bytes read, closing file "
]
......
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