[Libunwind-devel] [PATCH 5/7] Add ip argument to _UPTi_find_unwind_table

[Anderson Lizardo]

This new argument is necessary so that it can be passed to
dwarf_find_debug_frame() on the ARM implementation of this function.

Signed-off-by: Anderson Lizardo <address@hidden>
Signed-off-by: Bruna Moreira <address@hidden>
---
 src/ptrace/_UPT_find_proc_info.c |    8 +++++---
 src/ptrace/_UPT_internal.h       |    3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

Index: libunwind-indt-split/src/ptrace/_UPT_find_proc_info.c
===================================================================
--- libunwind-indt-split.orig/src/ptrace/_UPT_find_proc_info.c
+++ libunwind-indt-split/src/ptrace/_UPT_find_proc_info.c
@@ -97,7 +97,8 @@
 
 HIDDEN unw_dyn_info_t *
 _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_Ehdr *ehdr;
@@ -165,7 +166,8 @@
 
 HIDDEN unw_dyn_info_t *
 _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;
   unw_word_t addr, eh_frame_start, fde_count, load_base;
@@ -344,7 +346,7 @@
 
   /* Here, SEGBASE is the starting-address of the (mmap'ped) segment
      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
       /* This can happen in corner cases where dynamically generated
          code falls into the same page that contains the data-segment
Index: libunwind-indt-split/src/ptrace/_UPT_internal.h
===================================================================
--- libunwind-indt-split.orig/src/ptrace/_UPT_internal.h
+++ libunwind-indt-split/src/ptrace/_UPT_internal.h
@@ -52,6 +52,7 @@
                                                unw_addr_space_t as,
                                                char *path,
                                                unw_word_t segbase,
-                                               unw_word_t mapoff);
+                                               unw_word_t mapoff,
+                                               unw_word_t ip);
 
 #endif /* _UPT_internal_h */

-- 
Anderson Lizardo
Instituto Nokia de Tecnologia (INdT)
Manaus - Brazil