From: David S. Miller <davem@redhat.com>
Date: Tue, 19 Apr 2005 19:45:10 +0000 (+0000)
Subject: 	* config/tc-sparc.c (md_assemble): If sparc_ip gives us a
X-Git-Tag: msnyder-tracepoint-checkpoint-branchpoint~524
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0825cc233279083d1ad7d7673f06d6622b33c76;p=thirdparty%2Fbinutils-gdb.git

	* config/tc-sparc.c (md_assemble): If sparc_ip gives us a
	NULL insn, exit early.  Remove now spurious NULL checks.
	(sparc_ip): Use as_bad for unknown opcode errors, set *pinsn
	to NULL and exit.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index eb5169716bf..31ffae6c706 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-19  David S. Miller  <davem@davemloft.net>
+
+	* config/tc-sparc.c (md_assemble): If sparc_ip gives us a
+	NULL insn, exit early.  Remove now spurious NULL checks.
+	(sparc_ip): Use as_bad for unknown opcode errors, set *pinsn
+	to NULL and exit.
+
 2005-04-19  Jan Beulich  <jbeulich@novell.com>
 
 	* symbols.h (symbol_find_base): Remove prototype.
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index fe361a1b1f0..ea49bbab1d4 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -1304,11 +1304,12 @@ md_assemble (str)
 
   know (str);
   special_case = sparc_ip (str, &insn);
+  if (insn == NULL)
+    return;
 
   /* We warn about attempts to put a floating point branch in a delay slot,
      unless the delay slot has been annulled.  */
-  if (insn != NULL
-      && last_insn != NULL
+  if (last_insn != NULL
       && (insn->flags & F_FBR) != 0
       && (last_insn->flags & F_DELAYED) != 0
       /* ??? This test isn't completely accurate.  We assume anything with
@@ -1321,7 +1322,6 @@ md_assemble (str)
      point instruction and a floating point branch.  We insert one
      automatically, with a warning.  */
   if (max_architecture < SPARC_OPCODE_ARCH_V9
-      && insn != NULL
       && last_insn != NULL
       && (insn->flags & F_FBR) != 0
       && (last_insn->flags & F_FLOAT) != 0)
@@ -1417,7 +1417,9 @@ sparc_ip (str, pinsn)
       break;
 
     default:
-      as_fatal (_("Unknown opcode: `%s'"), str);
+      as_bad (_("Unknown opcode: `%s'"), str);
+      *pinsn = NULL;
+      return special_case;
     }
   insn = (struct sparc_opcode *) hash_find (op_hash, str);
   *pinsn = insn;