Minor tidy ups

Service call table made unconditional.
Typo in Hdr:FileCore corrected.
Comments improved, and other misc housekeeping.

Version 3.62. Tagged as 'FileCore-3_62'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "3.61"
-Module_Version          SETA    361
+Module_MajorVersion     SETS    "3.62"
+Module_Version          SETA    362
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "19 Jun 2013"
-Module_ApplicationDate  SETS    "19-Jun-13"
+Module_Date             SETS    "18 Jul 2013"
+Module_ApplicationDate  SETS    "18-Jul-13"
 Module_ComponentName    SETS    "FileCore"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/FileCore"
-Module_FullVersion      SETS    "3.61"
-Module_HelpVersion      SETS    "3.61 (19 Jun 2013)"
+Module_FullVersion      SETS    "3.62"
+Module_HelpVersion      SETS    "3.62 (18 Jul 2013)"
                         END

VersionNum

-/* (3.61)
+/* (3.62)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        3.61
+#define Module_MajorVersion_CMHG        3.62
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                19 Jun 2013
+#define Module_Date_CMHG                18 Jul 2013
 
-#define Module_MajorVersion             "3.61"
-#define Module_Version                  361
+#define Module_MajorVersion             "3.62"
+#define Module_Version                  362
 #define Module_MinorVersion             ""
-#define Module_Date                     "19 Jun 2013"
+#define Module_Date                     "18 Jul 2013"
 
-#define Module_ApplicationDate          "19-Jun-13"
+#define Module_ApplicationDate          "18-Jul-13"
 
 #define Module_ComponentName            "FileCore"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/FileCore"
 
-#define Module_FullVersion              "3.61"
-#define Module_HelpVersion              "3.61 (19 Jun 2013)"
-#define Module_LibraryVersionInfo       "3:61"
+#define Module_FullVersion              "3.62"
+#define Module_HelpVersion              "3.62 (18 Jul 2013)"
+#define Module_LibraryVersionInfo       "3:62"

hdr/FileCore

@@ -194,7 +194,7 @@ DiscRecord_BigDir_DiscVersion           # 4        ; version number of disc form
 DiscRecord_BigDir_RootDirSize           # 4        ; size of root dir
 SzDiscRecSig2                           # 0
 DiscRecord_BigDir_Reserved              # 8
-SzDiscRegSigSpace                       # 0
+SzDiscRecSigSpace                       # 0
         ASSERT  (DiscRecord_ZoneSpare :MOD: 4)=2
 
 ;

s/DebugOpts

@@ -28,9 +28,6 @@ UseBigFlag      SETL {TRUE}
         GBLL    BigFiles                ; Allow files up to 4G-1 in size
 BigFiles        SETL {TRUE}
 
-        GBLL    ServicePolice           ; Fast despatch table for service calls
-ServicePolice   SETL {TRUE}
-
         GBLL    BigMaps                 ; Big free space maps (allowing idlen to be more than 15)
 BigMaps         SETL {TRUE}
 

s/Defns

@@ -227,16 +227,13 @@ SectorCache_Contents    # 0
 
 DefectListDiscAdd       * &400+&800
 SzDefectList            * &200
-DefectEndMark           bit 29
 MaxStruc                * 64
-        ASSERT  SzDiscRec<=MaxStruc
+        ASSERT  SzDiscRecSig2<=MaxStruc
 
         ^ 0
-                # SzDefectList-MaxStruc-4
+                # SzDefectList-4-MaxStruc
 ParkDiscAdd     # 4
-DefectStruc     # MaxStruc-1
-;DefectCheck
-                # 1
+DefectStruc     # MaxStruc
         ASSERT  @=SzDefectList
 
 

s/FileCore15

@@ -866,7 +866,7 @@ RetryDriveOp ROUT
         MOV     R0, R6
 75
         LDR     LR, [R0],#4
-        CMPS    LR, #DefectEndMark
+        CMPS    LR, #DefectList_End
         EORCC   R7, LR, R7, ROR #13
         BCC     %BT75
         EOR     R7, R7, R7, LSR #16

s/FileCore20

@@ -266,14 +266,14 @@ DetermineDiscType ROUT
         Push    "r0"
         LDR     r0, [r5, #DiscRecord_DiscType]
         DREG    r0, "Disc identified...Type=",cc
-        ASSERT  DiscId :MOD: 4 = 0
+        ASSERT  DiscRecord_DiscId :MOD: 4 = 0
         LDR     r0, [r5, #DiscRecord_DiscId]
         MOV     r0, r0, ASL #16
         MOV     r0, r0, LSR #16
         DREG    r0, " DiscId=",cc
         ADD     r0, r5, #DiscRecord_DiscName
         DSTRING r0, " name=",cc
-        LDR     r0, [r5, #DiscSize]
+        LDR     r0, [r5, #DiscRecord_DiscSize]
         DREG    r0, " DiscSize="
         DLINE   "trying to match against other records..."
         Pull    "r0"

s/FileCore35

@@ -1091,7 +1091,7 @@ SizeLessDefects64 ROUT
         ; Get the disc size
         MOV     R2, R3, LSR #(32-3)       ;disc
  [ DebugL
-        DREG    R2, "SizeLessDefects(",cc
+        DREG    R2, "SizeLessDefects64(",cc
  ]
         DiscRecPtr  R1, R2
         LDR     LR, [R1, #DiscRecord_DiscSize]
@@ -1128,8 +1128,8 @@ SizeLessDefects64 ROUT
         MOV     R0,#0
 20
  [ DebugL
-        MOV     R1, LR
-        DREG    R1, ")="
+        DREG    R0, ")=", cc
+        DREG    LR
  ]
         RestPSR R6,,f
         Pull    "R1-R2,R6,PC"

s/GenSWIs

@@ -450,8 +450,8 @@ DO64_R2Offset * 4
  [ BigDisc
         Push    "R1,R3"
         LDRB    R3,[R5,#DiscRecord_Log2SectorSize]      ; get sector size
-        LDMIB   R2,{R1,LR}              ; turn 64-bit byte address + drive
-        LDRB    R2,[R2,#0]              ; into packed
+        LDMIB   R2,{R1,LR}              ; turn 64-bit byte address + drive into packed
+        LDRB    R2,[R2,#ExtendedDiscAddress_DriveNumber]
         RSB     R0,R3,#32
         MOV     R1,R1,LSR R3
         ORR     R1,R1,LR,LSL R0

s/Identify

@@ -911,7 +911,7 @@ SanityCheckEDiscRecord ROUT
         TEQ     r0, r14
  [ DebugL
         BEQ     %FT01
-        DREG    r1, "Failed on RootDir != "
+        DREG    r14, "Failed on RootDir != "
 01
  ]
         BNE     %FT85

s/InitDieSvc

@@ -816,9 +816,14 @@ ReadCaseTables ROUT
 ; >>>>>>>>>>>>
 ; ServiceEntry
 ; >>>>>>>>>>>>
-
- [ ServicePolice
-
+        ASSERT  Service_ClaimFIQ < Service_Memory
+        ASSERT  Service_Memory < Service_Reset
+        ASSERT  Service_Reset < Service_FSRedeclare
+        ASSERT  Service_FSRedeclare < Service_IdentifyDisc
+        ASSERT  Service_IdentifyDisc < Service_EnumerateFormats
+        ASSERT  Service_EnumerateFormats < Service_IdentifyFormat
+        ASSERT  Service_IdentifyFormat < Service_DisplayFormatHelp
+        ASSERT  Service_DisplayFormatHelp < Service_TerritoryStarted
 ServiceTable
         &       0       ; flags word
         &       ServiceEntry2   - Module_BaseAddr
@@ -832,16 +837,12 @@ ServiceTable
         &       Service_IdentifyFormat
         &       Service_DisplayFormatHelp
         &       Service_TerritoryStarted
-
-        &       0
+        &       0       ; terminator
 
         &       ServiceTable    - Module_BaseAddr
- ]
 ServiceEntry ROUT
-        ; Rapid service rejection
- [ ServicePolice
         MOV     r0, r0
- ]
+        ; Rapid service rejection
         TEQ     r1, #Service_ClaimFIQ
         TEQNE   r1, #Service_Memory
         TEQNE   r1, #Service_FSRedeclare
@@ -852,9 +853,7 @@ ServiceEntry ROUT
         TEQNE   r1, #Service_DisplayFormatHelp
         TEQNE   r1, #Service_TerritoryStarted
         MOVNE   pc, lr
- [ ServicePolice
 ServiceEntry2
- ]
         ; Service entry and check for base invocation of FileCore
         Push    "R0-R2,R11,R12,LR"      ;need entry R12 stacked for FSRedeclare
         getSB