From 3ce2bf1815f79e33ffbcebcf7da5f6896536f390 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 1 Mar 2004 00:50:56 +0000 Subject: [PATCH] 2004-02-29 Andrew Cagney * rs6000-tdep.c (rs6000_init_frame_pc_first): New function. (rs6000_gdbarch_init): Set deprecated_init_frame_pc_first. * config/rs6000/tm-rs6000.h (DEPRECATED_INIT_FRAME_PC_FIRST): Delete macro. --- gdb/ChangeLog | 7 +++++++ gdb/config/rs6000/tm-rs6000.h | 6 ------ gdb/rs6000-tdep.c | 8 ++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6382a3d111..4770aa5154 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2004-02-29 Andrew Cagney + + * rs6000-tdep.c (rs6000_init_frame_pc_first): New function. + (rs6000_gdbarch_init): Set deprecated_init_frame_pc_first. + * config/rs6000/tm-rs6000.h (DEPRECATED_INIT_FRAME_PC_FIRST): + Delete macro. + 2004-02-29 Daniel Jacobowitz * inflow.c (terminal_inferior): Don't give up the terminal if we diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h index 4b8a09dc3c..4422fcbf3c 100644 --- a/gdb/config/rs6000/tm-rs6000.h +++ b/gdb/config/rs6000/tm-rs6000.h @@ -74,12 +74,6 @@ extern void aix_process_linenos (void); #define FP0_REGNUM 32 /* Floating point register 0 */ #define FPLAST_REGNUM 63 /* Last floating point register */ -/* Define other aspects of the stack frame. */ - -#define DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev) \ - (fromleaf ? DEPRECATED_SAVED_PC_AFTER_CALL (prev->next) : \ - prev->next ? DEPRECATED_FRAME_SAVED_PC (prev->next) : read_pc ()) - /* Notice when a new child process is started. */ #define TARGET_CREATE_INFERIOR_HOOK rs6000_create_inferior diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 5eef895911..05eb442114 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -210,6 +210,13 @@ rs6000_frame_init_saved_regs (struct frame_info *fi) frame_get_saved_regs (fi, NULL); } +static CORE_ADDR +rs6000_init_frame_pc_first (int fromleaf, struct frame_info *prev) +{ + return (fromleaf ? DEPRECATED_SAVED_PC_AFTER_CALL (prev->next) + : prev->next ? DEPRECATED_FRAME_SAVED_PC (prev->next) : read_pc ()); +} + static CORE_ADDR rs6000_frame_args_address (struct frame_info *fi) { @@ -2914,6 +2921,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, rs6000_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, rs6000_init_extra_frame_info); + set_gdbarch_deprecated_init_frame_pc_first (gdbarch, rs6000_init_frame_pc_first); if (!sysv_abi) {