X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxstormy16-tdep.c;h=eac5efdccecc8cc38b106f12be2671742aabbb3e;hb=b099ab9fcd00257ccf077d30a327a719edd940e6;hp=7cd6410f6a013064d4f81de97056b646b53272a4;hpb=d93859e2e8495bc510108127f76a5cbca589ad81;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 7cd6410f6a..eac5efdcce 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for the Sanyo Xstormy16a (LC590000) processor. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. This file is part of GDB. @@ -198,8 +198,8 @@ xstormy16_store_return_value (struct type *type, struct regcache *regcache, } static enum return_value_convention -xstormy16_return_value (struct gdbarch *gdbarch, struct type *type, - struct regcache *regcache, +xstormy16_return_value (struct gdbarch *gdbarch, struct type *func_type, + struct type *type, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf) { if (xstormy16_use_struct_convention (type)) @@ -311,7 +311,7 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, static CORE_ADDR xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr, struct xstormy16_frame_cache *cache, - struct frame_info *next_frame) + struct frame_info *this_frame) { CORE_ADDR next_addr; ULONGEST inst, inst2; @@ -404,7 +404,7 @@ xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr, stepped into a function call. */ static CORE_ADDR -xstormy16_skip_prologue (CORE_ADDR pc) +xstormy16_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) { CORE_ADDR func_addr = 0, func_end = 0; char *func_name; @@ -424,7 +424,7 @@ xstormy16_skip_prologue (CORE_ADDR pc) return plg_end; /* Found a function. */ - sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL, NULL); + sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL); /* Don't use line number debug info for assembly source files. */ if (sym && SYMBOL_LANGUAGE (sym) != language_asm) { @@ -490,7 +490,8 @@ xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) } const static unsigned char * -xstormy16_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) +xstormy16_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, + int *lenptr) { static unsigned char breakpoint[] = { 0x06, 0x0 }; *lenptr = sizeof (breakpoint); @@ -637,7 +638,7 @@ xstormy16_alloc_frame_cache (void) } static struct xstormy16_frame_cache * -xstormy16_frame_cache (struct frame_info *next_frame, void **this_cache) +xstormy16_frame_cache (struct frame_info *this_frame, void **this_cache) { struct xstormy16_frame_cache *cache; CORE_ADDR current_pc; @@ -649,17 +650,17 @@ xstormy16_frame_cache (struct frame_info *next_frame, void **this_cache) cache = xstormy16_alloc_frame_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; - cache->pc = frame_func_unwind (next_frame, NORMAL_FRAME); - current_pc = frame_pc_unwind (next_frame); + cache->pc = get_frame_func (this_frame); + current_pc = get_frame_pc (this_frame); if (cache->pc) - xstormy16_analyze_prologue (cache->pc, current_pc, cache, next_frame); + xstormy16_analyze_prologue (cache->pc, current_pc, cache, this_frame); if (!cache->uses_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; @@ -670,59 +671,29 @@ xstormy16_frame_cache (struct frame_info *next_frame, void **this_cache) return cache; } -static void -xstormy16_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 * +xstormy16_frame_prev_register (struct frame_info *this_frame, + void **this_cache, int regnum) { - struct xstormy16_frame_cache *cache = xstormy16_frame_cache (next_frame, + struct xstormy16_frame_cache *cache = xstormy16_frame_cache (this_frame, this_cache); gdb_assert (regnum >= 0); if (regnum == E_SP_REGNUM && cache->saved_sp) - { - *optimizedp = 0; - *lvalp = not_lval; - *addrp = 0; - *realnump = -1; - if (valuep) - { - /* Store the value. */ - store_unsigned_integer (valuep, xstormy16_reg_size, cache->saved_sp); - } - return; - } + return frame_unwind_got_constant (this_frame, regnum, cache->saved_sp); if (regnum < E_NUM_REGS && cache->saved_regs[regnum] != REG_UNAVAIL) - { - *optimizedp = 0; - *lvalp = lval_memory; - *addrp = cache->saved_regs[regnum]; - *realnump = -1; - if (valuep) - { - /* Read the value in from memory. */ - read_memory (*addrp, valuep, - register_size (current_gdbarch, 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 -xstormy16_frame_this_id (struct frame_info *next_frame, void **this_cache, +xstormy16_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { - struct xstormy16_frame_cache *cache = xstormy16_frame_cache (next_frame, + struct xstormy16_frame_cache *cache = xstormy16_frame_cache (this_frame, this_cache); /* This marks the outermost frame. */ @@ -733,9 +704,9 @@ xstormy16_frame_this_id (struct frame_info *next_frame, void **this_cache, } static CORE_ADDR -xstormy16_frame_base_address (struct frame_info *next_frame, void **this_cache) +xstormy16_frame_base_address (struct frame_info *this_frame, void **this_cache) { - struct xstormy16_frame_cache *cache = xstormy16_frame_cache (next_frame, + struct xstormy16_frame_cache *cache = xstormy16_frame_cache (this_frame, this_cache); return cache->base; } @@ -743,7 +714,9 @@ xstormy16_frame_base_address (struct frame_info *next_frame, void **this_cache) static const struct frame_unwind xstormy16_frame_unwind = { NORMAL_FRAME, xstormy16_frame_this_id, - xstormy16_frame_prev_register + xstormy16_frame_prev_register, + NULL, + default_frame_sniffer }; static const struct frame_base xstormy16_frame_base = { @@ -753,12 +726,6 @@ static const struct frame_base xstormy16_frame_base = { xstormy16_frame_base_address }; -static const struct frame_unwind * -xstormy16_frame_sniffer (struct frame_info *next_frame) -{ - return &xstormy16_frame_unwind; -} - static CORE_ADDR xstormy16_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) { @@ -772,11 +739,10 @@ xstormy16_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) } static struct frame_id -xstormy16_unwind_dummy_id (struct gdbarch *gdbarch, - struct frame_info *next_frame) +xstormy16_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) { - return frame_id_build (xstormy16_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)); } @@ -831,7 +797,7 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) */ set_gdbarch_unwind_sp (gdbarch, xstormy16_unwind_sp); set_gdbarch_unwind_pc (gdbarch, xstormy16_unwind_pc); - set_gdbarch_unwind_dummy_id (gdbarch, xstormy16_unwind_dummy_id); + set_gdbarch_dummy_id (gdbarch, xstormy16_dummy_id); set_gdbarch_frame_align (gdbarch, xstormy16_frame_align); frame_base_set_default (gdbarch, &xstormy16_frame_base); @@ -850,8 +816,8 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) gdbarch_init_osabi (info, gdbarch); - frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); - frame_unwind_append_sniffer (gdbarch, xstormy16_frame_sniffer); + dwarf2_append_unwinders (gdbarch); + frame_unwind_append_unwinder (gdbarch, &xstormy16_frame_unwind); return gdbarch; }