From ecccb8133fded73256851985bd8f7795639d4262 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 30 Apr 2013 09:27:43 +0000 Subject: [PATCH] 2013-04-30 Samuel Thibault * i386gnu-nat.c (CREG_OFFSET): New macro. (creg_offset): New array. (CREG_ADDR): Use creg_offset instead of reg_offset. --- gdb/ChangeLog | 6 ++++++ gdb/i386gnu-nat.c | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5fae52883cc..12254b75d8e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-04-30 Samuel Thibault + + * i386gnu-nat.c (CREG_OFFSET): New macro. + (creg_offset): New array. + (CREG_ADDR): Use creg_offset instead of reg_offset. + 2013-04-29 Joel Brobecker * mep-tdep.c (mep_write_pc): Delete. diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c index f33810348cb..0fd8d91d701 100644 --- a/gdb/i386gnu-nat.c +++ b/gdb/i386gnu-nat.c @@ -55,8 +55,21 @@ static int reg_offset[] = REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs) }; +/* Offset to the greg_t location where REG is stored. */ +#define CREG_OFFSET(reg) (REG_##reg * 4) + +/* At CREG_OFFSET[N] is the offset to the greg_t location where + the GDB register N is stored. */ +static int creg_offset[] = +{ + CREG_OFFSET (EAX), CREG_OFFSET (ECX), CREG_OFFSET (EDX), CREG_OFFSET (EBX), + CREG_OFFSET (UESP), CREG_OFFSET (EBP), CREG_OFFSET (ESI), CREG_OFFSET (EDI), + CREG_OFFSET (EIP), CREG_OFFSET (EFL), CREG_OFFSET (CS), CREG_OFFSET (SS), + CREG_OFFSET (DS), CREG_OFFSET (ES), CREG_OFFSET (FS), CREG_OFFSET (GS) +}; + #define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum]) -#define CREG_ADDR(state, regnum) ((const char *)(state) + reg_offset[regnum]) +#define CREG_ADDR(state, regnum) ((const char *)(state) + creg_offset[regnum]) /* Get the whole floating-point state of THREAD and record the values