Binutils portion of fix for syntax array elements when max

	operands is greater than 127.

	2001-02-02  Patrick Macdonald  <patrickm@redhat.com>

	* cgen.h (CGEN_SYNTAX_CHAR_TYPE): Typedef as unsigned short.
	(CGEN_MAX_SYNTAX_ELEMENTS): Rename from CGEN_MAX_SYNTAX_BYTES.
	(CGEN_SYNTAX): Define using CGEN_MAX_SYNTAX_ELEMENTS.

	* fr30-desc.h: Regenerate with CGEN_MAX_SYNTAX_ELEMENTS.
	* m32r-desc.h: Regenerate.

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 1384234..9dfdcd3 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-02  Patrick Macdonald  <patrickm@redhat.com>
+
+        * cgen.h (CGEN_SYNTAX_CHAR_TYPE): Typedef as unsigned short.
+        (CGEN_MAX_SYNTAX_ELEMENTS): Rename from CGEN_MAX_SYNTAX_BYTES.
+        (CGEN_SYNTAX): Define using CGEN_MAX_SYNTAX_ELEMENTS.
+
 2001-01-24  Karsten Keil  <kkeil@suse.de>
 
        * i386.h (i386_optab): Fix swapgs

diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h
index f7962cd..e208a54 100644 (file)
--- a/include/opcode/cgen.h
+++ b/include/opcode/cgen.h
@@ -736,25 +736,21 @@ typedef struct
    the data is recorded in the parse/insert/extract/print switch statements. */
 
 /* This should be at least as large as necessary for any target. */
-#define CGEN_MAX_SYNTAX_BYTES 40
+#define CGEN_MAX_SYNTAX_ELEMENTS 40
 
 /* A target may know its own precise maximum.  Assert that it falls below
    the above limit. */
-#ifdef CGEN_ACTUAL_MAX_SYNTAX_BYTES
-#if CGEN_ACTUAL_MAX_SYNTAX_BYTES > CGEN_MAX_SYNTAX_BYTES
-#error "CGEN_ACTUAL_MAX_SYNTAX_BYTES too high - enlarge CGEN_MAX_SYNTAX_BYTES"
+#ifdef CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS
+#if CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS > CGEN_MAX_SYNTAX_ELEMENTS
+#error "CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS too high - enlarge CGEN_MAX_SYNTAX_ELEMENTS"
 #endif
 #endif
 
-#if !defined(MAX_OPERANDS) || MAX_OPERANDS <= 127
-typedef unsigned char CGEN_SYNTAX_CHAR_TYPE;
-#else
 typedef unsigned short CGEN_SYNTAX_CHAR_TYPE;
-#endif
 
 typedef struct
 {
-  CGEN_SYNTAX_CHAR_TYPE syntax[CGEN_MAX_SYNTAX_BYTES];
+  CGEN_SYNTAX_CHAR_TYPE syntax[CGEN_MAX_SYNTAX_ELEMENTS];
 } CGEN_SYNTAX;
 
 #define CGEN_SYNTAX_STRING(syn) (syn->syntax)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index acd6ca5..fd72ae5 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-02  Patrick Macdonald  <patrickm@redhat.com>
+
+       * fr30-desc.h: Regenerate with CGEN_MAX_SYNTAX_ELEMENTS. 
+       * m32r-desc.h: Regenerate.
+
 Thu Feb  1 16:29:06 MET 2001  Jan Hubicka  <jh@suse.cz>
 
        * (dis386_att, grps): Use 'T' for push/pop

diff --git a/opcodes/fr30-desc.h b/opcodes/fr30-desc.h
index 446fc7d..27b4db5 100644 (file)
--- a/opcodes/fr30-desc.h
+++ b/opcodes/fr30-desc.h
@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CGEN_INT_INSN_P 0
 
 /* Maximum nymber of syntax bytes in an instruction.  */
-#define CGEN_ACTUAL_MAX_SYNTAX_BYTES 15
+#define CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS 15
 
 /* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands.
    e.g. In "b,a foo" the ",a" is an operand.  If mnemonics have operands

diff --git a/opcodes/m32r-desc.h b/opcodes/m32r-desc.h
index 774891d..9fe57ab 100644 (file)
--- a/opcodes/m32r-desc.h
+++ b/opcodes/m32r-desc.h
@@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CGEN_INT_INSN_P 1
 
 /* Maximum nymber of syntax bytes in an instruction.  */
-#define CGEN_ACTUAL_MAX_SYNTAX_BYTES 15
+#define CGEN_ACTUAL_MAX_SYNTAX_ELEMENTS 15
 
 /* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands.
    e.g. In "b,a foo" the ",a" is an operand.  If mnemonics have operands