darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* arm-linux-tdep.c, arm-tdep.c, armobsd-tdep.c: Update for

Browse source 
unwinder changes.
This commit is contained in:
Daniel Jacobowitz 2008-04-30 21:23:45 +00:00
parent 1045891474
commit a262aec23e
4 changed files with 76 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-30 Daniel Jacobowitz <dan@codesourcery.com>
* arm-linux-tdep.c, arm-tdep.c, armobsd-tdep.c: Update for
unwinder changes.
2008-04-30 Daniel Jacobowitz <dan@codesourcery.com> 2008-04-30 Daniel Jacobowitz <dan@codesourcery.com>
Update i386 and amd64 ports for unwinder changes. Update i386 and amd64 ports for unwinder changes.

20
gdb/arm-linux-tdep.c
View file

@ -212,11 +212,11 @@ static const char arm_linux_thumb_le_breakpoint[] = {0x01, 0xde};
#define ARM_EABI_SYSCALL 0xef000000 #define ARM_EABI_SYSCALL 0xef000000
static void static void
arm_linux_sigtramp_cache (struct frame_info *next_frame, arm_linux_sigtramp_cache (struct frame_info *this_frame,
struct trad_frame_cache *this_cache, struct trad_frame_cache *this_cache,
CORE_ADDR func, int regs_offset) CORE_ADDR func, int regs_offset)
{ {
CORE_ADDR sp = frame_unwind_register_unsigned (next_frame, ARM_SP_REGNUM); CORE_ADDR sp = get_frame_register_unsigned (this_frame, ARM_SP_REGNUM);
CORE_ADDR base = sp + regs_offset; CORE_ADDR base = sp + regs_offset;
int i; int i;
@ -279,38 +279,38 @@ arm_linux_sigtramp_cache (struct frame_info *next_frame,
static void static void
arm_linux_sigreturn_init (const struct tramp_frame *self, arm_linux_sigreturn_init (const struct tramp_frame *self,
struct frame_info *next_frame, struct frame_info *this_frame,
struct trad_frame_cache *this_cache, struct trad_frame_cache *this_cache,
CORE_ADDR func) CORE_ADDR func)
{ {
CORE_ADDR sp = frame_unwind_register_unsigned (next_frame, ARM_SP_REGNUM); CORE_ADDR sp = get_frame_register_unsigned (this_frame, ARM_SP_REGNUM);
ULONGEST uc_flags = read_memory_unsigned_integer (sp, 4); ULONGEST uc_flags = read_memory_unsigned_integer (sp, 4);
if (uc_flags == ARM_NEW_SIGFRAME_MAGIC) if (uc_flags == ARM_NEW_SIGFRAME_MAGIC)
arm_linux_sigtramp_cache (next_frame, this_cache, func, arm_linux_sigtramp_cache (this_frame, this_cache, func,
ARM_UCONTEXT_SIGCONTEXT ARM_UCONTEXT_SIGCONTEXT
+ ARM_SIGCONTEXT_R0); + ARM_SIGCONTEXT_R0);
else else
arm_linux_sigtramp_cache (next_frame, this_cache, func, arm_linux_sigtramp_cache (this_frame, this_cache, func,
ARM_SIGCONTEXT_R0); ARM_SIGCONTEXT_R0);
} }
static void static void
arm_linux_rt_sigreturn_init (const struct tramp_frame *self, arm_linux_rt_sigreturn_init (const struct tramp_frame *self,
struct frame_info *next_frame, struct frame_info *this_frame,
struct trad_frame_cache *this_cache, struct trad_frame_cache *this_cache,
CORE_ADDR func) CORE_ADDR func)
{ {
CORE_ADDR sp = frame_unwind_register_unsigned (next_frame, ARM_SP_REGNUM); CORE_ADDR sp = get_frame_register_unsigned (this_frame, ARM_SP_REGNUM);
ULONGEST pinfo = read_memory_unsigned_integer (sp, 4); ULONGEST pinfo = read_memory_unsigned_integer (sp, 4);
if (pinfo == sp + ARM_OLD_RT_SIGFRAME_SIGINFO) if (pinfo == sp + ARM_OLD_RT_SIGFRAME_SIGINFO)
arm_linux_sigtramp_cache (next_frame, this_cache, func, arm_linux_sigtramp_cache (this_frame, this_cache, func,
ARM_OLD_RT_SIGFRAME_UCONTEXT ARM_OLD_RT_SIGFRAME_UCONTEXT
+ ARM_UCONTEXT_SIGCONTEXT + ARM_UCONTEXT_SIGCONTEXT
+ ARM_SIGCONTEXT_R0); + ARM_SIGCONTEXT_R0);
else else
arm_linux_sigtramp_cache (next_frame, this_cache, func, arm_linux_sigtramp_cache (this_frame, this_cache, func,
ARM_NEW_RT_SIGFRAME_UCONTEXT ARM_NEW_RT_SIGFRAME_UCONTEXT
+ ARM_UCONTEXT_SIGCONTEXT + ARM_UCONTEXT_SIGCONTEXT
+ ARM_SIGCONTEXT_R0); + ARM_SIGCONTEXT_R0);

129
gdb/arm-tdep.c
View file

@ -637,13 +637,13 @@ thumb_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR prev_pc,
*/ */
static void static void
arm_scan_prologue (struct frame_info *next_frame, arm_scan_prologue (struct frame_info *this_frame,
struct arm_prologue_cache *cache) struct arm_prologue_cache *cache)
{ {
struct gdbarch *gdbarch = get_frame_arch (next_frame); struct gdbarch *gdbarch = get_frame_arch (this_frame);
int regno; int regno;
CORE_ADDR prologue_start, prologue_end, current_pc; CORE_ADDR prologue_start, prologue_end, current_pc;
CORE_ADDR prev_pc = frame_pc_unwind (next_frame); CORE_ADDR prev_pc = get_frame_pc (this_frame);
pv_t regs[ARM_FPS_REGNUM]; pv_t regs[ARM_FPS_REGNUM];
struct pv_area *stack; struct pv_area *stack;
struct cleanup *back_to; struct cleanup *back_to;
@ -711,7 +711,7 @@ arm_scan_prologue (struct frame_info *next_frame,
CORE_ADDR frame_loc; CORE_ADDR frame_loc;
LONGEST return_value; LONGEST return_value;
frame_loc = frame_unwind_register_unsigned (next_frame, ARM_FP_REGNUM); frame_loc = get_frame_register_unsigned (this_frame, ARM_FP_REGNUM);
if (!safe_read_memory_integer (frame_loc, 4, &return_value)) if (!safe_read_memory_integer (frame_loc, 4, &return_value))
return; return;
else else
@ -916,18 +916,18 @@ arm_scan_prologue (struct frame_info *next_frame,
} }
static struct arm_prologue_cache * static struct arm_prologue_cache *
arm_make_prologue_cache (struct frame_info *next_frame) arm_make_prologue_cache (struct frame_info *this_frame)
{ {
int reg; int reg;
struct arm_prologue_cache *cache; struct arm_prologue_cache *cache;
CORE_ADDR unwound_fp; CORE_ADDR unwound_fp;
cache = FRAME_OBSTACK_ZALLOC (struct arm_prologue_cache); cache = FRAME_OBSTACK_ZALLOC (struct arm_prologue_cache);
cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
arm_scan_prologue (next_frame, cache); arm_scan_prologue (this_frame, cache);
unwound_fp = frame_unwind_register_unsigned (next_frame, cache->framereg); unwound_fp = get_frame_register_unsigned (this_frame, cache->framereg);
if (unwound_fp == 0) if (unwound_fp == 0)
return cache; return cache;
@ -935,7 +935,7 @@ arm_make_prologue_cache (struct frame_info *next_frame)
/* Calculate actual addresses of saved registers using offsets /* Calculate actual addresses of saved registers using offsets
determined by arm_scan_prologue. */ determined by arm_scan_prologue. */
for (reg = 0; reg < gdbarch_num_regs (get_frame_arch (next_frame)); reg++) for (reg = 0; reg < gdbarch_num_regs (get_frame_arch (this_frame)); reg++)
if (trad_frame_addr_p (cache->saved_regs, reg)) if (trad_frame_addr_p (cache->saved_regs, reg))
cache->saved_regs[reg].addr += cache->prev_sp; cache->saved_regs[reg].addr += cache->prev_sp;
@ -946,7 +946,7 @@ arm_make_prologue_cache (struct frame_info *next_frame)
and the caller's SP when we were called. */ and the caller's SP when we were called. */
static void static void
arm_prologue_this_id (struct frame_info *next_frame, arm_prologue_this_id (struct frame_info *this_frame,
void **this_cache, void **this_cache,
struct frame_id *this_id) struct frame_id *this_id)
{ {
@ -955,14 +955,14 @@ arm_prologue_this_id (struct frame_info *next_frame,
CORE_ADDR func; CORE_ADDR func;
if (*this_cache == NULL) if (*this_cache == NULL)
*this_cache = arm_make_prologue_cache (next_frame); *this_cache = arm_make_prologue_cache (this_frame);
cache = *this_cache; cache = *this_cache;
func = frame_func_unwind (next_frame, NORMAL_FRAME); func = get_frame_func (this_frame);
/* This is meant to halt the backtrace at "_start". Make sure we /* This is meant to halt the backtrace at "_start". Make sure we
don't halt it at a generic dummy frame. */ don't halt it at a generic dummy frame. */
if (func <= gdbarch_tdep (get_frame_arch (next_frame))->lowest_pc) if (func <= gdbarch_tdep (get_frame_arch (this_frame))->lowest_pc)
return; return;
/* If we've hit a wall, stop. */ /* If we've hit a wall, stop. */
@ -973,20 +973,15 @@ arm_prologue_this_id (struct frame_info *next_frame,
*this_id = id; *this_id = id;
} }
static void static struct value *
arm_prologue_prev_register (struct frame_info *next_frame, arm_prologue_prev_register (struct frame_info *this_frame,
void **this_cache, void **this_cache,
int prev_regnum, int prev_regnum)
int *optimized,
enum lval_type *lvalp,
CORE_ADDR *addrp,
int *realnump,
gdb_byte *valuep)
{ {
struct arm_prologue_cache *cache; struct arm_prologue_cache *cache;
if (*this_cache == NULL) if (*this_cache == NULL)
*this_cache = arm_make_prologue_cache (next_frame); *this_cache = arm_make_prologue_cache (this_frame);
cache = *this_cache; cache = *this_cache;
/* If we are asked to unwind the PC, then we need to return the LR /* If we are asked to unwind the PC, then we need to return the LR
@ -996,43 +991,34 @@ arm_prologue_prev_register (struct frame_info *next_frame,
prev_regnum = ARM_LR_REGNUM; prev_regnum = ARM_LR_REGNUM;
/* SP is generally not saved to the stack, but this frame is /* SP is generally not saved to the stack, but this frame is
identified by NEXT_FRAME's stack pointer at the time of the call. identified by the next frame's stack pointer at the time of the call.
The value was already reconstructed into PREV_SP. */ The value was already reconstructed into PREV_SP. */
if (prev_regnum == ARM_SP_REGNUM) if (prev_regnum == ARM_SP_REGNUM)
{ return frame_unwind_got_constant (this_frame, prev_regnum, cache->prev_sp);
*lvalp = not_lval;
if (valuep)
store_unsigned_integer (valuep, 4, cache->prev_sp);
return;
}
trad_frame_get_prev_register (next_frame, cache->saved_regs, prev_regnum, return trad_frame_get_prev_register (this_frame, cache->saved_regs,
optimized, lvalp, addrp, realnump, valuep); prev_regnum);
} }
struct frame_unwind arm_prologue_unwind = { struct frame_unwind arm_prologue_unwind = {
NORMAL_FRAME, NORMAL_FRAME,
arm_prologue_this_id, arm_prologue_this_id,
arm_prologue_prev_register arm_prologue_prev_register,
NULL,
default_frame_sniffer
}; };
static const struct frame_unwind *
arm_prologue_unwind_sniffer (struct frame_info *next_frame)
{
return &arm_prologue_unwind;
}
static struct arm_prologue_cache * static struct arm_prologue_cache *
arm_make_stub_cache (struct frame_info *next_frame) arm_make_stub_cache (struct frame_info *this_frame)
{ {
int reg; int reg;
struct arm_prologue_cache *cache; struct arm_prologue_cache *cache;
CORE_ADDR unwound_fp; CORE_ADDR unwound_fp;
cache = FRAME_OBSTACK_ZALLOC (struct arm_prologue_cache); cache = FRAME_OBSTACK_ZALLOC (struct arm_prologue_cache);
cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
cache->prev_sp = frame_unwind_register_unsigned (next_frame, ARM_SP_REGNUM); cache->prev_sp = get_frame_register_unsigned (this_frame, ARM_SP_REGNUM);
return cache; return cache;
} }
@ -1040,47 +1026,50 @@ arm_make_stub_cache (struct frame_info *next_frame)
/* Our frame ID for a stub frame is the current SP and LR. */ /* Our frame ID for a stub frame is the current SP and LR. */
static void static void
arm_stub_this_id (struct frame_info *next_frame, arm_stub_this_id (struct frame_info *this_frame,
void **this_cache, void **this_cache,
struct frame_id *this_id) struct frame_id *this_id)
{ {
struct arm_prologue_cache *cache; struct arm_prologue_cache *cache;
if (*this_cache == NULL) if (*this_cache == NULL)
*this_cache = arm_make_stub_cache (next_frame); *this_cache = arm_make_stub_cache (this_frame);
cache = *this_cache; cache = *this_cache;
*this_id = frame_id_build (cache->prev_sp, *this_id = frame_id_build (cache->prev_sp, get_frame_pc (this_frame));
frame_pc_unwind (next_frame)); }
static int
arm_stub_unwind_sniffer (const struct frame_unwind *self,
struct frame_info *this_frame,
void **this_prologue_cache)
{
CORE_ADDR addr_in_block;
char dummy[4];
addr_in_block = get_frame_address_in_block (this_frame);
if (in_plt_section (addr_in_block, NULL)
|| target_read_memory (get_frame_pc (this_frame), dummy, 4) != 0)
return 1;
return 0;
} }
struct frame_unwind arm_stub_unwind = { struct frame_unwind arm_stub_unwind = {
NORMAL_FRAME, NORMAL_FRAME,
arm_stub_this_id, arm_stub_this_id,
arm_prologue_prev_register arm_prologue_prev_register,
NULL,
arm_stub_unwind_sniffer
}; };
static const struct frame_unwind *
arm_stub_unwind_sniffer (struct frame_info *next_frame)
{
CORE_ADDR addr_in_block;
char dummy[4];
addr_in_block = frame_unwind_address_in_block (next_frame, NORMAL_FRAME);
if (in_plt_section (addr_in_block, NULL)
|| target_read_memory (frame_pc_unwind (next_frame), dummy, 4) != 0)
return &arm_stub_unwind;
return NULL;
}
static CORE_ADDR static CORE_ADDR
arm_normal_frame_base (struct frame_info *next_frame, void **this_cache) arm_normal_frame_base (struct frame_info *this_frame, void **this_cache)
{ {
struct arm_prologue_cache *cache; struct arm_prologue_cache *cache;
if (*this_cache == NULL) if (*this_cache == NULL)
*this_cache = arm_make_prologue_cache (next_frame); *this_cache = arm_make_prologue_cache (this_frame);
cache = *this_cache; cache = *this_cache;
return cache->prev_sp - cache->framesize; return cache->prev_sp - cache->framesize;
@ -1093,17 +1082,17 @@ struct frame_base arm_normal_base = {
arm_normal_frame_base arm_normal_frame_base
}; };
/* Assuming NEXT_FRAME->prev is a dummy, return the frame ID of that /* Assuming THIS_FRAME is a dummy, return the frame ID of that
dummy frame. The frame ID's base needs to match the TOS value dummy frame. The frame ID's base needs to match the TOS value
saved by save_dummy_frame_tos() and returned from saved by save_dummy_frame_tos() and returned from
arm_push_dummy_call, and the PC needs to match the dummy frame's arm_push_dummy_call, and the PC needs to match the dummy frame's
breakpoint. */ breakpoint. */
static struct frame_id static struct frame_id
arm_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) arm_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
{ {
return frame_id_build (frame_unwind_register_unsigned (next_frame, ARM_SP_REGNUM), return frame_id_build (get_frame_register_unsigned (this_frame, ARM_SP_REGNUM),
frame_pc_unwind (next_frame)); get_frame_pc (this_frame));
} }
/* Given THIS_FRAME, find the previous frame's resume PC (which will /* Given THIS_FRAME, find the previous frame's resume PC (which will
@ -2987,7 +2976,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_write_pc (gdbarch, arm_write_pc); set_gdbarch_write_pc (gdbarch, arm_write_pc);
/* Frame handling. */ /* Frame handling. */
set_gdbarch_unwind_dummy_id (gdbarch, arm_unwind_dummy_id); set_gdbarch_dummy_id (gdbarch, arm_dummy_id);
set_gdbarch_unwind_pc (gdbarch, arm_unwind_pc); set_gdbarch_unwind_pc (gdbarch, arm_unwind_pc);
set_gdbarch_unwind_sp (gdbarch, arm_unwind_sp); set_gdbarch_unwind_sp (gdbarch, arm_unwind_sp);
@ -3046,9 +3035,9 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
gdbarch_init_osabi (info, gdbarch); gdbarch_init_osabi (info, gdbarch);
/* Add some default predicates. */ /* Add some default predicates. */
frame_unwind_append_sniffer (gdbarch, arm_stub_unwind_sniffer); frame_unwind_append_unwinder (gdbarch, &arm_stub_unwind);
frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); dwarf2_append_unwinders (gdbarch);
frame_unwind_append_sniffer (gdbarch, arm_prologue_unwind_sniffer); frame_unwind_append_unwinder (gdbarch, &arm_prologue_unwind);
/* Now we have tuned the configuration, set a few final things, /* Now we have tuned the configuration, set a few final things,
based on what the OS ABI has told us. */ based on what the OS ABI has told us. */

4
gdb/armobsd-tdep.c
View file

@ -32,7 +32,7 @@
static void static void
armobsd_sigframe_init (const struct tramp_frame *self, armobsd_sigframe_init (const struct tramp_frame *self,
struct frame_info *next_frame, struct frame_info *this_frame,
struct trad_frame_cache *cache, struct trad_frame_cache *cache,
CORE_ADDR func) CORE_ADDR func)
{ {
@ -41,7 +41,7 @@ armobsd_sigframe_init (const struct tramp_frame *self,
/* We find the appropriate instance of `struct sigcontext' at a /* We find the appropriate instance of `struct sigcontext' at a
fixed offset in the signal frame. */ fixed offset in the signal frame. */
sp = frame_unwind_register_signed (next_frame, ARM_SP_REGNUM); sp = get_frame_register_signed (this_frame, ARM_SP_REGNUM);
sigcontext_addr = sp + 16; sigcontext_addr = sp + 16;
/* PC. */ /* PC. */