For include/opcode:

	* d30v.h: Fix declaration of reg_name_cnt.

	* d10v.h: Fix declaration of d10v_reg_name_cnt.

	* arc.h: Add prototypes from opcodes/arc-opc.c.

For opcodes:
	* tic54x-dis.c: Add unused attributes where needed.

	* z8k-dis.c (output_instr): Add unused attribute.

	* h8300-dis.c: Add missing prototypes.
	(bfd_h8_disassemble): Make static.

	* cris-dis.c: Add missing prototype.
	* h8500-dis.c: Likewise.
	* m68hc11-dis.c: Likewise.
	* pj-dis.c: Likewise.
	* tic54x-dis.c: Likewise.
	* v850-dis.c: Likewise.
	* vax-dis.c: Likewise.
	* w65-dis.c: Likewise.
	* z8k-dis.c: Likewise.

	* d10v-dis.c: Add missing prototype.
	(dis_long): Remove unused variable.
	(dis_2_short): Likewise.

	* sh-dis.c: Add missing prototypes.
	* v850-opc.c: Likewise.
	Add unused attributes where needed.

	* ns32k-dis.c: Add missing prototypes.
	(bit_extract_simple): Remove unused variable.

14 files changed, 165 insertions, 61 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ec5bdcc..9949ecf 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,33 @@
+2001-08-25  Andreas Jaeger  <aj@suse.de>
+
+	* tic54x-dis.c: Add unused attributes where needed.
+
+	* z8k-dis.c (output_instr): Add unused attribute.
+
+	* h8300-dis.c: Add missing prototypes.
+	(bfd_h8_disassemble): Make static.
+
+	* cris-dis.c: Add missing prototype.
+	* h8500-dis.c: Likewise.
+	* m68hc11-dis.c: Likewise.
+	* pj-dis.c: Likewise.
+	* tic54x-dis.c: Likewise.
+	* v850-dis.c: Likewise.
+	* vax-dis.c: Likewise.
+	* w65-dis.c: Likewise.
+	* z8k-dis.c: Likewise.
+
+	* d10v-dis.c: Add missing prototype.
+	(dis_long): Remove unused variable.
+	(dis_2_short): Likewise.
+
+	* sh-dis.c: Add missing prototypes.
+	* v850-opc.c: Likewise.
+	Add unused attributes where needed.
+
+	* ns32k-dis.c: Add missing prototypes.
+	(bit_extract_simple): Remove unused variable.
+
 2001-08-23  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* opcodes/s390-opc.c: Add "low or high" and "not low or high"
diff --git a/opcodes/cris-dis.c b/opcodes/cris-dis.c
index 68c8899..dcd9911 100644
--- a/opcodes/cris-dis.c
+++ b/opcodes/cris-dis.c
@@ -7,7 +7,7 @@ This file is part of the GNU binutils and GDB, the GNU debugger.
 
 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 the Free
-Software Foundation; either version 2 of the License, or (at your option)
+Software Foundation; either version 2, or (at your option)
 any later version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
@@ -97,6 +97,8 @@ static int print_insn_cris_with_register_prefix
   PARAMS ((bfd_vma, disassemble_info *));
 static int print_insn_cris_without_register_prefix
   PARAMS ((bfd_vma, disassemble_info *));
+static const struct cris_opcode *get_opcode_entry
+  PARAMS ((unsigned int, unsigned int));
 
 /* Return the descriptor of a special register.
    FIXME: Depend on a CPU-version specific argument when all machinery
diff --git a/opcodes/d10v-dis.c b/opcodes/d10v-dis.c
index 31ce526..29996ad 100644
--- a/opcodes/d10v-dis.c
+++ b/opcodes/d10v-dis.c
@@ -29,6 +29,9 @@ static void dis_2_short PARAMS ((unsigned long insn, bfd_vma memaddr,
 				 struct disassemble_info *info, int order));
 static void dis_long PARAMS ((unsigned long insn, bfd_vma memaddr,
 			      struct disassemble_info *info));
+static void print_operand
+  PARAMS ((struct d10v_operand *, long unsigned int, struct d10v_opcode *,
+	   bfd_vma, struct disassemble_info *));
 
 int
 print_insn_d10v (memaddr, info)
@@ -192,7 +195,6 @@ dis_long (insn, memaddr, info)
      struct disassemble_info *info;
 {
   int i;
-  char buf[32];
   struct d10v_opcode *op = (struct d10v_opcode *) d10v_opcodes;
   struct d10v_operand *oper;
   int need_paren = 0;
@@ -235,10 +237,8 @@ dis_2_short (insn, memaddr, info, order)
      int order;
 {
   int i, j;
-  char astr[2][32];
   unsigned int ins[2];
   struct d10v_opcode *op;
-  char buf[32];
   int match, num_match = 0;
   struct d10v_operand *oper;
   int need_paren = 0;
diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
index ab95db4..c521c77 100644
--- a/opcodes/h8300-dis.c
+++ b/opcodes/h8300-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble h8300 instructions.
-   Copyright 1993, 1994, 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1996, 1998, 2000, 2001 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
@@ -23,6 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "dis-asm.h"
 #include "opintl.h"
 
+static void bfd_h8_disassemble_init PARAMS ((void));
+static unsigned int bfd_h8_disassemble
+  PARAMS ((bfd_vma, disassemble_info *, int));
+
 /* Run through the opcodes and sort them into order to make them easy
    to disassemble.  */
 static void
