From: Andrew Cagney Date: Fri, 2 Apr 2004 22:58:57 +0000 (+0000) Subject: 2004-04-02 Andrew Cagney X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08be3abd6026bf04ed7226c2fea9c87e264928fd;p=binutils-gdb.git 2004-04-02 Andrew Cagney * gdbarch.sh (DEPRECATED_INIT_FRAME_PC_FIRST): Delete. * gdbarch.h, gdbarch.c: Re-generate. * frame.c (legacy_get_prev_frame): Delete references to DEPRECATED_INIT_FRAME_PC_FIRST. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b6d211cfc13..0972e99c192 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2004-04-02 Andrew Cagney + * gdbarch.sh (DEPRECATED_INIT_FRAME_PC_FIRST): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * frame.c (legacy_get_prev_frame): Delete references to + DEPRECATED_INIT_FRAME_PC_FIRST. + * infrun.c (pc_in_sigtramp): Delete function. (check_sigtramp2): Inline call to pc_in_sigtramp, use get_frame_type. diff --git a/gdb/frame.c b/gdb/frame.c index 1f45e8e0993..a323e032b63 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1268,7 +1268,7 @@ reinit_frame_cache (void) } /* Create the previous frame using the deprecated methods - INIT_EXTRA_INFO, INIT_FRAME_PC and INIT_FRAME_PC_FIRST. */ + INIT_EXTRA_INFO, and INIT_FRAME_PC. */ static struct frame_info * legacy_get_prev_frame (struct frame_info *this_frame) @@ -1304,8 +1304,7 @@ legacy_get_prev_frame (struct frame_info *this_frame) /* NOTE: cagney/2002-11-18: Should have been correctly setting the frame's type here, before anything else, and not last, at the bottom of this function. The various - DEPRECATED_INIT_EXTRA_FRAME_INFO, DEPRECATED_INIT_FRAME_PC, - DEPRECATED_INIT_FRAME_PC_FIRST and + DEPRECATED_INIT_EXTRA_FRAME_INFO, DEPRECATED_INIT_FRAME_PC, and DEPRECATED_FRAME_INIT_SAVED_REGS methods are full of work-arounds that handle the frame not being correctly set from the start. Unfortunately those same work-arounds rely on the type defaulting @@ -1563,10 +1562,6 @@ legacy_get_prev_frame (struct frame_info *this_frame) machines appear to require DEPRECATED_INIT_EXTRA_FRAME_INFO before they can do DEPRECATED_INIT_FRAME_PC. Phoo. - We shouldn't need DEPRECATED_INIT_FRAME_PC_FIRST to add more - complication to an already overcomplicated part of GDB. - gnu@cygnus.com, 15Sep92. - Assuming that some machines need DEPRECATED_INIT_FRAME_PC after DEPRECATED_INIT_EXTRA_FRAME_INFO, one possible scheme: @@ -1622,11 +1617,6 @@ legacy_get_prev_frame (struct frame_info *this_frame) frame_pc_unwind() and that function does have somewhere to cache that PC value. */ - if (DEPRECATED_INIT_FRAME_PC_FIRST_P ()) - deprecated_update_frame_pc_hack (prev, - DEPRECATED_INIT_FRAME_PC_FIRST (fromleaf, - prev)); - if (DEPRECATED_INIT_EXTRA_FRAME_INFO_P ()) DEPRECATED_INIT_EXTRA_FRAME_INFO (fromleaf, prev); @@ -2322,7 +2312,6 @@ int legacy_frame_p (struct gdbarch *current_gdbarch) { if (DEPRECATED_INIT_FRAME_PC_P () - || DEPRECATED_INIT_FRAME_PC_FIRST_P () || DEPRECATED_INIT_EXTRA_FRAME_INFO_P () || DEPRECATED_FRAME_CHAIN_P ()) /* No question, it's a legacy frame. */ diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index d6246af2a80..19462caf05e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -181,7 +181,6 @@ struct gdbarch gdbarch_cannot_store_register_ftype *cannot_store_register; gdbarch_get_longjmp_target_ftype *get_longjmp_target; gdbarch_deprecated_pc_in_call_dummy_ftype *deprecated_pc_in_call_dummy; - gdbarch_deprecated_init_frame_pc_first_ftype *deprecated_init_frame_pc_first; gdbarch_deprecated_init_frame_pc_ftype *deprecated_init_frame_pc; int believe_pcc_promotion; int believe_pcc_promotion_type; @@ -348,7 +347,6 @@ struct gdbarch startup_gdbarch = 0, /* cannot_store_register */ 0, /* get_longjmp_target */ deprecated_pc_in_call_dummy, /* deprecated_pc_in_call_dummy */ - 0, /* deprecated_init_frame_pc_first */ 0, /* deprecated_init_frame_pc */ 0, /* believe_pcc_promotion */ 0, /* believe_pcc_promotion_type */ @@ -651,7 +649,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of cannot_store_register, invalid_p == 0 */ /* Skip verify of get_longjmp_target, has predicate */ /* Skip verify of deprecated_pc_in_call_dummy, has predicate */ - /* Skip verify of deprecated_init_frame_pc_first, has predicate */ /* Skip verify of deprecated_init_frame_pc, has predicate */ /* Skip verify of deprecated_get_saved_register, has predicate */ /* Skip verify of deprecated_register_convertible, has predicate */ @@ -1268,25 +1265,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_init_frame_pc /*DEPRECATED_INIT_FRAME_PC ()*/); #endif -#ifdef DEPRECATED_INIT_FRAME_PC_FIRST_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_FRAME_PC_FIRST_P()", - XSTRING (DEPRECATED_INIT_FRAME_PC_FIRST_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_INIT_FRAME_PC_FIRST_P() = %d\n", - DEPRECATED_INIT_FRAME_PC_FIRST_P ()); -#endif -#ifdef DEPRECATED_INIT_FRAME_PC_FIRST - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev)", - XSTRING (DEPRECATED_INIT_FRAME_PC_FIRST (fromleaf, prev))); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_INIT_FRAME_PC_FIRST = <0x%08lx>\n", - (long) current_gdbarch->deprecated_init_frame_pc_first - /*DEPRECATED_INIT_FRAME_PC_FIRST ()*/); -#endif #ifdef DEPRECATED_MAX_REGISTER_RAW_SIZE_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -3797,30 +3775,6 @@ set_gdbarch_deprecated_pc_in_call_dummy (struct gdbarch *gdbarch, gdbarch->deprecated_pc_in_call_dummy = deprecated_pc_in_call_dummy; } -int -gdbarch_deprecated_init_frame_pc_first_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_init_frame_pc_first != NULL; -} - -CORE_ADDR -gdbarch_deprecated_init_frame_pc_first (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_init_frame_pc_first != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_init_frame_pc_first called\n"); - return gdbarch->deprecated_init_frame_pc_first (fromleaf, prev); -} - -void -set_gdbarch_deprecated_init_frame_pc_first (struct gdbarch *gdbarch, - gdbarch_deprecated_init_frame_pc_first_ftype deprecated_init_frame_pc_first) -{ - gdbarch->deprecated_init_frame_pc_first = deprecated_init_frame_pc_first; -} - int gdbarch_deprecated_init_frame_pc_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 8585b701a4a..86c118d7449 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1114,31 +1114,6 @@ extern void set_gdbarch_deprecated_pc_in_call_dummy (struct gdbarch *gdbarch, gd #define DEPRECATED_PC_IN_CALL_DUMMY(pc, sp, frame_address) (gdbarch_deprecated_pc_in_call_dummy (current_gdbarch, pc, sp, frame_address)) #endif -#if defined (DEPRECATED_INIT_FRAME_PC_FIRST) -/* Legacy for systems yet to multi-arch DEPRECATED_INIT_FRAME_PC_FIRST */ -#if !defined (DEPRECATED_INIT_FRAME_PC_FIRST_P) -#define DEPRECATED_INIT_FRAME_PC_FIRST_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_init_frame_pc_first_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_FRAME_PC_FIRST_P) -#error "Non multi-arch definition of DEPRECATED_INIT_FRAME_PC_FIRST" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_INIT_FRAME_PC_FIRST_P) -#define DEPRECATED_INIT_FRAME_PC_FIRST_P() (gdbarch_deprecated_init_frame_pc_first_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_init_frame_pc_first_ftype) (int fromleaf, struct frame_info *prev); -extern CORE_ADDR gdbarch_deprecated_init_frame_pc_first (struct gdbarch *gdbarch, int fromleaf, struct frame_info *prev); -extern void set_gdbarch_deprecated_init_frame_pc_first (struct gdbarch *gdbarch, gdbarch_deprecated_init_frame_pc_first_ftype *deprecated_init_frame_pc_first); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_INIT_FRAME_PC_FIRST) -#error "Non multi-arch definition of DEPRECATED_INIT_FRAME_PC_FIRST" -#endif -#if !defined (DEPRECATED_INIT_FRAME_PC_FIRST) -#define DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev) (gdbarch_deprecated_init_frame_pc_first (current_gdbarch, fromleaf, prev)) -#endif - #if defined (DEPRECATED_INIT_FRAME_PC) /* Legacy for systems yet to multi-arch DEPRECATED_INIT_FRAME_PC */ #if !defined (DEPRECATED_INIT_FRAME_PC_P) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 7292a0bb0c5..b3100b3649f 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -563,7 +563,6 @@ F:2:GET_LONGJMP_TARGET:int:get_longjmp_target:CORE_ADDR *pc:pc # migration process - old code, calling DEPRECATED_PC_IN_CALL_DUMMY(), # doesn't need to be modified. F::DEPRECATED_PC_IN_CALL_DUMMY:int:deprecated_pc_in_call_dummy:CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address:pc, sp, frame_address::deprecated_pc_in_call_dummy:deprecated_pc_in_call_dummy -F:2:DEPRECATED_INIT_FRAME_PC_FIRST:CORE_ADDR:deprecated_init_frame_pc_first:int fromleaf, struct frame_info *prev:fromleaf, prev F:2:DEPRECATED_INIT_FRAME_PC:CORE_ADDR:deprecated_init_frame_pc:int fromleaf, struct frame_info *prev:fromleaf, prev # v:2:BELIEVE_PCC_PROMOTION:int:believe_pcc_promotion:::::::