* config/tc-mn10300.c (r_registers): Add a0-a3,d0-d3 and e0-e7

        as synonyms for "rN" registers.
        (xr_registers): Add mcrh, mcrl, mcvf, mdrq and sp as synonyms
        for "xrN" registers.
        (md_assemble): Fix typo computing the size of relocations.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7e83865..ee16e57 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+start-sanitize-am33
+Wed Jun 24 09:38:10 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * config/tc-mn10300.c (r_registers): Add a0-a3,d0-d3 and e0-e7
+       as synonyms for "rN" registers.
+       (xr_registers): Add mcrh, mcrl, mcvf, mdrq and sp as synonyms
+       for "xrN" registers.
+       (md_assemble): Fix typo computing the size of relocations.
+
+end-sanitize-am33
 Tue Jun 23 17:47:31 1998  Jim Wilson  <wilson@cygnus.com>
 
        * config/tc-h8300.c (do_a_fix_imm, build_bytes): Replace cast to

diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index 67eef17..ab59b76 100644 (file)
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -141,6 +141,24 @@ static const struct reg_name address_registers[] =
 /* start-sanitize-am33 */
 static const struct reg_name r_registers[] =
 {
+  { "a0", 8 },
+  { "a1", 9 },
+  { "a2", 10 },
+  { "a3", 11 },
+  { "a0", 12 },
+  { "d1", 13 },
+  { "d2", 14 },
+  { "d3", 15 },
+  { "e0", 0 },
+  { "e1", 1 },
+  { "e2", 2 },
+  { "e3", 3 },
+  { "e4", 4 },
+  { "e5", 5 },
+  { "e6", 6 },
+  { "e7", 7 },
+  { "e8", 8 },
+  { "e9", 9 },
   { "r0", 0 },
   { "r1", 1 },
   { "r10", 10 },
@@ -162,6 +180,11 @@ static const struct reg_name r_registers[] =
 
 static const struct reg_name xr_registers[] =
 {
+  { "mcrh", 2 },
+  { "mcrl", 3 },
+  { "mcvf", 4 },
+  { "mdrq", 1 },
+  { "sp", 0 },
   { "xr0", 0 },
   { "xr1", 1 },
   { "xr10", 10 },
@@ -1588,7 +1611,7 @@ keep_going:
              if ((operand->flags & MN10300_OPERAND_SPLIT) != 0)
                reloc_size = 32;
              /* start-sanitize-am33 */
-             if ((operand->flags & MN10300_OPERAND_24BIT) != 0)
+             else if ((operand->flags & MN10300_OPERAND_24BIT) != 0)
                reloc_size = 24;
              /* end-sanitize-am33 */
              else