/* BFD back-end for ieee-695 objects.
- Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+ Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define KEEPMINUSPCININST 0
#include "libbfd.h"
#include "ieee.h"
#include "libieee.h"
-#include "obstack.h"
-#define obstack_chunk_alloc malloc
-#define obstack_chunk_free free
+
+static boolean ieee_write_byte PARAMS ((bfd *, int));
+static boolean ieee_write_2bytes PARAMS ((bfd *, int));
+static boolean ieee_write_int PARAMS ((bfd *, bfd_vma));
+static boolean ieee_write_id PARAMS ((bfd *, const char *));
+static boolean ieee_write_expression
+ PARAMS ((bfd *, bfd_vma, asymbol *, boolean, unsigned int));
+static void ieee_write_int5 PARAMS ((bfd_byte *, bfd_vma));
+static boolean ieee_write_int5_out PARAMS ((bfd *, bfd_vma));
+static boolean ieee_write_section_part PARAMS ((bfd *));
+static boolean do_with_relocs PARAMS ((bfd *, asection *));
+static boolean do_as_repeat PARAMS ((bfd *, asection *));
+static boolean do_without_relocs PARAMS ((bfd *, asection *));
+static boolean ieee_write_external_part PARAMS ((bfd *));
+static boolean ieee_write_data_part PARAMS ((bfd *));
+static boolean ieee_write_debug_part PARAMS ((bfd *));
+static boolean ieee_write_me_part PARAMS ((bfd *));
+static boolean ieee_write_processor PARAMS ((bfd *));
+
+static boolean ieee_slurp_debug PARAMS ((bfd *));
+static boolean ieee_slurp_section_data PARAMS ((bfd *));
/* Functions for writing to ieee files in the strange way that the
standard requires. */
-static void
-DEFUN (ieee_write_byte, (abfd, byte),
- bfd * abfd AND
- bfd_byte byte)
+static boolean
+ieee_write_byte (abfd, barg)
+ bfd *abfd;
+ int barg;
{
- bfd_write ((PTR) & byte, 1, 1, abfd);
-}
+ bfd_byte byte;
-static void
-DEFUN (ieee_write_twobyte, (abfd, twobyte),
- bfd * abfd AND
- int twobyte)
-{
- bfd_byte b[2];
- b[1] = twobyte & 0xff;
- b[0] = twobyte >> 8;
- bfd_write ((PTR) & b[0], 1, 2, abfd);
+ byte = barg;
+ if (bfd_write ((PTR) &byte, 1, 1, abfd) != 1)
+ return false;
+ return true;
}
-static void
-DEFUN (ieee_write_2bytes, (abfd, bytes),
- bfd * abfd AND
- int bytes)
+static boolean
+ieee_write_2bytes (abfd, bytes)
+ bfd *abfd;
+ int bytes;
{
bfd_byte buffer[2];
+
buffer[0] = bytes >> 8;
buffer[1] = bytes & 0xff;
-
- bfd_write ((PTR) buffer, 1, 2, abfd);
+ if (bfd_write ((PTR) buffer, 1, 2, abfd) != 2)
+ return false;
+ return true;
}
-static void
-DEFUN (ieee_write_int, (abfd, value),
- bfd * abfd AND
- bfd_vma value)
+static boolean
+ieee_write_int (abfd, value)
+ bfd *abfd;
+ bfd_vma value;
{
- if (((unsigned) value) <= 127)
+ if (value <= 127)
{
- ieee_write_byte (abfd, (bfd_byte) value);
+ if (! ieee_write_byte (abfd, (bfd_byte) value))
+ return false;
}
else
{
unsigned int length;
+
/* How many significant bytes ? */
/* FIXME FOR LONGER INTS */
if (value & 0xff000000)
- {
- length = 4;
- }
+ length = 4;
else if (value & 0x00ff0000)
- {
- length = 3;
- }
+ length = 3;
else if (value & 0x0000ff00)
- {
- length = 2;
- }
+ length = 2;
else
length = 1;
- ieee_write_byte (abfd,
- (bfd_byte) ((int) ieee_number_repeat_start_enum + length));
+ if (! ieee_write_byte (abfd,
+ (bfd_byte) ((int) ieee_number_repeat_start_enum
+ + length)))
+ return false;
switch (length)
{
case 4:
- ieee_write_byte (abfd, (bfd_byte) (value >> 24));
+ if (! ieee_write_byte (abfd, (bfd_byte) (value >> 24)))
+ return false;
+ /* Fall through. */
case 3:
- ieee_write_byte (abfd, (bfd_byte) (value >> 16));
+ if (! ieee_write_byte (abfd, (bfd_byte) (value >> 16)))
+ return false;
+ /* Fall through. */
case 2:
- ieee_write_byte (abfd, (bfd_byte) (value >> 8));
+ if (! ieee_write_byte (abfd, (bfd_byte) (value >> 8)))
+ return false;
+ /* Fall through. */
case 1:
- ieee_write_byte (abfd, (bfd_byte) (value));
+ if (! ieee_write_byte (abfd, (bfd_byte) (value)))
+ return false;
}
}
+
+ return true;
}
-static void
-DEFUN (ieee_write_id, (abfd, id),
- bfd * abfd AND
- CONST char *id)
+static boolean
+ieee_write_id (abfd, id)
+ bfd *abfd;
+ const char *id;
{
size_t length = strlen (id);
+
if (length <= 127)
{
- ieee_write_byte (abfd, (bfd_byte) length);
+ if (! ieee_write_byte (abfd, (bfd_byte) length))
+ return false;
}
else if (length < 255)
{
- ieee_write_byte (abfd, ieee_extension_length_1_enum);
- ieee_write_byte (abfd, (bfd_byte) length);
+ if (! ieee_write_byte (abfd, ieee_extension_length_1_enum)
+ || ! ieee_write_byte (abfd, (bfd_byte) length))
+ return false;
}
else if (length < 65535)
{
- ieee_write_byte (abfd, ieee_extension_length_2_enum);
- ieee_write_byte (abfd, (bfd_byte) (length >> 8));
- ieee_write_byte (abfd, (bfd_byte) (length & 0xff));
+ if (! ieee_write_byte (abfd, ieee_extension_length_2_enum)
+ || ! ieee_write_2bytes (abfd, (int) length))
+ return false;
}
else
{
- BFD_FAIL ();
+ (*_bfd_error_handler)
+ ("%s: string too long (%d chars, max 65535)",
+ bfd_get_filename (abfd), length);
+ bfd_set_error (bfd_error_invalid_operation);
+ return false;
}
- bfd_write ((PTR) id, 1, length, abfd);
+
+ if (bfd_write ((PTR) id, 1, length, abfd) != length)
+ return false;
+ return true;
}
\f
-
/***************************************************************************
Functions for reading from ieee files in the strange way that the
standard requires:
#define this_byte_and_next(ieee) (*((ieee)->input_p++))
static unsigned short
-DEFUN (read_2bytes, (ieee),
- common_header_type * ieee)
+read_2bytes (ieee)
+ common_header_type *ieee;
{
unsigned char c1 = this_byte_and_next (ieee);
unsigned char c2 = this_byte_and_next (ieee);
}
static void
-DEFUN (bfd_get_string, (ieee, string, length),
- common_header_type * ieee AND
- char *string AND
- size_t length)
+bfd_get_string (ieee, string, length)
+ common_header_type *ieee;
+ char *string;
+ size_t length;
{
size_t i;
for (i = 0; i < length; i++)
}
static char *
-DEFUN (read_id, (ieee),
- common_header_type * ieee)
+read_id (ieee)
+ common_header_type *ieee;
{
size_t length;
char *string;
/* Buy memory and read string */
string = bfd_alloc (ieee->abfd, length + 1);
if (!string)
- {
- bfd_error = no_memory;
- return NULL;
- }
+ return NULL;
bfd_get_string (ieee, string, length);
string[length] = 0;
return string;
}
-static void
-DEFUN (ieee_write_expression, (abfd, value, symbol, pcrel, index),
- bfd * abfd AND
- bfd_vma value AND
- asymbol * symbol AND
- boolean pcrel AND
- unsigned int index)
+static boolean
+ieee_write_expression (abfd, value, symbol, pcrel, index)
+ bfd *abfd;
+ bfd_vma value;
+ asymbol *symbol;
+ boolean pcrel;
+ unsigned int index;
{
unsigned int term_count = 0;
if (value != 0)
{
- ieee_write_int (abfd, value);
+ if (! ieee_write_int (abfd, value))
+ return false;
term_count++;
}
if (bfd_is_com_section (symbol->section)
- || symbol->section == &bfd_und_section)
+ || bfd_is_und_section (symbol->section))
{
/* Def of a common symbol */
- ieee_write_byte (abfd, ieee_variable_X_enum);
- ieee_write_int (abfd, symbol->value);
+ if (! ieee_write_byte (abfd, ieee_variable_X_enum)
+ || ! ieee_write_int (abfd, symbol->value))
+ return false;
term_count++;
}
- else if (symbol->section != &bfd_abs_section)
+ else if (! bfd_is_abs_section (symbol->section))
{
/* Ref to defined symbol - */
- ieee_write_byte (abfd, ieee_variable_R_enum);
- ieee_write_byte (abfd,
- (bfd_byte) (symbol->section->index + IEEE_SECTION_NUMBER_BASE));
- term_count++;
if (symbol->flags & BSF_GLOBAL)
{
- ieee_write_byte (abfd, ieee_variable_I_enum);
- ieee_write_int (abfd, symbol->value);
+ if (! ieee_write_byte (abfd, ieee_variable_I_enum)
+ || ! ieee_write_int (abfd, symbol->value))
+ return false;
term_count++;
}
else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
{
- /* This is a reference to a defined local symbol,
- We can easily do a local as a section+offset */
- ieee_write_byte (abfd, ieee_variable_R_enum); /* or L */
- ieee_write_byte (abfd,
- (bfd_byte) (symbol->section->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_int (abfd, symbol->value);
+ /* This is a reference to a defined local symbol. We can
+ easily do a local as a section+offset. */
+ if (! ieee_write_byte (abfd, ieee_variable_R_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (symbol->section->index
+ + IEEE_SECTION_NUMBER_BASE)))
+ return false;
term_count++;
+ if (symbol->value != 0)
+ {
+ if (! ieee_write_int (abfd, symbol->value))
+ return false;
+ term_count++;
+ }
}
else
{
- BFD_FAIL ();
+ (*_bfd_error_handler)
+ ("%s: unrecognized symbol `%s' flags 0x%x",
+ bfd_get_filename (abfd), bfd_asymbol_name (symbol),
+ symbol->flags);
+ bfd_set_error (bfd_error_invalid_operation);
+ return false;
}
}
if (pcrel)
{
/* subtract the pc from here by asking for PC of this section*/
- ieee_write_byte (abfd, ieee_variable_P_enum);
- ieee_write_byte (abfd, (bfd_byte) (index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_byte (abfd, ieee_function_minus_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_P_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (index + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_byte (abfd, ieee_function_minus_enum))
+ return false;
}
- if (term_count == 1)
+ /* Handle the degenerate case of a 0 address. */
+ if (term_count == 0)
{
- ieee_write_byte (abfd, 0);
+ if (! ieee_write_int (abfd, 0))
+ return false;
}
- else
+
+ while (term_count > 1)
{
- while (term_count > 1)
- {
- ieee_write_byte (abfd, ieee_function_plus_enum);
- term_count--;
- }
+ if (! ieee_write_byte (abfd, ieee_function_plus_enum))
+ return false;
+ term_count--;
}
+
+ return true;
}
\f
-
/*****************************************************************************/
/*
writes any integer into the buffer supplied and always takes 5 bytes
*/
static void
-DEFUN (ieee_write_int5, (buffer, value),
- bfd_byte * buffer AND
- bfd_vma value)
+ieee_write_int5 (buffer, value)
+ bfd_byte *buffer;
+ bfd_vma value;
{
buffer[0] = (bfd_byte) ieee_number_repeat_4_enum;
buffer[1] = (value >> 24) & 0xff;
buffer[4] = (value >> 0) & 0xff;
}
-static void
-DEFUN (ieee_write_int5_out, (abfd, value),
- bfd * abfd AND
- bfd_vma value)
+static boolean
+ieee_write_int5_out (abfd, value)
+ bfd *abfd;
+ bfd_vma value;
{
bfd_byte b[5];
+
ieee_write_int5 (b, value);
- bfd_write ((PTR) b, 1, 5, abfd);
+ if (bfd_write ((PTR) b, 1, 5, abfd) != 5)
+ return false;
+ return true;
}
static boolean
-DEFUN (parse_int, (ieee, value_ptr),
- common_header_type * ieee AND
- bfd_vma * value_ptr)
+parse_int (ieee, value_ptr)
+ common_header_type *ieee;
+ bfd_vma *value_ptr;
{
int value = this_byte (ieee);
int result;
}
static int
-DEFUN (parse_i, (ieee, ok),
- common_header_type * ieee AND
- boolean * ok)
+parse_i (ieee, ok)
+ common_header_type *ieee;
+ boolean *ok;
{
bfd_vma x;
*ok = parse_int (ieee, &x);
}
static bfd_vma
-DEFUN (must_parse_int, (ieee),
- common_header_type * ieee)
+must_parse_int (ieee)
+ common_header_type *ieee;
{
bfd_vma result;
BFD_ASSERT (parse_int (ieee, &result) == true);
} ieee_value_type;
-static
-reloc_howto_type abs32_howto
-= HOWTO (1, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "abs32", true, 0xffffffff, 0xffffffff, false);
-static
-reloc_howto_type abs16_howto
-= HOWTO (1, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false);
-
-static
-reloc_howto_type abs8_howto
-= HOWTO (1, 0, 0, 8, false, 0, complain_overflow_bitfield, 0, "abs8", true, 0x000000ff, 0x000000ff, false);
-
-static
-reloc_howto_type rel32_howto
-= HOWTO (1, 0, 2, 32, true, 0, complain_overflow_signed, 0, "rel32", true, 0xffffffff,
- 0xffffffff, false);
+#if KEEPMINUSPCININST
-static
-reloc_howto_type rel16_howto
-= HOWTO (1, 0, 1, 16, true, 0, complain_overflow_signed, 0, "rel16", true, 0x0000ffff, 0x0000ffff, false);
+#define SRC_MASK(arg) arg
+#define PCREL_OFFSET false
-static
-reloc_howto_type rel8_howto
-= HOWTO (1, 0, 0, 8, true, 0, complain_overflow_signed, 0, "rel8", true, 0x000000ff, 0x000000ff, false);
+#else
+#define SRC_MASK(arg) 0
+#define PCREL_OFFSET true
-static ieee_symbol_index_type NOSYMBOL =
-{0, 0};
+#endif
+static reloc_howto_type abs32_howto =
+ HOWTO (1,
+ 0,
+ 2,
+ 32,
+ false,
+ 0,
+ complain_overflow_bitfield,
+ 0,
+ "abs32",
+ true,
+ 0xffffffff,
+ 0xffffffff,
+ false);
+
+static reloc_howto_type abs16_howto =
+ HOWTO (1,
+ 0,
+ 1,
+ 16,
+ false,
+ 0,
+ complain_overflow_bitfield,
+ 0,
+ "abs16",
+ true,
+ 0x0000ffff,
+ 0x0000ffff,
+ false);
+
+static reloc_howto_type abs8_howto =
+ HOWTO (1,
+ 0,
+ 0,
+ 8,
+ false,
+ 0,
+ complain_overflow_bitfield,
+ 0,
+ "abs8",
+ true,
+ 0x000000ff,
+ 0x000000ff,
+ false);
+
+static reloc_howto_type rel32_howto =
+ HOWTO (1,
+ 0,
+ 2,
+ 32,
+ true,
+ 0,
+ complain_overflow_signed,
+ 0,
+ "rel32",
+ true,
+ SRC_MASK (0xffffffff),
+ 0xffffffff,
+ PCREL_OFFSET);
+
+static reloc_howto_type rel16_howto =
+ HOWTO (1,
+ 0,
+ 1,
+ 16,
+ true,
+ 0,
+ complain_overflow_signed,
+ 0,
+ "rel16",
+ true,
+ SRC_MASK (0x0000ffff),
+ 0x0000ffff,
+ PCREL_OFFSET);
+
+static reloc_howto_type rel8_howto =
+ HOWTO (1,
+ 0,
+ 0,
+ 8,
+ true,
+ 0,
+ complain_overflow_signed,
+ 0,
+ "rel8",
+ true,
+ SRC_MASK (0x000000ff),
+ 0x000000ff,
+ PCREL_OFFSET);
+
+static ieee_symbol_index_type NOSYMBOL = {0, 0};
static void
-DEFUN (parse_expression, (ieee, value, symbol, pcrel, extra, section),
- ieee_data_type * ieee AND
- bfd_vma * value AND
- ieee_symbol_index_type * symbol AND
- boolean * pcrel AND
- unsigned int *extra AND
- asection ** section)
+parse_expression (ieee, value, symbol, pcrel, extra, section)
+ ieee_data_type *ieee;
+ bfd_vma *value;
+ ieee_symbol_index_type *symbol;
+ boolean *pcrel;
+ unsigned int *extra;
+ asection **section;
{
#define POS sp[1]
next_byte (&(ieee->h));
*pcrel = true;
section_n = must_parse_int (&(ieee->h));
- PUSH (NOSYMBOL, &bfd_abs_section,
- TOS.value = ieee->section_table[section_n]->vma +
- ieee_per_section (ieee->section_table[section_n])->pc);
+ PUSH (NOSYMBOL, bfd_abs_section_ptr, 0);
break;
}
case ieee_variable_L_enum:
ieee->section_table[must_parse_int (&(ieee->h))]->_raw_size);
break;
case ieee_variable_I_enum:
+ /* Push the address of variable n */
+ {
+ ieee_symbol_index_type sy;
+ next_byte (&(ieee->h));
+ sy.index = (int) must_parse_int (&(ieee->h));
+ sy.letter = 'I';
+
+ PUSH (sy, bfd_abs_section_ptr, 0);
+ }
+ break;
case ieee_variable_X_enum:
/* Push the address of external variable n */
{
sy.index = (int) (must_parse_int (&(ieee->h)));
sy.letter = 'X';
- PUSH (sy, &bfd_und_section, 0);
+ PUSH (sy, bfd_und_section_ptr, 0);
}
break;
case ieee_function_minus_enum:
POP (sy, section1, value1);
POP (sy, section_dummy, value2);
- PUSH (sy, section1 ? section1 : section_dummy, value1 - value2);
+ PUSH (sy, section1 ? section1 : section_dummy, value2 - value1);
}
break;
case ieee_function_plus_enum:
POP (sy1, section1, value1);
POP (sy2, section2, value2);
- PUSH (sy1.letter ? sy1 : sy2, section1 != &bfd_abs_section ? section1 : section2, value1 + value2);
+ PUSH (sy1.letter ? sy1 : sy2,
+ bfd_is_abs_section (section1) ? section2 : section1,
+ value1 + value2);
}
break;
default:
|| this_byte (&(ieee->h)) > (int) ieee_variable_Z_enum);
if (parse_int (&(ieee->h), &va))
{
- PUSH (NOSYMBOL, &bfd_abs_section, va);
+ PUSH (NOSYMBOL, bfd_abs_section_ptr, va);
}
else
{
#define ieee_seek(abfd, offset) \
IEEE_DATA(abfd)->h.input_p = IEEE_DATA(abfd)->h.first_byte + offset
-#define ieee_pos(abfd) IEEE_DATA(abfd)->h.input_p -IEEE_DATA(abfd)->h.first_byte
+#define ieee_pos(abfd) \
+ (IEEE_DATA(abfd)->h.input_p - IEEE_DATA(abfd)->h.first_byte)
static unsigned int last_index;
static char last_type; /* is the index for an X or a D */
static ieee_symbol_type *
-DEFUN (get_symbol, (abfd,
- ieee,
- last_symbol,
- symbol_count,
- pptr,
- max_index,
- this_type
- ),
- bfd * abfd AND
- ieee_data_type * ieee AND
- ieee_symbol_type * last_symbol AND
- unsigned int *symbol_count AND
- ieee_symbol_type *** pptr AND
- unsigned int *max_index AND
- char this_type
+get_symbol (abfd,
+ ieee,
+ last_symbol,
+ symbol_count,
+ pptr,
+ max_index,
+ this_type
)
+ bfd *abfd;
+ ieee_data_type *ieee;
+ ieee_symbol_type *last_symbol;
+ unsigned int *symbol_count;
+ ieee_symbol_type ***pptr;
+ unsigned int *max_index;
+ char this_type
+ ;
{
/* Need a new symbol */
unsigned int new_index = must_parse_int (&(ieee->h));
ieee_symbol_type *new_symbol = (ieee_symbol_type *) bfd_alloc (ieee->h.abfd,
sizeof (ieee_symbol_type));
if (!new_symbol)
- {
- bfd_error = no_memory;
- return NULL;
- }
+ return NULL;
new_symbol->index = new_index;
last_index = new_index;
*max_index = new_index;
}
last_type = this_type;
+ new_symbol->symbol.section = bfd_abs_section_ptr;
return new_symbol;
}
return last_symbol;
}
-static void
-DEFUN (ieee_slurp_external_symbols, (abfd),
- bfd * abfd)
+static boolean
+ieee_slurp_external_symbols (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
file_ptr offset = ieee->w.r.external_part;
symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
&prev_symbols_ptr,
- &ieee->external_symbol_max_index, 'D');
-
+ &ieee->external_symbol_max_index, 'I');
+ if (symbol == NULL)
+ return false;
symbol->symbol.the_bfd = abfd;
symbol->symbol.name = read_id (&(ieee->h));
- symbol->symbol.udata = (PTR) NULL;
+ symbol->symbol.udata.p = (PTR) NULL;
symbol->symbol.flags = BSF_NO_FLAGS;
break;
case ieee_external_symbol_enum:
symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
&prev_symbols_ptr,
&ieee->external_symbol_max_index, 'D');
-
+ if (symbol == NULL)
+ return false;
BFD_ASSERT (symbol->index >= ieee->external_symbol_min_index);
symbol->symbol.the_bfd = abfd;
symbol->symbol.name = read_id (&(ieee->h));
- symbol->symbol.udata = (PTR) NULL;
+ symbol->symbol.udata.p = (PTR) NULL;
symbol->symbol.flags = BSF_NO_FLAGS;
break;
case ieee_attribute_record_enum >> 8:
unsigned int symbol_type_index;
unsigned int symbol_attribute_def;
bfd_vma value;
- next_byte (&(ieee->h)); /* Skip prefix */
- next_byte (&(ieee->h));
- symbol_name_index = must_parse_int (&(ieee->h));
- symbol_type_index = must_parse_int (&(ieee->h));
- symbol_attribute_def = must_parse_int (&(ieee->h));
- switch (symbol_attribute_def)
+ switch (read_2bytes (ieee))
{
- case 63:
- /* Module misc; followed by two fields which describe the
- current module block. The first fired is the type id
- number, the second is the number of asn records
- associated with the directive */
+ case ieee_attribute_record_enum:
+ symbol_name_index = must_parse_int (&(ieee->h));
+ symbol_type_index = must_parse_int (&(ieee->h));
+ symbol_attribute_def = must_parse_int (&(ieee->h));
+ switch (symbol_attribute_def)
+ {
+ case 8:
+ case 19:
+ parse_int (&ieee->h, &value);
+ break;
+ default:
+ (*_bfd_error_handler)
+ ("%s: unimplemented ATI record %u for symbol %u",
+ bfd_get_filename (abfd), symbol_attribute_def,
+ symbol_name_index);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ break;
+ }
+ break;
+ case ieee_external_reference_info_record_enum:
+ /* Skip over ATX record. */
+ parse_int (&(ieee->h), &value);
parse_int (&(ieee->h), &value);
parse_int (&(ieee->h), &value);
- break;
-
- default:
parse_int (&(ieee->h), &value);
break;
}
value = 0;
}
/* This turns into a common */
- symbol->symbol.section = &bfd_com_section;
+ symbol->symbol.section = bfd_com_section_ptr;
symbol->symbol.value = size;
}
break;
symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
&prev_reference_ptr,
&ieee->external_reference_max_index, 'X');
-
+ if (symbol == NULL)
+ return false;
symbol->symbol.the_bfd = abfd;
symbol->symbol.name = read_id (&(ieee->h));
- symbol->symbol.udata = (PTR) NULL;
- symbol->symbol.section = &bfd_und_section;
+ symbol->symbol.udata.p = (PTR) NULL;
+ symbol->symbol.section = bfd_und_section_ptr;
symbol->symbol.value = (bfd_vma) 0;
symbol->symbol.flags = 0;
*prev_symbols_ptr = (ieee_symbol_type *) NULL;
*prev_reference_ptr = (ieee_symbol_type *) NULL;
+
+ return true;
}
-static void
-DEFUN (ieee_slurp_symbol_table, (abfd),
- bfd * abfd)
+static boolean
+ieee_slurp_symbol_table (abfd)
+ bfd *abfd;
{
if (IEEE_DATA (abfd)->read_symbols == false)
{
- ieee_slurp_external_symbols (abfd);
+ if (! ieee_slurp_external_symbols (abfd))
+ return false;
IEEE_DATA (abfd)->read_symbols = true;
}
+ return true;
}
-unsigned int
-DEFUN (ieee_get_symtab_upper_bound, (abfd),
- bfd * abfd)
+long
+ieee_get_symtab_upper_bound (abfd)
+ bfd *abfd;
{
- ieee_slurp_symbol_table (abfd);
+ if (! ieee_slurp_symbol_table (abfd))
+ return -1;
return (abfd->symcount != 0) ?
(abfd->symcount + 1) * (sizeof (ieee_symbol_type *)) : 0;
symbol index order
*/
-extern bfd_target ieee_vec;
+extern const bfd_target ieee_vec;
-unsigned int
-DEFUN (ieee_get_symtab, (abfd, location),
- bfd * abfd AND
- asymbol ** location)
+long
+ieee_get_symtab (abfd, location)
+ bfd *abfd;
+ asymbol **location;
{
ieee_symbol_type *symp;
static bfd dummy_bfd;
static asymbol empty_symbol =
/* the_bfd, name, value, attr, section */
- {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, &bfd_abs_section};
+ {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, bfd_abs_section_ptr};
if (abfd->symcount)
{
ieee_data_type *ieee = IEEE_DATA (abfd);
dummy_bfd.xvec = &ieee_vec;
- ieee_slurp_symbol_table (abfd);
+ if (! ieee_slurp_symbol_table (abfd))
+ return -1;
if (ieee->symbol_table_full == false)
{
}
static asection *
-DEFUN (get_section_entry, (abfd, ieee, index),
- bfd * abfd AND
- ieee_data_type * ieee AND
- unsigned int index)
+get_section_entry (abfd, ieee, index)
+ bfd *abfd;
+ ieee_data_type *ieee;
+ unsigned int index;
{
+ if (index >= ieee->section_table_size)
+ {
+ unsigned int c, i;
+ asection **n;
+
+ c = ieee->section_table_size;
+ if (c == 0)
+ c = 20;
+ while (c <= index)
+ c *= 2;
+
+ n = ((asection **)
+ bfd_realloc (ieee->section_table, c * sizeof (asection *)));
+ if (n == NULL)
+ return NULL;
+
+ for (i = ieee->section_table_size; i < c; i++)
+ n[i] = NULL;
+
+ ieee->section_table = n;
+ ieee->section_table_size = c;
+ }
+
if (ieee->section_table[index] == (asection *) NULL)
{
char *tmp = bfd_alloc (abfd, 11);
asection *section;
if (!tmp)
- {
- bfd_error = no_memory;
- return NULL;
- }
+ return NULL;
sprintf (tmp, " fsec%4d", index);
section = bfd_make_section (abfd, tmp);
ieee->section_table[index] = section;
}
static void
-DEFUN (ieee_slurp_sections, (abfd),
- bfd * abfd)
+ieee_slurp_sections (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
file_ptr offset = ieee->w.r.section_part;
unsigned int section_index;
next_byte (&(ieee->h));
section_index = must_parse_int (&(ieee->h));
- /* Fixme to be nice about a silly number of sections */
- BFD_ASSERT (section_index < NSECTIONS);
section = get_section_entry (abfd, ieee, section_index);
section_type[0] = this_byte_and_next (&(ieee->h));
+
+ /* Set minimal section attributes. Attributes are
+ extended later, based on section contents. */
+
switch (section_type[0])
{
case 0xC1:
/* Normal attributes for absolute sections */
section_type[1] = this_byte (&(ieee->h));
- section->flags = SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+ section->flags = SEC_ALLOC;
switch (section_type[1])
{
case 0xD3: /* AS Absolute section attributes */
case 0xD0:
/* Normal code */
next_byte (&(ieee->h));
- section->flags |= SEC_LOAD | SEC_CODE;
+ section->flags |= SEC_CODE;
break;
case 0xC4:
- next_byte (&(ieee->h));
- section->flags |= SEC_LOAD | SEC_DATA;
/* Normal data */
+ next_byte (&(ieee->h));
+ section->flags |= SEC_DATA;
break;
case 0xD2:
next_byte (&(ieee->h));
/* Normal rom data */
- section->flags |= SEC_LOAD | SEC_ROM | SEC_DATA;
+ section->flags |= SEC_ROM | SEC_DATA;
break;
default:
break;
break;
case 0xC3: /* Named relocatable sections (type C) */
section_type[1] = this_byte (&(ieee->h));
- section->flags = SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+ section->flags = SEC_ALLOC;
switch (section_type[1])
{
case 0xD0: /* Normal code (CP) */
next_byte (&(ieee->h));
- section->flags |= SEC_LOAD | SEC_CODE;
+ section->flags |= SEC_CODE;
break;
case 0xC4: /* Normal data (CD) */
next_byte (&(ieee->h));
- section->flags |= SEC_LOAD | SEC_DATA;
+ section->flags |= SEC_DATA;
break;
case 0xD2: /* Normal rom data (CR) */
next_byte (&(ieee->h));
- section->flags |= SEC_LOAD | SEC_ROM | SEC_DATA;
+ section->flags |= SEC_ROM | SEC_DATA;
break;
default:
break;
case ieee_region_base_address_enum:
section = ieee->section_table[must_parse_int (&(ieee->h))];
section->vma = must_parse_int (&(ieee->h));
+ section->lma = section->vma;
break;
case ieee_mau_size_enum:
must_parse_int (&(ieee->h));
case ieee_section_base_address_enum:
section = ieee->section_table[must_parse_int (&(ieee->h))];
section->vma = must_parse_int (&(ieee->h));
+ section->lma = section->vma;
break;
case ieee_section_offset_enum:
(void) must_parse_int (&(ieee->h));
}
}
}
-\f
+/* Make a section for the debugging information, if any. We don't try
+ to interpret the debugging information; we just point the section
+ at the area in the file so that program which understand can dig it
+ out. */
+
+static boolean
+ieee_slurp_debug (abfd)
+ bfd *abfd;
+{
+ ieee_data_type *ieee = IEEE_DATA (abfd);
+ asection *sec;
+
+ if (ieee->w.r.debug_information_part == 0)
+ return true;
+
+ sec = bfd_make_section (abfd, ".debug");
+ if (sec == NULL)
+ return false;
+ sec->flags |= SEC_DEBUGGING | SEC_HAS_CONTENTS;
+ sec->filepos = ieee->w.r.debug_information_part;
+ sec->_raw_size = ieee->w.r.data_part - ieee->w.r.debug_information_part;
+
+ return true;
+}
+\f
/***********************************************************************
* archive stuff
*/
-bfd_target *
-DEFUN (ieee_archive_p, (abfd),
- bfd * abfd)
+const bfd_target *
+ieee_archive_p (abfd)
+ bfd *abfd;
{
char *library;
boolean loop;
-
unsigned int i;
unsigned char buffer[512];
- struct obstack ob;
file_ptr buffer_offset = 0;
ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
ieee_ar_data_type *ieee;
abfd->tdata.ieee_ar_data = (ieee_ar_data_type *) bfd_alloc (abfd, sizeof (ieee_ar_data_type));
if (!abfd->tdata.ieee_ar_data)
- {
- bfd_error = no_memory;
- return NULL;
- }
+ return NULL;
ieee = IEEE_AR_DATA (abfd);
+ /* FIXME: Check return value. I'm not sure whether it needs to read
+ the entire buffer or not. */
bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
ieee->h.first_byte = buffer;
if (this_byte (&(ieee->h)) != Module_Beginning)
{
abfd->tdata.ieee_ar_data = save;
- return (bfd_target *) NULL;
+ return (const bfd_target *) NULL;
}
next_byte (&(ieee->h));
{
bfd_release (abfd, ieee);
abfd->tdata.ieee_ar_data = save;
- return (bfd_target *) NULL;
+ return (const bfd_target *) NULL;
}
/* Throw away the filename */
read_id (&(ieee->h));
- /* This must be an IEEE archive, so we'll buy some space to do
- things */
-
- if (!obstack_begin (&ob, 128))
- {
- bfd_error = no_memory;
- return (bfd_target *) NULL;
- }
ieee->element_count = 0;
ieee->element_index = 0;
t.abfd = (bfd *) NULL;
ieee->element_count++;
- obstack_grow (&ob, (PTR) & t, sizeof (t));
+ bfd_alloc_grow (abfd, (PTR) &t, sizeof t);
/* Make sure that we don't go over the end of the buffer */
- if (ieee_pos (abfd) > sizeof (buffer) / 2)
+ if ((size_t) ieee_pos (abfd) > sizeof (buffer) / 2)
{
/* Past half way, reseek and reprime */
buffer_offset += ieee_pos (abfd);
- bfd_seek (abfd, buffer_offset, SEEK_SET);
+ if (bfd_seek (abfd, buffer_offset, SEEK_SET) != 0)
+ return NULL;
+ /* FIXME: Check return value. I'm not sure whether it
+ needs to read the entire buffer or not. */
bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
ieee->h.first_byte = buffer;
ieee->h.input_p = buffer;
loop = false;
}
- ieee->elements = (ieee_ar_obstack_type *) obstack_finish (&ob);
+ ieee->elements = (ieee_ar_obstack_type *) bfd_alloc_finish (abfd);
if (!ieee->elements)
- {
- bfd_error = no_memory;
- return (bfd_target *) NULL;
- }
+ return (const bfd_target *) NULL;
/* Now scan the area again, and replace BB offsets with file */
/* offsets */
for (i = 2; i < ieee->element_count; i++)
{
- bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET);
+ if (bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET) != 0)
+ return NULL;
+ /* FIXME: Check return value. I'm not sure whether it needs to
+ read the entire buffer or not. */
bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
ieee->h.first_byte = buffer;
ieee->h.input_p = buffer;
}
static boolean
-DEFUN (ieee_mkobject, (abfd),
- bfd * abfd)
+ieee_mkobject (abfd)
+ bfd *abfd;
{
abfd->tdata.ieee_data = (ieee_data_type *) bfd_zalloc (abfd, sizeof (ieee_data_type));
return abfd->tdata.ieee_data ? true : false;
}
-bfd_target *
-DEFUN (ieee_object_p, (abfd),
- bfd * abfd)
+const bfd_target *
+ieee_object_p (abfd)
+ bfd *abfd;
{
char *processor;
unsigned int part;
ieee_mkobject (abfd);
ieee = IEEE_DATA (abfd);
- bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
+ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+ goto fail;
/* Read the first few bytes in to see if it makes sense */
+ /* FIXME: Check return value. I'm not sure whether it needs to read
+ the entire buffer or not. */
bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
ieee->h.input_p = buffer;
if (this_byte_and_next (&(ieee->h)) != Module_Beginning)
- goto fail;
+ goto got_wrong_format;
ieee->read_symbols = false;
ieee->read_data = false;
ieee->external_reference_min_index = IEEE_REFERENCE_BASE;
ieee->external_reference_max_index = 0;
ieee->h.abfd = abfd;
- memset ((PTR) ieee->section_table, 0, sizeof (ieee->section_table));
+ ieee->section_table = NULL;
+ ieee->section_table_size = 0;
processor = ieee->mb.processor = read_id (&(ieee->h));
if (strcmp (processor, "LIBRARY") == 0)
- goto fail;
+ goto got_wrong_format;
ieee->mb.module_name = read_id (&(ieee->h));
if (abfd->filename == (CONST char *) NULL)
{
/* Determine the architecture and machine type of the object file.
*/
{
- bfd_arch_info_type *arch = bfd_scan_arch (processor);
+ const bfd_arch_info_type *arch = bfd_scan_arch (processor);
if (arch == 0)
- goto fail;
+ goto got_wrong_format;
abfd->arch_info = arch;
}
}
}
- abfd->flags = HAS_SYMS;
-/* By now we know that this is a real IEEE file, we're going to read
- the whole thing into memory so that we can run up and down it
- quickly. We can work out how big the file is from the trailer
- record */
- IEEE_DATA (abfd)->h.first_byte = (unsigned char *) bfd_alloc (ieee->h.abfd, ieee->w.r.me_record
- + 50);
+ if (ieee->w.r.external_part != 0)
+ abfd->flags = HAS_SYMS;
+
+ /* By now we know that this is a real IEEE file, we're going to read
+ the whole thing into memory so that we can run up and down it
+ quickly. We can work out how big the file is from the trailer
+ record */
+
+ IEEE_DATA (abfd)->h.first_byte =
+ (unsigned char *) bfd_alloc (ieee->h.abfd, ieee->w.r.me_record + 1);
if (!IEEE_DATA (abfd)->h.first_byte)
- {
- bfd_error = no_memory;
- goto fail;
- }
- bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
- bfd_read ((PTR) (IEEE_DATA (abfd)->h.first_byte), 1, ieee->w.r.me_record + 50, abfd);
+ goto fail;
+ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+ goto fail;
+ /* FIXME: Check return value. I'm not sure whether it needs to read
+ the entire buffer or not. */
+ bfd_read ((PTR) (IEEE_DATA (abfd)->h.first_byte), 1,
+ ieee->w.r.me_record + 1, abfd);
ieee_slurp_sections (abfd);
+
+ if (! ieee_slurp_debug (abfd))
+ goto fail;
+
+ /* Parse section data to activate file and section flags implied by
+ section contents. */
+
+ if (! ieee_slurp_section_data (abfd))
+ goto fail;
+
return abfd->xvec;
+got_wrong_format:
+ bfd_set_error (bfd_error_wrong_format);
fail:
(void) bfd_release (abfd, ieee);
abfd->tdata.ieee_data = save;
- return (bfd_target *) NULL;
+ return (const bfd_target *) NULL;
}
void
-DEFUN (ieee_get_symbol_info, (ignore_abfd, symbol, ret),
- bfd * ignore_abfd AND
- asymbol * symbol AND
- symbol_info * ret)
+ieee_get_symbol_info (ignore_abfd, symbol, ret)
+ bfd *ignore_abfd;
+ asymbol *symbol;
+ symbol_info *ret;
{
bfd_symbol_info (symbol, ret);
if (symbol->name[0] == ' ')
}
void
-DEFUN (ieee_print_symbol, (ignore_abfd, afile, symbol, how),
- bfd * ignore_abfd AND
- PTR afile AND
- asymbol * symbol AND
- bfd_print_symbol_type how)
+ieee_print_symbol (ignore_abfd, afile, symbol, how)
+ bfd *ignore_abfd;
+ PTR afile;
+ asymbol *symbol;
+ bfd_print_symbol_type how;
{
FILE *file = (FILE *) afile;
break;
case bfd_print_symbol_all:
{
- CONST char *section_name = symbol->section == (asection *) NULL ?
- (CONST char *) "*abs" : symbol->section->name;
+ const char *section_name =
+ (symbol->section == (asection *) NULL
+ ? "*abs"
+ : symbol->section->name);
if (symbol->name[0] == ' ')
{
fprintf (file, "* empty table entry ");
fprintf (file, " %-5s %04x %02x %s",
section_name,
(unsigned) ieee_symbol (symbol)->index,
- (unsigned) 0, /*
- aout_symbol(symbol)->desc & 0xffff,
- aout_symbol(symbol)->other & 0xff,*/
+ (unsigned) 0,
symbol->name);
}
}
}
static boolean
-DEFUN (do_one, (ieee, current_map, location_ptr, s),
- ieee_data_type * ieee AND
- ieee_per_section_type * current_map AND
- unsigned char *location_ptr AND
- asection * s)
+do_one (ieee, current_map, location_ptr, s, iterations)
+ ieee_data_type *ieee;
+ ieee_per_section_type *current_map;
+ unsigned char *location_ptr;
+ asection *s;
+ int iterations;
{
switch (this_byte (&(ieee->h)))
{
(ieee_reloc_type *) bfd_alloc (ieee->h.abfd,
sizeof (ieee_reloc_type));
if (!r)
- {
- bfd_error = no_memory;
- return false;
- }
+ return false;
*(current_map->reloc_tail_ptr) = r;
current_map->reloc_tail_ptr = &r->next;
&r->symbol,
&pcrel, &extra, §ion);
r->relent.address = current_map->pc;
+ s->flags |= SEC_RELOC;
+ s->owner->flags |= HAS_RELOC;
s->reloc_count++;
if (r->relent.sym_ptr_ptr == 0)
{
}
/* Build a relocation entry for this type */
/* If pc rel then stick -ve pc into instruction
- and take out of reloc ..
+ and take out of reloc ..
- I've changed this. It's all too
- complicated. I keep 0 in the
- instruction now.
- */
+ I've changed this. It's all too complicated. I
+ keep 0 in the instruction now. */
switch (extra)
{
default:
BFD_FAIL ();
- break;
+ return false;
}
}
break;
}
}
}
+
+ /* Prevent more than the first load-item of an LR record
+ from being repeated (MRI convention). */
+ if (iterations != 1)
+ loop = false;
}
}
}
/* Read in all the section data and relocation stuff too */
static boolean
-DEFUN (ieee_slurp_section_data, (abfd),
- bfd * abfd)
+ieee_slurp_section_data (abfd)
+ bfd *abfd;
{
bfd_byte *location_ptr = (bfd_byte *) NULL;
ieee_data_type *ieee = IEEE_DATA (abfd);
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
ieee_per_section_type *per = (ieee_per_section_type *) s->used_by_bfd;
+ if ((s->flags & SEC_DEBUGGING) != 0)
+ continue;
per->data = (bfd_byte *) bfd_alloc (ieee->h.abfd, s->_raw_size);
if (!per->data)
- {
- bfd_error = no_memory;
- return false;
- }
+ return false;
/*SUPPRESS 68*/
per->reloc_tail_ptr =
(ieee_reloc_type **) & (s->relocation);
next_byte (&(ieee->h));
section_number = must_parse_int (&(ieee->h));
s = ieee->section_table[section_number];
+ s->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
current_map = (ieee_per_section_type *) s->used_by_bfd;
location_ptr = current_map->data - s->vma;
/* The document I have says that Microtec's compilers reset */
break;
case ieee_value_starting_address_enum & 0xff:
+ next_byte (&(ieee->h));
+ if (this_byte (&(ieee->h)) == ieee_function_either_open_b_enum)
+ next_byte (&(ieee->h));
+ abfd->start_address = must_parse_int (&(ieee->h));
/* We've got to the end of the data now - */
return true;
default:
BFD_FAIL ();
- return true;
+ return false;
}
break;
case ieee_repeat_data_enum:
while (iterations != 0)
{
ieee->h.input_p = start;
- if (!do_one (ieee, current_map, location_ptr, s))
+ if (!do_one (ieee, current_map, location_ptr, s,
+ iterations))
return false;
iterations--;
}
case ieee_load_constant_bytes_enum:
case ieee_load_with_relocation_enum:
{
- if (!do_one (ieee, current_map, location_ptr, s))
+ if (!do_one (ieee, current_map, location_ptr, s, 1))
return false;
}
}
}
boolean
-DEFUN (ieee_new_section_hook, (abfd, newsect),
- bfd * abfd AND
- asection * newsect)
+ieee_new_section_hook (abfd, newsect)
+ bfd *abfd;
+ asection *newsect;
{
newsect->used_by_bfd = (PTR)
bfd_alloc (abfd, sizeof (ieee_per_section_type));
if (!newsect->used_by_bfd)
- {
- bfd_error = no_memory;
- return false;
- }
+ return false;
ieee_per_section (newsect)->data = (bfd_byte *) NULL;
ieee_per_section (newsect)->section = newsect;
return true;
}
-unsigned int
-DEFUN (ieee_get_reloc_upper_bound, (abfd, asect),
- bfd * abfd AND
- sec_ptr asect)
+long
+ieee_get_reloc_upper_bound (abfd, asect)
+ bfd *abfd;
+ sec_ptr asect;
{
- ieee_slurp_section_data (abfd);
+ if ((asect->flags & SEC_DEBUGGING) != 0)
+ return 0;
+ if (! ieee_slurp_section_data (abfd))
+ return -1;
return (asect->reloc_count + 1) * sizeof (arelent *);
}
static boolean
-DEFUN (ieee_get_section_contents, (abfd, section, location, offset, count),
- bfd * abfd AND
- sec_ptr section AND
- PTR location AND
- file_ptr offset AND
- bfd_size_type count)
+ieee_get_section_contents (abfd, section, location, offset, count)
+ bfd *abfd;
+ sec_ptr section;
+ PTR location;
+ file_ptr offset;
+ bfd_size_type count;
{
ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;
+ if ((section->flags & SEC_DEBUGGING) != 0)
+ return _bfd_generic_get_section_contents (abfd, section, location,
+ offset, count);
ieee_slurp_section_data (abfd);
(void) memcpy ((PTR) location, (PTR) (p->data + offset), (unsigned) count);
return true;
}
-unsigned int
-DEFUN (ieee_canonicalize_reloc, (abfd, section, relptr, symbols),
- bfd * abfd AND
- sec_ptr section AND
- arelent ** relptr AND
- asymbol ** symbols)
+long
+ieee_canonicalize_reloc (abfd, section, relptr, symbols)
+ bfd *abfd;
+ sec_ptr section;
+ arelent **relptr;
+ asymbol **symbols;
{
/* ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;*/
ieee_reloc_type *src = (ieee_reloc_type *) (section->relocation);
ieee_data_type *ieee = IEEE_DATA (abfd);
+ if ((section->flags & SEC_DEBUGGING) != 0)
+ return 0;
+
while (src != (ieee_reloc_type *) NULL)
{
/* Work out which symbol to attach it this reloc to */
switch (src->symbol.letter)
{
+ case 'I':
+ src->relent.sym_ptr_ptr =
+ symbols + src->symbol.index + ieee->external_symbol_base_offset;
+ break;
case 'X':
src->relent.sym_ptr_ptr =
symbols + src->symbol.index + ieee->external_reference_base_offset;
}
static int
-DEFUN (comp, (ap, bp),
- CONST PTR ap AND
- CONST PTR bp)
+comp (ap, bp)
+ CONST PTR ap;
+ CONST PTR bp;
{
arelent *a = *((arelent **) ap);
arelent *b = *((arelent **) bp);
return a->address - b->address;
}
-/*
-Write the section headers
-*/
+/* Write the section headers. */
-static void
-DEFUN (ieee_write_section_part, (abfd),
- bfd * abfd)
+static boolean
+ieee_write_section_part (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
asection *s;
ieee->w.r.section_part = bfd_tell (abfd);
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
- if (s != &bfd_abs_section)
+ if (! bfd_is_abs_section (s)
+ && (s->flags & SEC_DEBUGGING) == 0)
{
- ieee_write_byte (abfd, ieee_section_type_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
+ if (! ieee_write_byte (abfd, ieee_section_type_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index
+ + IEEE_SECTION_NUMBER_BASE)))
+ return false;
if (abfd->flags & EXEC_P)
{
/* This image is executable, so output absolute sections */
- ieee_write_byte (abfd, ieee_variable_A_enum);
- ieee_write_byte (abfd, ieee_variable_S_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_A_enum)
+ || ! ieee_write_byte (abfd, ieee_variable_S_enum))
+ return false;
}
else
{
- ieee_write_byte (abfd, ieee_variable_C_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_C_enum))
+ return false;
}
switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
{
case SEC_CODE | SEC_LOAD:
case SEC_CODE:
- ieee_write_byte (abfd, ieee_variable_P_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_P_enum))
+ return false;
break;
case SEC_DATA:
default:
- ieee_write_byte (abfd, ieee_variable_D_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_D_enum))
+ return false;
break;
case SEC_ROM:
case SEC_ROM | SEC_DATA:
case SEC_ROM | SEC_LOAD:
case SEC_ROM | SEC_DATA | SEC_LOAD:
-
- ieee_write_byte (abfd, ieee_variable_R_enum);
+ if (! ieee_write_byte (abfd, ieee_variable_R_enum))
+ return false;
}
- ieee_write_id (abfd, s->name);
+ if (! ieee_write_id (abfd, s->name))
+ return false;
#if 0
ieee_write_int (abfd, 0); /* Parent */
ieee_write_int (abfd, 0); /* Brother */
ieee_write_int (abfd, 0); /* Context */
#endif
/* Alignment */
- ieee_write_byte (abfd, ieee_section_alignment_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_int (abfd, 1 << s->alignment_power);
+ if (! ieee_write_byte (abfd, ieee_section_alignment_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index
+ + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_int (abfd, 1 << s->alignment_power))
+ return false;
/* Size */
- ieee_write_2bytes (abfd, ieee_section_size_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_int (abfd, s->_raw_size);
+ if (! ieee_write_2bytes (abfd, ieee_section_size_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index
+ + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_int (abfd, s->_raw_size))
+ return false;
if (abfd->flags & EXEC_P)
{
/* Relocateable sections don't have asl records */
/* Vma */
- ieee_write_2bytes (abfd, ieee_section_base_address_enum);
- ieee_write_byte (abfd,
- (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_int (abfd, s->vma);
+ if (! ieee_write_2bytes (abfd, ieee_section_base_address_enum)
+ || ! ieee_write_byte (abfd,
+ ((bfd_byte)
+ (s->index
+ + IEEE_SECTION_NUMBER_BASE)))
+ || ! ieee_write_int (abfd, s->lma))
+ return false;
}
}
-
}
+
+ return true;
}
static boolean
-DEFUN (do_with_relocs, (abfd, s),
- bfd * abfd AND
- asection * s)
+do_with_relocs (abfd, s)
+ bfd *abfd;
+ asection *s;
{
+ unsigned int number_of_maus_in_address =
+ bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd);
unsigned int relocs_to_go = s->reloc_count;
-
bfd_byte *stream = ieee_per_section (s)->data;
arelent **p = s->orelocation;
-
bfd_size_type current_byte_index = 0;
qsort (s->orelocation,
comp);
/* Output the section preheader */
- ieee_write_byte (abfd, ieee_set_current_section_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-
- ieee_write_twobyte (abfd, ieee_set_current_pc_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_expression (abfd, 0, s->symbol, 0, 0);
+ if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_2bytes (abfd, ieee_set_current_pc_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE)))
+ return false;
+ if ((abfd->flags & EXEC_P) != 0 && relocs_to_go == 0)
+ {
+ if (! ieee_write_int (abfd, s->lma))
+ return false;
+ }
+ else
+ {
+ if (! ieee_write_expression (abfd, 0, s->symbol, 0, 0))
+ return false;
+ }
if (relocs_to_go == 0)
{
- /* If there arn't any relocations then output the load constant byte
- opcode rather than the load with relocation opcode */
+ /* If there aren't any relocations then output the load constant
+ byte opcode rather than the load with relocation opcode */
while (current_byte_index < s->_raw_size)
{
bfd_size_type run;
- unsigned int MAXRUN = 32;
+ unsigned int MAXRUN = 127;
run = MAXRUN;
if (run > s->_raw_size - current_byte_index)
{
if (run != 0)
{
- ieee_write_byte (abfd, ieee_load_constant_bytes_enum);
+ if (! ieee_write_byte (abfd, ieee_load_constant_bytes_enum))
+ return false;
/* Output a stream of bytes */
- ieee_write_int (abfd, run);
- bfd_write ((PTR) (stream + current_byte_index),
- 1,
- run,
- abfd);
+ if (! ieee_write_int (abfd, run))
+ return false;
+ if (bfd_write ((PTR) (stream + current_byte_index),
+ 1,
+ run,
+ abfd)
+ != run)
+ return false;
current_byte_index += run;
}
}
}
else
{
- ieee_write_byte (abfd, ieee_load_with_relocation_enum);
-
+ if (! ieee_write_byte (abfd, ieee_load_with_relocation_enum))
+ return false;
/* Output the data stream as the longest sequence of bytes
- possible, allowing for the a reasonable packet size and
- relocation stuffs */
+ possible, allowing for the a reasonable packet size and
+ relocation stuffs. */
if ((PTR) stream == (PTR) NULL)
{
/* Outputting a section without data, fill it up */
stream = (unsigned char *) (bfd_alloc (abfd, s->_raw_size));
if (!stream)
- {
- bfd_error = no_memory;
- return false;
- }
- memset ((PTR) stream, 0, s->_raw_size);
+ return false;
+ memset ((PTR) stream, 0, (size_t) s->_raw_size);
}
while (current_byte_index < s->_raw_size)
{
bfd_size_type run;
- unsigned int MAXRUN = 32;
+ unsigned int MAXRUN = 127;
if (relocs_to_go)
{
run = (*p)->address - current_byte_index;
+ if (run > MAXRUN)
+ run = MAXRUN;
}
else
{
if (run != 0)
{
/* Output a stream of bytes */
- ieee_write_int (abfd, run);
- bfd_write ((PTR) (stream + current_byte_index),
- 1,
- run,
- abfd);
+ if (! ieee_write_int (abfd, run))
+ return false;
+ if (bfd_write ((PTR) (stream + current_byte_index),
+ 1,
+ run,
+ abfd)
+ != run)
+ return false;
current_byte_index += run;
}
/* Output any relocations here */
if (relocs_to_go && (*p) && (*p)->address == current_byte_index)
{
- while (relocs_to_go && (*p) && (*p)->address == current_byte_index)
+ while (relocs_to_go
+ && (*p) && (*p)->address == current_byte_index)
{
-
arelent *r = *p;
- bfd_vma ov;
+ bfd_signed_vma ov;
#if 0
if (r->howto->pc_relative)
{
case 2:
- ov = bfd_get_32 (abfd,
- stream + current_byte_index);
+ ov = bfd_get_signed_32 (abfd,
+ stream + current_byte_index);
current_byte_index += 4;
break;
case 1:
- ov = bfd_get_16 (abfd,
- stream + current_byte_index);
+ ov = bfd_get_signed_16 (abfd,
+ stream + current_byte_index);
current_byte_index += 2;
break;
case 0:
- ov = bfd_get_8 (abfd,
- stream + current_byte_index);
+ ov = bfd_get_signed_8 (abfd,
+ stream + current_byte_index);
current_byte_index++;
break;
default:
ov = 0;
BFD_FAIL ();
+ return false;
}
- ieee_write_byte (abfd, ieee_function_either_open_b_enum);
-/* abort();*/
+
+ ov &= r->howto->src_mask;
+
+ if (r->howto->pc_relative
+ && ! r->howto->pcrel_offset)
+ ov += r->address;
+
+ if (! ieee_write_byte (abfd,
+ ieee_function_either_open_b_enum))
+ return false;
+
+/* abort();*/
if (r->sym_ptr_ptr != (asymbol **) NULL)
{
- ieee_write_expression (abfd, r->addend + ov,
- *(r->sym_ptr_ptr),
- r->howto->pc_relative, s->index);
+ if (! ieee_write_expression (abfd, r->addend + ov,
+ *(r->sym_ptr_ptr),
+ r->howto->pc_relative,
+ s->index))
+ return false;
}
else
{
- ieee_write_expression (abfd, r->addend + ov,
- (asymbol *) NULL,
- r->howto->pc_relative, s->index);
+ if (! ieee_write_expression (abfd, r->addend + ov,
+ (asymbol *) NULL,
+ r->howto->pc_relative,
+ s->index))
+ return false;
}
- if (1 || r->howto->size != 2)
+ if (number_of_maus_in_address
+ != bfd_get_reloc_size (r->howto))
{
- ieee_write_byte (abfd, ieee_comma);
- ieee_write_int (abfd, 1 << r->howto->size);
+ if (! ieee_write_int (abfd,
+ bfd_get_reloc_size (r->howto)))
+ return false;
}
- ieee_write_byte (abfd,
- ieee_function_either_close_b_enum);
+ if (! ieee_write_byte (abfd,
+ ieee_function_either_close_b_enum))
+ return false;
relocs_to_go--;
p++;
}
}
}
+
return true;
}
-/* If there are no relocations in the output section then we can
-be clever about how we write. We block items up into a max of 127
-bytes */
+/* If there are no relocations in the output section then we can be
+ clever about how we write. We block items up into a max of 127
+ bytes. */
-static void
-DEFUN (do_as_repeat, (abfd, s),
- bfd * abfd AND
- asection * s)
+static boolean
+do_as_repeat (abfd, s)
+ bfd *abfd;
+ asection *s;
{
if (s->_raw_size)
{
- ieee_write_byte (abfd, ieee_set_current_section_enum);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8);
- ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff);
- ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
- ieee_write_int (abfd, s->vma);
-
- ieee_write_byte (abfd, ieee_repeat_data_enum);
- ieee_write_int (abfd, s->_raw_size);
- ieee_write_byte (abfd, ieee_load_constant_bytes_enum);
- ieee_write_byte (abfd, 1);
- ieee_write_byte (abfd, 0);
+ if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index
+ + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8)
+ || ! ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff)
+ || ! ieee_write_byte (abfd,
+ (bfd_byte) (s->index
+ + IEEE_SECTION_NUMBER_BASE))
+ || ! ieee_write_int (abfd, s->lma)
+ || ! ieee_write_byte (abfd, ieee_repeat_data_enum)
+ || ! ieee_write_int (abfd, s->_raw_size)
+ || ! ieee_write_byte (abfd, ieee_load_constant_bytes_enum)
+ || ! ieee_write_byte (abfd, 1)
+ || ! ieee_write_byte (abfd, 0))
+ return false;
}
+
+ return true;
}
-static void
-DEFUN (do_without_relocs, (abfd, s),
- bfd * abfd AND
- asection * s)
+static boolean
+do_without_relocs (abfd, s)
+ bfd *abfd;
+ asection *s;
{
bfd_byte *stream = ieee_per_section (s)->data;
if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
{
- do_as_repeat (abfd, s);
+ if (! do_as_repeat (abfd, s))
+ return false;
}
else
{
{
if (stream[i] != 0)
{
- do_with_relocs (abfd, s);
- return;
+ if (! do_with_relocs (abfd, s))
+ return false;
+ return true;
}
}
- do_as_repeat (abfd, s);
+ if (! do_as_repeat (abfd, s))
+ return false;
}
+ return true;
}
static bfd *output_bfd;
static int output_buffer;
-static void
+static void
fill ()
{
+ /* FIXME: Check return value. I'm not sure whether it needs to read
+ the entire buffer or not. */
bfd_read ((PTR) input_ptr_start, 1, input_ptr_end - input_ptr_start, input_bfd);
input_ptr = input_ptr_start;
}
-static void
+static void
flush ()
{
- bfd_write ((PTR) (output_ptr_start), 1, output_ptr - output_ptr_start, output_bfd);
+ if (bfd_write ((PTR) (output_ptr_start), 1, output_ptr - output_ptr_start,
+ output_bfd)
+ != (bfd_size_type) (output_ptr - output_ptr_start))
+ abort ();
output_ptr = output_ptr_start;
output_buffer++;
}
#define NEXT() { input_ptr++; if (input_ptr == input_ptr_end) fill(); }
#define OUT(x) { *output_ptr++ = (x); if(output_ptr == output_ptr_end) flush(); }
-static void
+static void
write_int (value)
int value;
{
}
}
-static void
+static void
copy_id ()
{
int length = THIS ();
}
#define VAR(x) ((x | 0x80))
-static void
+static void
copy_expression ()
{
int stack[10];
s = ieee->section_table[section_number];
if (s->output_section)
{
- value = s->output_section->vma;
+ value = s->output_section->lma;
}
else
{
};
static void
-DEFUN (fill_int, (buf),
- struct output_buffer_struct *buf)
+fill_int (buf)
+ struct output_buffer_struct *buf;
{
if (buf->buffer == output_buffer)
{
}
static void
-DEFUN (drop_int, (buf),
- struct output_buffer_struct *buf)
+drop_int (buf)
+ struct output_buffer_struct *buf;
{
int type = THIS ();
int ch;
OUT (0);
}
-static void
+static void
copy_int ()
{
int type = THIS ();
#define INTn(q) copy_int()
#define EXPn(q) copy_expression()
-static void
+static void
f1_record ()
{
int ch;
}
-static void
+static void
f0_record ()
{
/* Attribute record */
ID;
}
-static void
+static void
copy_till_end ()
{
int ch = THIS ();
}
-static void
+static void
f2_record ()
{
NEXT ();
static void block ();
-static void
+static void
f8_record ()
{
int ch;
}
}
-static void
+static void
e2_record ()
{
OUT (0xe2);
EXP;
}
-static void
-DEFUN_VOID (block)
+static void
+block ()
{
int ch;
while (1)
*/
static void
-DEFUN (relocate_debug, (output, input),
- bfd * output AND
- bfd * input)
+relocate_debug (output, input)
+ bfd *output;
+ bfd *input;
{
#define IBS 400
#define OBS 400
input_ptr_start = input_ptr = input_buffer;
input_ptr_end = input_buffer + IBS;
input_bfd = input;
+ /* FIXME: Check return value. I'm not sure whether it needs to read
+ the entire buffer or not. */
bfd_read ((PTR) input_ptr_start, 1, IBS, input);
block ();
}
the debug info in each, and copy it out, relocating it as we go.
*/
-static void
-DEFUN (ieee_write_debug_part, (abfd),
- bfd * abfd)
+static boolean
+ieee_write_debug_part (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
bfd_chain_type *chain = ieee->chain_root;
if (chain == (bfd_chain_type *) NULL)
{
-#if 0
- /* There is no debug info, so we'll fake some up */
- CONST static char fake[] =
- {
- 0xf8, 0xa, 0, 5, 't', 't', 't', 't', 't', 0, 2, 3,
- '1', '.', '1', 0x82, 1991 >> 8, 1991 & 0xff, 9, 20, 11, 07, 50};
- ieee->w.r.debug_information_part = 0;
+ asection *s;
+ for (s = abfd->sections; s != NULL; s = s->next)
+ if ((s->flags & SEC_DEBUGGING) != 0)
+ break;
+ if (s == NULL)
+ {
+ ieee->w.r.debug_information_part = 0;
+ return true;
+ }
- here;
-
-
- /* bfd_write(fake, 1, sizeof(fake), abfd);*/
- /* Now write a header for each section */
- {
- int i = 0;
- asection *s = abfd->sections;
- while (s)
- {
- if (s != abfd->abs_section)
- {
-
- ieee_write_byte (abfd, 0xf8);
- ieee_write_byte (abfd, 0x0b);
- ieee_write_byte (abfd, 0);
- ieee_write_byte (abfd, 0);
- ieee_write_byte (abfd, 1);
- ieee_write_byte (abfd, i + IEEE_SECTION_NUMBER_BASE);
- ieee_write_expression (abfd, 0, s->symbol, 0, 0, 0);
- ieee_write_byte (abfd, 0);
- ieee_write_byte (abfd, 0xf9);
- ieee_write_expression (abfd, s->size,
- bfd_abs_section.symbol, 0, 0, 0);
- i++;
- }
-
- s = s->next;
-
- }
- /* Close the scope */
- ieee_write_byte (abfd, 0xf9);
- }
-#endif
+ ieee->w.r.debug_information_part = here;
+ if (bfd_write (s->contents, 1, s->_raw_size, abfd) != s->_raw_size)
+ return false;
}
else
{
ieee_data_type *entry_ieee = IEEE_DATA (entry);
if (entry_ieee->w.r.debug_information_part)
{
- bfd_seek (entry, entry_ieee->w.r.debug_information_part, SEEK_SET);
+ if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
+ SEEK_SET)
+ != 0)
+ return false;
relocate_debug (abfd, entry);
}
{
ieee->w.r.debug_information_part = 0;
}
+
+ flush ();
}
- flush ();
+ return true;
}
-/* write the data in an ieee way */
-static void
-DEFUN (ieee_write_data_part, (abfd),
- bfd * abfd)
+/* Write the data in an ieee way. */
+
+static boolean
+ieee_write_data_part (abfd)
+ bfd *abfd;
{
asection *s;
ieee_data_type *ieee = IEEE_DATA (abfd);
ieee->w.r.data_part = bfd_tell (abfd);
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
+ /* Skip sections that have no loadable contents (.bss,
+ debugging, etc.) */
+ if ((s->flags & SEC_LOAD) == 0)
+ continue;
+
/* Sort the reloc records so we can insert them in the correct
- places */
+ places */
if (s->reloc_count != 0)
{
- do_with_relocs (abfd, s);
+ if (! do_with_relocs (abfd, s))
+ return false;
}
else
{
- do_without_relocs (abfd, s);
+ if (! do_without_relocs (abfd, s))
+ return false;
}
}
+
+ return true;
}
static boolean
-DEFUN (init_for_output, (abfd),
- bfd * abfd)
+init_for_output (abfd)
+ bfd *abfd;
{
asection *s;
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
+ if ((s->flags & SEC_DEBUGGING) != 0)
+ continue;
if (s->_raw_size != 0)
{
ieee_per_section (s)->data = (bfd_byte *) (bfd_alloc (abfd, s->_raw_size));
if (!ieee_per_section (s)->data)
- {
- bfd_error = no_memory;
- return false;
- }
+ return false;
}
}
return true;
* not a byte image, but a record stream.
*/
boolean
-DEFUN (ieee_set_section_contents, (abfd, section, location, offset, count),
- bfd * abfd AND
- sec_ptr section AND
- PTR location AND
- file_ptr offset AND
- bfd_size_type count)
+ieee_set_section_contents (abfd, section, location, offset, count)
+ bfd *abfd;
+ sec_ptr section;
+ PTR location;
+ file_ptr offset;
+ bfd_size_type count;
{
+ if ((section->flags & SEC_DEBUGGING) != 0)
+ {
+ if (section->contents == NULL)
+ {
+ section->contents = ((unsigned char *)
+ bfd_alloc (abfd, section->_raw_size));
+ if (section->contents == NULL)
+ return false;
+ }
+ /* bfd_set_section_contents has already checked that everything
+ is within range. */
+ memcpy (section->contents + offset, location, count);
+ return true;
+ }
+
if (ieee_per_section (section)->data == (bfd_byte *) NULL)
{
if (!init_for_output (abfd))
return true;
}
-/*
-write the external symbols of a file, IEEE considers two sorts of
-external symbols, public, and referenced. It uses to internal forms
-to index them as well. When we write them out we turn their symbol
-values into indexes from the right base.
-*/
-static void
-DEFUN (ieee_write_external_part, (abfd),
- bfd * abfd)
+/* Write the external symbols of a file. IEEE considers two sorts of
+ external symbols, public, and referenced. It uses to internal
+ forms to index them as well. When we write them out we turn their
+ symbol values into indexes from the right base. */
+
+static boolean
+ieee_write_external_part (abfd)
+ bfd *abfd;
{
asymbol **q;
ieee_data_type *ieee = IEEE_DATA (abfd);
for (q = abfd->outsymbols; *q != (asymbol *) NULL; q++)
{
asymbol *p = *q;
- hadone = true;
- if (p->section == &bfd_und_section)
+ if (bfd_is_und_section (p->section))
{
/* This must be a symbol reference .. */
- ieee_write_byte (abfd, ieee_external_reference_enum);
- ieee_write_int (abfd, reference_index);
- ieee_write_id (abfd, p->name);
+ if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+ || ! ieee_write_int (abfd, reference_index)
+ || ! ieee_write_id (abfd, p->name))
+ return false;
p->value = reference_index;
reference_index++;
+ hadone = true;
}
else if (bfd_is_com_section (p->section))
{
/* This is a weak reference */
- ieee_write_byte (abfd, ieee_external_reference_enum);
- ieee_write_int (abfd, reference_index);
- ieee_write_id (abfd, p->name);
- ieee_write_byte (abfd, ieee_weak_external_reference_enum);
- ieee_write_int (abfd, reference_index);
- ieee_write_int (abfd, p->value);
- ieee_write_int (abfd, BFD_FORT_COMM_DEFAULT_VALUE);
+ if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+ || ! ieee_write_int (abfd, reference_index)
+ || ! ieee_write_id (abfd, p->name)
+ || ! ieee_write_byte (abfd,
+ ieee_weak_external_reference_enum)
+ || ! ieee_write_int (abfd, reference_index)
+ || ! ieee_write_int (abfd, p->value))
+ return false;
p->value = reference_index;
reference_index++;
+ hadone = true;
}
else if (p->flags & BSF_GLOBAL)
{
/* This must be a symbol definition */
-
- ieee_write_byte (abfd, ieee_external_symbol_enum);
- ieee_write_int (abfd, public_index);
- ieee_write_id (abfd, p->name);
-
- ieee_write_twobyte (abfd, ieee_attribute_record_enum);
- ieee_write_int (abfd, public_index);
- ieee_write_byte (abfd, 15); /* instruction address */
- ieee_write_byte (abfd, 19); /* static symbol */
- ieee_write_byte (abfd, 1); /* one of them */
-
+ if (! ieee_write_byte (abfd, ieee_external_symbol_enum)
+ || ! ieee_write_int (abfd, public_index)
+ || ! ieee_write_id (abfd, p->name)
+ || ! ieee_write_2bytes (abfd, ieee_attribute_record_enum)
+ || ! ieee_write_int (abfd, public_index)
+ || ! ieee_write_byte (abfd, 15) /* instruction address */
+ || ! ieee_write_byte (abfd, 19) /* static symbol */
+ || ! ieee_write_byte (abfd, 1)) /* one of them */
+ return false;
/* Write out the value */
- ieee_write_2bytes (abfd, ieee_value_record_enum);
- ieee_write_int (abfd, public_index);
- if (p->section != &bfd_abs_section)
+ if (! ieee_write_2bytes (abfd, ieee_value_record_enum)
+ || ! ieee_write_int (abfd, public_index))
+ return false;
+ if (! bfd_is_abs_section (p->section))
{
if (abfd->flags & EXEC_P)
{
/* If fully linked, then output all symbols
- relocated */
- ieee_write_int (abfd,
- p->value + p->section->output_offset + p->section->output_section->vma);
-
+ relocated */
+ if (! (ieee_write_int
+ (abfd,
+ (p->value
+ + p->section->output_offset
+ + p->section->output_section->vma))))
+ return false;
}
else
{
- ieee_write_expression (abfd,
- p->value + p->section->output_offset,
- p->section->output_section->symbol
- ,false, 0);
+ if (! (ieee_write_expression
+ (abfd,
+ p->value + p->section->output_offset,
+ p->section->output_section->symbol,
+ false, 0)))
+ return false;
}
}
else
{
- ieee_write_expression (abfd,
- p->value,
- bfd_abs_section.symbol,
- false, 0);
+ if (! ieee_write_expression (abfd,
+ p->value,
+ bfd_abs_section_ptr->symbol,
+ false, 0))
+ return false;
}
p->value = public_index;
public_index++;
+ hadone = true;
}
else
{
if (hadone)
ieee->w.r.external_part = here;
+ return true;
}
/* 0xf1, 0xce, 0x21, 0, 54, 2,1,1 tool & version # */
};
-static
-void
-DEFUN (ieee_write_me_part, (abfd),
- bfd * abfd)
+static boolean
+ieee_write_me_part (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
ieee->w.r.trailer_part = bfd_tell (abfd);
if (abfd->start_address)
{
- ieee->w.r.me_record = bfd_tell (abfd);
- ieee_write_2bytes (abfd, ieee_value_starting_address_enum);
- ieee_write_byte (abfd, ieee_function_either_open_b_enum);
- ieee_write_int (abfd, abfd->start_address);
- ieee_write_byte (abfd, ieee_function_either_close_b_enum);
+ if (! ieee_write_2bytes (abfd, ieee_value_starting_address_enum)
+ || ! ieee_write_byte (abfd, ieee_function_either_open_b_enum)
+ || ! ieee_write_int (abfd, abfd->start_address)
+ || ! ieee_write_byte (abfd, ieee_function_either_close_b_enum))
+ return false;
}
- else
+ ieee->w.r.me_record = bfd_tell (abfd);
+ if (! ieee_write_byte (abfd, ieee_module_end_enum))
+ return false;
+ return true;
+}
+
+/* Write out the IEEE processor ID. */
+
+static boolean
+ieee_write_processor (abfd)
+ bfd *abfd;
+{
+ const bfd_arch_info_type *arch;
+
+ arch = bfd_get_arch_info (abfd);
+ switch (arch->arch)
{
- ieee->w.r.me_record = bfd_tell (abfd);
+ default:
+ if (! ieee_write_id (abfd, bfd_printable_name (abfd)))
+ return false;
+ break;
+
+ case bfd_arch_a29k:
+ if (! ieee_write_id (abfd, "29000"))
+ return false;
+ break;
+
+ case bfd_arch_h8300:
+ if (! ieee_write_id (abfd, "H8/300"))
+ return false;
+ break;
+
+ case bfd_arch_h8500:
+ if (! ieee_write_id (abfd, "H8/500"))
+ return false;
+ break;
+
+ case bfd_arch_i960:
+ switch (arch->mach)
+ {
+ default:
+ case bfd_mach_i960_core:
+ case bfd_mach_i960_ka_sa:
+ if (! ieee_write_id (abfd, "80960KA"))
+ return false;
+ break;
+
+ case bfd_mach_i960_kb_sb:
+ if (! ieee_write_id (abfd, "80960KB"))
+ return false;
+ break;
+
+ case bfd_mach_i960_ca:
+ if (! ieee_write_id (abfd, "80960CA"))
+ return false;
+ break;
+
+ case bfd_mach_i960_mc:
+ case bfd_mach_i960_xa:
+ if (! ieee_write_id (abfd, "80960MC"))
+ return false;
+ break;
+ }
+ break;
+
+ case bfd_arch_m68k:
+ {
+ char ab[20];
+
+ sprintf (ab, "%lu", arch->mach);
+ if (! ieee_write_id (abfd, ab))
+ return false;
+ }
+ break;
}
- ieee_write_byte (abfd, ieee_module_end_enum);
+ return true;
}
boolean
-DEFUN (ieee_write_object_contents, (abfd),
- bfd * abfd)
+ieee_write_object_contents (abfd)
+ bfd *abfd;
{
ieee_data_type *ieee = IEEE_DATA (abfd);
unsigned int i;
file_ptr old;
+
/* Fast forward over the header area */
- bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
- ieee_write_byte (abfd, ieee_module_beginning_enum);
+ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+ return false;
- ieee_write_id (abfd, bfd_printable_name (abfd));
- ieee_write_id (abfd, abfd->filename);
+ if (! ieee_write_byte (abfd, ieee_module_beginning_enum)
+ || ! ieee_write_processor (abfd)
+ || ! ieee_write_id (abfd, abfd->filename))
+ return false;
/* Fast forward over the variable bits */
- ieee_write_byte (abfd, ieee_address_descriptor_enum);
+ if (! ieee_write_byte (abfd, ieee_address_descriptor_enum))
+ return false;
/* Bits per MAU */
- ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd)));
+ if (! ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd))))
+ return false;
/* MAU's per address */
- ieee_write_byte (abfd,
- (bfd_byte) (bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd)));
+ if (! ieee_write_byte (abfd,
+ (bfd_byte) (bfd_arch_bits_per_address (abfd)
+ / bfd_arch_bits_per_byte (abfd))))
+ return false;
old = bfd_tell (abfd);
- bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR);
+ if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
+ return false;
ieee->w.r.extension_record = bfd_tell (abfd);
- bfd_write ((char *) exten, 1, sizeof (exten), abfd);
+ if (bfd_write ((char *) exten, 1, sizeof (exten), abfd) != sizeof (exten))
+ return false;
if (abfd->flags & EXEC_P)
- ieee_write_byte (abfd, 0x1);/* Absolute */
+ {
+ if (! ieee_write_byte (abfd, 0x1)) /* Absolute */
+ return false;
+ }
else
- ieee_write_byte (abfd, 0x2);/* Relocateable */
+ {
+ if (! ieee_write_byte (abfd, 0x2)) /* Relocateable */
+ return false;
+ }
ieee->w.r.environmental_record = bfd_tell (abfd);
- bfd_write ((char *) envi, 1, sizeof (envi), abfd);
+ if (bfd_write ((char *) envi, 1, sizeof (envi), abfd) != sizeof (envi))
+ return false;
+
+ /* The HP emulator database requires a timestamp in the file. */
+ {
+ time_t now;
+ const struct tm *t;
+
+ time (&now);
+ t = (struct tm *) localtime (&now);
+ if (! ieee_write_2bytes (abfd, (int) ieee_atn_record_enum)
+ || ! ieee_write_byte (abfd, 0x21)
+ || ! ieee_write_byte (abfd, 0)
+ || ! ieee_write_byte (abfd, 50)
+ || ! ieee_write_int (abfd, t->tm_year + 1900)
+ || ! ieee_write_int (abfd, t->tm_mon + 1)
+ || ! ieee_write_int (abfd, t->tm_mday)
+ || ! ieee_write_int (abfd, t->tm_hour)
+ || ! ieee_write_int (abfd, t->tm_min)
+ || ! ieee_write_int (abfd, t->tm_sec))
+ return false;
+ }
+
output_bfd = abfd;
- flush ();
- ieee_write_section_part (abfd);
- /*
- First write the symbols, this changes their values into table
- indeces so we cant use it after this point
- */
- ieee_write_external_part (abfd);
- /* ieee_write_byte(abfd, ieee_record_seperator_enum);*/
+ flush ();
+ if (! ieee_write_section_part (abfd))
+ return false;
+ /* First write the symbols. This changes their values into table
+ indeces so we cant use it after this point. */
+ if (! ieee_write_external_part (abfd))
+ return false;
/* ieee_write_byte(abfd, ieee_record_seperator_enum);*/
+ /* ieee_write_byte(abfd, ieee_record_seperator_enum);*/
- /*
- Write any debugs we have been told about
- */
- ieee_write_debug_part (abfd);
-
- /*
- Can only write the data once the symbols have been written since
- the data contains relocation information which points to the
- symbols
- */
- ieee_write_data_part (abfd);
+ /* Write any debugs we have been told about. */
+ if (! ieee_write_debug_part (abfd))
+ return false;
- /*
- At the end we put the end !
- */
- ieee_write_me_part (abfd);
+ /* Can only write the data once the symbols have been written, since
+ the data contains relocation information which points to the
+ symbols. */
+ if (! ieee_write_data_part (abfd))
+ return false;
+ /* At the end we put the end! */
+ if (! ieee_write_me_part (abfd))
+ return false;
/* Generate the header */
- bfd_seek (abfd, old, SEEK_SET);
+ if (bfd_seek (abfd, old, SEEK_SET) != 0)
+ return false;
for (i = 0; i < N_W_VARIABLES; i++)
{
- ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum);
- ieee_write_byte (abfd, (bfd_byte) i);
- ieee_write_int5_out (abfd, ieee->w.offset[i]);
+ if (! ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum)
+ || ! ieee_write_byte (abfd, (bfd_byte) i)
+ || ! ieee_write_int5_out (abfd, ieee->w.offset[i]))
+ return false;
}
+
return true;
}
\f
-
-
/* Native-level interface to symbols. */
/* We read the symbols into a buffer, which is discarded when this
-function exits. We read the strings into a buffer large enough to
-hold them all plus all the cached symbol entries. */
+ function exits. We read the strings into a buffer large enough to
+ hold them all plus all the cached symbol entries. */
asymbol *
-DEFUN (ieee_make_empty_symbol, (abfd),
- bfd * abfd)
+ieee_make_empty_symbol (abfd)
+ bfd *abfd;
{
-
ieee_symbol_type *new =
- (ieee_symbol_type *) bfd_zmalloc (sizeof (ieee_symbol_type));
+ (ieee_symbol_type *) bfd_zmalloc (sizeof (ieee_symbol_type));
if (!new)
- {
- bfd_error = no_error;
- return NULL;
- }
+ return NULL;
new->symbol.the_bfd = abfd;
return &new->symbol;
}
static bfd *
-DEFUN (ieee_openr_next_archived_file, (arch, prev),
- bfd * arch AND
- bfd * prev)
+ieee_openr_next_archived_file (arch, prev)
+ bfd *arch;
+ bfd *prev;
{
ieee_ar_data_type *ar = IEEE_AR_DATA (arch);
/* take the next one from the arch state, or reset */
}
else
{
- bfd_error = no_more_archived_files;
+ bfd_set_error (bfd_error_no_more_archived_files);
return (bfd *) NULL;
}
struct stat *buf;
{
ieee_ar_data_type *ar = abfd->my_archive->tdata.ieee_ar_data;
+ ieee_data_type *ieee;
+
if (ar == (ieee_ar_data_type *) NULL)
{
- bfd_error = invalid_operation;
+ bfd_set_error (bfd_error_invalid_operation);
return -1;
}
- else
+
+ if (IEEE_DATA (abfd) == NULL)
{
- buf->st_size = 0x1;
- buf->st_mode = 0666;
- return !ieee_object_p (abfd);
+ if (ieee_object_p (abfd) == NULL)
+ {
+ bfd_set_error (bfd_error_wrong_format);
+ return -1;
+ }
}
+
+ ieee = IEEE_DATA (abfd);
+
+ buf->st_size = ieee->w.r.me_record + 1;
+ buf->st_mode = 0644;
+ return 0;
}
static int
-DEFUN (ieee_sizeof_headers, (abfd, x),
- bfd * abfd AND
- boolean x)
+ieee_sizeof_headers (abfd, x)
+ bfd *abfd;
+ boolean x;
{
return 0;
}
+/* The debug info routines are never used. */
+#if 0
+
static void
-DEFUN (ieee_bfd_debug_info_start, (abfd),
- bfd * abfd)
+ieee_bfd_debug_info_start (abfd)
+ bfd *abfd;
{
}
static void
-DEFUN (ieee_bfd_debug_info_end, (abfd),
- bfd * abfd)
+ieee_bfd_debug_info_end (abfd)
+ bfd *abfd;
{
}
be ready to output it at close time
*/
static void
-DEFUN (ieee_bfd_debug_info_accumulate, (abfd, section),
- bfd * abfd AND
- asection * section)
+ieee_bfd_debug_info_accumulate (abfd, section)
+ bfd *abfd;
+ asection *section;
{
ieee_data_type *ieee = IEEE_DATA (section->owner);
ieee_data_type *output_ieee = IEEE_DATA (abfd);
{
bfd_chain_type *n = (bfd_chain_type *) bfd_alloc (abfd, sizeof (bfd_chain_type));
if (!n)
- {
- bfd_error = no_memory;
- abort(); /* FIXME */
- }
+ abort (); /* FIXME */
n->this = section->owner;
n->next = (bfd_chain_type *) NULL;
}
}
+#endif
+
+#define ieee_close_and_cleanup _bfd_generic_close_and_cleanup
+#define ieee_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define FOO PROTO
-#define ieee_core_file_failing_command (char *(*)())(bfd_nullvoidptr)
-#define ieee_core_file_failing_signal (int (*)())bfd_0
-#define ieee_core_file_matches_executable_p ( FOO(boolean, (*),(bfd *, bfd *)))bfd_false
#define ieee_slurp_armap bfd_true
#define ieee_slurp_extended_name_table bfd_true
-#define ieee_truncate_arname (void (*)())bfd_nullvoidptr
-#define ieee_write_armap (FOO( boolean, (*),(bfd *, unsigned int, struct orl *, unsigned int, int))) bfd_nullvoidptr
-#define ieee_get_lineno (struct lineno_cache_entry *(*)())bfd_nullvoidptr
-#define ieee_close_and_cleanup bfd_generic_close_and_cleanup
-#define ieee_set_arch_mach bfd_default_set_arch_mach
-#define ieee_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
+#define ieee_construct_extended_name_table \
+ ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+ bfd_true)
+#define ieee_truncate_arname bfd_dont_truncate_arname
+#define ieee_write_armap \
+ ((boolean (*) \
+ PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
+ bfd_true)
+#define ieee_read_ar_hdr bfd_nullvoidptr
+#define ieee_update_armap_timestamp bfd_true
+#define ieee_get_elt_at_index _bfd_generic_get_elt_at_index
+
+#define ieee_bfd_is_local_label bfd_generic_is_local_label
+#define ieee_get_lineno _bfd_nosymbols_get_lineno
+#define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define ieee_read_minisymbols _bfd_generic_read_minisymbols
+#define ieee_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+#define ieee_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+
+#define ieee_set_arch_mach _bfd_generic_set_arch_mach
+
+#define ieee_get_section_contents_in_window \
+ _bfd_generic_get_section_contents_in_window
+#define ieee_bfd_get_relocated_section_contents \
+ bfd_generic_get_relocated_section_contents
#define ieee_bfd_relax_section bfd_generic_relax_section
-#define ieee_bfd_reloc_type_lookup \
- ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
-#define ieee_bfd_make_debug_symbol \
- ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
#define ieee_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
#define ieee_bfd_link_add_symbols _bfd_generic_link_add_symbols
#define ieee_bfd_final_link _bfd_generic_final_link
+#define ieee_bfd_link_split_section _bfd_generic_link_split_section
/*SUPPRESS 460 */
-bfd_target ieee_vec =
+const bfd_target ieee_vec =
{
"ieee", /* name */
bfd_target_ieee_flavour,
- true, /* target byte order */
- true, /* target headers byte order */
+ BFD_ENDIAN_UNKNOWN, /* target byte order */
+ BFD_ENDIAN_UNKNOWN, /* target headers byte order */
(HAS_RELOC | EXEC_P | /* object flags */
HAS_LINENO | HAS_DEBUG |
HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
(SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
| SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
- 0, /* leading underscore */
+ '_', /* leading underscore */
' ', /* ar_pad_char */
16, /* ar_max_namelen */
- 1, /* minimum alignment */
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_write_archive_contents,
bfd_false,
},
- JUMP_TABLE (ieee),
+
+ BFD_JUMP_TABLE_GENERIC (ieee),
+ BFD_JUMP_TABLE_COPY (_bfd_generic),
+ BFD_JUMP_TABLE_CORE (_bfd_nocore),
+ BFD_JUMP_TABLE_ARCHIVE (ieee),
+ BFD_JUMP_TABLE_SYMBOLS (ieee),
+ BFD_JUMP_TABLE_RELOCS (ieee),
+ BFD_JUMP_TABLE_WRITE (ieee),
+ BFD_JUMP_TABLE_LINK (ieee),
+ BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
(PTR) 0
};
projects / binutils-gdb.git / blobdiff