m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-17 13:47:37 +01:00
Code Issues Releases Activity

Add ip argument to _UPTi_find_unwind_table.

Browse source 
Signed-off-by: Andris Zeila <andris.zeila@accenture.com>
This commit is contained in:
Arun Sharma 2010-05-15 12:15:49 -07:00
parent 1787a2fd28
commit 8ee7b1762e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ptrace/_UPT_find_proc_info.c
View file

@ -97,7 +97,8 @@ find_gp (struct UPT_info *ui, Elf64_Phdr *pdyn, Elf64_Addr load_base)
HIDDEN unw_dyn_info_t * HIDDEN unw_dyn_info_t *
_UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as, _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
char *path, unw_word_t segbase, unw_word_t mapoff) char *path, unw_word_t segbase, unw_word_t mapoff,
unw_word_t ip)
{ {
Elf64_Phdr *phdr, *ptxt = NULL, *punw = NULL, *pdyn = NULL; Elf64_Phdr *phdr, *ptxt = NULL, *punw = NULL, *pdyn = NULL;
Elf64_Ehdr *ehdr; Elf64_Ehdr *ehdr;
@ -165,7 +166,8 @@ dwarf_read_encoded_pointer (unw_addr_space_t as, unw_accessors_t *a,
HIDDEN unw_dyn_info_t * HIDDEN unw_dyn_info_t *
_UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as, _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
char *path, unw_word_t segbase, unw_word_t mapoff) char *path, unw_word_t segbase, unw_word_t mapoff,
unw_word_t ip)
{ {
Elf_W(Phdr) *phdr, *ptxt = NULL, *peh_hdr = NULL, *pdyn = NULL; Elf_W(Phdr) *phdr, *ptxt = NULL, *peh_hdr = NULL, *pdyn = NULL;
unw_word_t addr, eh_frame_start, fde_count, load_base; unw_word_t addr, eh_frame_start, fde_count, load_base;
@ -348,7 +350,7 @@ get_unwind_info (struct UPT_info *ui, unw_addr_space_t as, unw_word_t ip)
/* Here, SEGBASE is the starting-address of the (mmap'ped) segment /* Here, SEGBASE is the starting-address of the (mmap'ped) segment
which covers the IP we're looking for. */ which covers the IP we're looking for. */
di = _UPTi_find_unwind_table (ui, as, path, segbase, mapoff); di = _UPTi_find_unwind_table (ui, as, path, segbase, mapoff, ip);
if (!di if (!di
/* This can happen in corner cases where dynamically generated /* This can happen in corner cases where dynamically generated
code falls into the same page that contains the data-segment code falls into the same page that contains the data-segment

3
src/ptrace/_UPT_internal.h
View file

@ -62,6 +62,7 @@ extern unw_dyn_info_t *_UPTi_find_unwind_table (struct UPT_info *ui,
unw_addr_space_t as, unw_addr_space_t as,
char *path, char *path,
unw_word_t segbase, unw_word_t segbase,
unw_word_t mapoff); unw_word_t mapoff,
unw_word_t ip);
#endif /* _UPT_internal_h */ #endif /* _UPT_internal_h */