From: Alan Modra <amodra@gmail.com>
Date: Mon, 10 Nov 2008 08:45:13 +0000 (+0000)
Subject: 	* objdump.c (disassemble_bytes): Don't skip leading zeros when
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17ceb936752c300b333b579762f1eb757e94a69e;p=binutils-gdb.git

	* objdump.c (disassemble_bytes): Don't skip leading zeros when
	end of section calculation overflows.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index cb506bfbe50..587a60df507 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-10  Tristan Gingold  <gingold@adacore.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (disassemble_bytes): Don't skip leading zeros when
+	end of section calculation overflows.
+
 2008-11-07  Prafulla Thakare  <prafulla.thakare@kpitcummins.com>
 
 	* MAINTAINERS: Take over from Anil Paranjpe as H8300 maintainer.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 5fad8ddcce9..76f595b4871 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1372,19 +1372,18 @@ disassemble_bytes (struct disassemble_info * info,
   if (! prefix_addresses)
     {
       char buf[30];
-      char *s;
-
-      bfd_sprintf_vma
-	(aux->abfd, buf,
-	 (section->vma
-	  + bfd_section_size (section->owner, section) / opb));
-      s = buf;
-      while (s[0] == '0' && s[1] == '0' && s[2] == '0' && s[3] == '0'
-	     && s[4] == '0')
-	{
-	  skip_addr_chars += 4;
-	  s += 4;
-	}
+
+      bfd_sprintf_vma (aux->abfd, buf, section->vma + section->size / opb);
+
+      while (buf[skip_addr_chars] == '0')
+	++skip_addr_chars;
+
+      /* Don't discard zeros on overflow.  */
+      if (buf[skip_addr_chars] == '\0' && section->vma != 0)
+	skip_addr_chars = 0;
+
+      if (skip_addr_chars != 0)
+	skip_addr_chars = (skip_addr_chars - 1) & -4;
     }
 
   info->insn_info_valid = 0;