From: Jeff Law <law@redhat.com>
Date: Wed, 22 Sep 1999 15:43:26 +0000 (+0000)
Subject:         * config/tc-hppa.c (pa_ip): Avoid ANSI specific initialization.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b1039fc41ec4d13b6ac2e274e47c64d179ae202e;p=binutils-gdb.git

    * config/tc-hppa.c (pa_ip): Avoid ANSI specific initialization.
        (pa_ip, case 'm'): Failure to get a CBIT specifier just means the
        insn does not match and we should try the next insn in the table.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1d120b10940..b0c2d7330ff 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 22 09:37:19 1999  Jeffrey A Law  (law@cygnus.com)
+
+        * config/tc-hppa.c (pa_ip): Avoid ANSI specific initialization.
+	(pa_ip, case 'm'): Failure to get a CBIT specifier just means the
+	insn does not match and we should try the next insn in the table.
+
 1999-09-22  Nick Clifton  <nickc@cygnus.com>
 
 	* config/tc-arm.c (MULTI_SET_PSR): Rename to LDM_TYPE_2_OR_3.
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 8965a6c26b0..d93998facb5 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -2139,9 +2139,13 @@ pa_ip (str)
 		case '*':
 		  if (*s++ == ',')
 		    {
-		      int permloc[4] = {13,10,8,6};
+		      int permloc[4];
 		      int perm = 0;
 		      int i = 0;
+		      permloc[0] = 13;
+		      permloc[1] = 10;
+		      permloc[2] = 8;
+		      permloc[3] = 6;
 		      for (; i < 4; i++)
 		        {
 			  switch (*s++)
@@ -2777,16 +2781,16 @@ pa_ip (str)
 	       are 0..6 inclusive.  */
 	    case 'm':
 	      get_expression (s);
-	      s = expr_end;
 	      if (the_insn.exp.X_op == O_constant)
 		{
+		  s = expr_end;
 		  num = evaluate_absolute (&the_insn);
 		  CHECK_FIELD (num, 6, 0, 0);
 		  num = (num + 1) ^ 1;
 		  INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
 		}
 	      else
-		as_bad (_("Invalid CBit Specification: %s"), s);
+		break;
 
 	    /* Handle graphics test completers for ftest */
 	    case '=':