From: Nick Clifton <nickc@redhat.com>
Date: Sun, 25 Jun 2000 16:49:47 +0000 (+0000)
Subject: Assemble ldmac correctly.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d2104f2ac70c2b10265fb22d9857eb66e3a81721;p=pf3gnuchains%2Fpf3gnuchains3x.git

Assemble ldmac correctly.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b42a606385..0f135ae1ea 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-25  Kazu Hirata  <kazu@hxi.com>
+
+	* config/tc-h8300.c (build_bytes): Assemble ldmac correctly.
+
 2000-06-24  DJ Delorie  <dj@cygnus.com>
 
 	* config/tc-i386.c (md_estimate_size_before_relax): Revert
diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index ab9f7337ca..399cd0e085 100644
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -1026,7 +1026,12 @@ build_bytes (this_try, operand)
 
 	  if (c & MACREG)
 	    {
-	      nib = 2 + operand[d].reg;
+	      if (operand[0].mode == MACREG)
+		/* stmac has mac[hl] as the first operand.  */
+		nib = 2 + operand[0].reg;
+	      else
+		/* ldmac has mac[hl] as the second operand.  */
+		nib = 2 + operand[1].reg;
 	    }
 	}
       nibble_count++;