Now copes with SWI OS_SynchroniseCodeAreas returning an error. The old code...

Now copes with SWI OS_SynchroniseCodeAreas returning an error.  The old code preserved the V bit, but trashed r0.

Version 2.38. Tagged as 'FileSwitch-2_38'

Version

 ; > Version
 
+        GET     VersionASM
         GBLA    Version
-        GBLS    VString
-        GBLS    Date
 
-Version SETA    237              ; FileSwitch
-VString SETS    "2.37"           ; 1.54
-Date    SETS    "02 May 1997"   ; 02 Sep 1988
+Version SETA    Module_Version
 
         END

VersionASM

@@ -5,8 +5,8 @@
 			GBLA    Module_Version
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
-Module_MajorVersion	SETS    "2.37"
-Module_Version          SETA    237
+Module_MajorVersion	SETS    "2.38"
+Module_Version          SETA    238
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "22 Oct 1998"
 		        END

VersionNum

-/* (2.37)
+/* (2.38)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	2.37
+#define Module_MajorVersion_CMHG     	2.38
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		22 Oct 1998
 
-#define Module_MajorVersion     	"2.37"
-#define Module_Version                  237
+#define Module_MajorVersion     	"2.38"
+#define Module_Version                  238
 #define Module_MinorVersion		""
 #define Module_Date      		"22 Oct 1998"
 

s/FileSwBody

@@ -970,7 +970,7 @@ FileSwitchMinor SETS "/01"         ; for consistency with release version
  ]
 
 FileSwitch_HelpText
-        DCB     "FileSwitch", TAB, "$VString.$FileSwitchMinor ($Date)"
+        DCB     "FileSwitch", TAB, "$Module_MajorVersion.$FileSwitchMinor ($Module_Date)"
  [ anyfiledebug
         DCB     " Debugging version"
  ]

s/OSFile

@@ -792,6 +792,9 @@ int_DoLoadFile ENTRY "r0,r1,r2,r3,r5,r7"
 	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
 	STRB	r5, codeflag	;Reset it
@@ -838,6 +841,9 @@ int_DoLoadFile ENTRY "r0,r1,r2,r3,r5,r7"
 	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
 	STRB	r5, codeflag	;Reset it