@@ -58,7 +62,7 @@ bfd_h8_disassemble_init ()
     }
 }
 
-unsigned int
+static unsigned int
 bfd_h8_disassemble (addr, info, mode)
      bfd_vma addr;
      disassemble_info *info;
diff --git a/opcodes/h8500-dis.c b/opcodes/h8500-dis.c
index 437207c..6237182 100644
--- a/opcodes/h8500-dis.c
+++ b/opcodes/h8500-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble h8500 instructions.
-   Copyright 1993, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1993, 1998, 2000, 2001 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
@@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <setjmp.h>
 
+static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+
 struct private
 {
   /* Points to first byte not fetched.  */
diff --git a/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c
index 610e373..53367ab 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
+   Copyright 1986, 1988, 1991, 1992, 1994, 1998, 2001
    Free Software Foundation, Inc.
 
 This file is part of opcodes library.
@@ -39,6 +39,16 @@ 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));
+static long int read_memory_integer PARAMS ((unsigned char *, int));
+static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+struct ns32k_option;
+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 int sign_extend PARAMS ((int, int));
+static void flip_bytes PARAMS ((char *, int));
 
 static long read_memory_integer(addr, nr)
      unsigned char *addr;
@@ -308,7 +318,6 @@ bit_extract_simple (buffer, offset, count)
      int count;
 {
   int result;
-  int mask;
   int bit;
 
   buffer += offset >> 3;
diff --git a/opcodes/pj-dis.c b/opcodes/pj-dis.c
index d46c5f9..b8b81a9 100644
--- a/opcodes/pj-dis.c
+++ b/opcodes/pj-dis.c
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 extern const pj_opc_info_t pj_opc_info[512];
 
+static int get_int PARAMS ((bfd_vma, int *, struct disassemble_info *));
+
+
 static int
 get_int (memaddr, iptr, info)
      bfd_vma memaddr;
diff --git a/opcodes/sh-dis.c b/opcodes/sh-dis.c
index 80ccfdc..e5fa9d2 100644
--- a/opcodes/sh-dis.c
+++ b/opcodes/sh-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble SH instructions.
-   Copyright 1993, 1994, 1995, 1997, 1998, 2000
+   Copyright 1993, 1994, 1995, 1997, 1998, 2000, 2001
    Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define LITTLE_BIT 2
 
+static void print_movxy
+  PARAMS ((sh_opcode_info *, int, int, fprintf_ftype, void *));
+static void print_insn_ddt PARAMS ((int, struct disassemble_info *));
+static void print_dsp_reg PARAMS ((int, fprintf_ftype, void *));
+static void print_insn_ppi PARAMS ((int, struct disassemble_info *));
+static int print_insn_shx PARAMS ((bfd_vma, struct disassemble_info *));
+
 static void
 print_movxy (op, rn, rm, fprintf_fn, stream)
      sh_opcode_info *op;
diff --git a/opcodes/tic54x-dis.c b/opcodes/tic54x-dis.c
index 5c099d9..1db79e8 100644
--- a/opcodes/tic54x-dis.c
+++ b/opcodes/tic54x-dis.c
@@ -1,5 +1,5 @@
 /* Disassembly routines for TMS320C54X architecture
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Timothy Wall (twall@cygnus.com)
 
    This program is free software; you can redistribute it and/or modify
@@ -31,20 +31,21 @@ typedef struct _instruction {
   partemplate *ptm;
 } instruction;
 
+static int has_lkaddr PARAMS ((unsigned short, template *));
 static int get_insn_size PARAMS ((unsigned short, instruction *));
-static int get_instruction PARAMS ((disassemble_info *, bfd_vma, 
+static int get_instruction PARAMS ((disassemble_info *, bfd_vma,
                                     unsigned short, instruction *));
-static int print_instruction PARAMS ((disassemble_info *, bfd_vma, 
-                                      unsigned short, char *, 
+static int print_instruction PARAMS ((disassemble_info *, bfd_vma,
+                                      unsigned short, char *,
                                       enum optype [], int, int));
 static int print_parallel_instruction PARAMS ((disassemble_info *, bfd_vma,
                                                unsigned short, partemplate *,
-                                               int)); 
-static int sprint_dual_address (disassemble_info *,char [], 
+                                               int));
+static int sprint_dual_address (disassemble_info *,char [],
                                 unsigned short);
-static int sprint_indirect_address (disassemble_info *,char [], 
+static int sprint_indirect_address (disassemble_info *,char [],
                                     unsigned short);
-static int sprint_direct_address (disassemble_info *,char [], 
+static int sprint_direct_address (disassemble_info *,char [],
                                   unsigned short);
 static int sprint_mmr (disassemble_info *,char [],int);
 static int sprint_condition (disassemble_info *,char *,unsigned short);
@@ -55,7 +56,7 @@ print_insn_tic54x (memaddr, info)
   bfd_vma memaddr;
   disassemble_info *info;
 {
-  bfd_byte opbuf[2]; 
+  bfd_byte opbuf[2];
   unsigned short opcode;
   int status, size;
   instruction insn;
@@ -84,8 +85,8 @@ print_insn_tic54x (memaddr, info)
   }
   else
   {
-    if (!print_instruction (info, memaddr, opcode, 
-                            (char *) insn.tm->name, 
+    if (!print_instruction (info, memaddr, opcode,
+                            (char *) insn.tm->name,
                             insn.tm->operand_types,
                             size, (insn.tm->flags & FL_EXT)))
       return -1;
@@ -108,7 +109,7 @@ has_lkaddr (opcode, tm)
 
 /* always returns 1 (whether an insn template was found) since we provide an
    "unknown instruction" template */
-static int 
+static int
 get_instruction (info, addr, opcode, insn)
   disassemble_info *info;
   bfd_vma addr;
@@ -162,7 +163,7 @@ get_instruction (info, addr, opcode, insn)
   return 1;
 }
 
