diff options
| author | Kevin Buettner <kevinb@redhat.com> | 2002-08-09 18:26:15 +0000 |
|---|---|---|
| committer | Kevin Buettner <kevinb@redhat.com> | 2002-08-09 18:26:15 +0000 |
| commit | fbcdb4a3f02bdce305f1abb63c7928d110729061 (patch) | |
| tree | efa8897fa7a78d4a92c1e3001d71323a3c79433f /gdb | |
| parent | 3c3bea1c7eb9586fd6d80885c8a972e10401f3f1 (diff) | |
| download | gdb-fbcdb4a3f02bdce305f1abb63c7928d110729061.zip gdb-fbcdb4a3f02bdce305f1abb63c7928d110729061.tar.gz gdb-fbcdb4a3f02bdce305f1abb63c7928d110729061.tar.bz2 | |
* blockframe.c (frame_saved_regs_register_unwind): Revise
PC_IN_CALL_DUMMY assertion to only apply when generic dummy
frames are in use.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/blockframe.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 659e8b0..8b3e8db 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2002-08-09 Kevin Buettner <kevinb@redhat.com> + + * 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 <graces@redhat.com> * remote.c: (remote_wait, remote_async_wait): Add check for awatch diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 93a4765..d255bee 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) |