/* BFD backend for hp-ux 9000/300
- Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2000, 2001
- Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
+ 2004 Free Software Foundation, Inc.
Written by Glenn Engel.
This file is part of BFD, the Binary File Descriptor library.
slurp_symbol_table
swap_std_reloc_in
slurp_reloc_table
- get_symtab
+ canonicalize_symtab
get_symtab_upper_bound
canonicalize_reloc
mkobject
This should also be fixed. */
#define TARGETNAME "a.out-hp300hpux"
-#define MY(OP) CAT(hp300hpux_,OP)
+
+/* Do not "beautify" the CONCAT* macro args. Traditional C will not
+ remove whitespace added here, and thus will fail to concatenate
+ the tokens. */
+#define MY(OP) CONCAT2 (hp300hpux_,OP)
#define external_exec hp300hpux_exec_bytes
#define external_nlist hp300hpux_nlist_bytes
/* provide overrides for routines in this file */
/***********************************************/
/* these don't use MY because that causes problems within JUMP_TABLE
- (CAT winds up being expanded recursively, which ANSI C compilers
+ (CONCAT2 winds up being expanded recursively, which ANSI C compilers
will not do). */
-#define MY_get_symtab hp300hpux_get_symtab
+#define MY_canonicalize_symtab hp300hpux_canonicalize_symtab
#define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound
#define MY_canonicalize_reloc hp300hpux_canonicalize_reloc
#define MY_write_object_contents hp300hpux_write_object_contents
#define HP_RLENGTH_LONG 0x02
#define HP_RLENGTH_ALIGN 0x03
-#define NAME(x,y) CAT3(hp300hpux,_32_,y)
+#define NAME(x,y) CONCAT3 (hp300hpux,_32_,y)
#define ARCH_SIZE 32
/* aoutx.h requires definitions for BMAGIC and QMAGIC. */
#include "aoutx.h"
-static const bfd_target * MY (callback) PARAMS ((bfd *));
-static boolean MY (write_object_contents) PARAMS ((bfd *));
-static void convert_sym_type PARAMS ((struct external_nlist *, aout_symbol_type *, bfd *));
-
-boolean MY (slurp_symbol_table) PARAMS ((bfd *));
-void MY (swap_std_reloc_in) PARAMS ((bfd *, struct hp300hpux_reloc *, arelent *, asymbol **, bfd_size_type));
-boolean MY (slurp_reloc_table) PARAMS ((bfd *, sec_ptr, asymbol **));
-long MY (get_symtab) PARAMS ((bfd *, asymbol **));
-long MY (get_symtab_upper_bound) PARAMS ((bfd *));
-long MY (canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+static const bfd_target * MY (callback)
+ PARAMS ((bfd *));
+static bfd_boolean MY (write_object_contents)
+ PARAMS ((bfd *));
+static void convert_sym_type
+ PARAMS ((struct external_nlist *, aout_symbol_type *, bfd *));
+
+bfd_boolean MY (slurp_symbol_table)
+ PARAMS ((bfd *));
+void MY (swap_std_reloc_in)
+ PARAMS ((bfd *, struct hp300hpux_reloc *, arelent *, asymbol **,
+ bfd_size_type));
+bfd_boolean MY (slurp_reloc_table)
+ PARAMS ((bfd *, sec_ptr, asymbol **));
+long MY (canonicalize_symtab)
+ PARAMS ((bfd *, asymbol **));
+long MY (get_symtab_upper_bound)
+ PARAMS ((bfd *));
+long MY (canonicalize_reloc)
+ PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
/* Since the hpux symbol table has nlist elements interspersed with
strings and we need to insert som strings for secondary symbols, we
struct internal_exec *execp = exec_hdr (abfd);
/* Calculate the file positions of the parts of a newly read aout header */
- obj_textsec (abfd)->_raw_size = N_TXTSIZE (*execp);
+ obj_textsec (abfd)->size = N_TXTSIZE (*execp);
/* The virtual memory addresses of the sections */
obj_textsec (abfd)->vma = N_TXTADDR (*execp);
return abfd->xvec;
}
-extern boolean aout_32_write_syms PARAMS ((bfd * abfd));
+extern bfd_boolean aout_32_write_syms
+ PARAMS ((bfd * abfd));
-static boolean
+static bfd_boolean
MY (write_object_contents) (abfd)
bfd *abfd;
{
/* this is really the sym table size but we store it in drelocs */
H_PUT_32 (abfd, (bfd_get_symcount (abfd) * 12), exec_bytes.e_drelocs);
- if (bfd_seek (abfd, (file_ptr) 0, false) != 0
+ if (bfd_seek (abfd, (file_ptr) 0, FALSE) != 0
|| (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
!= EXEC_BYTES_SIZE))
- return false;
+ return FALSE;
/* Write out the symbols, and then the relocs. We must write out
the symbols first so that we know the symbol indices. */
/* Skip the relocs to where we want to put the symbols. */
if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp) + execp->a_drsize),
SEEK_SET) != 0)
- return false;
+ return FALSE;
}
if (!MY (write_syms) (abfd))
- return false;
+ return FALSE;
if (bfd_get_symcount (abfd) != 0)
{
if (bfd_seek (abfd, (file_ptr) N_TRELOFF (*execp), SEEK_CUR) != 0)
- return false;
+ return FALSE;
if (!NAME (aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
- return false;
+ return FALSE;
if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp), SEEK_CUR) != 0)
- return false;
+ return FALSE;
if (!NAME (aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
- return false;
+ return FALSE;
}
- return true;
+ return TRUE;
}
/* convert the hp symbol type to be the same as aout64.h usage so we */
/***************************************************************/
/* check the header to see if it was generated by a bfd output */
- /* this is detected rather bizarely by requiring a bunch of */
+ /* this is detected rather bizarrely by requiring a bunch of */
/* header fields to be zero and an old unused field (now used) */
/* to be set. */
/***************************************************************/
...
*/
-boolean
+bfd_boolean
MY (slurp_symbol_table) (abfd)
bfd *abfd;
{
/* If there's no work to be done, don't do any */
if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
- return true;
+ return TRUE;
symbol_bytes = exec_hdr (abfd)->a_syms;
amt = symbol_bytes + SYM_EXTRA_BYTES;
strings = (char *) bfd_alloc (abfd, amt);
if (!strings)
- return false;
+ return FALSE;
syms = (struct external_nlist *) (strings + SYM_EXTRA_BYTES);
if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
|| bfd_bread ((PTR) syms, symbol_bytes, abfd) != symbol_bytes)
{
bfd_release (abfd, syms);
- return false;
+ return FALSE;
}
sym_end = (struct external_nlist *) (((char *) syms) + symbol_bytes);
amt *= sizeof (aout_symbol_type);
cached = (aout_symbol_type *) bfd_zalloc (abfd, amt);
if (cached == NULL && num_syms != 0)
- return false;
+ return FALSE;
/* as we march thru the hp symbol table, convert it into a list of
null terminated strings to hold the symbol names. Make sure any
assignment to the strings pointer is done after we're thru using
the nlist so we don't overwrite anything important. */
- /* OK, now walk the new symtable, cacheing symbol properties */
+ /* OK, now walk the new symtable, caching symbol properties */
{
aout_symbol_type *cache_ptr = cached;
aout_symbol_type cache_save;
cache_save = *cache_ptr;
convert_sym_type (sym_pointer, cache_ptr, abfd);
if (!translate_from_native_sym_flags (abfd, cache_ptr))
- return false;
+ return FALSE;
/********************************************************/
- /* for hpux, the 'lenght' value indicates the length of */
+ /* for hpux, the 'length' value indicates the length of */
/* the symbol name which follows the nlist entry. */
/********************************************************/
if (length)
obj_aout_symbols (abfd) = cached;
- return true;
+ return TRUE;
}
void
}
}
-boolean
+bfd_boolean
MY (slurp_reloc_table) (abfd, asect, symbols)
bfd *abfd;
sec_ptr asect;
arelent *cache_ptr;
if (asect->relocation)
- return true;
+ return TRUE;
if (asect->flags & SEC_CONSTRUCTOR)
- return true;
+ return TRUE;
if (asect == obj_datasec (abfd))
{
}
bfd_set_error (bfd_error_invalid_operation);
- return false;
+ return FALSE;
doit:
if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
- return false;
+ return FALSE;
each_size = obj_reloc_entry_size (abfd);
count = reloc_size / each_size;
reloc_cache = (arelent *) bfd_zalloc (abfd, count * sizeof (arelent));
if (!reloc_cache && count != 0)
- return false;
+ return FALSE;
relocs = (PTR) bfd_alloc (abfd, reloc_size);
if (!relocs && reloc_size != 0)
{
bfd_release (abfd, reloc_cache);
- return false;
+ return FALSE;
}
if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
{
bfd_release (abfd, relocs);
bfd_release (abfd, reloc_cache);
- return false;
+ return FALSE;
}
rptr = (struct hp300hpux_reloc *) relocs;
bfd_release (abfd, relocs);
asect->relocation = reloc_cache;
asect->reloc_count = count;
- return true;
+ return TRUE;
}
/************************************************************************/
/* call aout_32 versions if the input file was generated by gcc */
/************************************************************************/
-long aout_32_get_symtab PARAMS ((bfd * abfd, asymbol ** location));
-long aout_32_get_symtab_upper_bound PARAMS ((bfd * abfd));
-
-long aout_32_canonicalize_reloc PARAMS ((bfd * abfd, sec_ptr section,
- arelent ** relptr,
- asymbol ** symbols));
+long aout_32_canonicalize_symtab
+ PARAMS ((bfd * abfd, asymbol ** location));
+long aout_32_get_symtab_upper_bound
+ PARAMS ((bfd * abfd));
+long aout_32_canonicalize_reloc
+ PARAMS ((bfd * abfd, sec_ptr section, arelent ** relptr,
+ asymbol ** symbols));
long
-MY (get_symtab) (abfd, location)
+MY (canonicalize_symtab) (abfd, location)
bfd *abfd;
asymbol **location;
{
aout_symbol_type *symbase;
if (obj_aout_subformat (abfd) == gnu_encap_format)
- return aout_32_get_symtab (abfd, location);
+ return aout_32_canonicalize_symtab (abfd, location);
if (!MY (slurp_symbol_table) (abfd))
return -1;
projects / deliverable / binutils-gdb.git / blobdiff