Changed module to use modgen instead of assembler.

Really 32-bit compatible now.

Version 1.20. Tagged as 'Chars-1_20'

.gitattributes

-s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 *,ffb gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true

Makefile

@@ -113,8 +113,9 @@ clean:
 # Static dependencies:
 #
 
-${ROM_MODULE}: s.Main ${RESFILES}
-	${AS} ${AFLAGS} -from s.Main -to $@
+${ROM_MODULE}: VersionNum ${RESFILES}
+	perl build:getversion Chars$Version
+	do modgen ${ROM_MODULE} !Chars !Chars <Chars$Version> Resources.!RunImage Resources.Chars.!RunImage
 
 ${RDIR}.!RunImage: crunched.!RunImage
 	${SQUISH} ${SQFLAGS} -from crunched.!RunImage -to $@

VersionASM

@@ -8,11 +8,11 @@
                         GBLS    Module_FullVersion
                         GBLS    Module_ApplicationDate2
                         GBLS    Module_ApplicationDate4
-Module_MajorVersion     SETS    "1.19"
-Module_Version          SETA    119
+Module_MajorVersion     SETS    "1.20"
+Module_Version          SETA    120
 Module_MinorVersion     SETS    ""
 Module_Date             SETS    "07 Jul 2000"
 Module_ApplicationDate2 SETS    "07-Jul-00"
 Module_ApplicationDate4 SETS    "07-Jul-2000"
-Module_FullVersion      SETS    "1.19"
+Module_FullVersion      SETS    "1.20"
                         END

VersionNum

-/* (1.19)
+/* (1.20)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        1.19
+#define Module_MajorVersion_CMHG        1.20
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                07 Jul 2000
 
-#define Module_MajorVersion             "1.19"
-#define Module_Version                  119
+#define Module_MajorVersion             "1.20"
+#define Module_Version                  120
 #define Module_MinorVersion             ""
 #define Module_Date                     "07 Jul 2000"
 
 #define Module_ApplicationDate2         "07-Jul-00"
 #define Module_ApplicationDate4         "07-Jul-2000"
 
-#define Module_FullVersion              "1.19"
+#define Module_FullVersion              "1.20"

s/AppName

-; Copyright 1996 Acorn Computers Ltd
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;     http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-;
-; > Sources.AppName
-
-                GBLS    ApplicationName
-
-ApplicationName SETS    "Chars"
-
-                END

s/Main

-; Copyright 1996 Acorn Computers Ltd
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;     http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-;
-; > Sources.Main
-
-; *********************************
-; ***    C h a n g e   L i s t  ***
-; *********************************
-
-; Date       Description
-; ----       -----------
-; 19-Feb-90     1.01    File created
-; 08-Jan-91     1.02    Font Menu constructed using new Font_ListFonts in Font Manager 2.78
-; 06-Nov-94     AMcC    &.Hdr. changed to Hdr:
-
-Module_BaseAddr
-
-        GET     s.AppName         ; read ApplicationName
-
-        GET     Hdr:ListOpts
-        GET     Hdr:Macros
-        GET     Hdr:System
-        GET     Hdr:ModHand
-        GET     Hdr:Services
-        GET     Hdr:Proc
-        GET     Hdr:ResourceFS
-        GET     VersionASM
-
-        LEADR   Module_LoadAddr
-
-
-; **************** Module code starts here **********************
-
-        ASSERT  (.-Module_BaseAddr) = 0
-
-        DCD     0 ; App_Start    - Module_BaseAddr
-        DCD     App_Init     - Module_BaseAddr
-        DCD     App_Die      - Module_BaseAddr
-        DCD     App_Service  - Module_BaseAddr
-        DCD     App_Title    - Module_BaseAddr
-        DCD     App_HelpStr  - Module_BaseAddr
-        DCD     0
-        DCD     0
-        DCD     0
-        DCD     0
-        DCD     0
-
-        MACRO
-        TabTo   $n
-        LCLA    fred
-fred    SETA    $n + &100000
-        WHILE   fred > &100000
-        DCB     9
-fred    SETA    fred-8
-        WEND
-        MEND
-
-App_Title       DCB     "!$ApplicationName", 0
-App_HelpStr     DCB     "!$ApplicationName"
-                TabTo   16-(.-App_HelpStr)
-                DCB     "$Module_MajorVersion ($Module_Date)", 0
-                ALIGN
-
-; *****************************************************************************
-;
-;       App_Init - Initialisation entry
-;
-
-App_Init ENTRY "r0"
-
-        ADR     R0, resourcefsfiles
-        SWI     XResourceFS_RegisterFiles   ; ignore errors (starts on Service_ResourceFSStarting)
-        CLRV
-
-        EXIT
-
-; *****************************************************************************
-;
-;       App_Die - Die entry
-;
-
-App_Die ENTRY "r0"
-
-        ADR     R0, resourcefsfiles
-        SWI     XResourceFS_DeregisterFiles
-        CLRV
-
-        EXIT                    ; ignore errors (ResourceFS might be dead)
-
-; *****************************************************************************
-;
-;       App_Service - Main entry point for services
-;
-
-;Ursula format
-App_ServTab
-        DCD     0                                   ;flags
-        DCD     App_UService - Module_BaseAddr      ;handler
-        DCD     Service_ResourceFSStarting
-        DCD     0                                   ;terminator
-        DCD     App_ServTab - Module_BaseAddr       ;anchor
-App_Service ROUT
-        MOV     r0,r0                               ;magic instruction
-        TEQ     R1, #Service_ResourceFSStarting
-        MOVNE   PC, LR
-App_UService
-
-; In    R2 -> address inside ResourceFS module to call
-;       R3 = workspace pointer for module
-; Out   R2 called with R0 -> files, R3 -> workspace
-
-svc_resourcefsstarting ENTRY "R0-R3"
-
-        ADR     R0, resourcefsfiles
-        MOV     LR, PC                          ; get return address
-        MOV     PC, R2                          ; R2 = address to call
-
-        EXIT
-
-resourcefsfiles
-        GET     s.ResFiles
-        DCD     0
-
-        END

s/ResFiles

-; Copyright 1996 Acorn Computers Ltd
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;     http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-;
-; > Sources.ResFiles
-;
-
-; Insert here the names of the files to be put into Resources:$.Apps.!<app>
-
-
-; Insert here the names of the files to be put into Resources:$.Resources.<app>
-
-        ResourceFile Resources.!RunImage,  Resources.$ApplicationName..!RunImage
-
-        END