From: Alan Modra <amodra@gmail.com>
Date: Mon, 9 Dec 2019 10:17:04 +0000 (+1030)
Subject: Delete duplicate struct objdump_disasm_info field
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f59f89789fc17166ee05491e5c430706c9b7c18e;p=binutils-gdb.git

Delete duplicate struct objdump_disasm_info field

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.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ef72f21be36..b1ecef23d43 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -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>
 
 	* testsuite/lib/binutils-common.exp (regexp_diff): Support #?REGEXP.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 6a1f142a0eb..d48a73ac4a7 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -147,7 +147,6 @@ static int include_path_count;
 struct objdump_disasm_info
 {
   bfd *              abfd;
-  asection *         sec;
   bfd_boolean        require_sec;
   arelent **         dynrelbuf;
   long               dynrelcount;
@@ -1078,7 +1077,7 @@ find_symbol_for_address (bfd_vma vma,
 
   aux = (struct objdump_disasm_info *) inf->application_data;
   abfd = aux->abfd;
-  sec = aux->sec;
+  sec = inf->section;
   opb = inf->octets_per_byte;
 
   /* 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)
 	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;
     }
 
@@ -1362,7 +1362,7 @@ objdump_print_addr (bfd_vma vma,
   if (!skip_find)
     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);
 }
 
@@ -1871,7 +1871,7 @@ disassemble_bytes (struct disassemble_info * inf,
   SFILE sfile;
 
   aux = (struct objdump_disasm_info *) inf->application_data;
-  section = aux->sec;
+  section = inf->section;
 
   sfile.alloc = 120;
   sfile.buffer = (char *) xmalloc (sfile.alloc);
@@ -2384,7 +2384,6 @@ disassemble_section (bfd *abfd, asection *section, void *inf)
       return;
     }
 
-  paux->sec = section;
   pinfo->buffer = data;
   pinfo->buffer_vma = section->vma;
   pinfo->buffer_length = datasize;