* cgen-opc.in (@arch@_cgen_get_insn_operands): Handle empty

	operand instance list.
	* m32r-opc.c: Regenerate.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 30d5fe2..4621374 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 13 14:26:06 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+       * cgen-opc.in (@arch@_cgen_get_insn_operands): Handle empty
+       operand instance list.
+       * m32r-opc.c: Regenerate.
+
 Fri Feb 13 14:53:02 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * Makefile.am (AUTOMAKE_OPTIONS): Define.

diff --git a/opcodes/cgen-opc.in b/opcodes/cgen-opc.in
index af51ef2..9679b04 100644 (file)
--- a/opcodes/cgen-opc.in
+++ b/opcodes/cgen-opc.in
@@ -143,7 +143,8 @@ const CGEN_INSN *
     return NULL;
 
   for (i = 0, opinst = CGEN_INSN_OPERANDS (insn);
-       CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
+       opinst != NULL
+        && CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
        ++i, ++opinst)
     {
       const CGEN_OPERAND *op = CGEN_OPERAND_INSTANCE_OPERAND (opinst);

diff --git a/opcodes/m32r-opc.c b/opcodes/m32r-opc.c
index 41651af..22c84a9 100644 (file)
--- a/opcodes/m32r-opc.c
+++ b/opcodes/m32r-opc.c
@@ -143,7 +143,8 @@ m32r_cgen_get_insn_operands (insn, insn_value, length, indices)
     return NULL;
 
   for (i = 0, opinst = CGEN_INSN_OPERANDS (insn);
-       CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
+       opinst != NULL
+        && CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
        ++i, ++opinst)
     {
       const CGEN_OPERAND *op = CGEN_OPERAND_INSTANCE_OPERAND (opinst);