X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-ns32k.c;h=12f989e704fe80ef1f46512657aa49df02e30299;hb=f5e98b7d675230fdfee794afa5ebae1fbc2893a2;hp=98f22e1881c33051a49bf1e20a7e07f910058b69;hpb=1a0670f37442b7ae904932b347353046126b990c;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index 98f22e1881..12f989e704 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -1,5 +1,5 @@ /* BFD support for the ns32k architecture. - Copyright (C) 1990-2016 Free Software Foundation, Inc. + Copyright (C) 1990-2021 Free Software Foundation, Inc. Almost totally rewritten by Ian Dall from initial work by Andrew Cagney. @@ -26,16 +26,16 @@ #include "ns32k.h" #define N(machine, printable, d, next) \ -{ 32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d, \ - bfd_default_compatible,bfd_default_scan,bfd_arch_default_fill,next, } + { 32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d, \ + bfd_default_compatible,bfd_default_scan,bfd_arch_default_fill,next, 0 } static const bfd_arch_info_type arch_info_struct[] = { - N(32532,"ns32k:32532",TRUE, 0), /* The word ns32k will match this too. */ + N (32532, "ns32k:32532", true, 0), /* The word ns32k will match this too. */ }; const bfd_arch_info_type bfd_ns32k_arch = - N(32032,"ns32k:32032",FALSE, &arch_info_struct[0]); + N (32032, "ns32k:32032", false, &arch_info_struct[0]); bfd_vma _bfd_ns32k_get_displacement (bfd_byte *buffer, int size) @@ -220,8 +220,8 @@ do_ns32k_reloc (bfd * abfd, the addend to be the negative of the position of the location within the section; for example, i386-aout does this. For i386-aout, pcrel_offset is FALSE. Some other targets do not - include the position of the location; for example, m88kbcs, - or ELF. For those targets, pcrel_offset is TRUE. + include the position of the location; for example, ELF. + For those targets, pcrel_offset is TRUE. If we are producing relocatable output, then we must ensure that this reloc will be correctly computed when the final @@ -483,23 +483,26 @@ do_ns32k_reloc (bfd * abfd, R result Do this: - i i i i i o o o o o from bfd_get - and S S S S S to get the size offset we want - + r r r r r r r r r r to get the final value to place - and D D D D D to chop to right size + i i i i i o o o o o from bfd_get + and S S S S S to get the size offset we want + + r r r r r r r r r r to get the final value to place + and D D D D D to chop to right size ----------------------- A A A A A And this: - ... i i i i i o o o o o from bfd_get - and N N N N N get instruction + ... i i i i i o o o o o from bfd_get + and N N N N N get instruction ----------------------- ... B B B B B And then: B B B B B - or A A A A A + or A A A A A ----------------------- - R R R R R R R R R R put into bfd_put. */ + R R R R R R R R R R put into bfd_put. */ + + if (howto->negate) + relocation = -relocation; #define DOIT(x) \ x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask)) @@ -531,14 +534,6 @@ do_ns32k_reloc (bfd * abfd, put_data ((bfd_vma) x, location, 4); } break; - case -2: - { - bfd_vma x = get_data (location, 4); - relocation = -relocation; - DOIT(x); - put_data ((bfd_vma) x, location, 4); - } - break; case 3: /* Do nothing. */ @@ -577,11 +572,9 @@ _bfd_do_ns32k_reloc_contents (reloc_howto_type *howto, { int size; bfd_vma x; - bfd_boolean overflow; + bool overflow; - /* If the size is negative, negate RELOCATION. This isn't very - general. */ - if (howto->size < 0) + if (howto->negate) relocation = -relocation; /* Get the value we are going to relocate. */ @@ -606,7 +599,7 @@ _bfd_do_ns32k_reloc_contents (reloc_howto_type *howto, which we don't check for. We must either check at every single operation, which would be tedious, or we must do the computations in a type larger than bfd_vma, which would be inefficient. */ - overflow = FALSE; + overflow = false; if (howto->complain_on_overflow != complain_overflow_dont) { bfd_vma check; @@ -681,7 +674,7 @@ _bfd_do_ns32k_reloc_contents (reloc_howto_type *howto, if (signed_check > reloc_signed_max || signed_check < reloc_signed_min) - overflow = TRUE; + overflow = true; } break; case complain_overflow_unsigned: @@ -693,7 +686,7 @@ _bfd_do_ns32k_reloc_contents (reloc_howto_type *howto, (((1 << (howto->bitsize - 1)) - 1) << 1) | 1; if (check > reloc_unsigned_max) - overflow = TRUE; + overflow = true; } break; case complain_overflow_bitfield: @@ -706,7 +699,7 @@ _bfd_do_ns32k_reloc_contents (reloc_howto_type *howto, if ((check & ~reloc_bits) != 0 && (((bfd_vma) signed_check & ~reloc_bits) != (-(bfd_vma) 1 & ~reloc_bits))) - overflow = TRUE; + overflow = true; } break; default: @@ -793,12 +786,7 @@ _bfd_ns32k_final_link_relocate (reloc_howto_type *howto, /* If the relocation is PC relative, we want to set RELOCATION to the distance between the symbol (currently in RELOCATION) and the - location we are relocating. Some targets (e.g., i386-aout) - arrange for the contents of the section to be the negative of the - offset of the location within the section; for such targets - pcrel_offset is FALSE. Other targets (e.g., m88kbcs or ELF) - simply leave the contents of the section as zero; for such - targets pcrel_offset is TRUE. If pcrel_offset is FALSE we do not + location we are relocating. If pcrel_offset is FALSE we do not need to subtract out the offset of the location within the section (which is just ADDRESS). */ if (howto->pc_relative)