X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fpdp11.c;h=d41aefca2b2f5c8e15e6f842700f8874fbda48f8;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=1ab303336384fec85e53d44562d900f5e9e9e376;hpb=0d1cc75df1c9a356dfa47932e9ec52fca7d8f5ab;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 1ab3033363..d41aefca2b 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -63,6 +63,7 @@ #define N_SET_FLAGS(execp, flags) do { } while (0) #define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ && N_MAGIC(x) != NMAGIC \ + && N_MAGIC(x) != IMAGIC \ && N_MAGIC(x) != ZMAGIC) #include "sysdep.h" @@ -90,7 +91,8 @@ struct pdp11_external_exec #define A_MAGIC2 NMAGIC #define NMAGIC 0410 /* Pure executable. */ #define ZMAGIC 0413 /* Demand-paged executable. */ -#define A_MAGIC3 0411 /* Separated I&D. */ +#define IMAGIC 0411 /* Separated I&D. */ +#define A_MAGIC3 IMAGIC #define A_MAGIC4 0405 /* Overlay. */ #define A_MAGIC5 0430 /* Auto-overlay (nonseparate). */ #define A_MAGIC6 0431 /* Auto-overlay (separate). */ @@ -158,6 +160,7 @@ static bfd_boolean MY(write_object_contents) (bfd *); #undef N_REG #undef N_FN #undef N_EXT +#undef N_STAB #define N_TYPE 0x1f /* Type mask. */ #define N_UNDF 0x00 /* Undefined. */ #define N_ABS 0x01 /* Absolute. */ @@ -167,6 +170,7 @@ static bfd_boolean MY(write_object_contents) (bfd *); #define N_REG 0x14 /* Register symbol. */ #define N_FN 0x1f /* File name. */ #define N_EXT 0x20 /* External flag. */ +#define N_STAB 0xc0 /* Not relevant; modified aout64.h's 0xe0 to avoid N_EXT. */ #define RELOC_SIZE 2 @@ -242,11 +246,16 @@ struct aout_final_link_info struct external_nlist *output_syms; }; +/* Copy of the link_info.separate_code boolean to select the output format with + separate instruction and data spaces selected by --imagic */ +static bfd_boolean separate_i_d = FALSE; + reloc_howto_type howto_table_pdp11[] = { /* type rs size bsz pcrel bitpos ovrf sf name part_inpl readmask setmask pcdone */ HOWTO( 0, 0, 1, 16, FALSE, 0, complain_overflow_signed,0,"16", TRUE, 0x0000ffff,0x0000ffff, FALSE), HOWTO( 1, 0, 1, 16, TRUE, 0, complain_overflow_signed,0,"DISP16", TRUE, 0x0000ffff,0x0000ffff, FALSE), +HOWTO( 2, 0, 2, 32, FALSE, 0, complain_overflow_signed,0,"32", TRUE, 0x0000ffff,0x0000ffff, FALSE), }; #define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0])) @@ -268,6 +277,8 @@ NAME (aout, reloc_type_lookup) (bfd * abfd ATTRIBUTE_UNUSED, return &howto_table_pdp11[0]; case BFD_RELOC_16_PCREL: return &howto_table_pdp11[1]; + case BFD_RELOC_32: + return &howto_table_pdp11[2]; default: return NULL; } @@ -452,14 +463,14 @@ NAME (aout, make_sections) (bfd *abfd) environment's "finish up" function just before returning, to handle any last-minute setup. */ -const bfd_target * +bfd_cleanup NAME (aout, some_aout_object_p) (bfd *abfd, struct internal_exec *execp, - const bfd_target *(*callback_to_real_object_p) (bfd *)) + bfd_cleanup (*callback_to_real_object_p) (bfd *)) { struct aout_data_struct *rawptr, *oldrawptr; - const bfd_target *result; - bfd_size_type amt = sizeof (struct aout_data_struct); + bfd_cleanup cleanup; + size_t amt = sizeof (struct aout_data_struct); rawptr = bfd_zalloc (abfd, amt); if (rawptr == NULL) @@ -498,6 +509,8 @@ NAME (aout, some_aout_object_p) (bfd *abfd, } else if (N_MAGIC (execp) == OMAGIC) adata (abfd).magic = o_magic; + else if (N_MAGIC (execp) == IMAGIC) + adata (abfd).magic = i_magic; else { /* Should have been checked with N_BADMAG before this routine @@ -580,7 +593,7 @@ NAME (aout, some_aout_object_p) (bfd *abfd, adata(abfd)->segment_size = SEGMENT_SIZE; adata(abfd)->exec_bytes_size = EXEC_BYTES_SIZE; - return abfd->xvec; + return _bfd_no_cleanup; /* The architecture is encoded in various ways in various a.out variants, or is not encoded at all in some of them. The relocation size depends @@ -592,7 +605,7 @@ NAME (aout, some_aout_object_p) (bfd *abfd, header, should cope with them in this callback as well. */ #endif /* DOCUMENTATION */ - result = (*callback_to_real_object_p)(abfd); + cleanup = (*callback_to_real_object_p)(abfd); /* Now that the segment addresses have been worked out, take a better guess at whether the file is executable. If the entry point @@ -610,8 +623,11 @@ NAME (aout, some_aout_object_p) (bfd *abfd, sets the entry point, and that is likely to be non-zero for most systems. */ if (execp->a_entry != 0 - || (execp->a_entry >= obj_textsec(abfd)->vma - && execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->size)) + || (execp->a_entry >= obj_textsec (abfd)->vma + && execp->a_entry < (obj_textsec (abfd)->vma + + obj_textsec (abfd)->size) + && execp->a_trsize == 0 + && execp->a_drsize == 0)) abfd->flags |= EXEC_P; #ifdef STAT_FOR_EXEC else @@ -633,12 +649,12 @@ NAME (aout, some_aout_object_p) (bfd *abfd, } #endif /* STAT_FOR_EXEC */ - if (!result) + if (!cleanup) { free (rawptr); abfd->tdata.aout_data = oldrawptr; } - return result; + return cleanup; } /* Initialize ABFD for use with a.out files. */ @@ -647,7 +663,7 @@ bfd_boolean NAME (aout, mkobject) (bfd *abfd) { struct aout_data_struct *rawptr; - bfd_size_type amt = sizeof (struct aout_data_struct); + size_t amt = sizeof (struct aout_data_struct); bfd_set_error (bfd_error_system_call); @@ -789,57 +805,56 @@ adjust_o_magic (bfd *abfd, struct internal_exec *execp) file_ptr pos = adata (abfd).exec_bytes_size; bfd_vma vma = 0; int pad = 0; + asection *text = obj_textsec (abfd); + asection *data = obj_datasec (abfd); + asection *bss = obj_bsssec (abfd); /* Text. */ - obj_textsec (abfd)->filepos = pos; - if (! obj_textsec (abfd)->user_set_vma) - obj_textsec (abfd)->vma = vma; + text->filepos = pos; + if (!text->user_set_vma) + text->vma = vma; else - vma = obj_textsec (abfd)->vma; + vma = text->vma; - pos += obj_textsec (abfd)->size; - vma += obj_textsec (abfd)->size; + pos += execp->a_text; + vma += execp->a_text; /* Data. */ - if (!obj_datasec (abfd)->user_set_vma) + if (!data->user_set_vma) { - obj_textsec (abfd)->size += pad; pos += pad; vma += pad; - obj_datasec (abfd)->vma = vma; + data->vma = vma; } else - vma = obj_datasec (abfd)->vma; - obj_datasec (abfd)->filepos = pos; - pos += obj_datasec (abfd)->size; - vma += obj_datasec (abfd)->size; + vma = data->vma; + execp->a_text += pad; + + data->filepos = pos; + pos += data->size; + vma += data->size; /* BSS. */ - if (! obj_bsssec (abfd)->user_set_vma) + if (!bss->user_set_vma) { - obj_datasec (abfd)->size += pad; pos += pad; vma += pad; - obj_bsssec (abfd)->vma = vma; + bss->vma = vma; } - else + else if (data->size > 0 || bss->size > 0) /* PR25677: for objcopy --extract-symbol */ { /* The VMA of the .bss section is set by the VMA of the .data section plus the size of the .data section. We may need to add padding bytes to make this true. */ - pad = obj_bsssec (abfd)->vma - vma; - if (pad > 0) - { - obj_datasec (abfd)->size += pad; - pos += pad; - } + pad = bss->vma - vma; + if (pad < 0) + pad = 0; + pos += pad; } - obj_bsssec (abfd)->filepos = pos; + execp->a_data = data->size + pad; + bss->filepos = pos; + execp->a_bss = bss->size; - /* Fix up the exec header. */ - execp->a_text = obj_textsec (abfd)->size; - execp->a_data = obj_datasec (abfd)->size; - execp->a_bss = obj_bsssec (abfd)->size; N_SET_MAGIC (execp, OMAGIC); } @@ -849,7 +864,11 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) bfd_size_type data_pad, text_pad; file_ptr text_end; const struct aout_backend_data *abdp; - int ztih; /* Nonzero if text includes exec header. */ + /* TRUE if text includes exec header. */ + bfd_boolean ztih; + asection *text = obj_textsec (abfd); + asection *data = obj_datasec (abfd); + asection *bss = obj_bsssec (abfd); abdp = aout_backend_info (abfd); @@ -857,18 +876,17 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) ztih = (abdp != NULL && (abdp->text_includes_header || obj_aout_subformat (abfd) == q_magic_format)); - obj_textsec(abfd)->filepos = (ztih - ? adata(abfd).exec_bytes_size - : adata(abfd).zmagic_disk_block_size); - if (! obj_textsec(abfd)->user_set_vma) + text->filepos = (ztih + ? adata (abfd).exec_bytes_size + : adata (abfd).zmagic_disk_block_size); + if (!text->user_set_vma) { /* ?? Do we really need to check for relocs here? */ - obj_textsec(abfd)->vma = ((abfd->flags & HAS_RELOC) - ? 0 - : (ztih - ? (abdp->default_text_vma - + adata (abfd).exec_bytes_size) - : abdp->default_text_vma)); + text->vma = ((abfd->flags & HAS_RELOC) + ? 0 + : (ztih + ? abdp->default_text_vma + adata (abfd).exec_bytes_size + : abdp->default_text_vma)); text_pad = 0; } else @@ -877,17 +895,17 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) may need to pad it such that the .data section starts at a page boundary. */ if (ztih) - text_pad = ((obj_textsec (abfd)->filepos - obj_textsec (abfd)->vma) + text_pad = ((text->filepos - text->vma) & (adata (abfd).page_size - 1)); else - text_pad = ((- obj_textsec (abfd)->vma) + text_pad = (-text->vma & (adata (abfd).page_size - 1)); } /* Find start of data. */ if (ztih) { - text_end = obj_textsec (abfd)->filepos + obj_textsec (abfd)->size; + text_end = text->filepos + execp->a_text; text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end; } else @@ -895,49 +913,42 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) /* Note that if page_size == zmagic_disk_block_size, then filepos == page_size, and this case is the same as the ztih case. */ - text_end = obj_textsec (abfd)->size; + text_end = execp->a_text; text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end; - text_end += obj_textsec (abfd)->filepos; + text_end += text->filepos; } - - obj_textsec (abfd)->size += text_pad; - text_end += text_pad; + execp->a_text += text_pad; /* Data. */ - if (!obj_datasec(abfd)->user_set_vma) + if (!data->user_set_vma) { bfd_vma vma; - vma = obj_textsec(abfd)->vma + obj_textsec(abfd)->size; - obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size); + vma = text->vma + execp->a_text; + data->vma = BFD_ALIGN (vma, adata (abfd).segment_size); } if (abdp && abdp->zmagic_mapped_contiguous) { - text_pad = (obj_datasec(abfd)->vma - - obj_textsec(abfd)->vma - - obj_textsec(abfd)->size); - obj_textsec(abfd)->size += text_pad; + text_pad = data->vma - (text->vma + execp->a_text); + /* Only pad the text section if the data + section is going to be placed after it. */ + if (text_pad > 0) + execp->a_text += text_pad; } - obj_datasec (abfd)->filepos = (obj_textsec (abfd)->filepos - + obj_textsec (abfd)->size); + data->filepos = text->filepos + execp->a_text; /* Fix up exec header while we're at it. */ - execp->a_text = obj_textsec(abfd)->size; if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted))) - execp->a_text += adata(abfd).exec_bytes_size; + execp->a_text += adata (abfd).exec_bytes_size; N_SET_MAGIC (execp, ZMAGIC); /* Spec says data section should be rounded up to page boundary. */ - obj_datasec(abfd)->size - = align_power (obj_datasec(abfd)->size, - obj_bsssec(abfd)->alignment_power); - execp->a_data = BFD_ALIGN (obj_datasec(abfd)->size, - adata(abfd).page_size); - data_pad = execp->a_data - obj_datasec(abfd)->size; + execp->a_data = align_power (data->size, bss->alignment_power); + execp->a_data = BFD_ALIGN (execp->a_data, adata (abfd).page_size); + data_pad = execp->a_data - data->size; /* BSS. */ - if (!obj_bsssec(abfd)->user_set_vma) - obj_bsssec(abfd)->vma = (obj_datasec(abfd)->vma - + obj_datasec(abfd)->size); + if (!bss->user_set_vma) + bss->vma = data->vma + execp->a_data; /* If the BSS immediately follows the data section and extra space in the page is left after the data section, fudge data in the header so that the bss section looks smaller by that @@ -945,55 +956,95 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp) (Note that a linker script, as well as the above assignment, could have explicitly set the BSS vma to immediately follow the data section.) */ - if (align_power (obj_bsssec(abfd)->vma, obj_bsssec(abfd)->alignment_power) - == obj_datasec(abfd)->vma + obj_datasec(abfd)->size) - execp->a_bss = (data_pad > obj_bsssec(abfd)->size) ? 0 : - obj_bsssec(abfd)->size - data_pad; + if (align_power (bss->vma, bss->alignment_power) == data->vma + execp->a_data) + execp->a_bss = data_pad > bss->size ? 0 : bss->size - data_pad; else - execp->a_bss = obj_bsssec(abfd)->size; + execp->a_bss = bss->size; } static void adjust_n_magic (bfd *abfd, struct internal_exec *execp) { - file_ptr pos = adata(abfd).exec_bytes_size; + file_ptr pos = adata (abfd).exec_bytes_size; bfd_vma vma = 0; int pad; + asection *text = obj_textsec (abfd); + asection *data = obj_datasec (abfd); + asection *bss = obj_bsssec (abfd); /* Text. */ - obj_textsec(abfd)->filepos = pos; - if (!obj_textsec(abfd)->user_set_vma) - obj_textsec(abfd)->vma = vma; + text->filepos = pos; + if (!text->user_set_vma) + text->vma = vma; else - vma = obj_textsec(abfd)->vma; - pos += obj_textsec(abfd)->size; - vma += obj_textsec(abfd)->size; + vma = text->vma; + pos += execp->a_text; + vma += execp->a_text; /* Data. */ - obj_datasec(abfd)->filepos = pos; - if (!obj_datasec(abfd)->user_set_vma) - obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size); - vma = obj_datasec(abfd)->vma; + data->filepos = pos; + if (!data->user_set_vma) + data->vma = BFD_ALIGN (vma, adata (abfd).segment_size); + vma = data->vma; /* Since BSS follows data immediately, see if it needs alignment. */ - vma += obj_datasec(abfd)->size; - pad = align_power (vma, obj_bsssec(abfd)->alignment_power) - vma; - obj_datasec(abfd)->size += pad; - pos += obj_datasec(abfd)->size; + vma += data->size; + pad = align_power (vma, bss->alignment_power) - vma; + execp->a_data = data->size + pad; + pos += execp->a_data; /* BSS. */ - if (!obj_bsssec(abfd)->user_set_vma) - obj_bsssec(abfd)->vma = vma; + if (!bss->user_set_vma) + bss->vma = vma; else - vma = obj_bsssec(abfd)->vma; + vma = bss->vma; /* Fix up exec header. */ - execp->a_text = obj_textsec(abfd)->size; - execp->a_data = obj_datasec(abfd)->size; - execp->a_bss = obj_bsssec(abfd)->size; + execp->a_bss = bss->size; N_SET_MAGIC (execp, NMAGIC); } +static void +adjust_i_magic (bfd *abfd, struct internal_exec *execp) +{ + file_ptr pos = adata (abfd).exec_bytes_size; + bfd_vma vma = 0; + int pad; + asection *text = obj_textsec (abfd); + asection *data = obj_datasec (abfd); + asection *bss = obj_bsssec (abfd); + + /* Text. */ + text->filepos = pos; + if (!text->user_set_vma) + text->vma = vma; + else + vma = text->vma; + pos += execp->a_text; + + /* Data. */ + data->filepos = pos; + if (!data->user_set_vma) + data->vma = 0; + vma = data->vma; + + /* Since BSS follows data immediately, see if it needs alignment. */ + vma += data->size; + pad = align_power (vma, bss->alignment_power) - vma; + execp->a_data = data->size + pad; + pos += execp->a_data; + + /* BSS. */ + if (!bss->user_set_vma) + bss->vma = vma; + else + vma = bss->vma; + + /* Fix up exec header. */ + execp->a_bss = bss->size; + N_SET_MAGIC (execp, IMAGIC); +} + bfd_boolean NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) { @@ -1002,12 +1053,11 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) if (! NAME (aout, make_sections) (abfd)) return FALSE; - if (adata(abfd).magic != undecided_magic) + if (adata (abfd).magic != undecided_magic) return TRUE; - obj_textsec(abfd)->size = - align_power(obj_textsec(abfd)->size, - obj_textsec(abfd)->alignment_power); + execp->a_text = align_power (obj_textsec (abfd)->size, + obj_textsec (abfd)->alignment_power); /* Rule (heuristic) for when to pad to a new page. Note that there are (at least) two ways demand-paged (ZMAGIC) files have been @@ -1015,7 +1065,7 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) (TARGET_PAGE_SIZE). However, newer versions of SUNOS start the text segment right after the exec header; the latter is counted in the text segment size, and is paged in by the kernel with the rest of - the text. */ + the text. */ /* This perhaps isn't the right way to do this, but made it simpler for me to understand enough to implement it. Better would probably be to go @@ -1025,33 +1075,37 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) I understand it better now, but I haven't time to do the cleanup this minute. */ - if (abfd->flags & WP_TEXT) - adata(abfd).magic = n_magic; + if (separate_i_d) + adata (abfd).magic = i_magic; + else if (abfd->flags & WP_TEXT) + adata (abfd).magic = n_magic; else - adata(abfd).magic = o_magic; + adata (abfd).magic = o_magic; #ifdef BFD_AOUT_DEBUG /* requires gcc2 */ #if __GNUC__ >= 2 fprintf (stderr, "%s text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x,%x>\n", ({ char *str; - switch (adata(abfd).magic) { - case n_magic: str = "NMAGIC"; break; - case o_magic: str = "OMAGIC"; break; - case z_magic: str = "ZMAGIC"; break; - default: abort (); - } + switch (adata (abfd).magic) + { + case n_magic: str = "NMAGIC"; break; + case o_magic: str = "OMAGIC"; break; + case i_magic: str = "IMAGIC"; break; + case z_magic: str = "ZMAGIC"; break; + default: abort (); + } str; }), - obj_textsec(abfd)->vma, obj_textsec(abfd)->size, - obj_textsec(abfd)->alignment_power, - obj_datasec(abfd)->vma, obj_datasec(abfd)->size, - obj_datasec(abfd)->alignment_power, - obj_bsssec(abfd)->vma, obj_bsssec(abfd)->size, - obj_bsssec(abfd)->alignment_power); + obj_textsec (abfd)->vma, obj_textsec (abfd)->size, + obj_textsec (abfd)->alignment_power, + obj_datasec (abfd)->vma, obj_datasec (abfd)->size, + obj_datasec (abfd)->alignment_power, + obj_bsssec (abfd)->vma, obj_bsssec (abfd)->size, + obj_bsssec (abfd)->alignment_power); #endif #endif - switch (adata(abfd).magic) + switch (adata (abfd).magic) { case o_magic: adjust_o_magic (abfd, execp); @@ -1062,17 +1116,20 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) case n_magic: adjust_n_magic (abfd, execp); break; + case i_magic: + adjust_i_magic (abfd, execp); + break; default: abort (); } #ifdef BFD_AOUT_DEBUG fprintf (stderr, " text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x>\n", - obj_textsec(abfd)->vma, obj_textsec(abfd)->size, - obj_textsec(abfd)->filepos, - obj_datasec(abfd)->vma, obj_datasec(abfd)->size, - obj_datasec(abfd)->filepos, - obj_bsssec(abfd)->vma, obj_bsssec(abfd)->size); + obj_textsec (abfd)->vma, execp->a_text, + obj_textsec (abfd)->filepos, + obj_datasec (abfd)->vma, execp->a_data, + obj_datasec (abfd)->filepos, + obj_bsssec (abfd)->vma, execp->a_bss); #endif return TRUE; @@ -1182,17 +1239,13 @@ aout_get_external_symbols (bfd *abfd) /* We allocate using malloc to make the values easy to free later on. If we put them on the objalloc it might not be possible to free them. */ - syms = bfd_malloc (count * EXTERNAL_NLIST_SIZE); - if (syms == NULL && count != 0) + if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0) + return FALSE; + syms = (struct external_nlist *) + _bfd_malloc_and_read (abfd, count * EXTERNAL_NLIST_SIZE, + count * EXTERNAL_NLIST_SIZE); + if (syms == NULL) return FALSE; - - if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0 - || (bfd_bread (syms, exec_hdr (abfd)->a_syms, abfd) - != exec_hdr (abfd)->a_syms)) - { - free (syms); - return FALSE; - } #endif obj_aout_external_syms (abfd) = syms; @@ -1205,36 +1258,54 @@ aout_get_external_symbols (bfd *abfd) unsigned char string_chars[BYTES_IN_LONG]; bfd_size_type stringsize; char *strings; + bfd_size_type amt = BYTES_IN_LONG; /* Get the size of the strings. */ if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0 - || (bfd_bread ((void *) string_chars, (bfd_size_type) BYTES_IN_LONG, - abfd) != BYTES_IN_LONG)) + || bfd_bread ((void *) string_chars, amt, abfd) != amt) return FALSE; stringsize = H_GET_32 (abfd, string_chars); + if (stringsize == 0) + stringsize = 1; + else if (stringsize < BYTES_IN_LONG + || (size_t) stringsize != stringsize) + { + bfd_set_error (bfd_error_bad_value); + return FALSE; + } #ifdef USE_MMAP - if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize, - &obj_aout_string_window (abfd), TRUE)) - return FALSE; - strings = (char *) obj_aout_string_window (abfd).data; -#else - strings = bfd_malloc (stringsize + 1); - if (strings == NULL) - return FALSE; - - /* Skip space for the string count in the buffer for convenience - when using indexes. */ - if (bfd_bread (strings + 4, stringsize - 4, abfd) != stringsize - 4) + if (stringsize >= BYTES_IN_LONG) { - free (strings); - return FALSE; + if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize + 1, + &obj_aout_string_window (abfd), TRUE)) + return FALSE; + strings = (char *) obj_aout_string_window (abfd).data; } + else #endif + { + strings = (char *) bfd_malloc (stringsize + 1); + if (strings == NULL) + return FALSE; + + if (stringsize >= BYTES_IN_LONG) + { + /* Keep the string count in the buffer for convenience + when indexing with e_strx. */ + amt = stringsize - BYTES_IN_LONG; + if (bfd_bread (strings + BYTES_IN_LONG, amt, abfd) != amt) + { + free (strings); + return FALSE; + } + } + } /* Ensure that a zero index yields an empty string. */ strings[0] = '\0'; - strings[stringsize - 1] = 0; + /* Ensure that the string buffer is NUL terminated. */ + strings[stringsize] = 0; obj_aout_external_strings (abfd) = strings; obj_aout_external_string_size (abfd) = stringsize; @@ -1413,7 +1484,7 @@ translate_to_native_sym_flags (bfd *abfd, asymbol * NAME (aout, make_empty_symbol) (bfd *abfd) { - bfd_size_type amt = sizeof (aout_symbol_type); + size_t amt = sizeof (aout_symbol_type); aout_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt); if (!new_symbol_type) @@ -1454,9 +1525,15 @@ NAME (aout, translate_symbol_table) (bfd *abfd, else if (x < strsize) in->symbol.name = str + x; else - return FALSE; + { + _bfd_error_handler + (_("%pB: invalid string offset %" PRIu64 " >= %" PRIu64), + abfd, (uint64_t) x, (uint64_t) strsize); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } - in->symbol.value = GET_SWORD (abfd, ext->e_value); + in->symbol.value = GET_WORD (abfd, ext->e_value); /* TODO: is 0 a safe value here? */ in->desc = 0; in->other = 0; @@ -1546,7 +1623,7 @@ NAME (aout, slurp_symbol_table) (bfd *abfd) /* Get the index of a string in a strtab, adding it if it is not already present. */ -static INLINE bfd_size_type +static inline bfd_size_type add_to_stringtab (bfd *abfd, struct bfd_strtab_hash *tab, const char *str, @@ -1642,7 +1719,7 @@ NAME (aout, write_syms) (bfd *abfd) return TRUE; -error_return: + error_return: _bfd_stringtab_free (strtab); return FALSE; } @@ -1784,10 +1861,12 @@ pdp11_aout_swap_reloc_in (bfd * abfd, local or global. */ r_extern = (reloc_entry & RTYPE) == REXT; - if (r_extern && r_index > symcount) + if (r_extern && r_index >= symcount) { /* We could arrange to return an error, but it might be useful - to see the file even if it is bad. */ + to see the file even if it is bad. FIXME: Of course this + means that objdump -r *doesn't* see the actual reloc, and + objcopy silently writes a different reloc. */ r_extern = 0; r_index = N_ABS; } @@ -1829,19 +1908,11 @@ NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols) if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0) return FALSE; - - each_size = obj_reloc_entry_size (abfd); - - relocs = bfd_malloc (reloc_size); + relocs = _bfd_malloc_and_read (abfd, reloc_size, reloc_size); if (relocs == NULL && reloc_size != 0) return FALSE; - if (bfd_bread (relocs, reloc_size, abfd) != reloc_size) - { - free (relocs); - return FALSE; - } - + each_size = obj_reloc_entry_size (abfd); count = reloc_size / each_size; /* Count the number of NON-ZERO relocs, this is the count we want. */ @@ -1918,6 +1989,15 @@ NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section) { bfd_byte *r; + if ((*generic)->howto == NULL + || (*generic)->sym_ptr_ptr == NULL) + { + bfd_set_error (bfd_error_invalid_operation); + _bfd_error_handler (_("%pB: attempt to write out " + "unknown reloc type"), abfd); + bfd_release (abfd, native); + return FALSE; + } r = native + (*generic)->address; pdp11_aout_swap_reloc_out (abfd, *generic, r); count--; @@ -2186,8 +2266,8 @@ NAME (aout, find_nearest_line) (bfd *abfd, size_t filelen, funclen; char *buf; - *filename_ptr = abfd->filename; - *functionname_ptr = 0; + *filename_ptr = bfd_get_filename (abfd); + *functionname_ptr = NULL; *line_ptr = 0; if (discriminator_ptr) *discriminator_ptr = 0; @@ -2215,7 +2295,10 @@ NAME (aout, find_nearest_line) (bfd *abfd, const char * symname; symname = q->symbol.name; - if (strcmp (symname + strlen (symname) - 2, ".o") == 0) + + if (symname != NULL + && strlen (symname) > 2 + && strcmp (symname + strlen (symname) - 2, ".o") == 0) { if (q->symbol.value > low_line_vma) { @@ -2247,7 +2330,7 @@ NAME (aout, find_nearest_line) (bfd *abfd, /* Look ahead to next symbol to check if that too is an N_SO. */ p++; if (*p == NULL) - break; + goto done; q = (aout_symbol_type *)(*p); if (q->type != (int) N_SO) goto next; @@ -2308,8 +2391,7 @@ NAME (aout, find_nearest_line) (bfd *abfd, else funclen = strlen (bfd_asymbol_name (func)); - if (adata (abfd).line_buf != NULL) - free (adata (abfd).line_buf); + free (adata (abfd).line_buf); if (filelen + funclen == 0) adata (abfd).line_buf = buf = NULL; else @@ -2326,9 +2408,17 @@ NAME (aout, find_nearest_line) (bfd *abfd, *filename_ptr = main_file_name; else { - sprintf (buf, "%s%s", directory_name, main_file_name); - *filename_ptr = buf; - buf += filelen + 1; + if (buf == NULL) + /* PR binutils/20891: In a corrupt input file both + main_file_name and directory_name can be empty... */ + * filename_ptr = NULL; + else + { + snprintf (buf, filelen + 1, "%s%s", directory_name, + main_file_name); + *filename_ptr = buf; + buf += filelen + 1; + } } } @@ -2337,6 +2427,12 @@ NAME (aout, find_nearest_line) (bfd *abfd, const char *function = func->name; char *colon; + if (buf == NULL) + { + /* PR binutils/20892: In a corrupt input file func can be empty. */ + * functionname_ptr = NULL; + return TRUE; + } /* The caller expects a symbol name. We actually have a function name, without the leading underscore. Put the underscore back in, so that the caller gets a symbol name. */ @@ -2376,7 +2472,7 @@ NAME (aout, bfd_free_cached_info) (bfd *abfd) if (bfd_get_format (abfd) != bfd_object) return TRUE; -#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; } +#define BFCI_FREE(x) do { free (x); x = NULL; } while (0) BFCI_FREE (obj_aout_symbols (abfd)); #ifdef USE_MMAP @@ -2443,7 +2539,7 @@ struct bfd_link_hash_table * NAME (aout, link_hash_table_create) (bfd *abfd) { struct aout_link_hash_table *ret; - bfd_size_type amt = sizeof (struct aout_link_hash_table); + size_t amt = sizeof (struct aout_link_hash_table); ret = bfd_malloc (amt); if (ret == NULL) @@ -2767,6 +2863,9 @@ aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info) type = H_GET_8 (abfd, p->e_type); + /* PR 19629: Corrupt binaries can contain illegal string offsets. */ + if (GET_WORD (abfd, p->e_strx) >= obj_aout_external_string_size (abfd)) + return FALSE; name = strings + GET_WORD (abfd, p->e_strx); value = GET_WORD (abfd, p->e_value); flags = BSF_GLOBAL; @@ -2879,6 +2978,9 @@ aout_link_includes_newfunc (struct bfd_hash_entry *entry, return (struct bfd_hash_entry *) ret; } +/* Write out a symbol that was not associated with an a.out input + object. */ + static bfd_boolean aout_link_write_other_symbol (struct bfd_hash_entry *bh, void *data) { @@ -2889,7 +2991,7 @@ aout_link_write_other_symbol (struct bfd_hash_entry *bh, void *data) bfd_vma val; struct external_nlist outsym; bfd_size_type indx; - bfd_size_type amt; + size_t amt; if (h->root.type == bfd_link_hash_warning) { @@ -3263,8 +3365,15 @@ pdp11_aout_link_input_section (struct aout_final_link_info *flaginfo, r_extern = (r_type == REXT); howto_idx = r_pcrel; - BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_pdp11)); - howto = howto_table_pdp11 + howto_idx; + if (howto_idx < TABLE_SIZE (howto_table_pdp11)) + howto = howto_table_pdp11 + howto_idx; + else + { + _bfd_error_handler (_("%pB: unsupported relocation type"), + input_bfd); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } } if (relocatable) @@ -3642,6 +3751,7 @@ NAME (aout, final_link) (bfd *abfd, if (bfd_link_pic (info)) abfd->flags |= DYNAMIC; + separate_i_d = info->separate_code; aout_info.info = info; aout_info.output_bfd = abfd; aout_info.contents = NULL; @@ -3874,26 +3984,14 @@ NAME (aout, final_link) (bfd *abfd, } } - if (aout_info.contents != NULL) - { - free (aout_info.contents); - aout_info.contents = NULL; - } - if (aout_info.relocs != NULL) - { - free (aout_info.relocs); - aout_info.relocs = NULL; - } - if (aout_info.symbol_map != NULL) - { - free (aout_info.symbol_map); - aout_info.symbol_map = NULL; - } - if (aout_info.output_syms != NULL) - { - free (aout_info.output_syms); - aout_info.output_syms = NULL; - } + free (aout_info.contents); + aout_info.contents = NULL; + free (aout_info.relocs); + aout_info.relocs = NULL; + free (aout_info.symbol_map); + aout_info.symbol_map = NULL; + free (aout_info.output_syms); + aout_info.output_syms = NULL; if (includes_hash_initialized) { bfd_hash_table_free (&aout_info.includes.root); @@ -3926,29 +4024,37 @@ NAME (aout, final_link) (bfd *abfd, else if (obj_textsec (abfd)->reloc_count == 0 && obj_datasec (abfd)->reloc_count == 0) { - bfd_byte b; - - b = 0; - if (bfd_seek (abfd, - (file_ptr) (obj_datasec (abfd)->filepos - + exec_hdr (abfd)->a_data - - 1), - SEEK_SET) != 0 - || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1) - goto error_return; + /* The layout of a typical a.out file is header, text, data, + relocs, symbols, string table. When there are no relocs, + symbols or string table, the last thing in the file is data + and a_data may be rounded up. However we may have a smaller + sized .data section and thus not written final padding. The + same thing can happen with text if there is no data. Write + final padding here to extend the file. */ + file_ptr pos = 0; + + if (exec_hdr (abfd)->a_data > obj_datasec (abfd)->size) + pos = obj_datasec (abfd)->filepos + exec_hdr (abfd)->a_data; + else if (obj_datasec (abfd)->size == 0 + && exec_hdr (abfd)->a_text > obj_textsec (abfd)->size) + pos = obj_textsec (abfd)->filepos + exec_hdr (abfd)->a_text; + if (pos != 0) + { + bfd_byte b = 0; + + if (bfd_seek (abfd, pos - 1, SEEK_SET) != 0 + || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1) + goto error_return; + } } return TRUE; error_return: - if (aout_info.contents != NULL) - free (aout_info.contents); - if (aout_info.relocs != NULL) - free (aout_info.relocs); - if (aout_info.symbol_map != NULL) - free (aout_info.symbol_map); - if (aout_info.output_syms != NULL) - free (aout_info.output_syms); + free (aout_info.contents); + free (aout_info.relocs); + free (aout_info.symbol_map); + free (aout_info.output_syms); if (includes_hash_initialized) bfd_hash_table_free (&aout_info.includes.root); return FALSE; @@ -3985,13 +4091,14 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd) discarding such symbols. */ if (strip != strip_all && (strip != strip_some - || bfd_hash_lookup (flaginfo->info->keep_hash, input_bfd->filename, + || bfd_hash_lookup (flaginfo->info->keep_hash, + bfd_get_filename (input_bfd), FALSE, FALSE) != NULL) && discard != discard_all) { H_PUT_8 (output_bfd, N_TEXT, outsym->e_type); strtab_index = add_to_stringtab (output_bfd, flaginfo->strtab, - input_bfd->filename, FALSE); + bfd_get_filename (input_bfd), FALSE); if (strtab_index == (bfd_size_type) -1) return FALSE; PUT_WORD (output_bfd, strtab_index, outsym->e_strx);