Two minor 32-bit fixes.

Version 2.59. Tagged as 'FileSwitch-2_59'

VersionASM

@@ -11,14 +11,14 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.57"
-Module_Version          SETA    257
+Module_MajorVersion     SETS    "2.59"
+Module_Version          SETA    259
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "17 Apr 2001"
-Module_ApplicationDate2 SETS    "17-Apr-01"
-Module_ApplicationDate4 SETS    "17-Apr-2001"
+Module_Date             SETS    "10 May 2001"
+Module_ApplicationDate2 SETS    "10-May-01"
+Module_ApplicationDate4 SETS    "10-May-2001"
 Module_ComponentName    SETS    "FileSwitch"
 Module_ComponentPath    SETS    "RiscOS/Sources/FileSys/FileSwitch"
-Module_FullVersion      SETS    "2.57"
-Module_HelpVersion      SETS    "2.57 (17 Apr 2001)"
+Module_FullVersion      SETS    "2.59"
+Module_HelpVersion      SETS    "2.59 (10 May 2001)"
                         END

VersionNum

-/* (2.58)
+/* (2.59)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        2.58
+#define Module_MajorVersion_CMHG        2.59
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                17 Apr 2001
+#define Module_Date_CMHG                10 May 2001
 
-#define Module_MajorVersion             "2.58"
-#define Module_Version                  258
+#define Module_MajorVersion             "2.59"
+#define Module_Version                  259
 #define Module_MinorVersion             ""
-#define Module_Date                     "17 Apr 2001"
+#define Module_Date                     "10 May 2001"
 
-#define Module_ApplicationDate2         "17-Apr-01"
-#define Module_ApplicationDate4         "17-Apr-2001"
+#define Module_ApplicationDate2         "10-May-01"
+#define Module_ApplicationDate4         "10-May-2001"
 
 #define Module_ComponentName            "FileSwitch"
 #define Module_ComponentPath            "RiscOS/Sources/FileSys/FileSwitch"
 
-#define Module_FullVersion              "2.58"
-#define Module_HelpVersion              "2.58 (17 Apr 2001)"
+#define Module_FullVersion              "2.59"
+#define Module_HelpVersion              "2.59 (10 May 2001)"

s/FSCtrl2

@@ -225,8 +225,10 @@ AddFSEntry NewSwiEntry "r0-r8, fscb"
         TEQ     r1, #0                  ; Is it duff ?
         MOVEQ   r1, r14
         ADDNE   r1, r1, r5              ; Add in module base
+ [ :LNOT: No26bitCode
         TST     r1, #&FC000000          ; Real ARM address (byte aligned) ?
         MOVNE   r1, r14
+ ]
         MOV     r4, r1                  ; Save name^ for copying later
  [ debugcontrol
  LDRB r14,[r6,#FS_info]
@@ -271,8 +273,10 @@ AddFSEntry NewSwiEntry "r0-r8, fscb"
         BEQ     %FT13
         TEQ     r0, #0
         ADDNE   r0, r0, r5              ; If not zero, add in module base
+ [ :LNOT: No26bitCode
         TSTNE   r0, #&FC000000          ; Real ARM address (byte aligned )?
         MOVNE   r0, #0
+ ]
 13      STR     r0, [r2, #fscb_startuptext]
 
 ; FS_open to FS_gbpb are module offsets to add to module base in the new fscb

s/FSErrors

@@ -47,11 +47,9 @@ CopyErrorStore ROUT
 ; In    r0 -> error block
 
 CopyErrorValidateExternal ROUT
- [ :LNOT:No26bitCode
-        TST     r0, #&FC000003
-        MOVEQS  pc, lr
+        TST     r0, #&00000003          ; was &FC000003
+        MOVEQ   pc, lr
         ADRL    r0, ErrorBlock_InvalidErrorBlock
- ]
         B       copy_error              ; Tail folding
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++