X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmmo.c;h=d175befd0db3b1dc7a6745fdfd3ee1953606dc2f;hb=0d037fafed44c6704d0f15e8d49815caebcd7814;hp=b8af63a711f3080052da0544bdf1f3b703c61b03;hpb=4f3b23b390640efdc36c575dbda2175e61154bc9;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/mmo.c b/bfd/mmo.c index b8af63a711..d175befd0d 100644 --- a/bfd/mmo.c +++ b/bfd/mmo.c @@ -1,5 +1,5 @@ /* BFD back-end for mmo objects (MMIX-specific object-format). - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. Written by Hans-Peter Nilsson (hp@bitrange.com). Infrastructure and other bits originally copied from srec.c and binary.c. @@ -113,7 +113,7 @@ SUBSECTION @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 @@ -207,7 +207,7 @@ EXAMPLE #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 @@ -431,22 +431,30 @@ 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 -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 @@ -463,9 +471,10 @@ mmo_make_section (bfd *abfd, const char *secname) if (newsecname == NULL) { - (*_bfd_error_handler) - (_("%s: No core to allocate section name %s\n"), - bfd_get_filename (abfd), secname); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: no core to allocate section name %s"), + abfd, secname); bfd_set_error (bfd_error_system_call); return NULL; } @@ -483,21 +492,10 @@ static void 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. */ @@ -538,9 +536,10 @@ mmo_object_p (bfd *abfd) 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); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: no core to allocate a symbol %d bytes long"), + abfd, abfd->tdata.mmo_data->max_symbol_length); goto bad_final; } @@ -597,7 +596,7 @@ static bfd_boolean 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 @@ -643,10 +642,10 @@ static void 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; @@ -658,10 +657,10 @@ static void 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; @@ -701,12 +700,11 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) 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) @@ -716,12 +714,11 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) 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; } @@ -734,12 +731,11 @@ mmo_decide_section (bfd *abfd, bfd_vma vma) 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; } @@ -951,15 +947,17 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, group-wise aligned. */ 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); + _bfd_error_handler + /* 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); } @@ -1135,14 +1133,13 @@ mmo_get_spec_section (bfd *abfd, int spec_data_number) /* 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. */ @@ -1247,9 +1244,10 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum && bfd_get_start_address (abfd) != addr && !mmo_ignore_symbol_consistency (abfd)) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"), - bfd_get_filename (abfd)); + _bfd_error_handler + (_("%pB: invalid mmo file: initialization value for $255" + " is not `Main'\n"), + abfd); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -1392,11 +1390,11 @@ SUBSECTION abfd->tdata.mmo_data->lop_stab_symbol [abfd->tdata.mmo_data->symbol_position] = 0; - (*_bfd_error_handler) - (_("%s: unsupported wide character sequence" + _bfd_error_handler + /* 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; @@ -1559,9 +1557,8 @@ mmo_get_loc (asection *sec, bfd_vma vma, int size) /* 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; } } @@ -1597,7 +1594,7 @@ mmo_scan (bfd *abfd) 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; @@ -1626,9 +1623,10 @@ mmo_scan (bfd *abfd) switch (buf[1]) { default: - (*_bfd_error_handler) - (_("%s: invalid mmo file: unsupported lopcode `%d'\n"), - bfd_get_filename (abfd), buf[1]); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid mmo file: unsupported lopcode `%d'\n"), + abfd, buf[1]); bfd_set_error (bfd_error_bad_value); goto error_return; @@ -1636,9 +1634,11 @@ mmo_scan (bfd *abfd) /* Quote the next 32-bit word. */ 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); + _bfd_error_handler + /* 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; } @@ -1672,9 +1672,11 @@ mmo_scan (bfd *abfd) } 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); + _bfd_error_handler + /* 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; } @@ -1721,9 +1723,11 @@ mmo_scan (bfd *abfd) } 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); + _bfd_error_handler + /* 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; } @@ -1760,18 +1764,22 @@ mmo_scan (bfd *abfd) 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); + _bfd_error_handler + /* 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); + _bfd_error_handler + /* 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; } @@ -1792,9 +1800,11 @@ mmo_scan (bfd *abfd) p = vma - 4 * ((delta & 0xffffff) - (1 << z)); 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]); + _bfd_error_handler + /* 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; } @@ -1815,9 +1825,11 @@ mmo_scan (bfd *abfd) 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); + _bfd_error_handler + /* 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; } @@ -1835,10 +1847,11 @@ mmo_scan (bfd *abfd) if (file_names[y] != NULL) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: file number %d `%s'," + _bfd_error_handler + /* 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; } @@ -1848,10 +1861,11 @@ mmo_scan (bfd *abfd) if (file_names[y] == NULL) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: file name for number %d" + _bfd_error_handler + /* 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; } @@ -1954,10 +1968,11 @@ mmo_scan (bfd *abfd) /* We read in the symbols now, not later. */ if (y != 0 || z != 0) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: fields y and z of lop_stab" + _bfd_error_handler + /* 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; } @@ -1990,10 +2005,11 @@ mmo_scan (bfd *abfd) if (statbuf.st_size != curpos) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: lop_end not last item in" + _bfd_error_handler + /* 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; } @@ -2003,12 +2019,13 @@ mmo_scan (bfd *abfd) it. */ if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4) { - (*_bfd_error_handler) - (_("%s: invalid mmo file: YZ of lop_end (%ld)" + _bfd_error_handler + /* 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; } @@ -2048,18 +2065,16 @@ mmo_scan (bfd *abfd) 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))) error = TRUE; /* Free whatever resources we took. */ @@ -2120,7 +2135,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED, memcpy (location, loc, chunk_size); - location += chunk_size; + location = (bfd_byte *) location + chunk_size; bytes_to_do -= chunk_size; offset += chunk_size; } @@ -2410,7 +2425,7 @@ bfd_sec_flags_from_mmo_flags (flagword flags) 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; @@ -2442,7 +2457,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) 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 @@ -2463,7 +2478,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) } 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 @@ -2483,7 +2498,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) /* 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; } @@ -2497,7 +2512,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) } /* 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)) @@ -2505,7 +2520,7 @@ mmo_internal_write_section (bfd *abfd, asection *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)); @@ -2624,10 +2639,9 @@ EXAMPLE 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; } @@ -2657,7 +2671,7 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec, memcpy (loc, location, chunk_size); - location += chunk_size; + location = (bfd_byte *) location + chunk_size; bytes_to_do -= chunk_size; offset += chunk_size; } @@ -2713,9 +2727,10 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, we discover it and bail out. */ if (trie->sym.name != NULL) { - (*_bfd_error_handler) - (_("%s: invalid symbol table: duplicate symbol `%s'\n"), - bfd_get_filename (abfd), trie->sym.name); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: invalid symbol table: duplicate symbol `%s'\n"), + abfd, trie->sym.name); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2955,10 +2970,11 @@ mmo_write_symbols_and_terminator (bfd *abfd) sprintf_vma (vmas_main, mainvalue); sprintf_vma (vmas_start, vma_start); - (*_bfd_error_handler) - (_("%s: Bad symbol definition: `Main' set to %s rather" + _bfd_error_handler + /* 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; } @@ -3053,10 +3069,11 @@ mmo_write_symbols_and_terminator (bfd *abfd) There's no specific test-case. */ struct mmo_symbol sym; - (*_bfd_error_handler) - (_("%s: warning: symbol table too large for mmo, larger than 65535" + _bfd_error_handler + /* 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; @@ -3098,10 +3115,11 @@ mmo_write_symbols_and_terminator (bfd *abfd) /* I haven't seen this trig. It seems no use claiming this case 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" + _bfd_error_handler + /* 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; @@ -3145,15 +3163,16 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) /* 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" + _bfd_error_handler + /* 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; @@ -3201,23 +3220,22 @@ mmo_write_object_contents (bfd *abfd) 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)); + _bfd_error_handler + (_("%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); + _bfd_error_handler + /* 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)); + _bfd_error_handler + /* 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; } @@ -3246,8 +3264,7 @@ mmo_write_object_contents (bfd *abfd) /* 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 @@ -3286,10 +3303,13 @@ mmo_write_object_contents (bfd *abfd) #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). */ @@ -3334,16 +3354,16 @@ const bfd_target mmix_mmo_vec = _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),