aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Muller <muller@sourceware.org>2013-09-26 07:00:00 +0000
committerPierre Muller <muller@sourceware.org>2013-09-26 07:00:00 +0000
commit5b856f360b037357d147f20b7c20d3d463692b18 (patch)
treebe03b5ce1e612f80d125cd1ac2594d4eecb352e8
parentd3e819815acd7b1b075bc0c7029dc07dd935f3d2 (diff)
downloadgdb-5b856f360b037357d147f20b7c20d3d463692b18.zip
gdb-5b856f360b037357d147f20b7c20d3d463692b18.tar.gz
gdb-5b856f360b037357d147f20b7c20d3d463692b18.tar.bz2
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.
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/amd64-tdep.c13
-rw-r--r--gdb/amd64-windows-tdep.c4
3 files changed, 21 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d89e566..5a26dcd 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 37218ce..4d6b325 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 c09262a..a75d6ba 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