diff options
author | Nick Clifton <nickc@redhat.com> | 2005-04-21 07:45:39 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2005-04-21 07:45:39 +0000 |
commit | 7920ce38c3e43d462e360b21db6cc9c17a40b4f4 (patch) | |
tree | 416f762ca89660f4cecf9e1391f12c6ac478ce46 /bfd/aout-ns32k.c | |
parent | b450502905875e85aab17371f78bb6befe5a3059 (diff) | |
download | binutils-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.zip binutils-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.tar.gz binutils-7920ce38c3e43d462e360b21db6cc9c17a40b4f4.tar.bz2 |
Update to ISO-C90 and fix formatting
Diffstat (limited to 'bfd/aout-ns32k.c')
-rw-r--r-- | bfd/aout-ns32k.c | 289 |
1 files changed, 130 insertions, 159 deletions
diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c index 40bc244..7cf4d48 100644 --- a/bfd/aout-ns32k.c +++ b/bfd/aout-ns32k.c @@ -1,6 +1,6 @@ /* BFD back-end for ns32k a.out-ish binaries. Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003 Free Software Foundation, Inc. + 2002, 2003, 2005 Free Software Foundation, Inc. Contributed by Ian Dall (idall@eleceng.adelaide.edu.au). This file is part of BFD, the Binary File Descriptor library. @@ -28,41 +28,21 @@ the tokens. */ #define MYNS(OP) CONCAT2 (ns32kaout_,OP) -reloc_howto_type * -MYNS(bfd_reloc_type_lookup) - PARAMS((bfd *abfd AND - bfd_reloc_code_real_type code)); - -bfd_boolean -MYNS(write_object_contents) - PARAMS((bfd *abfd)); +reloc_howto_type * MYNS (bfd_reloc_type_lookup) (bfd * abfd, bfd_reloc_code_real_type); +bfd_boolean MYNS (write_object_contents) (bfd *abfd); /* Avoid multiple definitions from aoutx if supporting standard a.out format(s) as well as this one. */ #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y) -void bfd_ns32k_arch PARAMS ((void)); +void bfd_ns32k_arch (void); #include "libaout.h" -#define MY(OP) MYNS(OP) +#define MY(OP) MYNS (OP) -#define MY_swap_std_reloc_in MY(swap_std_reloc_in) -#define MY_swap_std_reloc_out MY(swap_std_reloc_out) - -static void -MY_swap_std_reloc_in PARAMS ((bfd *, struct reloc_std_external *, - arelent *, asymbol **, - bfd_size_type)); -static void -MY_swap_std_reloc_out PARAMS ((bfd *, arelent *, - struct reloc_std_external *)); -reloc_howto_type * -MY(reloc_howto) PARAMS ((bfd *, struct reloc_std_external *, - int *, int *, int *)); -void -MY(put_reloc) PARAMS ((bfd *, int, int, bfd_vma, reloc_howto_type *, - struct reloc_std_external *)); +#define MY_swap_std_reloc_in MY (swap_std_reloc_in) +#define MY_swap_std_reloc_out MY (swap_std_reloc_out) /* The ns32k series is ah, unusual, when it comes to relocation. There are three storage methods for relocatable objects. There @@ -94,83 +74,80 @@ MY(put_reloc) PARAMS ((bfd *, int, int, bfd_vma, reloc_howto_type *, 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)[] = - { - /* type rs size bsz pcrel bitpos ovrf sf name part_inpl readmask setmask pcdone */ - /* ns32k immediate operands. */ - HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "NS32K_IMM_8", - TRUE, 0x000000ff,0x000000ff, FALSE), - HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "NS32K_IMM_16", - TRUE, 0x0000ffff,0x0000ffff, FALSE), - HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "NS32K_IMM_32", - TRUE, 0xffffffff,0xffffffff, FALSE), - HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8", - TRUE, 0x000000ff, 0x000000ff, FALSE), - HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16", - TRUE, 0x0000ffff,0x0000ffff, FALSE), - HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32", - TRUE, 0xffffffff,0xffffffff, FALSE), - - /* ns32k displacements. */ - HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 7, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_disp, "NS32K_DISP_8", - TRUE, 0x000000ff,0x000000ff, FALSE), - HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 14, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_disp, "NS32K_DISP_16", - TRUE, 0x0000ffff, 0x0000ffff, FALSE), - HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 30, FALSE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_disp, "NS32K_DISP_32", - TRUE, 0xffffffff, 0xffffffff, FALSE), - HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 7, TRUE, 0, complain_overflow_signed, +reloc_howto_type MY (howto_table)[] = +{ + /* ns32k immediate operands. */ + HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "NS32K_IMM_8", + TRUE, 0x000000ff,0x000000ff, FALSE), + HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "NS32K_IMM_16", + TRUE, 0x0000ffff,0x0000ffff, FALSE), + HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "NS32K_IMM_32", + TRUE, 0xffffffff,0xffffffff, FALSE), + HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8", + TRUE, 0x000000ff, 0x000000ff, FALSE), + HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16", + TRUE, 0x0000ffff,0x0000ffff, FALSE), + HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32", + TRUE, 0xffffffff,0xffffffff, FALSE), + + /* ns32k displacements. */ + HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 7, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_disp, "NS32K_DISP_8", + TRUE, 0x000000ff,0x000000ff, FALSE), + HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 14, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_disp, "NS32K_DISP_16", + TRUE, 0x0000ffff, 0x0000ffff, FALSE), + HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 30, FALSE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_disp, "NS32K_DISP_32", + TRUE, 0xffffffff, 0xffffffff, FALSE), + HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 7, TRUE, 0, complain_overflow_signed, _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8", - TRUE, 0x000000ff,0x000000ff, FALSE), - HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 14, TRUE, 0, complain_overflow_signed, - _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16", - TRUE, 0x0000ffff,0x0000ffff, FALSE), - HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 30, TRUE, 0, complain_overflow_signed, - _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) - -#define RELOC_STD_BITS_NS32K_TYPE_BIG 0x06 -#define RELOC_STD_BITS_NS32K_TYPE_LITTLE 0x60 -#define RELOC_STD_BITS_NS32K_TYPE_SH_BIG 1 -#define RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE 5 - -reloc_howto_type * -MY(reloc_howto) (abfd, rel, r_index, r_extern, r_pcrel) - bfd *abfd ATTRIBUTE_UNUSED; - struct reloc_std_external *rel; - int *r_index; - int *r_extern; - int *r_pcrel; + TRUE, 0x000000ff,0x000000ff, FALSE), + HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 14, TRUE, 0, complain_overflow_signed, + _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16", + TRUE, 0x0000ffff,0x0000ffff, FALSE), + HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 30, TRUE, 0, complain_overflow_signed, + _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) + +#define RELOC_STD_BITS_NS32K_TYPE_BIG 0x06 +#define RELOC_STD_BITS_NS32K_TYPE_LITTLE 0x60 +#define RELOC_STD_BITS_NS32K_TYPE_SH_BIG 1 +#define RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE 5 + +static reloc_howto_type * +MY (reloc_howto) (bfd *abfd ATTRIBUTE_UNUSED, + struct reloc_std_external *rel, + int *r_index, + int *r_extern, + int *r_pcrel) { unsigned int r_length; int r_ns32k_type; - /* BFD_ASSERT(bfd_header_little_endian (abfd)); */ *r_index = ((rel->r_index[2] << 16) | (rel->r_index[1] << 8) | rel->r_index[0] ); @@ -180,20 +157,19 @@ MY(reloc_howto) (abfd, rel, r_index, r_extern, r_pcrel) >> RELOC_STD_BITS_LENGTH_SH_LITTLE); r_ns32k_type = ((rel->r_type[0] & RELOC_STD_BITS_NS32K_TYPE_LITTLE) >> RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE); - return (MY(howto_table) + r_length + 3 * (*r_pcrel) + 6 * r_ns32k_type); + return (MY (howto_table) + r_length + 3 * (*r_pcrel) + 6 * r_ns32k_type); } #define MY_reloc_howto(BFD, REL, IN, EX, PC) \ - MY(reloc_howto) (BFD, REL, &IN, &EX, &PC) - -void -MY(put_reloc) (abfd, r_extern, r_index, value, howto, reloc) - bfd *abfd; - int r_extern; - int r_index; - bfd_vma value; - reloc_howto_type *howto; - struct reloc_std_external *reloc; + MY (reloc_howto) (BFD, REL, &IN, &EX, &PC) + +static void +MY (put_reloc) (bfd *abfd, + int r_extern, + int r_index, + bfd_vma value, + reloc_howto_type *howto, + struct reloc_std_external *reloc) { unsigned int r_length; int r_pcrel; @@ -202,9 +178,8 @@ MY(put_reloc) (abfd, r_extern, r_index, value, howto, reloc) 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_ns32k_type = (howto - MY(howto_table) )/6; + r_ns32k_type = (howto - MY (howto_table) )/6; - /* 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; @@ -216,26 +191,26 @@ MY(put_reloc) (abfd, r_extern, r_index, value, howto, reloc) } #define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \ - MY(put_reloc) (BFD, EXT, IDX, VAL, HOWTO, RELOC) + MY (put_reloc) (BFD, EXT, IDX, VAL, HOWTO, RELOC) #define STAT_FOR_EXEC #define MY_final_link_relocate _bfd_ns32k_final_link_relocate -#define MY_relocate_contents _bfd_ns32k_relocate_contents +#define MY_relocate_contents _bfd_ns32k_relocate_contents + +static void MY_swap_std_reloc_in (bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type); +static void MY_swap_std_reloc_out (bfd *, arelent *, struct reloc_std_external *); #include "aoutx.h" reloc_howto_type * -MY(bfd_reloc_type_lookup) (abfd,code) - bfd *abfd; - bfd_reloc_code_real_type code; +MY (bfd_reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code) { - -#define ENTRY(i,j) case i: return &MY(howto_table)[j] +#define ENTRY(i,j) case i: return &MY (howto_table)[j] int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE; - BFD_ASSERT(ext == 0); + BFD_ASSERT (ext == 0); if (code == BFD_RELOC_CTOR) switch (bfd_get_arch_info (abfd)->bits_per_address) { @@ -247,37 +222,36 @@ MY(bfd_reloc_type_lookup) (abfd,code) } switch (code) { - ENTRY(BFD_RELOC_NS32K_IMM_8, 0); - ENTRY(BFD_RELOC_NS32K_IMM_16, 1); - ENTRY(BFD_RELOC_NS32K_IMM_32, 2); - ENTRY(BFD_RELOC_NS32K_IMM_8_PCREL, 3); - ENTRY(BFD_RELOC_NS32K_IMM_16_PCREL, 4); - ENTRY(BFD_RELOC_NS32K_IMM_32_PCREL, 5); - ENTRY(BFD_RELOC_NS32K_DISP_8, 6); - ENTRY(BFD_RELOC_NS32K_DISP_16, 7); - ENTRY(BFD_RELOC_NS32K_DISP_32, 8); - ENTRY(BFD_RELOC_NS32K_DISP_8_PCREL, 9); - ENTRY(BFD_RELOC_NS32K_DISP_16_PCREL, 10); - ENTRY(BFD_RELOC_NS32K_DISP_32_PCREL, 11); - ENTRY(BFD_RELOC_8, 12); - ENTRY(BFD_RELOC_16, 13); - ENTRY(BFD_RELOC_32, 14); - ENTRY(BFD_RELOC_8_PCREL, 15); - ENTRY(BFD_RELOC_16_PCREL, 16); - ENTRY(BFD_RELOC_32_PCREL, 17); + ENTRY (BFD_RELOC_NS32K_IMM_8, 0); + ENTRY (BFD_RELOC_NS32K_IMM_16, 1); + ENTRY (BFD_RELOC_NS32K_IMM_32, 2); + ENTRY (BFD_RELOC_NS32K_IMM_8_PCREL, 3); + ENTRY (BFD_RELOC_NS32K_IMM_16_PCREL, 4); + ENTRY (BFD_RELOC_NS32K_IMM_32_PCREL, 5); + ENTRY (BFD_RELOC_NS32K_DISP_8, 6); + ENTRY (BFD_RELOC_NS32K_DISP_16, 7); + ENTRY (BFD_RELOC_NS32K_DISP_32, 8); + ENTRY (BFD_RELOC_NS32K_DISP_8_PCREL, 9); + ENTRY (BFD_RELOC_NS32K_DISP_16_PCREL, 10); + ENTRY (BFD_RELOC_NS32K_DISP_32_PCREL, 11); + ENTRY (BFD_RELOC_8, 12); + ENTRY (BFD_RELOC_16, 13); + ENTRY (BFD_RELOC_32, 14); + ENTRY (BFD_RELOC_8_PCREL, 15); + ENTRY (BFD_RELOC_16_PCREL, 16); + ENTRY (BFD_RELOC_32_PCREL, 17); default: - return (reloc_howto_type *) NULL; + return NULL; } #undef ENTRY } static void -MY_swap_std_reloc_in (abfd, bytes, cache_ptr, symbols, symcount) - bfd *abfd; - struct reloc_std_external *bytes; - arelent *cache_ptr; - asymbol **symbols; - bfd_size_type symcount ATTRIBUTE_UNUSED; +MY_swap_std_reloc_in (bfd *abfd, + struct reloc_std_external *bytes, + arelent *cache_ptr, + asymbol **symbols, + bfd_size_type symcount ATTRIBUTE_UNUSED) { int r_index; int r_extern; @@ -287,16 +261,15 @@ MY_swap_std_reloc_in (abfd, bytes, cache_ptr, symbols, symcount) cache_ptr->address = H_GET_32 (abfd, bytes->r_address); /* Now the fun stuff. */ - cache_ptr->howto = MY_reloc_howto(abfd, bytes, r_index, r_extern, r_pcrel); + cache_ptr->howto = MY_reloc_howto (abfd, bytes, r_index, r_extern, r_pcrel); MOVE_ADDRESS (0); } static void -MY_swap_std_reloc_out (abfd, g, natptr) - bfd *abfd; - arelent *g; - struct reloc_std_external *natptr; +MY_swap_std_reloc_out (bfd *abfd, + arelent *g, + struct reloc_std_external *natptr) { int r_index; asymbol *sym = *(g->sym_ptr_ptr); @@ -346,15 +319,14 @@ MY_swap_std_reloc_out (abfd, g, natptr) } bfd_reloc_status_type -_bfd_ns32k_relocate_contents (howto, input_bfd, relocation, location) - reloc_howto_type *howto; - bfd *input_bfd; - bfd_vma relocation; - bfd_byte *location; +_bfd_ns32k_relocate_contents (reloc_howto_type *howto, + bfd *input_bfd, + bfd_vma relocation, + bfd_byte *location) { - int r_ns32k_type = (howto - MY(howto_table)) / 6; - bfd_vma (*get_data) PARAMS ((bfd_byte *, int)); - void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int)); + int r_ns32k_type = (howto - MY (howto_table)) / 6; + bfd_vma (*get_data) (bfd_byte *, int); + void (*put_data) (bfd_vma, bfd_byte *, int); switch (r_ns32k_type) { @@ -369,7 +341,6 @@ _bfd_ns32k_relocate_contents (howto, input_bfd, relocation, location) case 2: return _bfd_relocate_contents (howto, input_bfd, relocation, location); - /* NOT REACHED */ break; default: return bfd_reloc_notsupported; |