Altered to use shared makefiles and ObjAsm.

Detail: As above. No other changes. Admin: Tested in a Lazarus build. Version 2.57. Tagged as 'FileSwitch-2_57'

Altered to use shared makefiles and ObjAsm.
Detail: As above. No other changes. Admin: Tested in a Lazarus build. Version 2.57. Tagged as 'FileSwitch-2_57'
8d9ceeb7 · David Cotton · dc300ea2 · 8d9ceeb7 · 8d9ceeb7 · 8d9ceeb7
Commit 8d9ceeb7 authored Apr 17, 2001 by David Cotton
20 changed files
--- a/Makefile
+++ b/Makefile
@@ -14,93 +14,20 @@
 #
 # Makefile for FileSwitch
 #
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name         Description
-# ----       ----         -----------
-# 25-May-94  AMcC         Created.
+# *************************************
+# ***     C h a n g e   L i s t     ***
+# *************************************
+# Date         Name         Description
+# ----         ----         -----------
+# 11-Apr-2001  DSC          Created.
 #

-#
-# Paths
-#
-EXP_HDR = <export$dir>
-C_EXP_HDR = <cexport$dir>.Interface.h
-
-#
-# Generic options:
-#
-MKDIR   = cdir
-AS      = aasm
-CP      = copy
-RM      = remove
-CCFLAGS = -c -depend !Depend -IC:
-ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From 
-CPFLAGS = ~cfr~v
-
-#
-# Program specific options:
-#
 COMPONENT = FileSwitch
-SOURCE    = s.FileSwitch
-TARGET    = rm.FileSwitch
-EXPORTS   = ${EXP_HDR}.LowFSI \
-            ${EXP_HDR}.HighFSI \
-            ${C_EXP_HDR}.HighFSI
-# Add LowFSI if ever required - Hdr2H doesn't like it yet
-
-#
-# Generic rules:
-#
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
-
-export: ${EXPORTS}
-	@echo ${COMPONENT}: export complete
-
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-clean:
-	${RM} ${TARGET}
-	${RM} s.TokHelpSrc
-	@echo ${COMPONENT}: cleaned
-
-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:CmdHelp
-	print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
-
-${TARGET}: ${SOURCE} s.TokHelpSrc
-	${AS} ${ASFLAGS} ${SOURCE}
-
-s.TokHelpSrc: Hdr:Tokens HelpSrc
-	tokenise Hdr:Tokens HelpSrc $@
-
-${EXP_HDR}.LowFSI: hdr.LowFSI
-	${CP} hdr.LowFSI $@ ${CPFLAGS}
-
-${EXP_HDR}.HighFSI: hdr.HighFSI
-	${CP} hdr.HighFSI $@ ${CPFLAGS}

-${C_EXP_HDR}.LowFSI: hdr.LowFSI
-	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.LowFSI $@
+HEADER1 = LowFSI
+HEADER2 = HighFSI

-${C_EXP_HDR}.HighFSI: hdr.HighFSI
-	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.HighFSI $@
+include StdTools
+include AAsmModule

 # Dynamic dependencies:
--- a/VersionASM
+++ b/VersionASM
@@ -11,14 +11,14 @@
                        GBLS    Module_HelpVersion
                        GBLS    Module_ComponentName
                        GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.56"
-Module_Version          SETA    256
+Module_MajorVersion     SETS    "2.57"
+Module_Version          SETA    257
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "04 Apr 2001"
-Module_ApplicationDate2 SETS    "04-Apr-01"
-Module_ApplicationDate4 SETS    "04-Apr-2001"
+Module_Date             SETS    "17 Apr 2001"
+Module_ApplicationDate2 SETS    "17-Apr-01"
+Module_ApplicationDate4 SETS    "17-Apr-2001"
 Module_ComponentName    SETS    "FileSwitch"
 Module_ComponentPath    SETS    "RiscOS/Sources/FileSys/FileSwitch"
-Module_FullVersion      SETS    "2.56"
-Module_HelpVersion      SETS    "2.56 (04 Apr 2001)"
+Module_FullVersion      SETS    "2.57"
+Module_HelpVersion      SETS    "2.57 (17 Apr 2001)"
                        END
--- a/VersionNum
+++ b/VersionNum
-/* (2.56)
+/* (2.57)
 *
 * This file is automatically maintained by srccommit, do not edit manually.
 *
 */
