/* Frame unwinder for frames using the libunwind library.
- Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
Written by Jeff Johnston, contributed by Red Hat Inc.
static int (*unw_step_p) (unw_cursor_t *);
static int (*unw_init_remote_p) (unw_cursor_t *, unw_addr_space_t, void *);
static unw_addr_space_t (*unw_create_addr_space_p) (unw_accessors_t *, int);
+static void (*unw_destroy_addr_space_p) (unw_addr_space_t);
static int (*unw_search_unwind_table_p) (unw_addr_space_t, unw_word_t, unw_dyn_info_t *,
unw_proc_info_t *, int, void *);
static unw_word_t (*unw_find_dyn_list_p) (unw_addr_space_t, unw_dyn_info_t *,
CORE_ADDR base;
CORE_ADDR func_addr;
unw_cursor_t cursor;
+ unw_addr_space_t as;
};
/* We need to qualify the function names with a platform-specific prefix to match
#define STRINGIFY(name) STRINGIFY2(name)
#ifndef LIBUNWIND_SO
-#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so"
+/* Use the stable ABI major version number. `libunwind-ia64.so' is a link time
+ only library, not a runtime one. */
+#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so.7"
#endif
static char *get_reg_name = STRINGIFY(UNW_OBJ(get_reg));
static char *step_name = STRINGIFY(UNW_OBJ(step));
static char *init_remote_name = STRINGIFY(UNW_OBJ(init_remote));
static char *create_addr_space_name = STRINGIFY(UNW_OBJ(create_addr_space));
+static char *destroy_addr_space_name = STRINGIFY(UNW_OBJ(destroy_addr_space));
static char *search_unwind_table_name = STRINGIFY(UNW_OBJ(search_unwind_table));
static char *find_dyn_list_name = STRINGIFY(UNW_OBJ(find_dyn_list));
/* Allocate a new cache. */
cache = FRAME_OBSTACK_ZALLOC (struct libunwind_frame_cache);
- cache->func_addr = frame_func_unwind (next_frame);
+ /* We can assume we are unwinding a normal frame. Even if this is
+ for a signal trampoline, ia64 signal "trampolines" use a normal
+ subroutine call to start the signal handler. */
+ cache->func_addr = frame_func_unwind (next_frame, NORMAL_FRAME);
if (cache->func_addr == 0
&& frame_relative_level (next_frame) > 0
&& get_frame_type (next_frame) != SIGTRAMP_FRAME)
descr = libunwind_descr (get_frame_arch (next_frame));
acc = descr->accessors;
as = unw_create_addr_space_p (acc,
- TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
+ gdbarch_byte_order (current_gdbarch)
+ == BFD_ENDIAN_BIG
? __BIG_ENDIAN
: __LITTLE_ENDIAN);
unw_init_remote_p (&cache->cursor, as, next_frame);
if (unw_step_p (&cache->cursor) < 0)
- return NULL;
+ {
+ unw_destroy_addr_space_p (as);
+ return NULL;
+ }
/* To get base address, get sp from previous frame. */
uw_sp_regnum = descr->gdb2uw (SP_REGNUM);
ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp);
if (ret < 0)
- error (_("Can't get libunwind sp register."));
+ {
+ unw_destroy_addr_space_p (as);
+ error (_("Can't get libunwind sp register."));
+ }
cache->base = (CORE_ADDR)fp;
+ cache->as = as;
*this_cache = cache;
return cache;
}
+void
+libunwind_frame_dealloc_cache (struct frame_info *self, void *this_cache)
+{
+ struct libunwind_frame_cache *cache = this_cache;
+ if (cache->as)
+ unw_destroy_addr_space_p (cache->as);
+}
+
unw_word_t
libunwind_find_dyn_list (unw_addr_space_t as, unw_dyn_info_t *di, void *arg)
{
{
NORMAL_FRAME,
libunwind_frame_this_id,
- libunwind_frame_prev_register
+ libunwind_frame_prev_register,
+ NULL,
+ NULL,
+ NULL,
+ libunwind_frame_dealloc_cache
};
/* Verify if there is sufficient libunwind information for the frame to use
descr = libunwind_descr (get_frame_arch (next_frame));
acc = descr->accessors;
as = unw_create_addr_space_p (acc,
- TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
+ gdbarch_byte_order (current_gdbarch)
+ == BFD_ENDIAN_BIG
? __BIG_ENDIAN
: __LITTLE_ENDIAN);
ret = unw_init_remote_p (&cursor, as, next_frame);
if (ret < 0)
- return NULL;
+ {
+ unw_destroy_addr_space_p (as);
+ return NULL;
+ }
/* Check to see if we have libunwind info by checking if we are in a
signal frame. If it doesn't return an error, we have libunwind info
and can use libunwind. */
ret = unw_is_signal_frame_p (&cursor);
+ unw_destroy_addr_space_p (as);
if (ret < 0)
return NULL;
descr = libunwind_descr (get_frame_arch (next_frame));
acc = descr->accessors;
as = unw_create_addr_space_p (acc,
- TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
+ gdbarch_byte_order (current_gdbarch)
+ == BFD_ENDIAN_BIG
? __BIG_ENDIAN
: __LITTLE_ENDIAN);
ret = unw_init_remote_p (&cursor, as, next_frame);
if (ret < 0)
- return NULL;
+ {
+ unw_destroy_addr_space_p (as);
+ return NULL;
+ }
/* Check to see if we are in a signal frame. */
ret = unw_is_signal_frame_p (&cursor);
+ unw_destroy_addr_space_p (as);
if (ret > 0)
return &libunwind_frame_unwind;
are usually located at BOF, this is not always true and only the libunwind
info can decipher where they actually are. */
int
-libunwind_get_reg_special (struct gdbarch *gdbarch, int regnum, void *buf)
+libunwind_get_reg_special (struct gdbarch *gdbarch, struct regcache *regcache,
+ int regnum, void *buf)
{
unw_cursor_t cursor;
unw_accessors_t *acc;
descr = libunwind_descr (gdbarch);
acc = descr->special_accessors;
as = unw_create_addr_space_p (acc,
- TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
+ gdbarch_byte_order (current_gdbarch)
+ == BFD_ENDIAN_BIG
? __BIG_ENDIAN
: __LITTLE_ENDIAN);
- ret = unw_init_remote_p (&cursor, as, NULL);
+ ret = unw_init_remote_p (&cursor, as, regcache);
if (ret < 0)
- return -1;
+ {
+ unw_destroy_addr_space_p (as);
+ return -1;
+ }
uw_regnum = descr->gdb2uw (regnum);
ptr = &intval;
}
+ unw_destroy_addr_space_p (as);
+
if (ret < 0)
return -1;
if (unw_create_addr_space_p == NULL)
return 0;
+ unw_destroy_addr_space_p = dlsym (handle, destroy_addr_space_name);
+ if (unw_destroy_addr_space_p == NULL)
+ return 0;
+
unw_search_unwind_table_p = dlsym (handle, search_unwind_table_name);
if (unw_search_unwind_table_p == NULL)
return 0;