* config/tc-hppa.c (pa_ip): Change condition args to have '?' prefix.

gas/ChangeLog

@@ -1,3 +1,7 @@
+Thu Aug  5 16:52:51 1999  Jerry Quinn <jquinn@nortelnetworks.com>
+
+	* config/tc-hppa.c (pa_ip): Change condition args to have '?' prefix.
+
 Thu Aug  5 23:05:56 1999  J"orn Rennecke  <amylaar@cygnus.co.uk>
 
 	* config/tc-sh.c (md_assemble):  Call as_bad when there are excess

gas/config/tc-hppa.c

@@ -1717,144 +1717,19 @@ pa_ip (str)
 		INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
 	      }
 
-	    /* Handle a non-negated compare/stubtract condition.  */
+	    /* Handle all conditions.  */
-	    case '<':
-	      cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
-	      if (cmpltr < 0)
-		{
-		  as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
-		  cmpltr = 0;
-		}
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
-
-	    /* Handle a negated or non-negated compare/subtract condition.  */
 	    case '?':
-	      save_s = s;
-	      cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
-	      if (cmpltr < 0)
 	      {
-		  s = save_s;
+		args++;
-		  cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1);
+		switch (*args)
-		  if (cmpltr < 0)
 		  {
-		      as_bad (_("Invalid Compare/Subtract Condition."));
+ 		  /* Handle FP compare conditions.  */
-		      cmpltr = 0;
+ 		  case 'f':
-		    }
+ 		    cond = pa_parse_fp_cmp_cond (&s);
-		  else
+ 		    INSERT_FIELD_AND_CONTINUE (opcode, cond, 0);
-		    {
-		      /* Negated condition requires an opcode change.  */
-		      opcode |= 1 << 27;
-		    }
-		}
 
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+		  /* Handle an add condition.  */
-
-	    /* Handle non-negated add condition.  */
-	    case '!':
-	      cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
-	      if (cmpltr < 0)
-		{
-		  as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
-		  cmpltr = 0;
-		}
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
-
-	    /* Handle a negated or non-negated add condition.  */
-	    case '@':
-	      save_s = s;
-	      cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
-	      if (cmpltr < 0)
-		{
-		  s = save_s;
-		  cmpltr = pa_parse_neg_add_cmpltr (&s, 1);
-		  if (cmpltr < 0)
-		    {
-		      as_bad (_("Invalid Compare/Subtract Condition"));
-		      cmpltr = 0;
-		    }
-		  else
-		    {
-		      /* Negated condition requires an opcode change.  */
-		      opcode |= 1 << 27;
-		    }
-		}
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
-
-	    /* Handle a compare/subtract condition.  */
 		  case 'a':
-	      cmpltr = 0;
-	      flag = 0;
-	      if (*s == ',')
-		{
-		  s++;
-		  name = s;
-		  while (*s != ',' && *s != ' ' && *s != '\t')
-		    s += 1;
-		  c = *s;
-		  *s = 0x00;
-		  if (strcmp (name, "=") == 0)
-		    cmpltr = 1;
-		  else if (strcmp (name, "<") == 0)
-		    cmpltr = 2;
-		  else if (strcmp (name, "<=") == 0)
-		    cmpltr = 3;
-		  else if (strcasecmp (name, "<<") == 0)
-		    cmpltr = 4;
-		  else if (strcasecmp (name, "<<=") == 0)
-		    cmpltr = 5;
-		  else if (strcasecmp (name, "sv") == 0)
-		    cmpltr = 6;
-		  else if (strcasecmp (name, "od") == 0)
-		    cmpltr = 7;
-		  else if (strcasecmp (name, "tr") == 0)
-		    {
-		      cmpltr = 0;
-		      flag = 1;
-		    }
-		  else if (strcmp (name, "<>") == 0)
-		    {
-		      cmpltr = 1;
-		      flag = 1;
-		    }
-		  else if (strcmp (name, ">=") == 0)
-		    {
-		      cmpltr = 2;
-		      flag = 1;
-		    }
-		  else if (strcmp (name, ">") == 0)
-		    {
-		      cmpltr = 3;
-		      flag = 1;
-		    }
-		  else if (strcasecmp (name, ">>=") == 0)
-		    {
-		      cmpltr = 4;
-		      flag = 1;
-		    }
-		  else if (strcasecmp (name, ">>") == 0)
-		    {
-		      cmpltr = 5;
-		      flag = 1;
-		    }
-		  else if (strcasecmp (name, "nsv") == 0)
-		    {
-		      cmpltr = 6;
-		      flag = 1;
-		    }
-		  else if (strcasecmp (name, "ev") == 0)
-		    {
-		      cmpltr = 7;
-		      flag = 1;
-		    }
-		  else
-		    as_bad (_("Invalid Add Condition: %s"), name);
-		  *s = c;
-		}
-	      opcode |= cmpltr << 13;
-	      INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
-
-	    /* Handle a non-negated add condition.  */
-	    case 'd':
  		    cmpltr = 0;
  		    flag = 0;
 		    if (*s == ',')
