Add missing protypes

1 files changed, 109 insertions, 103 deletions

diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
index dc651cc..e431339 100644
--- a/bfd/aout-ns32k.c
+++ b/bfd/aout-ns32k.c
@@ -1,5 +1,5 @@
 /* BFD back-end for ns32k a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 2000
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 2000, 2001
    Free Software Foundation, Inc.
    Contributed by Ian Dall (idall@eleceng.adelaide.edu.au).
 
@@ -35,9 +35,8 @@ boolean
 MYNS(write_object_contents)
   PARAMS((bfd *abfd));
 
-/* Avoid multiple definitions from aoutx if supporting standard a.out format(s)
- * as well as this one
- */
+/* Avoid multiple definitions from aoutx if supporting
+   standard a.out format(s) as well as this one.  */
 #define NAME(x,y) CAT3(ns32kaout,_32_,y)
 
 void bfd_ns32k_arch PARAMS ((void));
@@ -53,99 +52,102 @@ static void
 MY_swap_std_reloc_in PARAMS ((bfd *abfd, struct reloc_std_external *bytes,
 			      arelent *cache_ptr, asymbol **symbols,
 			      bfd_size_type symcount));
-
 static void
 MY_swap_std_reloc_out PARAMS ((bfd *abfd, arelent *g,
 			       struct reloc_std_external *natptr));
+reloc_howto_type *
+MY(reloc_howto) PARAMS ((bfd *, struct reloc_std_external *,
+			 int *, int *, int *));
+void
+MY(put_reloc) PARAMS ((bfd *, int, int, long, reloc_howto_type *,
+		       struct reloc_std_external *));
 
 /* The ns32k series is ah, unusual, when it comes to relocation.
- * There are three storage methods for relocateable objects.  There
- * are displacements, immediate operands and ordinary twos complement
- * data. Of these, only the last fits into the standard relocation
- * scheme.  Immediate operands are stored huffman encoded and
- * immediate operands are stored big endian (where as the natural byte
- * order is little endian for this achitecture).
-
- * Note that the ns32k displacement storage method is orthogonal to
- * whether the relocation is pc relative or not. The "displacement"
- * storage scheme is used for essentially all address constants. The
- * displacement can be relative to zero (absolute displacement),
- * relative to the pc (pc relative), the stack pointer, the frame
- * pointer, the static base register and general purpose register etc.
-
- * For example:
- *
- *  sym1: .long .	# pc relative 2's complement
- *  sym1: .long foo	# 2's complement not pc relative
- *
- *  self:  movd @self, r0 # pc relative displacement
- *	   movd foo, r0 # non pc relative displacement
- *
- *  self:  movd self, r0 # pc relative immediate
- *         movd foo, r0 # non pc relative immediate
- *
- * In addition, for historical reasons the encoding of the relocation types
- * in the a.out format relocation entries is such that even the relocation
- * methods which are standard are not encoded the standard way.
- *
- */
+   There are three storage methods for relocateable objects.  There
+   are displacements, immediate operands and ordinary twos complement
+   data. Of these, only the last fits into the standard relocation
+   scheme.  Immediate operands are stored huffman encoded and
+   immediate operands are stored big endian (where as the natural byte
+   order is little endian for this achitecture).
+
+   Note that the ns32k displacement storage method is orthogonal to
+   whether the relocation is pc relative or not. The "displacement"
+   storage scheme is used for essentially all address constants. The
+   displacement can be relative to zero (absolute displacement),
+   relative to the pc (pc relative), the stack pointer, the frame
+   pointer, the static base register and general purpose register etc.
+
+   For example:
+   
+   sym1: .long .	 # pc relative 2's complement
+   sym1: .long foo	 # 2's complement not pc relative
+ 
+   self:  movd @self, r0 # pc relative displacement
+          movd foo, r0   # non pc relative displacement
+
+   self:  movd self, r0  # pc relative immediate
+          movd foo, r0   # non pc relative immediate
+ 
+   In addition, for historical reasons the encoding of the relocation types
+   in the a.out format relocation entries is such that even the relocation
+   methods which are standard are not encoded the standard way. */
 
 reloc_howto_type MY(howto_table)[] =