-static int 
+static int
 get_insn_size (opcode, insn)
   unsigned short opcode;
   instruction *insn;
@@ -248,11 +249,11 @@ print_instruction (info, memaddr, opcode, tm_name, tm_operands, size, ext)
                   if (mod == 15)
                       info->fprintf_func (info->stream, "*(");
                   else
-                      info->fprintf_func (info->stream, "*%sar%d(", 
+                      info->fprintf_func (info->stream, "*%sar%d(",
                                           (mod == 13 || mod == 14 ? "+" : ""),
                                           arf);
                   (*(info->print_address_func)) ((bfd_vma) addr, info);
-                  info->fprintf_func (info->stream, ")%s", 
+                  info->fprintf_func (info->stream, ")%s",
                                       mod == 14 ? "%" : "");
                 }
               else
@@ -407,7 +408,7 @@ print_instruction (info, memaddr, opcode, tm_name, tm_operands, size, ext)
             break;
           }
         case OP_k5:
-          sprintf (operand[i], "#%d", 
+          sprintf (operand[i], "#%d",
                    (int) (((signed char) opcode & 0x1F) << 3) >> 3);
           info->fprintf_func (info->stream, "%s%s", comma, operand[i]);
           break;
@@ -431,15 +432,15 @@ print_instruction (info, memaddr, opcode, tm_name, tm_operands, size, ext)
         case OP_SBIT:
         {
           const char *status0[] = {
-            "0", "1", "2", "3", "4", "5", "6", "7", "8", 
+            "0", "1", "2", "3", "4", "5", "6", "7", "8",
             "ovb", "ova", "c", "tc", "13", "14", "15"
           };
           const char *status1[] = {
-            "0", "1", "2", "3", "4", 
+            "0", "1", "2", "3", "4",
             "cmpt", "frct", "c16", "sxm", "ovm", "10",
             "intm", "hm", "xf", "cpl", "braf"
           };
-          sprintf (operand[i], "%s", 
+          sprintf (operand[i], "%s",
                    n ? status1[SBIT (opcode)] : status0[SBIT (opcode)]);
           info->fprintf_func (info->stream, "%s%s", comma, operand[i]);
           break;
@@ -487,16 +488,16 @@ print_parallel_instruction (info, memaddr, opcode, ptm, size)
   partemplate *ptm;
   int size;
 {
-  print_instruction (info, memaddr, opcode, 
+  print_instruction (info, memaddr, opcode,
                      ptm->name, ptm->operand_types, size, 0);
   info->fprintf_func (info->stream, " || ");
-  return print_instruction (info, memaddr, opcode, 
+  return print_instruction (info, memaddr, opcode,
                             ptm->parname, ptm->paroperand_types, size, 0);
 }
 
 static int
 sprint_dual_address (info, buf, code)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char buf[];
   unsigned short code;
 {
@@ -511,7 +512,7 @@ sprint_dual_address (info, buf, code)
 
 static int
 sprint_indirect_address (info, buf, opcode)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char buf[];
   unsigned short opcode;
 {
@@ -534,7 +535,7 @@ sprint_indirect_address (info, buf, opcode)
 
 static int
 sprint_direct_address (info, buf, opcode)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char buf[];
   unsigned short opcode;
 {
@@ -544,7 +545,7 @@ sprint_direct_address (info, buf, opcode)
 
 static int
 sprint_mmr (info, buf, mmr)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char buf[];
   int mmr;
 {
@@ -564,7 +565,7 @@ sprint_mmr (info, buf, mmr)
 
 static int
 sprint_cc2 (info, buf, opcode)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char *buf;
   unsigned short opcode;
 {
@@ -577,7 +578,7 @@ sprint_cc2 (info, buf, opcode)
 
 static int
 sprint_condition (info, buf, opcode)
-  disassemble_info *info;
+  disassemble_info *info ATTRIBUTE_UNUSED;
   char *buf;
   unsigned short opcode;
 {
@@ -597,15 +598,15 @@ sprint_condition (info, buf, opcode)
   else if (opcode & 0x3F)
     {
       if (opcode & 0x30)
-        buf += sprintf (buf, "%s%s", 
+        buf += sprintf (buf, "%s%s",
                         ((opcode & 0x30) == 0x30) ? "tc" : "ntc",
                         (opcode & 0x0F) ? ", " : "");
       if (opcode & 0x0C)
-        buf += sprintf (buf, "%s%s", 
+        buf += sprintf (buf, "%s%s",
                         ((opcode & 0x0C) == 0x0C) ? "c" : "nc",
                         (opcode & 0x03) ? ", " : "");
       if (opcode & 0x03)
-        buf += sprintf (buf, "%s", 
+        buf += sprintf (buf, "%s",
                         ((opcode & 0x03) == 0x03) ? "bio" : "nbio");
     }
   else
diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c
index 0f68867..e72b1e8 100644
--- a/opcodes/v850-dis.c
+++ b/opcodes/v850-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble V850 instructions.
-   Copyright 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001 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
@@ -41,6 +41,9 @@ static const char *const v850_cc_names[] =
 { "v", "c/l", "z", "nh", "s/n", "t", "lt", "le", 
   "nv", "nc/nl", "nz", "h", "ns/p", "sa", "ge", "gt" };
 
+static int disassemble
+  PARAMS ((bfd_vma, struct disassemble_info *, unsigned long));
+
 static int
 disassemble (memaddr, info, insn)
      bfd_vma memaddr;
diff --git a/opcodes/v850-opc.c b/opcodes/v850-opc.c
index 20a4d6d..b77a280 100644
--- a/opcodes/v850-opc.c
+++ b/opcodes/v850-opc.c
@@ -1,5 +1,5 @@
 /* Assemble V850 instructions.
-   Copyright 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001 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
@@ -34,6 +34,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* two-word opcodes */
 #define two(x,y)	((unsigned int) (x) | ((unsigned int) (y) << 16))
 
+static long unsigned int insert_d9
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d9
+  PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d22
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d22
+  PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d16_15
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d16_15
+  PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d8_7
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d8_7 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d8_6
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d8_6 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d5_4
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d5_4 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_d16_16
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_d16_16 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_i9
+  PARAMS ((long unsigned int, long int, const char **));
+static long unsigned int extract_i9 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_u9
+  PARAMS ((long unsigned int, long unsigned int, const char **));
+static long unsigned int extract_u9 PARAMS ((long unsigned int, int *));
+static long unsigned int insert_spe
+  PARAMS ((long unsigned int, long unsigned int, const char **));
+static long unsigned int extract_spe PARAMS ((long unsigned int, int *));
+static long unsigned int insert_i5div
+  PARAMS ((long unsigned int, long unsigned int, const char **));
+static long unsigned int extract_i5div PARAMS ((long unsigned int, int *));
 
 
 /* The functions used to insert and extract complicated operands.  */
@@ -71,7 +107,7 @@ insert_d9 (insn, value, errmsg)
 static unsigned long
 extract_d9 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = ((insn & 0xf800) >> 7) | ((insn & 0x0070) >> 3);
 
@@ -103,7 +139,7 @@ insert_d22 (insn, value, errmsg)
 static unsigned long
 extract_d22 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   signed long ret = ((insn & 0xfffe0000) >> 16) | ((insn & 0x3f) << 16);
 
@@ -132,7 +168,7 @@ insert_d16_15 (insn, value, errmsg)
 static unsigned long
 extract_d16_15 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   signed long ret = (insn & 0xfffe0000);
 
@@ -163,7 +199,7 @@ insert_d8_7 (insn, value, errmsg)
 static unsigned long
 extract_d8_7 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = (insn & 0x7f);
 
@@ -194,7 +230,7 @@ insert_d8_6 (insn, value, errmsg)
 static unsigned long
 extract_d8_6 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = (insn & 0x7e);
 
@@ -225,7 +261,7 @@ insert_d5_4 (insn, value, errmsg)
 static unsigned long
 extract_d5_4 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = (insn & 0x0f);
 
@@ -247,7 +283,7 @@ insert_d16_16 (insn, value, errmsg)
 static unsigned long
 extract_d16_16 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   signed long ret = insn & 0xfffe0000;
 
@@ -273,7 +309,7 @@ insert_i9 (insn, value, errmsg)
 static unsigned long
 extract_i9 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   signed long ret = insn & 0x003c0000;
 
@@ -300,7 +336,7 @@ insert_u9 (insn, value, errmsg)
 static unsigned long
 extract_u9 (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = insn & 0x003c0000;
 
@@ -325,8 +361,8 @@ insert_spe (insn, value, errmsg)
 
 static unsigned long
 extract_spe (insn, invalid)
-     unsigned long insn;
-     int *         invalid;
+     unsigned long insn ATTRIBUTE_UNUSED;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   return 3;
 }
@@ -355,7 +391,7 @@ insert_i5div (insn, value, errmsg)
 static unsigned long
 extract_i5div (insn, invalid)
      unsigned long insn;
-     int *         invalid;
+     int *         invalid ATTRIBUTE_UNUSED;
 {
   unsigned long ret = insn & 0x3c0000;
 
diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c
index e33f87e..9c9be01 100644
--- a/opcodes/vax-dis.c
+++ b/opcodes/vax-dis.c
@@ -21,12 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "dis-asm.h"
 
 /* Local function prototypes */
-static int
-print_insn_arg PARAMS ((const char *, unsigned char *, bfd_vma,
-			disassemble_info *));
+static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+static int print_insn_arg
+  PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *));
+static int print_insn_mode
+  PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *));
 
-static int
-print_insn_mode PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *));
 
 static char *reg_names[] =
 {
diff --git a/opcodes/w65-dis.c b/opcodes/w65-dis.c
index 8f08d63..8e9c724 100644
--- a/opcodes/w65-dis.c
+++ b/opcodes/w65-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble WDC 65816 instructions.
-   Copyright 1995, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1998, 2000, 2001 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
@@ -26,6 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static fprintf_ftype fpr;
 static void *stream;
 static struct disassemble_info *local_info;
+
+static void print_operand PARAMS ((int, char *, unsigned int *));
+
 #if 0
 static char *lname[] = { "r0","r1","r2","r3","r4","r5","r6","r7","s0" };
 
diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index 754540f..dcba775 100644
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -50,6 +50,9 @@ typedef struct {
   unsigned long interrupts;
 } instr_data_s;
 
+static int fetch_data PARAMS ((struct disassemble_info *, int));
+
+
 /* Make sure that bytes from INFO->PRIVATE_DATA->BUFFER (inclusive)
    to ADDR (exclusive) are valid.  Returns 1 for success, longjmps
    on error.  */
@@ -134,6 +137,7 @@ static char *ctrl_names[8] = {
 };
 
 static int seg_length;
+static int print_insn_z8k PARAMS ((bfd_vma, disassemble_info *, int));
 int z8k_lookup_instr PARAMS ((unsigned char *, disassemble_info *));
 static void output_instr
   PARAMS ((instr_data_s *, unsigned long, disassemble_info *));
@@ -274,7 +278,7 @@ z8k_lookup_instr (nibbles, info)
 static void
 output_instr (instr_data, addr, info)
      instr_data_s *instr_data;
-     unsigned long addr;
+     unsigned long addr ATTRIBUTE_UNUSED;
      disassemble_info *info;
 {
   int loop, loop_limit;