From 1ad2aeb7df53379a89ef0074d6ca57a608c03a93 Mon Sep 17 00:00:00 2001 From: drow Date: Thu, 11 Jan 2007 17:18:21 +0000 Subject: [PATCH] * frame.c (get_prev_frame_1): Check PC_REGNUM before using it. --- gdb/ChangeLog | 4 ++++ gdb/frame.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bda8146da4..bc417c18a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2007-01-11 Daniel Jacobowitz + + * frame.c (get_prev_frame_1): Check PC_REGNUM before using it. + 2007-01-10 Jim Blandy * MAINTAINERS (Global Maintainers): Ulrich Weigand has accepted diff --git a/gdb/frame.c b/gdb/frame.c index 8d393050c6..93258d7720 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1221,10 +1221,17 @@ get_prev_frame_1 (struct frame_info *this_frame) have different frame IDs, the new frame will be bogus; two functions can't share a register save slot for the PC. This can happen when the prologue analyzer finds a stack adjustment, but - no PC save. This check does assume that the "PC register" is - roughly a traditional PC, even if the gdbarch_unwind_pc method - frobs it. */ + no PC save. + + This check does assume that the "PC register" is roughly a + traditional PC, even if the gdbarch_unwind_pc method adjusts + it (we do not rely on the value, only on the unwound PC being + dependent on this value). A potential improvement would be + to have the frame prev_pc method and the gdbarch unwind_pc + method set the same lval and location information as + frame_register_unwind. */ if (this_frame->level > 0 + && PC_REGNUM >= 0 && get_frame_type (this_frame) == NORMAL_FRAME && get_frame_type (this_frame->next) == NORMAL_FRAME) { -- 2.11.0