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 d89e56629b534fb0a10b5cdaf3cdbb33bc89b509..5a26dcd8522c74928066fd57f17b0fcd7c0026c4 100644 (file)
--- 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 37218ce00b135ac0252d5e6dad8009cf5a012a39..4d6b325207ab4f0e7de4afcf06fc1639cb1c4a03 100644 (file)
--- 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 c09262a831bca5ba46ec7d7a64262e31eac5abfd..a75d6bafcf351e0124c878644f8d9a763ded6f2c 100644 (file)
--- 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