/* bfd back-end for HP PA-RISC SOM objects.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002
- Free Software Foundation, Inc.
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+ 2012 Free Software Foundation, Inc.
Contributed by the Center for Software Science at the
University of Utah.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+#include "sysdep.h"
#include "alloca-conf.h"
#include "bfd.h"
-#include "sysdep.h"
-
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined(HOST_HPPAMPEIX)
#include "libbfd.h"
#include "som.h"
#include "safe-ctype.h"
+#include "som/reloc.h"
+#include "aout/ar.h"
-#include <sys/param.h>
-#include <signal.h>
-#include <machine/reg.h>
-#include <sys/file.h>
+static bfd_reloc_status_type hppa_som_reloc
+ (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean som_mkobject (bfd *);
+static bfd_boolean som_is_space (asection *);
+static bfd_boolean som_is_subspace (asection *);
+static int compare_subspaces (const void *, const void *);
+static unsigned long som_compute_checksum (struct som_external_header *);
+static bfd_boolean som_build_and_write_symbol_table (bfd *);
+static unsigned int som_slurp_symbol_table (bfd *);
-/* Magic not defined in standard HP-UX header files until 8.0 */
+/* Magic not defined in standard HP-UX header files until 8.0. */
#ifndef CPU_PA_RISC1_0
#define CPU_PA_RISC1_0 0x20B
Note one side effect of using a R_PREV_FIXUP is the relocation that
is being repeated moves to the front of the queue. */
-struct reloc_queue {
+struct reloc_queue
+{
unsigned char *reloc;
unsigned int size;
} reloc_queue[4];
/* This fully describes the symbol types which may be attached to
an EXPORT or IMPORT directive. Only SOM uses this formation
(ELF has no need for it). */
-typedef enum {
+typedef enum
+{
SYMBOL_TYPE_UNKNOWN,
SYMBOL_TYPE_ABSOLUTE,
SYMBOL_TYPE_CODE,
SYMBOL_TYPE_SEC_PROG,
} pa_symbol_type;
-struct section_to_type {
- char *section;
+struct section_to_type
+{
+ const char *section;
char type;
};
/* Assorted symbol information that needs to be derived from the BFD symbol
and/or the BFD backend private symbol data. */
-struct som_misc_symbol_info {
+struct som_misc_symbol_info
+{
unsigned int symbol_type;
unsigned int symbol_scope;
unsigned int arg_reloc;
unsigned int symbol_value;
unsigned int priv_level;
unsigned int secondary_def;
+ unsigned int is_comdat;
+ unsigned int is_common;
+ unsigned int dup_common;
};
-/* Forward declarations */
-
-static boolean som_mkobject PARAMS ((bfd *));
-static const bfd_target * som_object_setup PARAMS ((bfd *,
- struct header *,
- struct som_exec_auxhdr *,
- unsigned long));
-static boolean setup_sections PARAMS ((bfd *, struct header *, unsigned long));
-static const bfd_target * som_object_p PARAMS ((bfd *));
-static boolean som_write_object_contents PARAMS ((bfd *));
-static boolean som_slurp_string_table PARAMS ((bfd *));
-static unsigned int som_slurp_symbol_table PARAMS ((bfd *));
-static long som_get_symtab_upper_bound PARAMS ((bfd *));
-static long som_canonicalize_reloc PARAMS ((bfd *, sec_ptr,
- arelent **, asymbol **));
-static long som_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static unsigned int som_set_reloc_info PARAMS ((unsigned char *, unsigned int,
- arelent *, asection *,
- asymbol **, boolean));
-static boolean som_slurp_reloc_table PARAMS ((bfd *, asection *,
- asymbol **, boolean));
-static long som_get_symtab PARAMS ((bfd *, asymbol **));
-static asymbol * som_make_empty_symbol PARAMS ((bfd *));
-static void som_print_symbol PARAMS ((bfd *, PTR,
- asymbol *, bfd_print_symbol_type));
-static boolean som_new_section_hook PARAMS ((bfd *, asection *));
-static boolean som_bfd_copy_private_symbol_data PARAMS ((bfd *, asymbol *,
- bfd *, asymbol *));
-static boolean som_bfd_copy_private_section_data PARAMS ((bfd *, asection *,
- bfd *, asection *));
-static boolean som_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-#define som_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
-#define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-static boolean som_bfd_is_local_label_name PARAMS ((bfd *, const char *));
-static boolean som_set_section_contents PARAMS ((bfd *, sec_ptr, PTR,
- file_ptr, bfd_size_type));
-static boolean som_get_section_contents PARAMS ((bfd *, sec_ptr, PTR,
- file_ptr, bfd_size_type));
-static boolean som_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
- unsigned long));
-static boolean som_find_nearest_line PARAMS ((bfd *, asection *,
- asymbol **, bfd_vma,
- const char **,
- const char **,
- unsigned int *));
-static void som_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static asection * bfd_section_from_som_symbol PARAMS ((bfd *,
- struct symbol_dictionary_record *));
-static int log2 PARAMS ((unsigned int));
-static bfd_reloc_status_type hppa_som_reloc PARAMS ((bfd *, arelent *,
- asymbol *, PTR,
- asection *, bfd *,
- char **));
-static void som_initialize_reloc_queue PARAMS ((struct reloc_queue *));
-static void som_reloc_queue_insert PARAMS ((unsigned char *, unsigned int,
- struct reloc_queue *));
-static void som_reloc_queue_fix PARAMS ((struct reloc_queue *, unsigned int));
-static int som_reloc_queue_find PARAMS ((unsigned char *, unsigned int,
- struct reloc_queue *));
-static unsigned char * try_prev_fixup PARAMS ((bfd *, int *, unsigned char *,
- unsigned int,
- struct reloc_queue *));
-
-static unsigned char * som_reloc_skip PARAMS ((bfd *, unsigned int,
- unsigned char *, unsigned int *,
- struct reloc_queue *));
-static unsigned char * som_reloc_addend PARAMS ((bfd *, bfd_vma,
- unsigned char *,
- unsigned int *,
- struct reloc_queue *));
-static unsigned char * som_reloc_call PARAMS ((bfd *, unsigned char *,
- unsigned int *,
- arelent *, int,
- struct reloc_queue *));
-static unsigned long som_count_spaces PARAMS ((bfd *));
-static unsigned long som_count_subspaces PARAMS ((bfd *));
-static int compare_syms PARAMS ((const void *, const void *));
-static int compare_subspaces PARAMS ((const void *, const void *));
-static unsigned long som_compute_checksum PARAMS ((bfd *));
-static boolean som_prep_headers PARAMS ((bfd *));
-static int som_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean som_finish_writing PARAMS ((bfd *));
-static boolean som_build_and_write_symbol_table PARAMS ((bfd *));
-static void som_prep_for_fixups PARAMS ((bfd *, asymbol **, unsigned long));
-static boolean som_write_fixups PARAMS ((bfd *, unsigned long, unsigned int *));
-static boolean som_write_space_strings PARAMS ((bfd *, unsigned long,
- unsigned int *));
-static boolean som_write_symbol_strings PARAMS ((bfd *, unsigned long,
- asymbol **, unsigned int,
- unsigned *,
- COMPUNIT *));
-static boolean som_begin_writing PARAMS ((bfd *));
-static reloc_howto_type * som_bfd_reloc_type_lookup
- PARAMS ((bfd *, bfd_reloc_code_real_type));
-static char som_section_type PARAMS ((const char *));
-static int som_decode_symclass PARAMS ((asymbol *));
-static boolean som_bfd_count_ar_symbols PARAMS ((bfd *, struct lst_header *,
- symindex *));
-
-static boolean som_bfd_fill_in_ar_symbols PARAMS ((bfd *, struct lst_header *,
- carsym **syms));
-static boolean som_slurp_armap PARAMS ((bfd *));
-static boolean som_write_armap PARAMS ((bfd *, unsigned int, struct orl *,
- unsigned int, int));
-static void som_bfd_derive_misc_symbol_info PARAMS ((bfd *, asymbol *,
- struct som_misc_symbol_info *));
-static boolean som_bfd_prep_for_ar_write PARAMS ((bfd *, unsigned int *,
- unsigned int *));
-static unsigned int som_bfd_ar_symbol_hash PARAMS ((asymbol *));
-static boolean som_bfd_ar_write_symbol_stuff PARAMS ((bfd *, unsigned int,
- unsigned int,
- struct lst_header,
- unsigned int));
-static boolean som_is_space PARAMS ((asection *));
-static boolean som_is_subspace PARAMS ((asection *));
-static boolean som_is_container PARAMS ((asection *, asection *));
-static boolean som_bfd_free_cached_info PARAMS ((bfd *));
-static boolean som_bfd_link_split_section PARAMS ((bfd *, asection *));
-
/* Map SOM section names to POSIX/BSD single-character symbol types.
This table includes all the standard subspaces as defined in the
current "PRO ABI for PA-RISC Systems", $UNWIND$ which for
some reason was left out, and sections specific to embedded stabs. */
-static const struct section_to_type stt[] = {
+static const struct section_to_type stt[] =
+{
{"$TEXT$", 't'},
{"$SHLIB_INFO$", 't'},
{"$MILLICODE$", 't'},
addil foo-$global$-0x1234 would use an override for "0x1234" rather
than storing it into the addil itself. */
-struct fixup_format {
+struct fixup_format
+{
int D;
const char *format;
};
-static const struct fixup_format som_fixup_formats[256] = {
- /* R_NO_RELOCATION */
+static const struct fixup_format som_fixup_formats[256] =
+{
+ /* R_NO_RELOCATION. */
{ 0, "LD1+4*=" }, /* 0x00 */
{ 1, "LD1+4*=" }, /* 0x01 */
{ 2, "LD1+4*=" }, /* 0x02 */
{ 1, "LD16<c+1+4*=" }, /* 0x1d */
{ 2, "LD16<c+1+4*=" }, /* 0x1e */
{ 0, "Ld1+=" }, /* 0x1f */
- /* R_ZEROES */
+ /* R_ZEROES. */
{ 0, "Lb1+4*=" }, /* 0x20 */
{ 1, "Ld1+=" }, /* 0x21 */
- /* R_UNINIT */
+ /* R_UNINIT. */
{ 0, "Lb1+4*=" }, /* 0x22 */
{ 1, "Ld1+=" }, /* 0x23 */
- /* R_RELOCATION */
+ /* R_RELOCATION. */
{ 0, "L4=" }, /* 0x24 */
- /* R_DATA_ONE_SYMBOL */
+ /* R_DATA_ONE_SYMBOL. */
{ 0, "L4=Sb=" }, /* 0x25 */
{ 1, "L4=Sd=" }, /* 0x26 */
- /* R_DATA_PLEBEL */
+ /* R_DATA_PLABEL. */
{ 0, "L4=Sb=" }, /* 0x27 */
{ 1, "L4=Sd=" }, /* 0x28 */
- /* R_SPACE_REF */
+ /* R_SPACE_REF. */
{ 0, "L4=" }, /* 0x29 */
- /* R_REPEATED_INIT */
+ /* R_REPEATED_INIT. */
{ 0, "L4=Mb1+4*=" }, /* 0x2a */
{ 1, "Lb4*=Mb1+L*=" }, /* 0x2b */
{ 2, "Lb4*=Md1+4*=" }, /* 0x2c */
{ 3, "Ld1+=Me1+=" }, /* 0x2d */
{ 0, "" }, /* 0x2e */
{ 0, "" }, /* 0x2f */
- /* R_PCREL_CALL */
+ /* R_PCREL_CALL. */
{ 0, "L4=RD=Sb=" }, /* 0x30 */
{ 1, "L4=RD=Sb=" }, /* 0x31 */
{ 2, "L4=RD=Sb=" }, /* 0x32 */
{ 1, "L4=RD8<b+=Sb=" }, /* 0x3b */
{ 0, "L4=RD8<b+=Sd=" }, /* 0x3c */
{ 1, "L4=RD8<b+=Sd=" }, /* 0x3d */
- /* R_SHORT_PCREL_MODE */
+ /* R_SHORT_PCREL_MODE. */
{ 0, "" }, /* 0x3e */
- /* R_LONG_PCREL_MODE */
+ /* R_LONG_PCREL_MODE. */
{ 0, "" }, /* 0x3f */
- /* R_ABS_CALL */
+ /* R_ABS_CALL. */
{ 0, "L4=RD=Sb=" }, /* 0x40 */
{ 1, "L4=RD=Sb=" }, /* 0x41 */
{ 2, "L4=RD=Sb=" }, /* 0x42 */
{ 1, "L4=RD8<b+=Sb=" }, /* 0x4b */
{ 0, "L4=RD8<b+=Sd=" }, /* 0x4c */
{ 1, "L4=RD8<b+=Sd=" }, /* 0x4d */
- /* R_RESERVED */
+ /* R_RESERVED. */
{ 0, "" }, /* 0x4e */
{ 0, "" }, /* 0x4f */
- /* R_DP_RELATIVE */
+ /* R_DP_RELATIVE. */
{ 0, "L4=SD=" }, /* 0x50 */
{ 1, "L4=SD=" }, /* 0x51 */
{ 2, "L4=SD=" }, /* 0x52 */
{ 31, "L4=SD=" }, /* 0x6f */
{ 32, "L4=Sb=" }, /* 0x70 */
{ 33, "L4=Sd=" }, /* 0x71 */
- /* R_RESERVED */
- { 0, "" }, /* 0x72 */
+ /* R_DATA_GPREL. */
+ { 0, "L4=Sd=" }, /* 0x72 */
+ /* R_RESERVED. */
{ 0, "" }, /* 0x73 */
{ 0, "" }, /* 0x74 */
{ 0, "" }, /* 0x75 */
{ 0, "" }, /* 0x76 */
{ 0, "" }, /* 0x77 */
- /* R_DLT_REL */
+ /* R_DLT_REL. */
{ 0, "L4=Sb=" }, /* 0x78 */
{ 1, "L4=Sd=" }, /* 0x79 */
- /* R_RESERVED */
+ /* R_RESERVED. */
{ 0, "" }, /* 0x7a */
{ 0, "" }, /* 0x7b */
{ 0, "" }, /* 0x7c */
{ 0, "" }, /* 0x7d */
{ 0, "" }, /* 0x7e */
{ 0, "" }, /* 0x7f */
- /* R_CODE_ONE_SYMBOL */
+ /* R_CODE_ONE_SYMBOL. */
{ 0, "L4=SD=" }, /* 0x80 */
{ 1, "L4=SD=" }, /* 0x81 */
{ 2, "L4=SD=" }, /* 0x82 */
{ 31, "L4=SD=" }, /* 0x9f */
{ 32, "L4=Sb=" }, /* 0xa0 */
{ 33, "L4=Sd=" }, /* 0xa1 */
- /* R_RESERVED */
+ /* R_RESERVED. */
{ 0, "" }, /* 0xa2 */
{ 0, "" }, /* 0xa3 */
{ 0, "" }, /* 0xa4 */
{ 0, "" }, /* 0xab */
{ 0, "" }, /* 0xac */
{ 0, "" }, /* 0xad */
- /* R_MILLI_REL */
+ /* R_MILLI_REL. */
{ 0, "L4=Sb=" }, /* 0xae */
{ 1, "L4=Sd=" }, /* 0xaf */
- /* R_CODE_PLABEL */
+ /* R_CODE_PLABEL. */
{ 0, "L4=Sb=" }, /* 0xb0 */
{ 1, "L4=Sd=" }, /* 0xb1 */
- /* R_BREAKPOINT */
+ /* R_BREAKPOINT. */
{ 0, "L4=" }, /* 0xb2 */
- /* R_ENTRY */
+ /* R_ENTRY. */
{ 0, "Te=Ue=" }, /* 0xb3 */
{ 1, "Uf=" }, /* 0xb4 */
- /* R_ALT_ENTRY */
+ /* R_ALT_ENTRY. */
{ 0, "" }, /* 0xb5 */
- /* R_EXIT */
+ /* R_EXIT. */
{ 0, "" }, /* 0xb6 */
- /* R_BEGIN_TRY */
+ /* R_BEGIN_TRY. */
{ 0, "" }, /* 0xb7 */
- /* R_END_TRY */
+ /* R_END_TRY. */
{ 0, "R0=" }, /* 0xb8 */
{ 1, "Rb4*=" }, /* 0xb9 */
{ 2, "Rd4*=" }, /* 0xba */
- /* R_BEGIN_BRTAB */
+ /* R_BEGIN_BRTAB. */
{ 0, "" }, /* 0xbb */
- /* R_END_BRTAB */
+ /* R_END_BRTAB. */
{ 0, "" }, /* 0xbc */
- /* R_STATEMENT */
+ /* R_STATEMENT. */
{ 0, "Nb=" }, /* 0xbd */
{ 1, "Nc=" }, /* 0xbe */
{ 2, "Nd=" }, /* 0xbf */
- /* R_DATA_EXPR */
+ /* R_DATA_EXPR. */
{ 0, "L4=" }, /* 0xc0 */
- /* R_CODE_EXPR */
+ /* R_CODE_EXPR. */
{ 0, "L4=" }, /* 0xc1 */
- /* R_FSEL */
+ /* R_FSEL. */
{ 0, "" }, /* 0xc2 */
- /* R_LSEL */
+ /* R_LSEL. */
{ 0, "" }, /* 0xc3 */
- /* R_RSEL */
+ /* R_RSEL. */
{ 0, "" }, /* 0xc4 */
- /* R_N_MODE */
+ /* R_N_MODE. */
{ 0, "" }, /* 0xc5 */
- /* R_S_MODE */
+ /* R_S_MODE. */
{ 0, "" }, /* 0xc6 */
- /* R_D_MODE */
+ /* R_D_MODE. */
{ 0, "" }, /* 0xc7 */
- /* R_R_MODE */
+ /* R_R_MODE. */
{ 0, "" }, /* 0xc8 */
- /* R_DATA_OVERRIDE */
+ /* R_DATA_OVERRIDE. */
{ 0, "V0=" }, /* 0xc9 */
{ 1, "Vb=" }, /* 0xca */
{ 2, "Vc=" }, /* 0xcb */
{ 3, "Vd=" }, /* 0xcc */
{ 4, "Ve=" }, /* 0xcd */
- /* R_TRANSLATED */
+ /* R_TRANSLATED. */
{ 0, "" }, /* 0xce */
- /* R_AUX_UNWIND */
- { 0,"Sd=Vf=Ef=" }, /* 0xcf */
- /* R_COMP1 */
+ /* R_AUX_UNWIND. */
+ { 0,"Sd=Ve=Ee=" }, /* 0xcf */
+ /* R_COMP1. */
{ 0, "Ob=" }, /* 0xd0 */
- /* R_COMP2 */
+ /* R_COMP2. */
{ 0, "Ob=Sd=" }, /* 0xd1 */
- /* R_COMP3 */
+ /* R_COMP3. */
{ 0, "Ob=Ve=" }, /* 0xd2 */
- /* R_PREV_FIXUP */
+ /* R_PREV_FIXUP. */
{ 0, "P" }, /* 0xd3 */
{ 1, "P" }, /* 0xd4 */
{ 2, "P" }, /* 0xd5 */
{ 3, "P" }, /* 0xd6 */
- /* R_SEC_STMT */
+ /* R_SEC_STMT. */
{ 0, "" }, /* 0xd7 */
- /* R_N0SEL */
+ /* R_N0SEL. */
{ 0, "" }, /* 0xd8 */
- /* R_N1SEL */
+ /* R_N1SEL. */
{ 0, "" }, /* 0xd9 */
- /* R_LINETAB */
+ /* R_LINETAB. */
{ 0, "Eb=Sd=Ve=" }, /* 0xda */
- /* R_LINETAB_ESC */
+ /* R_LINETAB_ESC. */
{ 0, "Eb=Mb=" }, /* 0xdb */
- /* R_LTP_OVERRIDE */
+ /* R_LTP_OVERRIDE. */
{ 0, "" }, /* 0xdc */
- /* R_COMMENT */
- { 0, "Ob=Ve=" }, /* 0xdd */
- /* R_RESERVED */
+ /* R_COMMENT. */
+ { 0, "Ob=Vf=" }, /* 0xdd */
+ /* R_RESERVED. */
{ 0, "" }, /* 0xde */
{ 0, "" }, /* 0xdf */
{ 0, "" }, /* 0xe0 */
{ 0, "" }, /* 0xff */
};
-static const int comp1_opcodes[] = {
+static const int comp1_opcodes[] =
+{
0x00,
0x40,
0x41,
-1
};
-static const int comp2_opcodes[] = {
+static const int comp2_opcodes[] =
+{
0x00,
0x80,
0x82,
-1
};
-static const int comp3_opcodes[] = {
+static const int comp3_opcodes[] =
+{
0x00,
0x02,
-1
};
/* These apparently are not in older versions of hpux reloc.h (hpux7). */
-#ifndef R_DLT_REL
-#define R_DLT_REL 0x78
-#endif
-
-#ifndef R_AUX_UNWIND
-#define R_AUX_UNWIND 0xcf
-#endif
-
-#ifndef R_SEC_STMT
-#define R_SEC_STMT 0xd7
-#endif
/* And these first appeared in hpux10. */
#ifndef R_SHORT_PCREL_MODE
#define R_SHORT_PCREL_MODE 0x3e
#endif
-#ifndef R_LONG_PCREL_MODE
-#define R_LONG_PCREL_MODE 0x3f
-#endif
-
-#ifndef R_N0SEL
-#define R_N0SEL 0xd8
-#endif
-
-#ifndef R_N1SEL
-#define R_N1SEL 0xd9
-#endif
-
-#ifndef R_LINETAB
-#define R_LINETAB 0xda
-#endif
-
-#ifndef R_LINETAB_ESC
-#define R_LINETAB_ESC 0xdb
-#endif
-
-#ifndef R_LTP_OVERRIDE
-#define R_LTP_OVERRIDE 0xdc
-#endif
-
-#ifndef R_COMMENT
-#define R_COMMENT 0xdd
-#endif
-
#define SOM_HOWTO(TYPE, NAME) \
- HOWTO(TYPE, 0, 0, 32, false, 0, 0, hppa_som_reloc, NAME, false, 0, 0, false)
+ HOWTO(TYPE, 0, 0, 32, FALSE, 0, 0, hppa_som_reloc, NAME, FALSE, 0, 0, FALSE)
-static reloc_howto_type som_hppa_howto_table[] = {
+static reloc_howto_type som_hppa_howto_table[] =
+{
SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
- SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+ SOM_HOWTO (R_DATA_GPREL, "R_DATA_GPREL"),
SOM_HOWTO (R_RESERVED, "R_RESERVED"),
SOM_HOWTO (R_RESERVED, "R_RESERVED"),
SOM_HOWTO (R_RESERVED, "R_RESERVED"),
the last four multibyte fixups. */
static void
-som_initialize_reloc_queue (queue)
- struct reloc_queue *queue;
+som_initialize_reloc_queue (struct reloc_queue *queue)
{
queue[0].reloc = NULL;
queue[0].size = 0;
/* Insert a new relocation into the relocation queue. */
static void
-som_reloc_queue_insert (p, size, queue)
- unsigned char *p;
- unsigned int size;
- struct reloc_queue *queue;
+som_reloc_queue_insert (unsigned char *p,
+ unsigned int size,
+ struct reloc_queue *queue)
{
queue[3].reloc = queue[2].reloc;
queue[3].size = queue[2].size;
to the front of the queue. */
static void
-som_reloc_queue_fix (queue, index)
- struct reloc_queue *queue;
- unsigned int index;
+som_reloc_queue_fix (struct reloc_queue *queue, unsigned int idx)
{
- if (index == 0)
+ if (idx == 0)
return;
- if (index == 1)
+ if (idx == 1)
{
unsigned char *tmp1 = queue[0].reloc;
unsigned int tmp2 = queue[0].size;
+
queue[0].reloc = queue[1].reloc;
queue[0].size = queue[1].size;
queue[1].reloc = tmp1;
return;
}
- if (index == 2)
+ if (idx == 2)
{
unsigned char *tmp1 = queue[0].reloc;
unsigned int tmp2 = queue[0].size;
+
queue[0].reloc = queue[2].reloc;
queue[0].size = queue[2].size;
queue[2].reloc = queue[1].reloc;
return;
}
- if (index == 3)
+ if (idx == 3)
{
unsigned char *tmp1 = queue[0].reloc;
unsigned int tmp2 = queue[0].size;
+
queue[0].reloc = queue[3].reloc;
queue[0].size = queue[3].size;
queue[3].reloc = queue[2].reloc;
/* Search for a particular relocation in the relocation queue. */
static int
-som_reloc_queue_find (p, size, queue)
- unsigned char *p;
- unsigned int size;
- struct reloc_queue *queue;
+som_reloc_queue_find (unsigned char *p,
+ unsigned int size,
+ struct reloc_queue *queue)
{
if (queue[0].reloc && !memcmp (p, queue[0].reloc, size)
&& size == queue[0].size)
}
static unsigned char *
-try_prev_fixup (abfd, subspace_reloc_sizep, p, size, queue)
- bfd *abfd ATTRIBUTE_UNUSED;
- int *subspace_reloc_sizep;
- unsigned char *p;
- unsigned int size;
- struct reloc_queue *queue;
+try_prev_fixup (bfd *abfd ATTRIBUTE_UNUSED,
+ unsigned int *subspace_reloc_sizep,
+ unsigned char *p,
+ unsigned int size,
+ struct reloc_queue *queue)
{
int queue_index = som_reloc_queue_find (p, size, queue);
current pointer into the relocation stream. */
static unsigned char *
-som_reloc_skip (abfd, skip, p, subspace_reloc_sizep, queue)
- bfd *abfd;
- unsigned int skip;
- unsigned char *p;
- unsigned int *subspace_reloc_sizep;
- struct reloc_queue *queue;
+som_reloc_skip (bfd *abfd,
+ unsigned int skip,
+ unsigned char *p,
+ unsigned int *subspace_reloc_sizep,
+ struct reloc_queue *queue)
{
/* Use a 4 byte R_NO_RELOCATION entry with a maximal value
then R_PREV_FIXUPs to get the difference down to a
into the relocation stream. */
static unsigned char *
-som_reloc_addend (abfd, addend, p, subspace_reloc_sizep, queue)
- bfd *abfd;
- bfd_vma addend;
- unsigned char *p;
- unsigned int *subspace_reloc_sizep;
- struct reloc_queue *queue;
+som_reloc_addend (bfd *abfd,
+ bfd_vma addend,
+ unsigned char *p,
+ unsigned int *subspace_reloc_sizep,
+ struct reloc_queue *queue)
{
if (addend + 0x80 < 0x100)
{
/* Handle a single function call relocation. */
static unsigned char *
-som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
- bfd *abfd;
- unsigned char *p;
- unsigned int *subspace_reloc_sizep;
- arelent *bfd_reloc;
- int sym_num;
- struct reloc_queue *queue;
+som_reloc_call (bfd *abfd,
+ unsigned char *p,
+ unsigned int *subspace_reloc_sizep,
+ arelent *bfd_reloc,
+ int sym_num,
+ struct reloc_queue *queue)
{
int arg_bits = HPPA_R_ARG_RELOC (bfd_reloc->addend);
int rtn_bits = arg_bits & 0x3;
return p;
}
-/* Return the logarithm of X, base 2, considering X unsigned.
- Abort -1 if X is not a power or two or is zero. */
+/* Return the logarithm of X, base 2, considering X unsigned,
+ if X is a power of 2. Otherwise, returns -1. */
static int
-log2 (x)
- unsigned int x;
+exact_log2 (unsigned int x)
{
int log = 0;
}
static bfd_reloc_status_type
-hppa_som_reloc (abfd, reloc_entry, symbol_in, data,
- input_section, output_bfd, error_message)
- bfd *abfd ATTRIBUTE_UNUSED;
- arelent *reloc_entry;
- asymbol *symbol_in ATTRIBUTE_UNUSED;
- PTR data ATTRIBUTE_UNUSED;
- asection *input_section;
- bfd *output_bfd;
- char **error_message ATTRIBUTE_UNUSED;
+hppa_som_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+ arelent *reloc_entry,
+ asymbol *symbol_in ATTRIBUTE_UNUSED,
+ void *data ATTRIBUTE_UNUSED,
+ asection *input_section,
+ bfd *output_bfd,
+ char **error_message ATTRIBUTE_UNUSED)
{
if (output_bfd)
- {
- reloc_entry->address += input_section->output_offset;
- return bfd_reloc_ok;
- }
+ reloc_entry->address += input_section->output_offset;
+
return bfd_reloc_ok;
}
and a field selector, return one or more appropriate SOM relocations. */
int **
-hppa_som_gen_reloc_type (abfd, base_type, format, field, sym_diff, sym)
- bfd *abfd;
- int base_type;
- int format;
- enum hppa_reloc_field_selector_type_alt field;
- int sym_diff;
- asymbol *sym;
+hppa_som_gen_reloc_type (bfd *abfd,
+ int base_type,
+ int format,
+ enum hppa_reloc_field_selector_type_alt field,
+ int sym_diff,
+ asymbol *sym)
{
int *final_type, **final_types;
- final_types = (int **) bfd_alloc (abfd, (bfd_size_type) sizeof (int *) * 6);
- final_type = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types = bfd_alloc (abfd, (bfd_size_type) sizeof (int *) * 6);
+ final_type = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types || !final_type)
return NULL;
case e_tsel:
case e_ltsel:
case e_rtsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
if (field == e_tsel)
case e_lssel:
case e_rssel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_S_MODE;
case e_lsel:
case e_rsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_N_MODE;
case e_ldsel:
case e_rdsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_D_MODE;
case e_lrsel:
case e_rrsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_R_MODE;
break;
case e_nsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_N1SEL;
case e_nlsel:
case e_nlrsel:
- final_types[0] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[0])
return NULL;
*final_types[0] = R_N0SEL;
- final_types[1] = (int *) bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+ final_types[1] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
if (!final_types[1])
return NULL;
if (field == e_nlsel)
final_types[3] = NULL;
*final_type = base_type;
break;
+
+ /* FIXME: These two field selectors are not currently supported. */
+ case e_ltpsel:
+ case e_rtpsel:
+ abort ();
}
switch (base_type)
if (sym_diff)
{
bfd_size_type amt = sizeof (int);
- final_types[0] = (int *) bfd_alloc (abfd, amt);
- final_types[1] = (int *) bfd_alloc (abfd, amt);
- final_types[2] = (int *) bfd_alloc (abfd, amt);
- final_types[3] = (int *) bfd_alloc (abfd, amt);
+
+ final_types[0] = bfd_alloc (abfd, amt);
+ final_types[1] = bfd_alloc (abfd, amt);
+ final_types[2] = bfd_alloc (abfd, amt);
+ final_types[3] = bfd_alloc (abfd, amt);
if (!final_types[0] || !final_types[1] || !final_types[2])
return NULL;
if (field == e_fsel)
|| field == e_lpsel
|| field == e_rpsel)
*final_type = R_DATA_PLABEL;
+ else if (field == e_fsel && format == 32)
+ *final_type = R_DATA_GPREL;
break;
case R_HPPA_COMPLEX:
if (sym_diff)
{
bfd_size_type amt = sizeof (int);
- final_types[0] = (int *) bfd_alloc (abfd, amt);
- final_types[1] = (int *) bfd_alloc (abfd, amt);
- final_types[2] = (int *) bfd_alloc (abfd, amt);
- final_types[3] = (int *) bfd_alloc (abfd, amt);
+
+ final_types[0] = bfd_alloc (abfd, amt);
+ final_types[1] = bfd_alloc (abfd, amt);
+ final_types[2] = bfd_alloc (abfd, amt);
+ final_types[3] = bfd_alloc (abfd, amt);
if (!final_types[0] || !final_types[1] || !final_types[2])
return NULL;
if (field == e_fsel)
#ifndef NO_PCREL_MODES
/* If we have short and long pcrel modes, then generate the proper
mode selector, then the pcrel relocation. Redundant selectors
- will be eliminted as the relocs are sized and emitted. */
+ will be eliminated as the relocs are sized and emitted. */
bfd_size_type amt = sizeof (int);
- final_types[0] = (int *) bfd_alloc (abfd, amt);
+
+ final_types[0] = bfd_alloc (abfd, amt);
if (!final_types[0])
return NULL;
if (format == 17)
howto table. */
static reloc_howto_type *
-som_bfd_reloc_type_lookup (abfd, code)
- bfd *abfd ATTRIBUTE_UNUSED;
- bfd_reloc_code_real_type code;
+som_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+ bfd_reloc_code_real_type code)
{
if ((int) code < (int) R_NO_RELOCATION + 255)
{
return &som_hppa_howto_table[(int) code];
}
- return (reloc_howto_type *) 0;
+ return NULL;
+}
+
+static reloc_howto_type *
+som_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+ const char *r_name)
+{
+ unsigned int i;
+
+ for (i = 0;
+ i < sizeof (som_hppa_howto_table) / sizeof (som_hppa_howto_table[0]);
+ i++)
+ if (som_hppa_howto_table[i].name != NULL
+ && strcasecmp (som_hppa_howto_table[i].name, r_name) == 0)
+ return &som_hppa_howto_table[i];
+
+ return NULL;
+}
+
+static void
+som_swap_clock_in (struct som_external_clock *src,
+ struct som_clock *dst)
+{
+ dst->secs = bfd_getb32 (src->secs);
+ dst->nanosecs = bfd_getb32 (src->nanosecs);
+}
+
+static void
+som_swap_clock_out (struct som_clock *src,
+ struct som_external_clock *dst)
+{
+ bfd_putb32 (src->secs, dst->secs);
+ bfd_putb32 (src->nanosecs, dst->nanosecs);
+}
+
+static void
+som_swap_header_in (struct som_external_header *src,
+ struct som_header *dst)
+{
+ dst->system_id = bfd_getb16 (src->system_id);
+ dst->a_magic = bfd_getb16 (src->a_magic);
+ dst->version_id = bfd_getb32 (src->version_id);
+ som_swap_clock_in (&src->file_time, &dst->file_time);
+ dst->entry_space = bfd_getb32 (src->entry_space);
+ dst->entry_subspace = bfd_getb32 (src->entry_subspace);
+ dst->entry_offset = bfd_getb32 (src->entry_offset);
+ dst->aux_header_location = bfd_getb32 (src->aux_header_location);
+ dst->aux_header_size = bfd_getb32 (src->aux_header_size);
+ dst->som_length = bfd_getb32 (src->som_length);
+ dst->presumed_dp = bfd_getb32 (src->presumed_dp);
+ dst->space_location = bfd_getb32 (src->space_location);
+ dst->space_total = bfd_getb32 (src->space_total);
+ dst->subspace_location = bfd_getb32 (src->subspace_location);
+ dst->subspace_total = bfd_getb32 (src->subspace_total);
+ dst->loader_fixup_location = bfd_getb32 (src->loader_fixup_location);
+ dst->loader_fixup_total = bfd_getb32 (src->loader_fixup_total);
+ dst->space_strings_location = bfd_getb32 (src->space_strings_location);
+ dst->space_strings_size = bfd_getb32 (src->space_strings_size);
+ dst->init_array_location = bfd_getb32 (src->init_array_location);
+ dst->init_array_total = bfd_getb32 (src->init_array_total);
+ dst->compiler_location = bfd_getb32 (src->compiler_location);
+ dst->compiler_total = bfd_getb32 (src->compiler_total);
+ dst->symbol_location = bfd_getb32 (src->symbol_location);
+ dst->symbol_total = bfd_getb32 (src->symbol_total);
+ dst->fixup_request_location = bfd_getb32 (src->fixup_request_location);
+ dst->fixup_request_total = bfd_getb32 (src->fixup_request_total);
+ dst->symbol_strings_location = bfd_getb32 (src->symbol_strings_location);
+ dst->symbol_strings_size = bfd_getb32 (src->symbol_strings_size);
+ dst->unloadable_sp_location = bfd_getb32 (src->unloadable_sp_location);
+ dst->unloadable_sp_size = bfd_getb32 (src->unloadable_sp_size);
+ dst->checksum = bfd_getb32 (src->checksum);
+}
+
+static void
+som_swap_header_out (struct som_header *src,
+ struct som_external_header *dst)
+{
+ bfd_putb16 (src->system_id, dst->system_id);
+ bfd_putb16 (src->a_magic, dst->a_magic);
+ bfd_putb32 (src->version_id, dst->version_id);
+ som_swap_clock_out (&src->file_time, &dst->file_time);
+ bfd_putb32 (src->entry_space, dst->entry_space);
+ bfd_putb32 (src->entry_subspace, dst->entry_subspace);
+ bfd_putb32 (src->entry_offset, dst->entry_offset);
+ bfd_putb32 (src->aux_header_location, dst->aux_header_location);
+ bfd_putb32 (src->aux_header_size, dst->aux_header_size);
+ bfd_putb32 (src->som_length, dst->som_length);
+ bfd_putb32 (src->presumed_dp, dst->presumed_dp);
+ bfd_putb32 (src->space_location, dst->space_location);
+ bfd_putb32 (src->space_total, dst->space_total);
+ bfd_putb32 (src->subspace_location, dst->subspace_location);
+ bfd_putb32 (src->subspace_total, dst->subspace_total);
+ bfd_putb32 (src->loader_fixup_location, dst->loader_fixup_location);
+ bfd_putb32 (src->loader_fixup_total, dst->loader_fixup_total);
+ bfd_putb32 (src->space_strings_location, dst->space_strings_location);
+ bfd_putb32 (src->space_strings_size, dst->space_strings_size);
+ bfd_putb32 (src->init_array_location, dst->init_array_location);
+ bfd_putb32 (src->init_array_total, dst->init_array_total);
+ bfd_putb32 (src->compiler_location, dst->compiler_location);
+ bfd_putb32 (src->compiler_total, dst->compiler_total);
+ bfd_putb32 (src->symbol_location, dst->symbol_location);
+ bfd_putb32 (src->symbol_total, dst->symbol_total);
+ bfd_putb32 (src->fixup_request_location, dst->fixup_request_location);
+ bfd_putb32 (src->fixup_request_total, dst->fixup_request_total);
+ bfd_putb32 (src->symbol_strings_location, dst->symbol_strings_location);
+ bfd_putb32 (src->symbol_strings_size, dst->symbol_strings_size);
+ bfd_putb32 (src->unloadable_sp_location, dst->unloadable_sp_location);
+ bfd_putb32 (src->unloadable_sp_size, dst->unloadable_sp_size);
+ bfd_putb32 (src->checksum, dst->checksum);
+}
+
+static void
+som_swap_space_dictionary_in (struct som_external_space_dictionary_record *src,
+ struct som_space_dictionary_record *dst)
+{
+ unsigned int flags;
+
+ dst->name = bfd_getb32 (src->name);
+ flags = bfd_getb32 (src->flags);
+ dst->is_loadable = (flags & SOM_SPACE_IS_LOADABLE) != 0;
+ dst->is_defined = (flags & SOM_SPACE_IS_DEFINED) != 0;
+ dst->is_private = (flags & SOM_SPACE_IS_PRIVATE) != 0;
+ dst->has_intermediate_code = (flags & SOM_SPACE_HAS_INTERMEDIATE_CODE) != 0;
+ dst->is_tspecific = (flags & SOM_SPACE_IS_TSPECIFIC) != 0;
+ dst->reserved = 0;
+ dst->sort_key = (flags >> SOM_SPACE_SORT_KEY_SH) & SOM_SPACE_SORT_KEY_MASK;
+ dst->reserved2 = 0;
+ dst->space_number = bfd_getb32 (src->space_number);
+ dst->subspace_index = bfd_getb32 (src->subspace_index);
+ dst->subspace_quantity = bfd_getb32 (src->subspace_quantity);
+ dst->loader_fix_index = bfd_getb32 (src->loader_fix_index);
+ dst->loader_fix_quantity = bfd_getb32 (src->loader_fix_quantity);
+ dst->init_pointer_index = bfd_getb32 (src->init_pointer_index);
+ dst->init_pointer_quantity = bfd_getb32 (src->init_pointer_quantity);
+}
+
+static void
+som_swap_space_dictionary_out (struct som_space_dictionary_record *src,
+ struct som_external_space_dictionary_record *dst)
+{
+ unsigned int flags;
+
+ bfd_putb32 (src->name, dst->name);
+
+ flags = 0;
+ if (src->is_loadable)
+ flags |= SOM_SPACE_IS_LOADABLE;
+ if (src->is_defined)
+ flags |= SOM_SPACE_IS_DEFINED;
+ if (src->is_private)
+ flags |= SOM_SPACE_IS_PRIVATE;
+ if (src->has_intermediate_code)
+ flags |= SOM_SPACE_HAS_INTERMEDIATE_CODE;
+ if (src->is_tspecific)
+ flags |= SOM_SPACE_IS_TSPECIFIC;
+ flags |= (src->sort_key & SOM_SPACE_SORT_KEY_MASK) << SOM_SPACE_SORT_KEY_SH;
+ bfd_putb32 (flags, dst->flags);
+ bfd_putb32 (src->space_number, dst->space_number);
+ bfd_putb32 (src->subspace_index, dst->subspace_index);
+ bfd_putb32 (src->subspace_quantity, dst->subspace_quantity);
+ bfd_putb32 (src->loader_fix_index, dst->loader_fix_index);
+ bfd_putb32 (src->loader_fix_quantity, dst->loader_fix_quantity);
+ bfd_putb32 (src->init_pointer_index, dst->init_pointer_index);
+ bfd_putb32 (src->init_pointer_quantity, dst->init_pointer_quantity);
+}
+
+static void
+som_swap_subspace_dictionary_in
+ (struct som_external_subspace_dictionary_record *src,
+ struct som_subspace_dictionary_record *dst)
+{
+ unsigned int flags;
+ dst->space_index = bfd_getb32 (src->space_index);
+ flags = bfd_getb32 (src->flags);
+ dst->access_control_bits = (flags >> SOM_SUBSPACE_ACCESS_CONTROL_BITS_SH)
+ & SOM_SUBSPACE_ACCESS_CONTROL_BITS_MASK;
+ dst->memory_resident = (flags & SOM_SUBSPACE_MEMORY_RESIDENT) != 0;
+ dst->dup_common = (flags & SOM_SUBSPACE_DUP_COMMON) != 0;
+ dst->is_common = (flags & SOM_SUBSPACE_IS_COMMON) != 0;
+ dst->is_loadable = (flags & SOM_SUBSPACE_IS_LOADABLE) != 0;
+ dst->quadrant = (flags >> SOM_SUBSPACE_QUADRANT_SH)
+ & SOM_SUBSPACE_QUADRANT_MASK;
+ dst->initially_frozen = (flags & SOM_SUBSPACE_INITIALLY_FROZEN) != 0;
+ dst->is_first = (flags & SOM_SUBSPACE_IS_FIRST) != 0;
+ dst->code_only = (flags & SOM_SUBSPACE_CODE_ONLY) != 0;
+ dst->sort_key = (flags >> SOM_SUBSPACE_SORT_KEY_SH)
+ & SOM_SUBSPACE_SORT_KEY_MASK;
+ dst->replicate_init = (flags & SOM_SUBSPACE_REPLICATE_INIT) != 0;
+ dst->continuation = (flags & SOM_SUBSPACE_CONTINUATION) != 0;
+ dst->is_tspecific = (flags & SOM_SUBSPACE_IS_TSPECIFIC) != 0;
+ dst->is_comdat = (flags & SOM_SUBSPACE_IS_COMDAT) != 0;
+ dst->reserved = 0;
+ dst->file_loc_init_value = bfd_getb32 (src->file_loc_init_value);
+ dst->initialization_length = bfd_getb32 (src->initialization_length);
+ dst->subspace_start = bfd_getb32 (src->subspace_start);
+ dst->subspace_length = bfd_getb32 (src->subspace_length);
+ dst->alignment = bfd_getb32 (src->alignment);
+ dst->name = bfd_getb32 (src->name);
+ dst->fixup_request_index = bfd_getb32 (src->fixup_request_index);
+ dst->fixup_request_quantity = bfd_getb32 (src->fixup_request_quantity);
+}
+
+static void
+som_swap_subspace_dictionary_record_out
+ (struct som_subspace_dictionary_record *src,
+ struct som_external_subspace_dictionary_record *dst)
+{
+ unsigned int flags;
+
+ bfd_putb32 (src->space_index, dst->space_index);
+ flags = (src->access_control_bits & SOM_SUBSPACE_ACCESS_CONTROL_BITS_MASK)
+ << SOM_SUBSPACE_ACCESS_CONTROL_BITS_SH;
+ if (src->memory_resident)
+ flags |= SOM_SUBSPACE_MEMORY_RESIDENT;
+ if (src->dup_common)
+ flags |= SOM_SUBSPACE_DUP_COMMON;
+ if (src->is_common)
+ flags |= SOM_SUBSPACE_IS_COMMON;
+ if (src->is_loadable)
+ flags |= SOM_SUBSPACE_IS_LOADABLE;
+ flags |= (src->quadrant & SOM_SUBSPACE_QUADRANT_MASK)
+ << SOM_SUBSPACE_QUADRANT_SH;
+ if (src->initially_frozen)
+ flags |= SOM_SUBSPACE_INITIALLY_FROZEN;
+ if (src->is_first)
+ flags |= SOM_SUBSPACE_IS_FIRST;
+ if (src->code_only)
+ flags |= SOM_SUBSPACE_CODE_ONLY;
+ flags |= (src->sort_key & SOM_SUBSPACE_SORT_KEY_MASK)
+ << SOM_SUBSPACE_SORT_KEY_SH;
+ if (src->replicate_init)
+ flags |= SOM_SUBSPACE_REPLICATE_INIT;
+ if (src->continuation)
+ flags |= SOM_SUBSPACE_CONTINUATION;
+ if (src->is_tspecific)
+ flags |= SOM_SUBSPACE_IS_TSPECIFIC;
+ if (src->is_comdat)
+ flags |= SOM_SUBSPACE_IS_COMDAT;
+ bfd_putb32 (flags, dst->flags);
+ bfd_putb32 (src->file_loc_init_value, dst->file_loc_init_value);
+ bfd_putb32 (src->initialization_length, dst->initialization_length);
+ bfd_putb32 (src->subspace_start, dst->subspace_start);
+ bfd_putb32 (src->subspace_length, dst->subspace_length);
+ bfd_putb32 (src->alignment, dst->alignment);
+ bfd_putb32 (src->name, dst->name);
+ bfd_putb32 (src->fixup_request_index, dst->fixup_request_index);
+ bfd_putb32 (src->fixup_request_quantity, dst->fixup_request_quantity);
+}
+
+static void
+som_swap_aux_id_in (struct som_external_aux_id *src,
+ struct som_aux_id *dst)
+{
+ unsigned int flags = bfd_getb32 (src->flags);
+
+ dst->mandatory = (flags & SOM_AUX_ID_MANDATORY) != 0;
+ dst->copy = (flags & SOM_AUX_ID_COPY) != 0;
+ dst->append = (flags & SOM_AUX_ID_APPEND) != 0;
+ dst->ignore = (flags & SOM_AUX_ID_IGNORE) != 0;
+ dst->type = (flags >> SOM_AUX_ID_TYPE_SH) & SOM_AUX_ID_TYPE_MASK;
+ dst->length = bfd_getb32 (src->length);
+}
+
+static void
+som_swap_aux_id_out (struct som_aux_id *src,
+ struct som_external_aux_id *dst)
+{
+ unsigned int flags = 0;
+
+ if (src->mandatory)
+ flags |= SOM_AUX_ID_MANDATORY;
+ if (src->copy)
+ flags |= SOM_AUX_ID_COPY;
+ if (src->append)
+ flags |= SOM_AUX_ID_APPEND;
+ if (src->ignore)
+ flags |= SOM_AUX_ID_IGNORE;
+ flags |= (src->type & SOM_AUX_ID_TYPE_MASK) << SOM_AUX_ID_TYPE_SH;
+ bfd_putb32 (flags, dst->flags);
+ bfd_putb32 (src->length, dst->length);
+}
+
+static void
+som_swap_string_auxhdr_out (struct som_string_auxhdr *src,
+ struct som_external_string_auxhdr *dst)
+{
+ som_swap_aux_id_out (&src->header_id, &dst->header_id);
+ bfd_putb32 (src->string_length, dst->string_length);
+}
+
+static void
+som_swap_compilation_unit_out (struct som_compilation_unit *src,
+ struct som_external_compilation_unit *dst)
+{
+ bfd_putb32 (src->name.strx, dst->name);
+ bfd_putb32 (src->language_name.strx, dst->language_name);
+ bfd_putb32 (src->product_id.strx, dst->product_id);
+ bfd_putb32 (src->version_id.strx, dst->version_id);
+ bfd_putb32 (src->flags, dst->flags);
+ som_swap_clock_out (&src->compile_time, &dst->compile_time);
+ som_swap_clock_out (&src->source_time, &dst->source_time);
+}
+
+static void
+som_swap_exec_auxhdr_in (struct som_external_exec_auxhdr *src,
+ struct som_exec_auxhdr *dst)
+{
+ som_swap_aux_id_in (&src->som_auxhdr, &dst->som_auxhdr);
+ dst->exec_tsize = bfd_getb32 (src->exec_tsize);
+ dst->exec_tmem = bfd_getb32 (src->exec_tmem);
+ dst->exec_tfile = bfd_getb32 (src->exec_tfile);
+ dst->exec_dsize = bfd_getb32 (src->exec_dsize);
+ dst->exec_dmem = bfd_getb32 (src->exec_dmem);
+ dst->exec_dfile = bfd_getb32 (src->exec_dfile);
+ dst->exec_bsize = bfd_getb32 (src->exec_bsize);
+ dst->exec_entry = bfd_getb32 (src->exec_entry);
+ dst->exec_flags = bfd_getb32 (src->exec_flags);
+ dst->exec_bfill = bfd_getb32 (src->exec_bfill);
+}
+
+static void
+som_swap_exec_auxhdr_out (struct som_exec_auxhdr *src,
+ struct som_external_exec_auxhdr *dst)
+{
+ som_swap_aux_id_out (&src->som_auxhdr, &dst->som_auxhdr);
+ bfd_putb32 (src->exec_tsize, dst->exec_tsize);
+ bfd_putb32 (src->exec_tmem, dst->exec_tmem);
+ bfd_putb32 (src->exec_tfile, dst->exec_tfile);
+ bfd_putb32 (src->exec_dsize, dst->exec_dsize);
+ bfd_putb32 (src->exec_dmem, dst->exec_dmem);
+ bfd_putb32 (src->exec_dfile, dst->exec_dfile);
+ bfd_putb32 (src->exec_bsize, dst->exec_bsize);
+ bfd_putb32 (src->exec_entry, dst->exec_entry);
+ bfd_putb32 (src->exec_flags, dst->exec_flags);
+ bfd_putb32 (src->exec_bfill, dst->exec_bfill);
+}
+
+static void
+som_swap_lst_header_in (struct som_external_lst_header *src,
+ struct som_lst_header *dst)
+{
+ dst->system_id = bfd_getb16 (src->system_id);
+ dst->a_magic = bfd_getb16 (src->a_magic);
+ dst->version_id = bfd_getb32 (src->version_id);
+ som_swap_clock_in (&src->file_time, &dst->file_time);
+ dst->hash_loc = bfd_getb32 (src->hash_loc);
+ dst->hash_size = bfd_getb32 (src->hash_size);
+ dst->module_count = bfd_getb32 (src->module_count);
+ dst->module_limit = bfd_getb32 (src->module_limit);
+ dst->dir_loc = bfd_getb32 (src->dir_loc);
+ dst->export_loc = bfd_getb32 (src->export_loc);
+ dst->export_count = bfd_getb32 (src->export_count);
+ dst->import_loc = bfd_getb32 (src->import_loc);
+ dst->aux_loc = bfd_getb32 (src->aux_loc);
+ dst->aux_size = bfd_getb32 (src->aux_size);
+ dst->string_loc = bfd_getb32 (src->string_loc);
+ dst->string_size = bfd_getb32 (src->string_size);
+ dst->free_list = bfd_getb32 (src->free_list);
+ dst->file_end = bfd_getb32 (src->file_end);
+ dst->checksum = bfd_getb32 (src->checksum);
}
/* Perform some initialization for an object. Save results of this
initialization in the BFD. */
static const bfd_target *
-som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset)
- bfd *abfd;
- struct header *file_hdrp;
- struct som_exec_auxhdr *aux_hdrp;
- unsigned long current_offset;
+som_object_setup (bfd *abfd,
+ struct som_header *file_hdrp,
+ struct som_exec_auxhdr *aux_hdrp,
+ unsigned long current_offset)
{
asection *section;
- int found;
/* som_mkobject will set bfd_error if som_mkobject fails. */
- if (som_mkobject (abfd) != true)
- return 0;
+ if (! som_mkobject (abfd))
+ return NULL;
/* Set BFD flags based on what information is available in the SOM. */
abfd->flags = BFD_NO_FLAGS;
break;
}
+ /* Save the auxiliary header. */
+ obj_som_exec_hdr (abfd) = aux_hdrp;
+
/* Allocate space to hold the saved exec header information. */
- obj_som_exec_data (abfd) = (struct som_exec_data *)
- bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_exec_data));
+ obj_som_exec_data (abfd) = bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_exec_data));
if (obj_som_exec_data (abfd) == NULL)
return NULL;
It's about time, OSF has used the new id since at least 1992;
HPUX didn't start till nearly 1995!.
- The new approach examines the entry field. If it's zero or not 4
- byte aligned then it's not a proper code address and we guess it's
- really the executable flags. */
- found = 0;
- for (section = abfd->sections; section; section = section->next)
- {
- if ((section->flags & SEC_CODE) == 0)
- continue;
- if (aux_hdrp->exec_entry >= section->vma
- && aux_hdrp->exec_entry < section->vma + section->_cooked_size)
- found = 1;
- }
- if (aux_hdrp->exec_entry == 0
- || (aux_hdrp->exec_entry & 0x3) != 0
- || ! found)
- {
- bfd_get_start_address (abfd) = aux_hdrp->exec_flags;
- obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_entry;
- }
- else
+ The new approach examines the entry field for an executable. If
+ it is not 4-byte aligned then it's not a proper code address and
+ we guess it's really the executable flags. For a main program,
+ we also consider zero to be indicative of a buggy linker, since
+ that is not a valid entry point. The entry point for a shared
+ library, however, can be zero so we do not consider that to be
+ indicative of a buggy linker. */
+ if (aux_hdrp)
{
- bfd_get_start_address (abfd) = aux_hdrp->exec_entry + current_offset;
- obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_flags;
+ int found = 0;
+
+ for (section = abfd->sections; section; section = section->next)
+ {
+ bfd_vma entry;
+
+ if ((section->flags & SEC_CODE) == 0)
+ continue;
+ entry = aux_hdrp->exec_entry + aux_hdrp->exec_tmem;
+ if (entry >= section->vma
+ && entry < section->vma + section->size)
+ found = 1;
+ }
+ if ((aux_hdrp->exec_entry == 0 && !(abfd->flags & DYNAMIC))
+ || (aux_hdrp->exec_entry & 0x3) != 0
+ || ! found)
+ {
+ bfd_get_start_address (abfd) = aux_hdrp->exec_flags;
+ obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_entry;
+ }
+ else
+ {
+ bfd_get_start_address (abfd) = aux_hdrp->exec_entry + current_offset;
+ obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_flags;
+ }
}
obj_som_exec_data (abfd)->version_id = file_hdrp->version_id;
/* Initialize the saved symbol table and string table to NULL.
Save important offsets and sizes from the SOM header into
the BFD. */
- obj_som_stringtab (abfd) = (char *) NULL;
- obj_som_symtab (abfd) = (som_symbol_type *) NULL;
+ obj_som_stringtab (abfd) = NULL;
+ obj_som_symtab (abfd) = NULL;
obj_som_sorted_syms (abfd) = NULL;
obj_som_stringtab_size (abfd) = file_hdrp->symbol_strings_size;
obj_som_sym_filepos (abfd) = file_hdrp->symbol_location + current_offset;
BFD sections which correspond to spaces will overlap the sections for the
associated subspaces. */
-static boolean
-setup_sections (abfd, file_hdr, current_offset)
- bfd *abfd;
- struct header *file_hdr;
- unsigned long current_offset;
+static bfd_boolean
+setup_sections (bfd *abfd,
+ struct som_header *file_hdr,
+ unsigned long current_offset)
{
char *space_strings;
unsigned int space_index, i;
bfd_size_type amt;
/* First, read in space names. */
-
amt = file_hdr->space_strings_size;
space_strings = bfd_malloc (amt);
if (!space_strings && amt != 0)
/* Loop over all of the space dictionaries, building up sections. */
for (space_index = 0; space_index < file_hdr->space_total; space_index++)
{
- struct space_dictionary_record space;
- struct subspace_dictionary_record subspace, save_subspace;
- int subspace_index;
+ struct som_space_dictionary_record space;
+ struct som_external_space_dictionary_record ext_space;
+ char *space_name;
+ struct som_external_subspace_dictionary_record ext_subspace;
+ struct som_subspace_dictionary_record subspace, save_subspace;
+ unsigned int subspace_index;
asection *space_asect;
+ bfd_size_type space_size = 0;
char *newname;
/* Read the space dictionary element. */
if (bfd_seek (abfd,
(current_offset + file_hdr->space_location
- + space_index * sizeof space),
+ + space_index * sizeof (ext_space)),
SEEK_SET) != 0)
goto error_return;
- amt = sizeof space;
- if (bfd_bread (&space, amt, abfd) != amt)
+ amt = sizeof ext_space;
+ if (bfd_bread (&ext_space, amt, abfd) != amt)
goto error_return;
+ som_swap_space_dictionary_in (&ext_space, &space);
+
/* Setup the space name string. */
- space.name.n_name = space.name.n_strx + space_strings;
+ space_name = space.name + space_strings;
/* Make a section out of it. */
- amt = strlen (space.name.n_name) + 1;
+ amt = strlen (space_name) + 1;
newname = bfd_alloc (abfd, amt);
if (!newname)
goto error_return;
- strcpy (newname, space.name.n_name);
+ strcpy (newname, space_name);
space_asect = bfd_make_section_anyway (abfd, newname);
if (!space_asect)
space_asect->flags |= SEC_DEBUGGING;
/* Set up all the attributes for the space. */
- if (bfd_som_set_section_attributes (space_asect, space.is_defined,
- space.is_private, space.sort_key,
- space.space_number) == false)
+ if (! bfd_som_set_section_attributes (space_asect, space.is_defined,
+ space.is_private, space.sort_key,
+ space.space_number))
goto error_return;
/* If the space has no subspaces, then we're done. */
/* Now, read in the first subspace for this space. */
if (bfd_seek (abfd,
(current_offset + file_hdr->subspace_location
- + space.subspace_index * sizeof subspace),
+ + space.subspace_index * sizeof ext_subspace),
SEEK_SET) != 0)
goto error_return;
- amt = sizeof subspace;
- if (bfd_bread (&subspace, amt, abfd) != amt)
+ amt = sizeof ext_subspace;
+ if (bfd_bread (&ext_subspace, amt, abfd) != amt)
goto error_return;
/* Seek back to the start of the subspaces for loop below. */
if (bfd_seek (abfd,
(current_offset + file_hdr->subspace_location
- + space.subspace_index * sizeof subspace),
+ + space.subspace_index * sizeof ext_subspace),
SEEK_SET) != 0)
goto error_return;
+ som_swap_subspace_dictionary_in (&ext_subspace, &subspace);
+
/* Setup the start address and file loc from the first subspace
- record. */
+ record. */
space_asect->vma = subspace.subspace_start;
space_asect->filepos = subspace.file_loc_init_value + current_offset;
- space_asect->alignment_power = log2 (subspace.alignment);
+ space_asect->alignment_power = exact_log2 (subspace.alignment);
if (space_asect->alignment_power == (unsigned) -1)
goto error_return;
/* Initialize save_subspace so we can reliably determine if this
loop placed any useful values into it. */
- memset (&save_subspace, 0, sizeof (struct subspace_dictionary_record));
+ memset (&save_subspace, 0, sizeof (save_subspace));
/* Loop over the rest of the subspaces, building up more sections. */
for (subspace_index = 0; subspace_index < space.subspace_quantity;
subspace_index++)
{
asection *subspace_asect;
+ char *subspace_name;
/* Read in the next subspace. */
- amt = sizeof subspace;
- if (bfd_bread (&subspace, amt, abfd) != amt)
+ amt = sizeof ext_subspace;
+ if (bfd_bread (&ext_subspace, amt, abfd) != amt)
goto error_return;
+ som_swap_subspace_dictionary_in (&ext_subspace, &subspace);
+
/* Setup the subspace name string. */
- subspace.name.n_name = subspace.name.n_strx + space_strings;
+ subspace_name = subspace.name + space_strings;
- amt = strlen (subspace.name.n_name) + 1;
+ amt = strlen (subspace_name) + 1;
newname = bfd_alloc (abfd, amt);
if (!newname)
goto error_return;
- strcpy (newname, subspace.name.n_name);
+ strcpy (newname, subspace_name);
/* Make a section out of this subspace. */
subspace_asect = bfd_make_section_anyway (abfd, newname);
goto error_return;
/* Store private information about the section. */
- if (bfd_som_set_subsection_attributes (subspace_asect, space_asect,
- subspace.access_control_bits,
- subspace.sort_key,
- subspace.quadrant) == false)
+ if (! bfd_som_set_subsection_attributes (subspace_asect, space_asect,
+ subspace.access_control_bits,
+ subspace.sort_key,
+ subspace.quadrant,
+ subspace.is_comdat,
+ subspace.is_common,
+ subspace.dup_common))
goto error_return;
/* Keep an easy mapping between subspaces and sections.
break;
}
- if (subspace.dup_common || subspace.is_common)
- subspace_asect->flags |= SEC_IS_COMMON;
- else if (subspace.subspace_length > 0)
+ if (subspace.is_comdat || subspace.is_common || subspace.dup_common)
+ subspace_asect->flags |= SEC_LINK_ONCE;
+
+ if (subspace.subspace_length > 0)
subspace_asect->flags |= SEC_HAS_CONTENTS;
if (subspace.is_loadable)
save_subspace = subspace;
subspace_asect->vma = subspace.subspace_start;
- subspace_asect->_cooked_size = subspace.subspace_length;
- subspace_asect->_raw_size = subspace.subspace_length;
+ subspace_asect->size = subspace.subspace_length;
subspace_asect->filepos = (subspace.file_loc_init_value
+ current_offset);
- subspace_asect->alignment_power = log2 (subspace.alignment);
+ subspace_asect->alignment_power = exact_log2 (subspace.alignment);
if (subspace_asect->alignment_power == (unsigned) -1)
goto error_return;
+
+ /* Keep track of the accumulated sizes of the sections. */
+ space_size += subspace.subspace_length;
}
/* This can happen for a .o which defines symbols in otherwise
- empty subspaces. */
+ empty subspaces. */
if (!save_subspace.file_loc_init_value)
- {
- space_asect->_cooked_size = 0;
- space_asect->_raw_size = 0;
- }
+ space_asect->size = 0;
else
{
- /* Setup the sizes for the space section based upon the info in the
- last subspace of the space. */
- space_asect->_cooked_size = (save_subspace.subspace_start
- - space_asect->vma
- + save_subspace.subspace_length);
- space_asect->_raw_size = (save_subspace.file_loc_init_value
- - space_asect->filepos
- + save_subspace.initialization_length);
+ if (file_hdr->a_magic != RELOC_MAGIC)
+ {
+ /* Setup the size for the space section based upon the info
+ in the last subspace of the space. */
+ space_asect->size = (save_subspace.subspace_start
+ - space_asect->vma
+ + save_subspace.subspace_length);
+ }
+ else
+ {
+ /* The subspace_start field is not initialised in relocatable
+ only objects, so it cannot be used for length calculations.
+ Instead we use the space_size value which we have been
+ accumulating. This isn't an accurate estimate since it
+ ignores alignment and ordering issues. */
+ space_asect->size = space_size;
+ }
}
}
/* Now that we've read in all the subspace records, we need to assign
a target index to each subspace. */
amt = total_subspaces;
amt *= sizeof (asection *);
- subspace_sections = (asection **) bfd_malloc (amt);
+ subspace_sections = bfd_malloc (amt);
if (subspace_sections == NULL)
goto error_return;
if (subspace_sections != NULL)
free (subspace_sections);
- return true;
+ return TRUE;
error_return:
if (space_strings != NULL)
if (subspace_sections != NULL)
free (subspace_sections);
- return false;
+ return FALSE;
}
+
/* Read in a SOM object and make it into a BFD. */
static const bfd_target *
-som_object_p (abfd)
- bfd *abfd;
+som_object_p (bfd *abfd)
{
- struct header file_hdr;
- struct som_exec_auxhdr aux_hdr;
+ struct som_external_header ext_file_hdr;
+ struct som_header file_hdr;
+ struct som_exec_auxhdr *aux_hdr_ptr = NULL;
unsigned long current_offset = 0;
- struct lst_header lst_header;
- struct som_entry som_entry;
+ struct som_external_lst_header ext_lst_header;
+ struct som_external_som_entry ext_som_entry;
bfd_size_type amt;
-#define ENTRY_SIZE sizeof (struct som_entry)
+ unsigned int loc;
+#define ENTRY_SIZE sizeof (struct som_external_som_entry)
- amt = FILE_HDR_SIZE;
- if (bfd_bread ((PTR) &file_hdr, amt, abfd) != amt)
+ amt = sizeof (struct som_external_header);
+ if (bfd_bread (&ext_file_hdr, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
+ som_swap_header_in (&ext_file_hdr, &file_hdr);
+
if (!_PA_RISC_ID (file_hdr.system_id))
{
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
switch (file_hdr.a_magic)
case EXEC_MAGIC:
case SHARE_MAGIC:
case DEMAND_MAGIC:
-#ifdef DL_MAGIC
case DL_MAGIC:
-#endif
-#ifdef SHL_MAGIC
case SHL_MAGIC:
-#endif
#ifdef SHARED_MAGIC_CNX
case SHARED_MAGIC_CNX:
#endif
break;
-#ifdef EXECLIBMAGIC
case EXECLIBMAGIC:
/* Read the lst header and determine where the SOM directory begins. */
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
- amt = SLSTHDR;
- if (bfd_bread ((PTR) &lst_header, amt, abfd) != amt)
+ amt = sizeof (struct som_external_lst_header);
+ if (bfd_bread (&ext_lst_header, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
/* Position to and read the first directory entry. */
-
- if (bfd_seek (abfd, lst_header.dir_loc, SEEK_SET) != 0)
+ loc = bfd_getb32 (ext_lst_header.dir_loc);
+ if (bfd_seek (abfd, loc, SEEK_SET) != 0)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
amt = ENTRY_SIZE;
- if (bfd_bread ((PTR) &som_entry, amt, abfd) != amt)
+ if (bfd_bread (&ext_som_entry, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
/* Now position to the first SOM. */
-
- if (bfd_seek (abfd, som_entry.location, SEEK_SET) != 0)
+ current_offset = bfd_getb32 (ext_som_entry.location);
+ if (bfd_seek (abfd, current_offset, SEEK_SET) != 0)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
- current_offset = som_entry.location;
-
/* And finally, re-read the som header. */
- amt = FILE_HDR_SIZE;
- if (bfd_bread ((PTR) &file_hdr, amt, abfd) != amt)
+ amt = sizeof (struct som_external_header);
+ if (bfd_bread (&ext_file_hdr, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
+ som_swap_header_in (&ext_file_hdr, &file_hdr);
+
break;
-#endif
default:
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
- if (file_hdr.version_id != VERSION_ID
+ if (file_hdr.version_id != OLD_VERSION_ID
&& file_hdr.version_id != NEW_VERSION_ID)
{
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
/* If the aux_header_size field in the file header is zero, then this
object is an incomplete executable (a .o file). Do not try to read
a non-existant auxiliary header. */
- memset (&aux_hdr, 0, sizeof (struct som_exec_auxhdr));
if (file_hdr.aux_header_size != 0)
{
- amt = AUX_HDR_SIZE;
- if (bfd_bread ((PTR) &aux_hdr, amt, abfd) != amt)
+ struct som_external_exec_auxhdr ext_exec_auxhdr;
+
+ aux_hdr_ptr = bfd_zalloc (abfd,
+ (bfd_size_type) sizeof (*aux_hdr_ptr));
+ if (aux_hdr_ptr == NULL)
+ return NULL;
+ amt = sizeof (struct som_external_exec_auxhdr);
+ if (bfd_bread (&ext_exec_auxhdr, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
- return 0;
+ return NULL;
}
+ som_swap_exec_auxhdr_in (&ext_exec_auxhdr, aux_hdr_ptr);
}
if (!setup_sections (abfd, &file_hdr, current_offset))
{
/* setup_sections does not bubble up a bfd error code. */
bfd_set_error (bfd_error_bad_value);
- return 0;
+ return NULL;
}
/* This appears to be a valid SOM object. Do some initialization. */
- return som_object_setup (abfd, &file_hdr, &aux_hdr, current_offset);
+ return som_object_setup (abfd, &file_hdr, aux_hdr_ptr, current_offset);
}
/* Create a SOM object. */
-static boolean
-som_mkobject (abfd)
- bfd *abfd;
+static bfd_boolean
+som_mkobject (bfd *abfd)
{
/* Allocate memory to hold backend information. */
- abfd->tdata.som_data = (struct som_data_struct *)
- bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_data_struct));
+ abfd->tdata.som_data = bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_data_struct));
if (abfd->tdata.som_data == NULL)
- return false;
- return true;
+ return FALSE;
+ return TRUE;
}
/* Initialize some information in the file header. This routine makes
not attempt at doing the right thing for a full executable; it
is only meant to handle relocatable objects. */
-static boolean
-som_prep_headers (abfd)
- bfd *abfd;
+static bfd_boolean
+som_prep_headers (bfd *abfd)
{
- struct header *file_hdr;
+ struct som_header *file_hdr;
asection *section;
- bfd_size_type amt = sizeof (struct header);
+ bfd_size_type amt = sizeof (struct som_header);
/* Make and attach a file header to the BFD. */
- file_hdr = (struct header *) bfd_zalloc (abfd, amt);
+ file_hdr = bfd_zalloc (abfd, amt);
if (file_hdr == NULL)
- return false;
+ return FALSE;
obj_som_file_hdr (abfd) = file_hdr;
if (abfd->flags & (EXEC_P | DYNAMIC))
{
-
/* Make and attach an exec header to the BFD. */
amt = sizeof (struct som_exec_auxhdr);
- obj_som_exec_hdr (abfd) =
- (struct som_exec_auxhdr *) bfd_zalloc (abfd, amt);
+ obj_som_exec_hdr (abfd) = bfd_zalloc (abfd, amt);
if (obj_som_exec_hdr (abfd) == NULL)
- return false;
+ return FALSE;
if (abfd->flags & D_PAGED)
file_hdr->a_magic = DEMAND_MAGIC;
/* Now iterate over the sections translating information from
BFD sections to SOM spaces/subspaces. */
-
for (section = abfd->sections; section != NULL; section = section->next)
{
/* Ignore anything which has not been marked as a space or
if (som_is_space (section))
{
/* Allocate space for the space dictionary. */
- amt = sizeof (struct space_dictionary_record);
- som_section_data (section)->space_dict =
- (struct space_dictionary_record *) bfd_zalloc (abfd, amt);
+ amt = sizeof (struct som_space_dictionary_record);
+ som_section_data (section)->space_dict = bfd_zalloc (abfd, amt);
if (som_section_data (section)->space_dict == NULL)
- return false;
+ return FALSE;
/* Set space attributes. Note most attributes of SOM spaces
are set based on the subspaces it contains. */
som_section_data (section)->space_dict->loader_fix_index = -1;
else
{
/* Allocate space for the subspace dictionary. */
- amt = sizeof (struct subspace_dictionary_record);
- som_section_data (section)->subspace_dict =
- (struct subspace_dictionary_record *) bfd_zalloc (abfd, amt);
+ amt = sizeof (struct som_subspace_dictionary_record);
+ som_section_data (section)->subspace_dict = bfd_zalloc (abfd, amt);
if (som_section_data (section)->subspace_dict == NULL)
- return false;
+ return FALSE;
/* Set subspace attributes. Basic stuff is done here, additional
attributes are filled in later as more information becomes
available. */
- if (section->flags & SEC_IS_COMMON)
- {
- som_section_data (section)->subspace_dict->dup_common = 1;
- som_section_data (section)->subspace_dict->is_common = 1;
- }
-
if (section->flags & SEC_ALLOC)
som_section_data (section)->subspace_dict->is_loadable = 1;
som_section_data (section)->subspace_dict->subspace_start =
section->vma;
som_section_data (section)->subspace_dict->subspace_length =
- bfd_section_size (abfd, section);
+ section->size;
som_section_data (section)->subspace_dict->initialization_length =
- bfd_section_size (abfd, section);
+ section->size;
som_section_data (section)->subspace_dict->alignment =
1 << section->alignment_power;
som_section_data (section)->copy_data->access_control_bits;
som_section_data (section)->subspace_dict->quadrant =
som_section_data (section)->copy_data->quadrant;
+ som_section_data (section)->subspace_dict->is_comdat =
+ som_section_data (section)->copy_data->is_comdat;
+ som_section_data (section)->subspace_dict->is_common =
+ som_section_data (section)->copy_data->is_common;
+ som_section_data (section)->subspace_dict->dup_common =
+ som_section_data (section)->copy_data->dup_common;
}
}
- return true;
+ return TRUE;
}
-/* Return true if the given section is a SOM space, false otherwise. */
+/* Return TRUE if the given section is a SOM space, FALSE otherwise. */
-static boolean
-som_is_space (section)
- asection *section;
+static bfd_boolean
+som_is_space (asection *section)
{
/* If no copy data is available, then it's neither a space nor a
subspace. */
if (som_section_data (section)->copy_data == NULL)
- return false;
+ return FALSE;
/* If the containing space isn't the same as the given section,
then this isn't a space. */
if (som_section_data (section)->copy_data->container != section
&& (som_section_data (section)->copy_data->container->output_section
!= section))
- return false;
+ return FALSE;
/* OK. Must be a space. */
- return true;
+ return TRUE;
}
-/* Return true if the given section is a SOM subspace, false otherwise. */
+/* Return TRUE if the given section is a SOM subspace, FALSE otherwise. */
-static boolean
-som_is_subspace (section)
- asection *section;
+static bfd_boolean
+som_is_subspace (asection *section)
{
/* If no copy data is available, then it's neither a space nor a
subspace. */
if (som_section_data (section)->copy_data == NULL)
- return false;
+ return FALSE;
/* If the containing space is the same as the given section,
then this isn't a subspace. */
if (som_section_data (section)->copy_data->container == section
|| (som_section_data (section)->copy_data->container->output_section
== section))
- return false;
+ return FALSE;
/* OK. Must be a subspace. */
- return true;
+ return TRUE;
}
-/* Return true if the given space containins the given subspace. It
+/* Return TRUE if the given space contains the given subspace. It
is safe to assume space really is a space, and subspace really
is a subspace. */
-static boolean
-som_is_container (space, subspace)
- asection *space, *subspace;
+static bfd_boolean
+som_is_container (asection *space, asection *subspace)
{
- return (som_section_data (subspace)->copy_data->container == space
- || (som_section_data (subspace)->copy_data->container->output_section
- == space));
+ return (som_section_data (subspace)->copy_data->container == space)
+ || (som_section_data (subspace)->copy_data->container->output_section
+ == space);
}
/* Count and return the number of spaces attached to the given BFD. */
static unsigned long
-som_count_spaces (abfd)
- bfd *abfd;
+som_count_spaces (bfd *abfd)
{
int count = 0;
asection *section;
/* Count the number of subspaces attached to the given BFD. */
static unsigned long
-som_count_subspaces (abfd)
- bfd *abfd;
+som_count_subspaces (bfd *abfd)
{
int count = 0;
asection *section;
count. Doing so compacts the relocation stream. */
static int
-compare_syms (arg1, arg2)
- const PTR arg1;
- const PTR arg2;
-
+compare_syms (const void *arg1, const void *arg2)
{
asymbol **sym1 = (asymbol **) arg1;
asymbol **sym2 = (asymbol **) arg2;
and subspace. */
static int
-compare_subspaces (arg1, arg2)
- const PTR arg1;
- const PTR arg2;
-
+compare_subspaces (const void *arg1, const void *arg2)
{
asection **subspace1 = (asection **) arg1;
asection **subspace2 = (asection **) arg2;
/* Perform various work in preparation for emitting the fixup stream. */
static void
-som_prep_for_fixups (abfd, syms, num_syms)
- bfd *abfd;
- asymbol **syms;
- unsigned long num_syms;
+som_prep_for_fixups (bfd *abfd, asymbol **syms, unsigned long num_syms)
{
unsigned long i;
asection *section;
output symbol table. */
amt = num_syms;
amt *= sizeof (asymbol *);
- sorted_syms = (asymbol **) bfd_zalloc (abfd, amt);
+ sorted_syms = bfd_zalloc (abfd, amt);
memcpy (sorted_syms, syms, num_syms * sizeof (asymbol *));
qsort (sorted_syms, num_syms, sizeof (asymbol *), compare_syms);
obj_som_sorted_syms (abfd) = sorted_syms;
}
}
-static boolean
-som_write_fixups (abfd, current_offset, total_reloc_sizep)
- bfd *abfd;
- unsigned long current_offset;
- unsigned int *total_reloc_sizep;
+static bfd_boolean
+som_write_fixups (bfd *abfd,
+ unsigned long current_offset,
+ unsigned int *total_reloc_sizep)
{
unsigned int i, j;
/* Chunk of memory that we can use as buffer space, then throw
int reloc_offset;
unsigned int current_rounding_mode;
#ifndef NO_PCREL_MODES
- int current_call_mode;
+ unsigned int current_call_mode;
#endif
/* Find a subspace of this space. */
continue;
/* If this subspace does not have real data, then we are
- finised with it. */
+ finished with it. */
if ((subsection->flags & SEC_HAS_CONTENTS) == 0)
{
som_section_data (subsection)->subspace_dict->fixup_request_index
for this subspace in preparation for writing out its fixup
stream. */
if (bfd_seek (abfd, current_offset + total_reloc_size, SEEK_SET) != 0)
- return false;
+ return FALSE;
/* Buffer space has already been allocated. Just perform some
initialization here. */
if (p - tmp_space + 100 > SOM_TMP_BUFSIZE)
{
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) tmp_space, amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
+ return FALSE;
p = tmp_space;
som_initialize_reloc_queue (reloc_queue);
abort ();
break;
+ case R_DATA_GPREL:
+ /* Account for any addend. */
+ if (bfd_reloc->addend)
+ p = som_reloc_addend (abfd, bfd_reloc->addend, p,
+ &subspace_reloc_size, reloc_queue);
+
+ if (sym_num < 0x10000000)
+ {
+ bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+ bfd_put_8 (abfd, sym_num >> 16, p + 1);
+ bfd_put_16 (abfd, (bfd_vma) sym_num, p + 2);
+ p = try_prev_fixup (abfd, &subspace_reloc_size,
+ p, 4, reloc_queue);
+ }
+ else
+ abort ();
+ break;
+
case R_DATA_ONE_SYMBOL:
case R_DATA_PLABEL:
case R_CODE_PLABEL:
/* Last BFD relocation for a subspace has been processed.
Map the rest of the subspace with R_NO_RELOCATION fixups. */
- p = som_reloc_skip (abfd, bfd_section_size (abfd, subsection)
- - reloc_offset,
+ p = som_reloc_skip (abfd, subsection->size - reloc_offset,
p, &subspace_reloc_size, reloc_queue);
/* Scribble out the relocations. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) tmp_space, amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
+ return FALSE;
p = tmp_space;
total_reloc_size += subspace_reloc_size;
section = section->next;
}
*total_reloc_sizep = total_reloc_size;
- return true;
+ return TRUE;
}
/* Write out the space/subspace string table. */
-static boolean
-som_write_space_strings (abfd, current_offset, string_sizep)
- bfd *abfd;
- unsigned long current_offset;
- unsigned int *string_sizep;
+static bfd_boolean
+som_write_space_strings (bfd *abfd,
+ unsigned long current_offset,
+ unsigned int *string_sizep)
{
/* Chunk of memory that we can use as buffer space, then throw
away. */
size_t tmp_space_size = SOM_TMP_BUFSIZE;
- unsigned char *tmp_space = alloca (tmp_space_size);
- unsigned char *p = tmp_space;
+ char *tmp_space = alloca (tmp_space_size);
+ char *p = tmp_space;
unsigned int strings_size = 0;
asection *section;
bfd_size_type amt;
/* Seek to the start of the space strings in preparation for writing
them out. */
if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
- return false;
+ return FALSE;
/* Walk through all the spaces and subspaces (order is not important)
building up and writing string table entries for their names. */
length = strlen (section->name);
/* If there is not enough room for the next entry, then dump the
- current buffer contents now and maybe allocate a larger
- buffer. Each entry will take 4 bytes to hold the string
- length + the string itself + null terminator. */
+ current buffer contents now and maybe allocate a larger
+ buffer. Each entry will take 4 bytes to hold the string
+ length + the string itself + null terminator. */
if (p - tmp_space + 5 + length > tmp_space_size)
{
/* Flush buffer before refilling or reallocating. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+ return FALSE;
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* Ensure a minimum growth factor to avoid O(n**2) space
- consumption for n strings. The optimal minimum
- factor seems to be 2, as no other value can guarantee
- wasting less than 50% space. (Note that we cannot
- deallocate space allocated by `alloca' without
- returning from this function.) The same technique is
- used a few more times below when a buffer is
- reallocated. */
- tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
+ consumption for n strings. The optimal minimum
+ factor seems to be 2, as no other value can guarantee
+ wasting less than 50% space. (Note that we cannot
+ deallocate space allocated by `alloca' without
+ returning from this function.) The same technique is
+ used a few more times below when a buffer is
+ reallocated. */
+ if (2 * tmp_space_size < length + 5)
+ tmp_space_size = length + 5;
+ else
+ tmp_space_size = 2 * tmp_space_size;
tmp_space = alloca (tmp_space_size);
}
/* Record the index in the space/subspace records. */
if (som_is_space (section))
- som_section_data (section)->space_dict->name.n_strx = strings_size;
+ som_section_data (section)->space_dict->name = strings_size;
else
- som_section_data (section)->subspace_dict->name.n_strx = strings_size;
+ som_section_data (section)->subspace_dict->name = strings_size;
/* Next comes the string itself + a null terminator. */
strcpy (p, section->name);
/* Done with the space/subspace strings. Write out any information
contained in a partial block. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+ return FALSE;
*string_sizep = strings_size;
- return true;
+ return TRUE;
}
/* Write out the symbol string table. */
-static boolean
-som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
- compilation_unit)
- bfd *abfd;
- unsigned long current_offset;
- asymbol **syms;
- unsigned int num_syms;
- unsigned int *string_sizep;
- COMPUNIT *compilation_unit;
+static bfd_boolean
+som_write_symbol_strings (bfd *abfd,
+ unsigned long current_offset,
+ asymbol **syms,
+ unsigned int num_syms,
+ unsigned int *string_sizep,
+ struct som_compilation_unit *compilation_unit)
{
unsigned int i;
/* Chunk of memory that we can use as buffer space, then throw
away. */
size_t tmp_space_size = SOM_TMP_BUFSIZE;
- unsigned char *tmp_space = alloca (tmp_space_size);
- unsigned char *p = tmp_space;
+ char *tmp_space = alloca (tmp_space_size);
+ char *p = tmp_space;
unsigned int strings_size = 0;
- unsigned char *comp[4];
bfd_size_type amt;
/* This gets a bit gruesome because of the compilation unit. The
strings within the compilation unit are part of the symbol
strings, but don't have symbol_dictionary entries. So, manually
- write them and update the compliation unit header. On input, the
+ write them and update the compilation unit header. On input, the
compilation unit header contains local copies of the strings.
Move them aside. */
- if (compilation_unit)
- {
- comp[0] = compilation_unit->name.n_name;
- comp[1] = compilation_unit->language_name.n_name;
- comp[2] = compilation_unit->product_id.n_name;
- comp[3] = compilation_unit->version_id.n_name;
- }
/* Seek to the start of the space strings in preparation for writing
them out. */
if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
- return false;
+ return FALSE;
if (compilation_unit)
{
for (i = 0; i < 4; i++)
{
- size_t length = strlen (comp[i]);
+ struct som_name_pt *name;
+ size_t length;
+
+ switch (i)
+ {
+ case 0:
+ name = &compilation_unit->name;
+ break;
+ case 1:
+ name = &compilation_unit->language_name;
+ break;
+ case 2:
+ name = &compilation_unit->product_id;
+ break;
+ case 3:
+ name = &compilation_unit->version_id;
+ break;
+ default:
+ abort ();
+ }
+
+ length = strlen (name->name);
/* If there is not enough room for the next entry, then dump
the current buffer contents now and maybe allocate a
{
/* Flush buffer before refilling or reallocating. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+ return FALSE;
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* See alloca above for discussion of new size. */
- tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
+ if (2 * tmp_space_size < 5 + length)
+ tmp_space_size = 5 + length;
+ else
+ tmp_space_size = 2 * tmp_space_size;
tmp_space = alloca (tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer
- space. */
+ space. */
p = tmp_space;
}
p += 4;
/* Next comes the string itself + a null terminator. */
- strcpy (p, comp[i]);
+ strcpy (p, name->name);
- switch (i)
- {
- case 0:
- obj_som_compilation_unit (abfd)->name.n_strx = strings_size;
- break;
- case 1:
- obj_som_compilation_unit (abfd)->language_name.n_strx =
- strings_size;
- break;
- case 2:
- obj_som_compilation_unit (abfd)->product_id.n_strx =
- strings_size;
- break;
- case 3:
- obj_som_compilation_unit (abfd)->version_id.n_strx =
- strings_size;
- break;
- }
+ name->strx = strings_size;
p += length + 1;
strings_size += length + 1;
{
/* Flush buffer before refilling or reallocating. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+ return FALSE;
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
{
/* See alloca above for discussion of new size. */
- tmp_space_size = MAX (2 * tmp_space_size, 5 + length);
+ if (2 * tmp_space_size < 5 + length)
+ tmp_space_size = 5 + length;
+ else
+ tmp_space_size = 2 * tmp_space_size;
tmp_space = alloca (tmp_space_size);
}
/* Scribble out any partial block. */
amt = p - tmp_space;
- if (bfd_bwrite ((PTR) &tmp_space[0], amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+ return FALSE;
*string_sizep = strings_size;
- return true;
+ return TRUE;
}
/* Compute variable information to be placed in the SOM headers,
space/subspace dictionaries, relocation streams, etc. Begin
writing parts of the object file. */
-static boolean
-som_begin_writing (abfd)
- bfd *abfd;
+static bfd_boolean
+som_begin_writing (bfd *abfd)
{
unsigned long current_offset = 0;
- int strings_size = 0;
+ unsigned int strings_size = 0;
unsigned long num_spaces, num_subspaces, i;
asection *section;
unsigned int total_subspaces = 0;
/* Make room for the file header, it's contents are not complete
yet, so it can not be written at this time. */
- current_offset += sizeof (struct header);
+ current_offset += sizeof (struct som_external_header);
/* Any auxiliary headers will follow the file header. Right now
we support only the copyright and version headers. */
/* Parts of the exec header will be filled in later, so
delay writing the header itself. Fill in the defaults,
and write it later. */
- current_offset += sizeof (struct som_exec_auxhdr);
+ current_offset += sizeof (struct som_external_exec_auxhdr);
obj_som_file_hdr (abfd)->aux_header_size
- += sizeof (struct som_exec_auxhdr);
+ += sizeof (struct som_external_exec_auxhdr);
exec_header = obj_som_exec_hdr (abfd);
exec_header->som_auxhdr.type = EXEC_AUX_ID;
exec_header->som_auxhdr.length = 40;
}
if (obj_som_version_hdr (abfd) != NULL)
{
+ struct som_external_string_auxhdr ext_string_auxhdr;
bfd_size_type len;
if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
- return false;
+ return FALSE;
/* Write the aux_id structure and the string length. */
- len = sizeof (struct aux_id) + sizeof (unsigned int);
+ len = sizeof (struct som_external_string_auxhdr);
obj_som_file_hdr (abfd)->aux_header_size += len;
current_offset += len;
- if (bfd_bwrite ((PTR) obj_som_version_hdr (abfd), len, abfd) != len)
- return false;
+ som_swap_string_auxhdr_out
+ (obj_som_version_hdr (abfd), &ext_string_auxhdr);
+ if (bfd_bwrite (&ext_string_auxhdr, len, abfd) != len)
+ return FALSE;
/* Write the version string. */
- len = obj_som_version_hdr (abfd)->header_id.length - sizeof (int);
+ len = obj_som_version_hdr (abfd)->header_id.length - 4;
obj_som_file_hdr (abfd)->aux_header_size += len;
current_offset += len;
- if (bfd_bwrite ((PTR) obj_som_version_hdr (abfd)->user_string, len, abfd)
+ if (bfd_bwrite ((void *) obj_som_version_hdr (abfd)->string, len, abfd)
!= len)
- return false;
+ return FALSE;
}
if (obj_som_copyright_hdr (abfd) != NULL)
{
+ struct som_external_string_auxhdr ext_string_auxhdr;
bfd_size_type len;
if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
- return false;
+ return FALSE;
/* Write the aux_id structure and the string length. */
- len = sizeof (struct aux_id) + sizeof (unsigned int);
+ len = sizeof (struct som_external_string_auxhdr);
obj_som_file_hdr (abfd)->aux_header_size += len;
current_offset += len;
- if (bfd_bwrite ((PTR) obj_som_copyright_hdr (abfd), len, abfd) != len)
- return false;
+ som_swap_string_auxhdr_out
+ (obj_som_copyright_hdr (abfd), &ext_string_auxhdr);
+ if (bfd_bwrite (&ext_string_auxhdr, len, abfd) != len)
+ return FALSE;
/* Write the copyright string. */
- len = obj_som_copyright_hdr (abfd)->header_id.length - sizeof (int);
+ len = obj_som_copyright_hdr (abfd)->header_id.length - 4;
obj_som_file_hdr (abfd)->aux_header_size += len;
current_offset += len;
- if (bfd_bwrite ((PTR) obj_som_copyright_hdr (abfd)->copyright, len, abfd)
+ if (bfd_bwrite ((void *) obj_som_copyright_hdr (abfd)->string, len, abfd)
!= len)
- return false;
+ return FALSE;
}
/* Next comes the initialization pointers; we have no initialization
num_spaces = som_count_spaces (abfd);
obj_som_file_hdr (abfd)->space_location = current_offset;
obj_som_file_hdr (abfd)->space_total = num_spaces;
- current_offset += num_spaces * sizeof (struct space_dictionary_record);
+ current_offset +=
+ num_spaces * sizeof (struct som_external_space_dictionary_record);
/* Next are the subspace records. These are fixed length records.
num_subspaces = som_count_subspaces (abfd);
obj_som_file_hdr (abfd)->subspace_location = current_offset;
obj_som_file_hdr (abfd)->subspace_total = num_subspaces;
- current_offset += num_subspaces * sizeof (struct subspace_dictionary_record);
+ current_offset
+ += num_subspaces * sizeof (struct som_external_subspace_dictionary_record);
/* Next is the string table for the space/subspace names. We will
build and write the string table on the fly. At the same time
obj_som_file_hdr (abfd)->space_strings_location = current_offset;
/* Scribble out the space strings. */
- if (som_write_space_strings (abfd, current_offset, &strings_size) == false)
- return false;
+ if (! som_write_space_strings (abfd, current_offset, &strings_size))
+ return FALSE;
/* Record total string table size in the header and update the
current offset. */
if (obj_som_compilation_unit (abfd))
{
obj_som_file_hdr (abfd)->compiler_total = 1;
- current_offset += COMPUNITSZ;
+ current_offset += sizeof (struct som_external_compilation_unit);
}
/* Now compute the file positions for the loadable subspaces, taking
/* Update the size of the code & data. */
if (abfd->flags & (EXEC_P | DYNAMIC)
&& subsection->flags & SEC_CODE)
- exec_header->exec_tsize += subsection->_cooked_size;
+ exec_header->exec_tsize += subsection->size;
else if (abfd->flags & (EXEC_P | DYNAMIC)
&& subsection->flags & SEC_DATA)
- exec_header->exec_dsize += subsection->_cooked_size;
+ exec_header->exec_dsize += subsection->size;
som_section_data (subsection)->subspace_dict->file_loc_init_value
= current_offset;
subsection->filepos = current_offset;
- current_offset += bfd_section_size (abfd, subsection);
- subspace_offset += bfd_section_size (abfd, subsection);
+ current_offset += subsection->size;
+ subspace_offset += subsection->size;
}
/* Looks like uninitialized data. */
else
{
/* Update the size of the bss section. */
if (abfd->flags & (EXEC_P | DYNAMIC))
- exec_header->exec_bsize += subsection->_cooked_size;
+ exec_header->exec_bsize += subsection->size;
som_section_data (subsection)->subspace_dict->file_loc_init_value
= 0;
som_section_data (subsection)->subspace_dict->file_loc_init_value
= current_offset;
subsection->filepos = current_offset;
- current_offset += bfd_section_size (abfd, subsection);
+ current_offset += subsection->size;
}
/* Looks like uninitialized data. */
else
som_section_data (subsection)->subspace_dict->file_loc_init_value
= 0;
som_section_data (subsection)->subspace_dict->
- initialization_length = bfd_section_size (abfd, subsection);
+ initialization_length = subsection->size;
}
}
/* Goto the next section. */
if (abfd->flags & (EXEC_P | DYNAMIC))
current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
if (bfd_seek (abfd, (file_ptr) current_offset - 1, SEEK_SET) != 0)
- return false;
- if (bfd_bwrite ((PTR) "", (bfd_size_type) 1, abfd) != 1)
- return false;
+ return FALSE;
+ if (bfd_bwrite ((void *) "", (bfd_size_type) 1, abfd) != 1)
+ return FALSE;
obj_som_file_hdr (abfd)->unloadable_sp_size
= current_offset - obj_som_file_hdr (abfd)->unloadable_sp_location;
/* Done. Store the total size of the SOM so far. */
obj_som_file_hdr (abfd)->som_length = current_offset;
- return true;
+ return TRUE;
}
/* Finally, scribble out the various headers to the disk. */
-static boolean
-som_finish_writing (abfd)
- bfd *abfd;
+static bfd_boolean
+som_finish_writing (bfd *abfd)
{
int num_spaces = som_count_spaces (abfd);
asymbol **syms = bfd_get_outsymbols (abfd);
- int i, num_syms, strings_size;
+ int i, num_syms;
int subspace_index = 0;
file_ptr location;
asection *section;
unsigned long current_offset;
- unsigned int total_reloc_size;
+ unsigned int strings_size, total_reloc_size;
bfd_size_type amt;
+ struct som_external_header ext_header;
/* We must set up the version identifier here as objcopy/strip copy
private BFD data too late for us to handle this in som_begin_writing. */
num_syms = bfd_get_symcount (abfd);
obj_som_file_hdr (abfd)->symbol_location = current_offset;
obj_som_file_hdr (abfd)->symbol_total = num_syms;
- current_offset += num_syms * sizeof (struct symbol_dictionary_record);
+ current_offset +=
+ num_syms * sizeof (struct som_external_symbol_dictionary_record);
/* Next are the symbol strings.
Align them to a word boundary. */
obj_som_file_hdr (abfd)->symbol_strings_location = current_offset;
/* Scribble out the symbol strings. */
- if (som_write_symbol_strings (abfd, current_offset, syms,
- num_syms, &strings_size,
- obj_som_compilation_unit (abfd))
- == false)
- return false;
+ if (! som_write_symbol_strings (abfd, current_offset, syms,
+ num_syms, &strings_size,
+ obj_som_compilation_unit (abfd)))
+ return FALSE;
/* Record total string table size in header and update the
current offset. */
/* Write the fixups and update fields in subspace headers which
relate to the fixup stream. */
- if (som_write_fixups (abfd, current_offset, &total_reloc_size) == false)
- return false;
+ if (! som_write_fixups (abfd, current_offset, &total_reloc_size))
+ return FALSE;
/* Record the total size of the fixup stream in the file header. */
obj_som_file_hdr (abfd)->fixup_request_total = total_reloc_size;
/* Now that the symbol table information is complete, build and
write the symbol table. */
- if (som_build_and_write_symbol_table (abfd) == false)
- return false;
+ if (! som_build_and_write_symbol_table (abfd))
+ return FALSE;
/* Subspaces are written first so that we can set up information
about them in their containing spaces as the subspace is written. */
/* Seek to the start of the subspace dictionary records. */
location = obj_som_file_hdr (abfd)->subspace_location;
if (bfd_seek (abfd, location, SEEK_SET) != 0)
- return false;
+ return FALSE;
section = abfd->sections;
/* Now for each loadable space write out records for its subspaces. */
subsection != NULL;
subsection = subsection->next)
{
+ struct som_external_subspace_dictionary_record ext_subspace_dict;
/* Skip any section which does not correspond to a space
or subspace. Or does not have SEC_ALLOC set (and therefore
som_section_data (subsection)->subspace_dict->space_index = i;
/* Dump the current subspace header. */
- amt = sizeof (struct subspace_dictionary_record);
- if (bfd_bwrite ((PTR) som_section_data (subsection)->subspace_dict,
- amt, abfd) != amt)
- return false;
+ som_swap_subspace_dictionary_record_out
+ (som_section_data (subsection)->subspace_dict, &ext_subspace_dict);
+ amt = sizeof (struct som_subspace_dictionary_record);
+ if (bfd_bwrite (&ext_subspace_dict, amt, abfd) != amt)
+ return FALSE;
}
/* Goto the next section. */
section = section->next;
subsection != NULL;
subsection = subsection->next)
{
+ struct som_external_subspace_dictionary_record ext_subspace_dict;
/* Skip any section which does not correspond to a space or
subspace, or which SEC_ALLOC set (and therefore handled
som_section_data (subsection)->subspace_dict->space_index = i;
/* Dump this subspace header. */
- amt = sizeof (struct subspace_dictionary_record);
- if (bfd_bwrite ((PTR) som_section_data (subsection)->subspace_dict,
- amt, abfd) != amt)
- return false;
+ som_swap_subspace_dictionary_record_out
+ (som_section_data (subsection)->subspace_dict, &ext_subspace_dict);
+ amt = sizeof (struct som_subspace_dictionary_record);
+ if (bfd_bwrite (&ext_subspace_dict, amt, abfd) != amt)
+ return FALSE;
}
/* Goto the next section. */
section = section->next;
}
- /* All the subspace dictiondary records are written, and all the
+ /* All the subspace dictionary records are written, and all the
fields are set up in the space dictionary records.
Seek to the right location and start writing the space
dictionary records. */
location = obj_som_file_hdr (abfd)->space_location;
if (bfd_seek (abfd, location, SEEK_SET) != 0)
- return false;
+ return FALSE;
section = abfd->sections;
for (i = 0; i < num_spaces; i++)
{
+ struct som_external_space_dictionary_record ext_space_dict;
+
/* Find a space. */
while (!som_is_space (section))
section = section->next;
/* Dump its header. */
- amt = sizeof (struct space_dictionary_record);
- if (bfd_bwrite ((PTR) som_section_data (section)->space_dict,
- amt, abfd) != amt)
- return false;
+ som_swap_space_dictionary_out (som_section_data (section)->space_dict,
+ &ext_space_dict);
+ amt = sizeof (struct som_external_space_dictionary_record);
+ if (bfd_bwrite (&ext_space_dict, amt, abfd) != amt)
+ return FALSE;
/* Goto the next section. */
section = section->next;
/* Write the compilation unit record if there is one. */
if (obj_som_compilation_unit (abfd))
{
+ struct som_external_compilation_unit ext_comp_unit;
+
location = obj_som_file_hdr (abfd)->compiler_location;
if (bfd_seek (abfd, location, SEEK_SET) != 0)
- return false;
+ return FALSE;
- amt = COMPUNITSZ;
- if (bfd_bwrite ((PTR) obj_som_compilation_unit (abfd), amt, abfd) != amt)
- return false;
+ som_swap_compilation_unit_out
+ (obj_som_compilation_unit (abfd), &ext_comp_unit);
+
+ amt = sizeof (struct som_external_compilation_unit);
+ if (bfd_bwrite (&ext_comp_unit, amt, abfd) != amt)
+ return FALSE;
}
/* Setting of the system_id has to happen very late now that copying of
else
obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC1_0;
- /* Compute the checksum for the file header just before writing
+ /* Swap and compute the checksum for the file header just before writing
the header to disk. */
- obj_som_file_hdr (abfd)->checksum = som_compute_checksum (abfd);
+ som_swap_header_out (obj_som_file_hdr (abfd), &ext_header);
+ bfd_putb32 (som_compute_checksum (&ext_header), ext_header.checksum);
/* Only thing left to do is write out the file header. It is always
at location zero. Seek there and write it. */
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
- return false;
- amt = sizeof (struct header);
- if (bfd_bwrite ((PTR) obj_som_file_hdr (abfd), amt, abfd) != amt)
- return false;
+ return FALSE;
+ amt = sizeof (struct som_external_header);
+ if (bfd_bwrite (&ext_header, amt, abfd) != amt)
+ return FALSE;
/* Now write the exec header. */
if (abfd->flags & (EXEC_P | DYNAMIC))
{
long tmp, som_length;
struct som_exec_auxhdr *exec_header;
+ struct som_external_exec_auxhdr ext_exec_header;
exec_header = obj_som_exec_hdr (abfd);
exec_header->exec_entry = bfd_get_start_address (abfd);
exec_header->exec_flags = obj_som_exec_data (abfd)->exec_flags;
/* Oh joys. Ram some of the BSS data into the DATA section
- to be compatable with how the hp linker makes objects
+ to be compatible with how the hp linker makes objects
(saves memory space). */
tmp = exec_header->exec_dsize;
tmp = SOM_ALIGN (tmp, PA_PAGESIZE);
|| exec_header->exec_dfile + exec_header->exec_dsize > som_length)
{
bfd_set_error (bfd_error_bad_value);
- return false;
+ return FALSE;
}
+ som_swap_exec_auxhdr_out (exec_header, &ext_exec_header);
+
if (bfd_seek (abfd, obj_som_file_hdr (abfd)->aux_header_location,
SEEK_SET) != 0)
- return false;
+ return FALSE;
- amt = AUX_HDR_SIZE;
- if (bfd_bwrite ((PTR) exec_header, amt, abfd) != amt)
- return false;
+ amt = sizeof (ext_exec_header);
+ if (bfd_bwrite (&ext_exec_header, amt, abfd) != amt)
+ return FALSE;
}
- return true;
+ return TRUE;
}
/* Compute and return the checksum for a SOM file header. */
static unsigned long
-som_compute_checksum (abfd)
- bfd *abfd;
+som_compute_checksum (struct som_external_header *hdr)
{
unsigned long checksum, count, i;
- unsigned long *buffer = (unsigned long *) obj_som_file_hdr (abfd);
+ unsigned long *buffer = (unsigned long *) hdr;
checksum = 0;
- count = sizeof (struct header) / sizeof (unsigned long);
+ count = sizeof (struct som_external_header) / 4;
for (i = 0; i < count; i++)
checksum ^= *(buffer + i);
}
static void
-som_bfd_derive_misc_symbol_info (abfd, sym, info)
- bfd *abfd ATTRIBUTE_UNUSED;
- asymbol *sym;
- struct som_misc_symbol_info *info;
+som_bfd_derive_misc_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+ asymbol *sym,
+ struct som_misc_symbol_info *info)
{
/* Initialize. */
memset (info, 0, sizeof (struct som_misc_symbol_info));
info->symbol_type = ST_DATA;
else
{
- /* Common symbols must have scope SS_UNSAT and type
- ST_STORAGE or the linker will choke. */
+ /* For BFD style common, the linker will choke unless we set the
+ type and scope to ST_STORAGE and SS_UNSAT, respectively. */
if (bfd_is_com_section (sym->section))
{
- info->symbol_scope = SS_UNSAT;
info->symbol_type = ST_STORAGE;
+ info->symbol_scope = SS_UNSAT;
}
/* It is possible to have a symbol without an associated
section (ST_DATA for DATA sections, ST_CODE for CODE sections). */
else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
{
- if (sym->section->flags & SEC_CODE)
+ if (bfd_is_abs_section (sym->section))
+ info->symbol_type = ST_ABSOLUTE;
+ else if (sym->section->flags & SEC_CODE)
info->symbol_type = ST_CODE;
else
info->symbol_type = ST_DATA;
}
- else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
- info->symbol_type = ST_DATA;
-
/* From now on it's a very simple mapping. */
else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_ABSOLUTE)
info->symbol_type = ST_ABSOLUTE;
/* Now handle the symbol's scope. Exported data which is not
in the common section has scope SS_UNIVERSAL. Note scope
of common symbols was handled earlier! */
- if (bfd_is_und_section (sym->section))
+ if (bfd_is_com_section (sym->section))
+ ;
+ else if (bfd_is_und_section (sym->section))
info->symbol_scope = SS_UNSAT;
- else if (sym->flags & (BSF_EXPORT | BSF_WEAK)
- && ! bfd_is_com_section (sym->section))
+ else if (sym->flags & (BSF_EXPORT | BSF_WEAK))
info->symbol_scope = SS_UNIVERSAL;
/* Anything else which is not in the common section has scope
SS_LOCAL. */
- else if (! bfd_is_com_section (sym->section))
+ else
info->symbol_scope = SS_LOCAL;
/* Now set the symbol_info field. It has no real meaning
/* Set the symbol's value. */
info->symbol_value = sym->value + sym->section->vma;
- /* The secondary_def field is for weak symbols. */
+ /* The secondary_def field is for "weak" symbols. */
if (sym->flags & BSF_WEAK)
- info->secondary_def = true;
+ info->secondary_def = TRUE;
else
- info->secondary_def = false;
-
+ info->secondary_def = FALSE;
+
+ /* The is_comdat, is_common and dup_common fields provide various
+ flavors of common.
+
+ For data symbols, setting IS_COMMON provides Fortran style common
+ (duplicate definitions and overlapped initialization). Setting both
+ IS_COMMON and DUP_COMMON provides Cobol style common (duplicate
+ definitions as long as they are all the same length). In a shared
+ link data symbols retain their IS_COMMON and DUP_COMMON flags.
+ An IS_COMDAT data symbol is similar to a IS_COMMON | DUP_COMMON
+ symbol except in that it loses its IS_COMDAT flag in a shared link.
+
+ For code symbols, IS_COMDAT and DUP_COMMON have effect. Universal
+ DUP_COMMON code symbols are not exported from shared libraries.
+ IS_COMDAT symbols are exported but they lose their IS_COMDAT flag.
+
+ We take a simplified approach to setting the is_comdat, is_common
+ and dup_common flags in symbols based on the flag settings of their
+ subspace. This avoids having to add directives like `.comdat' but
+ the linker behavior is probably undefined if there is more than one
+ universal symbol (comdat key sysmbol) in a subspace.
+
+ The behavior of these flags is not well documentmented, so there
+ may be bugs and some surprising interactions with other flags. */
+ if (som_section_data (sym->section)
+ && som_section_data (sym->section)->subspace_dict
+ && info->symbol_scope == SS_UNIVERSAL
+ && (info->symbol_type == ST_ENTRY
+ || info->symbol_type == ST_CODE
+ || info->symbol_type == ST_DATA))
+ {
+ info->is_comdat
+ = som_section_data (sym->section)->subspace_dict->is_comdat;
+ info->is_common
+ = som_section_data (sym->section)->subspace_dict->is_common;
+ info->dup_common
+ = som_section_data (sym->section)->subspace_dict->dup_common;
+ }
}
/* Build and write, in one big chunk, the entire symbol table for
this BFD. */
-static boolean
-som_build_and_write_symbol_table (abfd)
- bfd *abfd;
+static bfd_boolean
+som_build_and_write_symbol_table (bfd *abfd)
{
unsigned int num_syms = bfd_get_symcount (abfd);
file_ptr symtab_location = obj_som_file_hdr (abfd)->symbol_location;
asymbol **bfd_syms = obj_som_sorted_syms (abfd);
- struct symbol_dictionary_record *som_symtab = NULL;
+ struct som_external_symbol_dictionary_record *som_symtab = NULL;
unsigned int i;
bfd_size_type symtab_size;
/* Compute total symbol table size and allocate a chunk of memory
to hold the symbol table as we build it. */
symtab_size = num_syms;
- symtab_size *= sizeof (struct symbol_dictionary_record);
- som_symtab = (struct symbol_dictionary_record *) bfd_malloc (symtab_size);
+ symtab_size *= sizeof (struct som_external_symbol_dictionary_record);
+ som_symtab = bfd_zmalloc (symtab_size);
if (som_symtab == NULL && symtab_size != 0)
goto error_return;
- memset (som_symtab, 0, (size_t) symtab_size);
/* Walk over each symbol. */
for (i = 0; i < num_syms; i++)
{
struct som_misc_symbol_info info;
+ unsigned int flags;
/* This is really an index into the symbol strings table.
By the time we get here, the index has already been
computed and stored into the name field in the BFD symbol. */
- som_symtab[i].name.n_strx = som_symbol_data(bfd_syms[i])->stringtab_offset;
+ bfd_putb32 (som_symbol_data (bfd_syms[i])->stringtab_offset,
+ som_symtab[i].name);
/* Derive SOM information from the BFD symbol. */
som_bfd_derive_misc_symbol_info (abfd, bfd_syms[i], &info);
/* Now use it. */
- som_symtab[i].symbol_type = info.symbol_type;
- som_symtab[i].symbol_scope = info.symbol_scope;
- som_symtab[i].arg_reloc = info.arg_reloc;
- som_symtab[i].symbol_info = info.symbol_info;
- som_symtab[i].xleast = 3;
- som_symtab[i].symbol_value = info.symbol_value | info.priv_level;
- som_symtab[i].secondary_def = info.secondary_def;
+ flags = (info.symbol_type << SOM_SYMBOL_TYPE_SH)
+ | (info.symbol_scope << SOM_SYMBOL_SCOPE_SH)
+ | (info.arg_reloc << SOM_SYMBOL_ARG_RELOC_SH)
+ | (3 << SOM_SYMBOL_XLEAST_SH)
+ | (info.secondary_def ? SOM_SYMBOL_SECONDARY_DEF : 0)
+ | (info.is_common ? SOM_SYMBOL_IS_COMMON : 0)
+ | (info.dup_common ? SOM_SYMBOL_DUP_COMMON : 0);
+ bfd_putb32 (flags, som_symtab[i].flags);
+
+ flags = (info.symbol_info << SOM_SYMBOL_SYMBOL_INFO_SH)
+ | (info.is_comdat ? SOM_SYMBOL_IS_COMDAT : 0);
+ bfd_putb32 (flags, som_symtab[i].info);
+ bfd_putb32 (info.symbol_value | info.priv_level,
+ som_symtab[i].symbol_value);
}
/* Everything is ready, seek to the right location and
scribble out the symbol table. */
if (bfd_seek (abfd, symtab_location, SEEK_SET) != 0)
- return false;
+ return FALSE;
- if (bfd_bwrite ((PTR) som_symtab, symtab_size, abfd) != symtab_size)
+ if (bfd_bwrite ((void *) som_symtab, symtab_size, abfd) != symtab_size)
goto error_return;
if (som_symtab != NULL)
free (som_symtab);
- return true;
+ return TRUE;
error_return:
if (som_symtab != NULL)
free (som_symtab);
- return false;
+ return FALSE;
}
/* Write an object in SOM format. */
-static boolean
-som_write_object_contents (abfd)
- bfd *abfd;
+static bfd_boolean
+som_write_object_contents (bfd *abfd)
{
- if (abfd->output_has_begun == false)
+ if (! abfd->output_has_begun)
{
/* Set up fixed parts of the file, space, and subspace headers.
Notify the world that output has begun. */
som_prep_headers (abfd);
- abfd->output_has_begun = true;
+ abfd->output_has_begun = TRUE;
/* Start writing the object file. This include all the string
tables, fixup streams, and other portions of the object file. */
som_begin_writing (abfd);
}
- return (som_finish_writing (abfd));
+ return som_finish_writing (abfd);
}
\f
/* Read and save the string table associated with the given BFD. */
-static boolean
-som_slurp_string_table (abfd)
- bfd *abfd;
+static bfd_boolean
+som_slurp_string_table (bfd *abfd)
{
char *stringtab;
bfd_size_type amt;
/* Use the saved version if its available. */
if (obj_som_stringtab (abfd) != NULL)
- return true;
+ return TRUE;
/* I don't think this can currently happen, and I'm not sure it should
really be an error, but it's better than getting unpredictable results
if (obj_som_stringtab_size (abfd) == 0)
{
bfd_set_error (bfd_error_no_symbols);
- return false;
+ return FALSE;
}
/* Allocate and read in the string table. */
amt = obj_som_stringtab_size (abfd);
- stringtab = bfd_malloc (amt);
+ stringtab = bfd_zmalloc (amt);
if (stringtab == NULL)
- return false;
- memset (stringtab, 0, obj_som_stringtab_size (abfd));
+ return FALSE;
if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) != 0)
- return false;
+ return FALSE;
if (bfd_bread (stringtab, amt, abfd) != amt)
- return false;
+ return FALSE;
/* Save our results and return success. */
obj_som_stringtab (abfd) = stringtab;
- return true;
+ return TRUE;
}
/* Return the amount of data (in bytes) required to hold the symbol
table for this object. */
static long
-som_get_symtab_upper_bound (abfd)
- bfd *abfd;
+som_get_symtab_upper_bound (bfd *abfd)
{
if (!som_slurp_symbol_table (abfd))
return -1;
- return (bfd_get_symcount (abfd) + 1) * (sizeof (asymbol *));
+ return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
}
/* Convert from a SOM subspace index to a BFD section. */
static asection *
-bfd_section_from_som_symbol (abfd, symbol)
- bfd *abfd;
- struct symbol_dictionary_record *symbol;
+bfd_section_from_som_symbol
+ (bfd *abfd, struct som_external_symbol_dictionary_record *symbol)
{
asection *section;
+ unsigned int flags = bfd_getb32 (symbol->flags);
+ unsigned int symbol_type = (flags >> SOM_SYMBOL_TYPE_SH) & SOM_SYMBOL_TYPE_MASK;
/* The meaning of the symbol_info field changes for functions
within executables. So only use the quick symbol_info mapping for
incomplete objects and non-function symbols in executables. */
if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0
- || (symbol->symbol_type != ST_ENTRY
- && symbol->symbol_type != ST_PRI_PROG
- && symbol->symbol_type != ST_SEC_PROG
- && symbol->symbol_type != ST_MILLICODE))
+ || (symbol_type != ST_ENTRY
+ && symbol_type != ST_PRI_PROG
+ && symbol_type != ST_SEC_PROG
+ && symbol_type != ST_MILLICODE))
{
- unsigned int index = symbol->symbol_info;
+ int idx = (bfd_getb32 (symbol->info) >> SOM_SYMBOL_SYMBOL_INFO_SH)
+ & SOM_SYMBOL_SYMBOL_INFO_MASK;
+
for (section = abfd->sections; section != NULL; section = section->next)
- if (section->target_index == index && som_is_subspace (section))
+ if (section->target_index == idx && som_is_subspace (section))
return section;
-
- /* Could be a symbol from an external library (such as an OMOS
- shared library). Don't abort. */
- return bfd_abs_section_ptr;
-
}
else
{
- unsigned int value = symbol->symbol_value;
+ unsigned int value = bfd_getb32 (symbol->symbol_value);
/* For executables we will have to use the symbol's address and
find out what section would contain that address. Yuk. */
for (section = abfd->sections; section; section = section->next)
- {
- if (value >= section->vma
- && value <= section->vma + section->_cooked_size
- && som_is_subspace (section))
- return section;
- }
-
- /* Could be a symbol from an external library (such as an OMOS
- shared library). Don't abort. */
- return bfd_abs_section_ptr;
-
+ if (value >= section->vma
+ && value <= section->vma + section->size
+ && som_is_subspace (section))
+ return section;
}
+
+ /* Could be a symbol from an external library (such as an OMOS
+ shared library). Don't abort. */
+ return bfd_abs_section_ptr;
}
/* Read and save the symbol table associated with the given BFD. */
static unsigned int
-som_slurp_symbol_table (abfd)
- bfd *abfd;
+som_slurp_symbol_table (bfd *abfd)
{
int symbol_count = bfd_get_symcount (abfd);
- int symsize = sizeof (struct symbol_dictionary_record);
+ int symsize = sizeof (struct som_external_symbol_dictionary_record);
char *stringtab;
- struct symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
+ struct som_external_symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
som_symbol_type *sym, *symbase;
bfd_size_type amt;
amt = symbol_count;
amt *= sizeof (som_symbol_type);
- symbase = (som_symbol_type *) bfd_malloc (amt);
+ symbase = bfd_zmalloc (amt);
if (symbase == NULL)
goto error_return;
- memset (symbase, 0, symbol_count * sizeof (som_symbol_type));
/* Read in the external SOM representation. */
amt = symbol_count;
endbufp = buf + symbol_count;
for (bufp = buf, sym = symbase; bufp < endbufp; ++bufp)
{
+ unsigned int flags = bfd_getb32 (bufp->flags);
+ unsigned int symbol_type =
+ (flags >> SOM_SYMBOL_TYPE_SH) & SOM_SYMBOL_TYPE_MASK;
+ unsigned int symbol_scope =
+ (flags >> SOM_SYMBOL_SCOPE_SH) & SOM_SYMBOL_SCOPE_MASK;
/* I don't think we care about these. */
- if (bufp->symbol_type == ST_SYM_EXT
- || bufp->symbol_type == ST_ARG_EXT)
+ if (symbol_type == ST_SYM_EXT || symbol_type == ST_ARG_EXT)
continue;
/* Set some private data we care about. */
- if (bufp->symbol_type == ST_NULL)
+ if (symbol_type == ST_NULL)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
- else if (bufp->symbol_type == ST_ABSOLUTE)
+ else if (symbol_type == ST_ABSOLUTE)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_ABSOLUTE;
- else if (bufp->symbol_type == ST_DATA)
+ else if (symbol_type == ST_DATA)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_DATA;
- else if (bufp->symbol_type == ST_CODE)
+ else if (symbol_type == ST_CODE)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_CODE;
- else if (bufp->symbol_type == ST_PRI_PROG)
+ else if (symbol_type == ST_PRI_PROG)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_PRI_PROG;
- else if (bufp->symbol_type == ST_SEC_PROG)
+ else if (symbol_type == ST_SEC_PROG)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_SEC_PROG;
- else if (bufp->symbol_type == ST_ENTRY)
+ else if (symbol_type == ST_ENTRY)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_ENTRY;
- else if (bufp->symbol_type == ST_MILLICODE)
+ else if (symbol_type == ST_MILLICODE)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_MILLICODE;
- else if (bufp->symbol_type == ST_PLABEL)
+ else if (symbol_type == ST_PLABEL)
som_symbol_data (sym)->som_type = SYMBOL_TYPE_PLABEL;
else
som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
- som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc = bufp->arg_reloc;
+ som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc =
+ (flags >> SOM_SYMBOL_ARG_RELOC_SH) & SOM_SYMBOL_ARG_RELOC_MASK;
/* Some reasonable defaults. */
sym->symbol.the_bfd = abfd;
- sym->symbol.name = bufp->name.n_strx + stringtab;
- sym->symbol.value = bufp->symbol_value;
+ sym->symbol.name = bfd_getb32 (bufp->name) + stringtab;
+ sym->symbol.value = bfd_getb32 (bufp->symbol_value);
sym->symbol.section = 0;
sym->symbol.flags = 0;
- switch (bufp->symbol_type)
+ switch (symbol_type)
{
case ST_ENTRY:
case ST_MILLICODE:
sym->symbol.value &= ~0x3;
/* If the symbol's scope is SS_UNSAT, then these are
undefined function symbols. */
- if (bufp->symbol_scope == SS_UNSAT)
+ if (symbol_scope == SS_UNSAT)
sym->symbol.flags |= BSF_FUNCTION;
default:
}
/* Handle scoping and section information. */
- switch (bufp->symbol_scope)
+ switch (symbol_scope)
{
/* symbol_info field is undefined for SS_EXTERNAL and SS_UNSAT symbols,
so the section associated with this symbol can't be known. */
case SS_EXTERNAL:
- if (bufp->symbol_type != ST_STORAGE)
+ if (symbol_type != ST_STORAGE)
sym->symbol.section = bfd_und_section_ptr;
else
sym->symbol.section = bfd_com_section_ptr;
break;
case SS_UNSAT:
- if (bufp->symbol_type != ST_STORAGE)
+ if (symbol_type != ST_STORAGE)
sym->symbol.section = bfd_und_section_ptr;
else
sym->symbol.section = bfd_com_section_ptr;
sym->symbol.value -= sym->symbol.section->vma;
break;
-#if 0
- /* SS_GLOBAL and SS_LOCAL are two names for the same thing.
- Sound dumb? It is. */
- case SS_GLOBAL:
-#endif
case SS_LOCAL:
sym->symbol.flags |= BSF_LOCAL;
sym->symbol.section = bfd_section_from_som_symbol (abfd, bufp);
}
/* Check for a weak symbol. */
- if (bufp->secondary_def)
+ if (flags & SOM_SYMBOL_SECONDARY_DEF)
sym->symbol.flags |= BSF_WEAK;
/* Mark section symbols and symbols used by the debugger.
&& sym->symbol.name[strlen (sym->symbol.name) - 1] == '$'
&& !strcmp (sym->symbol.name, sym->symbol.section->name))
sym->symbol.flags |= BSF_SECTION_SYM;
- else if (!strncmp (sym->symbol.name, "L$0\002", 4))
+ else if (CONST_STRNEQ (sym->symbol.name, "L$0\002"))
{
sym->symbol.flags |= BSF_SECTION_SYM;
sym->symbol.name = sym->symbol.section->name;
}
- else if (!strncmp (sym->symbol.name, "L$0\001", 4))
+ else if (CONST_STRNEQ (sym->symbol.name, "L$0\001"))
sym->symbol.flags |= BSF_DEBUGGING;
/* Note increment at bottom of loop, since we skip some symbols
- we can not include it as part of the for statement. */
+ we can not include it as part of the for statement. */
sym++;
}
successful_return:
if (buf != NULL)
free (buf);
- return (true);
+ return (TRUE);
error_return:
if (buf != NULL)
free (buf);
- return false;
+ return FALSE;
}
/* Canonicalize a SOM symbol table. Return the number of entries
in the symbol table. */
static long
-som_get_symtab (abfd, location)
- bfd *abfd;
- asymbol **location;
+som_canonicalize_symtab (bfd *abfd, asymbol **location)
{
int i;
som_symbol_type *symbase;
/* Make a SOM symbol. There is nothing special to do here. */
static asymbol *
-som_make_empty_symbol (abfd)
- bfd *abfd;
+som_make_empty_symbol (bfd *abfd)
{
bfd_size_type amt = sizeof (som_symbol_type);
- som_symbol_type *new = (som_symbol_type *) bfd_zalloc (abfd, amt);
- if (new == NULL)
- return 0;
- new->symbol.the_bfd = abfd;
+ som_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
+
+ if (new_symbol_type == NULL)
+ return NULL;
+ new_symbol_type->symbol.the_bfd = abfd;
- return &new->symbol;
+ return &new_symbol_type->symbol;
}
/* Print symbol information. */
static void
-som_print_symbol (abfd, afile, symbol, how)
- bfd *abfd;
- PTR afile;
- asymbol *symbol;
- bfd_print_symbol_type how;
+som_print_symbol (bfd *abfd,
+ void *afile,
+ asymbol *symbol,
+ bfd_print_symbol_type how)
{
FILE *file = (FILE *) afile;
+
switch (how)
{
case bfd_print_symbol_name:
case bfd_print_symbol_all:
{
const char *section_name;
+
section_name = symbol->section ? symbol->section->name : "(*none*)";
- bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
+ bfd_print_symbol_vandf (abfd, (void *) file, symbol);
fprintf (file, " %s\t%s", section_name, symbol->name);
break;
}
}
}
-static boolean
-som_bfd_is_local_label_name (abfd, name)
- bfd *abfd ATTRIBUTE_UNUSED;
- const char *name;
+static bfd_boolean
+som_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+ const char *name)
{
- return (name[0] == 'L' && name[1] == '$');
+ return name[0] == 'L' && name[1] == '$';
}
/* Count or process variable-length SOM fixup records.
This needs at least two or three more passes to get it cleaned up. */
static unsigned int
-som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
- unsigned char *fixup;
- unsigned int end;
- arelent *internal_relocs;
- asection *section;
- asymbol **symbols;
- boolean just_count;
+som_set_reloc_info (unsigned char *fixup,
+ unsigned int end,
+ arelent *internal_relocs,
+ asection *section,
+ asymbol **symbols,
+ bfd_boolean just_count)
{
unsigned int op, varname, deallocate_contents = 0;
unsigned char *end_fixups = &fixup[end];
while (fixup < end_fixups)
{
-
/* Save pointer to the start of this fixup. We'll use
it later to determine if it is necessary to put this fixup
on the queue. */
if (rptr->addend == 0 && !section->contents)
{
/* Got to read the damn contents first. We don't
- bother saving the contents (yet). Add it one
+ bother saving the contents (yet). Add it one
day if the need arises. */
- section->contents = bfd_malloc (section->_raw_size);
- if (section->contents == NULL)
- return (unsigned) -1;
-
+ bfd_byte *contents;
+ if (!bfd_malloc_and_get_section (section->owner, section,
+ &contents))
+ {
+ if (contents != NULL)
+ free (contents);
+ return (unsigned) -1;
+ }
+ section->contents = contents;
deallocate_contents = 1;
- bfd_get_section_contents (section->owner,
- section,
- section->contents,
- (bfd_vma) 0,
- section->_raw_size);
}
else if (rptr->addend == 0)
rptr->addend = bfd_get_32 (section->owner,
/* Read in the relocs (aka fixups in SOM terms) for a section.
som_get_reloc_upper_bound calls this routine with JUST_COUNT
- set to true to indicate it only needs a count of the number
+ set to TRUE to indicate it only needs a count of the number
of actual relocations. */
-static boolean
-som_slurp_reloc_table (abfd, section, symbols, just_count)
- bfd *abfd;
- asection *section;
- asymbol **symbols;
- boolean just_count;
+static bfd_boolean
+som_slurp_reloc_table (bfd *abfd,
+ asection *section,
+ asymbol **symbols,
+ bfd_boolean just_count)
{
- char *external_relocs;
+ unsigned char *external_relocs;
unsigned int fixup_stream_size;
arelent *internal_relocs;
unsigned int num_relocs;
fixup_stream_size = som_section_data (section)->reloc_size;
/* If there were no relocations, then there is nothing to do. */
if (section->reloc_count == 0)
- return true;
+ return TRUE;
/* If reloc_count is -1, then the relocation stream has not been
parsed. We must do so now to know how many relocations exist. */
if (section->reloc_count == (unsigned) -1)
{
amt = fixup_stream_size;
- external_relocs = (char *) bfd_malloc (amt);
- if (external_relocs == (char *) NULL)
- return false;
+ external_relocs = bfd_malloc (amt);
+ if (external_relocs == NULL)
+ return FALSE;
/* Read in the external forms. */
if (bfd_seek (abfd,
obj_som_reloc_filepos (abfd) + section->rel_filepos,
SEEK_SET)
!= 0)
- return false;
+ return FALSE;
if (bfd_bread (external_relocs, amt, abfd) != amt)
- return false;
+ return FALSE;
/* Let callers know how many relocations found.
also save the relocation stream as we will
need it again. */
section->reloc_count = som_set_reloc_info (external_relocs,
fixup_stream_size,
- NULL, NULL, NULL, true);
+ NULL, NULL, NULL, TRUE);
som_section_data (section)->reloc_stream = external_relocs;
}
/* If the caller only wanted a count, then return now. */
if (just_count)
- return true;
+ return TRUE;
num_relocs = section->reloc_count;
external_relocs = som_section_data (section)->reloc_stream;
/* Return saved information about the relocations if it is available. */
- if (section->relocation != (arelent *) NULL)
- return true;
+ if (section->relocation != NULL)
+ return TRUE;
amt = num_relocs;
amt *= sizeof (arelent);
- internal_relocs = (arelent *) bfd_zalloc (abfd, (amt));
- if (internal_relocs == (arelent *) NULL)
- return false;
+ internal_relocs = bfd_zalloc (abfd, (amt));
+ if (internal_relocs == NULL)
+ return FALSE;
/* Process and internalize the relocations. */
som_set_reloc_info (external_relocs, fixup_stream_size,
- internal_relocs, section, symbols, false);
+ internal_relocs, section, symbols, FALSE);
/* We're done with the external relocations. Free them. */
free (external_relocs);
/* Save our results and return success. */
section->relocation = internal_relocs;
- return (true);
+ return TRUE;
}
/* Return the number of bytes required to store the relocation
information associated with the given section. */
static long
-som_get_reloc_upper_bound (abfd, asect)
- bfd *abfd;
- sec_ptr asect;
+som_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
{
/* If section has relocations, then read in the relocation stream
and parse it to determine how many relocations exist. */
if (asect->flags & SEC_RELOC)
{
- if (! som_slurp_reloc_table (abfd, asect, NULL, true))
+ if (! som_slurp_reloc_table (abfd, asect, NULL, TRUE))
return -1;
return (asect->reloc_count + 1) * sizeof (arelent *);
}
- /* There are no relocations. */
- return 0;
+
+ /* There are no relocations. Return enough space to hold the
+ NULL pointer which will be installed if som_canonicalize_reloc
+ is called. */
+ return sizeof (arelent *);
}
/* Convert relocations from SOM (external) form into BFD internal
form. Return the number of relocations. */
static long
-som_canonicalize_reloc (abfd, section, relptr, symbols)
- bfd *abfd;
- sec_ptr section;
- arelent **relptr;
- asymbol **symbols;
+som_canonicalize_reloc (bfd *abfd,
+ sec_ptr section,
+ arelent **relptr,
+ asymbol **symbols)
{
arelent *tblptr;
int count;
- if (som_slurp_reloc_table (abfd, section, symbols, false) == false)
+ if (! som_slurp_reloc_table (abfd, section, symbols, FALSE))
return -1;
count = section->reloc_count;
while (count--)
*relptr++ = tblptr++;
- *relptr = (arelent *) NULL;
+ *relptr = NULL;
return section->reloc_count;
}
/* A hook to set up object file dependent section information. */
-static boolean
-som_new_section_hook (abfd, newsect)
- bfd *abfd;
- asection *newsect;
+static bfd_boolean
+som_new_section_hook (bfd *abfd, asection *newsect)
{
- bfd_size_type amt = sizeof (struct som_section_data_struct);
- newsect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
if (!newsect->used_by_bfd)
- return false;
+ {
+ bfd_size_type amt = sizeof (struct som_section_data_struct);
+
+ newsect->used_by_bfd = bfd_zalloc (abfd, amt);
+ if (!newsect->used_by_bfd)
+ return FALSE;
+ }
newsect->alignment_power = 3;
/* We allow more than three sections internally. */
- return true;
+ return _bfd_generic_new_section_hook (abfd, newsect);
}
/* Copy any private info we understand from the input symbol
to the output symbol. */
-static boolean
-som_bfd_copy_private_symbol_data (ibfd, isymbol, obfd, osymbol)
- bfd *ibfd;
- asymbol *isymbol;
- bfd *obfd;
- asymbol *osymbol;
+static bfd_boolean
+som_bfd_copy_private_symbol_data (bfd *ibfd,
+ asymbol *isymbol,
+ bfd *obfd,
+ asymbol *osymbol)
{
struct som_symbol *input_symbol = (struct som_symbol *) isymbol;
struct som_symbol *output_symbol = (struct som_symbol *) osymbol;
/* One day we may try to grok other private data. */
if (ibfd->xvec->flavour != bfd_target_som_flavour
|| obfd->xvec->flavour != bfd_target_som_flavour)
- return false;
+ return FALSE;
/* The only private information we need to copy is the argument relocation
bits. */
output_symbol->tc_data.ap.hppa_arg_reloc =
input_symbol->tc_data.ap.hppa_arg_reloc;
- return true;
+ return TRUE;
}
/* Copy any private info we understand from the input section
to the output section. */
-static boolean
-som_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
- bfd *ibfd;
- asection *isection;
- bfd *obfd;
- asection *osection;
+static bfd_boolean
+som_bfd_copy_private_section_data (bfd *ibfd,
+ asection *isection,
+ bfd *obfd,
+ asection *osection)
{
bfd_size_type amt;
if (ibfd->xvec->flavour != bfd_target_som_flavour
|| obfd->xvec->flavour != bfd_target_som_flavour
|| (!som_is_space (isection) && !som_is_subspace (isection)))
- return true;
+ return TRUE;
amt = sizeof (struct som_copyable_section_data_struct);
- som_section_data (osection)->copy_data =
- (struct som_copyable_section_data_struct *) bfd_zalloc (obfd, amt);
+ som_section_data (osection)->copy_data = bfd_zalloc (obfd, amt);
if (som_section_data (osection)->copy_data == NULL)
- return false;
+ return FALSE;
memcpy (som_section_data (osection)->copy_data,
som_section_data (isection)->copy_data,
som_section_data (osection)->copy_data->container =
som_section_data (osection)->copy_data->container->output_section;
- return true;
+ return TRUE;
}
/* Copy any private info we understand from the input bfd
to the output bfd. */
-static boolean
-som_bfd_copy_private_bfd_data (ibfd, obfd)
- bfd *ibfd, *obfd;
+static bfd_boolean
+som_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
/* One day we may try to grok other private data. */
if (ibfd->xvec->flavour != bfd_target_som_flavour
|| obfd->xvec->flavour != bfd_target_som_flavour)
- return true;
+ return TRUE;
/* Allocate some memory to hold the data we need. */
- obj_som_exec_data (obfd) = (struct som_exec_data *)
- bfd_zalloc (obfd, (bfd_size_type) sizeof (struct som_exec_data));
+ obj_som_exec_data (obfd) = bfd_zalloc (obfd, (bfd_size_type) sizeof (struct som_exec_data));
if (obj_som_exec_data (obfd) == NULL)
- return false;
+ return FALSE;
/* Now copy the data. */
memcpy (obj_som_exec_data (obfd), obj_som_exec_data (ibfd),
sizeof (struct som_exec_data));
- return true;
+ return TRUE;
+}
+
+/* Display the SOM header. */
+
+static bfd_boolean
+som_bfd_print_private_bfd_data (bfd *abfd, void *farg)
+{
+ struct som_exec_auxhdr *exec_header;
+ struct som_aux_id* auxhdr;
+ FILE *f;
+
+ f = (FILE *) farg;
+
+ exec_header = obj_som_exec_hdr (abfd);
+ if (exec_header)
+ {
+ fprintf (f, _("\nExec Auxiliary Header\n"));
+ fprintf (f, " flags ");
+ auxhdr = &exec_header->som_auxhdr;
+ if (auxhdr->mandatory)
+ fprintf (f, "mandatory ");
+ if (auxhdr->copy)
+ fprintf (f, "copy ");
+ if (auxhdr->append)
+ fprintf (f, "append ");
+ if (auxhdr->ignore)
+ fprintf (f, "ignore ");
+ fprintf (f, "\n");
+ fprintf (f, " type %#x\n", auxhdr->type);
+ fprintf (f, " length %#x\n", auxhdr->length);
+
+ /* Note that, depending on the HP-UX version, the following fields can be
+ either ints, or longs. */
+
+ fprintf (f, " text size %#lx\n", (long) exec_header->exec_tsize);
+ fprintf (f, " text memory offset %#lx\n", (long) exec_header->exec_tmem);
+ fprintf (f, " text file offset %#lx\n", (long) exec_header->exec_tfile);
+ fprintf (f, " data size %#lx\n", (long) exec_header->exec_dsize);
+ fprintf (f, " data memory offset %#lx\n", (long) exec_header->exec_dmem);
+ fprintf (f, " data file offset %#lx\n", (long) exec_header->exec_dfile);
+ fprintf (f, " bss size %#lx\n", (long) exec_header->exec_bsize);
+ fprintf (f, " entry point %#lx\n", (long) exec_header->exec_entry);
+ fprintf (f, " loader flags %#lx\n", (long) exec_header->exec_flags);
+ fprintf (f, " bss initializer %#lx\n", (long) exec_header->exec_bfill);
+ }
+
+ return TRUE;
}
/* Set backend info for sections which can not be described
in the BFD data structures. */
-boolean
-bfd_som_set_section_attributes (section, defined, private, sort_key, spnum)
- asection *section;
- int defined;
- int private;
- unsigned int sort_key;
- int spnum;
+bfd_boolean
+bfd_som_set_section_attributes (asection *section,
+ int defined,
+ int private,
+ unsigned int sort_key,
+ int spnum)
{
/* Allocate memory to hold the magic information. */
if (som_section_data (section)->copy_data == NULL)
{
bfd_size_type amt = sizeof (struct som_copyable_section_data_struct);
- som_section_data (section)->copy_data =
- (struct som_copyable_section_data_struct *) bfd_zalloc (section->owner,
- amt);
+
+ som_section_data (section)->copy_data = bfd_zalloc (section->owner, amt);
if (som_section_data (section)->copy_data == NULL)
- return false;
+ return FALSE;
}
som_section_data (section)->copy_data->sort_key = sort_key;
som_section_data (section)->copy_data->is_defined = defined;
som_section_data (section)->copy_data->is_private = private;
som_section_data (section)->copy_data->container = section;
som_section_data (section)->copy_data->space_number = spnum;
- return true;
+ return TRUE;
}
/* Set backend info for subsections which can not be described
in the BFD data structures. */
-boolean
-bfd_som_set_subsection_attributes (section, container, access,
- sort_key, quadrant)
- asection *section;
- asection *container;
- int access;
- unsigned int sort_key;
- int quadrant;
+bfd_boolean
+bfd_som_set_subsection_attributes (asection *section,
+ asection *container,
+ int access_ctr,
+ unsigned int sort_key,
+ int quadrant,
+ int comdat,
+ int common,
+ int dup_common)
{
/* Allocate memory to hold the magic information. */
if (som_section_data (section)->copy_data == NULL)
{
bfd_size_type amt = sizeof (struct som_copyable_section_data_struct);
- som_section_data (section)->copy_data =
- (struct som_copyable_section_data_struct *) bfd_zalloc (section->owner,
- amt);
+
+ som_section_data (section)->copy_data = bfd_zalloc (section->owner, amt);
if (som_section_data (section)->copy_data == NULL)
- return false;
+ return FALSE;
}
som_section_data (section)->copy_data->sort_key = sort_key;
- som_section_data (section)->copy_data->access_control_bits = access;
+ som_section_data (section)->copy_data->access_control_bits = access_ctr;
som_section_data (section)->copy_data->quadrant = quadrant;
som_section_data (section)->copy_data->container = container;
- return true;
+ som_section_data (section)->copy_data->is_comdat = comdat;
+ som_section_data (section)->copy_data->is_common = common;
+ som_section_data (section)->copy_data->dup_common = dup_common;
+ return TRUE;
}
/* Set the full SOM symbol type. SOM needs far more symbol information
the symbol type wrong your program will not link. */
void
-bfd_som_set_symbol_type (symbol, type)
- asymbol *symbol;
- unsigned int type;
+bfd_som_set_symbol_type (asymbol *symbol, unsigned int type)
{
som_symbol_data (symbol)->som_type = type;
}
/* Attach an auxiliary header to the BFD backend so that it may be
written into the object file. */
-boolean
-bfd_som_attach_aux_hdr (abfd, type, string)
- bfd *abfd;
- int type;
- char *string;
+bfd_boolean
+bfd_som_attach_aux_hdr (bfd *abfd, int type, char *string)
{
bfd_size_type amt;
if (len % 4)
pad = (4 - (len % 4));
- amt = sizeof (struct aux_id) + sizeof (unsigned int) + len + pad;
- obj_som_version_hdr (abfd) =
- (struct user_string_aux_hdr *) bfd_zalloc (abfd, amt);
+ amt = sizeof (struct som_string_auxhdr) + len + pad;
+ obj_som_version_hdr (abfd) = bfd_zalloc (abfd, amt);
if (!obj_som_version_hdr (abfd))
- return false;
+ return FALSE;
obj_som_version_hdr (abfd)->header_id.type = VERSION_AUX_ID;
- obj_som_version_hdr (abfd)->header_id.length = len + pad;
- obj_som_version_hdr (abfd)->header_id.length += sizeof (int);
+ obj_som_version_hdr (abfd)->header_id.length = 4 + len + pad;
obj_som_version_hdr (abfd)->string_length = len;
- strncpy (obj_som_version_hdr (abfd)->user_string, string, len);
+ memcpy (obj_som_version_hdr (abfd)->string, string, len);
+ memset (obj_som_version_hdr (abfd)->string + len, 0, pad);
}
else if (type == COPYRIGHT_AUX_ID)
{
if (len % 4)
pad = (4 - (len % 4));
- amt = sizeof (struct aux_id) + sizeof (unsigned int) + len + pad;
- obj_som_copyright_hdr (abfd) =
- (struct copyright_aux_hdr *) bfd_zalloc (abfd, amt);
+ amt = sizeof (struct som_string_auxhdr) + len + pad;
+ obj_som_copyright_hdr (abfd) = bfd_zalloc (abfd, amt);
if (!obj_som_copyright_hdr (abfd))
- return false;
+ return FALSE;
obj_som_copyright_hdr (abfd)->header_id.type = COPYRIGHT_AUX_ID;
- obj_som_copyright_hdr (abfd)->header_id.length = len + pad;
- obj_som_copyright_hdr (abfd)->header_id.length += sizeof (int);
+ obj_som_copyright_hdr (abfd)->header_id.length = len + pad + 4;
obj_som_copyright_hdr (abfd)->string_length = len;
- strcpy (obj_som_copyright_hdr (abfd)->copyright, string);
+ memcpy (obj_som_copyright_hdr (abfd)->string, string, len);
+ memset (obj_som_copyright_hdr (abfd)->string + len, 0, pad);
}
- return true;
+ return TRUE;
}
-/* Attach an compilation unit header to the BFD backend so that it may be
+/* Attach a compilation unit header to the BFD backend so that it may be
written into the object file. */
-boolean
-bfd_som_attach_compilation_unit (abfd, name, language_name, product_id,
- version_id)
- bfd *abfd;
- const char *name;
- const char *language_name;
- const char *product_id;
- const char *version_id;
+bfd_boolean
+bfd_som_attach_compilation_unit (bfd *abfd,
+ const char *name,
+ const char *language_name,
+ const char *product_id,
+ const char *version_id)
{
- COMPUNIT *n = (COMPUNIT *) bfd_zalloc (abfd, (bfd_size_type) COMPUNITSZ);
+ struct som_compilation_unit *n;
+
+ n = (struct som_compilation_unit *) bfd_zalloc
+ (abfd, (bfd_size_type) sizeof (*n));
if (n == NULL)
- return false;
+ return FALSE;
#define STRDUP(f) \
if (f != NULL) \
{ \
- n->f.n_name = bfd_alloc (abfd, (bfd_size_type) strlen (f) + 1); \
- if (n->f.n_name == NULL) \
- return false; \
- strcpy (n->f.n_name, f); \
+ n->f.name = bfd_alloc (abfd, (bfd_size_type) strlen (f) + 1); \
+ if (n->f.name == NULL) \
+ return FALSE; \
+ strcpy (n->f.name, f); \
}
STRDUP (name);
obj_som_compilation_unit (abfd) = n;
- return true;
+ return TRUE;
}
-static boolean
-som_get_section_contents (abfd, section, location, offset, count)
- bfd *abfd;
- sec_ptr section;
- PTR location;
- file_ptr offset;
- bfd_size_type count;
+static bfd_boolean
+som_get_section_contents (bfd *abfd,
+ sec_ptr section,
+ void *location,
+ file_ptr offset,
+ bfd_size_type count)
{
if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
- return true;
- if ((bfd_size_type) (offset+count) > section->_raw_size
+ return TRUE;
+ if ((bfd_size_type) (offset+count) > section->size
|| bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
|| bfd_bread (location, count, abfd) != count)
- return (false); /* on error */
- return (true);
+ return FALSE; /* On error. */
+ return TRUE;
}
-static boolean
-som_set_section_contents (abfd, section, location, offset, count)
- bfd *abfd;
- sec_ptr section;
- PTR location;
- file_ptr offset;
- bfd_size_type count;
+static bfd_boolean
+som_set_section_contents (bfd *abfd,
+ sec_ptr section,
+ const void *location,
+ file_ptr offset,
+ bfd_size_type count)
{
- if (abfd->output_has_begun == false)
+ if (! abfd->output_has_begun)
{
/* Set up fixed parts of the file, space, and subspace headers.
Notify the world that output has begun. */
som_prep_headers (abfd);
- abfd->output_has_begun = true;
+ abfd->output_has_begun = TRUE;
/* Start writing the object file. This include all the string
tables, fixup streams, and other portions of the object file. */
som_begin_writing (abfd);
are not generated at run time by the OS). */
if (!som_is_subspace (section)
|| ((section->flags & SEC_HAS_CONTENTS) == 0))
- return true;
+ return TRUE;
/* Seek to the proper offset within the object file and write the
data. */
offset += som_section_data (section)->subspace_dict->file_loc_init_value;
if (bfd_seek (abfd, offset, SEEK_SET) != 0)
- return false;
+ return FALSE;
- if (bfd_bwrite ((PTR) location, count, abfd) != count)
- return false;
- return true;
+ if (bfd_bwrite (location, count, abfd) != count)
+ return FALSE;
+ return TRUE;
}
-static boolean
-som_set_arch_mach (abfd, arch, machine)
- bfd *abfd;
- enum bfd_architecture arch;
- unsigned long machine;
+static bfd_boolean
+som_set_arch_mach (bfd *abfd,
+ enum bfd_architecture arch,
+ unsigned long machine)
{
/* Allow any architecture to be supported by the SOM backend. */
return bfd_default_set_arch_mach (abfd, arch, machine);
}
-static boolean
-som_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
- functionname_ptr, line_ptr)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *section ATTRIBUTE_UNUSED;
- asymbol **symbols ATTRIBUTE_UNUSED;
- bfd_vma offset ATTRIBUTE_UNUSED;
- const char **filename_ptr ATTRIBUTE_UNUSED;
- const char **functionname_ptr ATTRIBUTE_UNUSED;
- unsigned int *line_ptr ATTRIBUTE_UNUSED;
+static bfd_boolean
+som_find_nearest_line (bfd *abfd,
+ asection *section,
+ asymbol **symbols,
+ bfd_vma offset,
+ const char **filename_ptr,
+ const char **functionname_ptr,
+ unsigned int *line_ptr)
{
- return (false);
+ bfd_boolean found;
+ asymbol *func;
+ bfd_vma low_func;
+ asymbol **p;
+
+ if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
+ & found, filename_ptr,
+ functionname_ptr, line_ptr,
+ & somdata (abfd).line_info))
+ return FALSE;
+
+ if (found)
+ return TRUE;
+
+ if (symbols == NULL)
+ return FALSE;
+
+ /* Fallback: find function name from symbols table. */
+ func = NULL;
+ low_func = 0;
+
+ for (p = symbols; *p != NULL; p++)
+ {
+ som_symbol_type *q = (som_symbol_type *) *p;
+
+ if (q->som_type == SYMBOL_TYPE_ENTRY
+ && q->symbol.section == section
+ && q->symbol.value >= low_func
+ && q->symbol.value <= offset)
+ {
+ func = (asymbol *) q;
+ low_func = q->symbol.value;
+ }
+ }
+
+ if (func == NULL)
+ return FALSE;
+
+ *filename_ptr = NULL;
+ *functionname_ptr = bfd_asymbol_name (func);
+ *line_ptr = 0;
+
+ return TRUE;
}
static int
-som_sizeof_headers (abfd, reloc)
- bfd *abfd ATTRIBUTE_UNUSED;
- boolean reloc ATTRIBUTE_UNUSED;
+som_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
(*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
- fflush (stderr);
abort ();
- return (0);
+ return 0;
}
/* Return the single-character symbol type corresponding to
SOM section S, or '?' for an unknown SOM section. */
static char
-som_section_type (s)
- const char *s;
+som_section_type (const char *s)
{
const struct section_to_type *t;
}
static int
-som_decode_symclass (symbol)
- asymbol *symbol;
+som_decode_symclass (asymbol *symbol)
{
char c;
if (bfd_is_com_section (symbol->section))
return 'C';
if (bfd_is_und_section (symbol->section))
- return 'U';
+ {
+ if (symbol->flags & BSF_WEAK)
+ {
+ /* If weak, determine if it's specifically an object
+ or non-object weak. */
+ if (symbol->flags & BSF_OBJECT)
+ return 'v';
+ else
+ return 'w';
+ }
+ else
+ return 'U';
+ }
if (bfd_is_ind_section (symbol->section))
return 'I';
if (symbol->flags & BSF_WEAK)
- return 'W';
+ {
+ /* If weak, determine if it's specifically an object
+ or non-object weak. */
+ if (symbol->flags & BSF_OBJECT)
+ return 'V';
+ else
+ return 'W';
+ }
if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
return '?';
/* Return information about SOM symbol SYMBOL in RET. */
static void
-som_get_symbol_info (ignore_abfd, symbol, ret)
- bfd *ignore_abfd ATTRIBUTE_UNUSED;
- asymbol *symbol;
- symbol_info *ret;
+som_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+ asymbol *symbol,
+ symbol_info *ret)
{
ret->type = som_decode_symclass (symbol);
if (ret->type != 'U')
/* Count the number of symbols in the archive symbol table. Necessary
so that we can allocate space for all the carsyms at once. */
-static boolean
-som_bfd_count_ar_symbols (abfd, lst_header, count)
- bfd *abfd;
- struct lst_header *lst_header;
- symindex *count;
+static bfd_boolean
+som_bfd_count_ar_symbols (bfd *abfd,
+ struct som_lst_header *lst_header,
+ symindex *count)
{
unsigned int i;
- unsigned int *hash_table = NULL;
+ unsigned char *hash_table;
bfd_size_type amt;
- file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
+ file_ptr lst_filepos;
- amt = lst_header->hash_size;
- amt *= sizeof (unsigned int);
- hash_table = (unsigned int *) bfd_malloc (amt);
- if (hash_table == NULL && lst_header->hash_size != 0)
+ lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
+
+ amt = lst_header->hash_size * 4;
+ hash_table = bfd_malloc (amt);
+ if (hash_table == NULL && amt != 0)
goto error_return;
/* Don't forget to initialize the counter! */
/* Read in the hash table. The has table is an array of 32bit file offsets
which point to the hash chains. */
- if (bfd_bread ((PTR) hash_table, amt, abfd) != amt)
+ if (bfd_bread ((void *) hash_table, amt, abfd) != amt)
goto error_return;
/* Walk each chain counting the number of symbols found on that particular
chain. */
for (i = 0; i < lst_header->hash_size; i++)
{
- struct lst_symbol_record lst_symbol;
+ struct som_external_lst_symbol_record ext_lst_symbol;
+ unsigned int hash_val = bfd_getb32 (hash_table + 4 * i);
/* An empty chain has zero as it's file offset. */
- if (hash_table[i] == 0)
+ if (hash_val == 0)
continue;
/* Seek to the first symbol in this hash chain. */
- if (bfd_seek (abfd, lst_filepos + hash_table[i], SEEK_SET) != 0)
+ if (bfd_seek (abfd, lst_filepos + hash_val, SEEK_SET) != 0)
goto error_return;
/* Read in this symbol and update the counter. */
- amt = sizeof (lst_symbol);
- if (bfd_bread ((PTR) &lst_symbol, amt, abfd) != amt)
+ amt = sizeof (ext_lst_symbol);
+ if (bfd_bread ((void *) &ext_lst_symbol, amt, abfd) != amt)
goto error_return;
(*count)++;
/* Now iterate through the rest of the symbols on this chain. */
- while (lst_symbol.next_entry)
+ while (1)
{
+ unsigned int next_entry = bfd_getb32 (ext_lst_symbol.next_entry);
+
+ if (next_entry == 0)
+ break;
/* Seek to the next symbol. */
- if (bfd_seek (abfd, lst_filepos + lst_symbol.next_entry, SEEK_SET)
- != 0)
+ if (bfd_seek (abfd, lst_filepos + next_entry, SEEK_SET) != 0)
goto error_return;
/* Read the symbol in and update the counter. */
- amt = sizeof (lst_symbol);
- if (bfd_bread ((PTR) &lst_symbol, amt, abfd) != amt)
+ amt = sizeof (ext_lst_symbol);
+ if (bfd_bread ((void *) &ext_lst_symbol, amt, abfd) != amt)
goto error_return;
(*count)++;
}
if (hash_table != NULL)
free (hash_table);
- return true;
+ return TRUE;
error_return:
if (hash_table != NULL)
free (hash_table);
- return false;
+ return FALSE;
}
/* Fill in the canonical archive symbols (SYMS) from the archive described
by ABFD and LST_HEADER. */
-static boolean
-som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
- bfd *abfd;
- struct lst_header *lst_header;
- carsym **syms;
+static bfd_boolean
+som_bfd_fill_in_ar_symbols (bfd *abfd,
+ struct som_lst_header *lst_header,
+ carsym **syms)
{
- unsigned int i, len;
+ unsigned int i;
carsym *set = syms[0];
- unsigned int *hash_table = NULL;
- struct som_entry *som_dict = NULL;
+ unsigned char *hash_table;
+ struct som_external_som_entry *som_dict = NULL;
bfd_size_type amt;
- file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
+ file_ptr lst_filepos;
+ unsigned int string_loc;
- amt = lst_header->hash_size;
- amt *= sizeof (unsigned int);
- hash_table = (unsigned int *) bfd_malloc (amt);
- if (hash_table == NULL && lst_header->hash_size != 0)
+ lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
+ amt = lst_header->hash_size * 4;
+ hash_table = bfd_malloc (amt);
+ if (hash_table == NULL && amt != 0)
goto error_return;
/* Read in the hash table. The has table is an array of 32bit file offsets
which point to the hash chains. */
- if (bfd_bread ((PTR) hash_table, amt, abfd) != amt)
+ if (bfd_bread ((void *) hash_table, amt, abfd) != amt)
goto error_return;
/* Seek to and read in the SOM dictionary. We will need this to fill
if (bfd_seek (abfd, lst_filepos + lst_header->dir_loc, SEEK_SET) != 0)
goto error_return;
- amt = lst_header->module_count;
- amt *= sizeof (struct som_entry);
- som_dict = (struct som_entry *) bfd_malloc (amt);
- if (som_dict == NULL && lst_header->module_count != 0)
+ amt = lst_header->module_count * sizeof (struct som_external_som_entry);
+ som_dict = bfd_malloc (amt);
+ if (som_dict == NULL && amt != 0)
goto error_return;
- if (bfd_bread ((PTR) som_dict, amt, abfd) != amt)
+ if (bfd_bread ((void *) som_dict, amt, abfd) != amt)
goto error_return;
+ string_loc = lst_header->string_loc;
+
/* Walk each chain filling in the carsyms as we go along. */
for (i = 0; i < lst_header->hash_size; i++)
{
- struct lst_symbol_record lst_symbol;
+ struct som_external_lst_symbol_record lst_symbol;
+ unsigned int hash_val;
+ unsigned int len;
+ unsigned char ext_len[4];
/* An empty chain has zero as it's file offset. */
- if (hash_table[i] == 0)
+ hash_val = bfd_getb32 (hash_table + 4 * i);
+ if (hash_val == 0)
continue;
/* Seek to and read the first symbol on the chain. */
- if (bfd_seek (abfd, lst_filepos + hash_table[i], SEEK_SET) != 0)
+ if (bfd_seek (abfd, lst_filepos + hash_val, SEEK_SET) != 0)
goto error_return;
amt = sizeof (lst_symbol);
- if (bfd_bread ((PTR) &lst_symbol, amt, abfd) != amt)
+ if (bfd_bread ((void *) &lst_symbol, amt, abfd) != amt)
goto error_return;
/* Get the name of the symbol, first get the length which is stored
and index into it. Well, according to the SOM ABI the string
index can point *anywhere* in the archive to save space, so just
using the string table would not be safe. */
- if (bfd_seek (abfd, lst_filepos + lst_header->string_loc
- + lst_symbol.name.n_strx - 4, SEEK_SET) != 0)
+ if (bfd_seek (abfd, (lst_filepos + string_loc
+ + bfd_getb32 (lst_symbol.name) - 4), SEEK_SET) != 0)
goto error_return;
- if (bfd_bread (&len, (bfd_size_type) 4, abfd) != 4)
+ if (bfd_bread (&ext_len, (bfd_size_type) 4, abfd) != 4)
goto error_return;
+ len = bfd_getb32 (ext_len);
/* Allocate space for the name and null terminate it too. */
set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
/* Fill in the file offset. Note that the "location" field points
to the SOM itself, not the ar_hdr in front of it. */
- set->file_offset = som_dict[lst_symbol.som_index].location
- - sizeof (struct ar_hdr);
+ set->file_offset =
+ bfd_getb32 (som_dict[bfd_getb32 (lst_symbol.som_index)].location)
+ - sizeof (struct ar_hdr);
/* Go to the next symbol. */
set++;
/* Iterate through the rest of the chain. */
- while (lst_symbol.next_entry)
+ while (1)
{
+ unsigned int next_entry = bfd_getb32 (lst_symbol.next_entry);
+
+ if (next_entry == 0)
+ break;
+
/* Seek to the next symbol and read it in. */
- if (bfd_seek (abfd, lst_filepos + lst_symbol.next_entry, SEEK_SET)
- != 0)
+ if (bfd_seek (abfd, lst_filepos + next_entry, SEEK_SET) != 0)
goto error_return;
amt = sizeof (lst_symbol);
- if (bfd_bread ((PTR) &lst_symbol, amt, abfd) != amt)
+ if (bfd_bread ((void *) &lst_symbol, amt, abfd) != amt)
goto error_return;
/* Seek to the name length & string and read them in. */
- if (bfd_seek (abfd, lst_filepos + lst_header->string_loc
- + lst_symbol.name.n_strx - 4, SEEK_SET) != 0)
+ if (bfd_seek (abfd, lst_filepos + string_loc
+ + bfd_getb32 (lst_symbol.name) - 4, SEEK_SET) != 0)
goto error_return;
- if (bfd_bread (&len, (bfd_size_type) 4, abfd) != 4)
+ if (bfd_bread (&ext_len, (bfd_size_type) 4, abfd) != 4)
goto error_return;
+ len = bfd_getb32 (ext_len);
/* Allocate space for the name and null terminate it too. */
set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
/* Fill in the file offset. Note that the "location" field points
to the SOM itself, not the ar_hdr in front of it. */
- set->file_offset = som_dict[lst_symbol.som_index].location
- - sizeof (struct ar_hdr);
+ set->file_offset =
+ bfd_getb32 (som_dict[bfd_getb32 (lst_symbol.som_index)].location)
+ - sizeof (struct ar_hdr);
/* Go on to the next symbol. */
set++;
free (hash_table);
if (som_dict != NULL)
free (som_dict);
- return true;
+ return TRUE;
error_return:
if (hash_table != NULL)
free (hash_table);
if (som_dict != NULL)
free (som_dict);
- return false;
+ return FALSE;
}
/* Read in the LST from the archive. */
-static boolean
-som_slurp_armap (abfd)
- bfd *abfd;
+static bfd_boolean
+som_slurp_armap (bfd *abfd)
{
- struct lst_header lst_header;
+ struct som_external_lst_header ext_lst_header;
+ struct som_lst_header lst_header;
struct ar_hdr ar_header;
unsigned int parsed_size;
struct artdata *ardata = bfd_ardata (abfd);
char nextname[17];
bfd_size_type amt = 16;
- int i = bfd_bread ((PTR) nextname, amt, abfd);
+ int i = bfd_bread ((void *) nextname, amt, abfd);
/* Special cases. */
if (i == 0)
- return true;
+ return TRUE;
if (i != 16)
- return false;
+ return FALSE;
if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
- return false;
+ return FALSE;
/* For archives without .o files there is no symbol table. */
- if (strncmp (nextname, "/ ", 16))
+ if (! CONST_STRNEQ (nextname, "/ "))
{
- bfd_has_map (abfd) = false;
- return true;
+ bfd_has_map (abfd) = FALSE;
+ return TRUE;
}
/* Read in and sanity check the archive header. */
amt = sizeof (struct ar_hdr);
- if (bfd_bread ((PTR) &ar_header, amt, abfd) != amt)
- return false;
+ if (bfd_bread ((void *) &ar_header, amt, abfd) != amt)
+ return FALSE;
if (strncmp (ar_header.ar_fmag, ARFMAG, 2))
{
bfd_set_error (bfd_error_malformed_archive);
- return false;
+ return FALSE;
}
/* How big is the archive symbol table entry? */
if (errno != 0)
{
bfd_set_error (bfd_error_malformed_archive);
- return false;
+ return FALSE;
}
/* Save off the file offset of the first real user data. */
/* Read in the library symbol table. We'll make heavy use of this
in just a minute. */
- amt = sizeof (struct lst_header);
- if (bfd_bread ((PTR) &lst_header, amt, abfd) != amt)
- return false;
+ amt = sizeof (struct som_external_lst_header);
+ if (bfd_bread ((void *) &ext_lst_header, amt, abfd) != amt)
+ return FALSE;
+
+ som_swap_lst_header_in (&ext_lst_header, &lst_header);
/* Sanity check. */
if (lst_header.a_magic != LIBMAGIC)
{
bfd_set_error (bfd_error_malformed_archive);
- return false;
+ return FALSE;
}
/* Count the number of symbols in the library symbol table. */
- if (som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count)
- == false)
- return false;
+ if (! som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count))
+ return FALSE;
/* Get back to the start of the library symbol table. */
if (bfd_seek (abfd, (ardata->first_file_filepos - parsed_size
- + sizeof (struct lst_header)), SEEK_SET) != 0)
- return false;
+ + sizeof (struct som_external_lst_header)),
+ SEEK_SET) != 0)
+ return FALSE;
- /* Initializae the cache and allocate space for the library symbols. */
+ /* Initialize the cache and allocate space for the library symbols. */
ardata->cache = 0;
amt = ardata->symdef_count;
amt *= sizeof (carsym);
- ardata->symdefs = (carsym *) bfd_alloc (abfd, amt);
+ ardata->symdefs = bfd_alloc (abfd, amt);
if (!ardata->symdefs)
- return false;
+ return FALSE;
/* Now fill in the canonical archive symbols. */
- if (som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs)
- == false)
- return false;
+ if (! som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs))
+ return FALSE;
/* Seek back to the "first" file in the archive. Note the "first"
file may be the extended name table. */
if (bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET) != 0)
- return false;
+ return FALSE;
/* Notify the generic archive code that we have a symbol map. */
- bfd_has_map (abfd) = true;
- return true;
+ bfd_has_map (abfd) = TRUE;
+ return TRUE;
}
/* Begin preparing to write a SOM library symbol table.
As part of the prep work we need to determine the number of symbols
and the size of the associated string section. */
-static boolean
-som_bfd_prep_for_ar_write (abfd, num_syms, stringsize)
- bfd *abfd;
- unsigned int *num_syms, *stringsize;
+static bfd_boolean
+som_bfd_prep_for_ar_write (bfd *abfd,
+ unsigned int *num_syms,
+ unsigned int *stringsize)
{
bfd *curr_bfd = abfd->archive_head;
if (curr_bfd->format != bfd_object
|| curr_bfd->xvec->flavour != bfd_target_som_flavour)
{
- curr_bfd = curr_bfd->next;
+ curr_bfd = curr_bfd->archive_next;
continue;
}
/* Make sure the symbol table has been read, then snag a pointer
to it. It's a little slimey to grab the symbols via obj_som_symtab,
but doing so avoids allocating lots of extra memory. */
- if (som_slurp_symbol_table (curr_bfd) == false)
- return false;
+ if (! som_slurp_symbol_table (curr_bfd))
+ return FALSE;
sym = obj_som_symtab (curr_bfd);
curr_count = bfd_get_symcount (curr_bfd);
/* Bump the various counters, being careful to honor
alignment considerations in the string table. */
(*num_syms)++;
- *stringsize = *stringsize + strlen (sym->symbol.name) + 5;
+ *stringsize += strlen (sym->symbol.name) + 5;
while (*stringsize % 4)
(*stringsize)++;
}
- curr_bfd = curr_bfd->next;
+ curr_bfd = curr_bfd->archive_next;
}
- return true;
+ return TRUE;
}
/* Hash a symbol name based on the hashing algorithm presented in the
SOM ABI. */
static unsigned int
-som_bfd_ar_symbol_hash (symbol)
- asymbol *symbol;
+som_bfd_ar_symbol_hash (asymbol *symbol)
{
unsigned int len = strlen (symbol->name);
/* Do the bulk of the work required to write the SOM library
symbol table. */
-static boolean
-som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
- bfd *abfd;
- unsigned int nsyms, string_size;
- struct lst_header lst;
- unsigned elength;
+static bfd_boolean
+som_bfd_ar_write_symbol_stuff (bfd *abfd,
+ unsigned int nsyms,
+ unsigned int string_size,
+ struct som_external_lst_header lst,
+ unsigned elength)
{
- file_ptr lst_filepos;
char *strings = NULL, *p;
- struct lst_symbol_record *lst_syms = NULL, *curr_lst_sym;
+ struct som_external_lst_symbol_record *lst_syms = NULL, *curr_lst_sym;
bfd *curr_bfd;
- unsigned int *hash_table = NULL;
- struct som_entry *som_dict = NULL;
- struct lst_symbol_record **last_hash_entry = NULL;
+ unsigned char *hash_table = NULL;
+ struct som_external_som_entry *som_dict = NULL;
+ struct som_external_lst_symbol_record **last_hash_entry = NULL;
unsigned int curr_som_offset, som_index = 0;
bfd_size_type amt;
+ unsigned int module_count;
+ unsigned int hash_size;
- amt = lst.hash_size;
- amt *= sizeof (unsigned int);
- hash_table = (unsigned int *) bfd_malloc (amt);
- if (hash_table == NULL && lst.hash_size != 0)
+ hash_size = bfd_getb32 (lst.hash_size);
+ amt = hash_size * 4;
+ hash_table = bfd_zmalloc (amt);
+ if (hash_table == NULL && hash_size != 0)
goto error_return;
- amt = lst.module_count;
- amt *= sizeof (struct som_entry);
- som_dict = (struct som_entry *) bfd_malloc (amt);
- if (som_dict == NULL && lst.module_count != 0)
+ module_count = bfd_getb32 (lst.module_count);
+ amt = module_count * sizeof (struct som_external_som_entry);
+ som_dict = bfd_zmalloc (amt);
+ if (som_dict == NULL && module_count != 0)
goto error_return;
- amt = lst.hash_size;
- amt *= sizeof (struct lst_symbol_record *);
- last_hash_entry = ((struct lst_symbol_record **) bfd_malloc (amt));
- if (last_hash_entry == NULL && lst.hash_size != 0)
+ amt = hash_size * sizeof (struct som_external_lst_symbol_record *);
+ last_hash_entry = bfd_zmalloc (amt);
+ if (last_hash_entry == NULL && hash_size != 0)
goto error_return;
- /* Lots of fields are file positions relative to the start
- of the lst record. So save its location. */
- lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
-
- /* Some initialization. */
- memset (hash_table, 0, 4 * lst.hash_size);
- memset (som_dict, 0, lst.module_count * sizeof (struct som_entry));
- memset (last_hash_entry, 0,
- lst.hash_size * sizeof (struct lst_symbol_record *));
-
/* Symbols have som_index fields, so we have to keep track of the
index of each SOM in the archive.
/* We add in the size of the archive header twice as the location
in the SOM dictionary is the actual offset of the SOM, not the
archive header before the SOM. */
- curr_som_offset = 8 + 2 * sizeof (struct ar_hdr) + lst.file_end;
+ curr_som_offset = 8 + 2 * sizeof (struct ar_hdr) + bfd_getb32 (lst.file_end);
/* Make room for the archive header and the contents of the
extended string table. Note that elength includes the size
/* FIXME should be done with buffers just like everything else... */
amt = nsyms;
- amt *= sizeof (struct lst_symbol_record);
+ amt *= sizeof (struct som_external_lst_symbol_record);
lst_syms = bfd_malloc (amt);
if (lst_syms == NULL && nsyms != 0)
goto error_return;
if (curr_bfd->format != bfd_object
|| curr_bfd->xvec->flavour != bfd_target_som_flavour)
{
- curr_bfd = curr_bfd->next;
+ curr_bfd = curr_bfd->archive_next;
continue;
}
/* Make sure the symbol table has been read, then snag a pointer
to it. It's a little slimey to grab the symbols via obj_som_symtab,
but doing so avoids allocating lots of extra memory. */
- if (som_slurp_symbol_table (curr_bfd) == false)
+ if (! som_slurp_symbol_table (curr_bfd))
goto error_return;
sym = obj_som_symtab (curr_bfd);
for (i = 0; i < curr_count; i++, sym++)
{
struct som_misc_symbol_info info;
+ struct som_external_lst_symbol_record *last;
+ unsigned int symbol_pos;
+ unsigned int slen;
+ unsigned int symbol_key;
+ unsigned int flags;
/* Derive SOM information from the BFD symbol. */
som_bfd_derive_misc_symbol_info (curr_bfd, &sym->symbol, &info);
/* If this is the first symbol from this SOM, then update
the SOM dictionary too. */
- if (som_dict[som_index].location == 0)
+ if (bfd_getb32 (som_dict[som_index].location) == 0)
{
- som_dict[som_index].location = curr_som_offset;
- som_dict[som_index].length = arelt_size (curr_bfd);
+ bfd_putb32 (curr_som_offset, som_dict[som_index].location);
+ bfd_putb32 (arelt_size (curr_bfd), som_dict[som_index].length);
}
+ symbol_key = som_bfd_ar_symbol_hash (&sym->symbol);
+
/* Fill in the lst symbol record. */
- curr_lst_sym->hidden = 0;
- curr_lst_sym->secondary_def = info.secondary_def;
- curr_lst_sym->symbol_type = info.symbol_type;
- curr_lst_sym->symbol_scope = info.symbol_scope;
- curr_lst_sym->check_level = 0;
- curr_lst_sym->must_qualify = 0;
- curr_lst_sym->initially_frozen = 0;
- curr_lst_sym->memory_resident = 0;
- curr_lst_sym->is_common = bfd_is_com_section (sym->symbol.section);
- curr_lst_sym->dup_common = 0;
- curr_lst_sym->xleast = 3;
- curr_lst_sym->arg_reloc = info.arg_reloc;
- curr_lst_sym->name.n_strx = p - strings + 4;
- curr_lst_sym->qualifier_name.n_strx = 0;
- curr_lst_sym->symbol_info = info.symbol_info;
- curr_lst_sym->symbol_value = info.symbol_value | info.priv_level;
- curr_lst_sym->symbol_descriptor = 0;
- curr_lst_sym->reserved = 0;
- curr_lst_sym->som_index = som_index;
- curr_lst_sym->symbol_key = som_bfd_ar_symbol_hash (&sym->symbol);
- curr_lst_sym->next_entry = 0;
+ flags = 0;
+ if (info.secondary_def)
+ flags |= LST_SYMBOL_SECONDARY_DEF;
+ flags |= info.symbol_type << LST_SYMBOL_SYMBOL_TYPE_SH;
+ flags |= info.symbol_scope << LST_SYMBOL_SYMBOL_SCOPE_SH;
+ if (bfd_is_com_section (sym->symbol.section))
+ flags |= LST_SYMBOL_IS_COMMON;
+ if (info.dup_common)
+ flags |= LST_SYMBOL_DUP_COMMON;
+ flags |= 3 << LST_SYMBOL_XLEAST_SH;
+ flags |= info.arg_reloc << LST_SYMBOL_ARG_RELOC_SH;
+ bfd_putb32 (flags, curr_lst_sym->flags);
+ bfd_putb32 (p - strings + 4, curr_lst_sym->name);
+ bfd_putb32 (0, curr_lst_sym->qualifier_name);
+ bfd_putb32 (info.symbol_info, curr_lst_sym->symbol_info);
+ bfd_putb32 (info.symbol_value | info.priv_level,
+ curr_lst_sym->symbol_value);
+ bfd_putb32 (0, curr_lst_sym->symbol_descriptor);
+ curr_lst_sym->reserved = 0;
+ bfd_putb32 (som_index, curr_lst_sym->som_index);
+ bfd_putb32 (symbol_key, curr_lst_sym->symbol_key);
+ bfd_putb32 (0, curr_lst_sym->next_entry);
/* Insert into the hash table. */
- if (hash_table[curr_lst_sym->symbol_key % lst.hash_size])
+ symbol_pos =
+ (curr_lst_sym - lst_syms)
+ * sizeof (struct som_external_lst_symbol_record)
+ + hash_size * 4
+ + module_count * sizeof (struct som_external_som_entry)
+ + sizeof (struct som_external_lst_header);
+ last = last_hash_entry[symbol_key % hash_size];
+ if (last != NULL)
{
- struct lst_symbol_record *tmp;
-
/* There is already something at the head of this hash chain,
so tack this symbol onto the end of the chain. */
- tmp = last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size];
- tmp->next_entry
- = (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
- + lst.hash_size * 4
- + lst.module_count * sizeof (struct som_entry)
- + sizeof (struct lst_header);
+ bfd_putb32 (symbol_pos, last->next_entry);
}
else
- {
- /* First entry in this hash chain. */
- hash_table[curr_lst_sym->symbol_key % lst.hash_size]
- = (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
- + lst.hash_size * 4
- + lst.module_count * sizeof (struct som_entry)
- + sizeof (struct lst_header);
- }
+ /* First entry in this hash chain. */
+ bfd_putb32 (symbol_pos, hash_table + 4 * (symbol_key % hash_size));
/* Keep track of the last symbol we added to this chain so we can
easily update its next_entry pointer. */
- last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size]
- = curr_lst_sym;
+ last_hash_entry[symbol_key % hash_size] = curr_lst_sym;
/* Update the string table. */
- bfd_put_32 (abfd, strlen (sym->symbol.name), p);
+ slen = strlen (sym->symbol.name);
+ bfd_put_32 (abfd, slen, p);
p += 4;
- strcpy (p, sym->symbol.name);
- p += strlen (sym->symbol.name) + 1;
- while ((int) p % 4)
+ slen++; /* Nul terminator. */
+ memcpy (p, sym->symbol.name, slen);
+ p += slen;
+ while (slen % 4)
{
bfd_put_8 (abfd, 0, p);
p++;
+ slen++;
}
+ BFD_ASSERT (p <= strings + string_size);
/* Head to the next symbol. */
curr_lst_sym++;
linker requires objects begin on an even boundary. So round
up the current offset as necessary. */
curr_som_offset = (curr_som_offset + 0x1) &~ (unsigned) 1;
- curr_bfd = curr_bfd->next;
+ curr_bfd = curr_bfd->archive_next;
som_index++;
}
/* Now scribble out the hash table. */
- amt = lst.hash_size * 4;
- if (bfd_bwrite ((PTR) hash_table, amt, abfd) != amt)
+ amt = hash_size * 4;
+ if (bfd_bwrite ((void *) hash_table, amt, abfd) != amt)
goto error_return;
/* Then the SOM dictionary. */
- amt = lst.module_count * sizeof (struct som_entry);
- if (bfd_bwrite ((PTR) som_dict, amt, abfd) != amt)
+ amt = module_count * sizeof (struct som_external_som_entry);
+ if (bfd_bwrite ((void *) som_dict, amt, abfd) != amt)
goto error_return;
/* The library symbols. */
- amt = nsyms * sizeof (struct lst_symbol_record);
- if (bfd_bwrite ((PTR) lst_syms, amt, abfd) != amt)
+ amt = nsyms * sizeof (struct som_external_lst_symbol_record);
+ if (bfd_bwrite ((void *) lst_syms, amt, abfd) != amt)
goto error_return;
/* And finally the strings. */
amt = string_size;
- if (bfd_bwrite ((PTR) strings, amt, abfd) != amt)
+ if (bfd_bwrite ((void *) strings, amt, abfd) != amt)
goto error_return;
if (hash_table != NULL)
free (lst_syms);
if (strings != NULL)
free (strings);
- return true;
+ return TRUE;
error_return:
if (hash_table != NULL)
if (strings != NULL)
free (strings);
- return false;
+ return FALSE;
}
/* Write out the LST for the archive.
You'll never believe this is really how armaps are handled in SOM... */
-static boolean
-som_write_armap (abfd, elength, map, orl_count, stridx)
- bfd *abfd;
- unsigned int elength;
- struct orl *map ATTRIBUTE_UNUSED;
- unsigned int orl_count ATTRIBUTE_UNUSED;
- int stridx ATTRIBUTE_UNUSED;
+static bfd_boolean
+som_write_armap (bfd *abfd,
+ unsigned int elength,
+ struct orl *map ATTRIBUTE_UNUSED,
+ unsigned int orl_count ATTRIBUTE_UNUSED,
+ int stridx ATTRIBUTE_UNUSED)
{
bfd *curr_bfd;
struct stat statbuf;
unsigned int i, lst_size, nsyms, stringsize;
struct ar_hdr hdr;
- struct lst_header lst;
- int *p;
+ struct som_external_lst_header lst;
+ unsigned char *p;
bfd_size_type amt;
+ unsigned int csum;
+ unsigned int module_count;
/* We'll use this for the archive's date and mode later. */
if (stat (abfd->filename, &statbuf) != 0)
{
bfd_set_error (bfd_error_system_call);
- return false;
+ return FALSE;
}
/* Fudge factor. */
bfd_ardata (abfd)->armap_timestamp = statbuf.st_mtime + 60;
/* Account for the lst header first. */
- lst_size = sizeof (struct lst_header);
+ lst_size = sizeof (struct som_external_lst_header);
/* Start building the LST header. */
/* FIXME: Do we need to examine each element to determine the
largest id number? */
- lst.system_id = CPU_PA_RISC1_0;
- lst.a_magic = LIBMAGIC;
- lst.version_id = VERSION_ID;
- lst.file_time.secs = 0;
- lst.file_time.nanosecs = 0;
+ bfd_putb16 (CPU_PA_RISC1_0, &lst.system_id);
+ bfd_putb16 (LIBMAGIC, &lst.a_magic);
+ bfd_putb32 (VERSION_ID, &lst.version_id);
+ bfd_putb32 (0, &lst.file_time.secs);
+ bfd_putb32 (0, &lst.file_time.nanosecs);
- lst.hash_loc = lst_size;
- lst.hash_size = SOM_LST_HASH_SIZE;
+ bfd_putb32 (lst_size, &lst.hash_loc);
+ bfd_putb32 (SOM_LST_HASH_SIZE, &lst.hash_size);
/* Hash table is a SOM_LST_HASH_SIZE 32bit offsets. */
lst_size += 4 * SOM_LST_HASH_SIZE;
/* We need to count the number of SOMs in this archive. */
curr_bfd = abfd->archive_head;
- lst.module_count = 0;
+ module_count = 0;
while (curr_bfd != NULL)
{
/* Only true SOM objects count. */
if (curr_bfd->format == bfd_object
&& curr_bfd->xvec->flavour == bfd_target_som_flavour)
- lst.module_count++;
- curr_bfd = curr_bfd->next;
+ module_count++;
+ curr_bfd = curr_bfd->archive_next;
}
- lst.module_limit = lst.module_count;
- lst.dir_loc = lst_size;
- lst_size += sizeof (struct som_entry) * lst.module_count;
+ bfd_putb32 (module_count, &lst.module_count);
+ bfd_putb32 (module_count, &lst.module_limit);
+ bfd_putb32 (lst_size, &lst.dir_loc);
+ lst_size += sizeof (struct som_external_som_entry) * module_count;
/* We don't support import/export tables, auxiliary headers,
or free lists yet. Make the linker work a little harder
to make our life easier. */
- lst.export_loc = 0;
- lst.export_count = 0;
- lst.import_loc = 0;
- lst.aux_loc = 0;
- lst.aux_size = 0;
+ bfd_putb32 (0, &lst.export_loc);
+ bfd_putb32 (0, &lst.export_count);
+ bfd_putb32 (0, &lst.import_loc);
+ bfd_putb32 (0, &lst.aux_loc);
+ bfd_putb32 (0, &lst.aux_size);
/* Count how many symbols we will have on the hash chains and the
size of the associated string table. */
- if (som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize) == false)
- return false;
+ if (! som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize))
+ return FALSE;
- lst_size += sizeof (struct lst_symbol_record) * nsyms;
+ lst_size += sizeof (struct som_external_lst_symbol_record) * nsyms;
/* For the string table. One day we might actually use this info
to avoid small seeks/reads when reading archives. */
- lst.string_loc = lst_size;
- lst.string_size = stringsize;
+ bfd_putb32 (lst_size, &lst.string_loc);
+ bfd_putb32 (stringsize, &lst.string_size);
lst_size += stringsize;
/* SOM ABI says this must be zero. */
- lst.free_list = 0;
- lst.file_end = lst_size;
+ bfd_putb32 (0, &lst.free_list);
+ bfd_putb32 (lst_size, &lst.file_end);
/* Compute the checksum. Must happen after the entire lst header
has filled in. */
- p = (int *) &lst;
- lst.checksum = 0;
- for (i = 0; i < sizeof (struct lst_header) / sizeof (int) - 1; i++)
- lst.checksum ^= *p++;
-
- sprintf (hdr.ar_name, "/ ");
- sprintf (hdr.ar_date, "%ld", bfd_ardata (abfd)->armap_timestamp);
- sprintf (hdr.ar_uid, "%ld", (long) getuid ());
- sprintf (hdr.ar_gid, "%ld", (long) getgid ());
- sprintf (hdr.ar_mode, "%-8o", (unsigned int) statbuf.st_mode);
- sprintf (hdr.ar_size, "%-10d", (int) lst_size);
+ p = (unsigned char *) &lst;
+ csum = 0;
+ for (i = 0; i < sizeof (struct som_external_lst_header) - sizeof (int);
+ i += 4)
+ csum ^= bfd_getb32 (&p[i]);
+ bfd_putb32 (csum, &lst.checksum);
+
+ sprintf (hdr.ar_name, "/ ");
+ _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%-12ld",
+ bfd_ardata (abfd)->armap_timestamp);
+ _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld",
+ statbuf.st_uid);
+ _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld",
+ statbuf.st_gid);
+ _bfd_ar_spacepad (hdr.ar_mode, sizeof (hdr.ar_mode), "%-8o",
+ (unsigned int)statbuf.st_mode);
+ _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10d",
+ (int) lst_size);
hdr.ar_fmag[0] = '`';
hdr.ar_fmag[1] = '\012';
/* Scribble out the ar header. */
amt = sizeof (struct ar_hdr);
- if (bfd_bwrite ((PTR) &hdr, amt, abfd) != amt)
- return false;
+ if (bfd_bwrite ((void *) &hdr, amt, abfd) != amt)
+ return FALSE;
/* Now scribble out the lst header. */
- amt = sizeof (struct lst_header);
- if (bfd_bwrite ((PTR) &lst, amt, abfd) != amt)
- return false;
+ amt = sizeof (struct som_external_lst_header);
+ if (bfd_bwrite ((void *) &lst, amt, abfd) != amt)
+ return FALSE;
/* Build and write the armap. */
if (!som_bfd_ar_write_symbol_stuff (abfd, nsyms, stringsize, lst, elength))
- return false;
+ return FALSE;
/* Done. */
- return true;
+ return TRUE;
}
/* Free all information we have cached for this BFD. We can always
read it again later if we need it. */
-static boolean
-som_bfd_free_cached_info (abfd)
- bfd *abfd;
+static bfd_boolean
+som_bfd_free_cached_info (bfd *abfd)
{
asection *o;
if (bfd_get_format (abfd) != bfd_object)
- return true;
+ return TRUE;
#define FREE(x) if (x != NULL) { free (x); x = NULL; }
/* Free the native string and symbol tables. */
FREE (obj_som_symtab (abfd));
FREE (obj_som_stringtab (abfd));
- for (o = abfd->sections; o != (asection *) NULL; o = o->next)
+ for (o = abfd->sections; o != NULL; o = o->next)
{
/* Free the native relocations. */
o->reloc_count = (unsigned) -1;
FREE (som_section_data (o)->reloc_stream);
- /* Free the generic relocations. */
- FREE (o->relocation);
+ /* Do not free the generic relocations as they are objalloc'ed. */
}
#undef FREE
- return true;
+ return TRUE;
}
/* End of miscellaneous support functions. */
/* Linker support functions. */
-static boolean
-som_bfd_link_split_section (abfd, sec)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec;
+static bfd_boolean
+som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
{
- return (som_is_subspace (sec) && sec->_raw_size > 240000);
+ return som_is_subspace (sec) && sec->size > 240000;
}
-#define som_close_and_cleanup som_bfd_free_cached_info
-
-#define som_read_ar_hdr _bfd_generic_read_ar_hdr
-#define som_openr_next_archived_file bfd_generic_openr_next_archived_file
-#define som_get_elt_at_index _bfd_generic_get_elt_at_index
-#define som_generic_stat_arch_elt bfd_generic_stat_arch_elt
-#define som_truncate_arname bfd_bsd_truncate_arname
-#define som_slurp_extended_name_table _bfd_slurp_extended_name_table
-#define som_construct_extended_name_table \
- _bfd_archive_coff_construct_extended_name_table
-#define som_update_armap_timestamp bfd_true
-#define som_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
-
-#define som_get_lineno _bfd_nosymbols_get_lineno
-#define som_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define som_read_minisymbols _bfd_generic_read_minisymbols
-#define som_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-#define som_get_section_contents_in_window \
- _bfd_generic_get_section_contents_in_window
-
-#define som_bfd_get_relocated_section_contents \
- bfd_generic_get_relocated_section_contents
-#define som_bfd_relax_section bfd_generic_relax_section
-#define som_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define som_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define som_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define som_bfd_link_just_syms _bfd_generic_link_just_syms
-#define som_bfd_final_link _bfd_generic_final_link
-
-#define som_bfd_gc_sections bfd_generic_gc_sections
-#define som_bfd_merge_sections bfd_generic_merge_sections
-#define som_bfd_discard_group bfd_generic_discard_group
-
-const bfd_target som_vec = {
- "som", /* name */
+#define som_close_and_cleanup som_bfd_free_cached_info
+#define som_read_ar_hdr _bfd_generic_read_ar_hdr
+#define som_write_ar_hdr _bfd_generic_write_ar_hdr
+#define som_openr_next_archived_file bfd_generic_openr_next_archived_file
+#define som_get_elt_at_index _bfd_generic_get_elt_at_index
+#define som_generic_stat_arch_elt bfd_generic_stat_arch_elt
+#define som_truncate_arname bfd_bsd_truncate_arname
+#define som_slurp_extended_name_table _bfd_slurp_extended_name_table
+#define som_construct_extended_name_table _bfd_archive_coff_construct_extended_name_table
+#define som_update_armap_timestamp bfd_true
+#define som_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define som_get_lineno _bfd_nosymbols_get_lineno
+#define som_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define som_read_minisymbols _bfd_generic_read_minisymbols
+#define som_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+#define som_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+#define som_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
+#define som_bfd_relax_section bfd_generic_relax_section
+#define som_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define som_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define som_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define som_bfd_link_just_syms _bfd_generic_link_just_syms
+#define som_bfd_copy_link_hash_symbol_type \
+ _bfd_generic_copy_link_hash_symbol_type
+#define som_bfd_final_link _bfd_generic_final_link
+#define som_bfd_gc_sections bfd_generic_gc_sections
+#define som_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define som_bfd_merge_sections bfd_generic_merge_sections
+#define som_bfd_is_group_section bfd_generic_is_group_section
+#define som_bfd_discard_group bfd_generic_discard_group
+#define som_section_already_linked _bfd_generic_section_already_linked
+#define som_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define som_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#define som_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#define som_find_inliner_info _bfd_nosymbols_find_inliner_info
+
+const bfd_target som_vec =
+{
+ "som", /* Name. */
bfd_target_som_flavour,
- BFD_ENDIAN_BIG, /* target byte order */
- BFD_ENDIAN_BIG, /* target headers byte order */
- (HAS_RELOC | EXEC_P | /* object flags */
+ BFD_ENDIAN_BIG, /* Target byte order. */
+ BFD_ENDIAN_BIG, /* Target headers byte order. */
+ (HAS_RELOC | EXEC_P | /* Object flags. */
HAS_LINENO | HAS_DEBUG |
HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED | DYNAMIC),
- (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
- | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+ (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS | SEC_LINK_ONCE
+ | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* Section flags. */
-/* leading_symbol_char: is the first char of a user symbol
- predictable, and if so what is it */
+ /* Leading_symbol_char: is the first char of a user symbol
+ predictable, and if so what is it. */
0,
- '/', /* ar_pad_char */
- 14, /* ar_max_namelen */
+ '/', /* AR_pad_char. */
+ 14, /* AR_max_namelen. */
+ 0, /* match priority. */
bfd_getb64, bfd_getb_signed_64, bfd_putb64,
bfd_getb32, bfd_getb_signed_32, bfd_putb32,
- bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+ bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */
bfd_getb64, bfd_getb_signed_64, bfd_putb64,
bfd_getb32, bfd_getb_signed_32, bfd_putb32,
- bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+ bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */
{_bfd_dummy_target,
- som_object_p, /* bfd_check_format */
+ som_object_p, /* bfd_check_format. */
bfd_generic_archive_p,
_bfd_dummy_target
},
NULL,
- (PTR) 0
+ NULL
};
-#endif /* HOST_HPPAHPUX || HOST_HPPABSD || HOST_HPPAOSF */