From 0228dfb97d58a54af8758840101975bf92903133 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 8 Apr 2005 12:10:21 +0000 Subject: [PATCH] * dwarf2-frame.c (struct dwarf2_frame_cache): New field undefined_retaddr. (dwarf2_frame_cache): Initialize undefined_retaddr. (dwarf2_frame_this_id): Return an invalid frame ID if undefined_retaddr. --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2-frame.c | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 30abadcff1..af02d972f2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2005-04-08 Daniel Jacobowitz + + * dwarf2-frame.c (struct dwarf2_frame_cache): New field + undefined_retaddr. + (dwarf2_frame_cache): Initialize undefined_retaddr. + (dwarf2_frame_this_id): Return an invalid frame ID if + undefined_retaddr. + 2005-04-05 Jim Blandy Move construction of IA-32 vector types to i386-tdep.c. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 1ac18598e6..22b8ae6f2f 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -610,6 +610,9 @@ struct dwarf2_frame_cache /* DWARF Call Frame Address. */ CORE_ADDR cfa; + /* Set if the return address column was marked as undefined. */ + int undefined_retaddr; + /* Saved registers, indexed by GDB register number, not by DWARF register number. */ struct dwarf2_frame_state_reg *reg; @@ -791,6 +794,10 @@ incomplete CFI data; unspecified registers (e.g., %s) at 0x%s"), } } + if (fs->retaddr_column < fs->regs.num_regs + && fs->regs.reg[fs->retaddr_column].how == DWARF2_FRAME_REG_UNDEFINED) + cache->undefined_retaddr = 1; + do_cleanups (old_chain); *this_cache = cache; @@ -804,6 +811,9 @@ dwarf2_frame_this_id (struct frame_info *next_frame, void **this_cache, struct dwarf2_frame_cache *cache = dwarf2_frame_cache (next_frame, this_cache); + if (cache->undefined_retaddr) + return; + (*this_id) = frame_id_build (cache->cfa, frame_func_unwind (next_frame)); } -- 2.34.1