From 23e2d720d191b57feecfbfb80e036a6725189c20 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 4 Jul 2012 20:46:20 +0000 Subject: [PATCH] Add sp_regnum_from_eax/pc_regnum_from_eax to i386 gdbarch_tdep * amd64-tdep.c (amd64_x32_init_abi): Set sp_regnum_from_eax to AMD64_RSP_REGNUM and pc_regnum_from_eax to AMD64_RIP_REGNUM. * i386-tdep.c (i386_gdbarch_init): Initialize sp_regnum_from_eax and pc_regnum_from_eax to -1. Update SP regnum from sp_regnum_from_eax and PC regnum from pc_regnum_from_eax if needed. * i386-tdep.h (gdbarch_tdep): Add sp_regnum_from_eax and pc_regnum_from_eax. --- gdb/ChangeLog | 13 +++++++++++++ gdb/amd64-tdep.c | 3 +++ gdb/i386-tdep.c | 11 +++++++++++ gdb/i386-tdep.h | 8 ++++++++ 4 files changed, 35 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1d8fba17a90..2a5c3d0d88b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2012-07-04 H.J. Lu + + * amd64-tdep.c (amd64_x32_init_abi): Set sp_regnum_from_eax to + AMD64_RSP_REGNUM and pc_regnum_from_eax to AMD64_RIP_REGNUM. + + * i386-tdep.c (i386_gdbarch_init): Initialize sp_regnum_from_eax + and pc_regnum_from_eax to -1. Update SP regnum from + sp_regnum_from_eax and PC regnum from pc_regnum_from_eax if + needed. + + * i386-tdep.h (gdbarch_tdep): Add sp_regnum_from_eax and + pc_regnum_from_eax. + 2012-07-03 Jan Kratochvil Fix 'warning: parameter has incomplete type' with gcc-3.4.6. diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 8ae1142c47e..54249265a71 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -2946,6 +2946,9 @@ amd64_x32_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdesc = tdesc_x32; tdep->tdesc = tdesc; + tdep->sp_regnum_from_eax = AMD64_RSP_REGNUM; + tdep->pc_regnum_from_eax = AMD64_RIP_REGNUM; + tdep->num_dword_regs = 17; set_tdesc_pseudo_register_type (gdbarch, amd64_x32_pseudo_register_type); diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index fd5969d61e0..6a029069657 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -7805,6 +7805,9 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->num_mmx_regs = 8; tdep->num_ymm_regs = 0; + tdep->sp_regnum_from_eax = -1; + tdep->pc_regnum_from_eax = -1; + tdesc_data = tdesc_data_alloc (); set_gdbarch_relocate_instruction (gdbarch, i386_relocate_instruction); @@ -7849,6 +7852,14 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Support dword pseudo-register if it hasn't been disabled. */ tdep->eax_regnum = ymm0_regnum; ymm0_regnum += tdep->num_dword_regs; + if (tdep->sp_regnum_from_eax != -1) + set_gdbarch_sp_regnum (gdbarch, + (tdep->eax_regnum + + tdep->sp_regnum_from_eax)); + if (tdep->pc_regnum_from_eax != -1) + set_gdbarch_pc_regnum (gdbarch, + (tdep->eax_regnum + + tdep->pc_regnum_from_eax)); } else tdep->eax_regnum = -1; diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h index 5f233f590fe..76afdceb315 100644 --- a/gdb/i386-tdep.h +++ b/gdb/i386-tdep.h @@ -149,6 +149,14 @@ struct gdbarch_tdep of pseudo dword register support. */ int eax_regnum; + /* Register number for SP, relative to %eax. Set this to -1 to + indicate the absence of pseudo SP register support. */ + int sp_regnum_from_eax; + + /* Register number for PC, relative to %eax. Set this to -1 to + indicate the absence of pseudo PC register support. */ + int pc_regnum_from_eax; + /* Number of core registers. */ int num_core_regs; -- 2.30.2