* arc-ext.c: Warning fixes.

	* arc-ext.h: Likewise.
	* cgen-opc.c: Likewise.
	* ia64-gen.c: Likewise.
	* maxq-dis.c: Likewise.
	* ns32k-dis.c: Likewise.
	* w65-dis.c: Likewise.
	* ia64-asmtab.c: Regenerate.

9 files changed, 302 insertions, 288 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 4f841ba2911..bd3f4987d86 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,16 @@
 2005-02-22  Alan Modra  <amodra@bigpond.net.au>
 
+	* arc-ext.c: Warning fixes.
+	* arc-ext.h: Likewise.
+	* cgen-opc.c: Likewise.
+	* ia64-gen.c: Likewise.
+	* maxq-dis.c: Likewise.
+	* ns32k-dis.c: Likewise.
+	* w65-dis.c: Likewise.
+	* ia64-asmtab.c: Regenerate.
+
+2005-02-22  Alan Modra  <amodra@bigpond.net.au>
+
 	* fr30-desc.c: Regenerate.
 	* fr30-desc.h: Regenerate.
 	* fr30-opc.c: Regenerate.
diff --git a/opcodes/arc-ext.c b/opcodes/arc-ext.c
index 6634534016d..38564d7465a 100644
--- a/opcodes/arc-ext.c
+++ b/opcodes/arc-ext.c
@@ -1,5 +1,6 @@
 /* ARC target-dependent stuff. Extension structure access functions
-   Copyright 1995, 1997, 2000, 2001, 2004 Free Software Foundation, Inc.
+   Copyright 1995, 1997, 2000, 2001, 2004, 2005
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -58,7 +59,7 @@ arcExtMap_coreRegName(int value)
 {
   if (value < 32)
     return 0;
-  return (const char *) arc_extension_map.coreRegisters[value-32];
+  return arc_extension_map.coreRegisters[value-32];
 }
 
 /* Get the name of an extension condition code.  */
@@ -68,7 +69,7 @@ arcExtMap_condCodeName(int value)
 {
   if (value < 16)
     return 0;
-  return (const char *) arc_extension_map.condCodes[value-16];
+  return arc_extension_map.condCodes[value-16];
 }
 
 /* Get the name of an extension aux register.  */
@@ -187,7 +188,7 @@ arcExtMap_add(void *base, unsigned long length)
 	    else
 	      opcode -= 0x10;
 	    insn -> flags = (char) *(p+4);
-	    strcpy(insn_name, (p+5));
+	    strcpy (insn_name, (char *) (p+5));
 	    insn -> name = insn_name;
 	    arc_extension_map.instructions[(int) opcode] = insn;
 	  }
@@ -197,7 +198,7 @@ arcExtMap_add(void *base, unsigned long length)
 	  {
 	    char * core_name = (char *) xmalloc(((int)*p-3) * sizeof(char));
 
-	    strcpy(core_name, (p+3));
+	    strcpy(core_name, (char *) (p+3));
 	    arc_extension_map.coreRegisters[p[2]-32] = core_name;
 	  }
 	  break;
@@ -205,7 +206,7 @@ arcExtMap_add(void *base, unsigned long length)
 	case EXT_COND_CODE:
 	  {
 	    char * cc_name = (char *) xmalloc( ((int)*p-3) * sizeof(char));
-	    strcpy(cc_name, (p+3));
+	    strcpy(cc_name, (char *) (p+3));
 	    arc_extension_map.condCodes[p[2]-16] = cc_name;
 	  }
 	  break;
@@ -217,7 +218,7 @@ arcExtMap_add(void *base, unsigned long length)
 	      (struct ExtAuxRegister *)malloc(sizeof(struct ExtAuxRegister));
 	    char * aux_name = (char *) xmalloc ( ((int)*p-6) * sizeof(char));
 
-	    strcpy (aux_name, (p+6));
+	    strcpy (aux_name, (char *) (p+6));
 	    newAuxRegister->name = aux_name;
 	    newAuxRegister->address = p[2]<<24 | p[3]<<16 | p[4]<<8  | p[5];
 	    newAuxRegister->next = arc_extension_map.auxRegisters;
diff --git a/opcodes/arc-ext.h b/opcodes/arc-ext.h
index bfe9750b60c..e2c6d5bf2cb 100644
--- a/opcodes/arc-ext.h
+++ b/opcodes/arc-ext.h
@@ -1,5 +1,5 @@
 /* ARC target-dependent stuff. Extension data structures.
-   Copyright 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1995, 1997, 2000, 2001, 2005 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -20,10 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef ARCEXT_H
 #define ARCEXT_H
 
-enum {EXT_INSTRUCTION   = 0};
-enum {EXT_CORE_REGISTER = 1};
-enum {EXT_AUX_REGISTER  = 2};
-enum {EXT_COND_CODE     = 3};
+enum {EXT_INSTRUCTION   = 0,
+      EXT_CORE_REGISTER = 1,
+      EXT_AUX_REGISTER  = 2,
+      EXT_COND_CODE     = 3};
 
 enum {NUM_EXT_INST = (0x1f-0x10+1) + (0x3f-0x09+1)};
 enum {NUM_EXT_CORE = 59-32+1};
@@ -46,8 +46,8 @@ struct arcExtMap
 {
   struct ExtAuxRegister *auxRegisters;
   struct ExtInstruction *instructions[NUM_EXT_INST];
-  unsigned char *coreRegisters[NUM_EXT_CORE];
-  unsigned char *condCodes[NUM_EXT_COND];
+  char *coreRegisters[NUM_EXT_CORE];
+  char *condCodes[NUM_EXT_COND];
 };
 
 extern int arcExtMap_add(void*, unsigned long);
diff --git a/opcodes/cgen-opc.c b/opcodes/cgen-opc.c
index 882b34898be..482bd0a2fed 100644
--- a/opcodes/cgen-opc.c
+++ b/opcodes/cgen-opc.c
@@ -1,6 +1,6 @@
 /* CGEN generic opcode support.
 
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
    Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils and GDB, the GNU debugger.
@@ -483,7 +483,7 @@ cgen_lookup_insn (CGEN_CPU_DESC cd,
       /* The instructions are stored in hash lists.
 	 Pick the first one and keep trying until we find the right one.  */
 