-#define Module_MajorVersion_CMHG        2.56
+#define Module_MajorVersion_CMHG        2.57
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                04 Apr 2001
+#define Module_Date_CMHG                17 Apr 2001

-#define Module_MajorVersion             "2.56"
-#define Module_Version                  256
+#define Module_MajorVersion             "2.57"
+#define Module_Version                  257
 #define Module_MinorVersion             ""
-#define Module_Date                     "04 Apr 2001"
+#define Module_Date                     "17 Apr 2001"

-#define Module_ApplicationDate2         "04-Apr-01"
-#define Module_ApplicationDate4         "04-Apr-2001"
+#define Module_ApplicationDate2         "17-Apr-01"
+#define Module_ApplicationDate4         "17-Apr-2001"

 #define Module_ComponentName            "FileSwitch"
 #define Module_ComponentPath            "RiscOS/Sources/FileSys/FileSwitch"

-#define Module_FullVersion              "2.56"
-#define Module_HelpVersion              "2.56 (04 Apr 2001)"
+#define Module_FullVersion              "2.57"
+#define Module_HelpVersion              "2.57 (17 Apr 2001)"
--- a/s/Canonical
+++ b/s/Canonical
@@ -44,7 +44,7 @@
 ;
 ; Out   filepath reduced.

-ReduceParents ENTRY "r0-r3"
+ReduceParents Entry "r0-r3"
 [ chopoffdollarfrompaths
        MOV     r1, r2                  ; Start of $ or .$ sequence
        LDRB    r0, [r2], #1
@@ -437,7 +437,7 @@ CanonicaliseSpecialAndDisc EntryS "r0,r3,r4,r5,r6,r7,r8", 4
 ; Out   r1 = path^ after disc and .
 ;       r2 = disc^ or NULL

-GetDiscFromPath ENTRY
+GetDiscFromPath Entry

        ; Check for the presence of a disc name
        LDRB    r14, [r1]
@@ -473,7 +473,7 @@ GetDiscFromPath ENTRY
 ; Out   r0 = Absolute char in path or 0 if none there
 ;       r1 = path^ (path without disc, special field or absolute)
 ;
-GetAbsolute ENTRY "r2"
+GetAbsolute Entry "r2"
        LDRB    r0, [r1]
        BL      IsAbsolute
        MOVNE   r0, #0
@@ -501,7 +501,7 @@ GetAbsolute ENTRY "r2"
 ; and the parts for reconstruction into a path returned.
 ;

-ObtainAbsoluteParts ENTRY "r0-r5,r7", 4
+ObtainAbsoluteParts Entry "r0-r5,r7", 4
 [ debugcanonical
 DSTRING r1,"Obtain absolute parts of "
 DREG r3, "Relativity is "
@@ -705,7 +705,7 @@ ObtainAbsoluteParts ENTRY "r0-r5,r7", 4
        addr    r3, Default_CSD_Path, EQ
        TEQ     r7, #"%"
        addr    r3, Default_LibD_Path, EQ
-        TEQ     r7, #"\"
+        TEQ     r7, #"\\"
        addr    r3, Default_PSD_Path, EQ
        TEQ     r7, #"&"
        addr    r3, Default_URD_Path, EQ
@@ -716,7 +716,7 @@ ObtainAbsoluteParts ENTRY "r0-r5,r7", 4
        addr    r3, Default_CSD_Whan_Path, EQ
        TEQ     r7, #"%"
        addr    r3, Default_LibD_Whan_Path, EQ
-        TEQ     r7, #"\"
+        TEQ     r7, #"\\"
        addr    r3, Default_PSD_Whan_Path, EQ
        TEQ     r7, #"&"
        addr    r3, Default_URD_Whan_Path, EQ
@@ -844,7 +844,7 @@ ObtainAbsoluteParts ENTRY "r0-r5,r7", 4
 95
        TEQ     r0, #"@"
        MOVEQ   r4, #Dir_Current
-        TEQ     r0, #"\"
+        TEQ     r0, #"\\"
        MOVEQ   r4, #Dir_Previous
        TEQ     r0, #"&"
        MOVEQ   r4, #Dir_UserRoot
@@ -872,7 +872,7 @@ ObtainAbsoluteParts ENTRY "r0-r5,r7", 4
 ; Path gets parents reduced.
 ;

-StitchAbsolutePartsTogether ENTRY "r0,r1,r2,r3,r4,r5,r6,r7,r8,r9"
+StitchAbsolutePartsTogether Entry "r0,r1,r2,r3,r4,r5,r6,r7,r8,r9"
 [ debugcanonical
 DSTRING r0,"Constructing new path from ",cc
 DSTRING r2," ",cc
@@ -1050,7 +1050,7 @@ StitchAbsolutePartsTogether ENTRY "r0,r1,r2,r3,r4,r5,r6,r7,r8,r9"
 ; Out   Path canonicalised
 ;

-CanonicalisePath ENTRY "r0,r1,r2,r3,r6,r7"
+CanonicalisePath Entry "r0,r1,r2,r3,r6,r7"
        MOV     r7, r1
        LDR     r1, [r1]
        LDR     r6, [r6]
@@ -1089,7 +1089,7 @@ CanonicalisePath ENTRY "r0,r1,r2,r3,r6,r7"
 ;
 MinWildCardSpace * &10
 MaxWildCardSpace * &400
-ResolveWildcardBySteam ENTRY "r1,r3,r4,r5,r6,r7"
+ResolveWildcardBySteam Entry "r1,r3,r4,r5,r6,r7"

        ; Hold wildcard for later
        MOV     r7, r2
@@ -1192,7 +1192,7 @@ ResolveWildcardBySteam ENTRY "r1,r3,r4,r5,r6,r7"
 ; Out   r2 = RMAlloced resolved wildcard, or NULL if not found
 ;

-ResolveWildcard ENTRY "r0,r1,r2,r3,r4,r5,fscb"
+ResolveWildcard Entry "r0,r1,r2,r3,r4,r5,fscb"

        ; Ensure the directory exists, but don't care about it's attributes
        BL      EnsureCanonicalObject
@@ -1305,7 +1305,7 @@ ResolveWildcard ENTRY "r0,r1,r2,r3,r4,r5,fscb"
 ;
 ; Out   r2 advanced to next . or terminator
 ;
-SkipToLeafEnd ENTRY
+SkipToLeafEnd Entry
 10
        LDRB    r14, [r2], #1
        TEQ     r14, #"."
@@ -1324,7 +1324,7 @@ SkipToLeafEnd ENTRY
 ;
 ; Out   Path has resolvable wildcards resolved
 ;
-UnWildcardPath ENTRY "r0,r1,r2,r3,r4,r5,r7"
+UnWildcardPath Entry "r0,r1,r2,r3,r4,r5,r7"

 [ debugcanonical
 Push r1

--- a/s/CtrlUtils
+++ b/s/CtrlUtils
@@ -37,7 +37,7 @@
 ;       r4 = special field^ for root fs
 ;       r5 = root fscb^
 ;
-int_ConstructFullPathWithoutFSAndSpecial ENTRY
+int_ConstructFullPathWithoutFSAndSpecial Entry
        TEQ     fscb, #Nowt
        BEQ     %FT10
        LDRB    r14, [fscb, #fscb_info]
@@ -94,7 +94,7 @@ int_ConstructFullPathWithoutFSAndSpecial ENTRY
 ;       r4 = special field^ for root fs
 ;       r5 = root fscb^
 ;
-int_ConstructPathWithoutFS ENTRY "r1,r2,r3"
+int_ConstructPathWithoutFS Entry "r1,r2,r3"

        ; Get to root FS and special
        MOV     r3, #0
@@ -153,7 +153,7 @@ int_ConstructPathWithoutFS ENTRY "r1,r2,r3"
 ;       r3 reduced by length of string inserted, will be sent
 ;               negative to correct value for full string
 ;
-int_ConstructFullPath ENTRY "r1,r2,r3,r4,r5"
+int_ConstructFullPath Entry "r1,r2,r3,r4,r5"

        ; Get to root FS and special
        MOV     r3, #0
@@ -216,7 +216,7 @@ int_ConstructFullPath ENTRY "r1,r2,r3,r4,r5"
 ;               negative to correct value for full string
 ;       Buffer overflow error generated if r3<0 at the end
 ;
-int_ConstructFullPathWithError ENTRY
+int_ConstructFullPathWithError Entry
        BL      int_ConstructFullPath
        CMP     r3, #0
        addr    r0, ErrorBlock_BuffOverflow, LT
@@ -234,7 +234,7 @@ int_ConstructFullPathWithError ENTRY
 ; Out
 ;       stack dropped by enough and hole filled in with path
 ;
-int_ConstructFullPathOnStack ENTRY "r2,r3,r7"
+int_ConstructFullPathOnStack Entry "r2,r3,r7"
        MOV     r7, sp
        MOV     r2, #ARM_CC_Mask
        MOV     r3, #0
@@ -255,7 +255,7 @@ int_ConstructFullPathOnStack ENTRY "r2,r3,r7"
 ;       fscb^ set
 ;
 MaxFilenameSpace * 400
-int_CatExTitle ENTRY "r0-r5,fscb"
+int_CatExTitle Entry "r0-r5,fscb"
 [ debugcontrol
 DSTRING r1, "CatExTitle tail is "
 DREG r6, "scb^/special field^ is "
@@ -409,9 +409,9 @@ CatExMaxWidthStr        = "FileSwitch$NameWidth",0
 ]

 [ CatExLong
-int_CatExBody ENTRY "r0-r9", CatExBody_FrameSize
+int_CatExBody Entry "r0-r9", CatExBody_FrameSize
 |
-int_CatExBody ENTRY "r0-r9", CatExBody_FrameSize
+int_CatExBody Entry "r0-r9", CatExBody_FrameSize
 ]
        MOV     CatExBodyFrame, sp
        SUB     sp, sp, #CatSpace + CatStringSpace
@@ -855,7 +855,7 @@ int_CatExBody ENTRY "r0-r9", CatExBody_FrameSize
 ;
 ; Out   spaces spewed (r0, VS error return mechanism)
 ;
-SpewSpaces ENTRY "r6"
+SpewSpaces Entry "r6"
        B       %FT20
 10
        SWI     XOS_WriteI+space
@@ -894,9 +894,9 @@ FileInfoFormat  DCB "FileInfo",0
        ALIGN

 [ CatExLong
-int_CatExItem ENTRY     "r0-r9"
+int_CatExItem Entry     "r0-r9"
 |
-int_CatExItem ENTRY     "r0-r9"
+int_CatExItem Entry     "r0-r9"
 ]
        TEQ     r8, #0
        ADREQ   r0, CatFormat
@@ -970,7 +970,7 @@ int_CatExItem ENTRY     "r0-r9"
 ;
 ; Out   r6 advanced or error (r0,VS errors)
 ;
-int_StuffFilenameIntoBuffer ENTRY "r3"
+int_StuffFilenameIntoBuffer Entry "r3"
 [ CatExLong
  [ debugcontrol
 	DREG	r10, "stuffing width: "
@@ -994,7 +994,7 @@ int_StuffFilenameIntoBuffer ENTRY "r3"
 ;
 ; Out   r6 advanced or error (r0,VS errors)
 ;
-int_StuffAttsIntoBuffer ENTRY "r0,r3", 8
+int_StuffAttsIntoBuffer Entry "r0,r3", 8
        MOV     r3, sp

        ; D
@@ -1055,7 +1055,7 @@ ExDateFormat DCB "ExDt",0
 ExLoadExecFormat DCB "ExLdEx",0
        ALIGN

-int_StuffLoadExecIntoBuffer ENTRY "r4,r5"
+int_StuffLoadExecIntoBuffer Entry "r4,r5"
        ADR     r4, ExDateFormat
        ADR     r5, ExLoadExecFormat
        BL      int_GenStuffLoadExecIntoBuffer
@@ -1077,7 +1077,7 @@ FileInfoDateFormat DCB "FileInDt",0
 FileInfoLoadExecFormat DCB "FileInLdEx",0
        ALIGN

-int_StuffExactLoadExecIntoBuffer ENTRY "r4,r5"
+int_StuffExactLoadExecIntoBuffer Entry "r4,r5"
        ADR     r4, FileInfoDateFormat
        ADR     r5, FileInfoLoadExecFormat
        BL      int_GenStuffLoadExecIntoBuffer
@@ -1100,7 +1100,7 @@ int_StuffExactLoadExecIntoBuffer ENTRY "r4,r5"
 DirText DCB "Dr",0
        ALIGN

-int_GenStuffLoadExecIntoBuffer ENTRY "r0-r4",24
+int_GenStuffLoadExecIntoBuffer Entry "r0-r4",24

        ; Is it a directory?
        TST     r0, #object_directory
@@ -1209,7 +1209,7 @@ int_GenStuffLoadExecIntoBuffer ENTRY "r0-r4",24
 ;
 ; Out   r6 advanced or error (r0,VS errors)
 ;
-int_StuffFileSizeIntoBuffer ENTRY "r0-r2"
+int_StuffFileSizeIntoBuffer Entry "r0-r2"
        MOV     r0, r4
        MOV     r1, r6
        SUB     r2, r7, r6
@@ -1228,7 +1228,7 @@ int_StuffFileSizeIntoBuffer ENTRY "r0-r2"
 ;
 ; Out   r6 advanced or error (r0,VS errors)
 ;
-int_StuffExactFileSizeIntoBuffer ENTRY "r0-r2"
+int_StuffExactFileSizeIntoBuffer Entry "r0-r2"
        MOV     r0, r4
        MOV     r1, r6
        SUB     r2, r7, r6
@@ -1251,7 +1251,7 @@ int_StuffExactFileSizeIntoBuffer ENTRY "r0-r2"
 ;
 ; Stuffs the name into the buffer padded to width
 ;
-int_StuffLPaddedStringIntoBuffer ENTRY "r3"
+int_StuffLPaddedStringIntoBuffer Entry "r3"
        BL      strlen_accumulate
        RSBS    r3, r3, #0
        MOVLO   r3, #0
@@ -1274,7 +1274,7 @@ int_StuffLPaddedStringIntoBuffer ENTRY "r3"
 ;
 ; Stuffs the name into the buffer padded to width
 ;
-int_StuffRPaddedStringIntoBuffer ENTRY "r3"
+int_StuffRPaddedStringIntoBuffer Entry "r3"
        RSB     r3, r3, #0
        BL      strlen_accumulate
        BL      int_StuffStringIntoBuffer
@@ -1299,7 +1299,7 @@ int_StuffRPaddedStringIntoBuffer ENTRY "r3"
 ; Stuffs the name into the buffer padded to width.  If the string's
 ; longer than the buffer width, it truncates it.
 ;
-int_StuffRPaddedMaybeTruncatedStringIntoBuffer ENTRY "r3,r4"
+int_StuffRPaddedMaybeTruncatedStringIntoBuffer Entry "r3,r4"
        MOV     r4, r3
        BL      strlen                  ; string length in R3
        CMP     r3, r4
@@ -1331,7 +1331,7 @@ int_StuffRPaddedMaybeTruncatedStringIntoBuffer ENTRY "r3,r4"
 ;
 ; Stuffs the given number of spaces into the buffer
 ;
-int_StuffSpacesIntoBuffer ENTRY "r0,r3"
+int_StuffSpacesIntoBuffer Entry "r0,r3"
        MOV     r0, #space
        B       %FT20
 10
@@ -1354,7 +1354,7 @@ int_StuffSpacesIntoBuffer ENTRY "r0,r3"
 ; Out   r6 advanced by string length, or error (r0,VS)
 ;       terminator not placed into buffer
 ;
-int_StuffStringIntoBuffer ENTRY "r0,r1"
+int_StuffStringIntoBuffer Entry "r0,r1"
        B       %FT20
 10
        BL      int_StuffByteIntoBuffer
@@ -1380,7 +1380,7 @@ int_StuffStringIntoBuffer ENTRY "r0,r1"
 ; Out   r6 advanced by string length, or error (r0,VS)
 ;       terminator not placed into buffer
 ;
-int_StuffRTruncatedStringIntoBuffer ENTRY "r0,r1,r3"
+int_StuffRTruncatedStringIntoBuffer Entry "r0,r1,r3"
        SUB     r3, r3, #3
        B       %FT20
 10
@@ -1422,7 +1422,7 @@ int_StuffRTruncatedStringIntoBuffer ENTRY "r0,r1,r3"
 ;
 ; Out   r6 advanced by 1, or error (r0,VS)
 ;
-int_StuffByteIntoBuffer ENTRY "r0"
+int_StuffByteIntoBuffer Entry "r0"
        CMP     r6, r7
        STRLOB  r0, [r6], #1
        EXIT    LO
@@ -1452,7 +1452,7 @@ int_StuffByteIntoBuffer ENTRY "r0"
 ;
 ; Will generate an error if the object doesn't exist
 ;
-Process_WildPathnameMustExist ENTRY
+Process_WildPathnameMustExist Entry
        BL      Process_WildPathname
        EXIT    VS
        TEQ     r0, #object_nothing

--- a/s/DirStore
+++ b/s/DirStore
@@ -83,7 +83,7 @@ FSW_Lib_Suffix DCB "$Lib"
 ; Out   r1 = 0 if not found
 ;       r5 reduced by length of variable

-SimpleReadDir ENTRY    "r0-r8", 512
+SimpleReadDir Entry    "r0-r8", 512

        MOV     r8, sp
        MOV     r7, #0
@@ -135,7 +135,7 @@ SimpleReadDir ENTRY    "r0-r8", 512
 ;
 ; Returns path corresponding to directory, or NULL if unset
 ;
-ReadDirWithSuppliedDefault ENTRY "r0-r3,r6-r8"
+ReadDirWithSuppliedDefault Entry "r0-r3,r6-r8"

 [ debugdirstore
 DREG r2, "Reading dir "
@@ -190,7 +190,7 @@ ReadDirWithSuppliedDefault ENTRY "r0-r3,r6-r8"
 ; & - $
 ; % - &.Library,$.Library,@
 ;
-ReadDirWithDefault ENTRY "r3"
+ReadDirWithDefault Entry "r3"
        LDR     lr, [fscb, #fscb_info]
        TST     lr, #fsinfo_handlesurdetc
        ADREQ   lr, DirDefaultTab
@@ -249,7 +249,7 @@ Lib_Whan_Default
 ; This limitation is on purpose: its is designed to handle multi-option
 ; % only, which should be supplied internally only.
 ;
-ExpandingReadDirWithDefault ENTRY "r0,r1,r2,r3"
+ExpandingReadDirWithDefault Entry "r0,r1,r2,r3"
        MOV     r1, #0
        BL      ReadDirWithDefault
        EXIT    VS
@@ -272,7 +272,7 @@ ExpandingReadDirWithDefault ENTRY "r0,r1,r2,r3"

        EXIT

-ExpandOneDir ENTRY "r0-r4", 8
+ExpandOneDir Entry "r0-r4", 8

 [ debugdirstore
 DREG r2, "Expanding dir ",cc
@@ -360,7 +360,7 @@ ReadDir_Path # 4
 ReadDir_Special # 4
 ReadDir_LocalSize * :INDEX:{VAR}

-ReadDir ENTRY   "r0-r9,fscb", ReadDir_LocalSize
+ReadDir Entry   "r0-r9,fscb", ReadDir_LocalSize
 [ debugdirstore
 DREG r0, "Read dirstore to "
 ]
@@ -506,7 +506,7 @@ ReadDir ENTRY   "r0-r9,fscb", ReadDir_LocalSize
 ;
 ; Sets the directory to be the given object
 ;
-SetDirFromObject ENTRY "r0-r8"
+SetDirFromObject Entry "r0-r8"
 [ debugdirstore
 DSTRING r1, "Setting dirstore with string "
 ]
@@ -568,7 +568,7 @@ SetDirFromObject ENTRY "r0-r8"
 ;
 ; Unsets the directory
 ;
-UnsetDir ENTRY
+UnsetDir Entry
        LDR     lr, [fscb, #fscb_info]
        TST     lr, #fsinfo_handlesurdetc
        BEQ     %FT10
@@ -594,7 +594,7 @@ UnsetDir ENTRY
 ; Unsets the directory without checking whether the filing system allows
 ; that directory to be set or not.
 ;
-int_UnsetDir ENTRY "r0-r4,r6-r8"
+int_UnsetDir Entry "r0-r4,r6-r8"
        MOV     r8, sp
        MOV     r7, #0
        MOV     r6, r2
@@ -618,7 +618,7 @@ int_UnsetDir ENTRY "r0-r4,r6-r8"
 ;
 ; Out   error possible
 ;
-CopyDir ENTRY "r0-r8,fscb"
+CopyDir Entry "r0-r8,fscb"
        MOV     r8, sp
        MOV     r7, #0
        BL      fscbscbTofscb
@@ -686,7 +686,7 @@ Default_PSD DCB "@", 0
 Default_Lib DCB "&", 0
 Default_URD DCB "$", 0

-ChangeDirectory ENTRY "r0-r6"
+ChangeDirectory Entry "r0-r6"

        ; Check for "" directory setting
        LDRB    r14, [r1]
@@ -777,7 +777,7 @@ ChangeDirectory ENTRY "r0-r6"
 ;
 ; Out   Directory path OS_WriteCed
 ;
-DisplayDirectoryPath ENTRY "r0-r7"
+DisplayDirectoryPath Entry "r0-r7"
        GetLumpOfStack r5, #MaxFilenameSpace, #MaxFilenameSpace, #2048, %FA95

        ; Save dir to display for later
@@ -1011,7 +1011,7 @@ AlterMatchingDirs EntryS "r0-r9"
 ;
 ; expect use: from Service_DiscDismounted

-UnsetMatchingDirs ENTRY "r1-r3"
+UnsetMatchingDirs Entry "r1-r3"
 [ debugservice
        DSTRING r2,"UnsetMatchingDirs(",cc
        DLINE   ")"

--- a/s/Ensure
+++ b/s/Ensure
@@ -175,7 +175,7 @@ EnsureCanonicalObject EntryS "r7,r8,r9"
 ; The performs a similar function to AssessDestinationForPath, except it
 ; ensures the end object exists/doesn't exist.
 ;
-EnsureObjectCommon ENTRY "r7"
+EnsureObjectCommon Entry "r7"

 [ debugensure
 Push "r1,r6"
@@ -203,7 +203,7 @@ EnsureObjectCommon ENTRY "r7"
 ;
 ; Out   File opened and attached in all the right places
 ;
-OpenMultiFSFile ENTRY "r1,r2,r3,r4,r5,r7,scb"
+OpenMultiFSFile Entry "r1,r2,r3,r4,r5,r7,scb"
        addr    r2, anull
        MOV     r5, #open_update
        MOV     r7, #open_update :OR: open_mustopen :OR: open_nodir :OR: open_nopath
@@ -290,7 +290,7 @@ OpenMultiFSFile ENTRY "r1,r2,r3,r4,r5,r7,scb"
 ;               unchanged.
 ;       EQ, NE as appropriate
 ;
-strcmp_forimagefilepath ENTRY "r1,r2,r3,r4"
+strcmp_forimagefilepath Entry "r1,r2,r3,r4"
        Internat_CaseConvertLoad r14,Lower
 10      LDRB    r3, [r2], #1
        LDRB    r4, [r1], #1
@@ -428,7 +428,7 @@ AssessDestinationForPath EntryS "r2,r3,scb"
 ; the fscb is correct as it may be the case that a deeper nesting of
 ; fscbs is required.

-AssessDestinationForPathTailForDirRead ENTRY "r2,r3,scb"
+AssessDestinationForPathTailForDirRead Entry "r2,r3,scb"
 [ debugensure
 DSTRING r1, "Assessing destination for dir read on "
 ]
@@ -531,7 +531,7 @@ AssessDestinationForPathTailForDirRead ENTRY "r2,r3,scb"
 ; This checks for the path being a MultiFS path and uses that first.
 ; The results are adjusted for MultiFSness.
 ;
-SimpleReadCatalogueInfo ENTRY
+SimpleReadCatalogueInfo Entry

 [ debugensure
 DSTRING r6,"SimpleReadCatalogueInfo(#",cc
@@ -570,7 +570,7 @@ SimpleReadCatalogueInfo ENTRY
 ;
 ; Out   r2 = fscb of the root non-MultiFS
 ;
-fscbscbTofscb ENTRY "r6"
+fscbscbTofscb Entry "r6"
 [ debugensure
 DREG fscb,"fscbscbTofscb(",cc
 DREG r6,",",cc

--- a/s/FSCommands
+++ b/s/FSCommands
@@ -18,7 +18,7 @@

 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

-Access_Code ENTRY
+Access_Code Entry

        MOV     r4, #FSControl_Access

@@ -134,7 +134,7 @@ NoLib_Code ALTENTRY