From fbcdb4a3f02bdce305f1abb63c7928d110729061 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Fri, 9 Aug 2002 18:26:15 +0000 Subject: [PATCH] * blockframe.c (frame_saved_regs_register_unwind): Revise PC_IN_CALL_DUMMY assertion to only apply when generic dummy frames are in use. --- gdb/ChangeLog | 6 ++++++ gdb/blockframe.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 659e8b041fd..8b3e8db47a2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2002-08-09 Kevin Buettner + + * blockframe.c (frame_saved_regs_register_unwind): Revise + PC_IN_CALL_DUMMY assertion to only apply when generic dummy + frames are in use. + 2002-08-09 Grace Sainsbury * remote.c: (remote_wait, remote_async_wait): Add check for awatch diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 93a4765e7d5..d255beecc1f 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -1410,7 +1410,11 @@ frame_saved_regs_register_unwind (struct frame_info *frame, void **cache, /* There is always a frame at this point. And THIS is the frame we're interested in. */ gdb_assert (frame != NULL); - gdb_assert (!PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame)); + /* If we're using generic dummy frames, we'd better not be in a call + dummy. (generic_call_dummy_register_unwind ought to have been called + instead.) */ + gdb_assert (!(USE_GENERIC_DUMMY_FRAMES + && PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))); /* Load the saved_regs register cache. */ if (frame->saved_regs == NULL) -- 2.30.2