/* BFD back-end for mmo objects (MMIX-specific object-format).
- Copyright (C) 2001-2016 Free Software Foundation, Inc.
+ Copyright (C) 2001-2020 Free Software Foundation, Inc.
Written by Hans-Peter Nilsson (hp@bitrange.com).
Infrastructure and other bits originally copied from srec.c and
binary.c.
@samp{YZ} in lop_fixr: it is xor:ed into the current location
minus @math{4 * L}. The first byte of the word is 0 or 1. If it
is 1, then @math{L = (@var{lowest 24 bits of word}) - 2^Z}, if 0,
- then @math{L = (@var{lowest 24 bits of word})}.
+ then @math{L = (@var{lowest 24 bits of word})}.
@item lop_file
0x9806YYZZ. @samp{Y} is the file number, @samp{Z} is count of
#include "elf/mmix.h"
#include "opcode/mmix.h"
-#define LOP 0x98
+#define LOP 0x98u
#define LOP_QUOTE 0
#define LOP_LOC 1
#define LOP_SKIP 2
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 bfd_cleanup 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,
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
-char valid_mmo_symbol_character_set[/* A-Z a-z (we assume consecutive
- codes; sorry EBCDIC:ers!). */
- + 'Z' - 'A' + 1 + 'z' - 'a' + 1
- /* Digits. */
- + 10
- /* ':' and '_'. */
- + 1 + 1
- /* Codes higher than 126. */
- + 256 - 126
- /* Ending zero. */
- + 1];
+static const char
+valid_mmo_symbol_character_set[] =
+{
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+ 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+ 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ ':', '_', 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255,
+ 0
+};
/* Get section SECNAME or create one if it doesn't exist. When creating
if (newsecname == NULL)
{
_bfd_error_handler
- (_("%s: No core to allocate section name %s\n"),
- bfd_get_filename (abfd), secname);
+ /* xgettext:c-format */
+ (_("%pB: no core to allocate section name %s"),
+ abfd, secname);
bfd_set_error (bfd_error_system_call);
return NULL;
}
mmo_init (void)
{
static bfd_boolean inited = FALSE;
- int i = 0;
- int j = 0;
- static const char letters[]
- = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789:_";
if (inited)
return;
inited = TRUE;
-
- /* Fill in the set of valid symbol characters. */
- strcpy (valid_mmo_symbol_character_set, letters);
- i = strlen (letters);
-
- for (j = 126; j < 256; j++)
- valid_mmo_symbol_character_set[i++] = j;
}
/* Check whether an existing file is an mmo file. */
-static const bfd_target *
+static bfd_cleanup
mmo_object_p (bfd *abfd)
{
struct stat statbuf;
if (abfd->tdata.mmo_data->lop_stab_symbol == NULL)
{
_bfd_error_handler
- (_("%s: No core to allocate a symbol %d bytes long\n"),
- bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length);
+ /* xgettext:c-format */
+ (_("%pB: no core to allocate a symbol %d bytes long"),
+ abfd, abfd->tdata.mmo_data->max_symbol_length);
goto bad_final;
}
if (! bfd_default_set_arch_mach (abfd, bfd_arch_mmix, 0))
goto bad_format_free;
- return abfd->xvec;
+ return _bfd_no_cleanup;
bad_format_free:
free (abfd->tdata.mmo_data->lop_stab_symbol);
/* All fields are zero-initialized, so we don't have to explicitly
initialize most. */
- tdata_type *tdata = (tdata_type *) bfd_zmalloc (sizeof (tdata_type));
+ tdata_type *tdata = (tdata_type *) bfd_zalloc (abfd, sizeof (tdata_type));
if (tdata == NULL)
return FALSE;
mmo_section_has_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p ATTRIBUTE_UNUSED)
{
/* The point is to match what --extract-symbols does (well, negated). */
- return bfd_get_section_size (sec) != 0;
+ return bfd_section_size (sec) != 0;
}
/* Find out whether we should omit symbol consistency checks for this
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);
+ bfd_vma vma = bfd_section_vma (sec);
/* Ignore sections that aren't loaded. */
- if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC))
+ if ((bfd_section_flags (sec) & (SEC_LOAD | SEC_ALLOC))
!= (SEC_LOAD | SEC_ALLOC))
return;
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);
+ bfd_vma vma = bfd_section_vma (sec);
/* Ignore sections that aren't loaded. */
- if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC))
+ if ((bfd_section_flags (sec) & (SEC_LOAD | SEC_ALLOC))
!= (SEC_LOAD | SEC_ALLOC))
return;
if (sec == NULL)
return NULL;
- if (! sec->user_set_vma && ! bfd_set_section_vma (abfd, sec, vma))
+ if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma))
return NULL;
- if (! bfd_set_section_flags (abfd, sec,
- bfd_get_section_flags (abfd, sec)
- | SEC_CODE | SEC_LOAD | SEC_ALLOC))
+ if (!bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_CODE | SEC_LOAD | SEC_ALLOC)))
return NULL;
}
else if ((vma >> 56) == 0x20)
if (sec == NULL)
return NULL;
- if (! sec->user_set_vma && ! bfd_set_section_vma (abfd, sec, vma))
+ if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma))
return NULL;
- if (! bfd_set_section_flags (abfd, sec,
- bfd_get_section_flags (abfd, sec)
- | SEC_LOAD | SEC_ALLOC))
+ if (!bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_LOAD | SEC_ALLOC)))
return NULL;
}
sprintf (sec_name, ".MMIX.sec.%d", abfd->tdata.mmo_data->sec_no++);
sec = mmo_make_section (abfd, sec_name);
- if (! sec->user_set_vma && ! bfd_set_section_vma (abfd, sec, vma))
+ if (!sec->user_set_vma && !bfd_set_section_vma (sec, vma))
return NULL;
- if (! bfd_set_section_flags (abfd, sec,
- bfd_get_section_flags (abfd, sec)
- | SEC_LOAD | SEC_ALLOC))
+ if (!bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_LOAD | SEC_ALLOC)))
return NULL;
return sec;
}
if ((vma & 3) != 0)
{
_bfd_error_handler
- (_("%s: attempt to emit contents at non-multiple-of-4 address 0x%lx\n"),
- bfd_get_filename (abfd), (unsigned long) vma);
+ /* xgettext:c-format */
+ (_("%pB: attempt to emit contents at non-multiple-of-4"
+ " address %#" PRIx64 ""),
+ abfd, (uint64_t) vma);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
/* We always write the location as 64 bits; no use saving bytes
- here. */
+ here. */
mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_LOC << 16) | 2);
mmo_write_octa_raw (abfd, vma);
}
/* Add in the section flags we found to those bfd entered during this
process and set the contents. */
- if (! bfd_set_section_flags (abfd, sec,
- bfd_sec_flags_from_mmo_flags (flags)
- | bfd_get_section_flags (abfd, sec)
- | (section_length != 0 ? SEC_HAS_CONTENTS : 0))
- || ! bfd_set_section_size (abfd, sec, sec->size + section_length)
+ if (!bfd_set_section_flags (sec,
+ (bfd_sec_flags_from_mmo_flags (flags)
+ | bfd_section_flags (sec)
+ | (section_length != 0 ? SEC_HAS_CONTENTS : 0)))
+ || !bfd_set_section_size (sec, sec->size + section_length)
/* Set VMA only for the first occurrence. */
- || (! sec->user_set_vma
- && ! bfd_set_section_vma (abfd, sec, section_vma)))
+ || (!sec->user_set_vma && !bfd_set_section_vma (sec, section_vma)))
{
/* If we get an error for any of the calls above, signal more than
just a format error for the spec section. */
&& !mmo_ignore_symbol_consistency (abfd))
{
_bfd_error_handler
- (_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"),
- bfd_get_filename (abfd));
+ (_("%pB: invalid mmo file: initialization value for $255"
+ " is not `Main'\n"),
+ abfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
[abfd->tdata.mmo_data->symbol_position] = 0;
_bfd_error_handler
- (_("%s: unsupported wide character sequence"
+ /* xgettext:c-format */
+ (_("%pB: 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);
+ abfd, c, c2, abfd->tdata.mmo_data->lop_stab_symbol);
bfd_set_error (bfd_error_bad_value);
abfd->tdata.mmo_data->have_error = TRUE;
return FALSE;
/* We get here for the first time (at other times too) for this
section. Say we have contents. */
- if (! bfd_set_section_flags (sec->owner, sec,
- bfd_get_section_flags (sec->owner, sec)
- | SEC_HAS_CONTENTS))
+ if (!bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_HAS_CONTENTS)))
return NULL;
}
}
unsigned int lineno = 1;
bfd_boolean error = FALSE;
bfd_vma vma = 0;
- asection *sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
+ asection *sec = NULL;
asection *non_spec_sec = NULL;
bfd_vma non_spec_vma = 0;
bfd_size_type nbytes_read = 0;
/* Buffer with room to read a 64-bit value. */
bfd_byte buf[8];
- long stab_loc = -1;
+ file_ptr stab_loc = -1;
char *file_names[256];
abfd->symcount = 0;
{
default:
_bfd_error_handler
- (_("%s: invalid mmo file: unsupported lopcode `%d'\n"),
- bfd_get_filename (abfd), buf[1]);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: unsupported lopcode `%d'\n"),
+ abfd, buf[1]);
bfd_set_error (bfd_error_bad_value);
goto error_return;
if (y != 0 || z != 1)
{
_bfd_error_handler
- (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"),
- bfd_get_filename (abfd), y*256+z);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: expected YZ = 1"
+ " got YZ = %d for lop_quote\n"),
+ abfd, y*256+z);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
goto error_return;
vma &= ~3;
+ if (sec == NULL)
+ sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
mmo_xore_32 (sec, vma, bfd_get_32 (abfd, buf));
vma += 4;
lineno++;
else
{
_bfd_error_handler
- (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"),
- bfd_get_filename (abfd), z);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: expected z = 1 or z = 2,"
+ " got z = %d for lop_loc\n"),
+ abfd, z);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
else
{
_bfd_error_handler
- (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"),
- bfd_get_filename (abfd), z);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: expected z = 1 or z = 2,"
+ " got z = %d for lop_fixo\n"),
+ abfd, z);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
if (y != 0)
{
_bfd_error_handler
- (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"),
- bfd_get_filename (abfd), y);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: expected y = 0,"
+ " got y = %d for lop_fixrx\n"),
+ abfd, y);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
if (z != 16 && z != 24)
{
_bfd_error_handler
- (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"),
- bfd_get_filename (abfd), z);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: expected z = 16 or z = 24,"
+ " got z = %d for lop_fixrx\n"),
+ abfd, z);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
else
{
_bfd_error_handler
- (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"),
- bfd_get_filename (abfd), buf[0]);
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: leading byte of operand word"
+ " must be 0 or 1, got %d for lop_fixrx\n"),
+ abfd, buf[0]);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
if (fname == NULL)
{
_bfd_error_handler
- (_("%s: cannot allocate file name for file number %d, %d bytes\n"),
- bfd_get_filename (abfd), y, z * 4 + 1);
+ /* xgettext:c-format */
+ (_("%pB: cannot allocate file name for file number %d,"
+ " %d bytes\n"),
+ abfd, y, z * 4 + 1);
bfd_set_error (bfd_error_system_call);
goto error_return;
}
if (file_names[y] != NULL)
{
_bfd_error_handler
- (_("%s: invalid mmo file: file number %d `%s',"
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: file number %d `%s',"
" was already entered as `%s'\n"),
- bfd_get_filename (abfd), y, fname, file_names[y]);
+ 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"
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: file name for number %d"
" was not specified before use\n"),
- bfd_get_filename (abfd), y);
+ abfd, y);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
if (y != 0 || z != 0)
{
_bfd_error_handler
- (_("%s: invalid mmo file: fields y and z of lop_stab"
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: fields y and z of lop_stab"
" non-zero, y: %d, z: %d\n"),
- bfd_get_filename (abfd), y, z);
+ 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"
+ /* xgettext:c-format */
+ (_("%pB: invalid mmo file: lop_end not last item in"
" file\n"),
- bfd_get_filename (abfd));
+ 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)"
+ /* xgettext:c-format */
+ (_("%pB: 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);
+ abfd, (long) (y * 256 + z),
+ (long) (curpos - stab_loc - 4)/4);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
else
{
/* This wasn't a lopcode, so store it in the current section. */
+ if (sec == NULL)
+ sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
mmo_xore_32 (sec, vma & ~3, bfd_get_32 (abfd, buf));
vma += 4;
vma &= ~3;
section flags must be set then. */
sec = bfd_get_section_by_name (abfd, MMO_TEXT_SECTION_NAME);
if (sec != NULL
- && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
- && ! bfd_set_section_flags (abfd, sec,
- bfd_get_section_flags (abfd, sec)
- | SEC_ALLOC | SEC_LOAD | SEC_CODE))
+ && (bfd_section_flags (sec) & SEC_HAS_CONTENTS)
+ && !bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_ALLOC | SEC_LOAD | SEC_CODE)))
error = TRUE;
sec = bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME);
if (sec != NULL
- && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
- && ! bfd_set_section_flags (abfd, sec,
- bfd_get_section_flags (abfd, sec)
- | SEC_ALLOC | SEC_LOAD))
+ && (bfd_section_flags (sec) & SEC_HAS_CONTENTS)
+ && !bfd_set_section_flags (sec, (bfd_section_flags (sec)
+ | SEC_ALLOC | SEC_LOAD | SEC_DATA)))
error = TRUE;
/* Free whatever resources we took. */
for (i = 0; i < sizeof (file_names) / sizeof (file_names[0]); i++)
- if (file_names[i])
- free (file_names[i]);
+ free (file_names[i]);
return ! error;
}
static bfd_boolean
mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec)
{
- bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+ bfd_vma secaddr = bfd_section_vma (sec);
if (sec->size < 4)
return FALSE;
if (strcmp (sec->name, MMO_TEXT_SECTION_NAME) == 0)
{
- bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+ bfd_vma secaddr = bfd_section_vma (sec);
/* Because leading and trailing zeros are omitted in output, we need to
specify the section boundaries so they're correct when the file
}
else if (strcmp (sec->name, MMO_DATA_SECTION_NAME) == 0)
{
- bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+ bfd_vma secaddr = bfd_section_vma (sec);
/* Same goes as for MMO_TEXT_SECTION_NAME above. */
if (sec->size != 0
/* Not handled here. */
{
/* This would normally be an abort call since this can't happen, but
- we don't do that. */
+ we don't do that. */
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
}
/* Ignore sections that are just allocated or empty; we write out
_contents_ here. */
- else if ((bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) != 0
+ else if ((bfd_section_flags (sec) & SEC_HAS_CONTENTS) != 0
&& sec->size != 0)
{
if (!mmo_write_section_description (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)
+ if (bfd_section_flags (sec) & SEC_LOAD)
return (! abfd->tdata.mmo_data->have_error
&& mmo_write_loc_chunk_list (abfd,
mmo_section_data (sec)->head));
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_sec_flags_from_bfd_flags (bfd_section_flags (sec)));
mmo_write_octa (abfd, sec->size);
- mmo_write_octa (abfd, bfd_get_section_vma (abfd, sec));
+ mmo_write_octa (abfd, bfd_section_vma (sec));
return TRUE;
}
if (trie->sym.name != NULL)
{
_bfd_error_handler
- (_("%s: invalid symbol table: duplicate symbol `%s'\n"),
- bfd_get_filename (abfd), trie->sym.name);
+ /* xgettext:c-format */
+ (_("%pB: invalid symbol table: duplicate symbol `%s'\n"),
+ abfd, trie->sym.name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
sprintf_vma (vmas_start, vma_start);
_bfd_error_handler
- (_("%s: Bad symbol definition: `Main' set to %s rather"
+ /* xgettext:c-format */
+ (_("%pB: bad symbol definition: `Main' set to %s rather"
" than the start address %s\n"),
- bfd_get_filename (abfd), vmas_main, vmas_start);
+ abfd, vmas_main, vmas_start);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
struct mmo_symbol sym;
_bfd_error_handler
- (_("%s: warning: symbol table too large for mmo, larger than 65535"
+ /* xgettext:c-format */
+ (_("%pB: 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);
+ abfd, trie_len);
memset (&sym, 0, sizeof (sym));
sym.sym_type = mmo_abs_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"
+ /* xgettext:c-format */
+ (_("%pB: internal error, symbol table changed size from %d to %d"
" words\n"),
- bfd_get_filename (abfd), trie_len,
+ abfd, trie_len,
(abfd->tdata.mmo_data->byte_no + 3)/4);
bfd_set_error (bfd_error_bad_value);
return FALSE;
/* Exclude the convenience register section. */
if (strcmp (sec->name, MMIX_REG_SECTION_NAME) == 0)
{
- if (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
+ if (bfd_section_flags (sec) & SEC_HAS_CONTENTS)
{
/* Make sure it hasn't got contents. It seems impossible to
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"
+ /* xgettext:c-format */
+ (_("%pB: internal error, internal register section %pA had"
" contents\n"),
- bfd_get_filename (abfd), sec->name);
+ abfd, sec);
bfd_set_error (bfd_error_bad_value);
infop->retval = FALSE;
return;
if (sec->size == 0)
/* There must always be at least one such register. */
_bfd_error_handler
- (_("%s: no initialized registers; section length 0\n"),
- bfd_get_filename (abfd));
+ (_("%pB: no initialized registers; section length 0\n"),
+ abfd);
else if (sec->vma > (256 - 32) * 8)
/* Provide better error message for the case of too many
global registers. */
_bfd_error_handler
- (_("%s: too many initialized registers; section length %ld\n"),
- bfd_get_filename (abfd),
- (long) sec->size);
+ /* xgettext:c-format */
+ (_("%pB: too many initialized registers; section length %" PRId64),
+ abfd, (int64_t) sec->size);
else
_bfd_error_handler
- (_("%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));
+ /* xgettext:c-format */
+ (_("%pB: invalid start address for initialized registers of"
+ " length %" PRId64 ": %#" PRIx64),
+ abfd, (int64_t) sec->size, (uint64_t) sec->vma);
return FALSE;
}
/* Perhaps we need to adjust this one; mmo labels (originally) without a
leading ':' might more appropriately be called local. */
#define mmo_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define mmo_bfd_is_target_special_symbol \
- ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define mmo_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
#define mmo_get_symbol_version_string \
_bfd_nosymbols_get_symbol_version_string
#define mmo_bfd_relax_section bfd_generic_relax_section
#define mmo_bfd_merge_sections bfd_generic_merge_sections
#define mmo_bfd_is_group_section bfd_generic_is_group_section
+#define mmo_bfd_group_name bfd_generic_group_name
#define mmo_bfd_discard_group bfd_generic_discard_group
#define mmo_section_already_linked \
_bfd_generic_section_already_linked
#define mmo_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define mmo_bfd_link_hide_symbol _bfd_generic_link_hide_symbol
+#define mmo_bfd_define_start_stop bfd_generic_define_start_stop
/* We want to copy time of creation, otherwise we'd use
BFD_JUMP_TABLE_COPY (_bfd_generic). */
_bfd_dummy_target,
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
mmo_mkobject,
- bfd_false,
- bfd_false,
+ _bfd_bool_bfd_false_error,
+ _bfd_bool_bfd_false_error,
},
{ /* bfd_write_contents */
- bfd_false,
+ _bfd_bool_bfd_false_error,
mmo_write_object_contents,
- bfd_false,
- bfd_false,
+ _bfd_bool_bfd_false_error,
+ _bfd_bool_bfd_false_error,
},
BFD_JUMP_TABLE_GENERIC (mmo),
projects / deliverable / binutils-gdb.git / blobdiff