Match r[0..7]_bank operands before normal operands.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 36e055e746deb6f4bf0e71d970c02c2e72045b47..bc68639459c5b6ec9478e56b00c4cd2708b16152 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-15  Jonathan Larmour  <[email protected]>
+
+       * config/tc-sh.c (parse_reg): Match r[0..7]_bank operands before
+       normal operands.
+
 2000-03-15  Kazu Hirata  <[email protected]>
 
        * config/tc-h8300.c: Add ATTRIBUTE_UNUSED as appropriate.

diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 66dbb5b38c30d12029c0f7f01cb4698d60682285..7d9fb6871c7ea90871a463d02b1ed68ba270aaf8 100644 (file)
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -265,6 +265,13 @@ parse_reg (src, mode, reg)
 
   if (src[0] == 'r')
     {
+      if (src[1] >= '0' && src[1] <= '7' && strncmp (&src[2], "_bank", 5) == 0
+         && ! isalnum ((unsigned char) src[7]))
+       {
+         *mode = A_REG_B;
+         *reg  = (src[1] - '0');
+         return 7;
+       }
       if (src[1] == '1')
        {
          if (src[2] >= '0' && src[2] <= '5'
@@ -282,13 +289,6 @@ parse_reg (src, mode, reg)
          *reg = (src[1] - '0');
          return 2;
        }
-      if (src[1] >= '0' && src[1] <= '7' && strncmp(&src[2], "_bank", 5) == 0
-         && ! isalnum ((unsigned char) src[7]))
-       {
-         *mode = A_REG_B;
-         *reg  = (src[1] - '0');
-         return 7;
-       }
 
       if (src[1] == 'e' && ! isalnum ((unsigned char) src[2]))
        {