diff options
| author | Andrew Cagney <cagney@redhat.com> | 2004-03-22 15:36:47 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2004-03-22 15:36:47 +0000 |
| commit | f0f7a9c6bd3d7bf8904350809e9094c8481e970f (patch) | |
| tree | d0bd20f63571589879eb30d0a7652372c3b6c2ce /gdb/dummy-frame.c | |
| parent | 1c63f1fa76e5eef19914163c730e9bdc6f7e0b83 (diff) | |
| download | gdb-f0f7a9c6bd3d7bf8904350809e9094c8481e970f.tar.gz | |
2004-03-22 Andrew Cagney <cagney@redhat.com>
* frame.h (deprecated_pc_in_call_dummy): Rename
generic_pc_in_call_dummy.
* dummy-frame.h (pc_in_dummy_frame): Delete declaration.
* dummy-frame.c (deprecated_pc_in_call_dummy): Rename
generic_pc_in_call_dummy.
(pc_in_dummy_frame): Make static.
* gdbarch.sh (DEPRECATED_PC_IN_CALL_DUMMY): Update.
* gdbarch.h, gdbarch.c: Re-generate.
* dummy-frame.c (dummy_frame_sniffer): Simplify.
* frame.c (frame_type_from_pc): Call deprecated_pc_in_call_dummy.
(legacy_get_prev_frame): Ditto.
* inferior.h: Delete reference to generic_pc_in_call_dummy in
comment.
Diffstat (limited to 'gdb/dummy-frame.c')
| -rw-r--r-- | gdb/dummy-frame.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c index 3b10c51640b..66918b6d219 100644 --- a/gdb/dummy-frame.c +++ b/gdb/dummy-frame.c @@ -36,6 +36,8 @@ static void dummy_frame_this_id (struct frame_info *next_frame, void **this_prologue_cache, struct frame_id *this_id); +static int pc_in_dummy_frame (CORE_ADDR pc); + /* Dummy frame. This saves the processor state just prior to setting up the inferior function call. Older targets save the registers on the target stack (but that really slows down function calls). */ @@ -137,7 +139,7 @@ deprecated_generic_find_dummy_frame (CORE_ADDR pc, CORE_ADDR fp) subtracted out. */ int -generic_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR fp) +deprecated_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR fp) { return pc_in_dummy_frame (pc); } @@ -155,7 +157,7 @@ generic_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR fp) !DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET_P yet generic dummy targets set DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET. True?). */ -int +static int pc_in_dummy_frame (CORE_ADDR pc) { struct dummy_frame *dummyframe; @@ -411,9 +413,8 @@ const struct frame_unwind * dummy_frame_sniffer (struct frame_info *next_frame) { CORE_ADDR pc = frame_pc_unwind (next_frame); - if (DEPRECATED_PC_IN_CALL_DUMMY_P () - ? DEPRECATED_PC_IN_CALL_DUMMY (pc, 0, 0) - : pc_in_dummy_frame (pc)) + gdb_assert (DEPRECATED_USE_GENERIC_DUMMY_FRAMES); + if (pc_in_dummy_frame (pc)) return &dummy_frame_unwind; else return NULL; |