Cross-compilable

Detail:
  * Rewrite makefile to use shared makefiles (requires splitting off into
    sub-makefiles because there are both app and module targets)
  * Alter to support assembly with objasm, not just aasm
  * Enable GitLab CI
  * Consolidate and complete .gitignore

Admin:
  Requires BuildSys-7_58

Version 0.02 (HAL.2). Tagged as 'HostFS-0_02-HAL_2'

.gitignore

+/aif/
+/*.d
+/DumpFile,ff8
+/gpa/
+/o/
+/objs/
+/rm/
+/SpewChars,ff8

.gitlab-ci.yml

+variables:
+  WHITESPACE_WHITELIST: "./!SpewChars/* ./BlackLog ./doc/JROACH"
+
+include:
+  - project: 'Support/CI'
+    file: '/HostFS.yml'

Makefile

-# Copyright 1996 Acorn Computers Ltd
+# Copyright 2019 RISC OS Open Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,73 +14,23 @@
 #
 # Makefile for TML_HostFS
 #
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name         Description
-# ----       ----         -----------
-# 26-May-94  AMcC         Created.
-#
 
-#
-# Paths
-#
-EXP_HDR = <export$dir>
-
-#
-# Generic options:
-#
-MKDIR   = cdir
-AS      = aasm
-CP      = copy
-RM      = remove
-CCFLAGS = -c -depend !Depend -IC:
-ASFLAGS = -depend !Depend -Stamp -quit
-CPFLAGS = ~cfr~v
-
-#
-# Program specific options:
-#
 COMPONENT ?= TML_HostFS
-SOURCE    = s.${COMPONENT}
-TARGET    = rm.${COMPONENT}
-EXPORTS   = ${EXP_HDR}.HostFS \
-            ${EXP_HDR}.HostDebug
 
-#
-# Generic rules:
-#
-all: DumpFile SpewChars ${TARGET}
-	@echo ${COMPONENT}: all complete
-
-export: ${EXPORTS}
-	@echo ${COMPONENT}: export complete
-
-clean:
-	${RM} ${TARGET}
-	${RM} DumpFile
-	${RM} SpewChars
-	@echo ${COMPONENT}: cleaned
-
-DumpFile: s.DumpFile
-	${AS} ${ASFLAGS} -To $@ -From s.DumpFile
-	SetType $@ Absolute
+include StdTools
 
-SpewChars: s.SpewChars
-	${AS} ${ASFLAGS} -To $@ -From s.SpewChars
-	SetType $@ Absolute
+all: DumpFile SpewChars standalone
 
-${TARGET}: ${SOURCE}
-	${AS} ${ASFLAGS} -module -To $@ -From ${SOURCE}
+DumpFile:
+	@${MAKE} -f app${EXT}mk COMPONENT=${COMPONENT} TARGET=DumpFile
 
-${EXP_HDR}.HostFS: hdr.HostFS
-	${CP} hdr.HostFS $@ ${CPFLAGS}
+SpewChars:
+	@${MAKE} -f app${EXT}mk COMPONENT=${COMPONENT} TARGET=SpewChars
 
-${EXP_HDR}.HostDebug: hdr.HostDebug
-	${CP} hdr.HostDebug $@ ${CPFLAGS}
+export_hdrs export_libs export resources rom rom_link standalone install debug gpa_debug prepro links:
+	@${MAKE} -f mod${EXT}mk COMPONENT=${COMPONENT} $@
 
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-# Dynamic dependencies:
+clean:
+	@${MAKE} -f app${EXT}mk COMPONENT=${COMPONENT} TARGET=DumpFile clean
+	@${MAKE} -f app${EXT}mk COMPONENT=${COMPONENT} TARGET=SpewChars clean
+	@${MAKE} -f mod${EXT}mk COMPONENT=${COMPONENT} clean

MkClean,fd7

@@ -14,3 +14,6 @@
 |
 Dir <Obey$Dir>
 amu_machine clean
+stripdepnd
+stripdepnd app/mk
+stripdepnd mod/mk

VersionASM

 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.2.
 ;
                         GBLS    Module_MajorVersion
                         GBLA    Module_Version
@@ -10,14 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-                        GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "0.02"
 Module_Version          SETA    2
-Module_MinorVersion     SETS    "4.2.2.1"
-Module_Date             SETS    "08 Jan 2004"
-Module_ApplicationDate  SETS    "08-Jan-04"
+Module_MinorVersion     SETS    "HAL.2"
+Module_Date             SETS    "01 Sep 2021"
+Module_ApplicationDate  SETS    "01-Sep-21"
 Module_ComponentName    SETS    "HostFS"
-Module_ComponentPath    SETS    "RiscOS/Sources/Programmer/HostFS"
-Module_FullVersion      SETS    "0.02 (4.2.2.1)"
-Module_HelpVersion      SETS    "0.02 (08 Jan 2004) 4.2.2.1"
+Module_FullVersion      SETS    "0.02 (HAL.2)"
+Module_HelpVersion      SETS    "0.02 (01 Sep 2021) HAL.2"
                         END

VersionNum

 /* (0.02)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.2.
  *
  */
 #define Module_MajorVersion_CMHG        0.02
