From: Pierre Muller <muller@sourceware.org>
Date: Thu, 26 Sep 2013 07:00:00 +0000 (+0000)
Subject: 	Replace constant values 8 to 15 by AMD64_R8_REGNUM to
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5b856f360b037357d147f20b7c20d3d463692b18;p=binutils-gdb.git

	Replace constant values 8 to 15 by AMD64_R8_REGNUM to
	AMD64_R15_REGNUM when a register index is expected.
	* amd64-windows-tdep.c (amd64_windows_dummy_call_integer_regs):
	Substitute in array.
	* amd64-tdep.c (amd64_dwarf_regmap): Ditto.
	(amd64_push_arguments): Substitute in integer_regnum array.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d89e56629b5..5a26dcd8522 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-26  Pierre Muller  <muller@sourceware.org>
+
+	Replace constant values 8 to 15 by AMD64_R8_REGNUM to
+	AMD64_R15_REGNUM when a register index is expected.
+	* amd64-windows-tdep.c (amd64_windows_dummy_call_integer_regs):
+	Substitute in array.
+	* amd64-tdep.c (amd64_dwarf_regmap): Ditto.
+	(amd64_push_arguments): Substitute in integer_regnum array.
+
 2013-09-25  Doug Evans  <dje@google.com>
 
 	* objfiles.c (allocate_objfile): Move comment to better place.
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 37218ce00b1..4d6b325207a 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -109,7 +109,14 @@ static int amd64_dwarf_regmap[] =
   AMD64_RSP_REGNUM,
 
   /* Extended Integer Registers 8 - 15.  */
-  8, 9, 10, 11, 12, 13, 14, 15,
+  AMD64_R8_REGNUM,		/* %r8 */
+  AMD64_R9_REGNUM,		/* %r9 */
+  AMD64_R10_REGNUM,		/* %r10 */
+  AMD64_R11_REGNUM,		/* %r11 */
+  AMD64_R12_REGNUM,		/* %r12 */
+  AMD64_R13_REGNUM,		/* %r13 */
+  AMD64_R14_REGNUM,		/* %r14 */
+  AMD64_R15_REGNUM,		/* %r15 */
 
   /* Return Address RA.  Mapped to RIP.  */
   AMD64_RIP_REGNUM,
@@ -758,8 +765,8 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
     AMD64_RSI_REGNUM,		/* %rsi */
     AMD64_RDX_REGNUM,		/* %rdx */
     AMD64_RCX_REGNUM,		/* %rcx */
-    8,				/* %r8 */
-    9				/* %r9 */
+    AMD64_R8_REGNUM,		/* %r8 */
+    AMD64_R9_REGNUM		/* %r9 */
   };
   static int sse_regnum[] =
   {
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index c09262a831b..a75d6bafcf3 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -38,8 +38,8 @@ static int amd64_windows_dummy_call_integer_regs[] =
 {
   AMD64_RCX_REGNUM,          /* %rcx */
   AMD64_RDX_REGNUM,          /* %rdx */
-  8,                         /* %r8 */
-  9                          /* %r9 */
+  AMD64_R8_REGNUM,           /* %r8 */
+  AMD64_R9_REGNUM            /* %r9 */
 };
 
 /* Return nonzero if an argument of type TYPE should be passed