/* bfd back-end for HP PA-RISC SOM objects.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1990-2023 Free Software Foundation, Inc.
Contributed by the Center for Software Science at the
University of Utah.
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
02110-1301, USA. */
-#include "alloca-conf.h"
#include "sysdep.h"
#include "bfd.h"
-
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined(HOST_HPPAMPEIX)
-
+#include "libiberty.h"
#include "libbfd.h"
#include "som.h"
#include "safe-ctype.h"
-
-#include <sys/param.h>
-#include <signal.h>
-#include <machine/reg.h>
-#include <sys/file.h>
+#include "som/reloc.h"
+#include "aout/ar.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 bool som_mkobject (bfd *);
+static bool som_is_space (asection *);
+static bool som_is_subspace (asection *);
static int compare_subspaces (const void *, const void *);
-static unsigned long som_compute_checksum (bfd *);
-static bfd_boolean som_build_and_write_symbol_table (bfd *);
+static uint32_t som_compute_checksum (struct som_external_header *);
+static bool 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. */
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
+static struct reloc_queue
{
unsigned char *reloc;
unsigned int size;
struct section_to_type
{
- char *section;
+ const char *section;
char type;
};
/* 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. */
{ 31, "L4=SD=" }, /* 0x6f */
{ 32, "L4=Sb=" }, /* 0x70 */
{ 33, "L4=Sd=" }, /* 0x71 */
+ /* R_DATA_GPREL. */
+ { 0, "L4=Sd=" }, /* 0x72 */
/* R_RESERVED. */
- { 0, "" }, /* 0x72 */
{ 0, "" }, /* 0x73 */
{ 0, "" }, /* 0x74 */
{ 0, "" }, /* 0x75 */
};
/* 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)
+#define SOM_HOWTO(SIZE, TYPE) \
+ HOWTO(TYPE, 0, SIZE, 32, false, 0, 0, hppa_som_reloc, \
+ #TYPE, false, 0, 0, false)
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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- 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_NO_RELOCATION, "R_NO_RELOCATION"),
- SOM_HOWTO (R_ZEROES, "R_ZEROES"),
- SOM_HOWTO (R_ZEROES, "R_ZEROES"),
- SOM_HOWTO (R_UNINIT, "R_UNINIT"),
- SOM_HOWTO (R_UNINIT, "R_UNINIT"),
- SOM_HOWTO (R_RELOCATION, "R_RELOCATION"),
- SOM_HOWTO (R_DATA_ONE_SYMBOL, "R_DATA_ONE_SYMBOL"),
- SOM_HOWTO (R_DATA_ONE_SYMBOL, "R_DATA_ONE_SYMBOL"),
- SOM_HOWTO (R_DATA_PLABEL, "R_DATA_PLABEL"),
- SOM_HOWTO (R_DATA_PLABEL, "R_DATA_PLABEL"),
- SOM_HOWTO (R_SPACE_REF, "R_SPACE_REF"),
- SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
- SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
- SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
- SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
- SOM_HOWTO (R_SHORT_PCREL_MODE, "R_SHORT_PCREL_MODE"),
- SOM_HOWTO (R_LONG_PCREL_MODE, "R_LONG_PCREL_MODE"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- 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_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_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_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_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_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_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_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_DP_RELATIVE, "R_DP_RELATIVE"),
- SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
- SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_DLT_REL, "R_DLT_REL"),
- SOM_HOWTO (R_DLT_REL, "R_DLT_REL"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_MILLI_REL, "R_MILLI_REL"),
- SOM_HOWTO (R_MILLI_REL, "R_MILLI_REL"),
- SOM_HOWTO (R_CODE_PLABEL, "R_CODE_PLABEL"),
- SOM_HOWTO (R_CODE_PLABEL, "R_CODE_PLABEL"),
- SOM_HOWTO (R_BREAKPOINT, "R_BREAKPOINT"),
- SOM_HOWTO (R_ENTRY, "R_ENTRY"),
- SOM_HOWTO (R_ENTRY, "R_ENTRY"),
- SOM_HOWTO (R_ALT_ENTRY, "R_ALT_ENTRY"),
- SOM_HOWTO (R_EXIT, "R_EXIT"),
- SOM_HOWTO (R_BEGIN_TRY, "R_BEGIN_TRY"),
- SOM_HOWTO (R_END_TRY, "R_END_TRY"),
- SOM_HOWTO (R_END_TRY, "R_END_TRY"),
- SOM_HOWTO (R_END_TRY, "R_END_TRY"),
- SOM_HOWTO (R_BEGIN_BRTAB, "R_BEGIN_BRTAB"),
- SOM_HOWTO (R_END_BRTAB, "R_END_BRTAB"),
- SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
- SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
- SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
- SOM_HOWTO (R_DATA_EXPR, "R_DATA_EXPR"),
- SOM_HOWTO (R_CODE_EXPR, "R_CODE_EXPR"),
- SOM_HOWTO (R_FSEL, "R_FSEL"),
- SOM_HOWTO (R_LSEL, "R_LSEL"),
- SOM_HOWTO (R_RSEL, "R_RSEL"),
- SOM_HOWTO (R_N_MODE, "R_N_MODE"),
- SOM_HOWTO (R_S_MODE, "R_S_MODE"),
- SOM_HOWTO (R_D_MODE, "R_D_MODE"),
- SOM_HOWTO (R_R_MODE, "R_R_MODE"),
- SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
- SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
- SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
- SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
- SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
- SOM_HOWTO (R_TRANSLATED, "R_TRANSLATED"),
- SOM_HOWTO (R_AUX_UNWIND, "R_AUX_UNWIND"),
- SOM_HOWTO (R_COMP1, "R_COMP1"),
- SOM_HOWTO (R_COMP2, "R_COMP2"),
- SOM_HOWTO (R_COMP3, "R_COMP3"),
- SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
- SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
- SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
- SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
- SOM_HOWTO (R_SEC_STMT, "R_SEC_STMT"),
- SOM_HOWTO (R_N0SEL, "R_N0SEL"),
- SOM_HOWTO (R_N1SEL, "R_N1SEL"),
- SOM_HOWTO (R_LINETAB, "R_LINETAB"),
- SOM_HOWTO (R_LINETAB_ESC, "R_LINETAB_ESC"),
- SOM_HOWTO (R_LTP_OVERRIDE, "R_LTP_OVERRIDE"),
- SOM_HOWTO (R_COMMENT, "R_COMMENT"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED"),
- SOM_HOWTO (R_RESERVED, "R_RESERVED")
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_NO_RELOCATION),
+ SOM_HOWTO (0, R_ZEROES),
+ SOM_HOWTO (0, R_ZEROES),
+ SOM_HOWTO (0, R_UNINIT),
+ SOM_HOWTO (0, R_UNINIT),
+ SOM_HOWTO (4, R_RELOCATION),
+ SOM_HOWTO (4, R_DATA_ONE_SYMBOL),
+ SOM_HOWTO (4, R_DATA_ONE_SYMBOL),
+ SOM_HOWTO (4, R_DATA_PLABEL),
+ SOM_HOWTO (4, R_DATA_PLABEL),
+ SOM_HOWTO (4, R_SPACE_REF),
+ SOM_HOWTO (0, R_REPEATED_INIT),
+ SOM_HOWTO (0, R_REPEATED_INIT),
+ SOM_HOWTO (0, R_REPEATED_INIT),
+ SOM_HOWTO (0, R_REPEATED_INIT),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (4, R_PCREL_CALL),
+ SOM_HOWTO (0, R_SHORT_PCREL_MODE),
+ SOM_HOWTO (0, R_LONG_PCREL_MODE),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (4, R_ABS_CALL),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DP_RELATIVE),
+ SOM_HOWTO (4, R_DATA_GPREL),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (4, R_DLT_REL),
+ SOM_HOWTO (4, R_DLT_REL),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (4, R_CODE_ONE_SYMBOL),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (4, R_MILLI_REL),
+ SOM_HOWTO (4, R_MILLI_REL),
+ SOM_HOWTO (4, R_CODE_PLABEL),
+ SOM_HOWTO (4, R_CODE_PLABEL),
+ SOM_HOWTO (4, R_BREAKPOINT),
+ SOM_HOWTO (0, R_ENTRY),
+ SOM_HOWTO (0, R_ENTRY),
+ SOM_HOWTO (0, R_ALT_ENTRY),
+ SOM_HOWTO (0, R_EXIT),
+ SOM_HOWTO (0, R_BEGIN_TRY),
+ SOM_HOWTO (0, R_END_TRY),
+ SOM_HOWTO (0, R_END_TRY),
+ SOM_HOWTO (0, R_END_TRY),
+ SOM_HOWTO (0, R_BEGIN_BRTAB),
+ SOM_HOWTO (0, R_END_BRTAB),
+ SOM_HOWTO (0, R_STATEMENT),
+ SOM_HOWTO (0, R_STATEMENT),
+ SOM_HOWTO (0, R_STATEMENT),
+ SOM_HOWTO (4, R_DATA_EXPR),
+ SOM_HOWTO (4, R_CODE_EXPR),
+ SOM_HOWTO (0, R_FSEL),
+ SOM_HOWTO (0, R_LSEL),
+ SOM_HOWTO (0, R_RSEL),
+ SOM_HOWTO (0, R_N_MODE),
+ SOM_HOWTO (0, R_S_MODE),
+ SOM_HOWTO (0, R_D_MODE),
+ SOM_HOWTO (0, R_R_MODE),
+ SOM_HOWTO (0, R_DATA_OVERRIDE),
+ SOM_HOWTO (0, R_DATA_OVERRIDE),
+ SOM_HOWTO (0, R_DATA_OVERRIDE),
+ SOM_HOWTO (0, R_DATA_OVERRIDE),
+ SOM_HOWTO (0, R_DATA_OVERRIDE),
+ SOM_HOWTO (0, R_TRANSLATED),
+ SOM_HOWTO (0, R_AUX_UNWIND),
+ SOM_HOWTO (0, R_COMP1),
+ SOM_HOWTO (0, R_COMP2),
+ SOM_HOWTO (0, R_COMP3),
+ SOM_HOWTO (0, R_PREV_FIXUP),
+ SOM_HOWTO (0, R_PREV_FIXUP),
+ SOM_HOWTO (0, R_PREV_FIXUP),
+ SOM_HOWTO (0, R_PREV_FIXUP),
+ SOM_HOWTO (0, R_SEC_STMT),
+ SOM_HOWTO (0, R_N0SEL),
+ SOM_HOWTO (0, R_N1SEL),
+ SOM_HOWTO (0, R_LINETAB),
+ SOM_HOWTO (0, R_LINETAB_ESC),
+ SOM_HOWTO (0, R_LTP_OVERRIDE),
+ SOM_HOWTO (0, R_COMMENT),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED),
+ SOM_HOWTO (0, R_RESERVED)
};
/* Initialize the SOM relocation queue. By definition the queue holds
to the front of the queue. */
static void
-som_reloc_queue_fix (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;
return;
}
- if (index == 2)
+ if (idx == 2)
{
unsigned char *tmp1 = queue[0].reloc;
unsigned int tmp2 = queue[0].size;
return;
}
- if (index == 3)
+ if (idx == 3)
{
unsigned char *tmp1 = queue[0].reloc;
unsigned int tmp2 = queue[0].size;
/* The difference of two symbols needs *very* special handling. */
if (sym_diff)
{
- bfd_size_type amt = sizeof (int);
+ size_t amt = sizeof (int);
final_types[0] = bfd_alloc (abfd, amt);
final_types[1] = bfd_alloc (abfd, amt);
|| 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:
/* The difference of two symbols needs *very* special handling. */
if (sym_diff)
{
- bfd_size_type amt = sizeof (int);
+ size_t amt = sizeof (int);
final_types[0] = bfd_alloc (abfd, amt);
final_types[1] = bfd_alloc (abfd, amt);
/* If we have short and long pcrel modes, then generate the proper
mode selector, then the pcrel relocation. Redundant selectors
will be eliminated as the relocs are sized and emitted. */
- bfd_size_type amt = sizeof (int);
+ size_t amt = sizeof (int);
final_types[0] = bfd_alloc (abfd, amt);
if (!final_types[0])
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 *
+static bfd_cleanup
som_object_setup (bfd *abfd,
- struct header *file_hdrp,
+ struct som_header *file_hdrp,
struct som_exec_auxhdr *aux_hdrp,
unsigned long current_offset)
{
|| (aux_hdrp->exec_entry & 0x3) != 0
|| ! found)
{
- bfd_get_start_address (abfd) = aux_hdrp->exec_flags;
+ abfd->start_address = 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;
+ abfd->start_address = 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;
bfd_default_set_arch_mach (abfd, bfd_arch_hppa, pa10);
- bfd_get_symcount (abfd) = file_hdrp->symbol_total;
+ abfd->symcount = file_hdrp->symbol_total;
/* Initialize the saved symbol table and string table to NULL.
Save important offsets and sizes from the SOM header into
+ current_offset);
obj_som_exec_data (abfd)->system_id = file_hdrp->system_id;
- return abfd->xvec;
+ return _bfd_no_cleanup;
}
/* Convert all of the space and subspace info into BFD sections. Each space
BFD sections which correspond to spaces will overlap the sections for the
associated subspaces. */
-static bfd_boolean
+static bool
setup_sections (bfd *abfd,
- struct header *file_hdr,
+ struct som_header *file_hdr,
unsigned long current_offset)
{
- char *space_strings;
+ char *space_strings = NULL;
unsigned int space_index, i;
unsigned int total_subspaces = 0;
asection **subspace_sections = NULL;
asection *section;
- bfd_size_type amt;
+ size_t amt;
/* First, read in space names. */
amt = file_hdr->space_strings_size;
- space_strings = bfd_malloc (amt);
- if (!space_strings && amt != 0)
- goto error_return;
-
+ if (amt == (size_t) -1)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
if (bfd_seek (abfd, current_offset + file_hdr->space_strings_location,
SEEK_SET) != 0)
goto error_return;
- if (bfd_bread (space_strings, amt, abfd) != amt)
+ space_strings = (char *) _bfd_malloc_and_read (abfd, amt + 1, amt);
+ if (space_strings == NULL)
goto error_return;
+ /* Make sure that the string table is NUL terminated. */
+ 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 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;
/* 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;
+ if (space.name >= file_hdr->space_strings_size)
+ goto error_return;
+
+ 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)
/* 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. */
space_asect->vma = subspace.subspace_start;
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;
+ if (subspace.name >= file_hdr->space_strings_size)
+ goto error_return;
+
+ 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);
else
{
/* The subspace_start field is not initialised in relocatable
- only objects, so it cannot be used for length calculations.
+ 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. */
}
/* 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 *);
+ if (_bfd_mul_overflow (total_subspaces, sizeof (asection *), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ goto error_return;
+ }
subspace_sections = bfd_malloc (amt);
if (subspace_sections == NULL)
goto error_return;
for (i = 0; i < total_subspaces; i++)
subspace_sections[i]->target_index = i;
- if (space_strings != NULL)
- free (space_strings);
-
- if (subspace_sections != NULL)
- free (subspace_sections);
-
- return TRUE;
+ free (space_strings);
+ free (subspace_sections);
+ return true;
error_return:
- if (space_strings != NULL)
- free (space_strings);
-
- if (subspace_sections != NULL)
- free (subspace_sections);
- return FALSE;
+ free (space_strings);
+ free (subspace_sections);
+ return false;
}
+
/* Read in a SOM object and make it into a BFD. */
-static const bfd_target *
+static bfd_cleanup
som_object_p (bfd *abfd)
{
- struct header file_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;
- bfd_size_type amt;
-#define ENTRY_SIZE sizeof (struct som_entry)
-
- amt = FILE_HDR_SIZE;
- if (bfd_bread ((void *) &file_hdr, amt, abfd) != amt)
+ struct som_external_lst_header ext_lst_header;
+ struct som_external_som_entry ext_som_entry;
+ size_t amt;
+ unsigned int loc;
+#define ENTRY_SIZE sizeof (struct som_external_som_entry)
+
+ 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 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);
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. */
return NULL;
}
- amt = SLSTHDR;
- if (bfd_bread ((void *) &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);
}
/* 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);
}
amt = ENTRY_SIZE;
- if (bfd_bread ((void *) &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);
}
/* 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 NULL;
}
- current_offset = som_entry.location;
-
/* And finally, re-read the som header. */
- amt = FILE_HDR_SIZE;
- if (bfd_bread ((void *) &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 NULL;
}
+ som_swap_header_in (&ext_file_hdr, &file_hdr);
+
break;
-#endif
default:
bfd_set_error (bfd_error_wrong_format);
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);
a non-existant auxiliary header. */
if (file_hdr.aux_header_size != 0)
{
- aux_hdr_ptr = bfd_zalloc (abfd,
+ 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 = AUX_HDR_SIZE;
- if (bfd_bread ((void *) aux_hdr_ptr, amt, abfd) != amt)
+ 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 NULL;
}
+ som_swap_exec_auxhdr_in (&ext_exec_auxhdr, aux_hdr_ptr);
}
if (!setup_sections (abfd, &file_hdr, current_offset))
/* Create a SOM object. */
-static bfd_boolean
+static bool
som_mkobject (bfd *abfd)
{
/* Allocate memory to hold backend information. */
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 bfd_boolean
+static bool
som_prep_headers (bfd *abfd)
{
- struct header *file_hdr;
+ struct som_header *file_hdr;
asection *section;
- bfd_size_type amt = sizeof (struct header);
+ size_t amt = sizeof (struct som_header);
/* Make and attach a file header to the BFD. */
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))
amt = sizeof (struct som_exec_auxhdr);
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;
if (som_is_space (section))
{
/* Allocate space for the space dictionary. */
- amt = sizeof (struct space_dictionary_record);
+ 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;
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
som_section_data (section)->copy_data->dup_common;
}
}
- return TRUE;
+ return true;
}
/* Return TRUE if the given section is a SOM space, FALSE otherwise. */
-static bfd_boolean
+static bool
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. */
-static bfd_boolean
+static bool
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 contains the given subspace. It
is safe to assume space really is a space, and subspace really
is a subspace. */
-static bfd_boolean
+static bool
som_is_container (asection *space, asection *subspace)
{
return (som_section_data (subspace)->copy_data->container == space)
/* Perform various work in preparation for emitting the fixup stream. */
-static void
+static bool
som_prep_for_fixups (bfd *abfd, asymbol **syms, unsigned long num_syms)
{
unsigned long i;
asection *section;
asymbol **sorted_syms;
- bfd_size_type amt;
+ size_t amt;
+
+ if (num_syms == 0)
+ return true;
/* Most SOM relocations involving a symbol have a length which is
dependent on the index of the symbol. So symbols which are
/* Sort a copy of the symbol table, rather than the canonical
output symbol table. */
- amt = num_syms;
- amt *= sizeof (asymbol *);
+ if (_bfd_mul_overflow (num_syms, sizeof (asymbol *), &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return false;
+ }
sorted_syms = bfd_zalloc (abfd, amt);
+ if (sorted_syms == NULL)
+ return false;
memcpy (sorted_syms, syms, num_syms * sizeof (asymbol *));
qsort (sorted_syms, num_syms, sizeof (asymbol *), compare_syms);
obj_som_sorted_syms (abfd) = sorted_syms;
else
som_symbol_data (sorted_syms[i])->index = i;
}
+ return true;
}
-static bfd_boolean
+static bool
som_write_fixups (bfd *abfd,
unsigned long current_offset,
unsigned int *total_reloc_sizep)
unsigned int subspace_reloc_size = 0;
unsigned int num_spaces = obj_som_file_hdr (abfd)->space_total;
asection *section = abfd->sections;
- bfd_size_type amt;
+ size_t amt;
memset (tmp_space, 0, SOM_TMP_BUFSIZE);
p = tmp_space;
asection *subsection;
/* Find a space. */
- while (!som_is_space (section))
+ while (section && !som_is_space (section))
section = section->next;
+ if (!section)
+ break;
/* Now iterate through each of its subspaces. */
for (subsection = abfd->sections;
subsection != NULL;
subsection = subsection->next)
{
- int reloc_offset;
+ unsigned int reloc_offset;
unsigned int current_rounding_mode;
#ifndef NO_PCREL_MODES
unsigned int current_call_mode;
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. */
unsigned int skip;
int sym_num;
+ if (bfd_reloc->address < reloc_offset)
+ {
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB(%pA+%#" PRIx64 "): "
+ "%s relocation offset out of order"),
+ abfd, subsection, (uint64_t) bfd_reloc->address,
+ bfd_reloc->howto->name);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ }
+ if (!bfd_reloc_offset_in_range (bfd_reloc->howto,
+ abfd, subsection,
+ bfd_reloc->address))
+ {
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB(%pA+%#" PRIx64 "): "
+ "%s relocation offset out of range"),
+ abfd, subsection, (uint64_t) bfd_reloc->address,
+ bfd_reloc->howto->name);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ }
+
/* Get the symbol number. Remember it's stored in a
special place for section symbols. */
if ((*bfd_reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
then dump the current buffer contents now. Also reinitialize
the relocation queue.
- No single BFD relocation could ever translate into more
- than 100 bytes of SOM relocations (20bytes is probably the
- upper limit, but leave lots of space for growth). */
- if (p - tmp_space + 100 > SOM_TMP_BUFSIZE)
+ A single BFD relocation would probably only ever
+ translate into at most 20 bytes of SOM relocations.
+ However with fuzzed object files and resulting silly
+ values for "skip" below, som_reloc_skip can emit 262
+ bytes. Leave lots of space for growth. */
+ if (p - tmp_space + 512 > SOM_TMP_BUFSIZE)
{
amt = p - tmp_space;
if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
- return FALSE;
+ return false;
p = tmp_space;
som_initialize_reloc_queue (reloc_queue);
p = som_reloc_skip (abfd, skip, p,
&subspace_reloc_size, reloc_queue);
- /* Update reloc_offset for the next iteration.
-
- Many relocations do not consume input bytes. They
- are markers, or set state necessary to perform some
- later relocation. */
- switch (bfd_reloc->howto->type)
- {
- case R_ENTRY:
- case R_ALT_ENTRY:
- case R_EXIT:
- case R_N_MODE:
- case R_S_MODE:
- case R_D_MODE:
- case R_R_MODE:
- case R_FSEL:
- case R_LSEL:
- case R_RSEL:
- case R_COMP1:
- case R_COMP2:
- case R_BEGIN_BRTAB:
- case R_END_BRTAB:
- case R_BEGIN_TRY:
- case R_END_TRY:
- case R_N0SEL:
- case R_N1SEL:
-#ifndef NO_PCREL_MODES
- case R_SHORT_PCREL_MODE:
- case R_LONG_PCREL_MODE:
-#endif
- reloc_offset = bfd_reloc->address;
- break;
-
- default:
- reloc_offset = bfd_reloc->address + 4;
- break;
- }
+ /* Update reloc_offset for the next iteration. */
+ reloc_offset = bfd_reloc->address + bfd_reloc->howto->size;
/* Now the actual relocation we care about. */
switch (bfd_reloc->howto->type)
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:
/* Scribble out the relocations. */
amt = p - tmp_space;
if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
- return FALSE;
+ 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 bfd_boolean
+static bool
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;
- char *tmp_space = alloca (tmp_space_size);
+ char *tmp_space = bfd_malloc (tmp_space_size);
char *p = tmp_space;
unsigned int strings_size = 0;
asection *section;
- bfd_size_type amt;
+ size_t amt;
+ bfd_size_type res;
+
+ if (tmp_space == NULL)
+ return false;
/* 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. */
/* Flush buffer before refilling or reallocating. */
amt = p - tmp_space;
if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
- return FALSE;
+ return false;
/* Reallocate if now empty buffer still too small. */
if (5 + length > tmp_space_size)
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);
- tmp_space = alloca (tmp_space_size);
+ if (2 * tmp_space_size < length + 5)
+ tmp_space_size = length + 5;
+ else
+ tmp_space_size = 2 * tmp_space_size;
+ tmp_space = xrealloc (tmp_space, tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer space. */
/* 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 ((void *) &tmp_space[0], amt, abfd) != amt)
- return FALSE;
+ res = bfd_bwrite ((void *) &tmp_space[0], amt, abfd);
+ free (tmp_space);
+ if (res != amt)
+ return false;
*string_sizep = strings_size;
- return TRUE;
+ return true;
}
/* Write out the symbol string table. */
-static bfd_boolean
+static bool
som_write_symbol_strings (bfd *abfd,
unsigned long current_offset,
asymbol **syms,
unsigned int num_syms,
unsigned int *string_sizep,
- COMPUNIT *compilation_unit)
+ 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;
- char *tmp_space = alloca (tmp_space_size);
+ char *tmp_space = bfd_malloc (tmp_space_size);
char *p = tmp_space;
-
unsigned int strings_size = 0;
- char *comp[4];
- bfd_size_type amt;
+ size_t amt;
+ bfd_size_type res;
+
+ if (tmp_space == NULL)
+ return false;
/* This gets a bit gruesome because of the compilation unit. The
strings within the compilation unit are part of the symbol
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 ((void *) &tmp_space[0], amt, abfd) != amt)
- return FALSE;
+ 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);
- tmp_space = alloca (tmp_space_size);
+ if (2 * tmp_space_size < 5 + length)
+ tmp_space_size = 5 + length;
+ else
+ tmp_space_size = 2 * tmp_space_size;
+ tmp_space = xrealloc (tmp_space, tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer
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 ((void *) &tmp_space[0], amt, abfd) != amt)
- return FALSE;
+ 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);
- tmp_space = alloca (tmp_space_size);
+ if (2 * tmp_space_size < 5 + length)
+ tmp_space_size = 5 + length;
+ else
+ tmp_space_size = 2 * tmp_space_size;
+ tmp_space = xrealloc (tmp_space, tmp_space_size);
}
/* Reset to beginning of the (possibly new) buffer space. */
/* Scribble out any partial block. */
amt = p - tmp_space;
- if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
- return FALSE;
+ res = bfd_bwrite ((void *) &tmp_space[0], amt, abfd);
+ free (tmp_space);
+ if (res != 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 bfd_boolean
+static bool
som_begin_writing (bfd *abfd)
{
unsigned long current_offset = 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 ((void *) 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 ((void *) 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 ((void *) 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 ((void *) 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.
obj_som_file_hdr (abfd)->subspace_location = current_offset;
obj_som_file_hdr (abfd)->subspace_total = num_subspaces;
current_offset
- += num_subspaces * sizeof (struct som_subspace_dictionary_record);
+ += 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
/* Scribble out the space strings. */
if (! som_write_space_strings (abfd, current_offset, &strings_size))
- return FALSE;
+ 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
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;
+ return false;
if (bfd_bwrite ((void *) "", (bfd_size_type) 1, abfd) != 1)
- return FALSE;
+ 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 bfd_boolean
+static bool
som_finish_writing (bfd *abfd)
{
int num_spaces = som_count_spaces (abfd);
asection *section;
unsigned long current_offset;
unsigned int strings_size, total_reloc_size;
- bfd_size_type amt;
+ size_t 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. */
if (! som_write_symbol_strings (abfd, current_offset, syms,
num_syms, &strings_size,
obj_som_compilation_unit (abfd)))
- return FALSE;
+ return false;
/* Record total string table size in header and update the
current offset. */
current_offset += strings_size;
/* Do prep work before handling fixups. */
- som_prep_for_fixups (abfd,
- bfd_get_outsymbols (abfd),
- bfd_get_symcount (abfd));
+ if (!som_prep_for_fixups (abfd,
+ bfd_get_outsymbols (abfd),
+ bfd_get_symcount (abfd)))
+ return false;
/* At the end of the file is the fixup stream which starts on a
word boundary. */
/* 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))
- return FALSE;
+ 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))
- return FALSE;
+ 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. */
+ 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 ((void *) som_section_data (subsection)->subspace_dict,
- amt, abfd) != amt)
- return FALSE;
+ 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. */
+ 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 ((void *) som_section_data (subsection)->subspace_dict,
- amt, abfd) != amt)
- return FALSE;
+ if (bfd_bwrite (&ext_subspace_dict, amt, abfd) != amt)
+ return false;
}
/* Goto the next section. */
section = section->next;
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 ((void *) 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 ((void *) 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
BFD private data happens *after* section contents are set. */
- if (abfd->flags & (EXEC_P | DYNAMIC))
+ if ((abfd->flags & (EXEC_P | DYNAMIC)) && obj_som_exec_data (abfd))
obj_som_file_hdr (abfd)->system_id = obj_som_exec_data (abfd)->system_id;
else if (bfd_get_mach (abfd) == pa20)
obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC2_0;
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 ((void *) 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;
+ if (obj_som_exec_data (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 compatible with how the hp linker makes objects
|| 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 ((void *) 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 (bfd *abfd)
+static uint32_t
+som_compute_checksum (struct som_external_header *hdr)
{
- unsigned long checksum, count, i;
- unsigned long *buffer = (unsigned long *) obj_som_file_hdr (abfd);
+ size_t count, i;
+ uint32_t checksum;
+ uint32_t *buffer = (uint32_t *) hdr;
checksum = 0;
- count = sizeof (struct header) / sizeof (unsigned long);
+ count = sizeof (*hdr) / sizeof (*buffer);
for (i = 0; i < count; i++)
checksum ^= *(buffer + i);
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;
/* 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.
/* Build and write, in one big chunk, the entire symbol table for
this BFD. */
-static bfd_boolean
+static bool
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;
+ size_t amt;
/* 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 = bfd_zmalloc (symtab_size);
- if (som_symtab == NULL && symtab_size != 0)
+ if (_bfd_mul_overflow (num_syms,
+ sizeof (struct som_external_symbol_dictionary_record),
+ &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return false;
+ }
+ som_symtab = bfd_zmalloc (amt);
+ if (som_symtab == NULL && num_syms != 0)
goto error_return;
/* 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;
- som_symtab[i].is_comdat = info.is_comdat;
- som_symtab[i].is_common = info.is_common;
- som_symtab[i].dup_common = info.dup_common;
+ 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;
+ goto error_return;
+ symtab_size = num_syms;
+ symtab_size *= sizeof (struct som_external_symbol_dictionary_record);
if (bfd_bwrite ((void *) som_symtab, symtab_size, abfd) != symtab_size)
goto error_return;
- if (som_symtab != NULL)
- free (som_symtab);
- return TRUE;
+ free (som_symtab);
+ return true;
+
error_return:
- if (som_symtab != NULL)
- free (som_symtab);
- return FALSE;
+ free (som_symtab);
+ return false;
}
/* Write an object in SOM format. */
-static bfd_boolean
+static bool
som_write_object_contents (bfd *abfd)
{
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);
\f
/* Read and save the string table associated with the given BFD. */
-static bfd_boolean
+static bool
som_slurp_string_table (bfd *abfd)
{
char *stringtab;
/* 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. */
+ if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) != 0)
+ return false;
amt = obj_som_stringtab_size (abfd);
- stringtab = bfd_zmalloc (amt);
+ stringtab = (char *) _bfd_malloc_and_read (abfd, amt + 1, amt);
if (stringtab == NULL)
- return FALSE;
-
- if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) != 0)
- return FALSE;
-
- if (bfd_bread (stringtab, amt, abfd) != amt)
- return FALSE;
+ return false;
+ /* Make sure that the strings are zero-terminated. */
+ stringtab[amt] = 0;
/* 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
/* Convert from a SOM subspace index to a BFD section. */
-static asection *
-bfd_section_from_som_symbol (bfd *abfd, struct symbol_dictionary_record *symbol)
+asection *
+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))
{
- 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;
}
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. */
static unsigned int
som_slurp_symbol_table (bfd *abfd)
{
- int symbol_count = bfd_get_symcount (abfd);
- int symsize = sizeof (struct symbol_dictionary_record);
+ unsigned int symbol_count = bfd_get_symcount (abfd);
+ size_t symsize = sizeof (struct som_external_symbol_dictionary_record);
char *stringtab;
- struct symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
- som_symbol_type *sym, *symbase;
- bfd_size_type amt;
+ struct som_external_symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
+ som_symbol_type *sym, *symbase = NULL;
+ size_t amt;
/* Return saved value if it exists. */
if (obj_som_symtab (abfd) != NULL)
stringtab = obj_som_stringtab (abfd);
- amt = symbol_count;
- amt *= sizeof (som_symbol_type);
- symbase = bfd_zmalloc (amt);
- if (symbase == NULL)
- goto error_return;
-
/* Read in the external SOM representation. */
- amt = symbol_count;
- amt *= symsize;
- buf = bfd_malloc (amt);
- if (buf == NULL && amt != 0)
- goto error_return;
+ if (_bfd_mul_overflow (symbol_count, symsize, &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ goto error_return;
+ }
if (bfd_seek (abfd, obj_som_sym_filepos (abfd), SEEK_SET) != 0)
goto error_return;
- if (bfd_bread (buf, amt, abfd) != amt)
+ buf = (struct som_external_symbol_dictionary_record *)
+ _bfd_malloc_and_read (abfd, amt, amt);
+ if (buf == NULL)
+ goto error_return;
+
+ if (_bfd_mul_overflow (symbol_count, sizeof (som_symbol_type), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ goto error_return;
+ }
+ symbase = bfd_zmalloc (amt);
+ if (symbase == NULL)
goto error_return;
/* Iterate over all the symbols and internalize them. */
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;
+ bfd_vma offset;
+
/* 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.section = 0;
+ offset = bfd_getb32 (bufp->name);
+ if (offset < obj_som_stringtab_size (abfd))
+ sym->symbol.name = offset + stringtab;
+ else
+ {
+ bfd_set_error (bfd_error_bad_value);
+ goto error_return;
+ }
+ sym->symbol.value = bfd_getb32 (bufp->symbol_value);
+ sym->symbol.section = NULL;
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.section = bfd_section_from_som_symbol (abfd, bufp);
sym->symbol.value -= sym->symbol.section->vma;
break;
+
+ default:
+ sym->symbol.section = bfd_und_section_ptr;
+ break;
}
/* 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.
Note $START$ is a magic code symbol, NOT a section symbol. */
if (sym->symbol.name[0] == '$'
&& sym->symbol.name[strlen (sym->symbol.name) - 1] == '$'
&& !strcmp (sym->symbol.name, sym->symbol.section->name))
sym->symbol.flags |= BSF_SECTION_SYM;
- else if (CONST_STRNEQ (sym->symbol.name, "L$0\002"))
+ else if (startswith (sym->symbol.name, "L$0\002"))
{
sym->symbol.flags |= BSF_SECTION_SYM;
sym->symbol.name = sym->symbol.section->name;
}
- else if (CONST_STRNEQ (sym->symbol.name, "L$0\001"))
+ else if (startswith (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. */
sym++;
/* We modify the symbol count to record the number of BFD symbols we
created. */
- bfd_get_symcount (abfd) = sym - symbase;
+ abfd->symcount = sym - symbase;
/* Save our results and return success. */
obj_som_symtab (abfd) = symbase;
successful_return:
- if (buf != NULL)
- free (buf);
- return (TRUE);
+ free (buf);
+ return true;
error_return:
- if (buf != NULL)
- free (buf);
- return FALSE;
+ free (symbase);
+ free (buf);
+ return false;
}
/* Canonicalize a SOM symbol table. Return the number of entries
static asymbol *
som_make_empty_symbol (bfd *abfd)
{
- bfd_size_type amt = sizeof (som_symbol_type);
- som_symbol_type *new = bfd_zalloc (abfd, amt);
+ size_t amt = sizeof (som_symbol_type);
+ som_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
- if (new == NULL)
+ if (new_symbol_type == NULL)
return NULL;
- new->symbol.the_bfd = abfd;
+ new_symbol_type->symbol.the_bfd = abfd;
- return &new->symbol;
+ return &new_symbol_type->symbol;
}
/* Print symbol information. */
fprintf (file, "%s", symbol->name);
break;
case bfd_print_symbol_more:
- fprintf (file, "som ");
- fprintf_vma (file, symbol->value);
- fprintf (file, " %lx", (long) symbol->flags);
+ fprintf (file, "som %08" PRIx64 " %x",
+ (uint64_t) symbol->value, symbol->flags);
break;
case bfd_print_symbol_all:
{
}
}
-static bfd_boolean
+static bool
som_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
const char *name)
{
arelent *internal_relocs,
asection *section,
asymbol **symbols,
- bfd_boolean just_count)
+ unsigned int symcount,
+ bool just_count)
{
- unsigned int op, varname, deallocate_contents = 0;
+ unsigned int deallocate_contents = 0;
unsigned char *end_fixups = &fixup[end];
- const struct fixup_format *fp;
- const char *cp;
- unsigned char *save_fixup;
- int variables[26], stack[20], c, v, count, prev_fixup, *sp, saved_unwind_bits;
- const int *subop;
+ int variables[26], stack[20], count, prev_fixup, *sp, saved_unwind_bits;
arelent *rptr = internal_relocs;
unsigned int offset = 0;
while (fixup < end_fixups)
{
+ const char *cp;
+ unsigned int op;
+ const struct fixup_format *fp;
+
/* 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. */
- save_fixup = fixup;
+ unsigned char *save_fixup = fixup;
/* Get the fixup code and its associated format. */
op = *fixup++;
/* Handle a request for a previous fixup. */
if (*fp->format == 'P')
{
+ if (!reloc_queue[fp->D].reloc)
+ /* The back-reference doesn't exist. This is a broken
+ object file, likely fuzzed. Just ignore the fixup. */
+ continue;
+
/* Get pointer to the beginning of the prev fixup, move
the repeated fixup to the head of the queue. */
fixup = reloc_queue[fp->D].reloc;
while (*cp)
{
/* The variable this pass is going to compute a value for. */
- varname = *cp++;
+ unsigned int varname = *cp++;
+ const int *subop;
+ int c;
/* Start processing RHS. Continue until a NULL or '=' is found. */
do
{
+ unsigned v;
+
c = *cp++;
/* If this is a variable, push it on the stack. */
else if (ISLOWER (c))
{
int bits = (c - 'a') * 8;
- for (v = 0; c > 'a'; --c)
+ for (v = 0; c > 'a' && fixup < end_fixups; --c)
v = (v << 8) | *fixup++;
if (varname == 'V')
v = sign_extend (v, bits);
push (v);
}
else
- /* An operator. Pop two two values from the stack and
+ /* An operator. Pop two values from the stack and
use them as operands to the given operation. Push
the result of the operation back on the stack. */
switch (c)
/* A symbol to use in the relocation. Make a note
of this if we are not just counting. */
case 'S':
- if (! just_count)
+ if (!just_count && symbols != NULL && (unsigned int) c < symcount)
rptr->sym_ptr_ptr = &symbols[c];
break;
/* Argument relocation bits for a function call. */
if (!bfd_malloc_and_get_section (section->owner, section,
&contents))
{
- if (contents != NULL)
- free (contents);
+ free (contents);
return (unsigned) -1;
}
section->contents = contents;
deallocate_contents = 1;
}
- else if (rptr->addend == 0)
+ if (rptr->addend == 0
+ && offset - var ('L') <= section->size
+ && section->size - (offset - var ('L')) >= 4)
rptr->addend = bfd_get_32 (section->owner,
(section->contents
+ offset - var ('L')));
}
}
if (deallocate_contents)
- free (section->contents);
+ {
+ free (section->contents);
+ section->contents = NULL;
+ }
return count;
set to TRUE to indicate it only needs a count of the number
of actual relocations. */
-static bfd_boolean
+static bool
som_slurp_reloc_table (bfd *abfd,
asection *section,
asymbol **symbols,
- bfd_boolean just_count)
+ bool just_count)
{
unsigned char *external_relocs;
unsigned int fixup_stream_size;
arelent *internal_relocs;
unsigned int num_relocs;
- bfd_size_type amt;
+ size_t amt;
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)
{
+ /* Read in the external forms. */
+ if (bfd_seek (abfd, obj_som_reloc_filepos (abfd) + section->rel_filepos,
+ SEEK_SET) != 0)
+ return false;
amt = fixup_stream_size;
- external_relocs = bfd_malloc (amt);
+ external_relocs = _bfd_malloc_and_read (abfd, amt, 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;
- 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, 0, 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 != NULL)
- return TRUE;
+ return true;
- amt = num_relocs;
- amt *= sizeof (arelent);
- internal_relocs = bfd_zalloc (abfd, (amt));
+ if (_bfd_mul_overflow (num_relocs, sizeof (arelent), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return false;
+ }
+ internal_relocs = bfd_zalloc (abfd, amt);
if (internal_relocs == NULL)
- return FALSE;
+ 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,
+ bfd_get_symcount (abfd), 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
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
arelent *tblptr;
int count;
- if (! som_slurp_reloc_table (abfd, section, symbols, FALSE))
+ if (! som_slurp_reloc_table (abfd, section, symbols, false))
return -1;
count = section->reloc_count;
return section->reloc_count;
}
-extern const bfd_target som_vec;
+extern const bfd_target hppa_som_vec;
/* A hook to set up object file dependent section information. */
-static bfd_boolean
+static bool
som_new_section_hook (bfd *abfd, asection *newsect)
{
if (!newsect->used_by_bfd)
{
- bfd_size_type amt = sizeof (struct som_section_data_struct);
+ size_t amt = sizeof (struct som_section_data_struct);
newsect->used_by_bfd = bfd_zalloc (abfd, amt);
if (!newsect->used_by_bfd)
- return FALSE;
+ return false;
}
newsect->alignment_power = 3;
/* Copy any private info we understand from the input symbol
to the output symbol. */
-static bfd_boolean
+static bool
som_bfd_copy_private_symbol_data (bfd *ibfd,
asymbol *isymbol,
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 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 bfd_boolean
+static bool
som_bfd_copy_private_section_data (bfd *ibfd,
asection *isection,
bfd *obfd,
asection *osection)
{
- bfd_size_type amt;
+ size_t amt;
/* 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
|| (!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 = 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,
/* Reparent if necessary. */
if (som_section_data (osection)->copy_data->container)
- som_section_data (osection)->copy_data->container =
- som_section_data (osection)->copy_data->container->output_section;
+ {
+ if (som_section_data (osection)->copy_data->container->output_section)
+ som_section_data (osection)->copy_data->container =
+ som_section_data (osection)->copy_data->container->output_section;
+ else
+ {
+ /* User has specified a subspace without its containing space. */
+ _bfd_error_handler (_("%pB[%pA]: no output section for space %pA"),
+ obfd, osection, som_section_data (osection)->copy_data->container);
+ return false;
+ }
+ }
- return TRUE;
+ return true;
}
/* Copy any private info we understand from the input bfd
to the output bfd. */
-static bfd_boolean
+static bool
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) = 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
+static bool
som_bfd_print_private_bfd_data (bfd *abfd, void *farg)
{
struct som_exec_auxhdr *exec_header;
- struct aux_id* auxhdr;
+ struct som_aux_id* auxhdr;
FILE *f;
f = (FILE *) farg;
fprintf (f, " length %#x\n", auxhdr->length);
/* Note that, depending on the HP-UX version, the following fields can be
- either ints, or longs. */
+ 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, " bss initializer %#lx\n", (long) exec_header->exec_bfill);
}
- return TRUE;
+ return true;
}
/* Set backend info for sections which can not be described
in the BFD data structures. */
-bfd_boolean
+bool
bfd_som_set_section_attributes (asection *section,
int defined,
int private,
/* 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);
+ size_t amt = sizeof (struct som_copyable_section_data_struct);
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. */
-bfd_boolean
+bool
bfd_som_set_subsection_attributes (asection *section,
asection *container,
- int access,
+ int access_ctr,
unsigned int sort_key,
int quadrant,
int comdat,
/* 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);
+ size_t amt = sizeof (struct som_copyable_section_data_struct);
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;
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;
+ return true;
}
/* Set the full SOM symbol type. SOM needs far more symbol information
/* Attach an auxiliary header to the BFD backend so that it may be
written into the object file. */
-bfd_boolean
+bool
bfd_som_attach_aux_hdr (bfd *abfd, int type, char *string)
{
- bfd_size_type amt;
+ size_t amt;
if (type == VERSION_AUX_ID)
{
if (len % 4)
pad = (4 - (len % 4));
- amt = sizeof (struct aux_id) + sizeof (unsigned int) + len + pad;
+ 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)
{
- int len = strlen (string);
+ size_t len = strlen (string);
int pad = 0;
if (len % 4)
pad = (4 - (len % 4));
- amt = sizeof (struct aux_id) + sizeof (unsigned int) + len + pad;
+ 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 a compilation unit header to the BFD backend so that it may be
written into the object file. */
-bfd_boolean
+bool
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 bfd_boolean
+static bool
som_get_section_contents (bfd *abfd,
sec_ptr section,
void *location,
bfd_size_type count)
{
if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
- return TRUE;
+ 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 bfd_boolean
+static bool
som_set_section_contents (bfd *abfd,
sec_ptr section,
const void *location,
/* 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 (location, count, abfd) != count)
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
-static bfd_boolean
+static bool
som_set_arch_mach (bfd *abfd,
enum bfd_architecture arch,
unsigned long machine)
return bfd_default_set_arch_mach (abfd, arch, machine);
}
-static bfd_boolean
+static bool
som_find_nearest_line (bfd *abfd,
- asection *section,
asymbol **symbols,
+ asection *section,
bfd_vma offset,
const char **filename_ptr,
const char **functionname_ptr,
- unsigned int *line_ptr)
+ unsigned int *line_ptr,
+ unsigned int *discriminator_ptr)
{
- bfd_boolean found;
+ bool found;
asymbol *func;
bfd_vma low_func;
asymbol **p;
+ if (discriminator_ptr)
+ *discriminator_ptr = 0;
+
if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
- & found, filename_ptr,
- functionname_ptr, line_ptr,
- & somdata (abfd).line_info))
- return FALSE;
+ & found, filename_ptr,
+ functionname_ptr, line_ptr,
+ & somdata (abfd).line_info))
+ return false;
if (found)
- return TRUE;
+ return true;
if (symbols == NULL)
- return FALSE;
+ 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
}
if (func == NULL)
- return FALSE;
+ return false;
*filename_ptr = NULL;
*functionname_ptr = bfd_asymbol_name (func);
*line_ptr = 0;
- return TRUE;
+ return true;
}
static int
som_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
- (*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
- fflush (stderr);
+ _bfd_error_handler (_("som_sizeof_headers unimplemented"));
abort ();
return 0;
}
{
char c;
+ /* If the symbol did not have a scope specified,
+ then it will not have associated section. */
+ if (symbol == NULL || symbol->section == NULL)
+ return '?';
+
if (bfd_is_com_section (symbol->section))
return 'C';
if (bfd_is_und_section (symbol->section))
/* Count the number of symbols in the archive symbol table. Necessary
so that we can allocate space for all the carsyms at once. */
-static bfd_boolean
+static bool
som_bfd_count_ar_symbols (bfd *abfd,
- struct lst_header *lst_header,
+ struct som_lst_header *lst_header,
symindex *count)
{
unsigned int i;
- unsigned int *hash_table = NULL;
- bfd_size_type amt;
- file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
+ unsigned char *hash_table;
+ size_t amt;
+ file_ptr lst_filepos;
+
+ lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
- amt = lst_header->hash_size;
- amt *= sizeof (unsigned int);
- hash_table = bfd_malloc (amt);
+ /* Read in the hash table. The hash table is an array of 32-bit
+ file offsets which point to the hash chains. */
+ if (_bfd_mul_overflow (lst_header->hash_size, 4, &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return false;
+ }
+ hash_table = _bfd_malloc_and_read (abfd, amt, amt);
if (hash_table == NULL && lst_header->hash_size != 0)
goto error_return;
/* Don't forget to initialize the counter! */
*count = 0;
- /* Read in the hash table. The has table is an array of 32bit file offsets
- which point to the hash chains. */
- 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 ((void *) &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;
+
+ /* Assume symbols on a chain are in increasing file offset
+ order. Otherwise we can loop here with fuzzed input. */
+ if (next_entry < hash_val + sizeof (ext_lst_symbol))
+ {
+ bfd_set_error (bfd_error_bad_value);
+ goto error_return;
+ }
+ hash_val = next_entry;
/* 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 ((void *) &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;
+ free (hash_table);
+ return true;
error_return:
- if (hash_table != NULL)
- free (hash_table);
- return FALSE;
+ free (hash_table);
+ return false;
}
/* Fill in the canonical archive symbols (SYMS) from the archive described
by ABFD and LST_HEADER. */
-static bfd_boolean
+static bool
som_bfd_fill_in_ar_symbols (bfd *abfd,
- struct lst_header *lst_header,
+ 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;
- bfd_size_type amt;
- file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
+ unsigned char *hash_table;
+ struct som_external_som_entry *som_dict = NULL;
+ size_t amt;
+ file_ptr lst_filepos;
+ unsigned int string_loc;
- amt = lst_header->hash_size;
- amt *= sizeof (unsigned int);
- hash_table = bfd_malloc (amt);
- if (hash_table == NULL && lst_header->hash_size != 0)
- goto error_return;
+ lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
/* Read in the hash table. The has table is an array of 32bit file offsets
which point to the hash chains. */
- if (bfd_bread ((void *) hash_table, amt, abfd) != amt)
+ if (_bfd_mul_overflow (lst_header->hash_size, 4, &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return false;
+ }
+ hash_table = _bfd_malloc_and_read (abfd, amt, amt);
+ if (hash_table == NULL && lst_header->hash_size != 0)
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 = bfd_malloc (amt);
+ if (_bfd_mul_overflow (lst_header->module_count,
+ sizeof (struct som_external_som_entry), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ goto error_return;
+ }
+ som_dict = (struct som_external_som_entry *)
+ _bfd_malloc_and_read (abfd, amt, amt);
if (som_dict == NULL && lst_header->module_count != 0)
goto error_return;
- 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;
+ size_t len;
+ unsigned char ext_len[4];
+ char *name;
+ unsigned int ndx;
/* 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);
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);
- if (!set->name)
- goto error_return;
- if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
+ if (len == (size_t) -1)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
+ name = (char *) _bfd_alloc_and_read (abfd, len + 1, len);
+ if (!name)
goto error_return;
-
- set->name[len] = 0;
+ name[len] = 0;
+ set->name = name;
/* 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);
+ ndx = bfd_getb32 (lst_symbol.som_index);
+ if (ndx >= lst_header->module_count)
+ {
+ bfd_set_error (bfd_error_bad_value);
+ goto error_return;
+ }
+ set->file_offset
+ = bfd_getb32 (som_dict[ndx].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);
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);
- if (!set->name)
- goto error_return;
-
- if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
+ if (len == (size_t) -1)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
+ name = (char *) _bfd_alloc_and_read (abfd, len + 1, len);
+ if (!name)
goto error_return;
- set->name[len] = 0;
+ name[len] = 0;
+ set->name = name;
/* 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);
+ ndx = bfd_getb32 (lst_symbol.som_index);
+ if (ndx >= lst_header->module_count)
+ {
+ bfd_set_error (bfd_error_bad_value);
+ goto error_return;
+ }
+ set->file_offset
+ = bfd_getb32 (som_dict[ndx].location) - sizeof (struct ar_hdr);
/* Go on to the next symbol. */
set++;
}
/* If we haven't died by now, then we successfully read the entire
archive symbol table. */
- if (hash_table != NULL)
- free (hash_table);
- if (som_dict != NULL)
- free (som_dict);
- return TRUE;
+ free (hash_table);
+ free (som_dict);
+ return true;
error_return:
- if (hash_table != NULL)
- free (hash_table);
- if (som_dict != NULL)
- free (som_dict);
- return FALSE;
+ free (hash_table);
+ free (som_dict);
+ return false;
}
/* Read in the LST from the archive. */
-static bfd_boolean
+static bool
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;
+ size_t amt = 16;
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 (! CONST_STRNEQ (nextname, "/ "))
+ if (! startswith (nextname, "/ "))
{
- bfd_has_map (abfd) = FALSE;
- return TRUE;
+ abfd->has_armap = false;
+ return true;
}
/* Read in and sanity check the archive header. */
amt = sizeof (struct ar_hdr);
if (bfd_bread ((void *) &ar_header, amt, abfd) != amt)
- return FALSE;
+ 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 ((void *) &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))
- return FALSE;
+ 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;
/* Initialize the cache and allocate space for the library symbols. */
ardata->cache = 0;
- amt = ardata->symdef_count;
- amt *= sizeof (carsym);
+ if (_bfd_mul_overflow (ardata->symdef_count, sizeof (carsym), &amt))
+ {
+ bfd_set_error (bfd_error_file_too_big);
+ return false;
+ }
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))
- return FALSE;
+ 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;
+ abfd->has_armap = 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 bfd_boolean
+static bool
som_bfd_prep_for_ar_write (bfd *abfd,
unsigned int *num_syms,
unsigned int *stringsize)
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))
- return FALSE;
+ 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->archive_next;
}
- return TRUE;
+ return true;
}
/* Hash a symbol name based on the hashing algorithm presented in the
/* Do the bulk of the work required to write the SOM library
symbol table. */
-static bfd_boolean
+static bool
som_bfd_ar_write_symbol_stuff (bfd *abfd,
unsigned int nsyms,
unsigned int string_size,
- struct lst_header lst,
+ 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;
+ size_t amt;
+ unsigned int module_count;
+ unsigned int hash_size;
- amt = lst.hash_size;
- amt *= sizeof (unsigned int);
+ hash_size = bfd_getb32 (lst.hash_size);
+ if (_bfd_mul_overflow (hash_size, 4, &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return false;
+ }
hash_table = bfd_zmalloc (amt);
- if (hash_table == NULL && lst.hash_size != 0)
+ if (hash_table == NULL && hash_size != 0)
goto error_return;
- amt = lst.module_count;
- amt *= sizeof (struct som_entry);
+ module_count = bfd_getb32 (lst.module_count);
+ if (_bfd_mul_overflow (module_count,
+ sizeof (struct som_external_som_entry), &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
som_dict = bfd_zmalloc (amt);
- if (som_dict == NULL && lst.module_count != 0)
+ if (som_dict == NULL && module_count != 0)
goto error_return;
- amt = lst.hash_size;
- amt *= sizeof (struct lst_symbol_record *);
+ if (_bfd_mul_overflow (hash_size,
+ sizeof (struct som_external_lst_symbol_record *),
+ &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
last_hash_entry = bfd_zmalloc (amt);
- if (last_hash_entry == NULL && lst.hash_size != 0)
+ 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);
-
/* 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
curr_som_offset = (curr_som_offset + 0x1) & ~0x1;
/* FIXME should be done with buffers just like everything else... */
- amt = nsyms;
- amt *= sizeof (struct lst_symbol_record);
+ if (_bfd_mul_overflow (nsyms,
+ sizeof (struct som_external_lst_symbol_record), &amt))
+ {
+ bfd_set_error (bfd_error_no_memory);
+ goto error_return;
+ }
lst_syms = bfd_malloc (amt);
if (lst_syms == NULL && nsyms != 0)
goto error_return;
- strings = bfd_malloc ((bfd_size_type) string_size);
+ strings = bfd_malloc (string_size);
if (strings == NULL && string_size != 0)
goto error_return;
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 = info.dup_common;
- 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;
+ 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;
- 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;
+ 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);
+ 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++;
}
/* Now scribble out the hash table. */
- amt = lst.hash_size * 4;
+ amt = (size_t) 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);
+ amt = (size_t) 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);
+ amt = (size_t) nsyms * sizeof (struct som_external_lst_symbol_record);
if (bfd_bwrite ((void *) lst_syms, amt, abfd) != amt)
goto error_return;
if (bfd_bwrite ((void *) strings, amt, abfd) != amt)
goto error_return;
- if (hash_table != NULL)
- free (hash_table);
- if (som_dict != NULL)
- free (som_dict);
- if (last_hash_entry != NULL)
- free (last_hash_entry);
- if (lst_syms != NULL)
- free (lst_syms);
- if (strings != NULL)
- free (strings);
- return TRUE;
+ free (hash_table);
+ free (som_dict);
+ free (last_hash_entry);
+ free (lst_syms);
+ free (strings);
+ return true;
error_return:
- if (hash_table != NULL)
- free (hash_table);
- if (som_dict != NULL)
- free (som_dict);
- if (last_hash_entry != NULL)
- free (last_hash_entry);
- if (lst_syms != NULL)
- free (lst_syms);
- if (strings != NULL)
- free (strings);
-
- return FALSE;
+ free (hash_table);
+ free (som_dict);
+ free (last_hash_entry);
+ free (lst_syms);
+ free (strings);
+
+ return false;
}
/* Write out the LST for the archive.
You'll never believe this is really how armaps are handled in SOM... */
-static bfd_boolean
+static bool
som_write_armap (bfd *abfd,
unsigned int elength,
struct orl *map ATTRIBUTE_UNUSED,
struct stat statbuf;
unsigned int i, lst_size, nsyms, stringsize;
struct ar_hdr hdr;
- struct lst_header lst;
- int *p;
- bfd_size_type amt;
+ struct som_external_lst_header lst;
+ unsigned char *p;
+ size_t 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)
+ if (stat (bfd_get_filename (abfd), &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++;
+ 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))
- return FALSE;
+ 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 ((void *) &hdr, amt, abfd) != amt)
- return FALSE;
+ return false;
/* Now scribble out the lst header. */
- amt = sizeof (struct lst_header);
+ amt = sizeof (struct som_external_lst_header);
if (bfd_bwrite ((void *) &lst, amt, abfd) != amt)
- return FALSE;
+ 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 bfd_boolean
+static bool
som_bfd_free_cached_info (bfd *abfd)
{
- asection *o;
-
- if (bfd_get_format (abfd) != bfd_object)
- 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 != NULL; o = o->next)
+ if (bfd_get_format (abfd) == bfd_object)
{
- /* Free the native relocations. */
- o->reloc_count = (unsigned) -1;
- FREE (som_section_data (o)->reloc_stream);
- /* Free the generic relocations. */
- FREE (o->relocation);
- }
+ asection *o;
+
+#define FREE(x) do { free (x); x = NULL; } while (0)
+ /* Free the native string and symbol tables. */
+ FREE (obj_som_symtab (abfd));
+ FREE (obj_som_stringtab (abfd));
+ 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);
+ /* Do not free the generic relocations as they are objalloc'ed. */
+ }
#undef FREE
+ }
- return TRUE;
+ return _bfd_generic_close_and_cleanup (abfd);
}
/* End of miscellaneous support functions. */
/* Linker support functions. */
-static bfd_boolean
+static bool
som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
{
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_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_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_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_find_line _bfd_nosymbols_find_line
+#define som_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string
+#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_bool_bfd_true
+#define som_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_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_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_group_name bfd_generic_group_name
+#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_link_hide_symbol _bfd_generic_link_hide_symbol
+#define som_bfd_define_start_stop bfd_generic_define_start_stop
#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
+#define som_bfd_link_check_relocs _bfd_generic_link_check_relocs
+#define som_set_reloc _bfd_generic_set_reloc
-const bfd_target som_vec =
+const bfd_target hppa_som_vec =
{
"som", /* Name. */
bfd_target_som_flavour,
0,
'/', /* AR_pad_char. */
14, /* AR_max_namelen. */
+ 0, /* match priority. */
+ TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */
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_dummy_target
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
som_mkobject,
_bfd_generic_mkarchive,
- bfd_false
+ _bfd_bool_bfd_false_error
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
som_write_object_contents,
_bfd_write_archive_contents,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
#undef som
NULL
};
-#endif /* HOST_HPPAHPUX || HOST_HPPABSD || HOST_HPPAOSF */