FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete duplicate struct objdump_disasm_info field

Browse source 
objdump_disasm_info.sec duplicates disassemble_info.section

	* objdump.c (struct objdump_disasm_info): Delete "sec".
	(find_symbol_for_address): Use inf->section rather than aux->sec.
	(objdump_print_addr, disassemble_bytes): Likewise.
	(disassemble_section): Don't set aux->sec.
This commit is contained in:
Alan Modra 2019-12-09 20:47:04 +10:30
parent e7c22a69ac
commit f59f89789f
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
binutils/ChangeLog
View file

@ -1,3 +1,10 @@
2019-12-10 Alan Modra <amodra@gmail.com>
* objdump.c (struct objdump_disasm_info): Delete "sec".
(find_symbol_for_address): Use inf->section rather than aux->sec.
(objdump_print_addr, disassemble_bytes): Likewise.
(disassemble_section): Don't set aux->sec.
2019-12-08 Alan Modra <amodra@gmail.com> 2019-12-08 Alan Modra <amodra@gmail.com>
* testsuite/lib/binutils-common.exp (regexp_diff): Support #?REGEXP. * testsuite/lib/binutils-common.exp (regexp_diff): Support #?REGEXP.

11
binutils/objdump.c
View file

@ -147,7 +147,6 @@ static int include_path_count;
struct objdump_disasm_info struct objdump_disasm_info
{ {
bfd * abfd; bfd * abfd;
asection * sec;
bfd_boolean require_sec; bfd_boolean require_sec;
arelent ** dynrelbuf; arelent ** dynrelbuf;
long dynrelcount; long dynrelcount;
@ -1078,7 +1077,7 @@ find_symbol_for_address (bfd_vma vma,
aux = (struct objdump_disasm_info *) inf->application_data; aux = (struct objdump_disasm_info *) inf->application_data;
abfd = aux->abfd; abfd = aux->abfd;
sec = aux->sec; sec = inf->section;
opb = inf->octets_per_byte; opb = inf->octets_per_byte;
/* Perform a binary search looking for the closest symbol to the /* Perform a binary search looking for the closest symbol to the
@ -1342,7 +1341,8 @@ objdump_print_addr (bfd_vma vma,
if (display_file_offsets) if (display_file_offsets)
inf->fprintf_func (inf->stream, _(" (File Offset: 0x%lx)"), inf->fprintf_func (inf->stream, _(" (File Offset: 0x%lx)"),
(long int)(aux->sec->filepos + (vma - aux->sec->vma))); (long int) (inf->section->filepos
+ (vma - inf->section->vma)));
return; return;
} }
@ -1362,7 +1362,7 @@ objdump_print_addr (bfd_vma vma,
if (!skip_find) if (!skip_find)
sym = find_symbol_for_address (vma, inf, NULL); sym = find_symbol_for_address (vma, inf, NULL);
objdump_print_addr_with_sym (aux->abfd, aux->sec, sym, vma, inf, objdump_print_addr_with_sym (aux->abfd, inf->section, sym, vma, inf,
skip_zeroes); skip_zeroes);
} }
@ -1871,7 +1871,7 @@ disassemble_bytes (struct disassemble_info * inf,
SFILE sfile; SFILE sfile;
aux = (struct objdump_disasm_info *) inf->application_data; aux = (struct objdump_disasm_info *) inf->application_data;
section = aux->sec; section = inf->section;
sfile.alloc = 120; sfile.alloc = 120;
sfile.buffer = (char *) xmalloc (sfile.alloc); sfile.buffer = (char *) xmalloc (sfile.alloc);
@ -2384,7 +2384,6 @@ disassemble_section (bfd *abfd, asection *section, void *inf)
return; return;
} }
paux->sec = section;
pinfo->buffer = data; pinfo->buffer = data;
pinfo->buffer_vma = section->vma; pinfo->buffer_vma = section->vma;
pinfo->buffer_length = datasize; pinfo->buffer_length = datasize;