Commit b732bf72 authored by Stuart Swales's avatar Stuart Swales Committed by ROOL
Browse files

Suppress warnings when UAL is in use

Detail:
  APCS Return macro changed when UAL is in use to remove warnings.
  Push and Pull in Hdr:Macros also changed for UAL.
  PullAPCS and single register push/pull substitute Push and Pull macros.

Version 2.96. Tagged as 'HdrSrc-2_96'
parent e176d8d2
/* (2.95) /* (2.96)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 2.95 #define Module_MajorVersion_CMHG 2.96
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 May 2021 #define Module_Date_CMHG 27 Nov 2021
#define Module_MajorVersion "2.95" #define Module_MajorVersion "2.96"
#define Module_Version 295 #define Module_Version 296
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "31 May 2021" #define Module_Date "27 Nov 2021"
#define Module_ApplicationDate "31-May-21" #define Module_ApplicationDate "27-Nov-21"
#define Module_ComponentName "HdrSrc" #define Module_ComponentName "HdrSrc"
#define Module_FullVersion "2.95" #define Module_FullVersion "2.96"
#define Module_HelpVersion "2.95 (31 May 2021)" #define Module_HelpVersion "2.96 (27 Nov 2021)"
#define Module_LibraryVersionInfo "2:95" #define Module_LibraryVersionInfo "2:96"
...@@ -39,9 +39,9 @@ $label PullAPCS $reglist, $cond ...@@ -39,9 +39,9 @@ $label PullAPCS $reglist, $cond
! 1, "PullAPCS must pull PC at the end. Use Pull instead" ! 1, "PullAPCS must pull PC at the end. Use Pull instead"
] ]
[ {CONFIG}=26 [ {CONFIG}=26
$label LDM$cond.FD sp!, {$reglist}^ $label Pull "$reglist", $cond, ^
| |
$label LDM$cond.FD sp!, {$reglist} $label Pull "$reglist", $cond
] ]
MEND MEND
...@@ -116,13 +116,13 @@ Temps SETS Temps :CC: "," ...@@ -116,13 +116,13 @@ Temps SETS Temps :CC: ","
Temps SETS Temps :CC: "," Temps SETS Temps :CC: ","
] ]
[ "$Base" = "fpbased" [ "$Base" = "fpbased"
[ {UAL}
LDMDB$CC fp, {$Temps.fp,sp,pc}
|
LDM$CC.DB fp, {$Temps.fp,sp,pc} LDM$CC.DB fp, {$Temps.fp,sp,pc}
]
| |
[ Temps = "" Pull "$Temps.pc", $CC
LDR$CC pc, [sp], #4
|
LDM$CC.FD sp!, {$Temps.pc}
]
] ]
] ]
] ]
......
...@@ -1331,6 +1331,13 @@ $slave # ?$master ...@@ -1331,6 +1331,13 @@ $slave # ?$master
; ***************************************** ; *****************************************
MACRO MACRO
$label Pull $reglist, $cond, $hat $label Pull $reglist, $cond, $hat
[ {UAL}
[ "$hat"=""
$label POP$cond {$reglist}
|
$label LDMFD$cond r13!, {$reglist}$hat
]
|
; loop to find "-" or "," in reglist - if ; loop to find "-" or "," in reglist - if
; not we can optimise a single-register ; not we can optimise a single-register
; load to be faster on SA, ARM9. ; load to be faster on SA, ARM9.
...@@ -1350,6 +1357,7 @@ $label LDR$cond $reglist, [r13], #4 ...@@ -1350,6 +1357,7 @@ $label LDR$cond $reglist, [r13], #4
| |
$label LDM$cond.FD r13!, {$reglist}$hat $label LDM$cond.FD r13!, {$reglist}$hat
] ]
]
MEND MEND
; ***************************************** ; *****************************************
...@@ -1357,6 +1365,9 @@ $label LDM$cond.FD r13!, {$reglist}$hat ...@@ -1357,6 +1365,9 @@ $label LDM$cond.FD r13!, {$reglist}$hat
; ***************************************** ; *****************************************
MACRO MACRO
$label Push $reglist, $cond $label Push $reglist, $cond
[ {UAL}
$label PUSH$cond {$reglist}
|
LCLS temps LCLS temps
LCLL onereg LCLL onereg
temps SETS "$reglist" temps SETS "$reglist"
...@@ -1372,6 +1383,7 @@ $label STR$cond $reglist, [r13, #-4]! ...@@ -1372,6 +1383,7 @@ $label STR$cond $reglist, [r13, #-4]!
| |
$label STM$cond.FD r13!, {$reglist} $label STM$cond.FD r13!, {$reglist}
] ]
]
MEND MEND
; ***************************************************************** ; *****************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment