From ef6affe12fd4fb55107d2510cf0515db1e5af33a Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Sun, 2 Apr 2006 11:43:44 +0000
Subject: [PATCH] 	* 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/testsuite/ChangeLog                  |  4 ++++
 sim/testsuite/sim/cris/asm/testutils.inc | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 5d51da4ca2..85d65485d3 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 06e63c598b..457d581f73 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