-      insn_list = cgen_dis_lookup_insn (cd, buf, base_insn);
+      insn_list = cgen_dis_lookup_insn (cd, (char *) buf, base_insn);
       while (insn_list != NULL)
 	{
 	  insn = insn_list->insn;
diff --git a/opcodes/ia64-asmtab.c b/opcodes/ia64-asmtab.c
index 0b55a827b2a..2264164ba86 100644
--- a/opcodes/ia64-asmtab.c
+++ b/opcodes/ia64-asmtab.c
@@ -370,113 +370,113 @@ dependencies[] = {
   { "PR63", 24, 2, 6, -1, NULL, },
 };
 
-static const short dep0[] = {
+static const unsigned short dep0[] = {
   96, 267, 2139, 2312, 
 };
 
-static const short dep1[] = {
+static const unsigned short dep1[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 4135, 
   20613, 
 };
 
-static const short dep2[] = {
+static const unsigned short dep2[] = {
   96, 267, 2165, 2166, 2168, 2169, 2171, 2172, 2174, 2329, 2332, 2333, 2336, 
   2337, 2340, 2341, 
 };
 
-static const short dep3[] = {
+static const unsigned short dep3[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 4135, 20613, 
 };
 
-static const short dep4[] = {
+static const unsigned short dep4[] = {
   96, 267, 22645, 22646, 22648, 22649, 22651, 22652, 22654, 22809, 22812, 22813, 
   22816, 22817, 22820, 22821, 
 };
 
-static const short dep5[] = {
+static const unsigned short dep5[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
   22809, 22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep6[] = {
+static const unsigned short dep6[] = {
   96, 267, 2165, 2166, 2168, 2169, 2171, 2172, 2174, 2329, 2330, 2332, 2334, 
   2336, 2338, 2340, 
 };
 
-static const short dep7[] = {
+static const unsigned short dep7[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2329, 2330, 
   2333, 2334, 2337, 2338, 2341, 4135, 20613, 
 };
 
-static const short dep8[] = {
+static const unsigned short dep8[] = {
   96, 267, 2165, 2166, 2168, 2169, 2171, 2172, 2174, 2329, 2331, 2333, 2335, 
   2337, 2339, 2341, 
 };
 
-static const short dep9[] = {
+static const unsigned short dep9[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2329, 2331, 
   2332, 2335, 2336, 2339, 2340, 4135, 20613, 
 };
 
-static const short dep10[] = {
+static const unsigned short dep10[] = {
   96, 267, 2165, 2166, 2168, 2169, 2171, 2172, 2174, 2329, 2330, 2331, 2332, 
   2333, 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 
 };
 
-static const short dep11[] = {
+static const unsigned short dep11[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2329, 2330, 
   2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 4135, 20613, 
   
 };
 
-static const short dep12[] = {
+static const unsigned short dep12[] = {
   96, 267, 2379, 
 };
 
-static const short dep13[] = {
+static const unsigned short dep13[] = {
   40, 41, 96, 156, 174, 175, 267, 2082, 2083, 2165, 2167, 2168, 2170, 2171, 
   2173, 2174, 4135, 
 };
 
-static const short dep14[] = {
+static const unsigned short dep14[] = {
   96, 155, 267, 310, 2379, 28852, 29002, 
 };
 
-static const short dep15[] = {
+static const unsigned short dep15[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
   22, 23, 24, 25, 26, 28, 29, 30, 31, 32, 33, 40, 41, 96, 144, 156, 174, 175, 
   267, 310, 2082, 2083, 2165, 2167, 2168, 2170, 2171, 2173, 2174, 4135, 28852, 
   29002, 
 };
 
-static const short dep16[] = {
+static const unsigned short dep16[] = {
   1, 6, 40, 96, 134, 182, 187, 226, 267, 297, 2379, 28852, 29002, 
 };
 
-static const short dep17[] = {
+static const unsigned short dep17[] = {
   1, 25, 27, 38, 40, 41, 96, 156, 158, 159, 174, 175, 182, 187, 226, 267, 297, 
   2082, 2083, 2165, 2167, 2168, 2170, 2171, 2173, 2174, 4135, 28852, 29002, 
   
 };
 
-static const short dep18[] = {
+static const unsigned short dep18[] = {
   1, 40, 51, 96, 182, 226, 233, 267, 28852, 29002, 
 };
 
-static const short dep19[] = {
+static const unsigned short dep19[] = {
   1, 38, 40, 41, 96, 153, 174, 182, 226, 233, 267, 4135, 28852, 29002, 
 };
 
-static const short dep20[] = {
+static const unsigned short dep20[] = {
   40, 96, 226, 267, 
 };
 
-static const short dep21[] = {
+static const unsigned short dep21[] = {
   96, 174, 226, 267, 
 };
 
-static const short dep22[] = {
+static const unsigned short dep22[] = {
   1, 40, 96, 128, 129, 131, 132, 133, 134, 135, 138, 139, 140, 141, 142, 143, 
   144, 145, 146, 147, 148, 150, 151, 152, 153, 154, 155, 156, 159, 160, 161, 
   162, 163, 164, 165, 166, 169, 170, 171, 172, 173, 174, 175, 176, 177, 182, 
@@ -485,1141 +485,1141 @@ static const short dep22[] = {
   324, 325, 326, 327, 328, 28852, 29002, 
 };
 
-static const short dep23[] = {
+static const unsigned short dep23[] = {
   1, 38, 40, 41, 50, 51, 55, 58, 72, 96, 134, 174, 182, 226, 267, 294, 295, 
   296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 
   311, 312, 313, 315, 316, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 
   328, 4135, 28852, 29002, 
 };
 
-static const short dep24[] = {
+static const unsigned short dep24[] = {
   96, 133, 267, 296, 
 };
 
-static const short dep25[] = {
+static const unsigned short dep25[] = {
   96, 134, 174, 267, 296, 
 };
 
-static const short dep26[] = {
+static const unsigned short dep26[] = {
   96, 134, 267, 297, 
 };
 
-static const short dep27[] = {
+static const unsigned short dep27[] = {
   25, 26, 96, 97, 100, 104, 107, 134, 156, 174, 267, 297, 
 };
 
-static const short dep28[] = {
+static const unsigned short dep28[] = {
   40, 41, 96, 174, 267, 2165, 2167, 2168, 2170, 2171, 2173, 2174, 4135, 
 };
 
-static const short dep29[] = {
+static const unsigned short dep29[] = {
   1, 25, 40, 96, 182, 214, 215, 226, 267, 2082, 2270, 2273, 2379, 28852, 29002, 
   
 };
 
-static const short dep30[] = {
+static const unsigned short dep30[] = {
   1, 6, 38, 40, 41, 96, 134, 156, 174, 175, 182, 214, 216, 226, 267, 2082, 2083, 
   2165, 2167, 2168, 2170, 2171, 2173, 2174, 2271, 2273, 4135, 28852, 29002, 
   
 };
 
-static const short dep31[] = {
+static const unsigned short dep31[] = {
   96, 267, 
 };
 
-static const short dep32[] = {
+static const unsigned short dep32[] = {
   96, 174, 267, 2082, 2084, 
 };
 
-static const short dep33[] = {
+static const unsigned short dep33[] = {
   40, 41, 96, 156, 174, 175, 267, 2165, 2167, 2168, 2170, 2171, 2173, 2174, 
   4135, 
 };
 
-static const short dep34[] = {
+static const unsigned short dep34[] = {
   6, 37, 38, 39, 96, 124, 125, 187, 226, 267, 292, 293, 2379, 
 };
 
-static const short dep35[] = {
+static const unsigned short dep35[] = {
   6, 37, 40, 41, 96, 156, 174, 175, 187, 226, 267, 292, 293, 331, 2165, 2167, 
   2168, 2170, 2171, 2173, 2174, 4135, 
 };
 
-static const short dep36[] = {
+static const unsigned short dep36[] = {
   24, 96, 213, 267, 2379, 
 };
 
-static const short dep37[] = {
+static const unsigned short dep37[] = {
   24, 40, 41, 96, 156, 174, 175, 213, 267, 2165, 2167, 2168, 2170, 2171, 2173, 
   2174, 4135, 
 };
 
-static const short dep38[] = {
+static const unsigned short dep38[] = {
   6, 24, 37, 38, 39, 96, 124, 125, 187, 213, 226, 267, 292, 293, 2379, 
 };
 
-static const short dep39[] = {
+static const unsigned short dep39[] = {
   6, 24, 37, 40, 41, 96, 156, 174, 175, 187, 213, 226, 267, 292, 293, 331, 2165, 
   2167, 2168, 2170, 2171, 2173, 2174, 4135, 
 };
 
-static const short dep40[] = {
+static const unsigned short dep40[] = {
   1, 6, 38, 40, 41, 96, 134, 156, 174, 175, 182, 214, 216, 226, 267, 2165, 2167, 
   2168, 2170, 2171, 2173, 2174, 2271, 2273, 4135, 28852, 29002, 
 };
 
-static const short dep41[] = {
+static const unsigned short dep41[] = {
   96, 174, 267, 
 };
 
-static const short dep42[] = {
+static const unsigned short dep42[] = {
   15, 96, 196, 197, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 22816, 
   22817, 22820, 22821, 
 };
 
-static const short dep43[] = {
+static const unsigned short dep43[] = {
   11, 19, 20, 40, 41, 96, 174, 196, 198, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 22809, 22812, 
   22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep44[] = {
+static const unsigned short dep44[] = {
   15, 16, 17, 18, 96, 196, 197, 199, 200, 202, 203, 205, 206, 267, 2135, 2310, 
   18593, 18594, 18746, 18747, 18749, 18750, 22645, 22646, 22647, 22649, 22650, 
   22652, 22653, 22809, 22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep45[] = {
+static const unsigned short dep45[] = {
   11, 12, 13, 14, 19, 20, 40, 41, 96, 174, 196, 198, 199, 201, 202, 204, 205, 
   207, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2310, 4135, 16524, 16526, 
   18746, 18748, 18749, 18751, 22809, 22812, 22813, 22816, 22817, 22820, 22821, 
   
 };
 
-static const short dep46[] = {
+static const unsigned short dep46[] = {
   16, 96, 199, 200, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 22816, 
   22817, 22820, 22821, 
 };
 
-static const short dep47[] = {
+static const unsigned short dep47[] = {
   12, 19, 20, 40, 41, 96, 174, 199, 201, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 22809, 22812, 
   22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep48[] = {
+static const unsigned short dep48[] = {
   17, 96, 202, 203, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 22816, 
   22817, 22820, 22821, 
 };
 
-static const short dep49[] = {
+static const unsigned short dep49[] = {
   13, 19, 20, 40, 41, 96, 174, 202, 204, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 22809, 22812, 
   22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep50[] = {
+static const unsigned short dep50[] = {
   18, 96, 205, 206, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 22816, 
   22817, 22820, 22821, 
 };
 
-static const short dep51[] = {
+static const unsigned short dep51[] = {
   14, 19, 20, 40, 41, 96, 174, 205, 207, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 22809, 22812, 
   22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep52[] = {
+static const unsigned short dep52[] = {
   15, 96, 196, 197, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   
 };
 
-static const short dep53[] = {
+static const unsigned short dep53[] = {
   11, 19, 20, 40, 41, 96, 174, 196, 198, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep54[] = {
+static const unsigned short dep54[] = {
   15, 16, 17, 18, 96, 196, 197, 199, 200, 202, 203, 205, 206, 267, 2135, 2310, 
   18593, 18594, 18746, 18747, 18749, 18750, 
 };
 
-static const short dep55[] = {
+static const unsigned short dep55[] = {
   11, 12, 13, 14, 19, 20, 40, 41, 96, 174, 196, 198, 199, 201, 202, 204, 205, 
   207, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2310, 4135, 16524, 16526, 
   18746, 18748, 18749, 18751, 
 };
 
-static const short dep56[] = {
+static const unsigned short dep56[] = {
   16, 96, 199, 200, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   
 };
 
-static const short dep57[] = {
+static const unsigned short dep57[] = {
   12, 19, 20, 40, 41, 96, 174, 199, 201, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep58[] = {
+static const unsigned short dep58[] = {
   17, 96, 202, 203, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   
 };
 
-static const short dep59[] = {
+static const unsigned short dep59[] = {
   13, 19, 20, 40, 41, 96, 174, 202, 204, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep60[] = {
+static const unsigned short dep60[] = {
   18, 96, 205, 206, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
   
 };
 
-static const short dep61[] = {
+static const unsigned short dep61[] = {
   14, 19, 20, 40, 41, 96, 174, 205, 207, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep62[] = {
+static const unsigned short dep62[] = {
   96, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
 };
 
-static const short dep63[] = {
+static const unsigned short dep63[] = {
   40, 41, 96, 174, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2310, 4135, 
   16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep64[] = {
+static const unsigned short dep64[] = {
   11, 96, 192, 267, 
 };
 
-static const short dep65[] = {
+static const unsigned short dep65[] = {
   11, 40, 41, 96, 174, 192, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep66[] = {
+static const unsigned short dep66[] = {
   11, 40, 41, 96, 174, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep67[] = {
+static const unsigned short dep67[] = {
   12, 96, 193, 267, 
 };
 
-static const short dep68[] = {
+static const unsigned short dep68[] = {
   11, 40, 41, 96, 174, 193, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep69[] = {
+static const unsigned short dep69[] = {
   13, 96, 194, 267, 
 };
 
-static const short dep70[] = {
+static const unsigned short dep70[] = {
   11, 40, 41, 96, 174, 194, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep71[] = {
+static const unsigned short dep71[] = {
   14, 96, 195, 267, 
 };
 
-static const short dep72[] = {
+static const unsigned short dep72[] = {
   11, 40, 41, 96, 174, 195, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep73[] = {
+static const unsigned short dep73[] = {
   15, 96, 197, 198, 267, 
 };
 
-static const short dep74[] = {
+static const unsigned short dep74[] = {
   40, 41, 96, 174, 197, 198, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep75[] = {
+static const unsigned short dep75[] = {
   40, 41, 96, 174, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep76[] = {
+static const unsigned short dep76[] = {
   16, 96, 200, 201, 267, 
 };
 
-static const short dep77[] = {
+static const unsigned short dep77[] = {
   40, 41, 96, 174, 200, 201, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep78[] = {
+static const unsigned short dep78[] = {
   17, 96, 203, 204, 267, 
 };
 
-static const short dep79[] = {
+static const unsigned short dep79[] = {
   40, 41, 96, 174, 203, 204, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep80[] = {
+static const unsigned short dep80[] = {
   18, 96, 206, 207, 267, 
 };
 
-static const short dep81[] = {
+static const unsigned short dep81[] = {
   40, 41, 96, 174, 206, 207, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep82[] = {
+static const unsigned short dep82[] = {
   15, 19, 20, 40, 41, 96, 156, 174, 175, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep83[] = {
+static const unsigned short dep83[] = {
   15, 16, 19, 20, 40, 41, 96, 156, 174, 175, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep84[] = {
+static const unsigned short dep84[] = {
   15, 17, 19, 20, 40, 41, 96, 156, 174, 175, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep85[] = {
+static const unsigned short dep85[] = {
   15, 18, 19, 20, 40, 41, 96, 156, 174, 175, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep86[] = {
+static const unsigned short dep86[] = {
   15, 96, 196, 197, 267, 
 };
 
-static const short dep87[] = {
+static const unsigned short dep87[] = {
   11, 19, 20, 40, 41, 96, 174, 196, 198, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep88[] = {
+static const unsigned short dep88[] = {
   15, 16, 17, 18, 96, 196, 197, 199, 200, 202, 203, 205, 206, 267, 
 };
 
-static const short dep89[] = {
+static const unsigned short dep89[] = {
   11, 12, 13, 14, 19, 20, 40, 41, 96, 174, 196, 198, 199, 201, 202, 204, 205, 
   207, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep90[] = {
+static const unsigned short dep90[] = {
   16, 96, 199, 200, 267, 
 };
 
-static const short dep91[] = {
+static const unsigned short dep91[] = {
   12, 19, 20, 40, 41, 96, 174, 199, 201, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep92[] = {
+static const unsigned short dep92[] = {
   17, 96, 202, 203, 267, 
 };
 
-static const short dep93[] = {
+static const unsigned short dep93[] = {
   13, 19, 20, 40, 41, 96, 174, 202, 204, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep94[] = {
+static const unsigned short dep94[] = {
   18, 96, 205, 206, 267, 
 };
 
-static const short dep95[] = {
+static const unsigned short dep95[] = {
   14, 19, 20, 40, 41, 96, 174, 205, 207, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep96[] = {
+static const unsigned short dep96[] = {
   15, 96, 196, 197, 267, 2165, 2166, 2167, 2169, 2170, 2172, 2173, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 
 };
 
-static const short dep97[] = {
+static const unsigned short dep97[] = {
   11, 19, 20, 40, 41, 96, 174, 196, 198, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2329, 2332, 2333, 2336, 2337, 2340, 2341, 4135, 16524, 16526, 
   
 };
 
-static const short dep98[] = {
+static const unsigned short dep98[] = {
   15, 16, 17, 18, 96, 196, 197, 199, 200, 202, 203, 205, 206, 267, 2165, 2166, 
   2167, 2169, 2170, 2172, 2173, 2329, 2332, 2333, 2336, 2337, 2340, 2341, 
 };
 
-static const short dep99[] = {
+static const unsigned short dep99[] = {
   11, 12, 13, 14, 19, 20, 40, 41, 96, 174, 196, 198, 199, 201, 202, 204, 205, 
   207, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2329, 2332, 2333, 2336, 
   2337, 2340, 2341, 4135, 16524, 16526, 
 };
 
-static const short dep100[] = {
+static const unsigned short dep100[] = {
   16, 96, 199, 200, 267, 2165, 2166, 2167, 2169, 2170, 2172, 2173, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 
 };
 
-static const short dep101[] = {
+static const unsigned short dep101[] = {
   12, 19, 20, 40, 41, 96, 174, 199, 201, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2329, 2332, 2333, 2336, 2337, 2340, 2341, 4135, 16524, 16526, 
   
 };
 
-static const short dep102[] = {
+static const unsigned short dep102[] = {
   17, 96, 202, 203, 267, 2165, 2166, 2167, 2169, 2170, 2172, 2173, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 
 };
 
-static const short dep103[] = {
+static const unsigned short dep103[] = {
   13, 19, 20, 40, 41, 96, 174, 202, 204, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2329, 2332, 2333, 2336, 2337, 2340, 2341, 4135, 16524, 16526, 
   
 };
 
-static const short dep104[] = {
+static const unsigned short dep104[] = {
   18, 96, 205, 206, 267, 2165, 2166, 2167, 2169, 2170, 2172, 2173, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 
 };
 
-static const short dep105[] = {
+static const unsigned short dep105[] = {
   14, 19, 20, 40, 41, 96, 174, 205, 207, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 2329, 2332, 2333, 2336, 2337, 2340, 2341, 4135, 16524, 16526, 
   
 };
 
-static const short dep106[] = {
+static const unsigned short dep106[] = {
   15, 96, 196, 197, 267, 22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 
   22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep107[] = {
+static const unsigned short dep107[] = {
   11, 19, 20, 40, 41, 96, 174, 196, 198, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 4135, 16524, 16526, 22809, 22812, 22813, 22816, 22817, 22820, 
   22821, 
 };
 
-static const short dep108[] = {
+static const unsigned short dep108[] = {
   15, 16, 17, 18, 96, 196, 197, 199, 200, 202, 203, 205, 206, 267, 22645, 22646, 
   22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 22816, 22817, 22820, 
   22821, 
 };
 
-static const short dep109[] = {
+static const unsigned short dep109[] = {
   11, 12, 13, 14, 19, 20, 40, 41, 96, 174, 196, 198, 199, 201, 202, 204, 205, 
   207, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 4135, 16524, 16526, 22809, 
   22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep110[] = {
+static const unsigned short dep110[] = {
   16, 96, 199, 200, 267, 22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 
   22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep111[] = {
+static const unsigned short dep111[] = {
   12, 19, 20, 40, 41, 96, 174, 199, 201, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 4135, 16524, 16526, 22809, 22812, 22813, 22816, 22817, 22820, 
   22821, 
 };
 
-static const short dep112[] = {
+static const unsigned short dep112[] = {
   17, 96, 202, 203, 267, 22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 
   22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep113[] = {
+static const unsigned short dep113[] = {
   13, 19, 20, 40, 41, 96, 174, 202, 204, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 4135, 16524, 16526, 22809, 22812, 22813, 22816, 22817, 22820, 
   22821, 
 };
 
-static const short dep114[] = {
+static const unsigned short dep114[] = {
   18, 96, 205, 206, 267, 22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 
   22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep115[] = {
+static const unsigned short dep115[] = {
   14, 19, 20, 40, 41, 96, 174, 205, 207, 267, 2134, 2135, 2136, 2165, 2166, 
   2169, 2172, 4135, 16524, 16526, 22809, 22812, 22813, 22816, 22817, 22820, 
   22821, 
 };
 
-static const short dep116[] = {
+static const unsigned short dep116[] = {
   96, 267, 2165, 2166, 2167, 2169, 2170, 2172, 2173, 2329, 2332, 2333, 2336, 
   2337, 2340, 2341, 
 };
 
-static const short dep117[] = {
+static const unsigned short dep117[] = {
   40, 41, 96, 174, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2329, 2332, 
   2333, 2336, 2337, 2340, 2341, 4135, 16524, 16526, 
 };
 
-static const short dep118[] = {
+static const unsigned short dep118[] = {
   96, 267, 22645, 22646, 22647, 22649, 22650, 22652, 22653, 22809, 22812, 22813, 
   22816, 22817, 22820, 22821, 
 };
 
-static const short dep119[] = {
+static const unsigned short dep119[] = {
   40, 41, 96, 174, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 4135, 16524, 
   16526, 22809, 22812, 22813, 22816, 22817, 22820, 22821, 
 };
 
-static const short dep120[] = {
+static const unsigned short dep120[] = {
   19, 20, 40, 41, 96, 174, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2310, 
   4135, 16524, 16526, 18746, 18748, 18749, 18751, 
 };
 
-static const short dep121[] = {
+static const unsigned short dep121[] = {
   40, 41, 96, 156, 174, 175, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   4135, 20613, 
 };
 
-static const short dep122[] = {
+static const unsigned short dep122[] = {
   96, 267, 2083, 2084, 2271, 2272, 
 };
 
-static const short dep123[] = {
+static const unsigned short dep123[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2270, 2272, 
   4135, 20613, 
 };
 
-static const short dep124[] = {
+static const unsigned short dep124[] = {
   40, 41, 96, 174, 267, 2082, 2084, 2165, 2166, 2169, 2172, 2312, 4135, 20613, 
   
 };
 
-static const short dep125[] = {
+static const unsigned short dep125[] = {
   96, 267, 14454, 14456, 14457, 14459, 14460, 14462, 14620, 14621, 14624, 14625, 
   14628, 14629, 
 };
 
-static const short dep126[] = {
+static const unsigned short dep126[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 4135, 14620, 14621, 14624, 14625, 
   14628, 14629, 20613, 24693, 24694, 24697, 24700, 
 };
 
-static const short dep127[] = {
+static const unsigned short dep127[] = {
   96, 121, 123, 124, 126, 267, 288, 289, 292, 293, 
 };
 
-static const short dep128[] = {
+static const unsigned short dep128[] = {
   40, 41, 96, 174, 267, 288, 289, 292, 293, 4135, 24693, 24694, 24697, 24700, 
   
 };
 
-static const short dep129[] = {
+static const unsigned short dep129[] = {
   40, 41, 96, 174, 267, 2165, 2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep130[] = {
+static const unsigned short dep130[] = {
   40, 41, 96, 118, 121, 124, 174, 267, 2312, 4135, 20613, 24693, 
 };
 
-static const short dep131[] = {
+static const unsigned short dep131[] = {
   6, 24, 26, 27, 96, 187, 213, 216, 267, 2081, 2269, 
 };
 
-static const short dep132[] = {
+static const unsigned short dep132[] = {
   40, 41, 96, 174, 187, 213, 215, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2269, 4135, 20613, 
 };
 
-static const short dep133[] = {
+static const unsigned short dep133[] = {
   6, 24, 25, 26, 40, 41, 96, 174, 267, 2081, 2165, 2166, 2169, 2172, 2312, 4135, 
   20613, 
 };
 
-static const short dep134[] = {
+static const unsigned short dep134[] = {
   0, 40, 41, 96, 156, 174, 175, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep135[] = {
+static const unsigned short dep135[] = {
   0, 96, 181, 267, 
 };
 
-static const short dep136[] = {
+static const unsigned short dep136[] = {
   0, 40, 41, 96, 156, 174, 175, 181, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep137[] = {
+static const unsigned short dep137[] = {
   40, 41, 96, 174, 181, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep138[] = {
+static const unsigned short dep138[] = {
   2, 28, 96, 183, 217, 267, 28852, 29002, 
 };
 
-static const short dep139[] = {
+static const unsigned short dep139[] = {
   1, 2, 28, 29, 96, 168, 169, 174, 183, 217, 267, 28852, 29002, 
 };
 
-static const short dep140[] = {
+static const unsigned short dep140[] = {
   1, 28, 29, 38, 40, 41, 96, 168, 169, 174, 183, 217, 267, 4135, 28852, 29002, 
   
 };
 
-static const short dep141[] = {
+static const unsigned short dep141[] = {
   0, 40, 41, 96, 174, 181, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep142[] = {
+static const unsigned short dep142[] = {
   1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 
   28, 29, 30, 31, 96, 182, 183, 184, 185, 186, 188, 189, 190, 191, 192, 193, 
   194, 195, 197, 198, 200, 201, 203, 204, 206, 207, 208, 209, 210, 211, 217, 
   218, 219, 267, 2071, 2081, 2260, 2269, 28852, 29002, 
 };
 
-static const short dep143[] = {
+static const unsigned short dep143[] = {
   29, 40, 41, 96, 134, 174, 182, 183, 184, 185, 186, 188, 189, 190, 191, 192, 
   193, 194, 195, 197, 198, 200, 201, 203, 204, 206, 207, 208, 209, 210, 211, 
   217, 218, 219, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2260, 2269, 
   4135, 20613, 28852, 29002, 
 };
 
-static const short dep144[] = {
+static const unsigned short dep144[] = {
   96, 267, 14463, 14465, 14466, 14468, 14497, 14498, 14513, 14630, 14631, 14651, 
   14652, 14654, 14655, 14664, 
 };
 
-static const short dep145[] = {
+static const unsigned short dep145[] = {
   40, 41, 96, 173, 174, 267, 2165, 2166, 2169, 2172, 4135, 14630, 14631, 14651, 
   14652, 14654, 14655, 14664, 
 };
 
-static const short dep146[] = {
+static const unsigned short dep146[] = {
   14463, 14465, 14466, 14468, 14497, 14498, 14513, 14630, 14631, 14651, 14652, 
   14654, 14655, 14664, 
 };
 
-static const short dep147[] = {
+static const unsigned short dep147[] = {
   173, 14630, 14631, 14651, 14652, 14654, 14655, 14664, 
 };
 
-static const short dep148[] = {
+static const unsigned short dep148[] = {
   96, 267, 14464, 14465, 14467, 14468, 14476, 14477, 14478, 14479, 14480, 14481, 
   14482, 14483, 14485, 14488, 14489, 14497, 14498, 14499, 14500, 14501, 14506, 
   14507, 14508, 14509, 14513, 14630, 14631, 14637, 14638, 14639, 14640, 14642, 
   14644, 14651, 14652, 14654, 14655, 14656, 14657, 14660, 14661, 14664, 
 };
 
-static const short dep149[] = {
+static const unsigned short dep149[] = {
   40, 41, 72, 96, 134, 174, 267, 2165, 2166, 2169, 2172, 4135, 14630, 14631, 
   14637, 14638, 14639, 14640, 14642, 14644, 14651, 14652, 14654, 14655, 14656, 
   14657, 14660, 14661, 14664, 
 };
 
-static const short dep150[] = {
+static const unsigned short dep150[] = {
   1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 
   28, 29, 30, 31, 40, 41, 96, 134, 171, 174, 267, 2071, 2081, 2165, 2166, 2169, 
   2172, 2312, 4135, 20613, 28852, 
 };
 
-static const short dep151[] = {
+static const unsigned short dep151[] = {
   43, 44, 45, 46, 47, 48, 49, 50, 52, 53, 54, 55, 56, 57, 58, 60, 61, 62, 63, 
   64, 65, 67, 69, 70, 71, 72, 93, 95, 96, 228, 229, 230, 231, 232, 233, 234, 
   235, 236, 237, 238, 240, 241, 242, 243, 244, 246, 248, 249, 250, 266, 267, 
   2116, 2295, 
 };
 
-static const short dep152[] = {
+static const unsigned short dep152[] = {
   40, 41, 95, 96, 134, 153, 174, 228, 229, 230, 231, 232, 233, 234, 235, 236, 
   237, 238, 240, 241, 242, 243, 244, 246, 248, 249, 250, 266, 267, 2137, 2138, 
   2139, 2165, 2166, 2169, 2172, 2295, 4135, 20613, 
 };
 
-static const short dep153[] = {
+static const unsigned short dep153[] = {
   59, 94, 96, 239, 266, 267, 2139, 2312, 
 };
 
-static const short dep154[] = {
+static const unsigned short dep154[] = {
   40, 41, 43, 44, 46, 48, 49, 51, 52, 53, 54, 56, 57, 60, 61, 63, 64, 65, 66, 
   67, 69, 70, 71, 93, 94, 96, 134, 153, 174, 239, 266, 267, 2107, 2116, 2165, 
   2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep155[] = {
+static const unsigned short dep155[] = {
   2, 28, 41, 96, 183, 217, 226, 267, 2139, 2312, 28852, 29002, 
 };
 
-static const short dep156[] = {
+static const unsigned short dep156[] = {
   2, 25, 26, 28, 29, 38, 40, 41, 96, 168, 169, 174, 183, 217, 226, 267, 2312, 
   4135, 20613, 28852, 29002, 
 };
 
-static const short dep157[] = {
+static const unsigned short dep157[] = {
   96, 128, 129, 131, 132, 136, 137, 140, 141, 142, 143, 144, 145, 146, 147, 
   149, 152, 153, 157, 158, 161, 162, 163, 164, 165, 167, 168, 170, 171, 172, 
   173, 175, 176, 177, 267, 294, 295, 299, 301, 302, 303, 304, 306, 308, 312, 
   315, 316, 318, 319, 320, 321, 323, 324, 325, 327, 328, 
 };
 
-static const short dep158[] = {
+static const unsigned short dep158[] = {
   40, 41, 72, 96, 134, 174, 267, 294, 295, 299, 301, 302, 303, 304, 306, 308, 
   312, 315, 316, 318, 319, 320, 321, 323, 324, 325, 327, 328, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep159[] = {
+static const unsigned short dep159[] = {
   96, 127, 129, 130, 132, 161, 162, 177, 267, 294, 295, 315, 316, 318, 319, 
   328, 
 };
 
-static const short dep160[] = {
+static const unsigned short dep160[] = {
   40, 41, 96, 173, 174, 267, 294, 295, 315, 316, 318, 319, 328, 2137, 2138, 
   2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep161[] = {
+static const unsigned short dep161[] = {
   40, 41, 96, 129, 132, 134, 137, 138, 141, 143, 145, 147, 149, 150, 152, 156, 
   157, 159, 160, 161, 162, 164, 165, 167, 169, 170, 172, 174, 176, 177, 267, 
   2165, 2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep162[] = {
+static const unsigned short dep162[] = {
   40, 41, 96, 129, 132, 161, 162, 174, 177, 267, 2165, 2166, 2169, 2172, 2312, 
   4135, 20613, 
 };
 
-static const short dep163[] = {
+static const unsigned short dep163[] = {
   40, 41, 75, 76, 81, 83, 96, 110, 134, 163, 174, 178, 267, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep164[] = {
+static const unsigned short dep164[] = {
   40, 41, 75, 76, 81, 83, 96, 110, 134, 135, 136, 138, 139, 163, 174, 178, 267, 
   2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep165[] = {
+static const unsigned short dep165[] = {
   76, 77, 96, 100, 101, 254, 255, 267, 269, 270, 
 };
 
-static const short dep166[] = {
+static const unsigned short dep166[] = {
   40, 41, 47, 62, 77, 79, 85, 96, 98, 101, 134, 153, 174, 178, 254, 255, 267, 
   269, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep167[] = {
+static const unsigned short dep167[] = {
   40, 41, 47, 62, 77, 79, 96, 98, 101, 103, 105, 134, 153, 174, 178, 254, 255, 
   267, 269, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep168[] = {
+static const unsigned short dep168[] = {
   96, 267, 12466, 12467, 12617, 
 };
 
-static const short dep169[] = {
+static const unsigned short dep169[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   12617, 20613, 
 };
 
-static const short dep170[] = {
+static const unsigned short dep170[] = {
   96, 267, 6218, 6219, 6396, 
 };
 
-static const short dep171[] = {
+static const unsigned short dep171[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   6396, 20613, 
 };
 
-static const short dep172[] = {
+static const unsigned short dep172[] = {
   96, 267, 6236, 6409, 
 };
 
-static const short dep173[] = {
+static const unsigned short dep173[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   6409, 20613, 
 };
 
-static const short dep174[] = {
+static const unsigned short dep174[] = {
   96, 267, 6254, 6255, 6256, 6257, 6420, 6422, 8469, 
 };
 
-static const short dep175[] = {
+static const unsigned short dep175[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   6257, 6421, 6422, 8303, 8468, 20613, 
 };
 
-static const short dep176[] = {
+static const unsigned short dep176[] = {
   96, 267, 6258, 6259, 6423, 
 };
 
-static const short dep177[] = {
+static const unsigned short dep177[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   6423, 20613, 
 };
 
-static const short dep178[] = {
+static const unsigned short dep178[] = {
   96, 267, 6260, 6424, 
 };
 
-static const short dep179[] = {
+static const unsigned short dep179[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   6424, 20613, 
 };
 
-static const short dep180[] = {
+static const unsigned short dep180[] = {
   96, 267, 10349, 10515, 
 };
 
-static const short dep181[] = {
+static const unsigned short dep181[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 
   10515, 20613, 
 };
 
-static const short dep182[] = {
+static const unsigned short dep182[] = {
   76, 77, 81, 82, 96, 100, 101, 254, 255, 257, 258, 267, 269, 270, 
 };
 
-static const short dep183[] = {
+static const unsigned short dep183[] = {
   40, 41, 47, 62, 77, 79, 82, 85, 96, 98, 101, 134, 153, 174, 178, 254, 255, 
   257, 259, 267, 269, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
   
 };
 
-static const short dep184[] = {
+static const unsigned short dep184[] = {
   76, 77, 96, 100, 101, 103, 104, 254, 255, 267, 269, 270, 271, 272, 
 };
 
-static const short dep185[] = {
+static const unsigned short dep185[] = {
   40, 41, 47, 62, 77, 79, 96, 98, 101, 103, 105, 134, 153, 174, 178, 254, 255, 
   267, 269, 270, 271, 272, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
   
 };
 
-static const short dep186[] = {
+static const unsigned short dep186[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 12467, 20613, 
 };
 
-static const short dep187[] = {
+static const unsigned short dep187[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 6218, 20613, 
 };
 
-static const short dep188[] = {
+static const unsigned short dep188[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 6236, 20613, 
 };
 
-static const short dep189[] = {
+static const unsigned short dep189[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 6256, 8302, 20613, 
 };
 
-static const short dep190[] = {
+static const unsigned short dep190[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 6258, 20613, 
 };
 
-static const short dep191[] = {
+static const unsigned short dep191[] = {
   40, 41, 96, 134, 173, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 6259, 6260, 20613, 
 };
 
-static const short dep192[] = {
+static const unsigned short dep192[] = {
   40, 41, 96, 134, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 10349, 20613, 
 };
 
-static const short dep193[] = {
+static const unsigned short dep193[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 4135, 
   6186, 20613, 
 };
 
-static const short dep194[] = {
+static const unsigned short dep194[] = {
   76, 78, 79, 96, 97, 98, 99, 253, 254, 267, 268, 269, 
 };
 
-static const short dep195[] = {
+static const unsigned short dep195[] = {
   40, 41, 77, 78, 82, 84, 96, 99, 101, 103, 106, 134, 174, 178, 253, 255, 267, 
   268, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep196[] = {
+static const unsigned short dep196[] = {
   76, 78, 79, 80, 96, 97, 98, 99, 102, 253, 254, 256, 267, 268, 269, 
 };
 
-static const short dep197[] = {
+static const unsigned short dep197[] = {
   40, 41, 77, 78, 80, 82, 84, 96, 99, 101, 102, 103, 106, 134, 174, 178, 253, 
   255, 256, 267, 268, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
   
 };
 
-static const short dep198[] = {
+static const unsigned short dep198[] = {
   76, 78, 79, 83, 84, 85, 96, 97, 98, 99, 253, 254, 259, 260, 267, 268, 269, 
   
 };
 
-static const short dep199[] = {
+static const unsigned short dep199[] = {
   40, 41, 77, 78, 82, 84, 96, 99, 101, 134, 174, 178, 253, 255, 258, 260, 267, 
   268, 270, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep200[] = {
+static const unsigned short dep200[] = {
   76, 78, 79, 96, 97, 98, 99, 105, 106, 107, 253, 254, 267, 268, 269, 272, 273, 
   
 };
 
-static const short dep201[] = {
+static const unsigned short dep201[] = {
   40, 41, 77, 78, 96, 99, 101, 103, 106, 134, 174, 178, 253, 255, 267, 268, 
   270, 271, 273, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep202[] = {
+static const unsigned short dep202[] = {
   40, 41, 46, 70, 96, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 20613, 
 };
 
-static const short dep203[] = {
+static const unsigned short dep203[] = {
   40, 41, 96, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 20613, 
 };
 
-static const short dep204[] = {
+static const unsigned short dep204[] = {
   40, 41, 76, 81, 83, 96, 134, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep205[] = {
+static const unsigned short dep205[] = {
   40, 41, 96, 156, 174, 175, 267, 2134, 2135, 2136, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 4135, 16524, 16526, 20613, 
 };
 
-static const short dep206[] = {
+static const unsigned short dep206[] = {
   40, 41, 76, 81, 83, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   4135, 20613, 
 };
 
-static const short dep207[] = {
+static const unsigned short dep207[] = {
   40, 41, 77, 78, 96, 99, 134, 174, 253, 255, 267, 268, 270, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 4135, 20613, 
 };
 
-static const short dep208[] = {
+static const unsigned short dep208[] = {
   40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2312, 
   4135, 20613, 
 };
 
-static const short dep209[] = {
+static const unsigned short dep209[] = {
   5, 96, 186, 267, 2139, 2312, 
 };
 
-static const short dep210[] = {
+static const unsigned short dep210[] = {
   40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 186, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 20613, 
 };
 
-static const short dep211[] = {
+static const unsigned short dep211[] = {
   40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 148, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2312, 4135, 20613, 
 };
 
-static const short dep212[] = {
+static const unsigned short dep212[] = {
   0, 96, 181, 267, 2139, 2312, 
 };
 
-static const short dep213[] = {
+static const unsigned short dep213[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2312, 4135, 20613, 
 };
 
-static const short dep214[] = {
+static const unsigned short dep214[] = {
   0, 40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
   136, 138, 139, 146, 148, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep215[] = {
+static const unsigned short dep215[] = {
   31, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 20613, 
 };
 
-static const short dep216[] = {
+static const unsigned short dep216[] = {
   0, 96, 181, 267, 2312, 26714, 
 };
 
-static const short dep217[] = {
+static const unsigned short dep217[] = {
   0, 96, 108, 181, 267, 274, 
 };
 
-static const short dep218[] = {
+static const unsigned short dep218[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 4135, 20613, 
 };
 
-static const short dep219[] = {
+static const unsigned short dep219[] = {
   0, 5, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 4135, 20613, 
 };
 
-static const short dep220[] = {
+static const unsigned short dep220[] = {
   0, 31, 96, 108, 181, 219, 267, 274, 
 };
 
-static const short dep221[] = {
+static const unsigned short dep221[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 219, 267, 274, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 4135, 20613, 
 };
 
-static const short dep222[] = {
+static const unsigned short dep222[] = {
   0, 96, 108, 181, 267, 274, 2139, 2312, 
 };
 
-static const short dep223[] = {
+static const unsigned short dep223[] = {
   0, 4, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
   136, 138, 139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep224[] = {
+static const unsigned short dep224[] = {
   0, 4, 5, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
   136, 138, 139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep225[] = {
+static const unsigned short dep225[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep226[] = {
+static const unsigned short dep226[] = {
   40, 41, 96, 174, 267, 2134, 2135, 2136, 2165, 2166, 2169, 2172, 2312, 4135, 
   16524, 16526, 20613, 
 };
 
-static const short dep227[] = {
+static const unsigned short dep227[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 267, 274, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2312, 4135, 20613, 
 };
 
-static const short dep228[] = {
+static const unsigned short dep228[] = {
   0, 31, 96, 108, 181, 219, 267, 274, 2139, 2312, 
 };
 
-static const short dep229[] = {
+static const unsigned short dep229[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 219, 267, 274, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep230[] = {
+static const unsigned short dep230[] = {
   40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2310, 
   4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep231[] = {
+static const unsigned short dep231[] = {
   40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 148, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep232[] = {
+static const unsigned short dep232[] = {
   0, 96, 181, 267, 2135, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
 };
 
-static const short dep233[] = {
+static const unsigned short dep233[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep234[] = {
+static const unsigned short dep234[] = {
   0, 40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
   136, 138, 139, 146, 148, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 2310, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
   
 };
 
-static const short dep235[] = {
+static const unsigned short dep235[] = {
   0, 96, 181, 267, 2136, 2310, 18593, 18594, 18746, 18747, 18749, 18750, 
 };
 
-static const short dep236[] = {
+static const unsigned short dep236[] = {
   96, 267, 2135, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 18750, 
   
 };
 
-static const short dep237[] = {
+static const unsigned short dep237[] = {
   40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2310, 
   2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep238[] = {
+static const unsigned short dep238[] = {
   40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 148, 163, 174, 178, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep239[] = {
+static const unsigned short dep239[] = {
   0, 96, 181, 267, 2135, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 
   18750, 
 };
 
-static const short dep240[] = {
+static const unsigned short dep240[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 136, 
   138, 139, 146, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 2166, 2169, 
   2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep241[] = {
+static const unsigned short dep241[] = {
   0, 40, 41, 44, 75, 76, 81, 83, 96, 108, 110, 127, 128, 130, 131, 134, 135, 
   136, 138, 139, 146, 148, 163, 174, 178, 181, 267, 2137, 2138, 2139, 2165, 
   2166, 2169, 2172, 2310, 2312, 4135, 16524, 16526, 18746, 18748, 18749, 18751, 
   20613, 
 };
 
-static const short dep242[] = {
+static const unsigned short dep242[] = {
   0, 96, 181, 267, 2136, 2139, 2310, 2312, 18593, 18594, 18746, 18747, 18749, 
   18750, 
 };
 
-static const short dep243[] = {
+static const unsigned short dep243[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 267, 274, 2134, 2135, 2136, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 4135, 16524, 16526, 20613, 
 };
 
-static const short dep244[] = {
+static const unsigned short dep244[] = {
   40, 41, 75, 96, 134, 148, 174, 267, 2165, 2166, 2169, 2172, 4135, 
 };
 
-static const short dep245[] = {
+static const unsigned short dep245[] = {
   40, 41, 75, 96, 134, 135, 139, 148, 174, 267, 2165, 2166, 2169, 2172, 4135, 
   
 };
 
-static const short dep246[] = {
+static const unsigned short dep246[] = {
   40, 41, 75, 96, 134, 148, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 
   2312, 4135, 20613, 
 };
 
-static const short dep247[] = {
+static const unsigned short dep247[] = {
   40, 41, 75, 96, 134, 135, 139, 148, 174, 267, 2137, 2138, 2139, 2165, 2166, 
   2169, 2172, 2312, 4135, 20613, 
 };
 
-static const short dep248[] = {
+static const unsigned short dep248[] = {
   40, 41, 96, 174, 267, 2137, 2138, 2139, 2165, 2166, 2169, 2172, 2310, 4135, 
   16524, 16526, 18746, 18748, 18749, 18751, 20613, 
 };
 
-static const short dep249[] = {
+static const unsigned short dep249[] = {
   0, 40, 41, 75, 76, 81, 83, 96, 110, 127, 128, 130, 131, 134, 135, 136, 138, 
   139, 146, 163, 174, 178, 181, 267, 274, 2134, 2135, 2136, 2137, 2138, 2139, 
   2165, 2166, 2169, 2172, 2312, 4135, 16524, 16526, 20613, 
 };
 
-static const short dep250[] = {
+static const unsigned short dep250[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
   22, 24, 26, 27, 28, 29, 30, 31, 96, 182, 183, 184, 185, 186, 187, 188, 189, 
   190, 191, 192, 193, 194, 195, 197, 198, 200, 201, 203, 204, 206, 207, 208, 
@@ -1627,7 +1627,7 @@ static const short dep250[] = {
   2312, 28852, 29002, 
 };
 
-static const short dep251[] = {
+static const unsigned short dep251[] = {
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 
   22, 24, 25, 26, 28, 29, 30, 31, 40, 41, 96, 134, 171, 174, 182, 183, 184, 
   185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 197, 198, 200, 201, 
diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
index bfad2f7b4e4..3b99adca4ae 100644
--- a/opcodes/ia64-gen.c
+++ b/opcodes/ia64-gen.c
@@ -1,5 +1,6 @@
 /* ia64-gen.c -- Generate a shrunk set of opcode tables
-   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2004, 2005
+   Free Software Foundation, Inc.
    Written by Bob Manson, Cygnus Solutions, <manson@cygnus.com>
 
    This file is part of GDB, GAS, and the GNU binutils.
@@ -1570,7 +1571,7 @@ print_dependency_table ()
   for (i=0;i < dlistlen;i++)
     {
       int len = 2;
-      printf ("static const short dep%d[] = {\n  ", i);
+      printf ("static const unsigned short dep%d[] = {\n  ", i);
       for (j=0;j < dlists[i]->len; j++)
         {
           len += printf ("%d, ", dlists[i]->deps[j]);
@@ -1913,7 +1914,7 @@ gen_dis_table (ent)
   if ((needed_bytes + insn_list_len) > tot_insn_list_len)
     {
       tot_insn_list_len += 256;
-      insn_list = (char *) xrealloc (insn_list, tot_insn_list_len);
+      insn_list = (unsigned char *) xrealloc (insn_list, tot_insn_list_len);
     }
   our_offset = insn_list_len;
   insn_list_len += needed_bytes;
@@ -2064,7 +2065,7 @@ gen_dis_table (ent)
 	  /* Store the address of the entry being branched to.  */
 	  while (currbits >= 0)
 	    {
-	      char *byte = insn_list + our_offset + bitsused / 8;
+	      unsigned char *byte = insn_list + our_offset + bitsused / 8;
 
 	      if (idest & (1 << currbits))
 		*byte |= (1 << (7 - (bitsused % 8)));
diff --git a/opcodes/maxq-dis.c b/opcodes/maxq-dis.c
index 8e4043361d1..dfdd4d04998 100644
--- a/opcodes/maxq-dis.c
+++ b/opcodes/maxq-dis.c
@@ -1,6 +1,6 @@
 /* Instruction printing code for the MAXQ
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright 2004, 2005 Free Software Foundation, Inc.
 
    Written by Vineet Sharma(vineets@noida.hcltech.com) Inderpreet
    S.(inderpreetb@noida.hcltech.com)
@@ -145,9 +145,9 @@ unsigned char const SIM_ALU_DECODE_POP_OP_GROUP = 10;
 unsigned char const SIM_ALU_DECODE_CMP_SRC_OP_GROUP = 11;
 
 /* GLOBAL */
-unsigned char unres_reg_name[20];
+char unres_reg_name[20];
 
-static unsigned char *
+static char *
 get_reg_name (unsigned char reg_code, type1 arg_pos)
 {
   unsigned char module;
diff --git a/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c
index fe7144ae505..df61847ae35 100644
--- a/opcodes/ns32k-dis.c
+++ b/opcodes/ns32k-dis.c
@@ -1,5 +1,5 @@
 /* Print National Semiconductor 32000 instructions.
-   Copyright 1986, 1988, 1991, 1992, 1994, 1998, 2001, 2002
+   Copyright 1986, 1988, 1991, 1992, 1994, 1998, 2001, 2002, 2005
    Free Software Foundation, Inc.
 
 This file is part of opcodes library.
@@ -33,12 +33,12 @@ static disassemble_info *dis_info;
 /*
  * Hacks to get it to compile <= READ THESE AS FIXES NEEDED
  */
-#define INVALID_FLOAT(val, size) invalid_float((char *)val, size)
+#define INVALID_FLOAT(val, size) invalid_float((bfd_byte *)val, size)
 
 static int print_insn_arg
-  PARAMS ((int, int, int *, char *, bfd_vma, char *, int));
-static int get_displacement PARAMS ((char *, int *));
-static int invalid_float PARAMS ((char *, int));
+  PARAMS ((int, int, int *, bfd_byte *, bfd_vma, char *, int));
+static int get_displacement PARAMS ((bfd_byte *, int *));
+static int invalid_float PARAMS ((bfd_byte *, int));
 static long int read_memory_integer PARAMS ((unsigned char *, int));
 static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
 struct ns32k_option;
@@ -46,7 +46,7 @@ static void optlist PARAMS ((int, const struct ns32k_option *, char *));
 static void list_search PARAMS ((int, const struct ns32k_option *, char *));
 static int bit_extract PARAMS ((bfd_byte *, int, int));
 static int bit_extract_simple PARAMS ((bfd_byte *, int, int));
-static void bit_copy PARAMS ((char *, int, int, char *));
+static void bit_copy PARAMS ((bfd_byte *, int, int, char *));
 static int sign_extend PARAMS ((int, int));
 static void flip_bytes PARAMS ((char *, int));
 
@@ -340,7 +340,7 @@ bit_extract_simple (buffer, offset, count)
 
 static void
 bit_copy (buffer, offset, count, to)
-     char *buffer;
+     bfd_byte *buffer;
      int offset;
      int count;
      char *to;
@@ -551,7 +551,7 @@ static int
 print_insn_arg (d, ioffset, aoffsetp, buffer, addr, result, index_offset)
      int d;
      int ioffset, *aoffsetp;
-     char *buffer;
+     bfd_byte *buffer;
      bfd_vma addr;
      char *result;
      int index_offset;
@@ -827,7 +827,7 @@ print_insn_arg (d, ioffset, aoffsetp, buffer, addr, result, index_offset)
 
 static int
 get_displacement (buffer, aoffsetp)
-     char *buffer;
+     bfd_byte *buffer;
      int *aoffsetp;
 {
   int Ivalue;
@@ -861,7 +861,7 @@ get_displacement (buffer, aoffsetp)
 #if 1 /* a version that should work on ns32k f's&d's on any machine */
 static int
 invalid_float (p, len)
-     register char *p;
+     register bfd_byte *p;
      register int len;
 {
   register int val;
diff --git a/opcodes/w65-dis.c b/opcodes/w65-dis.c
index 3f2affa8082..97ad74ec20a 100644
--- a/opcodes/w65-dis.c
+++ b/opcodes/w65-dis.c
@@ -1,5 +1,6 @@
 /* Disassemble WDC 65816 instructions.
-   Copyright 1995, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1995, 1998, 2000, 2001, 2002, 2005
+   Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@ static fprintf_ftype fpr;
 static void *stream;
 static struct disassemble_info *local_info;
 
-static void print_operand PARAMS ((int, char *, unsigned int *));
+static void print_operand PARAMS ((int, char *, int *));
 
 #if 0
 static char *lname[] = { "r0","r1","r2","r3","r4","r5","r6","r7","s0" };
@@ -45,7 +46,7 @@ static void
 print_operand (lookup, format, args)
      int lookup;
      char *format;
-     unsigned int *args;
+     int *args;
 {
   int val;
   int c;