@@ -1926,8 +1801,168 @@ pa_ip (str)
 		    opcode |= cmpltr << 13;
 		    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
 
-	    /* HANDLE a logical instruction condition.  */
+		  /* Handle non-negated add and branch condition.  */
-	    case '&':
+		  case 'd':
+		    cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
+		    if (cmpltr < 0)
+		      {
+			as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
+			cmpltr = 0;
+		      }
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+		  /* Handle a negated or non-negated add and branch 
+		     condition.  */
+		  case '@':
+		    save_s = s;
+		    cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
+		    if (cmpltr < 0)
+		      {
+			s = save_s;
+			cmpltr = pa_parse_neg_add_cmpltr (&s, 1);
+			if (cmpltr < 0)
+			  {
+			    as_bad (_("Invalid Compare/Subtract Condition"));
+			    cmpltr = 0;
+			  }
+			else
+			  {
+			    /* Negated condition requires an opcode change. */
+			    opcode |= 1 << 27;
+			  }
+		      }
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+		  /* Handle branch on bit conditions.  */
+		  case 'b':
+		    cmpltr = 0;
+		    if (*s == ',')
+		      {
+			s++;
+			if (strncmp (s, "<", 1) == 0)
+			  {
+			    cmpltr = 0;
+			    s++;
+			  }
+			else if (strncmp (s, ">=", 2) == 0)
+			  {
+			    cmpltr = 1;
+			    s += 2;
+			  }
+			else
+			  as_bad (_("Invalid Bit Branch Condition: %c"), *s);
+		      }
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
+
+		  /* Handle a compare/subtract condition.  */
+		  case 's':
+		    cmpltr = 0;
+		    flag = 0;
+		    if (*s == ',')
+		      {
+			s++;
+			name = s;
+			while (*s != ',' && *s != ' ' && *s != '\t')
+			  s += 1;
+			c = *s;
+			*s = 0x00;
+			if (strcmp (name, "=") == 0)
+			  cmpltr = 1;
+			else if (strcmp (name, "<") == 0)
+			  cmpltr = 2;
+			else if (strcmp (name, "<=") == 0)
+			  cmpltr = 3;
+			else if (strcasecmp (name, "<<") == 0)
+			  cmpltr = 4;
+			else if (strcasecmp (name, "<<=") == 0)
+			  cmpltr = 5;
+			else if (strcasecmp (name, "sv") == 0)
+			  cmpltr = 6;
+			else if (strcasecmp (name, "od") == 0)
+			  cmpltr = 7;
+			else if (strcasecmp (name, "tr") == 0)
+			  {
+			    cmpltr = 0;
+			    flag = 1;
+			  }
+			else if (strcmp (name, "<>") == 0)
+			  {
+			    cmpltr = 1;
+			    flag = 1;
+			  }
+			else if (strcmp (name, ">=") == 0)
+			  {
+			    cmpltr = 2;
+			    flag = 1;
+			  }
+			else if (strcmp (name, ">") == 0)
+			  {
+			    cmpltr = 3;
+			    flag = 1;
+			  }
+			else if (strcasecmp (name, ">>=") == 0)
+			  {
+			    cmpltr = 4;
+			    flag = 1;
+			  }
+			else if (strcasecmp (name, ">>") == 0)
+			  {
+			    cmpltr = 5;
+			    flag = 1;
+			  }
+			else if (strcasecmp (name, "nsv") == 0)
+			  {
+			    cmpltr = 6;
+			    flag = 1;
+			  }
+			else if (strcasecmp (name, "ev") == 0)
+			  {
+			    cmpltr = 7;
+			    flag = 1;
+			  }
+			else
+			  as_bad (_("Invalid Compare/Subtract Condition: %s"),
+				  name);
+			*s = c;
+		      }
+		    opcode |= cmpltr << 13;
+		    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
+
+		  /* Handle a non-negated compare condition.  */
+		  case 't':
+		    cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
+		    if (cmpltr < 0)
+		      {
+			as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
+			cmpltr = 0;
+		      }
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+  
+		  /* Handle a negated or non-negated compare/subtract
+		     condition.  */
+		  case 'n':
+		    save_s = s;
+		    cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
+		    if (cmpltr < 0)
+		      {
+			s = save_s;
+			cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1);
+			if (cmpltr < 0)
+			  {
+			    as_bad (_("Invalid Compare/Subtract Condition."));
+			    cmpltr = 0;
+			  }
+			else
+			  {
+			    /* Negated condition requires an opcode change. */
+			    opcode |= 1 << 27;
+			  }
+		      }
+	    
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+		    /* Handle a logical instruction condition.  */
+		  case 'l':
 		    cmpltr = 0;
 		    flag = 0;
 		    if (*s == ',')