-{
-  /* ns32k immediate operands */
-  HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, false, 0, true,
-	 _bfd_ns32k_reloc_imm, "NS32K_IMM_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, false, 0, true,
-	 _bfd_ns32k_reloc_imm,  "NS32K_IMM_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, false, 0, true,
-	 _bfd_ns32k_reloc_imm, "NS32K_IMM_32",
-	 true, 0xffffffff,0xffffffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8",
-	 true, 0x000000ff, 0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32",
-	 true, 0xffffffff,0xffffffff, false),
-
-  /* ns32k displacements */
-  HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 8, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 16, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_16",
-	 true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 32, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_32",
-	 true, 0xffffffff, 0xffffffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 8, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 16, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 32, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_32",
-	 true, 0xffffffff,0xffffffff, false),
-
-  /* Normal 2's complement */
-  HOWTO (BFD_RELOC_8, 0, 0, 8, false, 0, complain_overflow_bitfield,0,
-	 "8", true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_16, 0, 1, 16, false, 0, complain_overflow_bitfield,0,
-	 "16", true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,
-	 "32", true, 0xffffffff,0xffffffff, false),
-  HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, true, 0, complain_overflow_signed, 0,
-	 "PCREL_8", true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, true, 0, complain_overflow_signed, 0,
-	 "PCREL_16", true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, true, 0, complain_overflow_signed, 0,
-	 "PCREL_32", true, 0xffffffff,0xffffffff, false),
-};
+  {
+    /* ns32k immediate operands.  */
+    HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, false, 0, true,
+	   _bfd_ns32k_reloc_imm, "NS32K_IMM_8",
+	   true, 0x000000ff,0x000000ff, false),
+    HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, false, 0, true,
+	   _bfd_ns32k_reloc_imm,  "NS32K_IMM_16",
+	   true, 0x0000ffff,0x0000ffff, false),
+    HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, false, 0, true,
+	   _bfd_ns32k_reloc_imm, "NS32K_IMM_32",
+	   true, 0xffffffff,0xffffffff, false),
+    HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, true, 0, false,
+	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8",
+	   true, 0x000000ff, 0x000000ff, false),
+    HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, true, 0, false,
+	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16",
+	   true, 0x0000ffff,0x0000ffff, false),
+    HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, true, 0, false,
+	   _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32",
+	   true, 0xffffffff,0xffffffff, false),
+
+    /* ns32k displacements.  */
+    HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 8, false, 0, true,
+	   _bfd_ns32k_reloc_disp, "NS32K_DISP_8",
+	   true, 0x000000ff,0x000000ff, false),
+    HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 16, false, 0, true,
+	   _bfd_ns32k_reloc_disp, "NS32K_DISP_16",
+	   true, 0x0000ffff, 0x0000ffff, false),
+    HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 32, false, 0, true,
+	   _bfd_ns32k_reloc_disp, "NS32K_DISP_32",
+	   true, 0xffffffff, 0xffffffff, false),
+    HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 8, true, 0, false,
+	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8",
+	   true, 0x000000ff,0x000000ff, false),
+    HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 16, true, 0, false,
+	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16",
+	   true, 0x0000ffff,0x0000ffff, false),
+    HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 32, true, 0, false,
+	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_32",
+	   true, 0xffffffff,0xffffffff, false),
+
+    /* Normal 2's complement.  */
+    HOWTO (BFD_RELOC_8, 0, 0, 8, false, 0, complain_overflow_bitfield,0,
+	   "8", true, 0x000000ff,0x000000ff, false),
+    HOWTO (BFD_RELOC_16, 0, 1, 16, false, 0, complain_overflow_bitfield,0,
+	   "16", true, 0x0000ffff,0x0000ffff, false),
+    HOWTO (BFD_RELOC_32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,
+	   "32", true, 0xffffffff,0xffffffff, false),
+    HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, true, 0, complain_overflow_signed, 0,
+	   "PCREL_8", true, 0x000000ff,0x000000ff, false),
+    HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, true, 0, complain_overflow_signed, 0,
+	   "PCREL_16", true, 0x0000ffff,0x0000ffff, false),
+    HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, true, 0, complain_overflow_signed, 0,
+	   "PCREL_32", true, 0xffffffff,0xffffffff, false),
+  };
 
 #define CTOR_TABLE_RELOC_HOWTO(BFD) (MY(howto_table) + 14)
 
