From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 19 Dec 2013 22:24:34 +0000 (-0800)
Subject: Properly decode MODRM byte for 64-bit
X-Git-Tag: gdb-7.7-release~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e87984a63faf4378f6f71c407f7e969441b944e;p=external%2Fbinutils.git

Properly decode MODRM byte for 64-bit

64-bit mode doesn't use 16-bit address.  We should always check SIB byte
for address in 64-bit mode.

	PR gdb/16304
	* i386-tdep.c (i386_record_lea_modrm_addr): Don't use 16-bit
	address in 64-bit mode.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c12e907..76cedd7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,12 @@
 2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gdb/16304
+	* i386-tdep.c (i386_record_lea_modrm_addr): Don't use 16-bit
+	address in 64-bit mode.
+
+2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/16304
 	* i386-tdep.c (i386_record_lea_modrm_addr): Zero-extend 32-bit
 	address to 64-bit in 64-bit mode.
 
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index ff37851..8992088 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -4209,9 +4209,9 @@ i386_record_lea_modrm_addr (struct i386_record_s *irp, uint64_t *addr)
   ULONGEST offset64;
 
   *addr = 0;
-  if (irp->aflag)
+  if (irp->aflag || irp->regmap[X86_RECORD_R8_REGNUM])
     {
-      /* 32 bits */
+      /* 32/64 bits */
       int havesib = 0;
       uint8_t scale = 0;
       uint8_t byte;