From dcb3c129fb9c75ac868cf476425c8c991aff814d Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 11 Apr 2003 18:15:40 +0000 Subject: 2003-04-11 Andrew Cagney * gdbarch.sh (DEPRECATED_SAVED_PC_AFTER_CALL): Deprecate SAVED_PC_AFTER_CALL. * gdbarch.h, gdbarch.c: Regenerate. * xstormy16-tdep.c (xstormy16_gdbarch_init): Update. * x86-64-tdep.c (x86_64_init_abi): Update. * vax-tdep.c (vax_gdbarch_init): Update. * v850-tdep.c (v850_gdbarch_init): Update. * sparc-tdep.c (sparc_gdbarch_init): Update. * sh-tdep.c (sh_gdbarch_init): Update. * s390-tdep.c (s390_gdbarch_init): Update. * rs6000-tdep.c (rs6000_gdbarch_init): Update. * ns32k-tdep.c (ns32k_gdbarch_init): Update. * mn10300-tdep.c (mn10300_gdbarch_init): Update. * mips-tdep.c (mips_gdbarch_init): Update. * mcore-tdep.c (mcore_gdbarch_init): Update. * m68k-tdep.c (m68k_gdbarch_init): Update. * m68hc11-tdep.c (m68hc11_gdbarch_init): Update. * ia64-tdep.c (ia64_gdbarch_init): Update. (ia64_saved_pc_after_call): Update declaration. * i386ly-tdep.c (i386lynx_init_abi): Update. * i386-tdep.c (i386_gdbarch_init): Update. * hppa-tdep.c (hppa_gdbarch_init): Update. * h8300-tdep.c (h8300_gdbarch_init): Update. * frv-tdep.c (frv_gdbarch_init): Update. * cris-tdep.c (cris_gdbarch_init): Update. * avr-tdep.c (avr_gdbarch_init): Update. * arm-tdep.c (arm_gdbarch_init): Update. * alpha-tdep.c (alpha_gdbarch_init): Update. * ns32knbsd-nat.c (frame_num_args): Update. * ns32k-tdep.c (umax_frame_num_args): Update. * mips-tdep.c (mips_init_frame_pc_first): Update. * infrun.c (step_over_function): Update. * i386-linux-tdep.c (skip_hurd_resolver): Update. * i386-interix-tdep.c (i386_interix_back_one_frame): Update. * config/sparc/tm-sparc.h (DEPRECATED_SAVED_PC_AFTER_CALL): Update. (DEPRECATED_INIT_FRAME_PC_FIRST): Update. * config/rs6000/tm-rs6000.h (DEPRECATED_INIT_FRAME_PC_FIRST): Update. * config/pa/tm-hppa.h (DEPRECATED_SAVED_PC_AFTER_CALL): Update. * arm-linux-tdep.c (skip_hurd_resolver): Update. * arch-utils.c (init_frame_pc_default): Update. * alpha-tdep.c (alpha_init_frame_pc_first): Update. * x86-64-tdep.h (x86_64_linux_saved_pc_after_call): Update declaration. --- gdb/ChangeLog | 46 +++++++++++++++++++++++++++++++ gdb/alpha-tdep.c | 9 +++--- gdb/arch-utils.c | 4 +-- gdb/arm-linux-tdep.c | 2 +- gdb/arm-tdep.c | 2 +- gdb/avr-tdep.c | 2 +- gdb/config/pa/tm-hppa.h | 4 +-- gdb/config/rs6000/tm-rs6000.h | 2 +- gdb/config/sparc/tm-sparc.h | 4 +-- gdb/cris-tdep.c | 2 +- gdb/frv-tdep.c | 2 +- gdb/gdbarch.c | 64 +++++++++++++++++++++---------------------- gdb/gdbarch.h | 40 +++++++++++++-------------- gdb/gdbarch.sh | 2 +- gdb/h8300-tdep.c | 2 +- gdb/hppa-tdep.c | 2 +- gdb/i386-interix-tdep.c | 4 +-- gdb/i386-linux-tdep.c | 2 +- gdb/i386-tdep.c | 2 +- gdb/i386ly-tdep.c | 2 +- gdb/ia64-tdep.c | 4 +-- gdb/infrun.c | 8 +++--- gdb/m68hc11-tdep.c | 2 +- gdb/m68k-tdep.c | 2 +- gdb/mcore-tdep.c | 2 +- gdb/mips-tdep.c | 4 +-- gdb/mn10300-tdep.c | 2 +- gdb/ns32k-tdep.c | 4 +-- gdb/ns32knbsd-nat.c | 4 ++- gdb/rs6000-tdep.c | 2 +- gdb/s390-tdep.c | 2 +- gdb/sh-tdep.c | 2 +- gdb/sparc-tdep.c | 2 +- gdb/v850-tdep.c | 2 +- gdb/vax-tdep.c | 3 +- gdb/x86-64-tdep.c | 2 +- gdb/x86-64-tdep.h | 2 +- gdb/xstormy16-tdep.c | 2 +- 38 files changed, 149 insertions(+), 101 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1b7cbf27372..da97e8ff949 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,49 @@ +2003-04-11 Andrew Cagney + + * gdbarch.sh (DEPRECATED_SAVED_PC_AFTER_CALL): Deprecate + SAVED_PC_AFTER_CALL. + * gdbarch.h, gdbarch.c: Regenerate. + * xstormy16-tdep.c (xstormy16_gdbarch_init): Update. + * x86-64-tdep.c (x86_64_init_abi): Update. + * vax-tdep.c (vax_gdbarch_init): Update. + * v850-tdep.c (v850_gdbarch_init): Update. + * sparc-tdep.c (sparc_gdbarch_init): Update. + * sh-tdep.c (sh_gdbarch_init): Update. + * s390-tdep.c (s390_gdbarch_init): Update. + * rs6000-tdep.c (rs6000_gdbarch_init): Update. + * ns32k-tdep.c (ns32k_gdbarch_init): Update. + * mn10300-tdep.c (mn10300_gdbarch_init): Update. + * mips-tdep.c (mips_gdbarch_init): Update. + * mcore-tdep.c (mcore_gdbarch_init): Update. + * m68k-tdep.c (m68k_gdbarch_init): Update. + * m68hc11-tdep.c (m68hc11_gdbarch_init): Update. + * ia64-tdep.c (ia64_gdbarch_init): Update. + (ia64_saved_pc_after_call): Update declaration. + * i386ly-tdep.c (i386lynx_init_abi): Update. + * i386-tdep.c (i386_gdbarch_init): Update. + * hppa-tdep.c (hppa_gdbarch_init): Update. + * h8300-tdep.c (h8300_gdbarch_init): Update. + * frv-tdep.c (frv_gdbarch_init): Update. + * cris-tdep.c (cris_gdbarch_init): Update. + * avr-tdep.c (avr_gdbarch_init): Update. + * arm-tdep.c (arm_gdbarch_init): Update. + * alpha-tdep.c (alpha_gdbarch_init): Update. + * ns32knbsd-nat.c (frame_num_args): Update. + * ns32k-tdep.c (umax_frame_num_args): Update. + * mips-tdep.c (mips_init_frame_pc_first): Update. + * infrun.c (step_over_function): Update. + * i386-linux-tdep.c (skip_hurd_resolver): Update. + * i386-interix-tdep.c (i386_interix_back_one_frame): Update. + * config/sparc/tm-sparc.h (DEPRECATED_SAVED_PC_AFTER_CALL): Update. + (DEPRECATED_INIT_FRAME_PC_FIRST): Update. + * config/rs6000/tm-rs6000.h (DEPRECATED_INIT_FRAME_PC_FIRST): Update. + * config/pa/tm-hppa.h (DEPRECATED_SAVED_PC_AFTER_CALL): Update. + * arm-linux-tdep.c (skip_hurd_resolver): Update. + * arch-utils.c (init_frame_pc_default): Update. + * alpha-tdep.c (alpha_init_frame_pc_first): Update. + * x86-64-tdep.h (x86_64_linux_saved_pc_after_call): Update + declaration. + 2003-04-11 Andrew Cagney * i387-tdep.c: Update copyright. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 2cbec4ef413..d61f359c1f5 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -65,7 +65,6 @@ static gdbarch_frame_args_address_ftype alpha_frame_args_address; static gdbarch_frame_locals_address_ftype alpha_frame_locals_address; static gdbarch_skip_prologue_ftype alpha_skip_prologue; -static gdbarch_saved_pc_after_call_ftype alpha_saved_pc_after_call; static gdbarch_fix_call_dummy_ftype alpha_fix_call_dummy; @@ -453,8 +452,10 @@ alpha_frame_init_saved_regs (struct frame_info *fi) static CORE_ADDR alpha_init_frame_pc_first (int fromleaf, struct frame_info *prev) { - return (fromleaf ? SAVED_PC_AFTER_CALL (get_next_frame (prev)) - : get_next_frame (prev) ? DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev)) + return (fromleaf + ? DEPRECATED_SAVED_PC_AFTER_CALL (get_next_frame (prev)) + : get_next_frame (prev) + ? DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev)) : read_pc ()); } @@ -1834,7 +1835,7 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frameless_function_invocation (gdbarch, generic_frameless_function_invocation_not); - set_gdbarch_saved_pc_after_call (gdbarch, alpha_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, alpha_saved_pc_after_call); set_gdbarch_deprecated_frame_chain (gdbarch, alpha_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, alpha_frame_saved_pc); diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index cba0175709d..825bd5cb76f 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -383,8 +383,8 @@ init_frame_pc_noop (int fromleaf, struct frame_info *prev) CORE_ADDR init_frame_pc_default (int fromleaf, struct frame_info *prev) { - if (fromleaf && SAVED_PC_AFTER_CALL_P ()) - return SAVED_PC_AFTER_CALL (get_next_frame (prev)); + if (fromleaf && DEPRECATED_SAVED_PC_AFTER_CALL_P ()) + return DEPRECATED_SAVED_PC_AFTER_CALL (get_next_frame (prev)); else if (get_next_frame (prev) != NULL) return DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev)); else diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 781d4204a2c..91fa88fe0ad 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -406,7 +406,7 @@ skip_hurd_resolver (CORE_ADDR pc) = lookup_minimal_symbol ("fixup", NULL, objfile); if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc) - return (SAVED_PC_AFTER_CALL (get_current_frame ())); + return (DEPRECATED_SAVED_PC_AFTER_CALL (get_current_frame ())); } return 0; diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 748422b8de3..0a029e84702 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -2961,7 +2961,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_skip_prologue (gdbarch, arm_skip_prologue); /* Get the PC when a frame might not be available. */ - set_gdbarch_saved_pc_after_call (gdbarch, arm_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, arm_saved_pc_after_call); /* The stack grows downward. */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 9ebc0ce5e22..b787c8141cf 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -1197,7 +1197,7 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frame_saved_pc (gdbarch, avr_frame_saved_pc); set_gdbarch_frame_args_address (gdbarch, avr_frame_address); set_gdbarch_frame_locals_address (gdbarch, avr_frame_address); - set_gdbarch_saved_pc_after_call (gdbarch, avr_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, avr_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_convert_from_func_ptr_addr (gdbarch, diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h index 6089b32b526..c0b3e2630ea 100644 --- a/gdb/config/pa/tm-hppa.h +++ b/gdb/config/pa/tm-hppa.h @@ -104,8 +104,8 @@ extern int hppa_in_solib_return_trampoline (CORE_ADDR, char *); #endif #if !GDB_MULTI_ARCH -#undef SAVED_PC_AFTER_CALL -#define SAVED_PC_AFTER_CALL(frame) hppa_saved_pc_after_call (frame) +#undef DEPRECATED_SAVED_PC_AFTER_CALL +#define DEPRECATED_SAVED_PC_AFTER_CALL(frame) hppa_saved_pc_after_call (frame) extern CORE_ADDR hppa_saved_pc_after_call (struct frame_info *); #endif diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h index 08f069bdcd9..2a80a502261 100644 --- a/gdb/config/rs6000/tm-rs6000.h +++ b/gdb/config/rs6000/tm-rs6000.h @@ -79,7 +79,7 @@ extern void aix_process_linenos (void); /* Define other aspects of the stack frame. */ #define DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev) \ - (fromleaf ? SAVED_PC_AFTER_CALL (prev->next) : \ + (fromleaf ? DEPRECATED_SAVED_PC_AFTER_CALL (prev->next) : \ prev->next ? DEPRECATED_FRAME_SAVED_PC (prev->next) : read_pc ()) /* NOTE: cagney/2002-12-08: Add local declaration of init_frame_pc_noop() because it isn't possible to include diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h index 544a562ffae..414b69ec9ce 100644 --- a/gdb/config/sparc/tm-sparc.h +++ b/gdb/config/sparc/tm-sparc.h @@ -258,7 +258,7 @@ extern CORE_ADDR sparc_skip_prologue (CORE_ADDR); the new frame is not set up until the new function executes some instructions. */ -#define SAVED_PC_AFTER_CALL(FRAME) PC_ADJUST (read_register (RP_REGNUM)) +#define DEPRECATED_SAVED_PC_AFTER_CALL(FRAME) PC_ADJUST (read_register (RP_REGNUM)) /* Stack grows downward. */ @@ -471,7 +471,7 @@ extern void sparc_print_extra_frame_info (struct frame_info *); extern CORE_ADDR init_frame_pc_noop (int fromleaf, struct frame_info *prev); #define DEPRECATED_INIT_FRAME_PC(FROMLEAF, PREV) (init_frame_pc_noop (FROMLEAF, PREV)) #define DEPRECATED_INIT_FRAME_PC_FIRST(FROMLEAF, PREV) \ - ((FROMLEAF) ? SAVED_PC_AFTER_CALL ((PREV)->next) : \ + ((FROMLEAF) ? DEPRECATED_SAVED_PC_AFTER_CALL ((PREV)->next) : \ (PREV)->next ? DEPRECATED_FRAME_SAVED_PC ((PREV)->next) : read_pc ()) /* Define other aspects of the stack frame. */ diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 2258a17b7cc..f03cd14e269 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -4301,7 +4301,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frame_chain (gdbarch, cris_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, cris_frame_saved_pc); - set_gdbarch_saved_pc_after_call (gdbarch, cris_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, cris_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 42b471a7e89..bab37760ad0 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -1073,7 +1073,7 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_frameless_function_invocation (gdbarch, frv_frameless_function_invocation); - set_gdbarch_saved_pc_after_call (gdbarch, frv_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, frv_saved_pc_after_call); set_gdbarch_deprecated_frame_chain (gdbarch, frv_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, frv_frame_saved_pc); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 257f2b91cbe..3b5a80762c3 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -244,7 +244,7 @@ struct gdbarch gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_frame_args_address_ftype *frame_args_address; gdbarch_frame_locals_address_ftype *frame_locals_address; - gdbarch_saved_pc_after_call_ftype *saved_pc_after_call; + gdbarch_deprecated_saved_pc_after_call_ftype *deprecated_saved_pc_after_call; gdbarch_frame_num_args_ftype *frame_num_args; gdbarch_stack_align_ftype *stack_align; gdbarch_frame_align_ftype *frame_align; @@ -728,7 +728,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of unwind_pc, has predicate */ /* Skip verify of frame_args_address, invalid_p == 0 */ /* Skip verify of frame_locals_address, invalid_p == 0 */ - /* Skip verify of saved_pc_after_call, has predicate */ + /* Skip verify of deprecated_saved_pc_after_call, has predicate */ if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && (gdbarch->frame_num_args == 0)) fprintf_unfiltered (log, "\n\tframe_num_args"); @@ -1454,6 +1454,26 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_push_return_address /*DEPRECATED_PUSH_RETURN_ADDRESS ()*/); #endif +#ifdef DEPRECATED_SAVED_PC_AFTER_CALL_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_SAVED_PC_AFTER_CALL_P()", + XSTRING (DEPRECATED_SAVED_PC_AFTER_CALL_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_SAVED_PC_AFTER_CALL_P() = %d\n", + DEPRECATED_SAVED_PC_AFTER_CALL_P ()); +#endif +#ifdef DEPRECATED_SAVED_PC_AFTER_CALL + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_SAVED_PC_AFTER_CALL(frame)", + XSTRING (DEPRECATED_SAVED_PC_AFTER_CALL (frame))); + if (GDB_MULTI_ARCH) + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_SAVED_PC_AFTER_CALL = <0x%08lx>\n", + (long) current_gdbarch->deprecated_saved_pc_after_call + /*DEPRECATED_SAVED_PC_AFTER_CALL ()*/); +#endif #ifdef DEPRECATED_STORE_RETURN_VALUE #if GDB_MULTI_ARCH /* Macro might contain `[{}]' when not multi-arch */ @@ -2150,26 +2170,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->return_value_on_stack /*RETURN_VALUE_ON_STACK ()*/); #endif -#ifdef SAVED_PC_AFTER_CALL_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SAVED_PC_AFTER_CALL_P()", - XSTRING (SAVED_PC_AFTER_CALL_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: SAVED_PC_AFTER_CALL_P() = %d\n", - SAVED_PC_AFTER_CALL_P ()); -#endif -#ifdef SAVED_PC_AFTER_CALL - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "SAVED_PC_AFTER_CALL(frame)", - XSTRING (SAVED_PC_AFTER_CALL (frame))); - if (GDB_MULTI_ARCH) - fprintf_unfiltered (file, - "gdbarch_dump: SAVED_PC_AFTER_CALL = <0x%08lx>\n", - (long) current_gdbarch->saved_pc_after_call - /*SAVED_PC_AFTER_CALL ()*/); -#endif #ifdef SAVE_DUMMY_FRAME_TOS_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -4910,29 +4910,29 @@ set_gdbarch_frame_locals_address (struct gdbarch *gdbarch, } int -gdbarch_saved_pc_after_call_p (struct gdbarch *gdbarch) +gdbarch_deprecated_saved_pc_after_call_p (struct gdbarch *gdbarch) { gdb_assert (gdbarch != NULL); - return gdbarch->saved_pc_after_call != 0; + return gdbarch->deprecated_saved_pc_after_call != 0; } CORE_ADDR -gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame) +gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame) { gdb_assert (gdbarch != NULL); - if (gdbarch->saved_pc_after_call == 0) + if (gdbarch->deprecated_saved_pc_after_call == 0) internal_error (__FILE__, __LINE__, - "gdbarch: gdbarch_saved_pc_after_call invalid"); + "gdbarch: gdbarch_deprecated_saved_pc_after_call invalid"); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_saved_pc_after_call called\n"); - return gdbarch->saved_pc_after_call (frame); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_saved_pc_after_call called\n"); + return gdbarch->deprecated_saved_pc_after_call (frame); } void -set_gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, - gdbarch_saved_pc_after_call_ftype saved_pc_after_call) +set_gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, + gdbarch_deprecated_saved_pc_after_call_ftype deprecated_saved_pc_after_call) { - gdbarch->saved_pc_after_call = saved_pc_after_call; + gdbarch->deprecated_saved_pc_after_call = deprecated_saved_pc_after_call; } int diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index c1f02c81e52..e055dab0312 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -2385,40 +2385,40 @@ extern void set_gdbarch_frame_locals_address (struct gdbarch *gdbarch, gdbarch_f #endif #endif -#if defined (SAVED_PC_AFTER_CALL) -/* Legacy for systems yet to multi-arch SAVED_PC_AFTER_CALL */ -#if !defined (SAVED_PC_AFTER_CALL_P) -#define SAVED_PC_AFTER_CALL_P() (1) +#if defined (DEPRECATED_SAVED_PC_AFTER_CALL) +/* Legacy for systems yet to multi-arch DEPRECATED_SAVED_PC_AFTER_CALL */ +#if !defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) +#define DEPRECATED_SAVED_PC_AFTER_CALL_P() (1) #endif #endif /* Default predicate for non- multi-arch targets. */ -#if (!GDB_MULTI_ARCH) && !defined (SAVED_PC_AFTER_CALL_P) -#define SAVED_PC_AFTER_CALL_P() (0) +#if (!GDB_MULTI_ARCH) && !defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) +#define DEPRECATED_SAVED_PC_AFTER_CALL_P() (0) #endif -extern int gdbarch_saved_pc_after_call_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (SAVED_PC_AFTER_CALL_P) -#error "Non multi-arch definition of SAVED_PC_AFTER_CALL" +extern int gdbarch_deprecated_saved_pc_after_call_p (struct gdbarch *gdbarch); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) +#error "Non multi-arch definition of DEPRECATED_SAVED_PC_AFTER_CALL" #endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (SAVED_PC_AFTER_CALL_P) -#define SAVED_PC_AFTER_CALL_P() (gdbarch_saved_pc_after_call_p (current_gdbarch)) +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) +#define DEPRECATED_SAVED_PC_AFTER_CALL_P() (gdbarch_deprecated_saved_pc_after_call_p (current_gdbarch)) #endif /* Default (function) for non- multi-arch platforms. */ -#if (!GDB_MULTI_ARCH) && !defined (SAVED_PC_AFTER_CALL) -#define SAVED_PC_AFTER_CALL(frame) (internal_error (__FILE__, __LINE__, "SAVED_PC_AFTER_CALL"), 0) +#if (!GDB_MULTI_ARCH) && !defined (DEPRECATED_SAVED_PC_AFTER_CALL) +#define DEPRECATED_SAVED_PC_AFTER_CALL(frame) (internal_error (__FILE__, __LINE__, "DEPRECATED_SAVED_PC_AFTER_CALL"), 0) #endif -typedef CORE_ADDR (gdbarch_saved_pc_after_call_ftype) (struct frame_info *frame); -extern CORE_ADDR gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame); -extern void set_gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, gdbarch_saved_pc_after_call_ftype *saved_pc_after_call); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (SAVED_PC_AFTER_CALL) -#error "Non multi-arch definition of SAVED_PC_AFTER_CALL" +typedef CORE_ADDR (gdbarch_deprecated_saved_pc_after_call_ftype) (struct frame_info *frame); +extern CORE_ADDR gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame); +extern void set_gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, gdbarch_deprecated_saved_pc_after_call_ftype *deprecated_saved_pc_after_call); +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_SAVED_PC_AFTER_CALL) +#error "Non multi-arch definition of DEPRECATED_SAVED_PC_AFTER_CALL" #endif #if GDB_MULTI_ARCH -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (SAVED_PC_AFTER_CALL) -#define SAVED_PC_AFTER_CALL(frame) (gdbarch_saved_pc_after_call (current_gdbarch, frame)) +#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_SAVED_PC_AFTER_CALL) +#define DEPRECATED_SAVED_PC_AFTER_CALL(frame) (gdbarch_deprecated_saved_pc_after_call (current_gdbarch, frame)) #endif #endif diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 5807eb21c8c..0d2ca73e186 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -599,7 +599,7 @@ F:2:DEPRECATED_FRAME_SAVED_PC:CORE_ADDR:deprecated_frame_saved_pc:struct frame_i M::UNWIND_PC:CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame: f:2:FRAME_ARGS_ADDRESS:CORE_ADDR:frame_args_address:struct frame_info *fi:fi::0:get_frame_base::0 f:2:FRAME_LOCALS_ADDRESS:CORE_ADDR:frame_locals_address:struct frame_info *fi:fi::0:get_frame_base::0 -F::SAVED_PC_AFTER_CALL:CORE_ADDR:saved_pc_after_call:struct frame_info *frame:frame +F::DEPRECATED_SAVED_PC_AFTER_CALL:CORE_ADDR:deprecated_saved_pc_after_call:struct frame_info *frame:frame f:2:FRAME_NUM_ARGS:int:frame_num_args:struct frame_info *frame:frame::0:0 # F:2:STACK_ALIGN:CORE_ADDR:stack_align:CORE_ADDR sp:sp::0:0 diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 7bb25000bf9..2423a9a40a5 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1121,7 +1121,7 @@ h8300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, h8300_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, h8300_init_extra_frame_info); set_gdbarch_deprecated_frame_chain (gdbarch, h8300_frame_chain); - set_gdbarch_saved_pc_after_call (gdbarch, h8300_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, h8300_saved_pc_after_call); set_gdbarch_deprecated_frame_saved_pc (gdbarch, h8300_frame_saved_pc); set_gdbarch_skip_prologue (gdbarch, h8300_skip_prologue); set_gdbarch_frame_args_address (gdbarch, h8300_frame_args_address); diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 896d638e9e7..bc60e662292 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -4982,7 +4982,7 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_in_solib_call_trampoline (gdbarch, hppa_in_solib_call_trampoline); set_gdbarch_in_solib_return_trampoline (gdbarch, hppa_in_solib_return_trampoline); - set_gdbarch_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call); set_gdbarch_inner_than (gdbarch, hppa_inner_than); set_gdbarch_stack_align (gdbarch, hppa_stack_align); set_gdbarch_decr_pc_after_break (gdbarch, 0); diff --git a/gdb/i386-interix-tdep.c b/gdb/i386-interix-tdep.c index a44989dcc37..7713863e4d7 100644 --- a/gdb/i386-interix-tdep.c +++ b/gdb/i386-interix-tdep.c @@ -149,7 +149,7 @@ i386_interix_back_one_frame (int fromleaf, struct frame_info *frame) if (fromleaf) { - frame->pc = SAVED_PC_AFTER_CALL (frame->next); + frame->pc = DEPRECATED_SAVED_PC_AFTER_CALL (frame->next); return; } @@ -162,7 +162,7 @@ i386_interix_back_one_frame (int fromleaf, struct frame_info *frame) { /* We know we're in a system call mini-frame; was it NullApi or something else? */ - ra = SAVED_PC_AFTER_CALL (frame); + ra = DEPRECATED_SAVED_PC_AFTER_CALL (frame); if (ra >= null_start && ra < null_end) deprecated_set_frame_type (frame, SIGTRAMP_FRAME); /* There might also be an indirect call to the mini-frame, diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index f92f1ea0c6e..2fe4d0481a9 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -374,7 +374,7 @@ skip_hurd_resolver (CORE_ADDR pc) = lookup_minimal_symbol ("fixup", NULL, objfile); if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc) - return (SAVED_PC_AFTER_CALL (get_current_frame ())); + return (DEPRECATED_SAVED_PC_AFTER_CALL (get_current_frame ())); } return 0; diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 317d7261e79..475f89c2033 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -1601,7 +1601,7 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) i386_frameless_function_invocation); set_gdbarch_deprecated_frame_chain (gdbarch, i386_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, i386_frame_saved_pc); - set_gdbarch_saved_pc_after_call (gdbarch, i386_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, i386_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, i386_frame_num_args); set_gdbarch_pc_in_sigtramp (gdbarch, i386_pc_in_sigtramp); diff --git a/gdb/i386ly-tdep.c b/gdb/i386ly-tdep.c index d0775b76437..2374b71aa1f 100644 --- a/gdb/i386ly-tdep.c +++ b/gdb/i386ly-tdep.c @@ -53,7 +53,7 @@ i386lynx_saved_pc_after_call (struct frame_info *frame) static void i386lynx_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - set_gdbarch_saved_pc_after_call (gdbarch, i386lynx_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, i386lynx_saved_pc_after_call); } diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 7abd7ea3321..86638fb37ba 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -96,7 +96,7 @@ static gdbarch_deprecated_extract_return_value_ftype ia64_extract_return_value; static gdbarch_deprecated_extract_struct_value_address_ftype ia64_extract_struct_value_address; static gdbarch_use_struct_convention_ftype ia64_use_struct_convention; static gdbarch_frameless_function_invocation_ftype ia64_frameless_function_invocation; -static gdbarch_saved_pc_after_call_ftype ia64_saved_pc_after_call; +static gdbarch_deprecated_saved_pc_after_call_ftype ia64_saved_pc_after_call; static void ia64_pop_frame_regular (struct frame_info *frame); static struct type *is_float_or_hfa_type (struct type *t); @@ -2187,7 +2187,7 @@ ia64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_frameless_function_invocation (gdbarch, ia64_frameless_function_invocation); - set_gdbarch_saved_pc_after_call (gdbarch, ia64_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, ia64_saved_pc_after_call); set_gdbarch_deprecated_frame_chain (gdbarch, ia64_frame_chain); set_gdbarch_deprecated_frame_saved_pc (gdbarch, ia64_frame_saved_pc); diff --git a/gdb/infrun.c b/gdb/infrun.c index 3fda9649f07..35e002d9e50 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2685,9 +2685,9 @@ step_over_function (struct execution_control_state *ecs) very messy when there is no debug info available (look at the heuristic find pc start code found in targets like the MIPS). */ - /* NOTE: cagney/2003-04-06: Deprecate SAVED_PC_AFTER_CALL? + /* NOTE: cagney/2003-04-06: - The intent of SAVED_PC_AFTER_CALL was to: + The intent of DEPRECATED_SAVED_PC_AFTER_CALL was to: - provide a very light weight equivalent to frame_unwind_pc() (nee FRAME_SAVED_PC) that avoids the prologue analyzer @@ -2709,8 +2709,8 @@ step_over_function (struct execution_control_state *ecs) The d10v handles all this by bailing out of the prologue analsis when it reaches the current instruction. */ - if (SAVED_PC_AFTER_CALL_P ()) - sr_sal.pc = ADDR_BITS_REMOVE (SAVED_PC_AFTER_CALL (get_current_frame ())); + if (DEPRECATED_SAVED_PC_AFTER_CALL_P ()) + sr_sal.pc = ADDR_BITS_REMOVE (DEPRECATED_SAVED_PC_AFTER_CALL (get_current_frame ())); else sr_sal.pc = ADDR_BITS_REMOVE (frame_pc_unwind (get_current_frame ())); sr_sal.section = find_pc_overlay (sr_sal.pc); diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c index ef54821844e..37d27a544be 100644 --- a/gdb/m68hc11-tdep.c +++ b/gdb/m68hc11-tdep.c @@ -1400,7 +1400,7 @@ m68hc11_gdbarch_init (struct gdbarch_info info, set_gdbarch_deprecated_frame_saved_pc (gdbarch, m68hc11_frame_saved_pc); set_gdbarch_frame_args_address (gdbarch, m68hc11_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, m68hc11_frame_locals_address); - set_gdbarch_saved_pc_after_call (gdbarch, m68hc11_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, m68hc11_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_deprecated_get_saved_register (gdbarch, deprecated_generic_get_saved_register); diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index a93a156080e..1ad176e3ad0 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -994,7 +994,7 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_skip_prologue (gdbarch, m68k_skip_prologue); - set_gdbarch_saved_pc_after_call (gdbarch, m68k_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, m68k_saved_pc_after_call); set_gdbarch_breakpoint_from_pc (gdbarch, m68k_local_breakpoint_from_pc); /* Stack grows down. */ diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 21f3ce68c83..ab03f3ad765 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -1119,7 +1119,7 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_call_dummy_words (gdbarch, call_dummy_words); set_gdbarch_sizeof_call_dummy_words (gdbarch, 0); set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); - set_gdbarch_saved_pc_after_call (gdbarch, mcore_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mcore_saved_pc_after_call); set_gdbarch_function_start_offset (gdbarch, 0); set_gdbarch_decr_pc_after_break (gdbarch, 0); set_gdbarch_breakpoint_from_pc (gdbarch, mcore_breakpoint_from_pc); diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 3e8339b92d0..d2204aa9211 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -1715,7 +1715,7 @@ mips_init_frame_pc_first (int fromleaf, struct frame_info *prev) CORE_ADDR pc, tmp; pc = ((fromleaf) - ? SAVED_PC_AFTER_CALL (get_next_frame (prev)) + ? DEPRECATED_SAVED_PC_AFTER_CALL (get_next_frame (prev)) : get_next_frame (prev) ? DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev)) : read_pc ()); @@ -6035,7 +6035,7 @@ mips_gdbarch_init (struct gdbarch_info info, set_gdbarch_decr_pc_after_break (gdbarch, 0); set_gdbarch_skip_prologue (gdbarch, mips_skip_prologue); - set_gdbarch_saved_pc_after_call (gdbarch, mips_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mips_saved_pc_after_call); set_gdbarch_pointer_to_address (gdbarch, signed_pointer_to_address); set_gdbarch_address_to_pointer (gdbarch, address_to_signed_pointer); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 960e83e9488..22f3b67e7f1 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1166,7 +1166,7 @@ mn10300_gdbarch_init (struct gdbarch_info info, /* Stack unwinding. */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info); set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop); set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs); diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index c451ed929d1..3a31ddbb8d9 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -190,7 +190,7 @@ umax_frame_num_args (struct frame_info *fi) if (enter_addr > 0) { pc = ((enter_addr == 1) - ? SAVED_PC_AFTER_CALL (fi) + ? DEPRECATED_SAVED_PC_AFTER_CALL (fi) : DEPRECATED_FRAME_SAVED_PC (fi)); insn = read_memory_integer (pc, 2); addr_mode = (insn >> 11) & 0x1f; @@ -566,7 +566,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Frame and stack info */ set_gdbarch_skip_prologue (gdbarch, umax_skip_prologue); - set_gdbarch_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, umax_frame_num_args); set_gdbarch_frameless_function_invocation (gdbarch, diff --git a/gdb/ns32knbsd-nat.c b/gdb/ns32knbsd-nat.c index 97971d25123..24e422db661 100644 --- a/gdb/ns32knbsd-nat.c +++ b/gdb/ns32knbsd-nat.c @@ -295,7 +295,9 @@ frame_num_args (struct frame_info *fi) enter_addr = ns32k_get_enter_addr (fi->pc); if (enter_addr = 0) return (-1); - argp = enter_addr == 1 ? SAVED_PC_AFTER_CALL (fi) : DEPRECATED_FRAME_SAVED_PC (fi); + argp = (enter_addr == 1 + ? DEPRECATED_SAVED_PC_AFTER_CALL (fi) + : DEPRECATED_FRAME_SAVED_PC (fi)); for (i = 0; i < 16; i++) { /* diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 4e7d374e56e..b70917e126f 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2957,7 +2957,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) } set_gdbarch_frame_args_address (gdbarch, rs6000_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, rs6000_frame_args_address); - set_gdbarch_saved_pc_after_call (gdbarch, rs6000_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, rs6000_saved_pc_after_call); /* We can't tell how many args there are now that the C compiler delays popping them. */ diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index e3917ba70be..e50a46d9875 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1843,7 +1843,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* DEPRECATED_FRAME_CHAIN takes a frame's nominal address and produces the frame's chain-pointer. */ set_gdbarch_deprecated_frame_chain (gdbarch, s390_frame_chain); - set_gdbarch_saved_pc_after_call (gdbarch, s390_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, s390_saved_pc_after_call); set_gdbarch_register_byte (gdbarch, s390_register_byte); set_gdbarch_pc_regnum (gdbarch, S390_PC_REGNUM); set_gdbarch_sp_regnum (gdbarch, S390_SP_REGNUM); diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index b61eb2364f3..0390e95f84f 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -4667,7 +4667,7 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_frameless_function_invocation (gdbarch, frameless_look_for_prologue); set_gdbarch_deprecated_frame_saved_pc (gdbarch, sh_frame_saved_pc); - set_gdbarch_saved_pc_after_call (gdbarch, sh_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, sh_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_believe_pcc_promotion (gdbarch, 1); diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index 7a54b8ff120..32f28019131 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -3169,7 +3169,7 @@ sparc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) generic_register_convertible_not); set_gdbarch_reg_struct_has_addr (gdbarch, sparc_reg_struct_has_addr); set_gdbarch_return_value_on_stack (gdbarch, sparc_return_value_on_stack); - set_gdbarch_saved_pc_after_call (gdbarch, sparc_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, sparc_saved_pc_after_call); set_gdbarch_prologue_frameless_p (gdbarch, sparc_prologue_frameless_p); set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_skip_prologue (gdbarch, sparc_skip_prologue); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index ca627e61654..de810565e04 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1245,7 +1245,7 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, v850_frame_init_saved_regs); set_gdbarch_deprecated_init_extra_frame_info (gdbarch, v850_init_extra_frame_info); set_gdbarch_deprecated_frame_chain (gdbarch, v850_frame_chain); - set_gdbarch_saved_pc_after_call (gdbarch, v850_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, v850_saved_pc_after_call); set_gdbarch_deprecated_frame_saved_pc (gdbarch, v850_frame_saved_pc); set_gdbarch_skip_prologue (gdbarch, v850_skip_prologue); diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index a39881f062c..859e2b377d5 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -40,7 +40,6 @@ static gdbarch_register_virtual_size_ftype vax_register_virtual_size; static gdbarch_register_virtual_type_ftype vax_register_virtual_type; static gdbarch_skip_prologue_ftype vax_skip_prologue; -static gdbarch_saved_pc_after_call_ftype vax_saved_pc_after_call; static gdbarch_frame_num_args_ftype vax_frame_num_args; static gdbarch_deprecated_frame_chain_ftype vax_frame_chain; static gdbarch_frame_args_address_ftype vax_frame_args_address; @@ -640,7 +639,7 @@ vax_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Frame and stack info */ set_gdbarch_skip_prologue (gdbarch, vax_skip_prologue); - set_gdbarch_saved_pc_after_call (gdbarch, vax_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, vax_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, vax_frame_num_args); set_gdbarch_frameless_function_invocation (gdbarch, diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c index d670ff436db..29943c3b023 100644 --- a/gdb/x86-64-tdep.c +++ b/gdb/x86-64-tdep.c @@ -1036,7 +1036,7 @@ x86_64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* FIXME: kettenis/20021026: These two are GNU/Linux-specific and should be moved elsewhere. */ set_gdbarch_deprecated_frame_saved_pc (gdbarch, x86_64_linux_frame_saved_pc); - set_gdbarch_saved_pc_after_call (gdbarch, x86_64_linux_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, x86_64_linux_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); /* FIXME: kettenis/20021026: This one is GNU/Linux-specific too. */ set_gdbarch_pc_in_sigtramp (gdbarch, x86_64_linux_in_sigtramp); diff --git a/gdb/x86-64-tdep.h b/gdb/x86-64-tdep.h index f39ea0da6b5..b8f3aefb776 100644 --- a/gdb/x86-64-tdep.h +++ b/gdb/x86-64-tdep.h @@ -32,7 +32,7 @@ int x86_64_register_number (const char *name); const char *x86_64_register_name (int reg_nr); gdbarch_deprecated_frame_saved_pc_ftype x86_64_linux_frame_saved_pc; -gdbarch_saved_pc_after_call_ftype x86_64_linux_saved_pc_after_call; +gdbarch_deprecated_saved_pc_after_call_ftype x86_64_linux_saved_pc_after_call; gdbarch_pc_in_sigtramp_ftype x86_64_linux_in_sigtramp; CORE_ADDR x86_64_linux_frame_chain (struct frame_info *fi); CORE_ADDR x86_64_init_frame_pc (int fromleaf, struct frame_info *fi); diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 3b4c656c5d5..2d3b7afe41c 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1056,7 +1056,7 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) xstormy16_frame_init_saved_regs); set_gdbarch_deprecated_frame_chain (gdbarch, xstormy16_frame_chain); set_gdbarch_deprecated_get_saved_register (gdbarch, xstormy16_get_saved_register); - set_gdbarch_saved_pc_after_call (gdbarch, xstormy16_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, xstormy16_saved_pc_after_call); set_gdbarch_deprecated_frame_saved_pc (gdbarch, xstormy16_frame_saved_pc); set_gdbarch_skip_prologue (gdbarch, xstormy16_skip_prologue); set_gdbarch_deprecated_frame_chain_valid (gdbarch, xstormy16_frame_chain_valid); -- cgit v1.2.1