diff options
Diffstat (limited to 'bfd/cpu-ns32k.c')
| -rw-r--r-- | bfd/cpu-ns32k.c | 244 |
1 files changed, 115 insertions, 129 deletions
diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index f0059d5..acc081a 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -4,21 +4,21 @@ Almost totally rewritten by Ian Dall from initial work by Andrew Cagney. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -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) any later version. + 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) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ 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 = @@ -40,7 +40,7 @@ static bfd_reloc_status_type do_ns32k_reloc PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *, bfd *, char **, bfd_vma (*) (bfd_byte *, int), - int (*) (bfd_vma, bfd_byte *, int))); + void (*) (bfd_vma, bfd_byte *, int))); bfd_vma _bfd_ns32k_get_displacement (buffer, size) @@ -48,6 +48,7 @@ _bfd_ns32k_get_displacement (buffer, size) int size; { bfd_signed_vma value; + switch (size) { case 1: @@ -70,10 +71,11 @@ _bfd_ns32k_get_displacement (buffer, size) abort (); return 0; } + return value; } -int +void _bfd_ns32k_put_displacement (value, buffer, size) bfd_vma value; bfd_byte *buffer; @@ -82,15 +84,11 @@ _bfd_ns32k_put_displacement (value, buffer, size) switch (size) { case 1: - if (value + 0x40 > 0x7f) - return -1; value &= 0x7f; *buffer++ = value; break; case 2: - if (value + 0x2000 > 0x3fff) - return -1; value &= 0x3fff; value |= 0x8000; *buffer++ = (value >> 8); @@ -98,19 +96,14 @@ _bfd_ns32k_put_displacement (value, buffer, size) break; case 4: - /* FIXME: is this correct? -0x1f000000 <= value < 0x2000000 */ - if (value + 0x1f000000 > 0x3effffff) - return -1; value |= (bfd_vma) 0xc0000000; *buffer++ = (value >> 24); *buffer++ = (value >> 16); *buffer++ = (value >> 8); *buffer++ = value; break; - default: - return -1; } - return 0; + return; } bfd_vma @@ -119,13 +112,9 @@ _bfd_ns32k_get_immediate (buffer, size) int size; { bfd_vma value = 0; + switch (size) { - case 8: - value = (value << 8) | (*buffer++ & 0xff); - value = (value << 8) | (*buffer++ & 0xff); - value = (value << 8) | (*buffer++ & 0xff); - value = (value << 8) | (*buffer++ & 0xff); case 4: value = (value << 8) | (*buffer++ & 0xff); value = (value << 8) | (*buffer++ & 0xff); @@ -133,11 +122,14 @@ _bfd_ns32k_get_immediate (buffer, size) value = (value << 8) | (*buffer++ & 0xff); case 1: value = (value << 8) | (*buffer++ & 0xff); + break; + default: + abort (); } return value; } -int +void _bfd_ns32k_put_immediate (value, buffer, size) bfd_vma value; bfd_byte *buffer; @@ -146,11 +138,6 @@ _bfd_ns32k_put_immediate (value, buffer, size) buffer += size - 1; switch (size) { - case 8: - *buffer-- = (value & 0xff); value >>= 8; - *buffer-- = (value & 0xff); value >>= 8; - *buffer-- = (value & 0xff); value >>= 8; - *buffer-- = (value & 0xff); value >>= 8; case 4: *buffer-- = (value & 0xff); value >>= 8; *buffer-- = (value & 0xff); value >>= 8; @@ -159,14 +146,13 @@ _bfd_ns32k_put_immediate (value, buffer, size) case 1: *buffer-- = (value & 0xff); value >>= 8; } - return 0; } /* This is just like the standard perform_relocation except we - * use get_data and put_data which know about the ns32k - * storage methods. - * This is probably a lot more complicated than it needs to be! - */ + use get_data and put_data which know about the ns32k storage + methods. This is probably a lot more complicated than it + needs to be! */ + static bfd_reloc_status_type do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, get_data, put_data) @@ -178,7 +164,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, bfd *output_bfd; char **error_message ATTRIBUTE_UNUSED; bfd_vma (*get_data) PARAMS ((bfd_byte *, int)); - int (*put_data) PARAMS ((bfd_vma, bfd_byte *, int)); + void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int)); { int overflow = 0; bfd_vma relocation; @@ -262,7 +248,6 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, producing relocateable output it is not what the code actually does. I don't want to change it, because it seems far too likely that something will break. */ - relocation -= input_section->output_section->vma + input_section->output_offset; @@ -299,71 +284,76 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, relocation with -r. Removing the line below this comment fixes that problem; see PR 2953. -However, Ian wrote the following, regarding removing the line below, -which explains why it is still enabled: --djm - -If you put a patch like that into BFD you need to check all the COFF -linkers. I am fairly certain that patch will break coff-i386 (e.g., -SCO); see coff_i386_reloc in coff-i386.c where I worked around the -problem in a different way. There may very well be a reason that the -code works as it does. - -Hmmm. The first obvious point is that bfd_perform_relocation should -not have any tests that depend upon the flavour. It's seem like -entirely the wrong place for such a thing. The second obvious point -is that the current code ignores the reloc addend when producing -relocateable output for COFF. That's peculiar. In fact, I really -have no idea what the point of the line you want to remove is. - -A typical COFF reloc subtracts the old value of the symbol and adds in -the new value to the location in the object file (if it's a pc -relative reloc it adds the difference between the symbol value and the -location). When relocating we need to preserve that property. - -BFD handles this by setting the addend to the negative of the old -value of the symbol. Unfortunately it handles common symbols in a -non-standard way (it doesn't subtract the old value) but that's a -different story (we can't change it without losing backward -compatibility with old object files) (coff-i386 does subtract the old -value, to be compatible with existing coff-i386 targets, like SCO). - -So everything works fine when not producing relocateable output. When -we are producing relocateable output, logically we should do exactly -what we do when not producing relocateable output. Therefore, your -patch is correct. In fact, it should probably always just set -reloc_entry->addend to 0 for all cases, since it is, in fact, going to -add the value into the object file. This won't hurt the COFF code, -which doesn't use the addend; I'm not sure what it will do to other -formats (the thing to check for would be whether any formats both use -the addend and set partial_inplace). - -When I wanted to make coff-i386 produce relocateable output, I ran -into the problem that you are running into: I wanted to remove that -line. Rather than risk it, I made the coff-i386 relocs use a special -function; it's coff_i386_reloc in coff-i386.c. The function -specifically adds the addend field into the object file, knowing that -bfd_perform_relocation is not going to. If you remove that line, then -coff-i386.c will wind up adding the addend field in twice. It's -trivial to fix; it just needs to be done. - -The problem with removing the line is just that it may break some -working code. With BFD it's hard to be sure of anything. The right -way to deal with this is simply to build and test at least all the -supported COFF targets. It should be straightforward if time and disk -space consuming. For each target: - 1) build the linker - 2) generate some executable, and link it using -r (I would - probably use paranoia.o and link against newlib/libc.a, which - for all the supported targets would be available in - /usr/cygnus/progressive/H-host/target/lib/libc.a). - 3) make the change to reloc.c - 4) rebuild the linker - 5) repeat step 2 - 6) if the resulting object files are the same, you have at least - made it no worse - 7) if they are different you have to figure out which version is - right -*/ + However, Ian wrote the following, regarding removing the line + below, which explains why it is still enabled: --djm + + If you put a patch like that into BFD you need to check all + the COFF linkers. I am fairly certain that patch will break + coff-i386 (e.g., SCO); see coff_i386_reloc in coff-i386.c + where I worked around the problem in a different way. There + may very well be a reason that the code works as it does. + + Hmmm. The first obvious point is that bfd_perform_relocation + should not have any tests that depend upon the flavour. It's + seem like entirely the wrong place for such a thing. The + second obvious point is that the current code ignores the + reloc addend when producing relocateable output for COFF. + That's peculiar. In fact, I really have no idea what the + point of the line you want to remove is. + + A typical COFF reloc subtracts the old value of the symbol + and adds in the new value to the location in the object file + (if it's a pc relative reloc it adds the difference between + the symbol value and the location). When relocating we need + to preserve that property. + + BFD handles this by setting the addend to the negative of the + old value of the symbol. Unfortunately it handles common + symbols in a non-standard way (it doesn't subtract the old + value) but that's a different story (we can't change it + without losing backward compatibility with old object files) + (coff-i386 does subtract the old value, to be compatible with + existing coff-i386 targets, like SCO). + + So everything works fine when not producing relocateable + output. When we are producing relocateable output, logically + we should do exactly what we do when not producing + relocateable output. Therefore, your patch is correct. In + fact, it should probably always just set reloc_entry->addend + to 0 for all cases, since it is, in fact, going to add the + value into the object file. This won't hurt the COFF code, + which doesn't use the addend; I'm not sure what it will do + to other formats (the thing to check for would be whether + any formats both use the addend and set partial_inplace). + + When I wanted to make coff-i386 produce relocateable output, + I ran into the problem that you are running into: I wanted + to remove that line. Rather than risk it, I made the + coff-i386 relocs use a special function; it's coff_i386_reloc + in coff-i386.c. The function specifically adds the addend + field into the object file, knowing that bfd_perform_relocation + is not going to. If you remove that line, then coff-i386.c + will wind up adding the addend field in twice. It's trivial + to fix; it just needs to be done. + + The problem with removing the line is just that it may break + some working code. With BFD it's hard to be sure of anything. + The right way to deal with this is simply to build and test at + least all the supported COFF targets. It should be + straightforward if time and disk space consuming. For each + target: + 1) build the linker + 2) generate some executable, and link it using -r (I would + probably use paranoia.o and link against newlib/libc.a, + which for all the supported targets would be available in + /usr/cygnus/progressive/H-host/target/lib/libc.a). + 3) make the change to reloc.c + 4) rebuild the linker + 5) repeat step 2 + 6) if the resulting object files are the same, you have at + least made it no worse + 7) if they are different you have to figure out which + version is right. */ relocation -= reloc_entry->addend; #endif reloc_entry->addend = 0; @@ -462,11 +452,9 @@ space consuming. For each target: } } - /* - Either we are relocating all the way, or we don't want to apply - the relocation to the reloc entry (probably because there isn't - any room in the output format to describe addends to relocs) - */ + /* Either we are relocating all the way, or we don't want to apply + the relocation to the reloc entry (probably because there isn't + any room in the output format to describe addends to relocs). */ /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler (OSF version 1.3, compiler version 3.11). It miscompiles the @@ -493,11 +481,10 @@ space consuming. For each target: relocation >>= (bfd_vma) howto->rightshift; - /* Shift everything up to where it's going to be used */ - + /* Shift everything up to where it's going to be used. */ relocation <<= (bfd_vma) howto->bitpos; - /* Wait for the day when all have the mask in them */ + /* Wait for the day when all have the mask in them. */ /* What we do: i instruction to be left alone @@ -527,8 +514,7 @@ space consuming. For each target: B B B B B or A A A A A ----------------------- - R R R R R R R R R R put into bfd_put<size> - */ + R R R R R R R R R R put into bfd_put<size>. */ #define DOIT(x) \ x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask)) @@ -538,39 +524,39 @@ space consuming. For each target: { case 0: { - char x = get_data (location, 1); + bfd_vma x = get_data (location, 1); DOIT (x); - overflow = put_data ((bfd_vma) x, location, 1); + put_data ((bfd_vma) x, location, 1); } break; case 1: if (relocation) { - short x = get_data (location, 2); + bfd_vma x = get_data (location, 2); DOIT (x); - overflow = put_data ((bfd_vma) x, location, 2); + put_data ((bfd_vma) x, location, 2); } break; case 2: if (relocation) { - long x = get_data (location, 4); + bfd_vma x = get_data (location, 4); DOIT (x); - overflow = put_data ((bfd_vma) x, location, 4); + put_data ((bfd_vma) x, location, 4); } break; case -2: { - long x = get_data (location, 4); + bfd_vma x = get_data (location, 4); relocation = -relocation; DOIT(x); - overflow = put_data ((bfd_vma) x, location, 4); + put_data ((bfd_vma) x, location, 4); } break; case 3: - /* Do nothing */ + /* Do nothing. */ break; case 4: @@ -579,7 +565,7 @@ space consuming. For each target: { bfd_vma x = get_data (location, 8); DOIT (x); - overflow = put_data (x, location, 8); + put_data (x, location, 8); } #else abort (); @@ -604,7 +590,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location, bfd_vma relocation; bfd_byte *location; bfd_vma (*get_data) PARAMS ((bfd_byte *, int)); - int (*put_data) PARAMS ((bfd_vma, bfd_byte *, int)); + void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int)); { int size; bfd_vma x; |