Merged Spinner branch.

Copes with registrations with addresses >= &80000000.
Changed to use srccommit.

Makefile

@@ -63,11 +63,21 @@ clean:
 	${RM} ${TARGET}
 	@echo ${COMPONENT}: cleaned
 
-resources:
-	${MKDIR} ${RESDIR}.${COMPONENT}
-	${CP} Resources.${LOCALE}.Messages  ${RESDIR}.${COMPONENT}.Messages  ${CPFLAGS}
+resources: resources-${CMDHELP}
 	@echo ${COMPONENT}: resource files copied
 
+resources_common:
+	${MKDIR} ${RESDIR}.${COMPONENT}
+	TokenCheck LocalRes:Messages
+	${CP} LocalRes:Messages  ${RESDIR}.${COMPONENT}.Messages  ${CPFLAGS}
+
+resources-None: resources_common
+	@
+
+resources-: resources_common
+	TokenCheck LocalRes:Messages
+	print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
+
 ${TARGET}: ${SOURCE}
 	${AS} ${ASFLAGS} ${SOURCE}
 

Version

-; > Version
-
-        GBLA    Version
-        GBLS    VString
-        GBLS    Date
-
-Version SETA    016
-VString SETS    "0.16"
-Date    SETS    "16 Aug 1995"
-
-        END

s/ResourceFS

@@ -40,6 +40,7 @@
 ;                            Generate a file index (speed enhancement)
 ; 12-Mar-92     0.14    JSR  Misc bugs from failure to initialise workspace. G-RO-5512.
 ; 16-Aug-95     0.15    RWB  Allow booting from ResourceFS, provides *Run !Boot as default and only option
+; 08-Sep-98     0.16    KJB  Cope with registrations above &80000000.
 ;
 Module_BaseAddr
 
@@ -61,7 +62,7 @@ Module_BaseAddr
         GET     Hdr:MsgTrans
         GET     Hdr:Territory
 
-        GET     Version
+        GET     VersionASM
 
         GET     Hdr:NDRDebug
 
@@ -157,7 +158,11 @@ MySWIBase       *       Module_SWISystemBase + ResourceFSSWI * Module_SWIChunkSi
  ]
 
 ROMFS_HelpStr
-        =       "ResourceFS", TAB, "$VString ($Date)", 0
+        =       "ResourceFS", TAB, "$Module_MajorVersion ($Module_Date)"
+ [ Module_MinorVersion <> ""
+        =       " $Module_MinorVersion"
+ ]
+        = 0
         ALIGN
 
 ROMFS_HC_Table
@@ -276,7 +281,7 @@ registerfiles ENTRY "R1-R3"
 
         BLVC    JunkQuickIndexBlock
 
-      [ Version >= 3
+      [ Module_Version >= 3
         MOVVC   R0, #upfsfile_Create
         BLVC    modifyingfiles                  ; R2 -> link block
       ]
@@ -1413,10 +1418,19 @@ compare_R10_R11 ENTRY "R1,R2"
 
         Internat_UpperCaseLoad  R2
 
+ [ {FALSE}
+; KJB - fails if pointers are above &80000000
         RSBS    R14, R10, #1
         RSBLES  R14, R11, #1
         EXIT    GT                      ; GT <= either filename is null
-
+ |
+        TEQ     R10, #0
+        TEQNE   R11, #0
+        BNE     %FT05
+        CMP     PC, #0                  ; PC always GT 0 (in 26-bit modes...)
+        EXIT
+ ]
+05
         DebugS  fs,"compare_R10:",R10
         DebugS  fs,"compare_R11:",R11