/* BFD back-end for mmo objects (MMIX-specific object-format).
- Copyright 2001, 2002, 2003, 2004
+ Copyright 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Written by Hans-Peter Nilsson (hp@bitrange.com).
Infrastructure and other bits originally copied from srec.c and
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
/*
SECTION
@samp{0x2000@dots{}00} to @samp{0x20ff@dots{}ff} is used for
writable data. @xref{mmo section mapping}.
+ There is provision for specifying ``special data'' of 65536
+ different types. We use type 80 (decimal), arbitrarily chosen the
+ same as the ELF <<e_machine>> number for MMIX, filling it with
+ section information normally found in ELF objects. @xref{mmo
+ section mapping}.
+
Contents is entered as 32-bit words, xor:ed over previous
contents, always zero-initialized. A word that starts with the
byte @samp{0x98} forms a command called a @samp{lopcode}, where
@url{http://www-cs-faculty.stanford.edu/~knuth/mmixal-intro.ps.gz},
the lopcodes are:
- There is provision for specifying ``special data'' of 65536
- different types. We use type 80 (decimal), arbitrarily chosen the
- same as the ELF <<e_machine>> number for MMIX, filling it with
- section information normally found in ELF objects. @xref{mmo
- section mapping}.
-
@table @code
@item lop_quote
0x98000001. The next word is contents, regardless of whether it
struct mmo_symbol
{
struct mmo_symbol *next;
- const char *name;
+ char *name;
bfd_vma value;
enum mmo_sym_type sym_type;
unsigned int serno;
bfd_vma addr;
};
-static bfd_boolean mmo_bfd_copy_private_bfd_data
- PARAMS ((bfd *, bfd *));
-static void mmo_write_section_unless_reg_contents
- PARAMS ((bfd *, asection *, PTR));
-static void mmo_find_sec_w_addr
- PARAMS ((bfd *, asection *, PTR));
-static void mmo_find_sec_w_addr_grow
- PARAMS ((bfd *, asection *, PTR));
-static asection *mmo_make_section
- PARAMS ((bfd *, const char *));
-static void mmo_get_symbol_info
- PARAMS ((bfd *, asymbol *, symbol_info *));
-static void mmo_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void mmo_init
- PARAMS ((void));
-static bfd_boolean mmo_mkobject
- PARAMS ((bfd *));
-static bfd_boolean mmo_scan
- PARAMS ((bfd *));
-static asection *mmo_decide_section
- PARAMS ((bfd *, bfd_vma));
-static asection *mmo_get_generic_spec_data_section
- PARAMS ((bfd *, int));
-static asection *mmo_get_spec_section
- PARAMS ((bfd *, int));
-static INLINE bfd_byte *mmo_get_loc
- PARAMS ((asection *, bfd_vma, int));
-static void mmo_xore_64
- PARAMS ((asection *, bfd_vma vma, bfd_vma value));
-static void mmo_xore_32
- PARAMS ((asection *, bfd_vma vma, unsigned int));
-static void mmo_xore_16
- PARAMS ((asection *, bfd_vma vma, unsigned int));
-static const bfd_target *mmo_object_p
- PARAMS ((bfd *));
-static void mmo_map_set_sizes
- PARAMS ((bfd *, asection *, PTR));
-static bfd_boolean mmo_get_symbols
- PARAMS ((bfd *));
-static bfd_boolean mmo_create_symbol
- PARAMS ((bfd *, const char *, bfd_vma, enum mmo_sym_type, unsigned int));
-static bfd_boolean mmo_get_section_contents
- PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long mmo_get_symtab_upper_bound
- PARAMS ((bfd *));
-static long mmo_canonicalize_symtab
- PARAMS ((bfd *, asymbol **));
-static void mmo_get_symbol_info
- PARAMS ((bfd *, asymbol *, symbol_info *));
-static void mmo_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static bfd_boolean mmo_set_section_contents
- PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type));
-static int mmo_sizeof_headers
- PARAMS ((bfd *, bfd_boolean));
-static long mmo_get_reloc_upper_bound
- PARAMS ((bfd *, asection *));
-
-static bfd_boolean mmo_internal_write_header
- PARAMS ((bfd *));
-static bfd_boolean mmo_internal_write_post
- PARAMS ((bfd *, int, asection *));
-static bfd_boolean mmo_internal_add_3_sym
- PARAMS ((bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *));
-static unsigned int mmo_internal_3_length
- PARAMS ((bfd *, struct mmo_symbol_trie *));
-static void mmo_internal_3_dump
- PARAMS ((bfd *, struct mmo_symbol_trie *));
-static void mmo_beb128_out
- PARAMS ((bfd *, int, int));
-static bfd_boolean mmo_internal_write_section
- PARAMS ((bfd *, asection *));
-static void mmo_write_tetra
- PARAMS ((bfd *, unsigned int));
-static void mmo_write_tetra_raw
- PARAMS ((bfd *, unsigned int));
-static void mmo_write_octa
- PARAMS ((bfd *, bfd_vma));
-static void mmo_write_octa_raw
- PARAMS ((bfd *, bfd_vma));
-static bfd_boolean mmo_write_chunk
- PARAMS ((bfd *, const bfd_byte *, unsigned int));
-static bfd_boolean mmo_flush_chunk
- PARAMS ((bfd *));
-static bfd_boolean mmo_write_loc_chunk
- PARAMS ((bfd *, bfd_vma, const bfd_byte *, unsigned int, bfd_vma *));
-static bfd_boolean mmo_write_chunk_list
- PARAMS ((bfd *, mmo_data_list_type *));
-static bfd_boolean mmo_write_loc_chunk_list
- PARAMS ((bfd *, mmo_data_list_type *));
-static bfd_boolean mmo_write_symbols_and_terminator
- PARAMS ((bfd *));
-static flagword mmo_sec_flags_from_bfd_flags
- PARAMS ((flagword));
-static flagword bfd_sec_flags_from_mmo_flags
- PARAMS ((flagword));
-static bfd_byte mmo_get_byte
- PARAMS ((bfd *));
-static void mmo_write_byte
- PARAMS ((bfd *, bfd_byte));
-static bfd_boolean mmo_new_section_hook
- PARAMS ((bfd *, asection *));
-static int mmo_sort_mmo_symbols
- PARAMS ((const PTR, const PTR));
-static bfd_boolean mmo_write_object_contents
- PARAMS ((bfd *));
-static long mmo_canonicalize_reloc
- PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+static bfd_boolean mmo_bfd_copy_private_bfd_data (bfd *, bfd *);
+static void mmo_write_section_unless_reg_contents (bfd *, asection *, void *);
+static void mmo_find_sec_w_addr (bfd *, asection *, void *);
+static void mmo_find_sec_w_addr_grow (bfd *, asection *, void *);
+static asection *mmo_make_section (bfd *, const char *);
+static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
+static void mmo_print_symbol (bfd *, void *, asymbol *,
+ bfd_print_symbol_type);
+static void mmo_init (void);
+static bfd_boolean mmo_mkobject (bfd *);
+static bfd_boolean mmo_scan (bfd *);
+static asection *mmo_decide_section (bfd *, bfd_vma);
+static asection *mmo_get_generic_spec_data_section (bfd *, int);
+static asection *mmo_get_spec_section (bfd *, int);
+static INLINE bfd_byte *mmo_get_loc (asection *, bfd_vma, int);
+static void mmo_xore_64 (asection *, bfd_vma vma, bfd_vma value);
+static void mmo_xore_32 (asection *, bfd_vma vma, unsigned int);
+static void mmo_xore_16 (asection *, bfd_vma vma, unsigned int);
+static const bfd_target *mmo_object_p (bfd *);
+static void mmo_map_set_sizes (bfd *, asection *, void *);
+static bfd_boolean mmo_get_symbols (bfd *);
+static bfd_boolean mmo_create_symbol (bfd *, const char *, bfd_vma,
+ enum mmo_sym_type, unsigned int);
+static bfd_boolean mmo_get_section_contents (bfd *, asection *, void *,
+ file_ptr, bfd_size_type);
+static long mmo_get_symtab_upper_bound (bfd *);
+static long mmo_canonicalize_symtab (bfd *, asymbol **);
+static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
+static void mmo_print_symbol (bfd *, void *, asymbol *,
+ bfd_print_symbol_type);
+static bfd_boolean mmo_set_section_contents (bfd *, sec_ptr, const void *,
+ file_ptr, bfd_size_type);
+static int mmo_sizeof_headers (bfd *, bfd_boolean);
+static long mmo_get_reloc_upper_bound (bfd *, asection *);
+static bfd_boolean mmo_internal_write_header (bfd *);
+static bfd_boolean mmo_internal_write_post (bfd *, int, asection *);
+static bfd_boolean mmo_internal_add_3_sym (bfd *, struct mmo_symbol_trie *,
+ const struct mmo_symbol *);
+static unsigned int mmo_internal_3_length (bfd *, struct mmo_symbol_trie *);
+static void mmo_internal_3_dump (bfd *, struct mmo_symbol_trie *);
+static void mmo_beb128_out (bfd *, int, int);
+static bfd_boolean mmo_internal_write_section (bfd *, asection *);
+static void mmo_write_tetra (bfd *, unsigned int);
+static void mmo_write_tetra_raw (bfd *, unsigned int);
+static void mmo_write_octa (bfd *, bfd_vma);
+static void mmo_write_octa_raw (bfd *, bfd_vma);
+static bfd_boolean mmo_write_chunk (bfd *, const bfd_byte *, unsigned int);
+static bfd_boolean mmo_flush_chunk (bfd *);
+static bfd_boolean mmo_write_loc_chunk (bfd *, bfd_vma, const bfd_byte *,
+ unsigned int, bfd_vma *);
+static bfd_boolean mmo_write_chunk_list (bfd *, mmo_data_list_type *);
+static bfd_boolean mmo_write_loc_chunk_list (bfd *, mmo_data_list_type *);
+static bfd_boolean mmo_write_symbols_and_terminator (bfd *);
+static flagword mmo_sec_flags_from_bfd_flags (flagword);
+static flagword bfd_sec_flags_from_mmo_flags (flagword);
+static bfd_byte mmo_get_byte (bfd *);
+static void mmo_write_byte (bfd *, bfd_byte);
+static bfd_boolean mmo_new_section_hook (bfd *, asection *);
+static int mmo_sort_mmo_symbols (const void *, const void *);
+static bfd_boolean mmo_write_object_contents (bfd *);
+static long mmo_canonicalize_reloc (bfd *, sec_ptr, arelent **, asymbol **);
+static bfd_boolean mmo_write_section_description (bfd *, asection *);
+static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *,
+ asection *);
/* Global "const" variables initialized once. Must not depend on
particular input or caller; put such things into the bfd or elsewhere.
Look ma, no static per-invocation data! */
-static unsigned
+static
char valid_mmo_symbol_character_set[/* A-Z a-z (we assume consecutive
codes; sorry EBCDIC:ers!). */
+ 'Z' - 'A' + 1 + 'z' - 'a' + 1
one, new memory for the name is allocated. */
static asection *
-mmo_make_section (abfd, secname)
- bfd *abfd;
- const char *secname;
+mmo_make_section (bfd *abfd, const char *secname)
{
asection *sec = bfd_get_section_by_name (abfd, secname);
here, nor must it be static. Add it to tdata information instead. */
static void
-mmo_init ()
+mmo_init (void)
{
static bfd_boolean inited = FALSE;
int i = 0;
/* Check whether an existing file is an mmo file. */
static const bfd_target *
-mmo_object_p (abfd)
- bfd *abfd;
+mmo_object_p (bfd *abfd)
{
struct stat statbuf;
bfd_byte b[4];
/* Set up the mmo tdata information. */
static bfd_boolean
-mmo_mkobject (abfd)
- bfd *abfd;
+mmo_mkobject (bfd *abfd)
{
mmo_init ();
}
static bfd_boolean
-mmo_bfd_copy_private_bfd_data (ibfd, obfd)
- bfd *ibfd;
- bfd *obfd;
+mmo_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
{
if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour
|| bfd_get_flavour (obfd) != bfd_target_mmo_flavour)
bfd_map_over_sections. */
static void
-mmo_find_sec_w_addr (abfd, sec, p)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec;
- PTR p;
+mmo_find_sec_w_addr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
{
struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
bfd_vma vma = bfd_get_section_vma (abfd, sec);
}
static void
-mmo_find_sec_w_addr_grow (abfd, sec, p)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec;
- PTR p;
+mmo_find_sec_w_addr_grow (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
{
struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
bfd_vma vma = bfd_get_section_vma (abfd, sec);
increasing number. */
static asection *
-mmo_decide_section (abfd, vma)
- bfd *abfd;
- bfd_vma vma;
+mmo_decide_section (bfd *abfd, bfd_vma vma)
{
asection *sec = NULL;
char sec_name[sizeof (".MMIX.sec.") + 20];
/* Xor in a 64-bit value VALUE at VMA. */
static INLINE void
-mmo_xore_64 (sec, vma, value)
- asection *sec;
- bfd_vma vma;
- bfd_vma value;
+mmo_xore_64 (asection *sec, bfd_vma vma, bfd_vma value)
{
bfd_byte *loc = mmo_get_loc (sec, vma, 8);
bfd_vma prev = bfd_get_64 (sec->owner, loc);
/* Xor in a 32-bit value VALUE at VMA. */
static INLINE void
-mmo_xore_32 (sec, vma, value)
- asection *sec;
- bfd_vma vma;
- unsigned int value;
+mmo_xore_32 (asection *sec, bfd_vma vma, unsigned int value)
{
bfd_byte *loc = mmo_get_loc (sec, vma, 4);
unsigned int prev = bfd_get_32 (sec->owner, loc);
/* Xor in a 16-bit value VALUE at VMA. */
static INLINE void
-mmo_xore_16 (sec, vma, value)
- asection *sec;
- bfd_vma vma;
- unsigned int value;
+mmo_xore_16 (asection *sec, bfd_vma vma, unsigned int value)
{
bfd_byte *loc = mmo_get_loc (sec, vma, 2);
unsigned int prev = bfd_get_16 (sec->owner, loc);
/* Write a 32-bit word to output file, no lop_quote generated. */
static INLINE void
-mmo_write_tetra_raw (abfd, value)
- bfd *abfd;
- unsigned int value;
+mmo_write_tetra_raw (bfd *abfd, unsigned int value)
{
bfd_byte buf[4];
bfd_put_32 (abfd, value, buf);
- if (bfd_bwrite ((PTR) buf, 4, abfd) != 4)
+ if (bfd_bwrite (buf, 4, abfd) != 4)
abfd->tdata.mmo_data->have_error = TRUE;
}
/* Write a 32-bit word to output file; lop_quote if necessary. */
static INLINE void
-mmo_write_tetra (abfd, value)
- bfd *abfd;
- unsigned int value;
+mmo_write_tetra (bfd *abfd, unsigned int value)
{
if (((value >> 24) & 0xff) == LOP)
mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT);
/* Write a 64-bit word to output file, perhaps with lop_quoting. */
static INLINE void
-mmo_write_octa (abfd, value)
- bfd *abfd;
- bfd_vma value;
+mmo_write_octa (bfd *abfd, bfd_vma value)
{
mmo_write_tetra (abfd, (unsigned int) (value >> 32));
mmo_write_tetra (abfd, (unsigned int) value);
/* Write a 64-bit word to output file, without lop_quoting. */
static INLINE void
-mmo_write_octa_raw (abfd, value)
- bfd *abfd;
- bfd_vma value;
+mmo_write_octa_raw (bfd *abfd, bfd_vma value)
{
mmo_write_tetra_raw (abfd, (unsigned int) (value >> 32));
mmo_write_tetra_raw (abfd, (unsigned int) value);
sequence, followed by a call to mmo_flush_chunk. */
static INLINE bfd_boolean
-mmo_write_chunk (abfd, loc, len)
- bfd *abfd;
- const bfd_byte *loc;
- unsigned int len;
+mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len)
{
bfd_boolean retval = TRUE;
retval = (retval
&& ! abfd->tdata.mmo_data->have_error
- && 4 == bfd_bwrite ((PTR) loc, 4, abfd));
+ && 4 == bfd_bwrite (loc, 4, abfd));
loc += 4;
len -= 4;
4 bytes. */
static INLINE bfd_boolean
-mmo_flush_chunk (abfd)
- bfd *abfd;
+mmo_flush_chunk (bfd *abfd)
{
if (abfd->tdata.mmo_data->byte_no != 0)
{
/* Same, but from a list. */
static INLINE bfd_boolean
-mmo_write_chunk_list (abfd, datap)
- bfd *abfd;
- mmo_data_list_type *datap;
+mmo_write_chunk_list (bfd *abfd, mmo_data_list_type *datap)
{
for (; datap != NULL; datap = datap->next)
if (! mmo_write_chunk (abfd, datap->data, datap->size))
output if different than *LAST_VMAP, which is updated after this call. */
static bfd_boolean
-mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap)
- bfd *abfd;
- bfd_vma vma;
- const bfd_byte *loc;
- unsigned int len;
- bfd_vma *last_vmap;
+mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
+ unsigned int len, bfd_vma *last_vmap)
{
/* Find an initial and trailing section of zero tetras; we don't need to
write out zeros. FIXME: When we do this, we should emit section size
/* Same, but from a list. */
static INLINE bfd_boolean
-mmo_write_loc_chunk_list (abfd, datap)
- bfd *abfd;
- mmo_data_list_type *datap;
+mmo_write_loc_chunk_list (bfd *abfd, mmo_data_list_type *datap)
{
/* Get an address different than the address of the first chunk. */
bfd_vma last_vma = datap ? datap->where - 1 : 0;
/* Make a .MMIX.spec_data.N section. */
static asection *
-mmo_get_generic_spec_data_section (abfd, spec_data_number)
- bfd *abfd;
- int spec_data_number;
+mmo_get_generic_spec_data_section (bfd *abfd, int spec_data_number)
{
asection *sec;
char secname[sizeof (MMIX_OTHER_SPEC_SECTION_PREFIX) + 20]
ourselves, parse some of its data to get at the section name. */
static asection *
-mmo_get_spec_section (abfd, spec_data_number)
- bfd *abfd;
- int spec_data_number;
+mmo_get_spec_section (bfd *abfd, int spec_data_number)
{
- bfd_byte *secname;
+ char *secname;
asection *sec;
bfd_byte buf[4];
unsigned int secname_length;
if (bfd_bread (secname + i * 4, 4, abfd) != 4)
goto format_error_free;
- if (secname[i * 4] == LOP)
+ if (secname[i * 4] == (char) LOP)
{
/* A bit of overkill, but we handle char 0x98 in a section name,
and recognize misparsing. */
/* Read a byte, but read from file in multiples of 32-bit words. */
static bfd_byte
-mmo_get_byte (abfd)
- bfd *abfd;
+mmo_get_byte (bfd *abfd)
{
bfd_byte retval;
/* Write a byte, in multiples of 32-bit words. */
static void
-mmo_write_byte (abfd, value)
- bfd *abfd;
- bfd_byte value;
+mmo_write_byte (bfd *abfd, bfd_byte value)
{
abfd->tdata.mmo_data->buf[(abfd->tdata.mmo_data->byte_no++ % 4)] = value;
if ((abfd->tdata.mmo_data->byte_no % 4) == 0)
/* Create a symbol. */
static bfd_boolean
-mmo_create_symbol (abfd, symname, addr, sym_type, serno)
- bfd *abfd;
- const char *symname;
- bfd_vma addr;
- enum mmo_sym_type sym_type;
- unsigned int serno;
+mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum
+ mmo_sym_type sym_type, unsigned int serno)
{
struct mmo_symbol *n;
if (n->name == NULL)
return FALSE;
- strcpy ((PTR) n->name, symname);
+ strcpy (n->name, symname);
n->value = addr;
n->sym_type = sym_type;
/* Read in symbols. */
static bfd_boolean
-mmo_get_symbols (abfd)
- bfd *abfd;
+mmo_get_symbols (bfd *abfd)
{
/*
INODE
[abfd->tdata.mmo_data->symbol_position] = 0;
(*_bfd_error_handler)
- (_("%s: unsupported wide character sequence\
- 0x%02X 0x%02X after symbol name starting with `%s'\n"),
+ (_("%s: unsupported wide character sequence"
+ " 0x%02X 0x%02X after symbol name starting with `%s'\n"),
bfd_get_filename (abfd), c, c2,
abfd->tdata.mmo_data->lop_stab_symbol);
bfd_set_error (bfd_error_bad_value);
MMO_SEC_CONTENTS_CHUNK_SIZE. */
static INLINE bfd_byte *
-mmo_get_loc (sec, vma, size)
- asection *sec;
- bfd_vma vma;
- int size;
+mmo_get_loc (asection *sec, bfd_vma vma, int size)
{
bfd_size_type allocated_size;
struct mmo_section_data_struct *sdatap = mmo_section_data (sec);
/* Set sizes once we've read in all sections. */
static void
-mmo_map_set_sizes (abfd, sec, ignored)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec;
- PTR ignored ATTRIBUTE_UNUSED;
+mmo_map_set_sizes (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+ void *ignored ATTRIBUTE_UNUSED)
{
sec->lma = sec->vma;
}
/* Read the mmo file and turn it into sections. */
static bfd_boolean
-mmo_scan (abfd)
- bfd *abfd;
+mmo_scan (bfd *abfd)
{
unsigned int i;
unsigned int lineno = 1;
if (file_names[y] != NULL)
{
(*_bfd_error_handler)
- (_("%s: invalid mmo file: file number %d `%s',\
- was already entered as `%s'\n"),
+ (_("%s: invalid mmo file: file number %d `%s',"
+ " was already entered as `%s'\n"),
bfd_get_filename (abfd), y, fname, file_names[y]);
bfd_set_error (bfd_error_bad_value);
goto error_return;
if (file_names[y] == NULL)
{
(*_bfd_error_handler)
- (_("%s: invalid mmo file: file name for number %d\
- was not specified before use\n"),
+ (_("%s: invalid mmo file: file name for number %d"
+ " was not specified before use\n"),
bfd_get_filename (abfd), y);
bfd_set_error (bfd_error_bad_value);
goto error_return;
rsec
= bfd_make_section_old_way (abfd,
MMIX_REG_CONTENTS_SECTION_NAME);
+ rsec->flags |= SEC_LINKER_CREATED;
rsec->vma = z * 8;
loc = mmo_get_loc (rsec, z * 8, (255 - z) * 8);
bfd_put_64 (abfd, first_octa, loc);
if (y != 0 || z != 0)
{
(*_bfd_error_handler)
- (_("%s: invalid mmo file: fields y and z of lop_stab\
- non-zero, y: %d, z: %d\n"),
+ (_("%s: invalid mmo file: fields y and z of lop_stab"
+ " non-zero, y: %d, z: %d\n"),
bfd_get_filename (abfd), y, z);
bfd_set_error (bfd_error_bad_value);
goto error_return;
if (statbuf.st_size != curpos)
{
(*_bfd_error_handler)
- (_("%s: invalid mmo file: lop_end not last item in\
- file\n"),
+ (_("%s: invalid mmo file: lop_end not last item in"
+ " file\n"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
goto error_return;
if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
{
(*_bfd_error_handler)
- (_("%s: invalid mmo file: YZ of lop_end (%ld)\
- not equal to the number of tetras to the preceding lop_stab (%ld)\n"),
+ (_("%s: invalid mmo file: YZ of lop_end (%ld)"
+ " not equal to the number of tetras to the preceding"
+ " lop_stab (%ld)\n"),
bfd_get_filename (abfd), (long) (y * 256 + z),
(curpos - stab_loc - 4)/4);
bfd_set_error (bfd_error_bad_value);
we point out the shape of allocated section contents. */
static bfd_boolean
-mmo_new_section_hook (abfd, newsect)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *newsect;
+mmo_new_section_hook (bfd *abfd ATTRIBUTE_UNUSED, asection *newsect)
{
/* We zero-fill all fields and assume NULL is represented by an all
zero-bit pattern. */
newsect->used_by_bfd =
- (PTR) bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
+ bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
if (!newsect->used_by_bfd)
return FALSE;
contents. */
static bfd_boolean
-mmo_get_section_contents (abfd, sec, location, offset, bytes_to_do)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec ATTRIBUTE_UNUSED;
- PTR location ATTRIBUTE_UNUSED;
- file_ptr offset ATTRIBUTE_UNUSED;
- bfd_size_type bytes_to_do ATTRIBUTE_UNUSED;
+mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+ asection *sec,
+ void * location,
+ file_ptr offset,
+ bfd_size_type bytes_to_do)
{
/* Iterate over diminishing chunk sizes, copying contents, like
mmo_set_section_contents. */
/* Return the amount of memory needed to read the symbol table. */
static long
-mmo_get_symtab_upper_bound (abfd)
- bfd *abfd ATTRIBUTE_UNUSED;
+mmo_get_symtab_upper_bound (bfd *abfd)
{
return (abfd->symcount + 1) * sizeof (asymbol *);
}
/* Sort mmo symbols by serial number. */
static int
-mmo_sort_mmo_symbols (arg1, arg2)
- const PTR arg1;
- const PTR arg2;
+mmo_sort_mmo_symbols (const void *arg1, const void *arg2)
{
const struct mmo_symbol *sym1 = *(const struct mmo_symbol **) arg1;
const struct mmo_symbol *sym2 = *(const struct mmo_symbol **) arg2;
/* Translate the symbol table. */
static long
-mmo_canonicalize_symtab (abfd, alocation)
- bfd *abfd;
- asymbol **alocation;
+mmo_canonicalize_symtab (bfd *abfd, asymbol **alocation)
{
unsigned int symcount = bfd_get_symcount (abfd);
asymbol *csymbols;
{
c->section
= bfd_make_section_old_way (abfd, MMIX_REG_SECTION_NAME);
+ c->section->flags |= SEC_LINKER_CREATED;
}
else
{
asection *textsec
= bfd_get_section_by_name (abfd, MMO_TEXT_SECTION_NAME);
+ asection *datasec;
if (textsec != NULL
&& c->value >= textsec->vma
c->section = textsec;
c->value -= c->section->vma;
}
+ /* In mmo, symbol types depend on the VMA. Therefore, if
+ the data section isn't within the usual bounds, its
+ symbols are marked as absolute. Correct that. This
+ means we can't have absolute symbols with values matching
+ data section addresses, but we also can't have with
+ absolute symbols with values matching text section
+ addresses. For such needs, use the ELF format. */
+ else if ((datasec
+ = bfd_get_section_by_name (abfd,
+ MMO_DATA_SECTION_NAME))
+ != NULL
+ && c->value >= datasec->vma
+ && c->value <= datasec->vma + datasec->size)
+ {
+ c->section = datasec;
+ c->value -= c->section->vma;
+ }
else
c->section = bfd_abs_section_ptr;
}
/* Get information about a symbol. */
static void
-mmo_get_symbol_info (ignore_abfd, symbol, ret)
- bfd *ignore_abfd ATTRIBUTE_UNUSED;
- asymbol *symbol;
- symbol_info *ret;
+mmo_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+ asymbol *symbol, symbol_info *ret)
{
bfd_symbol_info (symbol, ret);
}
static void
-mmo_print_symbol (abfd, afile, symbol, how)
- bfd *abfd;
- PTR afile;
- asymbol *symbol;
- bfd_print_symbol_type how;
+mmo_print_symbol (bfd *abfd, void *afile, asymbol *symbol,
+ bfd_print_symbol_type how)
{
FILE *file = (FILE *) afile;
fprintf (file, "%s", symbol->name);
break;
default:
- bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
+ bfd_print_symbol_vandf (abfd, file, symbol);
fprintf (file, " %-5s %s",
symbol->section->name,
size of header information is irrelevant. */
static int
-mmo_sizeof_headers (abfd, exec)
- bfd *abfd ATTRIBUTE_UNUSED;
- bfd_boolean exec ATTRIBUTE_UNUSED;
+mmo_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+ bfd_boolean exec ATTRIBUTE_UNUSED)
{
return 0;
}
/* Write the (section-neutral) file preamble. */
static bfd_boolean
-mmo_internal_write_header (abfd)
- bfd *abfd;
+mmo_internal_write_header (bfd *abfd)
{
const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};
start-address. */
static bfd_boolean
-mmo_internal_write_post (abfd, z, sec)
- bfd *abfd;
- int z;
- asection *sec;
+mmo_internal_write_post (bfd *abfd, int z, asection *sec)
{
int i;
bfd_byte buf[8];
get bitten by BFD flag number changes. */
static flagword
-mmo_sec_flags_from_bfd_flags (flags)
- flagword flags;
+mmo_sec_flags_from_bfd_flags (flagword flags)
{
flagword oflags = 0;
}
static flagword
-bfd_sec_flags_from_mmo_flags (flags)
- flagword flags;
+bfd_sec_flags_from_mmo_flags (flagword flags)
{
flagword oflags = 0;
return oflags;
}
+/* Return TRUE iff the leading or trailing tetrabyte in SEC is defined and
+ is 0. */
+
+static bfd_boolean
+mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec)
+{
+ bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+ if (sec->size < 4)
+ return FALSE;
+
+ if (bfd_get_32 (abfd, mmo_get_loc (sec, secaddr, 4)) == 0
+ && bfd_get_32 (abfd,
+ mmo_get_loc (sec, secaddr + sec->size - 4, 4)) == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
/* Write a section. */
static bfd_boolean
-mmo_internal_write_section (abfd, sec)
- bfd *abfd;
- asection *sec;
+mmo_internal_write_section (bfd *abfd, asection *sec)
{
/* We do it differently depending on what section this is:
above. */
if (strcmp (sec->name, MMO_TEXT_SECTION_NAME) == 0)
- /* FIXME: Output source file name and line number. */
- return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+ {
+ bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+ /* Because leading and trailing zeros are omitted in output, we need to
+ specify the section boundaries so they're correct when the file
+ is read in again. That's also the case if this section is
+ specified as not within its usual boundaries or alignments. */
+ if (sec->size != 0
+ && (secaddr + sec->size >= (bfd_vma) 1 << 56
+ || (secaddr & 3) != 0
+ || (sec->size & 3) != 0
+ || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec)))
+ {
+ if (!mmo_write_section_description (abfd, sec))
+ return FALSE;
+ }
+
+ /* FIXME: Output source file name and line number. */
+ return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+ }
else if (strcmp (sec->name, MMO_DATA_SECTION_NAME) == 0)
- return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+ {
+ bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+ /* Same goes as for MMO_TEXT_SECTION_NAME above. */
+ if (sec->size != 0
+ && (secaddr < (bfd_vma) 0x20 << 56
+ || secaddr + sec->size >= (bfd_vma) 0x21 << 56
+ || (secaddr & 3) != 0
+ || (sec->size & 3) != 0
+ || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec)))
+ {
+ if (!mmo_write_section_description (abfd, sec))
+ return FALSE;
+ }
+
+ return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+ }
else if (strcmp (sec->name, MMIX_REG_CONTENTS_SECTION_NAME) == 0)
/* Not handled here. */
{
else if ((bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) != 0
&& sec->size != 0)
{
- /* Keep the document-comment formatted the way it is. */
+ if (!mmo_write_section_description (abfd, sec))
+ return FALSE;
+
+ /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually
+ loaded. */
+ if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
+ return (! abfd->tdata.mmo_data->have_error
+ && mmo_write_loc_chunk_list (abfd,
+ mmo_section_data (sec)->head));
+ return (! abfd->tdata.mmo_data->have_error
+ && mmo_write_chunk_list (abfd, mmo_section_data (sec)->head));
+ }
+
+ /* Some section without contents. */
+ return TRUE;
+}
+
+/* Write the description of a section, extended-mmo-style. */
+
+static bfd_boolean
+mmo_write_section_description (bfd *abfd, asection *sec)
+{
+ /* Keep the following document-comment formatted the way it is. */
/*
INODE
mmo section mapping, , Symbol-table, mmo
special data. The address is usually unimportant but might
provide information for e.g.@: the DWARF 2 debugging format. */
- mmo_write_tetra_raw (abfd, LOP_SPEC_SECTION);
- mmo_write_tetra (abfd, (strlen (sec->name) + 3) / 4);
- mmo_write_chunk (abfd, sec->name, strlen (sec->name));
- mmo_flush_chunk (abfd);
- /* FIXME: We can get debug sections (.debug_line & Co.) with a
- section flag still having SEC_RELOC set. Investigate. This
- might be true for all alien sections; perhaps mmo.em should clear
- that flag. Might be related to weak references. */
- mmo_write_tetra (abfd,
- mmo_sec_flags_from_bfd_flags
- (bfd_get_section_flags (abfd, sec)));
- mmo_write_octa (abfd, sec->size);
- mmo_write_octa (abfd, bfd_get_section_vma (abfd, sec));
-
- /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually
- loaded. */
- if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
- return (! abfd->tdata.mmo_data->have_error
- && mmo_write_loc_chunk_list (abfd,
- mmo_section_data (sec)->head));
- return (! abfd->tdata.mmo_data->have_error
- && mmo_write_chunk_list (abfd, mmo_section_data (sec)->head));
- }
+ mmo_write_tetra_raw (abfd, LOP_SPEC_SECTION);
+ mmo_write_tetra (abfd, (strlen (sec->name) + 3) / 4);
+ mmo_write_chunk (abfd, (bfd_byte *) sec->name, strlen (sec->name));
+ mmo_flush_chunk (abfd);
+ /* FIXME: We can get debug sections (.debug_line & Co.) with a section
+ flag still having SEC_RELOC set. Investigate. This might be true
+ for all alien sections; perhaps mmo.em should clear that flag. Might
+ be related to weak references. */
+ mmo_write_tetra (abfd,
+ mmo_sec_flags_from_bfd_flags
+ (bfd_get_section_flags (abfd, sec)));
+ mmo_write_octa (abfd, sec->size);
+ mmo_write_octa (abfd, bfd_get_section_vma (abfd, sec));
return TRUE;
}
/* We save up all data before output. */
static bfd_boolean
-mmo_set_section_contents (abfd, sec, location, offset, bytes_to_do)
- bfd *abfd ATTRIBUTE_UNUSED;
- sec_ptr sec;
- const PTR location;
- file_ptr offset;
- bfd_size_type bytes_to_do;
+mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
+ const void *location, file_ptr offset,
+ bfd_size_type bytes_to_do)
{
/* Iterate over diminishing chunk sizes, copying contents. */
while (bytes_to_do)
/* Add a symbol to a trie-tree. */
static bfd_boolean
-mmo_internal_add_3_sym (abfd, rootp, symp)
- bfd *abfd;
- struct mmo_symbol_trie *rootp;
- const struct mmo_symbol *symp;
+mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp,
+ const struct mmo_symbol *symp)
{
const char *name = symp->name;
struct mmo_symbol_trie *trie = rootp;
/* Find out the length of the serialized version of a trie in bytes. */
static unsigned int
-mmo_internal_3_length (abfd, trie)
- bfd *abfd;
- struct mmo_symbol_trie *trie;
+mmo_internal_3_length (bfd *abfd, struct mmo_symbol_trie *trie)
{
/* First, one for the control byte. */
unsigned int length = 1;
beb128. Using a helper function and recursion simplifies debugging. */
static void
-mmo_beb128_out (abfd, serno, marker)
- bfd *abfd;
- int serno;
- int marker;
+mmo_beb128_out (bfd *abfd, int serno, int marker)
{
if (serno & ~0x7f)
mmo_beb128_out (abfd, serno >> 7, 0);
/* Serialize a trie. */
static void
-mmo_internal_3_dump (abfd, trie)
- bfd *abfd;
- struct mmo_symbol_trie *trie;
+mmo_internal_3_dump (bfd *abfd, struct mmo_symbol_trie *trie)
{
bfd_byte control = 0;
/* Write symbols in mmo format. Also write the lop_end terminator. */
static bfd_boolean
-mmo_write_symbols_and_terminator (abfd)
- bfd *abfd;
+mmo_write_symbols_and_terminator (bfd *abfd)
{
int count = bfd_get_symcount (abfd);
asymbol *maintable[2];
sprintf_vma (vmas_start, vma_start);
(*_bfd_error_handler)
- (_("%s: Bad symbol definition: `Main' set to %s rather\
- than the start address %s\n"),
+ (_("%s: Bad symbol definition: `Main' set to %s rather"
+ " than the start address %s\n"),
bfd_get_filename (abfd), vmas_main, vmas_start);
bfd_set_error (bfd_error_bad_value);
return FALSE;
struct mmo_symbol sym;
memset (&sym, 0, sizeof (sym));
- sym.name = s->name;
+ /* Need to strip const here; strdup:ing would leak and the
+ existing string must be safe to reuse. */
+ sym.name = (char *) s->name;
sym.value =
s->value
+ s->section->output_section->vma
struct mmo_symbol sym;
(*_bfd_error_handler)
- (_("%s: warning: symbol table too large for mmo, larger than 65535\
- 32-bit words: %d. Only `Main' will be emitted.\n"),
+ (_("%s: warning: symbol table too large for mmo, larger than 65535"
+ " 32-bit words: %d. Only `Main' will be emitted.\n"),
bfd_get_filename (abfd), trie_len);
memset (&sym, 0, sizeof (sym));
isn't debugged and abort if we get here. Instead emit a
diagnostic and fail "normally". */
(*_bfd_error_handler)
- (_("%s: internal error, symbol table changed size from %d to %d\
- words\n"),
+ (_("%s: internal error, symbol table changed size from %d to %d"
+ " words\n"),
bfd_get_filename (abfd), trie_len,
(abfd->tdata.mmo_data->byte_no + 3)/4);
bfd_set_error (bfd_error_bad_value);
used through bfd_map_over_sections. */
static void
-mmo_write_section_unless_reg_contents (abfd, sec, p)
- bfd *abfd;
- asection *sec;
- PTR p;
+mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p)
{
struct mmo_write_sec_info *infop = (struct mmo_write_sec_info *) p;
make it carry contents, so we don't have a test-case for
this. */
(*_bfd_error_handler)
- (_("%s: internal error, internal register section %s had\
- contents\n"),
+ (_("%s: internal error, internal register section %s had"
+ " contents\n"),
bfd_get_filename (abfd), sec->name);
bfd_set_error (bfd_error_bad_value);
infop->retval = FALSE;
already called. */
static bfd_boolean
-mmo_write_object_contents (abfd)
- bfd *abfd;
+mmo_write_object_contents (bfd *abfd)
{
struct mmo_write_sec_info wsecinfo;
wsecinfo.retval = TRUE;
bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents,
- (PTR) &wsecinfo);
+ &wsecinfo);
if (! wsecinfo.retval)
return FALSE;
(long) sec->size);
else
(*_bfd_error_handler)
- (_("%s: invalid start address for initialized registers of\
- length %ld: 0x%lx%08lx\n"),
+ (_("%s: invalid start address for initialized registers of"
+ " length %ld: 0x%lx%08lx\n"),
bfd_get_filename (abfd),
(long) sec->size,
(unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
object. */
static long
-mmo_get_reloc_upper_bound (abfd, sec)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *sec ATTRIBUTE_UNUSED;
+mmo_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
+ asection *sec ATTRIBUTE_UNUSED)
{
- return sizeof (PTR);
+ return sizeof (void *);
}
/* Similarly canonicalize relocs to empty, filling in the terminating NULL
pointer. */
long
-mmo_canonicalize_reloc (abfd, section, relptr, symbols)
- bfd *abfd ATTRIBUTE_UNUSED;
- sec_ptr section ATTRIBUTE_UNUSED;
- arelent **relptr;
- asymbol **symbols ATTRIBUTE_UNUSED;
+mmo_canonicalize_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+ sec_ptr section ATTRIBUTE_UNUSED, arelent **relptr,
+ asymbol **symbols ATTRIBUTE_UNUSED)
{
*relptr = NULL;
return 0;
/* FIXME: We can do better on this one, if we have a dwarf2 .debug_line
section or if MMO line numbers are implemented. */
#define mmo_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define mmo_find_inliner_info _bfd_nosymbols_find_inliner_info
#define mmo_make_empty_symbol _bfd_generic_make_empty_symbol
#define mmo_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
#define mmo_read_minisymbols _bfd_generic_read_minisymbols