@@ -1980,15 +2015,55 @@ pa_ip (str)
 		    opcode |= cmpltr << 13;
 		    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
 
+		  /* Handle a shift/extract/deposit condition.  */
+		  case 'x':
+		  case 'y':
+		    cmpltr = 0;
+		    if (*s == ',')
+		      {
+			save_s = s++;
+
+			name = s;
+			while (*s != ',' && *s != ' ' && *s != '\t')
+			  s += 1;
+			c = *s;
+			*s = 0x00;
+			if (strcmp (name, "=") == 0)
+			  cmpltr = 1;
+			else if (strcmp (name, "<") == 0)
+			  cmpltr = 2;
+			else if (strcasecmp (name, "od") == 0)
+			  cmpltr = 3;
+			else if (strcasecmp (name, "tr") == 0)
+			  cmpltr = 4;
+			else if (strcmp (name, "<>") == 0)
+			  cmpltr = 5;
+			else if (strcmp (name, ">=") == 0)
+			  cmpltr = 6;
+			else if (strcasecmp (name, "ev") == 0)
+			  cmpltr = 7;
+			/* Handle movb,n.  Put things back the way they were.
+			   This includes moving s back to where it started.  */
+			else if (strcasecmp (name, "n") == 0 && *args == 'y')
+			  {
+			    *s = c;
+			    s = save_s;
+			    continue;
+			  }
+			else
+			  as_bad (_("Invalid Shift/Extract/Deposit Condition."));
+			*s = c;
+		      }
+		    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
 		  /* Handle a unit instruction condition.  */
-	    case 'U':
+		  case 'u':	/* unit */
 		    cmpltr = 0;
 		    flag = 0;
 		    if (*s == ',')
 		      {
 			s++;
 	    
-
 			if (strncasecmp (s, "sbz", 3) == 0)
 			  {
 			    cmpltr = 2;
@@ -2051,73 +2126,15 @@ pa_ip (str)
 			    s += 3;
 			  }
 			else
-		    as_bad (_("Invalid Logical Instruction Condition."));
+			  as_bad (_("Invalid Unit Instruction Condition."));
 		      }
 		    opcode |= cmpltr << 13;
 		    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
 
-	    /* Handle a shift/extract/deposit condition.  */
+		  default:
-	    case '|':
+		    abort ();
-	    case '>':
-	      cmpltr = 0;
-	      if (*s == ',')
-		{
-		  save_s = s++;
-
-
-		  name = s;
-		  while (*s != ',' && *s != ' ' && *s != '\t')
-		    s += 1;
-		  c = *s;
-		  *s = 0x00;
-		  if (strcmp (name, "=") == 0)
-		    cmpltr = 1;
-		  else if (strcmp (name, "<") == 0)
-		    cmpltr = 2;
-		  else if (strcasecmp (name, "od") == 0)
-		    cmpltr = 3;
-		  else if (strcasecmp (name, "tr") == 0)
-		    cmpltr = 4;
-		  else if (strcmp (name, "<>") == 0)
-		    cmpltr = 5;
-		  else if (strcmp (name, ">=") == 0)
-		    cmpltr = 6;
-		  else if (strcasecmp (name, "ev") == 0)
-		    cmpltr = 7;
-		  /* Handle movb,n.  Put things back the way they were.
-		     This includes moving s back to where it started.  */
-		  else if (strcasecmp (name, "n") == 0 && *args == '|')
-		    {
-		      *s = c;
-		      s = save_s;
-		      continue;
 		  }
-		  else
-		    as_bad (_("Invalid Shift/Extract/Deposit Condition."));
-		  *s = c;
 	      }
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
-
-	    /* Handle bvb and bb conditions.  */
-	    case '~':
-	      cmpltr = 0;
-	      if (*s == ',')
-		{
-		  s++;
-		  if (strncmp (s, "<", 1) == 0)
-		    {
-		      cmpltr = 0;
-		      s++;
-		    }
-		  else if (strncmp (s, ">=", 2) == 0)
-		    {
-		      cmpltr = 1;
-		      s += 2;
-		    }
-		  else
-		    as_bad (_("Invalid Bit Branch Condition: %c"), *s);
-		}
-	      INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
 
 	    /* Handle a system control completer.  */
 	    case 'Z':
@@ -2430,11 +2447,6 @@ pa_ip (str)
 	      the_insn.fpof2 = flag;
 	      INSERT_FIELD_AND_CONTINUE (opcode, flag, 13);
 
-	    /* Handle FP compare conditions.  */
-	    case 'M':
-	      cond = pa_parse_fp_cmp_cond (&s);
-	      INSERT_FIELD_AND_CONTINUE (opcode, cond, 0);
-
 	    /* Handle L/R register halves like 't'.  */
 	    case 'v':
 	      {