* config/tc-hppa.c (pa_ip): Add args q, %, and |.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b07fad62ea3d8b754c1ed520bba168bfaae53da6..f0b319c341f865ba81069dec316ef9de5ee86222 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -4,6 +4,8 @@ Sat Aug 28 01:23:11 1999  Jeffrey A Law  (law@cygnus.com)
 
 Sat Aug 28 00:26:26 1999  Jerry Quinn <jquinn@nortelnetworks.com>
 
+       * config/tc-hppa.c (pa_ip): Add args q, %, and |.
+
        * config/tc-hppa.c (pa_ip):  Absorb white space in instructions
        between args.
        Add new completers.  Fix bug in 64 bit condition handling.

diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 44a60f04359729dab8aaf170958af16c591bf263..f082f518f2b02f88365f6269366211851b6ebbc6 100644 (file)
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1822,6 +1822,17 @@ pa_ip (str)
 
                  INSERT_FIELD_AND_CONTINUE (opcode, flag, 6);
 
+               /* Handle zero/sign extension completer.  */
+               case 'z':
+                 flag = 1;
+                 if (!strncasecmp (s, ",z", 2))
+                   {
+                     flag = 0;
+                     s += 2;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 10);
+
                /* Handle add completer.  */
                case 'a':
                  flag = 1;
@@ -2800,6 +2811,27 @@ pa_ip (str)
              opcode |= (num & 0x20) << 6;
              INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 5);
 
+           /* Handle a 6 bit field length at 23,27:31.  */
+           case '%':
+             flag = 0;
+             num = pa_get_absolute_expression (&the_insn, &s);
+             s = expr_end;
+             CHECK_FIELD (num, 64, 1, 0);
+             num--;
+             opcode |= (num & 0x20) << 3;
+             num = 31 - (num & 0x1f);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+
+           /* Handle a 6 bit field length at 19,27:31.  */
+           case '|':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             s = expr_end;
+             CHECK_FIELD (num, 64, 1, 0);
+             num--;
+             opcode |= (num & 0x20) << 7;
+             num = 31 - (num & 0x1f);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+
            /* Handle a 5 bit bit position at 26.  */
            case 'P':
              num = pa_get_absolute_expression (&the_insn, &s);
@@ -2807,9 +2839,16 @@ pa_ip (str)
              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 5);
 
+           /* Handle a 6 bit bit position at 20,22:26.  */
+           case 'q':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             s = expr_end;
+             CHECK_FIELD (num, 63, 0, 0);
+             opcode |= (num & 0x20) << 6;
+             INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 5);
+
            /* Handle a 5 bit immediate at 10.  */
            case 'Q':
-
              num = pa_get_absolute_expression (&the_insn, &s);
              if (the_insn.exp.X_op != O_constant)
                break;