FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dwarf2-frame.c (struct dwarf2_cie): Add signal_frame field.

Browse source 
(dwarf2_frame_sniffer): Use it.
(decode_frame_entry_1): Set it according to augmentation "S".
This commit is contained in:
Alexandre Oliva 2006-05-28 05:56:20 +00:00
parent f8fdc85041
commit 56c987f606
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-28 Alexandre Oliva <aoliva@redhat.com>
* dwarf2-frame.c (struct dwarf2_cie): Add signal_frame field.
(dwarf2_frame_sniffer): Use it.
(decode_frame_entry_1): Set it according to augmentation "S".
2006-05-27 Joel Brobecker <brobecker@adacore.com> 2006-05-27 Joel Brobecker <brobecker@adacore.com>
From Peter Schauer <peterschauer@gmx.net> From Peter Schauer <peterschauer@gmx.net>

24
gdb/dwarf2-frame.c
View file

@ -70,6 +70,9 @@ struct dwarf2_cie
/* True if a 'z' augmentation existed. */ /* True if a 'z' augmentation existed. */
unsigned char saw_z_augmentation; unsigned char saw_z_augmentation;
/* True if an 'S' augmentation existed. */
unsigned char signal_frame;
struct dwarf2_cie *next; struct dwarf2_cie *next;
}; };
@ -1053,14 +1056,16 @@ dwarf2_frame_sniffer (struct frame_info *next_frame)
function. frame_pc_unwind(), for a no-return next function, can function. frame_pc_unwind(), for a no-return next function, can
end up returning something past the end of this function's body. */ end up returning something past the end of this function's body. */
CORE_ADDR block_addr = frame_unwind_address_in_block (next_frame); CORE_ADDR block_addr = frame_unwind_address_in_block (next_frame);
if (!dwarf2_frame_find_fde (&block_addr)) struct dwarf2_fde *fde = dwarf2_frame_find_fde (&block_addr);
if (!fde)
return NULL; return NULL;
/* On some targets, signal trampolines may have unwind information. /* On some targets, signal trampolines may have unwind information.
We need to recognize them so that we set the frame type We need to recognize them so that we set the frame type
correctly. */ correctly. */
if (dwarf2_frame_signal_frame_p (get_frame_arch (next_frame), if (fde->cie->signal_frame
|| dwarf2_frame_signal_frame_p (get_frame_arch (next_frame),
next_frame)) next_frame))
return &dwarf2_signal_frame_unwind; return &dwarf2_signal_frame_unwind;
@ -1521,6 +1526,10 @@ decode_frame_entry_1 (struct comp_unit *unit, gdb_byte *start, int eh_frame_p)
depends on the target address size. */ depends on the target address size. */
cie->encoding = DW_EH_PE_absptr; cie->encoding = DW_EH_PE_absptr;
/* We'll determine the final value later, but we need to
initialize it conservatively. */
cie->signal_frame = 0;
/* Check version number. */ /* Check version number. */
cie_version = read_1_byte (unit->abfd, buf); cie_version = read_1_byte (unit->abfd, buf);
if (cie_version != 1 && cie_version != 3) if (cie_version != 1 && cie_version != 3)
@ -1604,6 +1613,17 @@ decode_frame_entry_1 (struct comp_unit *unit, gdb_byte *start, int eh_frame_p)
augmentation++; augmentation++;
} }
/* "S" indicates a signal frame, such that the return
address must not be decremented to locate the call frame
info for the previous frame; it might even be the first
instruction of a function, so decrementing it would take
us to a different function. */
else if (*augmentation == 'S')
{
cie->signal_frame = 1;
augmentation++;
}
/* Otherwise we have an unknown augmentation. /* Otherwise we have an unknown augmentation.
Bail out unless we saw a 'z' prefix. */ Bail out unless we saw a 'z' prefix. */
else else