-#define Module_MinorVersion_CMHG        4.2.2.1
-#define Module_Date_CMHG                08 Jan 2004
+#define Module_MinorVersion_CMHG        HAL.2
+#define Module_Date_CMHG                01 Sep 2021
 
 #define Module_MajorVersion             "0.02"
 #define Module_Version                  2
-#define Module_MinorVersion             "4.2.2.1"
-#define Module_Date                     "08 Jan 2004"
+#define Module_MinorVersion             "HAL.2"
+#define Module_Date                     "01 Sep 2021"
 
-#define Module_ApplicationDate          "08-Jan-04"
+#define Module_ApplicationDate          "01-Sep-21"
 
 #define Module_ComponentName            "HostFS"
-#define Module_ComponentPath            "RiscOS/Sources/Programmer/HostFS"
 
-#define Module_FullVersion              "0.02 (4.2.2.1)"
-#define Module_HelpVersion              "0.02 (08 Jan 2004) 4.2.2.1"
+#define Module_FullVersion              "0.02 (HAL.2)"
+#define Module_HelpVersion              "0.02 (01 Sep 2021) HAL.2"
 #define Module_LibraryVersionInfo       "0:2"

app.mk

+# Copyright 2019 RISC OS Open 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.
+#
+# Makefile for TML_HostFS application
+#
+
+include CApp
+
+# Dynamic dependencies:

mod.mk

+# Copyright 2019 RISC OS Open 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.
+#
+# Makefile for TML_HostFS module
+#
+
+HDRS      =
+ASMHDRS   = HostFS HostDebug
+CMHGFILE  =
+CUSTOMRES = no
+
+include CModule
+
+# Dynamic dependencies:

rm/.gitignore

-*
-!.gitignore

s/DumpFile

@@ -12,6 +12,11 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
+
+        AREA    |Asm$$Code|, CODE, READONLY
+
+        ENTRY
+
 r0      RN      0
 r1      RN      1
 

s/HAL_HostFS

@@ -36,7 +36,9 @@
         GET     Hdr:HALEntries
         GET 	VersionASM
 
-        LEADR   Module_LoadAddr
+        AREA    |Asm$$Code|, CODE, READONLY
+
+        ENTRY
 
 CR      *       13
 LF      *       10
@@ -188,7 +190,7 @@ MaxSwi  *       (.-JumpTable) / 4
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-DoHostVdu ENTRY "r0-r2"
+DoHostVdu Entry "r0-r2"
 
         MOV     r0, #WrchV              ; Claim WrchV
         ADR     r1, WRCHandler
@@ -199,7 +201,7 @@ DoHostVdu ENTRY "r0-r2"
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-DoTubeVdu ENTRY "r0-r2"
+DoTubeVdu Entry "r0-r2"
 
         MOV     r0, #WrchV              ; Release WrchV
         ADR     r1, WRCHandler

s/SpewChars

@@ -12,6 +12,11 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
+
+        AREA    |Asm$$Code|, CODE, READONLY
+
+        ENTRY
+
 r0      RN      0
 r1      RN      1
 

s/TML_HostFS

@@ -35,7 +35,9 @@
         GET     Hdr:HostFS
         GET 	VersionASM
 
-        LEADR   Module_LoadAddr
+        AREA    |Asm$$Code|, CODE, READONLY
+
+        ENTRY
 
 CR      *       13
 LF      *       10
@@ -177,7 +179,7 @@ MaxSwi  *       (.-JumpTable) / 4
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-DoHostVdu ENTRY "r0-r2"
+DoHostVdu Entry "r0-r2"
 
         MOV     r0, #WrchV              ; Claim WrchV
         ADR     r1, WRCHandler
@@ -188,7 +190,7 @@ DoHostVdu ENTRY "r0-r2"
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-DoTubeVdu ENTRY "r0-r2"
+DoTubeVdu Entry "r0-r2"
 
         MOV     r0, #WrchV              ; Release WrchV
         ADR     r1, WRCHandler