From d7b7af6f3a94a8da1f9ca9c94f70fa618d693a31 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 16 Jul 2006 11:03:41 +0000 Subject: [PATCH] * gdbarch.sh (deprecated_saved_pc_after_call): Delete. --- gdb/ChangeLog | 3 +++ gdb/gdbarch.c | 45 --------------------------------------------- gdb/gdbarch.h | 25 ------------------------- gdb/gdbarch.sh | 1 - 4 files changed, 3 insertions(+), 71 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 684ad8d5a8a..73ae72de1f2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2006-07-16 Mark Kettenis + * gdbarch.sh (deprecated_saved_pc_after_call): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * arm-tdep.c (arm_saved_pc_after_call): Delete. (arm_gdbarch_init): Do not set deprecated_saved_pc_after_call. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 706bd1307c7..cad6e047538 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -206,7 +206,6 @@ struct gdbarch CORE_ADDR frame_args_skip; gdbarch_unwind_pc_ftype *unwind_pc; gdbarch_unwind_sp_ftype *unwind_sp; - gdbarch_deprecated_saved_pc_after_call_ftype *deprecated_saved_pc_after_call; gdbarch_frame_num_args_ftype *frame_num_args; gdbarch_deprecated_stack_align_ftype *deprecated_stack_align; gdbarch_frame_align_ftype *frame_align; @@ -332,7 +331,6 @@ struct gdbarch startup_gdbarch = 0, /* frame_args_skip */ 0, /* unwind_pc */ 0, /* unwind_sp */ - 0, /* deprecated_saved_pc_after_call */ 0, /* frame_num_args */ 0, /* deprecated_stack_align */ 0, /* frame_align */ @@ -586,7 +584,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of frame_args_skip, invalid_p == 0 */ /* Skip verify of unwind_pc, has predicate */ /* Skip verify of unwind_sp, has predicate */ - /* Skip verify of deprecated_saved_pc_after_call, has predicate */ /* Skip verify of frame_num_args, has predicate */ /* Skip verify of deprecated_stack_align, has predicate */ /* Skip verify of frame_align, has predicate */ @@ -921,24 +918,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: deprecated_register_size = %s\n", paddr_d (current_gdbarch->deprecated_register_size)); -#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 ())); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: gdbarch_deprecated_saved_pc_after_call_p() = %d\n", - gdbarch_deprecated_saved_pc_after_call_p (current_gdbarch)); -#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))); -#endif - fprintf_unfiltered (file, - "gdbarch_dump: deprecated_saved_pc_after_call = <0x%lx>\n", - (long) current_gdbarch->deprecated_saved_pc_after_call); #ifdef DEPRECATED_STACK_ALIGN_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -3107,30 +3086,6 @@ set_gdbarch_unwind_sp (struct gdbarch *gdbarch, gdbarch->unwind_sp = unwind_sp; } -int -gdbarch_deprecated_saved_pc_after_call_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_saved_pc_after_call != NULL; -} - -CORE_ADDR -gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_saved_pc_after_call != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_saved_pc_after_call called\n"); - return gdbarch->deprecated_saved_pc_after_call (frame); -} - -void -set_gdbarch_deprecated_saved_pc_after_call (struct gdbarch *gdbarch, - gdbarch_deprecated_saved_pc_after_call_ftype deprecated_saved_pc_after_call) -{ - gdbarch->deprecated_saved_pc_after_call = deprecated_saved_pc_after_call; -} - int gdbarch_frame_num_args_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 48bcd7a263b..a4764f89c6c 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1001,31 +1001,6 @@ extern void set_gdbarch_unwind_sp (struct gdbarch *gdbarch, gdbarch_unwind_sp_ft /* DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame frame-base. Enable frame-base before frame-unwind. */ -#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 - -extern int gdbarch_deprecated_saved_pc_after_call_p (struct gdbarch *gdbarch); -#if !defined (GDB_TM_FILE) && defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) -#error "Non multi-arch definition of DEPRECATED_SAVED_PC_AFTER_CALL" -#endif -#if !defined (DEPRECATED_SAVED_PC_AFTER_CALL_P) -#define DEPRECATED_SAVED_PC_AFTER_CALL_P() (gdbarch_deprecated_saved_pc_after_call_p (current_gdbarch)) -#endif - -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 !defined (GDB_TM_FILE) && defined (DEPRECATED_SAVED_PC_AFTER_CALL) -#error "Non multi-arch definition of DEPRECATED_SAVED_PC_AFTER_CALL" -#endif -#if !defined (DEPRECATED_SAVED_PC_AFTER_CALL) -#define DEPRECATED_SAVED_PC_AFTER_CALL(frame) (gdbarch_deprecated_saved_pc_after_call (current_gdbarch, frame)) -#endif - #if defined (FRAME_NUM_ARGS) /* Legacy for systems yet to multi-arch FRAME_NUM_ARGS */ #if !defined (FRAME_NUM_ARGS_P) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index d142b87f5a7..b3d3547e3aa 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -573,7 +573,6 @@ M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame # DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame # frame-base. Enable frame-base before frame-unwind. -F:=:CORE_ADDR:deprecated_saved_pc_after_call:struct frame_info *frame:frame F:=:int:frame_num_args:struct frame_info *frame:frame # # DEPRECATED_STACK_ALIGN has been replaced by an initial aligning call -- 2.30.2