aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-h8300.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b42a606..0f135ae 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 ab9f733..399cd0e 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++;