X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fnlm32-sparc.c;h=e647ad082aa579f9da3c2f5bdd3d3363d2c23b03;hb=0bf60745767d2465c81ee57ae7705a62d6d8fafe;hp=ff0571be203b441435863990d21d0ce52310f152;hpb=cdbfad1cd7167c88ba56ba899b6f23cbb09768ab;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c index ff0571be20..e647ad082a 100644 --- a/bfd/nlm32-sparc.c +++ b/bfd/nlm32-sparc.c @@ -1,21 +1,22 @@ /* Support for 32-bit SPARC NLM (NetWare Loadable Module) - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 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,113 +29,81 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "libnlm.h" -static boolean nlm_sparc_read_reloc - PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *)); -static boolean nlm_sparc_write_reloc - PARAMS ((bfd *, asection *, arelent *)); -static boolean nlm_sparc_mangle_relocs - PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type)); -static boolean nlm_sparc_read_import - PARAMS ((bfd *, nlmNAME(symbol_type) *)); -static boolean nlm_sparc_write_import - PARAMS ((bfd *, asection *, arelent *)); -static boolean nlm_sparc_write_external - PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *)); - enum reloc_type - { - R_SPARC_NONE = 0, - R_SPARC_8, R_SPARC_16, R_SPARC_32, - R_SPARC_DISP8, R_SPARC_DISP16, R_SPARC_DISP32, - R_SPARC_WDISP30, R_SPARC_WDISP22, - R_SPARC_HI22, R_SPARC_22, - R_SPARC_13, R_SPARC_LO10, - R_SPARC_GOT10, R_SPARC_GOT13, R_SPARC_GOT22, - R_SPARC_PC10, R_SPARC_PC22, - R_SPARC_WPLT30, - R_SPARC_COPY, - R_SPARC_GLOB_DAT, R_SPARC_JMP_SLOT, - R_SPARC_RELATIVE, - R_SPARC_UA32, - R_SPARC_max - }; - -#if 0 -static CONST char *CONST reloc_type_names[] = { - "R_SPARC_NONE", - "R_SPARC_8", "R_SPARC_16", "R_SPARC_32", - "R_SPARC_DISP8", "R_SPARC_DISP16", "R_SPARC_DISP32", - "R_SPARC_WDISP30", "R_SPARC_WDISP22", - "R_SPARC_HI22", "R_SPARC_22", - "R_SPARC_13", "R_SPARC_LO10", - "R_SPARC_GOT10", "R_SPARC_GOT13", "R_SPARC_GOT22", - "R_SPARC_PC10", "R_SPARC_PC22", - "R_SPARC_WPLT30", - "R_SPARC_COPY", - "R_SPARC_GLOB_DAT", "R_SPARC_JMP_SLOT", - "R_SPARC_RELATIVE", - "R_SPARC_UA32", + R_SPARC_NONE = 0, + R_SPARC_8, R_SPARC_16, R_SPARC_32, + R_SPARC_DISP8, R_SPARC_DISP16, R_SPARC_DISP32, + R_SPARC_WDISP30, R_SPARC_WDISP22, + R_SPARC_HI22, R_SPARC_22, + R_SPARC_13, R_SPARC_LO10, + R_SPARC_GOT10, R_SPARC_GOT13, R_SPARC_GOT22, + R_SPARC_PC10, R_SPARC_PC22, + R_SPARC_WPLT30, + R_SPARC_COPY, + R_SPARC_GLOB_DAT, R_SPARC_JMP_SLOT, + R_SPARC_RELATIVE, + R_SPARC_UA32, + R_SPARC_max }; -#endif -static reloc_howto_type nlm32_sparc_howto_table[] = +static reloc_howto_type nlm32_sparc_howto_table[] = { - HOWTO(R_SPARC_NONE, 0,0, 0,false,0,complain_overflow_dont, 0,"R_SPARC_NONE", false,0,0x00000000,true), - HOWTO(R_SPARC_8, 0,0, 8,false,0,complain_overflow_bitfield,0,"R_SPARC_8", false,0,0x000000ff,true), - HOWTO(R_SPARC_16, 0,1,16,false,0,complain_overflow_bitfield,0,"R_SPARC_16", false,0,0x0000ffff,true), - HOWTO(R_SPARC_32, 0,2,32,false,0,complain_overflow_bitfield,0,"R_SPARC_32", false,0,0xffffffff,true), - HOWTO(R_SPARC_DISP8, 0,0, 8,true, 0,complain_overflow_signed, 0,"R_SPARC_DISP8", false,0,0x000000ff,true), - HOWTO(R_SPARC_DISP16, 0,1,16,true, 0,complain_overflow_signed, 0,"R_SPARC_DISP16", false,0,0x0000ffff,true), - HOWTO(R_SPARC_DISP32, 0,2,32,true, 0,complain_overflow_signed, 0,"R_SPARC_DISP32", false,0,0x00ffffff,true), - HOWTO(R_SPARC_WDISP30, 2,2,30,true, 0,complain_overflow_signed, 0,"R_SPARC_WDISP30", false,0,0x3fffffff,true), - HOWTO(R_SPARC_WDISP22, 2,2,22,true, 0,complain_overflow_signed, 0,"R_SPARC_WDISP22", false,0,0x003fffff,true), - HOWTO(R_SPARC_HI22, 10,2,22,false,0,complain_overflow_dont, 0,"R_SPARC_HI22", false,0,0x003fffff,true), - HOWTO(R_SPARC_22, 0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_22", false,0,0x003fffff,true), - HOWTO(R_SPARC_13, 0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_13", false,0,0x00001fff,true), - HOWTO(R_SPARC_LO10, 0,2,10,false,0,complain_overflow_dont, 0,"R_SPARC_LO10", false,0,0x000003ff,true), - HOWTO(R_SPARC_GOT10, 0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT10", false,0,0x000003ff,true), - HOWTO(R_SPARC_GOT13, 0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT13", false,0,0x00001fff,true), - HOWTO(R_SPARC_GOT22, 10,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT22", false,0,0x003fffff,true), - HOWTO(R_SPARC_PC10, 0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_PC10", false,0,0x000003ff,true), - HOWTO(R_SPARC_PC22, 0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_PC22", false,0,0x003fffff,true), - HOWTO(R_SPARC_WPLT30, 0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_WPLT30", false,0,0x00000000,true), - HOWTO(R_SPARC_COPY, 0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_COPY", false,0,0x00000000,true), - HOWTO(R_SPARC_GLOB_DAT,0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_GLOB_DAT",false,0,0x00000000,true), - HOWTO(R_SPARC_JMP_SLOT,0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_JMP_SLOT",false,0,0x00000000,true), - HOWTO(R_SPARC_RELATIVE,0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_RELATIVE",false,0,0x00000000,true), - HOWTO(R_SPARC_UA32, 0,0,00,false,0,complain_overflow_dont, 0,"R_SPARC_UA32", false,0,0x00000000,true), + HOWTO (R_SPARC_NONE, 0,0, 0,FALSE,0,complain_overflow_dont, 0,"R_SPARC_NONE", FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_8, 0,0, 8,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_8", FALSE,0,0x000000ff,TRUE), + HOWTO (R_SPARC_16, 0,1,16,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_16", FALSE,0,0x0000ffff,TRUE), + HOWTO (R_SPARC_32, 0,2,32,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_32", FALSE,0,0xffffffff,TRUE), + HOWTO (R_SPARC_DISP8, 0,0, 8,TRUE, 0,complain_overflow_signed, 0,"R_SPARC_DISP8", FALSE,0,0x000000ff,TRUE), + HOWTO (R_SPARC_DISP16, 0,1,16,TRUE, 0,complain_overflow_signed, 0,"R_SPARC_DISP16", FALSE,0,0x0000ffff,TRUE), + HOWTO (R_SPARC_DISP32, 0,2,32,TRUE, 0,complain_overflow_signed, 0,"R_SPARC_DISP32", FALSE,0,0x00ffffff,TRUE), + HOWTO (R_SPARC_WDISP30, 2,2,30,TRUE, 0,complain_overflow_signed, 0,"R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE), + HOWTO (R_SPARC_WDISP22, 2,2,22,TRUE, 0,complain_overflow_signed, 0,"R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE), + HOWTO (R_SPARC_HI22, 10,2,22,FALSE,0,complain_overflow_dont, 0,"R_SPARC_HI22", FALSE,0,0x003fffff,TRUE), + HOWTO (R_SPARC_22, 0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_22", FALSE,0,0x003fffff,TRUE), + HOWTO (R_SPARC_13, 0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_13", FALSE,0,0x00001fff,TRUE), + HOWTO (R_SPARC_LO10, 0,2,10,FALSE,0,complain_overflow_dont, 0,"R_SPARC_LO10", FALSE,0,0x000003ff,TRUE), + HOWTO (R_SPARC_GOT10, 0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT10", FALSE,0,0x000003ff,TRUE), + HOWTO (R_SPARC_GOT13, 0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT13", FALSE,0,0x00001fff,TRUE), + HOWTO (R_SPARC_GOT22, 10,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT22", FALSE,0,0x003fffff,TRUE), + HOWTO (R_SPARC_PC10, 0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC10", FALSE,0,0x000003ff,TRUE), + HOWTO (R_SPARC_PC22, 0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC22", FALSE,0,0x003fffff,TRUE), + HOWTO (R_SPARC_WPLT30, 0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_WPLT30", FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_COPY, 0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_COPY", FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_GLOB_DAT,0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_JMP_SLOT,0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_RELATIVE,0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE), + HOWTO (R_SPARC_UA32, 0,0,00,FALSE,0,complain_overflow_dont, 0,"R_SPARC_UA32", FALSE,0,0x00000000,TRUE), }; /* Read a NetWare sparc reloc. */ -struct nlm32_sparc_reloc_ext { +struct nlm32_sparc_reloc_ext +{ unsigned char offset[4]; unsigned char addend[4]; unsigned char type[1]; unsigned char pad1[3]; }; -static boolean -nlm_sparc_read_reloc (abfd, sym, secp, rel) - bfd *abfd; - nlmNAME(symbol_type) *sym; - asection **secp; - arelent *rel; +static bfd_boolean +nlm_sparc_read_reloc (bfd *abfd, + nlmNAME (symbol_type) *sym ATTRIBUTE_UNUSED, + asection **secp, + arelent *rel) { - bfd_byte temp[4]; bfd_vma val, addend; - const char *name; - int index; + unsigned int index; unsigned int type; struct nlm32_sparc_reloc_ext tmp_reloc; + asection *code_sec, *data_sec; + + if (bfd_bread (&tmp_reloc, (bfd_size_type) 12, abfd) != 12) + return FALSE; - if (bfd_read (&tmp_reloc, 12, 1, abfd) != 12) { - bfd_error = system_call_error; - return false; - } + code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME); + data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME); - *secp = bfd_get_section_by_name (abfd, NLM_CODE_NAME); + *secp = code_sec; val = bfd_get_32 (abfd, tmp_reloc.offset); addend = bfd_get_32 (abfd, tmp_reloc.addend); @@ -145,63 +114,60 @@ nlm_sparc_read_reloc (abfd, sym, secp, rel) rel->howto = NULL; for (index = 0; - index < sizeof(nlm32_sparc_howto_table) / sizeof(reloc_howto_type); + index < sizeof (nlm32_sparc_howto_table) / sizeof (reloc_howto_type); index++) - if (nlm32_sparc_howto_table[index].type == type) { - rel->howto = &nlm32_sparc_howto_table[index]; - break; - } + if (nlm32_sparc_howto_table[index].type == type) + { + rel->howto = &nlm32_sparc_howto_table[index]; + break; + } #ifdef DEBUG fprintf (stderr, "%s: address = %08lx, addend = %08lx, type = %d, howto = %08lx\n", - __FILE__, rel->address, rel->addend, type, rel->howto); + __FUNCTION__, rel->address, rel->addend, type, rel->howto); #endif - return true; + return TRUE; } /* Write a NetWare sparc reloc. */ -static boolean -nlm_sparc_write_reloc (abfd, sec, rel) - bfd *abfd; - asection *sec; - arelent *rel; +static bfd_boolean +nlm_sparc_write_reloc (bfd * abfd, asection * sec, arelent * rel) { bfd_vma val; - struct nlm32_sparc_reloc_ext tmp_reloc = {0}; - int index; + struct nlm32_sparc_reloc_ext tmp_reloc; + unsigned int index; int type = -1; reloc_howto_type *tmp; - for (index = 0; - index < sizeof (nlm32_sparc_howto_table) / sizeof(reloc_howto_type); - index++) { - tmp = &nlm32_sparc_howto_table[index]; - - if (tmp->rightshift == rel->howto->rightshift - && tmp->size == rel->howto->size - && tmp->bitsize == rel->howto->bitsize - && tmp->pc_relative == rel->howto->pc_relative - && tmp->bitpos == rel->howto->bitpos - && tmp->src_mask == rel->howto->src_mask - && tmp->dst_mask == rel->howto->dst_mask) { - type = tmp->type; - break; + index < sizeof (nlm32_sparc_howto_table) / sizeof (reloc_howto_type); + index++) + { + tmp = &nlm32_sparc_howto_table[index]; + + if (tmp->rightshift == rel->howto->rightshift + && tmp->size == rel->howto->size + && tmp->bitsize == rel->howto->bitsize + && tmp->pc_relative == rel->howto->pc_relative + && tmp->bitpos == rel->howto->bitpos + && tmp->src_mask == rel->howto->src_mask + && tmp->dst_mask == rel->howto->dst_mask) + { + type = tmp->type; + break; + } } - } if (type == -1) - abort(); + abort (); - /* - * Netware wants a list of relocs for each address. - * Format is: - * long offset - * long addend - * char type - * That should be it. - */ + /* Netware wants a list of relocs for each address. + Format is: + long offset + long addend + char type + That should be it. */ /* The value we write out is the offset into the appropriate segment. This offset is the section vma, adjusted by the vma of @@ -211,161 +177,171 @@ nlm_sparc_write_reloc (abfd, sec, rel) #ifdef DEBUG fprintf (stderr, "%s: val = %08lx, addend = %08lx, type = %d\n", - __FILE__, val, rel->addend, rel->howto->type); + __FUNCTION__, val, rel->addend, rel->howto->type); #endif bfd_put_32 (abfd, val, tmp_reloc.offset); bfd_put_32 (abfd, rel->addend, tmp_reloc.addend); - bfd_put_8 (abfd, (short)(rel->howto->type), tmp_reloc.type); + bfd_put_8 (abfd, (short) (rel->howto->type), tmp_reloc.type); - if (bfd_write (&tmp_reloc, 12, 1, abfd) != 12) - { - abort(); - } + if (bfd_bwrite (&tmp_reloc, (bfd_size_type) 12, abfd) != 12) + return FALSE; - return true; + return TRUE; } /* Mangle relocs for SPARC NetWare. We can just use the standard SPARC relocs. */ -static boolean -nlm_sparc_mangle_relocs (abfd, sec, data, offset, count) - bfd *abfd; - asection *sec; - PTR data; - bfd_vma offset; - bfd_size_type count; +static bfd_boolean +nlm_sparc_mangle_relocs (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec ATTRIBUTE_UNUSED, + const void * data ATTRIBUTE_UNUSED, + bfd_vma offset ATTRIBUTE_UNUSED, + bfd_size_type count ATTRIBUTE_UNUSED) { - return true; + return TRUE; } -/* Read a NetWare sparc import record */ -static boolean -nlm_sparc_read_import (abfd, sym) - bfd *abfd; - nlmNAME(symbol_type) *sym; +/* Read a NetWare sparc import record. */ + +static bfd_boolean +nlm_sparc_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 */ - - /* - * First, read in the number of relocation - * entries for this symbol - */ - if (bfd_read ((PTR) temp, 4, 1, abfd) - != 4) - { - bfd_error = system_call_error; - return (false); - } - + 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; + + /* First, read in the number of relocation + entries for this symbol. */ + if (bfd_bread (temp, (bfd_size_type) 4, abfd) != 4) + return FALSE; + rcount = bfd_get_32 (abfd, temp); - - /* - * Next, read in the length of the symbol - */ - - if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd) + + /* Next, read in the length of the symbol. */ + if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd) != sizeof (symlength)) - { - bfd_error = system_call_error; - return (false); - } + return FALSE; sym -> symbol.the_bfd = abfd; - sym -> symbol.name = bfd_alloc (abfd, symlength + 1); - - /* - * Then read in the symbol - */ - - if (bfd_read ((PTR) sym -> symbol.name, symlength, 1, abfd) - != symlength) - { - bfd_error = system_call_error; - return (false); - } + name = bfd_alloc (abfd, (bfd_size_type) symlength + 1); + if (name == NULL) + return FALSE; + + /* Then read in the symbol. */ + 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; - - /* - * Next, start reading in the relocs. - */ - - nlm_relocs = ((struct nlm_relent *) - bfd_alloc (abfd, rcount * sizeof (struct nlm_relent))); + sym -> symbol.section = bfd_und_section_ptr; + + /* Next, start reading in the relocs. */ + nlm_relocs = bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)); + if (!nlm_relocs) + return FALSE; sym -> relocs = nlm_relocs; sym -> rcnt = 0; while (sym -> rcnt < rcount) { asection *section; - - if (nlm_sparc_read_reloc (abfd, sym, §ion, - &nlm_relocs -> reloc) - == false) - return false; + + if (! nlm_sparc_read_reloc (abfd, sym, §ion, &nlm_relocs -> reloc)) + return FALSE; nlm_relocs -> section = section; nlm_relocs++; sym -> rcnt++; } - return true; + + return TRUE; } -static boolean -nlm_sparc_write_import (abfd, sec, rel) - bfd *abfd; - asection *sec; - arelent *rel; +static bfd_boolean +nlm_sparc_write_import (bfd * abfd, asection * sec, arelent * rel) { char temp[4]; + asection *code, *data, *bss, *symsec; + bfd_vma base; + + code = bfd_get_section_by_name (abfd, NLM_CODE_NAME); + data = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME); + bss = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME); + symsec = (*rel->sym_ptr_ptr)->section; + + if (symsec == code) + base = 0; + else if (symsec == data) + base = code->size; + else if (symsec == bss) + base = code->size + data->size; + else + base = 0; - bfd_put_32 (abfd, (*rel->sym_ptr_ptr)->value, temp); - bfd_write ((PTR)temp, 4, 1, abfd); - bfd_put_32 (abfd, 1, temp); - bfd_write ((PTR)temp, 4, 1, abfd); - if (nlm_sparc_write_reloc (abfd, sec, rel) == false) - return false; - return true; +#ifdef DEBUG + fprintf (stderr, "%s: <%x, 1>\n\t", + __FUNCTION__, base + (*rel->sym_ptr_ptr)->value); +#endif + bfd_put_32 (abfd, base + (*rel->sym_ptr_ptr)->value, temp); + if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4) + return FALSE; + bfd_put_32 (abfd, (bfd_vma) 1, temp); + if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4) + return FALSE; + if (! nlm_sparc_write_reloc (abfd, sec, rel)) + return FALSE; + return TRUE; } /* Write out an external reference. */ -static boolean -nlm_sparc_write_external (abfd, count, sym, relocs) - bfd *abfd; - bfd_size_type count; - asymbol *sym; - struct reloc_and_sec *relocs; +static bfd_boolean +nlm_sparc_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]; bfd_put_32 (abfd, count, temp); - if (bfd_write (temp, sizeof(temp), 1, abfd) != sizeof (temp)) - { - bfd_error = system_call_error; - return false; - } + if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp)) + return FALSE; len = strlen (sym->name); - if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte)) - || bfd_write (sym->name, len, 1, abfd) != len) - { - bfd_error = system_call_error; - 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; for (i = 0; i < count; i++) - { - if (nlm_sparc_write_reloc (abfd, relocs[i].sec, - relocs[i].rel) == false) - return false; - } + if (! nlm_sparc_write_reloc (abfd, relocs[i].sec, relocs[i].rel)) + return FALSE; + + return TRUE; +} + +static bfd_boolean +nlm_sparc_write_export (bfd * abfd, asymbol * sym, bfd_vma value) +{ + bfd_byte len; + bfd_byte temp[4]; + +#ifdef DEBUG + fprintf (stderr, "%s: <%x, %d, %s>\n", + __FUNCTION__, value, strlen (sym->name), sym->name); +#endif + bfd_put_32 (abfd, value, temp); + len = strlen (sym->name); + + if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4 + || bfd_bwrite (&len, (bfd_size_type) 1, abfd) != 1 + || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len) + return FALSE; - return true; + return TRUE; } #undef nlm_swap_fixed_header_in @@ -377,24 +353,26 @@ static const struct nlm_backend_data nlm32_sparc_backend = { "NetWare SPARC Module \032", sizeof (Nlm32_sparc_External_Fixed_Header), - 0, /* optional_prefix_size */ + 0, /* Optional_prefix_size. */ bfd_arch_sparc, 0, - 0, /* backend_object_p */ - 0, /* write_prefix_func */ + FALSE, + 0, /* Backend_object_p. */ + 0, /* Write_prefix_func. */ nlm_sparc_read_reloc, nlm_sparc_mangle_relocs, nlm_sparc_read_import, nlm_sparc_write_import, - 0, /* set_public_section */ - 0, /* get_public_offset */ + 0, /* Set_public_section. */ + 0, /* Get_public_offset. */ nlm_swap_fixed_header_in, nlm_swap_fixed_header_out, nlm_sparc_write_external, + nlm_sparc_write_export }; #define TARGET_BIG_NAME "nlm32-sparc" -#define TARGET_BIG_SYM nlmNAME(sparc_vec) -#define TARGET_BACKEND_DATA &nlm32_sparc_backend +#define TARGET_BIG_SYM nlmNAME (sparc_vec) +#define TARGET_BACKEND_DATA & nlm32_sparc_backend #include "nlm-target.h"