summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2006-04-02 11:43:44 +0000
committerHans-Peter Nilsson <hp@axis.com>2006-04-02 11:43:44 +0000
commitef6affe12fd4fb55107d2510cf0515db1e5af33a (patch)
treef9347b5a7365c1aaa2085dc2b297a7cec2b5d98c
parent4369b6eb6ec890ee344e6f537ff70259f1c19f8e (diff)
downloadbinutils-ef6affe12fd4fb55107d2510cf0515db1e5af33a.tar.gz
binutils-ef6affe12fd4fb55107d2510cf0515db1e5af33a.tar.bz2
binutils-ef6affe12fd4fb55107d2510cf0515db1e5af33a.zip
* sim/cris/asm/testutils.inc (test_h_mem): Use register prefix.
(testr_h_dr, test_h_dr, ldmem_h_gr, mvr_h_mem): Ditto. Correct syntax.
-rw-r--r--sim/testsuite/ChangeLog4
-rw-r--r--sim/testsuite/sim/cris/asm/testutils.inc18
2 files changed, 14 insertions, 8 deletions
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 5d51da4ca2e..85d65485d3b 100644
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2006-04-02 Hans-Peter Nilsson <hp@axis.com>
+ * sim/cris/asm/testutils.inc (test_h_mem): Use register prefix.
+ (testr_h_dr, test_h_dr, ldmem_h_gr, mvr_h_mem): Ditto. Correct
+ syntax.
+
* sim/cris/asm/x0-v10.ms, sim/cris/asm/x0-v32.ms: Widen regexp for
stack pointer values.
diff --git a/sim/testsuite/sim/cris/asm/testutils.inc b/sim/testsuite/sim/cris/asm/testutils.inc
index 06e63c598b6..457d581f734 100644
--- a/sim/testsuite/sim/cris/asm/testutils.inc
+++ b/sim/testsuite/sim/cris/asm/testutils.inc
@@ -89,7 +89,8 @@ _start:
; Store a register into a word in memory
.macro mvr_h_mem reg addr
- move.d \reg,@\addr
+ move.d \addr,$r13
+ move.d \reg,[$r13]
.endm
; Store the current ps on the stack
@@ -104,7 +105,8 @@ _start:
; Load a word value from memory
.macro ldmem_h_gr addr reg
- move.d @\addr,\reg
+ move.d \addr,$r13
+ move.d [$r13],\reg
.endm
; Add 2 general registers
@@ -137,20 +139,20 @@ _start:
; Test the value of an immediate against a dedicated register
.macro test_h_dr val reg
- move.d \reg,r12
- test_h_gr \val r12
+ move \reg,$r12
+ test_h_gr \val $r12
.endm
; Test the value of an general register against a dedicated register
.macro testr_h_dr gr dr
- move.d \dr,r12
- testr_h_gr \gr r12
+ move \dr,$r12
+ testr_h_gr \gr $r12
.endm
; Compare an immediate with word in memory
.macro test_h_mem val addr
- ldmem_h_gr \addr r12
- test_h_gr \val r12
+ ldmem_h_gr \addr $r12
+ test_h_gr \val $r12
.endm
; Compare a general register with word in memory