Resync with allocations database.

Also removed obsolete STASH and GRAB macros.

Version 2.11. Tagged as 'HdrSrc-2_11'

VersionNum

-/* (2.10)
+/* (2.11)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.10
+#define Module_MajorVersion_CMHG        2.11
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                15 Jul 2012
+#define Module_Date_CMHG                20 Jul 2012
 
-#define Module_MajorVersion             "2.10"
-#define Module_Version                  210
+#define Module_MajorVersion             "2.11"
+#define Module_Version                  211
 #define Module_MinorVersion             ""
-#define Module_Date                     "15 Jul 2012"
+#define Module_Date                     "20 Jul 2012"
 
-#define Module_ApplicationDate          "15-Jul-12"
+#define Module_ApplicationDate          "20-Jul-12"
 
 #define Module_ComponentName            "HdrSrc"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Programmer/HdrSrc"
 
-#define Module_FullVersion              "2.10"
-#define Module_HelpVersion              "2.10 (15 Jul 2012)"
-#define Module_LibraryVersionInfo       "2:10"
+#define Module_FullVersion              "2.11"
+#define Module_HelpVersion              "2.11 (20 Jul 2012)"
+#define Module_LibraryVersionInfo       "2:11"

hdr/Macros

@@ -117,8 +117,6 @@ OldOpt  SETA    {OPT}
 ;$label  Error   $errno, $errstr                                Generate an immediate error
 ;$label  ExitSWIHandler $cond                                   Exit macro for SWI handlers
 ;        GetIf   $filename, $cc                                 Get a file conditional on an assembly-time flag
-;$label  GRAB    $reglist, $cond, $hat                          Pull registers from the stack
-;$label  GRABS   $reglist, $cond                                Pull registers from stack with warning
 ;        Immediate $var                                         Set flag if value is immediate
 ;$label  INC     $reg,$by                                       Increment a register (by a value)
 ;$label  INCS    $reg,$by                                       Increment a register (by a value) setting the PSR
@@ -144,7 +142,6 @@ OldOpt  SETA    {OPT}
 ;$label  RRX     $reg, $cc                                      Generate an RRX instruction
 ;$var    SETBCD  $val                                           Convert $var to BCD and assign to variable
 ;$label  ST      $reg,$var,$cc                                  Store word or byte
-;$label  STASH   $reglist, $cond, $hat                          Push registers onto the stack
 ;$label  STRIM   $string                                        Output an immediate string
 ;$Answer StringContains $string,$substring                      Assembly-time INSTR function
 ;$label  Swap    $ra, $rb, $cc                                  Swap two registers
@@ -880,24 +877,6 @@ GetConditionally SETS "; no GET required"
       ]
         MEND
 
-; ************************************
-; ***  GRAB - An old form of Pull  ***
-; ************************************
-        MACRO
-$label  GRAB    $reglist, $cond, $hat
-$label  Pull    "$reglist", $cond, $hat
-        MEND
-
-; **************************************************************************
-; ***  GRABS - Pull registers and restore PSR (if R15 loaded). Use with  ***
-; ***  extreme caution: there are bugs in the 3um ARM (ARM1) with PSR    ***
-; ***  update in non-USR modes.                                          ***
-; **************************************************************************
-        MACRO
-$label  GRABS   $reglist, $cond
-$label  Pull    "$reglist", $cond, ^
-        MEND
-
 ; ******************************************
 ; ***  Immediate - set flag if value is  ***
 ; ***  a valid immediate field value     ***
@@ -1404,14 +1383,6 @@ $label  STR$cc  $reg, $var
         MEND
 
 
-; *************************************
-; ***  STASH - An old form of Push  ***
-; *************************************
-        MACRO
-$label  STASH   $reglist, $cond, $hat
-$label  STM$cond.FD r13!, {$reglist}$hat
-        MEND
-
 ; ***************************************
 ; ***  STRIM - String immediate out.  ***
 ; ***************************************

hdr/NewErrors

@@ -1514,5 +1514,6 @@ ErrorBase_Bar                   #       &100    ; &0081EF00 Steve Revill (ROOL)
 ErrorBase_ZLib                  #       &100    ; &0081F000 Jeffrey Lee - differs from the ROL ZLib error block
 ErrorBase_VFPSupport            #       &100    ; &0081F100 Jeffrey Lee
 ErrorBase_BCMSupport            #       &100    ; &0081F200 John Ballance
+ErrorBase_BootCommands          #       &100    ; &0081F300 Rob Sprowson
         OPT     OldOpt
         END