Avoid unnecessary remainder calculations

Detail:
  s/CtrlUtils, s/OSGBPB - Avoid unnecessary remainder calculations in DivRem macro
Admin:
  Tested on Cortex-A15


Version 2.84. Tagged as 'FileSwitch-2_84'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.83"
-Module_Version          SETA    283
+Module_MajorVersion     SETS    "2.84"
+Module_Version          SETA    284
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "11 Nov 2014"
-Module_ApplicationDate  SETS    "11-Nov-14"
+Module_Date             SETS    "08 May 2016"
+Module_ApplicationDate  SETS    "08-May-16"
 Module_ComponentName    SETS    "FileSwitch"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/FileSwitch"
-Module_FullVersion      SETS    "2.83"
-Module_HelpVersion      SETS    "2.83 (11 Nov 2014)"
+Module_FullVersion      SETS    "2.84"
+Module_HelpVersion      SETS    "2.84 (08 May 2016)"
                         END

VersionNum

-/* (2.83)
+/* (2.84)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.83
+#define Module_MajorVersion_CMHG        2.84
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                11 Nov 2014
+#define Module_Date_CMHG                08 May 2016
 
-#define Module_MajorVersion             "2.83"
-#define Module_Version                  283
+#define Module_MajorVersion             "2.84"
+#define Module_Version                  284
 #define Module_MinorVersion             ""
-#define Module_Date                     "11 Nov 2014"
+#define Module_Date                     "08 May 2016"
 
-#define Module_ApplicationDate          "11-Nov-14"
+#define Module_ApplicationDate          "08-May-16"
 
 #define Module_ComponentName            "FileSwitch"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/FileSwitch"
 
-#define Module_FullVersion              "2.83"
-#define Module_HelpVersion              "2.83 (11 Nov 2014)"
-#define Module_LibraryVersionInfo       "2:83"
+#define Module_FullVersion              "2.84"
+#define Module_HelpVersion              "2.84 (08 May 2016)"
+#define Module_LibraryVersionInfo       "2:84"

s/CtrlUtils

@@ -757,7 +757,7 @@ int_CatExBody Entry "r0-r9", CatExBody_FrameSize
         ADD     r6, r7, r8
         ADD     r6, r6, r0
         SUB     r6, r6, #1
-        DivRem  r5, r6, r0, r14
+        DivRem  r5, r6, r0, r14, norem
         MUL     r6, r0, r5
         SUB     r6, r6, r7
 

s/OSGBPB

@@ -1238,7 +1238,7 @@ Daft_ReadDirEntries Entry "r0-r10" ; FSFunc only preserves r6 up
 
         ADD     r0, r5, r4              ; B+g
         ADD     r9, r3, r4              ; g+m
-        DivRem  r8, r0, r9, r14         ; (B+g)/(g+m) (note we *DO* want the round-down here)
+        DivRem  r8, r0, r9, r14, norem  ; (B+g)/(g+m) (note we *DO* want the round-down here)
         MUL     r8, r4, r8              ; (B+g)/(g+m) * g
         ADD     r2, r2, r8              ; Adjust buffer start
         SUB     r5, r5, r8              ; Adjust buffer length
@@ -1257,7 +1257,7 @@ Daft_ReadDirEntries Entry "r0-r10" ; FSFunc only preserves r6 up
 
         ADD     r0, r5, #2              ; B+g-1
         ADD     r9, r3, #3              ; g+m
-        DivRem  r8, r0, r9, r14         ; (B+g-1)/(B+m)
+        DivRem  r8, r0, r9, r14, norem  ; (B+g-1)/(B+m)
         ADD     r8, r8, r8, ASL #1      ; (B+g-1)/(B+m) * g
         SUB     r5, r5, r8              ; Adjust buffer size only