Assemble ldmac correctly.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b42a6063851a34d52426a3b5f9e6a9a44ce014f6..0f135ae1eabe8e50216bcb69adc1b6ba7bdb33b5 100644 (file)
--- 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 ab9f7337cae55f3f982d7ca1bb586b1306715939..399cd0e085d3b6914f00cc31a88a72dbc736fef8 100644 (file)
--- 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++;