Commit c9afa87c authored by Steve Revill's avatar Steve Revill
Browse files

Important change to Hdr:Macros.

Replaced LSL, LSR, etc, macros with myLSL, myLSR, etc. because the old macro
names will clash with pseudo-opcodes that ARM have introduced which in turn will
be supported by newer assemblers.

Admin: this will cause some components to fail to build, especially with the
existing toolchain. If you see these failures, simply replace any uses of these
shift macros with the renamed 'my' shift macros (which are functionally identical).

Version 1.79. Tagged as 'HdrSrc-1_79'
parent a6a7207c
/* (1.78)
/* (1.79)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.78
#define Module_MajorVersion_CMHG 1.79
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 08 Feb 2011
#define Module_Date_CMHG 14 Mar 2011
#define Module_MajorVersion "1.78"
#define Module_Version 178
#define Module_MajorVersion "1.79"
#define Module_Version 179
#define Module_MinorVersion ""
#define Module_Date "08 Feb 2011"
#define Module_Date "14 Mar 2011"
#define Module_ApplicationDate "08-Feb-11"
#define Module_ApplicationDate "14-Mar-11"
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "1.78"
#define Module_HelpVersion "1.78 (08 Feb 2011)"
#define Module_LibraryVersionInfo "1:78"
#define Module_FullVersion "1.79"
#define Module_HelpVersion "1.79 (14 Mar 2011)"
#define Module_LibraryVersionInfo "1:79"
......@@ -417,19 +417,19 @@ $label CMP $reg, #"a"
SUBGE $reg, $reg, #"a"-"A"
MEND
; ***************************************************************
; *** ASL - Generate an instruction which ASLs its argument ***
; ***************************************************************
; *****************************************************************
; *** myASL - Generate an instruction which ASLs its argument ***
; *****************************************************************
MACRO
$label ASL $reg, $val, $cc
$label myASL $reg, $val, $cc
$label MOV$cc $reg, $reg, ASL #$val
MEND
; ***************************************************************
; *** ASL - Generate an instruction which ASRs its argument ***
; ***************************************************************
; *****************************************************************
; *** myASL - Generate an instruction which ASRs its argument ***
; *****************************************************************
MACRO
$label ASR $reg, $val, $cc
$label myASR $reg, $val, $cc
$label MOV$cc $reg, $reg, ASR #$val
MEND
......@@ -1210,19 +1210,19 @@ $label CMP $reg, #"A"
! 0, "Use the Territory Manager for any International-aware code."
MEND
; ***************************************************************
; *** LSL - Generate an instruction which LSLs its argument ***
; ***************************************************************
; *****************************************************************
; *** myLSL - Generate an instruction which LSLs its argument ***
; *****************************************************************
MACRO
$label LSL $reg, $val, $cc
$label myLSL $reg, $val, $cc
$label MOV$cc $reg, $reg, LSL #$val
MEND
; ***************************************************************
; *** LSR - Generate an instruction which LSRs its argument ***
; ***************************************************************
; *****************************************************************
; *** myLSR - Generate an instruction which LSRs its argument ***
; *****************************************************************
MACRO
$label LSR $reg, $val, $cc
$label myLSR $reg, $val, $cc
$label MOV$cc $reg, $reg, LSR #$val
MEND
......@@ -1370,11 +1370,11 @@ $label STM$cond.FD r13!, {$reglist}
]
MEND
; ***************************************************************
; *** ROR - Generate an instruction which RORs its argument ***
; ***************************************************************
; *****************************************************************
; *** myROR - Generate an instruction which RORs its argument ***
; *****************************************************************
MACRO
$label ROR $reg, $val, $cc
$label myROR $reg, $val, $cc
$label
LCLA modval
modval SETA ($val) :AND: &1F
......@@ -1385,11 +1385,11 @@ modval SETA ($val) :AND: &1F
]
MEND
; ***************************************************************
; *** RRX - Generate an instruction which RRXs its argument ***
; ***************************************************************
; *****************************************************************
; *** myRRX - Generate an instruction which RRXs its argument ***
; *****************************************************************
MACRO
$label RRX $reg, $cc
$label myRRX $reg, $cc
$label MOV$cc $reg, $reg, RRX
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