From 94afd7a6d348a66ea3fb35fdb8234b050ec8c779 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 28 Jun 2008 17:29:04 +0000 Subject: * alphafbsd-tdep.c: Update for unwinder changes. * alpha-linux-tdep.c: Likewise. * alphanbsd-tdep.c: Likewise. * alphaobsd-tdep.c: Likewise. * avr-tdep.c: Likewise. * cris-tdep.c: Likewise. * frv-linux-tdep.c: Likewise. * frv-tdep.c: Likewise. * h8300-tdep.c: Likewise. * hppa-linux-tdep.c: Likewise. * iq2000-tdep.c: Likewise. * m32c-tdep.c: Likewise. * m32r-linux-tdep.c: Likewise. * m32r-tdep.c: Likewise. * m68hc11-tdep.c: Likewise. * mep-tdep.c: Likewise. * mn10300-tdep.c: Likewise. * mt-tdep.c: Likewise. * score-tdep.c: Likewise. * sh64-tdep.c: Likewise. * sh-tdep.c: Likewise. * sparc64fbsd-tdep.c: Likewise. * sparc64nbsd-tdep.c: Likewise. * sparc64obsd-tdep.c: Likewise. * v850-tdep.c: Likewise. * vaxobsd-tdep.c: Likewise. * vax-tdep.c: Likewise. * xstormy16-tdep.c: Likewise. --- gdb/iq2000-tdep.c | 80 +++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 53 deletions(-) (limited to 'gdb/iq2000-tdep.c') diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c index d938fe7..4843ff1 100644 --- a/gdb/iq2000-tdep.c +++ b/gdb/iq2000-tdep.c @@ -356,7 +356,7 @@ iq2000_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) } static struct iq2000_frame_cache * -iq2000_frame_cache (struct frame_info *next_frame, void **this_cache) +iq2000_frame_cache (struct frame_info *this_frame, void **this_cache) { struct iq2000_frame_cache *cache; CORE_ADDR current_pc; @@ -369,16 +369,16 @@ iq2000_frame_cache (struct frame_info *next_frame, void **this_cache) iq2000_init_frame_cache (cache); *this_cache = cache; - cache->base = frame_unwind_register_unsigned (next_frame, E_FP_REGNUM); + cache->base = get_frame_register_unsigned (this_frame, E_FP_REGNUM); //if (cache->base == 0) //return cache; - current_pc = frame_pc_unwind (next_frame); + current_pc = get_frame_pc (this_frame); find_pc_partial_function (current_pc, NULL, &cache->pc, NULL); if (cache->pc != 0) - iq2000_scan_prologue (cache->pc, current_pc, next_frame, cache); + iq2000_scan_prologue (cache->pc, current_pc, this_frame, cache); if (!cache->using_fp) - cache->base = frame_unwind_register_unsigned (next_frame, E_SP_REGNUM); + cache->base = get_frame_register_unsigned (this_frame, E_SP_REGNUM); cache->saved_sp = cache->base + cache->framesize; @@ -389,52 +389,30 @@ iq2000_frame_cache (struct frame_info *next_frame, void **this_cache) return cache; } -static void -iq2000_frame_prev_register (struct frame_info *next_frame, void **this_cache, - int regnum, int *optimizedp, - enum lval_type *lvalp, CORE_ADDR *addrp, - int *realnump, gdb_byte *valuep) +static struct value * +iq2000_frame_prev_register (struct frame_info *this_frame, void **this_cache, + int regnum) { - struct iq2000_frame_cache *cache = iq2000_frame_cache (next_frame, this_cache); + struct iq2000_frame_cache *cache = iq2000_frame_cache (this_frame, this_cache); + if (regnum == E_SP_REGNUM && cache->saved_sp) - { - *optimizedp = 0; - *lvalp = not_lval; - *addrp = 0; - *realnump = -1; - if (valuep) - store_unsigned_integer (valuep, 4, cache->saved_sp); - return; - } + return frame_unwind_got_constant (this_frame, regnum, cache->saved_sp); if (regnum == E_PC_REGNUM) regnum = E_LR_REGNUM; if (regnum < E_NUM_REGS && cache->saved_regs[regnum] != -1) - { - *optimizedp = 0; - *lvalp = lval_memory; - *addrp = cache->saved_regs[regnum]; - *realnump = -1; - if (valuep) - read_memory (*addrp, valuep, - register_size (get_frame_arch (next_frame), regnum)); - return; - } + return frame_unwind_got_memory (this_frame, regnum, + cache->saved_regs[regnum]); - *optimizedp = 0; - *lvalp = lval_register; - *addrp = 0; - *realnump = regnum; - if (valuep) - frame_unwind_register (next_frame, (*realnump), valuep); + return frame_unwind_got_register (this_frame, regnum, regnum); } static void -iq2000_frame_this_id (struct frame_info *next_frame, void **this_cache, +iq2000_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { - struct iq2000_frame_cache *cache = iq2000_frame_cache (next_frame, this_cache); + struct iq2000_frame_cache *cache = iq2000_frame_cache (this_frame, this_cache); /* This marks the outermost frame. */ if (cache->base == 0) @@ -446,15 +424,11 @@ iq2000_frame_this_id (struct frame_info *next_frame, void **this_cache, static const struct frame_unwind iq2000_frame_unwind = { NORMAL_FRAME, iq2000_frame_this_id, - iq2000_frame_prev_register + iq2000_frame_prev_register, + NULL, + default_frame_sniffer }; -static const struct frame_unwind * -iq2000_frame_sniffer (struct frame_info *next_frame) -{ - return &iq2000_frame_unwind; -} - static CORE_ADDR iq2000_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) { @@ -468,16 +442,16 @@ iq2000_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) } static struct frame_id -iq2000_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) +iq2000_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) { - return frame_id_build (iq2000_unwind_sp (gdbarch, next_frame), - frame_pc_unwind (next_frame)); + CORE_ADDR sp = get_frame_register_unsigned (this_frame, E_SP_REGNUM); + return frame_id_build (sp, get_frame_pc (this_frame)); } static CORE_ADDR -iq2000_frame_base_address (struct frame_info *next_frame, void **this_cache) +iq2000_frame_base_address (struct frame_info *this_frame, void **this_cache) { - struct iq2000_frame_cache *cache = iq2000_frame_cache (next_frame, this_cache); + struct iq2000_frame_cache *cache = iq2000_frame_cache (this_frame, this_cache); return cache->base; } @@ -851,14 +825,14 @@ iq2000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_align (gdbarch, iq2000_frame_align); set_gdbarch_unwind_sp (gdbarch, iq2000_unwind_sp); set_gdbarch_unwind_pc (gdbarch, iq2000_unwind_pc); - set_gdbarch_unwind_dummy_id (gdbarch, iq2000_unwind_dummy_id); + set_gdbarch_dummy_id (gdbarch, iq2000_dummy_id); frame_base_set_default (gdbarch, &iq2000_frame_base); set_gdbarch_push_dummy_call (gdbarch, iq2000_push_dummy_call); gdbarch_init_osabi (info, gdbarch); - frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); - frame_unwind_append_sniffer (gdbarch, iq2000_frame_sniffer); + dwarf2_append_unwinders (gdbarch); + frame_unwind_append_unwinder (gdbarch, &iq2000_frame_unwind); return gdbarch; } -- cgit v1.1