* config/tc-z8k.c (md_assemble): Improve error detection.

2 files changed, 9 insertions, 4 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3ab47b349d..0a5118d8a7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-28  Christian Groessler  <chris@groessler.org>
+
+	* config/tc-z8k.c (md_assemble): Improve error detection.
+
 2005-01-28  Jan Beulich  <jbeulich@novell.com>
 
 	* config/tc-ia64.c (ia64_estimate_size_before_relax): Allocate space
diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index b914a14f4b..593ed36596 100644
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -1241,11 +1241,12 @@ md_assemble (char *str)
 
       new_input_line_pointer = get_operands (opcode, op_end, operand);
       if (new_input_line_pointer)
-        input_line_pointer = new_input_line_pointer;
-
-      opcode = get_specific (opcode, operand);
+        {
+          input_line_pointer = new_input_line_pointer;
+          opcode = get_specific (opcode, operand);
+        }
 
-      if (opcode == 0)
+      if (new_input_line_pointer == NULL || opcode == NULL)
 	{
 	  /* Couldn't find an opcode which matched the operands.  */
 	  char *where = frag_more (2);