Test/Tester/c/Tester

@@ -684,7 +684,6 @@ int main( int argc, char *argv[] )
                 }
 
                 i++;
-if(i==65536) break;//131 wierd file x{5}PG
         }
 
         logprintf( "current open files are:\nHandle  Name\n" );

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "3.66"
-Module_Version          SETA    366
+Module_MajorVersion     SETS    "3.75"
+Module_Version          SETA    375
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "28 Mar 2015"
-Module_ApplicationDate  SETS    "28-Mar-15"
+Module_Date             SETS    "06 Jul 2017"
+Module_ApplicationDate  SETS    "06-Jul-17"
 Module_ComponentName    SETS    "FileCore"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/FileCore"
-Module_FullVersion      SETS    "3.66"
-Module_HelpVersion      SETS    "3.66 (28 Mar 2015)"
+Module_FullVersion      SETS    "3.75"
+Module_HelpVersion      SETS    "3.75 (06 Jul 2017)"
                         END

VersionNum

-/* (3.66)
+/* (3.75)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        3.66
+#define Module_MajorVersion_CMHG        3.75
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                28 Mar 2015
+#define Module_Date_CMHG                06 Jul 2017
 
-#define Module_MajorVersion             "3.66"
-#define Module_Version                  366
+#define Module_MajorVersion             "3.75"
+#define Module_Version                  375
 #define Module_MinorVersion             ""
-#define Module_Date                     "28 Mar 2015"
+#define Module_Date                     "06 Jul 2017"
 
-#define Module_ApplicationDate          "28-Mar-15"
+#define Module_ApplicationDate          "06-Jul-17"
 
 #define Module_ComponentName            "FileCore"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/FileCore"
 
-#define Module_FullVersion              "3.66"
-#define Module_HelpVersion              "3.66 (28 Mar 2015)"
-#define Module_LibraryVersionInfo       "3:66"
+#define Module_FullVersion              "3.75"
+#define Module_HelpVersion              "3.75 (06 Jul 2017)"
+#define Module_LibraryVersionInfo       "3:75"

s/BigDirCode

@@ -116,11 +116,13 @@ SanityCheckBigDirHeader ROUT
  ]
         BNE     %FT95
 
-        MOVS    r1, lr, LSR #22
+        ASSERT  BigDirMaxSize = 1:SHL:22
+        SUB     r1, lr, #1              ; can be equal to BigDirMaxSize though
+        MOVS    r1, r1, LSR #22
 
  [ DebugX
         BEQ     %FT01
-        DLINE   "Failed at BigDirSize too large"
+        DLINE   "Failed at BigDirSize too large (or zero)"
 01
  ]
 
@@ -867,7 +869,7 @@ LookUpBigDir    ROUT
         DREG    r4, "r4 : "
  ]
 
-        DivRem  r8, lr, r9, r4                  ; r8 = offset into dir
+        DivRem  r8, lr, r9, r4, norem           ; r8 = offset into dir
 
  [ DebugXb
         DREG    r8, "init offset: "
@@ -1439,7 +1441,10 @@ GrowBigDir ROUT
 ; first of all, ensure have enough memory for dir of required size
         SUB     R4, R6, R5              ; current dir size
         ADD     R4, R4, #BigDirMinSize  ; add a bit to it
-        BL      TryGrowDirBuf
+        CMP     R4, #BigDirMaxSize      ; clear V
+        MOVHI   R0, #DirFullErr
+        BLHI    SetV
+        BLVC    TryGrowDirBuf
         BVS     %FT99
 
 ; loop back to here when need to move more files
@@ -1450,8 +1455,8 @@ GrowBigDir ROUT
         SUB     R4, R6, R5
         ADD     R4, R4, #BigDirMinSize  ; size required
         BL      DiscAddToRec            ;(R3->LR) get disc record
-        LDR     R7, [LR, #DiscRecord_Log2SectorSize]   ; sector size
-        LDR     LR, [LR, #DiscRecord_BigMap_ShareSize]    ; share size
+        LDRB    R7, [LR, #DiscRecord_Log2SectorSize]   ; sector size
+        LDRB    LR, [LR, #DiscRecord_BigMap_ShareSize]    ; share size
         ADD     R7, R7, LR
         MOV     R11, #1
         RSB     R11, R11,R11,LSL R7
@@ -1481,7 +1486,7 @@ GrowBigDir ROUT
         TEQS    R5, #0
         TEQEQS  R4, #0
         BEQ     %FT25           ;end of list marker found
-        MOVS    R5, R5, LSR #9  ;link bits
+        MOVS    R5, R5, LSR #9  ;link bits from word 1 bits 9-31
         ADDCS   R5, R5, R3, LSR #8
         RSBCC   R5, R5, R3, LSR #8
  [ DebugXg
@@ -2461,6 +2466,7 @@ DoOsFunRenameBigDir ROUT
         BL      CanBigDirShrink
         BLEQ    ShrinkBigDir
 14
+        STRVS   R0, [SP]
         Pull    "R0,R1,R2,R3,R4,R6,R7,PC"
 
 

s/Commands

@@ -3131,7 +3131,7 @@ Map_Code ROUT
 ; r0 = 0 - not a new filecore disc
 ; r0 = 1 - big dirs, small map
 ; r0 = 2 - big map, small dirs, this case is only valid for IdLen=16
-; r0 = 3 - bit map, big dirs
+; r0 = 3 - big map, big dirs
         TEQS    r0, #1
         baddr   r0, MC4, EQ     ;(   start,  length) new map, big directories
         BEQ     %FT07
@@ -3199,10 +3199,15 @@ Map_Code ROUT
  [ BigDisc ; SBP: Thu 15th December 1994 - walked thru, doesn't seem
 ; to support >4G discs.  Changed to support them.
         Push    "R1,R2"
-        LDR     R1, [R10, #ZoneHead+DiscRecord_BigMap_DiscSize2]    ; discsize2 field
+        BL      DiscAddToRec            ;(R3->LR)
+        LDRB    R1, [LR, #DiscFlags]
+        TSTS    R1, #OldMapFlag
+        BNE     %FT18                   ; old map, indirect disc addresses are in bytes already
+        LDR     R1, [LR, #DiscRecord_BigMap_DiscSize2]
         MOVS    R1, R1
+        LDRB    LR, [LR, #DiscRecord_Log2SectorSize]
+        MOVEQ   R0, R0, LSL LR
         BEQ     %FT18                   ; small disc
-        LDRB    LR,[R10,#ZoneHead+DiscRecord_Log2SectorSize]   ; sector size
         MOV     R1, R0,LSL LR
         RSB     LR, LR, #32
         MOVS    R0, R0, LSR LR
@@ -3221,13 +3226,7 @@ Map_Code ROUT
         SUBS    R0, R0, #1
         BNE     %BT17
         MOV     R0, R1
-        BL      PutHex2
-        B       %FT19
-
-; here when small disc
 18
-        LDRB    LR,[R10,#ZoneHead+DiscRecord_Log2SectorSize]   ; sector size
-        MOV     R0, R0, LSL LR
         BL      PutHex2
 ; here when finished address and want to do length
 19
@@ -3553,7 +3552,7 @@ Verify_Code ROUT
         MOV     r9,r0
         BL      MapPtrToDiscAdd
         SUB     r4,r0,r2
-        LDR     lr,[r10,#ZoneHead+DiscRecord_Log2SectorSize]
+        LDRB    lr,[r10,#ZoneHead+DiscRecord_Log2SectorSize]
         MOV     r4,r4,LSL lr
         MOV     r0,r9
         CMP     r4,#1024*1024*1024

s/Defns

@@ -182,7 +182,12 @@ DrvsFsMap aw 4  ;ptr to free space maps
  ]
 BadFs   bit 31  ;set if corrupt on disc
 EmptyFs bit 30  ;set if FS map buffer empty for old maps
-FsMapMaxSize    * 4*1024*1024
+FsMapMaxObjects * 1:SHL:MaxIdLenBigMap
+FsMapMinObjBits * MaxIdLenBigMap+1
+FsMapZoneSpareBits * 64*8192 ; a lavish ZoneSpare and NZones value
+                             ; only relevant in the maximal map case
+FsMapMaxBits    * (FsMapMinObjBits * FsMapMaxObjects) + FsMapZoneSpareBits
+FsMapMaxSize    * FsMapMaxBits:SHR:3
  [ DynamicMaps
 MemErrorFs bit 29       ;set if failed to load FSmap due to errors with dynamic areas
 NewHiFsBits     * BadFs :OR: EmptyFs
@@ -259,6 +264,8 @@ Check1          # 1     ;checksum on sector 1
 ; New map
 
 MaxFreeLinkBits * 15    ; Though 'BigMaps' extend this limit
+MaxIdLenSmlMap  * 15
+MaxIdLenBigMap  * 21
 
 ZoneDiscRecSz   * 60    ;reserve additional bytes
 Zone0Bits       * ZoneDiscRecSz*8

s/FileCore15

@@ -433,6 +433,7 @@ GenIndDiscOp
         DREG    r3," disc address is "
         Pull    "r0"
  ]
+        AND     r3, r3, #DiscBits       ;with IdLen=21 be careful to not set C during TEQ
         TEQ     lr, r3, LSR #(32-3)
         BEQ     %FT52
 

s/FileCore20

@@ -776,8 +776,10 @@ MountDiscOnDrive ROUT
         ASSERT  DiscRecord_DiscName = DiscRecord_DiscId + 2
         STR     lr, [r5, #DiscRecord_DiscId]
  [ BigDisc
+        ; DiscSize2
         STR     lr, [r5,#DiscRecord_BigMap_DiscSize2]
  [ BigShare
+        ; ShareSize
         STR     lr, [r5,#DiscRecord_BigMap_ShareSize]
  ]
  ]
@@ -1798,11 +1800,16 @@ Mount
         BNE     %FT10
       ]
 
-        MOV     r2, #DefectListDiscAdd
+      [ BigSectors
+DefectListDiscAligned * (DefectListDiscAdd:SHR:12):SHL:12 ; Round DLDA down to nearest whole sector
+      |
+DefectListDiscAligned * (DefectListDiscAdd:SHR:10):SHL:10 ; Round DLDA down to nearest whole sector
+      ]
+        MOV     r2, #DefectListDiscAligned
         ORR     r2, r2, r1, ASL #(32-3)
         EOR     r2, r2, #bit31
         MOV     r3, #ScratchSpace
-        MOV     r4, #SzDefectList
+        LDR     r4, =DefectListDiscAdd - DefectListDiscAligned + SzDefectList
 10
 
  [ DebugL
@@ -1838,12 +1845,14 @@ Mount
 
         Push    "r0,r1"
         MOV     r0, #ScratchSpace
+        ADD     r0, r0, #DefectListDiscAdd - DefectListDiscAligned
         MOV     r1, #SzDefectList
         BL      CheckSum
         BVS     %FT15
 
         ; Pick up heads/sectorsize/secspertrk/density/lowsector/DiscSize from read block
         MOV     r4, #ScratchSpace
+        ADD     r4, r4, #DefectListDiscAdd - DefectListDiscAligned
         ADD     r4, r4, #DefectStruc
 
         ; Density <= DensityOctal
@@ -1864,11 +1873,15 @@ Mount
         BEQ     %FT15
         STRB    lr, [r5, #DiscRecord_SecsPerTrk]
 
-        ; 256 <= SectorSize <= 1024
+        ; 256 <= SectorSize <= upper limit
         LDRB    lr, [r4, #DiscRecord_Log2SectorSize]
         CMP     lr, #8
         BLO     %FT15
-        CMP     lr, #10
+      [ BigSectors
+        CMP     lr, #12         ; upper limit 4k
+      |
+        CMP     lr, #10         ; upper limit 1k
+      ]
         BHI     %FT15
         STRB    lr, [r5, #DiscRecord_Log2SectorSize]
 

s/FileCore25

@@ -217,25 +217,13 @@ FindDirCommon
         MOV     R7, R3          ;save dir disc address
         MOV     R8, R5          ;save dir buffer ptr
 
- [ Debug6
-  [ BigDir
-        CMP     R4, #0
-        BEQ     %FT01
-  ]
-        DREG    R5, "Going to read dir to start, end:",cc
-        DREG    R6, ","
-  [ BigDir
-01
-  ]
- ]
-
   [ BigDir
         ; if it's big dir, then things get a lil' harder
 
         CMP     R4, #0
         BNE     %FT70
 
-        MOV     R4, #NewDirSize         ; get the first 2048 bytes
+        MOV     R4, #BigDirMinSize      ; get the first 2048 bytes
 
         ADD     r6,r4,r5                ; end
 
@@ -278,7 +266,16 @@ FindDirCommon
 
 66
 
-        MOV     r5, #NewDirSize                 ; start offset
+        MOV     r5, #BigDirMinSize              ; start offset
+      [ BigSectors
+        MOV     lr, r7, LSR #(32-3)
+        DiscRecPtr lr, lr
+        LDRB    lr, [lr, #DiscRecord_Log2SectorSize]
+        MOV     r5, r5, LSR lr
+        MOV     r5, r5, LSL lr                  ; round down to nearest sector for DiscOp
+        MOV     r3, r3, LSR lr
+        MOV     r3, r3, LSL lr                  ; round dir buf offset similarly
+      ]
         SUBS    r4, r4, r5                      ; amount of data to read
 
 
@@ -301,6 +298,11 @@ FindDirCommon
 70
   ]
 
+ [ Debug6
+        DREG    R5, "Going to read dir to start, end:",cc
+        DREG    R6, ","
+ ]
+
         MOV     R1, #DiscOp_ReadSecs ;ALLOW ESCAPE AND TIMEOUT
         MOV     R2, R3
         MOV     R3, R5

s/FileCore30

@@ -346,6 +346,53 @@ FindBuffer ROUT
  ]
         BLNE    %FT90
 
+        ; With modern kernels not supporting free pool locking, our original
+        ; tactic of just claiming free space without actively growing DAs isn't
+        ; going to work, because we no longer have the free pool to fall back on
+        ; as a source of 'infinite' free memory.
+        ; So if we've failed to find enough free space, and claiming from the
+        ; RMA is allowed, try growing the RMA to be large enough and then give
+        ; it another chance.
+        CMP     R11, R5                 ;failed to get min length
+        CMPLO   R9, #1                  ;and haven't claimed any yet
+        BHS     %FT17
+        TST     R4, #1 :SHL: UseRmaHeap ;and RMA available
+        BEQ     %FT17
+        ; Try and limit max claim to 1MB so that we don't completely empty the
+        ; free pool. I.e. claim max(min(1MB,max_length),min_length)
+        CMP     R6, #1 :SHL: 20
+        MOVHS   R1, #1 :SHL: 20
+        MOVLO   R1, R6
+        CMP     R1, R5
+        MOVLO   R1, R5
+        ; Round up to size multiple
+        ADD     R1, R1, R7
+        BIC     R1, R1, R7
+        ; Add safety net to ensure background claimants have a little bit of
+        ; free memory to work with
+        ADD     R1, R1, #4096
+        ; Grow dynamic area (will probably leave us with more space than we
+        ; need, but will avoid us claiming all the spare heap space and causing
+        ; issues for background claimants)
+        MOV     R0, #1
+ [ DebugD
+        DREG    R1, "trying to grow RMA by "
+ ]
+        SWI     XOS_ChangeDynamicArea
+ [ DebugD
+        DREG    R1, "managed to grow RMA by "
+ ]
+        ; Check RMA again if any grow was performed
+        CMP     R1, #0
+        BEQ     %FT17
+        MOV     R0, #ModHandReason_RMADesc
+        BL      OnlyXOS_Module          ;(R0->R0,R2,R3,V)
+        BVS     %FT17
+        SUBS    r2, r2, #2048
+        MOVGT   R0, #UseRmaHeap
+        BLGT    %FT90
+
+17
         TSTS    R4, #DiscOp_Op_ScatterList_Flag
         BEQ     %FT20
         TEQS    R11,#0                  ;scatter case, claim any
@@ -444,7 +491,7 @@ Sink
         MOV     R0, #FSControl_StartApplication ; Start parent module up as application
         baddr   R1, anull               ; command tail
         LDR     R2, ParentBase          ; CAO pointer
-        LDR     R3, [R2, #Module_Title] ; command name
+        LDR     R3, [R2, #Module_TitleStr] ; command name
         BL      OnlyXOS_FSControl
         MOV     R1, #AppSpaceStart
         BIC     R4, R4, #1 :SHL: UseApplicArea
@@ -1310,8 +1357,7 @@ InternalFromParent
 ; Error occurred - let's convert (if necessary) from old scheme to new.
         LDR     LR, FS_Flags
         TSTS    LR, #CreateFlag_NewErrorSupport
-        BNE     %FT95
-        Pull    "R1,PC",NE
+        BNE     %FT95                           ; Child returns new style errors
         TSTS    R0, #DiscErrorBit
         BNE     %FT50
         TSTS    R0, #ExternalErrorBit
@@ -1347,9 +1393,9 @@ InternalFromParent
         MOV     LR, R4, LSR R0
         MOV     R4, R4, LSL R3
 70
-        ASSERT  NewDiscErrorBit < bit2          ; STM ignores bits 0 and 1 :)
-        ADR     R0, ConvDiscErr+NewDiscErrorBit
-        STMIA   R0, {R2, R4, LR}
+        ADR     R0, ConvDiscErr
+        STMIA   R0, {R2, R4, LR}                ; Fabricated new style error
+        ORR     R0, R0, #NewDiscErrorBit
         Pull    "R2-R4"
 95
         RestPSR R1,,f

s/FileCore31

@@ -122,14 +122,14 @@ NewClaimFree ROUT
         TEQS    R5, #0
         TEQEQS  R4, #0
         BEQ     %FT06           ;end of list marker found
-        MOVS    R5, R5, LSR #9  ;link bits
+        MOVS    R5, R5, LSR #9  ;link bits from word 1 bits 9-31
  |
         LDRB    R4, [R8]        ;index in dir
         LDRB    R0, [R8,#1]     ;sharing offset in frag
         LDR     R5, [R8],#4
         TEQS    R5, #0
         BEQ     %FT06           ;end of list marker found
-        MOVS    R5, R5, LSR #17 ;link bits
+        MOVS    R5, R5, LSR #17 ;link bits from bits 17-31
  ]
         ADDCS   R5, R5, R3, LSR #8
         RSBCC   R5, R5, R3, LSR #8
@@ -404,12 +404,30 @@ MultiBit        bit 30
         BL      Log2AllocBits   ;(->LR)
         MOV     R2, LR
 
-        ASSERT  ?ScratchSpace>=16*K
-        MOV     R0, #ScratchSpace
         LDRB    R1, [R10,#ZoneHead+DiscRecord_Log2SectorSize]
         MOV     R5, #8*2
         MOV     R1, R5,LSL R1
         MOV     R1, R1,LSR R2
+      [ BigSectors
+        CMP     R1, #?ScratchSpace
+        MOVLS   R0, #ScratchSpace
+        BLS     %FT28           ;table can fit in scratch space
+
+        Push    "R2-R3"
+        MOV     R3, R1          ;search for a buffer (not ScratchSpace, of course)
+        MOV     R2, R1
+        MOV     R0, #(1:SHL:UseSpareScreen) :OR: (1:SHL:UseWimpFree) :OR: \
+                     (1:SHL:UseRmaHeap) :OR: (1:SHL:UseSysHeap)
+        BL      FindBuffer      ;(R0-R3->R0-R3,V)
+        MOVVC   R0, R1
+        MOVVC   R1, R2
+        Pull    "R2-R3"
+        BVS     %FT95
+28
+      |
+        ASSERT  ?ScratchSpace>=16*K
+        MOV     R0, #ScratchSpace
+      ]
         BL      ZeroRam         ;init tables of gap frequencies
         ADD     R1, R0, R1,LSR #1
         MOV     R5, #0  ;init total gaps between ptrs
@@ -432,9 +450,11 @@ PreFirstGap     # 4
 FirstGap        # 4
 LastGap         # 4
 LastSize        # 4
+FoundBuffer     # 4
 AllocWork2      # 0
 
-        Push    "R3, R6-R12"    ;save dir & reserve 28 bytes stack space
+        Push    "R0"            ;save buffer (for ReturnBuffer)
+        Push    "R3,R6-R12"     ;save dir & reserve stack space
         BL      NextFree        ;(R10,R11->R9, R11,Z,C)
  [ BigMaps
         BLNE    FreeRdLenBits   ;(R10,R11->R7)
@@ -528,7 +548,8 @@ AllocWork2      # 0
 42                              ;IF R9 short of total
         MOV     R7, R9, LSR R2
         SUB     LR, R1, R7
-        CMPS    LR, #ScratchSpace
+        LDR     R0, FoundBuffer
+        CMPS    LR, R0
         LDRGTB  R0, [R1, R7]
         LDRGTB  LR, [R1,-R7]
         TEQGTS  R0, LR          ;AND unused gap of size R9 exists (GT preserves N=V=0)
@@ -572,7 +593,7 @@ AllocWork2      # 0
         LDR     R0, FirstGap+(2*4)      ;calc map ptr diff+zone diff*2^24
         LDR     R1, LastGap+(2*4)
         SUB     R9, R1, R0
-        LDR     R3, [R10,#ZoneHead+DiscRecord_Log2SectorSize]
+        LDRB    R3, [R10,#ZoneHead+DiscRecord_Log2SectorSize]
         ADD     R3, R3, #3              ;log2 bits in a zone
         MOV     R0, R0, LSR R3
         MOV     R1, R1, LSR R3
@@ -723,6 +744,11 @@ AllocWork2      # 0
 87
         MOV     R0, #0
 88
+      [ BigSectors
+        LDR     LR, FoundBuffer ;if FindBuffer used, free it
+        TEQ     LR, #ScratchSpace
+        BLNE    ReturnBuffer
+      ]
         ADD     SP, SP, #:INDEX:AllocWork2
         B       %FT93
 
@@ -730,6 +756,11 @@ AllocWork2      # 0
         BIC     R6, R6, #WasteBit
         ADD     R1, R4, R6              ;gap length in map bits
         LDR     R6, PreBestPtr
+      [ BigSectors
+        LDR     LR, FoundBuffer ;if FindBuffer used, free it
+        TEQ     LR, #ScratchSpace
+        BLNE    ReturnBuffer
+      ]
         ADD     SP, SP, #:INDEX:AllocWork2
 90
         BL      DefFindIdThenClaim      ;(R3,R4,R6,R10->R2,R5,R11)

s/FileCore32

@@ -64,9 +64,9 @@ PostId          * 12
 PostFrag        * 16    ;map offset of start of fragment after gap
 GapOff          * 20    ;map offset of start of gap
 JoinNext        * 24
-GapEntrySz  * 28
+GapEntrySz      * 28
 GapFrags        # MaxGaps*GapEntrySz
-;entry of 7 words for each gap, used to choose which fragment to move with
+;entry of 8 words for each gap, used to choose which fragment to move with
 ;eventual aim of causing two gaps to join
 ;IF JoinNext<=2 this gap can't be joined to next gap by moving fragments to
 ;earlier gap since it is either first/last gap or defects separate them
@@ -184,8 +184,8 @@ CompactZone ROUT
         BLS     %FT14           ;if defect or out of zone
  [ BigMaps
         ASSERT  IdHashLen=6*K
-        BIC     R0, R5, #&FF000
-        BIC     R0, R0, #  &800
+        BIC     R0, R5, #&3F0000
+        BIC     R0, R0, #  &F800
         ADD     R0, R0, R0, LSL #1      ; multiply by three, to address entry in table
         ADD     R0, R0, #IdHash
         LDRB    R1, [R0,#0]             ; then get first value
@@ -270,9 +270,9 @@ CompactZone ROUT
 
  [ BigMaps
         ASSERT  IdHashLen=6*K
-        BIC     R0, R8, #&FF000
-        BIC     R0, R0, #&00800
-        ADD     R0, R0, R0, LSL #2
+        BIC     R0, R8, #&3F0000
+        BIC     R0, R0, #&00F800
+        ADD     R0, R0, R0, LSL #1
         ADD     R0, R0, #IdHash
         LDRB    R1, [R0]
         LDRB    LR, [R0, #1]
@@ -342,7 +342,7 @@ CompactZone ROUT
         LDRB    LR, [R5], #1
         ORR     R3, R3, LR, LSL #16
         TSTS    R3, R4
-        |
+ |
         LDR     R3, [R5],#4
         TSTS    R3, R4
  ]
@@ -384,11 +384,11 @@ CompactZone ROUT
 Stacked1 * 10*4
         Push    "R1-R5,R7-R9,R11,LR"
  [ BigMaps
-        MOV     R3, R3, LSL #(32-19)    ;mask to bottom 19 bits
-        MOV     R3, R3, LSR #(32-19)
+        MOV     R3, R3, LSL #(32-MaxIdLenBigMap)    ;mask id bits
+        MOV     R3, R3, LSR #(32-MaxIdLenBigMap)
  |
-        MOV     R3, R3, LSL #17           ;mask to bottom 15 bits
-        MOV     R3, R3, LSR #17
+        MOV     R3, R3, LSL #(32-MaxIdLenSmlMap)    ;mask id bits
+        MOV     R3, R3, LSR #(32-MaxIdLenSmlMap)
  ]
         MOV     R7, #GapFrags
 26
@@ -1773,7 +1773,7 @@ DoCompMoves ROUT
  ]
         Pull    "R0-R2,R4-R11,PC"
 
- |
+ | ; Optimised version of DoCompMoves below
 
 ; ===========
 ; DoCompMoves
@@ -1825,11 +1825,11 @@ DoCompMoves ROUT
         LDR     R3, [R3,#DiscRecord_Root]
         MOV     R4, R9
 
+ [ BigDisc
 ; get the zone base address from the first move, and squirrel
 ; it away.  Also place it in a spare register to help with
 ; generation of offsets.
 
- [ BigDisc
         LDR     R11,[R4,#MoveDest]      ; get a move address
         BL      MapPtrToZoneBase        ; get base address of zone
         ADR     LR, DoCompZoneBase      ;

s/FileCore45

@@ -486,7 +486,7 @@ DoOsFileCreateDir ROUT
         BVS     %FT99                   ; don't yet know how to grow big dirs!
         BL      BeforeAlterFsMap        ; (R3->R0,V)
         BVS     %FT99
-        MOV     R10, #NewDirSize        ; minimum size of a big dir is NewDirSize
+        MOV     R10, #BigDirMinSize     ; minimum size of a big dir
         BL      ClaimFreeSpace          ; (R3,R10->R0,R2,V)
         BVS     %FT95                   ; couldn't claim free space
         BL      TryCacheDirBuf          ; (R3) we'll create dir in the dir buffer
@@ -632,8 +632,7 @@ SaveCreate ROUT
         BL      TestBigDir      ;test if it's a bigdir
         BNE     %FT01
         BL      IsBigDirFull    ;(R1,R3,R5->R0,V)
-        BVC     %FT02           ;dir has space
-        BL      GrowBigDir      ;try to grow the directory
+        BLVS    GrowBigDir      ;try to grow the directory if no space
         B       %FT02
 01
         BL      IsDirFull       ;(R3,R5,R6->R0,V)

s/Identify

@@ -730,23 +730,23 @@ SanityCheckEDiscRecord ROUT
         BNE     %FT85
 
  [ BigMaps
-        ; Check 0 < idlen < 20
+        ; Check idlen <= MaxIdLenBigMap
         LDRB    r0, [sp, #DiscRecord_IdLen]
-        CMP     r0, #19
+        CMP     r0, #MaxIdLenBigMap
 
  [ DebugL
         BLS     %FT01
-        DLINE   "Failed on idlen >= 20"
+        DLINE   "Failed on idlen valid for big map"
 01
  ]
 
  |
-        ; Check 0 < idlen < 16
+        ; Check idlen <= MaxIdLenSmlMap
         LDRB    r0, [sp, #DiscRecord_IdLen]
-        CMP     r0, #15
+        CMP     r0, #MaxIdLenSmlMap
  [ DebugL
         BLS     %FT01
-        DLINE   "Failed on idlen >= 16"
+        DLINE   "Failed on idlen valid for small map"
 01
  ]
 
@@ -769,7 +769,7 @@ SanityCheckEDiscRecord ROUT
         SUB     r1, r1, r0, LSR #16     ; map bits per sector
         LDRB    r0, [sp, #DiscRecord_IdLen]
         ADD     r0, r0, #1
-        DivRem  r2, r1, r0, lr          ; r2 = max objects per zone
+        DivRem  r2, r1, r0, lr, norem   ; r2 = max objects per zone
  [ BigMaps
         LDRB    r0, [sp, #DiscRecord_NZones]
         LDRB    r1, [sp, #DiscRecord_BigMap_NZones2]    ; r1 is the target for the MUL below
@@ -801,8 +801,8 @@ SanityCheckEDiscRecord ROUT
 
  [ BigMaps
         ; if BigMaps then idlen can be more than MaxFreeLink, so test against
-        ; MaxFreeLink (we're being paranoid here, since maximum sector is 1024
-        ; bytes, needing 13 link bits)
+        ; MaxFreeLink (we're being paranoid here, since maximum sector is 4096
+        ; bytes, needing 15 link bits)
 
         CMP     r2, #MaxFreeLinkBits
         MOVHI   r2, #MaxFreeLinkBits
@@ -833,8 +833,8 @@ SanityCheckEDiscRecord ROUT
  [ BigMaps
 
         LDRB    r1, [sp, #DiscRecord_IdLen]
-        CMP     r1, #15
-        BHI     %FT10
+        CMP     r1, #MaxIdLenSmlMap
+        BHI     %FT10                   ; tests for BigMap
 
         LDRB    r1, [sp, #DiscRecord_BigDir_DiscVersion]
         TEQS    r1, #0

s/InitDieSvc

@@ -382,8 +382,7 @@ InitEntry ROUT          ; NO REENTRANCY CHECK NEEDED
  [ DynamicMaps
 
         ; if we're using dynamic areas for the free space maps, then the
-        ; map for each configured drive is created as a dynamic area, with
-        ; a maximum size of 4096K
+        ; map for each configured drive is created as a dynamic area
 
         SUB     SP, SP, #256+4
 
@@ -635,7 +634,7 @@ DieEntry
 
         ; Delete the parent of this incarnation (eg ADFS)
         LDR     R1, ParentBase
-        LDR     R0, [R1,#Module_Title]
+        LDR     R0, [R1,#Module_TitleStr]
         ADD     R1, R1, R0
         MOV     R0, #ModHandReason_Delete
         SWI     XOS_Module

s/MyMacros

@@ -223,6 +223,10 @@ CaseConvertType SETS   "$Type"
         ASSERT  CaseConvertType = "Upper"
         CMP     $UR, #BadPtr
         LDRNEB  $Reg, [$UR, $Reg]
+        BNE     %FT01
+        ASCII_UpperCase $Reg, $UR
+        MOV     $UR, #BadPtr ; Restore $UR after use as a temp register
+01
         MEND