X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fnlm32-i386.c;h=fcdfc645640b3daf9307d1b248fa2dfba41be1b9;hb=97182d3694952458f2cf93c5e3308527a1d201f4;hp=0fc991cff459d5d2798302afcf6d12e8eddd17fc;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/nlm32-i386.c b/bfd/nlm32-i386.c index 0fc991cff4..fcdfc64564 100644 --- a/bfd/nlm32-i386.c +++ b/bfd/nlm32-i386.c @@ -1,21 +1,22 @@ /* Support for 32-bit i386 NLM (NetWare Loadable Module) - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright 1993, 1994, 2000, 2001, 2002, 2003, 2005 + Free Software Foundation, Inc. -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., 675 Mass Ave, Cambridge, MA 02139, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "bfd.h" #include "sysdep.h" @@ -28,66 +29,54 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "libnlm.h" -static boolean nlm_i386_read_reloc - PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *)); -static boolean nlm_i386_write_import - PARAMS ((bfd *, asection *, arelent *)); -static boolean nlm_i386_mangle_relocs - PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type)); -static boolean nlm_i386_read_import - PARAMS ((bfd *, nlmNAME(symbol_type) *)); -static boolean nlm_i386_write_external - PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *)); - /* Adjust the reloc location by an absolute value. */ static reloc_howto_type nlm_i386_abs_howto = - HOWTO (0, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - false, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_bitfield, /* complain_on_overflow */ - 0, /* special_function */ - "32", /* name */ - true, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - false); /* pcrel_offset */ + HOWTO (0, /* Type. */ + 0, /* Rightshift. */ + 2, /* Size (0 = byte, 1 = short, 2 = long). */ + 32, /* Bitsize. */ + FALSE, /* PC relative. */ + 0, /* Bitpos. */ + complain_overflow_bitfield, /* Complain_on_overflow. */ + 0, /* Special_function. */ + "32", /* Name. */ + TRUE, /* Partial_inplace. */ + 0xffffffff, /* Source mask. */ + 0xffffffff, /* Dest mask. */ + FALSE); /* PR rel_offset. */ /* Adjust the reloc location by a PC relative displacement. */ static reloc_howto_type nlm_i386_pcrel_howto = - HOWTO (1, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - true, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ - 0, /* special_function */ - "DISP32", /* name */ - true, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - true); /* pcrel_offset */ + HOWTO (1, /* Type. */ + 0, /* Rightshift. */ + 2, /* Size (0 = byte, 1 = short, 2 = long). */ + 32, /* Bitsize. */ + TRUE, /* PC relative. */ + 0, /* Bitpos. */ + complain_overflow_signed, /* Complain_on_overflow. */ + 0, /* Special_function. */ + "DISP32", /* Name. */ + TRUE, /* Partial_inplace. */ + 0xffffffff, /* Source mask. */ + 0xffffffff, /* Dest mask. */ + TRUE); /* PR rel_offset. */ /* Read a NetWare i386 reloc. */ -static boolean -nlm_i386_read_reloc (abfd, sym, secp, rel) - bfd *abfd; - nlmNAME(symbol_type) *sym; - asection **secp; - arelent *rel; +static bfd_boolean +nlm_i386_read_reloc (bfd *abfd, + nlmNAME (symbol_type) *sym, + asection **secp, + arelent *rel) { bfd_byte temp[4]; bfd_vma val; const char *name; - if (bfd_read (temp, sizeof (temp), 1, abfd) != sizeof (temp)) - return false; + if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp)) + return FALSE; val = bfd_get_32 (abfd, temp); @@ -145,16 +134,13 @@ nlm_i386_read_reloc (abfd, sym, secp, rel) rel->address = val; rel->addend = 0; - return true; + return TRUE; } /* Write a NetWare i386 reloc. */ -static boolean -nlm_i386_write_import (abfd, sec, rel) - bfd *abfd; - asection *sec; - arelent *rel; +static bfd_boolean +nlm_i386_write_import (bfd * abfd, asection * sec, arelent * rel) { asymbol *sym; bfd_vma val; @@ -174,7 +160,7 @@ nlm_i386_write_import (abfd, sec, rel) || rel->howto->dst_mask != 0xffffffff) { bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; } sym = *rel->sym_ptr_ptr; @@ -196,13 +182,13 @@ nlm_i386_write_import (abfd, sec, rel) else val -= nlm_get_data_low (abfd); - if (bfd_get_section (sym) != &bfd_und_section) + if (! bfd_is_und_section (bfd_get_section (sym))) { /* NetWare only supports absolute internal relocs. */ if (rel->howto->pc_relative) { bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; } /* The high bit is 1 if the reloc is against the code section, 0 @@ -222,19 +208,19 @@ nlm_i386_write_import (abfd, sec, rel) if (! rel->howto->pcrel_offset) { bfd_set_error (bfd_error_invalid_operation); - return false; + return FALSE; } } } - + bfd_put_32 (abfd, val, temp); - if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp)) - return false; + if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp)) + return FALSE; - return true; + return TRUE; } -/* I want to be able to use objcopy to turn a i386 a.out or COFF file +/* I want to be able to use objcopy to turn an i386 a.out or COFF file into a NetWare i386 module. That means that the relocs from the source file have to be mapped into relocs that apply to the target file. This function is called by nlm_set_section_contents to give @@ -243,13 +229,12 @@ nlm_i386_write_import (abfd, sec, rel) This is actually a fairly general concept. However, this is not a general implementation. */ -static boolean -nlm_i386_mangle_relocs (abfd, sec, data, offset, count) - bfd *abfd; - asection *sec; - PTR data; - bfd_vma offset; - bfd_size_type count; +static bfd_boolean +nlm_i386_mangle_relocs (bfd *abfd, + asection *sec, + const PTR data, + bfd_vma offset, + bfd_size_type count) { arelent **rel_ptr_ptr, **rel_end; @@ -335,93 +320,82 @@ nlm_i386_mangle_relocs (abfd, sec, data, offset, count) } } - return true; + return TRUE; } -/* Read a NetWare i386 import record */ -static boolean -nlm_i386_read_import (abfd, sym) - bfd *abfd; - nlmNAME(symbol_type) *sym; +/* Read a NetWare i386 import record. */ + +static bfd_boolean +nlm_i386_read_import (bfd * abfd, nlmNAME (symbol_type) * sym) { - struct nlm_relent *nlm_relocs; /* relocation records for symbol */ - bfd_size_type rcount; /* number of relocs */ - bfd_byte temp[NLM_TARGET_LONG_SIZE]; /* temporary 32-bit value */ - unsigned char symlength; /* length of symbol name */ + struct nlm_relent *nlm_relocs; /* Relocation records for symbol. */ + bfd_size_type rcount; /* Number of relocs. */ + bfd_byte temp[NLM_TARGET_LONG_SIZE]; /* Temporary 32-bit value. */ + unsigned char symlength; /* Length of symbol name. */ + char *name; - if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd) + if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd) != sizeof (symlength)) - return false; + return FALSE; sym -> symbol.the_bfd = abfd; - sym -> symbol.name = bfd_alloc (abfd, symlength + 1); - if (!sym -> symbol.name) - { - bfd_set_error (bfd_error_no_memory); - return false; - } - if (bfd_read ((PTR) sym -> symbol.name, symlength, 1, abfd) - != symlength) - return false; + name = bfd_alloc (abfd, (bfd_size_type) symlength + 1); + if (name == NULL) + return FALSE; + if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength) + return FALSE; + name[symlength] = '\0'; + sym -> symbol.name = name; sym -> symbol.flags = 0; sym -> symbol.value = 0; - sym -> symbol.section = &bfd_und_section; - if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp)) - return false; - rcount = bfd_h_get_32 (abfd, temp); - nlm_relocs = ((struct nlm_relent *) - bfd_alloc (abfd, rcount * sizeof (struct nlm_relent))); + sym -> symbol.section = bfd_und_section_ptr; + if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp)) + return FALSE; + rcount = H_GET_32 (abfd, temp); + nlm_relocs = bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)); if (!nlm_relocs) - { - bfd_set_error (bfd_error_no_memory); - return false; - } + return FALSE; sym -> relocs = nlm_relocs; sym -> rcnt = 0; while (sym -> rcnt < rcount) { asection *section; - - if (nlm_i386_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) - return false; + + if (! nlm_i386_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) + return FALSE; nlm_relocs -> section = section; nlm_relocs++; sym -> rcnt++; } - return true; + return TRUE; } /* Write out an external reference. */ -static boolean -nlm_i386_write_external (abfd, count, sym, relocs) - bfd *abfd; - bfd_size_type count; - asymbol *sym; - struct reloc_and_sec *relocs; +static bfd_boolean +nlm_i386_write_external (bfd *abfd, + bfd_size_type count, + asymbol *sym, + struct reloc_and_sec *relocs) { - int i; + unsigned int i; bfd_byte len; unsigned char temp[NLM_TARGET_LONG_SIZE]; len = strlen (sym->name); - if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte)) - || bfd_write (sym->name, len, 1, abfd) != len) - return false; + if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd) + != sizeof (bfd_byte)) + || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len) + return FALSE; bfd_put_32 (abfd, count, temp); - if (bfd_write (temp, sizeof(temp), 1, abfd) != sizeof (temp)) - return false; + if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp)) + return FALSE; for (i = 0; i < count; i++) - { - if (nlm_i386_write_import (abfd, relocs[i].sec, - relocs[i].rel) == false) - return false; - } + if (! nlm_i386_write_import (abfd, relocs[i].sec, relocs[i].rel)) + return FALSE; - return true; + return TRUE; } #include "nlmswap.h" @@ -430,26 +404,26 @@ static const struct nlm_backend_data nlm32_i386_backend = { "NetWare Loadable Module\032", sizeof (Nlm32_i386_External_Fixed_Header), - 0, /* optional_prefix_size */ + 0, /* Optional_prefix_size. */ bfd_arch_i386, 0, - false, - 0, /* backend_object_p */ - 0, /* write_prefix_func */ + FALSE, + 0, /* Backend_object_p. */ + 0, /* Write_prefix_func. */ nlm_i386_read_reloc, nlm_i386_mangle_relocs, nlm_i386_read_import, nlm_i386_write_import, - 0, /* set_public_section */ - 0, /* get_public_offset */ + 0, /* Set_public_section. */ + 0, /* Set_public_offset. */ nlm_swap_fixed_header_in, nlm_swap_fixed_header_out, nlm_i386_write_external, - 0, /* write_export */ + 0, /* Write_export. */ }; #define TARGET_LITTLE_NAME "nlm32-i386" -#define TARGET_LITTLE_SYM nlmNAME(i386_vec) -#define TARGET_BACKEND_DATA &nlm32_i386_backend +#define TARGET_LITTLE_SYM nlmNAME (i386_vec) +#define TARGET_BACKEND_DATA & nlm32_i386_backend #include "nlm-target.h"