X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxstormy16-tdep.c;h=9e62d87eefb545c23778f77789e23b42f856db32;hb=40936b0de8ad60a96731849f5e61ef3276489857;hp=3cd64d7be54351ca91fba3d977c32cdf14091706;hpb=19d718a3ac83b076a53698e1956685c5beee15ba;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 3cd64d7be5..9e62d87eef 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1,12 +1,13 @@ /* Target-dependent code for the Sanyo Xstormy16a (LC590000) processor. - Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "frame.h" @@ -105,7 +104,7 @@ enum Returns the name of the standard Xstormy16 register N. */ static const char * -xstormy16_register_name (int regnum) +xstormy16_register_name (struct gdbarch *gdbarch, int regnum) { static char *register_names[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", @@ -115,7 +114,7 @@ xstormy16_register_name (int regnum) if (regnum < 0 || regnum >= E_NUM_REGS) internal_error (__FILE__, __LINE__, - "xstormy16_register_name: illegal register number %d", + _("xstormy16_register_name: illegal register number %d"), regnum); else return register_names[regnum]; @@ -126,9 +125,9 @@ static struct type * xstormy16_register_type (struct gdbarch *gdbarch, int regnum) { if (regnum == E_PC_REGNUM) - return builtin_type_uint32; + return builtin_type (gdbarch)->builtin_uint32; else - return builtin_type_uint16; + return builtin_type (gdbarch)->builtin_uint16; } /* Function: xstormy16_type_is_scalar @@ -199,9 +198,9 @@ 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, - void *readbuf, const void *writebuf) +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)) return RETURN_VALUE_STRUCT_CONVENTION; @@ -234,11 +233,12 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR stack_dest = sp; int argreg = E_1ST_ARG_REGNUM; int i, j; int typelen, slacklen; - char *val; + const gdb_byte *val; char buf[xstormy16_pc_size]; /* If struct_return is true, then the struct return address will @@ -256,18 +256,19 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, would fit in the remaining unused registers. */ for (i = 0; i < nargs && argreg <= E_LST_ARG_REGNUM; i++) { - typelen = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[i])); + typelen = TYPE_LENGTH (value_enclosing_type (args[i])); if (typelen > E_MAX_RETTYPE_SIZE (argreg)) break; /* Put argument into registers wordwise. */ - val = VALUE_CONTENTS (args[i]); + val = value_contents (args[i]); for (j = 0; j < typelen; j += xstormy16_reg_size) regcache_cooked_write_unsigned (regcache, argreg++, extract_unsigned_integer (val + j, typelen - j == 1 ? 1 : - xstormy16_reg_size)); + xstormy16_reg_size, + byte_order)); } /* Align SP */ @@ -277,10 +278,12 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, wordaligned. */ for (j = nargs - 1; j >= i; j--) { - typelen = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[j])); + char *val; + + typelen = TYPE_LENGTH (value_enclosing_type (args[j])); slacklen = typelen & 1; val = alloca (typelen + slacklen); - memcpy (val, VALUE_CONTENTS (args[j]), typelen); + memcpy (val, value_contents (args[j]), typelen); memset (val + typelen, 0, slacklen); /* Now write this data to the stack. The stack grows upwards. */ @@ -288,7 +291,7 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, stack_dest += typelen + slacklen; } - store_unsigned_integer (buf, xstormy16_pc_size, bp_addr); + store_unsigned_integer (buf, xstormy16_pc_size, byte_order, bp_addr); write_memory (stack_dest, buf, xstormy16_pc_size); stack_dest += xstormy16_pc_size; @@ -308,10 +311,12 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, Returns the address of the first instruction after the prologue. */ static CORE_ADDR -xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr, +xstormy16_analyze_prologue (struct gdbarch *gdbarch, + CORE_ADDR start_addr, CORE_ADDR end_addr, struct xstormy16_frame_cache *cache, - struct frame_info *next_frame) + struct frame_info *this_frame) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR next_addr; ULONGEST inst, inst2; LONGEST offset; @@ -327,9 +332,10 @@ xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr, for (next_addr = start_addr; next_addr < end_addr; next_addr += xstormy16_inst_size) { - inst = read_memory_unsigned_integer (next_addr, xstormy16_inst_size); + inst = read_memory_unsigned_integer (next_addr, + xstormy16_inst_size, byte_order); inst2 = read_memory_unsigned_integer (next_addr + xstormy16_inst_size, - xstormy16_inst_size); + xstormy16_inst_size, byte_order); if (inst >= 0x0082 && inst <= 0x008d) /* push r2 .. push r13 */ { @@ -403,7 +409,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; @@ -413,15 +419,18 @@ xstormy16_skip_prologue (CORE_ADDR pc) struct symtab_and_line sal; struct symbol *sym; struct xstormy16_frame_cache cache; + CORE_ADDR plg_end; + + memset (&cache, 0, sizeof cache); /* Don't trust line number debug info in frameless functions. */ - CORE_ADDR plg_end = xstormy16_analyze_prologue (func_addr, func_end, - &cache, NULL); + plg_end = xstormy16_analyze_prologue (gdbarch, func_addr, func_end, + &cache, NULL); if (!cache.uses_fp) 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) { @@ -447,6 +456,7 @@ xstormy16_skip_prologue (CORE_ADDR pc) static int xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR func_addr = 0, func_end = 0; if (find_pc_partial_function (pc, NULL, &func_addr, &func_end)) @@ -460,19 +470,21 @@ xstormy16_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) /* Check if we're on a `ret' instruction. Otherwise it's too dangerous to proceed. */ - inst = read_memory_unsigned_integer (addr, xstormy16_inst_size); + inst = read_memory_unsigned_integer (addr, + xstormy16_inst_size, byte_order); if (inst != 0x0003) return 0; while ((addr -= xstormy16_inst_size) >= func_addr) { - inst = read_memory_unsigned_integer (addr, xstormy16_inst_size); + inst = read_memory_unsigned_integer (addr, + xstormy16_inst_size, byte_order); if (inst >= 0x009a && inst <= 0x009d) /* pop r10...r13 */ continue; if (inst == 0x305f || inst == 0x307f) /* dec r15, #0x1/#0x3 */ break; inst2 = read_memory_unsigned_integer (addr - xstormy16_inst_size, - xstormy16_inst_size); + xstormy16_inst_size, byte_order); if (inst2 == 0x314f && inst >= 0x8000) /* add r15, neg. value */ { addr -= xstormy16_inst_size; @@ -487,7 +499,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); @@ -497,8 +510,9 @@ xstormy16_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) /* Given a pointer to a jump table entry, return the address of the function it jumps to. Return 0 if not found. */ static CORE_ADDR -xstormy16_resolve_jmp_table_entry (CORE_ADDR faddr) +xstormy16_resolve_jmp_table_entry (struct gdbarch *gdbarch, CORE_ADDR faddr) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct obj_section *faddr_sect = find_pc_section (faddr); if (faddr_sect) @@ -512,9 +526,10 @@ xstormy16_resolve_jmp_table_entry (CORE_ADDR faddr) if (!target_read_memory (faddr, buf, sizeof buf)) { - inst = extract_unsigned_integer (buf, xstormy16_inst_size); + inst = extract_unsigned_integer (buf, + xstormy16_inst_size, byte_order); inst2 = extract_unsigned_integer (buf + xstormy16_inst_size, - xstormy16_inst_size); + xstormy16_inst_size, byte_order); addr = inst2 << 8 | (inst & 0xff); return addr; } @@ -526,8 +541,9 @@ xstormy16_resolve_jmp_table_entry (CORE_ADDR faddr) address of the corresponding jump table entry. Return 0 if not found. */ static CORE_ADDR -xstormy16_find_jmp_table_entry (CORE_ADDR faddr) +xstormy16_find_jmp_table_entry (struct gdbarch *gdbarch, CORE_ADDR faddr) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct obj_section *faddr_sect = find_pc_section (faddr); if (faddr_sect) @@ -546,18 +562,22 @@ xstormy16_find_jmp_table_entry (CORE_ADDR faddr) if (osect < faddr_sect->objfile->sections_end) { - CORE_ADDR addr; - for (addr = osect->addr; - addr < osect->endaddr; addr += 2 * xstormy16_inst_size) + CORE_ADDR addr, endaddr; + + addr = obj_section_addr (osect); + endaddr = obj_section_endaddr (osect); + + for (; addr < endaddr; addr += 2 * xstormy16_inst_size) { LONGEST inst, inst2, faddr2; char buf[2 * xstormy16_inst_size]; if (target_read_memory (addr, buf, sizeof buf)) return 0; - inst = extract_unsigned_integer (buf, xstormy16_inst_size); + inst = extract_unsigned_integer (buf, + xstormy16_inst_size, byte_order); inst2 = extract_unsigned_integer (buf + xstormy16_inst_size, - xstormy16_inst_size); + xstormy16_inst_size, byte_order); faddr2 = inst2 << 8 | (inst & 0xff); if (faddr == faddr2) return addr; @@ -568,9 +588,10 @@ xstormy16_find_jmp_table_entry (CORE_ADDR faddr) } static CORE_ADDR -xstormy16_skip_trampoline_code (CORE_ADDR pc) +xstormy16_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) { - CORE_ADDR tmp = xstormy16_resolve_jmp_table_entry (pc); + struct gdbarch *gdbarch = get_frame_arch (frame); + CORE_ADDR tmp = xstormy16_resolve_jmp_table_entry (gdbarch, pc); if (tmp && tmp != pc) return tmp; @@ -585,14 +606,17 @@ xstormy16_skip_trampoline_code (CORE_ADDR pc) and vice versa. */ static CORE_ADDR -xstormy16_pointer_to_address (struct type *type, const void *buf) +xstormy16_pointer_to_address (struct gdbarch *gdbarch, + struct type *type, const gdb_byte *buf) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type)); - CORE_ADDR addr = extract_unsigned_integer (buf, TYPE_LENGTH (type)); + CORE_ADDR addr + = extract_unsigned_integer (buf, TYPE_LENGTH (type), byte_order); if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD) { - CORE_ADDR addr2 = xstormy16_resolve_jmp_table_entry (addr); + CORE_ADDR addr2 = xstormy16_resolve_jmp_table_entry (gdbarch, addr); if (addr2) addr = addr2; } @@ -601,17 +625,19 @@ xstormy16_pointer_to_address (struct type *type, const void *buf) } static void -xstormy16_address_to_pointer (struct type *type, void *buf, CORE_ADDR addr) +xstormy16_address_to_pointer (struct gdbarch *gdbarch, + struct type *type, gdb_byte *buf, CORE_ADDR addr) { + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type)); if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD) { - CORE_ADDR addr2 = xstormy16_find_jmp_table_entry (addr); + CORE_ADDR addr2 = xstormy16_find_jmp_table_entry (gdbarch, addr); if (addr2) addr = addr2; } - store_unsigned_integer (buf, TYPE_LENGTH (type), addr); + store_unsigned_integer (buf, TYPE_LENGTH (type), byte_order, addr); } static struct xstormy16_frame_cache * @@ -634,8 +660,9 @@ 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 gdbarch *gdbarch = get_frame_arch (this_frame); struct xstormy16_frame_cache *cache; CORE_ADDR current_pc; int i; @@ -646,17 +673,18 @@ 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); - 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 (gdbarch, 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; @@ -667,58 +695,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, void *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. */ @@ -729,9 +728,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; } @@ -739,7 +738,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 = { @@ -749,12 +750,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) { @@ -768,11 +763,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)); } @@ -819,8 +813,6 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_address_to_pointer (gdbarch, xstormy16_address_to_pointer); set_gdbarch_pointer_to_address (gdbarch, xstormy16_pointer_to_address); - set_gdbarch_write_pc (gdbarch, generic_target_write_pc); - /* Stack grows up. */ set_gdbarch_inner_than (gdbarch, core_addr_greaterthan); @@ -829,7 +821,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); @@ -848,8 +840,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; }