@@ -164,7 +166,8 @@ MY(reloc_howto) (abfd, rel, r_index, r_extern, r_pcrel)
 {
   unsigned int r_length;
   int r_ns32k_type;
-/*  BFD_ASSERT(bfd_header_little_endian (abfd)); */
+
+  /*  BFD_ASSERT(bfd_header_little_endian (abfd)); */
   *r_index =  ((rel->r_index[2] << 16)
 	       | (rel->r_index[1] << 8)
 	       |  rel->r_index[0] );
@@ -191,11 +194,13 @@ MY(put_reloc) (abfd, r_extern, r_index, value, howto, reloc)
   unsigned int r_length;
   int r_pcrel;
   int r_ns32k_type;
+
   PUT_WORD (abfd, value, reloc->r_address);
-  r_length = howto->size ;	/* Size as a power of two */
-  r_pcrel  = (int) howto->pc_relative; /* Relative to PC? */
+  r_length = howto->size ;	/* Size as a power of two.  */
+  r_pcrel  = (int) howto->pc_relative; /* Relative to PC?  */
   r_ns32k_type = (howto - MY(howto_table) )/6;
-/*  BFD_ASSERT (bfd_header_little_endian (abfd)); */
+
+  /*  BFD_ASSERT (bfd_header_little_endian (abfd)); */
   reloc->r_index[2] = r_index >> 16;
   reloc->r_index[1] = r_index >> 8;
   reloc->r_index[0] = r_index;
@@ -233,6 +238,8 @@ MY(bfd_reloc_type_lookup) (abfd,code)
       case 32:
 	code = BFD_RELOC_32;
 	break;
+      default:
+	break;
       }
   switch (code)
     {
@@ -254,7 +261,8 @@ MY(bfd_reloc_type_lookup) (abfd,code)
       ENTRY(BFD_RELOC_8_PCREL, 15);
       ENTRY(BFD_RELOC_16_PCREL, 16);
       ENTRY(BFD_RELOC_32_PCREL, 17);
-    default: return (reloc_howto_type *) NULL;
+    default:
+      return (reloc_howto_type *) NULL;
     }
 #undef ENTRY
 }
@@ -274,11 +282,10 @@ MY_swap_std_reloc_in (abfd, bytes, cache_ptr, symbols, symcount)
 
   cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
 
-  /* now the fun stuff */
-
+  /* Now the fun stuff.  */
   cache_ptr->howto = MY_reloc_howto(abfd, bytes, r_index, r_extern, r_pcrel);
 
-  MOVE_ADDRESS(0);
+  MOVE_ADDRESS (0);
 }
 
 static void
@@ -295,7 +302,7 @@ MY_swap_std_reloc_out (abfd, g, natptr)
 
   r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
 
-  /* name was clobbered by aout_write_syms to be symbol index */
+  /* Name was clobbered by aout_write_syms to be symbol index.  */
 
   /* If this relocation is relative to a symbol then set the
      r_index to the symbols index, and the r_extern bit.
@@ -303,7 +310,6 @@ MY_swap_std_reloc_out (abfd, g, natptr)
      Absolute symbols can come in in two ways, either as an offset
      from the abs section, or as a symbol which has an abs value.
      Check for that here.  */
-
   if (bfd_is_com_section (output_section)
       || output_section == &bfd_abs_section
       || output_section == &bfd_und_section)
@@ -311,13 +317,13 @@ MY_swap_std_reloc_out (abfd, g, natptr)
       if (bfd_abs_section.symbol == sym)
 	{
 	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section */
+	     from the abs section.  */
 	  r_index = 0;
 	  r_extern = 0;
 	}
       else
 	{
-	  /* Fill in symbol */
+	  /* Fill in symbol.  */
 	  r_extern = 1;
 #undef KEEPIT
 #define KEEPIT udata.i
@@ -327,7 +333,7 @@ MY_swap_std_reloc_out (abfd, g, natptr)
     }
   else
     {
-      /* Just an ordinary section */
+      /* Just an ordinary section.  */
       r_extern = 0;
       r_index  = output_section->target_index;
     }