From fbe1e41fe2fe57e6a0aebac9d3e5f4906ec74985 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 29 Jun 2000 23:44:41 +0000
Subject: [PATCH] Change the registers used in ldmac and stmac tests.

---
 gas/testsuite/ChangeLog           |  6 ++++++
 gas/testsuite/gas/h8300/h8300.exp | 12 ++++++------
 gas/testsuite/gas/h8300/macs.s    | 10 +++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8617f12ec5..52b20dadf7 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-29  Kazu Hirata  <kazu@hxi.com>=0A=
+
+	* gas/h8300/h8300.exp (do_h8300s_mac): Change the registers used
+	in ldmac and stmac.
+	* gas/h8300/macs.s: Likewise.
+
 2000-06-27  Nick Clifton  <nickc@cygnus.com>
 
 	* gas/d30v/bittest.l: Edit to match new warning messages produced
diff --git a/gas/testsuite/gas/h8300/h8300.exp b/gas/testsuite/gas/h8300/h8300.exp
index 2b7d41ec0b..013c55c8b5 100644
--- a/gas/testsuite/gas/h8300/h8300.exp
+++ b/gas/testsuite/gas/h8300/h8300.exp
@@ -2036,12 +2036,12 @@ proc do_h8300s_mac {} {
     # assembled correctly.
     while 1 {
 	expect {
-	    -re " +\[0-9\]+ 0000 01A0\[^\n\]*\n"   { set x [expr $x+1] }
-	    -re " +\[0-9\]+ 0002 0320\[^\n\]*\n"   { set x [expr $x+1] }
-	    -re " +\[0-9\]+ 0004 0331\[^\n\]*\n"   { set x [expr $x+1] }
-	    -re " +\[0-9\]+ 0006 01606D01\[^\n\]*\n"   { set x [expr $x+1] }
-	    -re " +\[0-9\]+ 000a 0220\[^\n\]*\n"   { set x [expr $x+1] }
-	    -re " +\[0-9\]+ 000c 0231\[^\n\]*\n"   { set x [expr $x+1] }
+ 	    -re " +\[0-9\]+ 0000 01A0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 0324\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 0335\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 01606D45\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 0224\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 0235\[^\n\]*\n"   { set x [expr $x+1] }
 	    eof					{ break }
 	}
     }
diff --git a/gas/testsuite/gas/h8300/macs.s b/gas/testsuite/gas/h8300/macs.s
index e2df6ddb65..aee08e00d0 100644
--- a/gas/testsuite/gas/h8300/macs.s
+++ b/gas/testsuite/gas/h8300/macs.s
@@ -2,10 +2,10 @@
 	.text
 h8300s_mac:
 	clrmac
-	ldmac er0,mach
-	ldmac er1,macl
-	mac @er0+,@er1+
-	stmac mach,er0
-	stmac macl,er1
+	ldmac er4,mach
+	ldmac er5,macl
+	mac @er4+,@er5+
+	stmac mach,er4
+	stmac macl,er5