2004-06-07 Randolph Chung <tausq@debian.org>

[deliverable/binutils-gdb.git] / gdb / dwarf2-frame.c

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 13c836e7dc405b8e8674b8c4a6f9275962a41f47..fccb94d3e33eca562d012fa93d8906647d32d65a 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -372,11 +372,17 @@ execute_cfa_program (unsigned char *insn_ptr, unsigned char *insn_end,
              {
                struct dwarf2_frame_state_reg_info *old_rs = fs->regs.prev;
 
-               gdb_assert (old_rs);
-
-               xfree (fs->regs.reg);
-               fs->regs = *old_rs;
-               xfree (old_rs);
+               if (old_rs == NULL)
+                 {
+                   complaint (&symfile_complaints, "\
+bad CFI data; mismatched DW_CFA_restore_state at 0x%s", paddr (fs->pc));
+                 }
+               else
+                 {
+                   xfree (fs->regs.reg);
+                   fs->regs = *old_rs;
+                   xfree (old_rs);
+                 }
              }
              break;
 
@@ -1082,6 +1088,14 @@ read_encoded_value (struct comp_unit *unit, unsigned char encoding,
     case DW_EH_PE_textrel:
       base = unit->tbase;
       break;
+    case DW_EH_PE_funcrel:
+      /* FIXME: kettenis/20040501: For now just pretend
+         DW_EH_PE_funcrel is equivalent to DW_EH_PE_absptr.  For
+         reading the initial location of an FDE it should be treated
+         as such, and currently that's the only place where this code
+         is used.  */
+      base = 0;
+      break;
     case DW_EH_PE_aligned:
       base = 0;
       offset = buf - unit->dwarf_frame_buffer;