X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fcris-tdep.c;h=aeccb13a001c4677f9e1da5a6ba4e0b9a3cc6fca;hb=8527d542c07f6bea86fe5baf3b31568c7fba1398;hp=0944d0021144e279ef7c9a49d3ad86c87ee6f262;hpb=0963b4bd458eab010b3b19c9ffd8eb790f2cd06c;p=platform%2Fupstream%2Fbinutils.git diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 0944d00..aeccb13 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -1,7 +1,6 @@ /* Target dependent code for CRIS, for GDB, the GNU debugger. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011 Free Software Foundation, Inc. + Copyright (C) 2001-2014 Free Software Foundation, Inc. Contributed by Axis Communications AB. Written by Hendrik Ruijter, Stefan Andersson, and Orjan Friberg. @@ -35,17 +34,18 @@ #include "target.h" #include "value.h" #include "opcode/cris.h" +#include "osabi.h" #include "arch-utils.h" #include "regcache.h" -#include "gdb_assert.h" #include "objfiles.h" #include "solib.h" /* Support for shared libraries. */ #include "solib-svr4.h" -#include "gdb_string.h" #include "dis-asm.h" +#include "cris-tdep.h" + enum cris_num_regs { /* There are no floating point registers. Used in gdbserver low-linux.c. */ @@ -145,14 +145,14 @@ extern const struct cris_spec_reg cris_spec_regs[]; /* CRIS version, set via the user command 'set cris-version'. Affects register names and sizes. */ -static int usr_cmd_cris_version; +static unsigned int usr_cmd_cris_version; /* Indicates whether to trust the above variable. */ static int usr_cmd_cris_version_valid = 0; static const char cris_mode_normal[] = "normal"; static const char cris_mode_guru[] = "guru"; -static const char *cris_modes[] = { +static const char *const cris_modes[] = { cris_mode_normal, cris_mode_guru, 0 @@ -165,14 +165,6 @@ static const char *usr_cmd_cris_mode = cris_mode_normal; /* Whether to make use of Dwarf-2 CFI (default on). */ static int usr_cmd_cris_dwarf2_cfi = 1; -/* CRIS architecture specific information. */ -struct gdbarch_tdep -{ - int cris_version; - const char *cris_mode; - int cris_dwarf2_cfi; -}; - /* Sigtramp identification code copied from i386-linux-tdep.c. */ #define SIGTRAMP_INSN0 0x9c5f /* movu.w 0xXX, $r9 */ @@ -262,7 +254,7 @@ cris_sigcontext_addr (struct frame_info *this_frame) enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); CORE_ADDR pc; CORE_ADDR sp; - char buf[4]; + gdb_byte buf[4]; get_frame_register (this_frame, gdbarch_sp_regnum (gdbarch), buf); sp = extract_unsigned_integer (buf, 4, byte_order); @@ -323,10 +315,8 @@ cris_sigtramp_frame_unwind_cache (struct frame_info *this_frame, struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct cris_unwind_cache *info; - CORE_ADDR pc; - CORE_ADDR sp; CORE_ADDR addr; - char buf[4]; + gdb_byte buf[4]; int i; if ((*this_cache)) @@ -448,6 +438,7 @@ cris_sigtramp_frame_sniffer (const struct frame_unwind *self, static const struct frame_unwind cris_sigtramp_frame_unwind = { SIGTRAMP_FRAME, + default_frame_unwind_stop_reason, cris_sigtramp_frame_this_id, cris_sigtramp_frame_prev_register, NULL, @@ -477,48 +468,6 @@ crisv32_single_step_through_delay (struct gdbarch *gdbarch, return ret; } -/* Hardware watchpoint support. */ - -/* We support 6 hardware data watchpoints, but cannot trigger on execute - (any combination of read/write is fine). */ - -int -cris_can_use_hardware_watchpoint (int type, int count, int other) -{ - struct gdbarch_tdep *tdep = gdbarch_tdep (target_gdbarch); - - /* No bookkeeping is done here; it is handled by the remote debug agent. */ - - if (tdep->cris_version != 32) - return 0; - else - /* CRISv32: Six data watchpoints, one for instructions. */ - return (((type == bp_read_watchpoint || type == bp_access_watchpoint - || type == bp_hardware_watchpoint) && count <= 6) - || (type == bp_hardware_breakpoint && count <= 1)); -} - -/* The CRISv32 hardware data watchpoints work by specifying ranges, - which have no alignment or length restrictions. */ - -int -cris_region_ok_for_watchpoint (CORE_ADDR addr, int len) -{ - return 1; -} - -/* If the inferior has some watchpoint that triggered, return the - address associated with that watchpoint. Otherwise, return - zero. */ - -CORE_ADDR -cris_stopped_data_address (void) -{ - CORE_ADDR eda; - eda = get_frame_register_unsigned (get_current_frame (), EDA_REGNUM); - return eda; -} - /* The instruction environment needed to find single-step breakpoints. */ typedef @@ -720,7 +669,7 @@ struct stack_item }; static struct stack_item * -push_stack_item (struct stack_item *prev, void *contents, int len) +push_stack_item (struct stack_item *prev, const gdb_byte *contents, int len) { struct stack_item *si; si = xmalloc (sizeof (struct stack_item)); @@ -753,9 +702,7 @@ cris_frame_unwind_cache (struct frame_info *this_frame, { struct gdbarch *gdbarch = get_frame_arch (this_frame); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - CORE_ADDR pc; struct cris_unwind_cache *info; - int i; if ((*this_prologue_cache)) return (*this_prologue_cache); @@ -865,13 +812,10 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function, int struct_return, CORE_ADDR struct_addr) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - int stack_alloc; int stack_offset; int argreg; int argnum; - CORE_ADDR regval; - /* The function's arguments and memory allocated by gdb for the arguments to point at reside in separate areas on the stack. Both frame pointers grow toward higher addresses. */ @@ -899,12 +843,12 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function, for (argnum = 0; argnum < nargs; argnum++) { int len; - char *val; + const gdb_byte *val; int reg_demand; int i; len = TYPE_LENGTH (value_type (args[argnum])); - val = (char *) value_contents (args[argnum]); + val = value_contents (args[argnum]); /* How may registers worth of storage do we need for this argument? */ reg_demand = (len / 4) + (len % 4 != 0 ? 1 : 0); @@ -985,6 +929,7 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function, static const struct frame_unwind cris_frame_unwind = { NORMAL_FRAME, + default_frame_unwind_stop_reason, cris_frame_this_id, cris_frame_prev_register, NULL, @@ -1487,7 +1432,7 @@ cris_spec_reg_applicable (struct gdbarch *gdbarch, struct cris_spec_reg spec_reg) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - int version = tdep->cris_version; + unsigned int version = tdep->cris_version; switch (spec_reg.applicable_version) { @@ -1705,7 +1650,7 @@ crisv32_register_type (struct gdbarch *gdbarch, int regno) static void cris_store_return_value (struct type *type, struct regcache *regcache, - const void *valbuf) + const gdb_byte *valbuf) { struct gdbarch *gdbarch = get_regcache_arch (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -1723,7 +1668,7 @@ cris_store_return_value (struct type *type, struct regcache *regcache, /* Put the return value in R10 and R11. */ val = extract_unsigned_integer (valbuf, 4, byte_order); regcache_cooked_write_unsigned (regcache, ARG1_REGNUM, val); - val = extract_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order); + val = extract_unsigned_integer (valbuf + 4, len - 4, byte_order); regcache_cooked_write_unsigned (regcache, ARG2_REGNUM, val); } else @@ -1876,7 +1821,7 @@ cris_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, static void cris_extract_return_value (struct type *type, struct regcache *regcache, - void *valbuf) + gdb_byte *valbuf) { struct gdbarch *gdbarch = get_regcache_arch (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -1895,7 +1840,7 @@ cris_extract_return_value (struct type *type, struct regcache *regcache, regcache_cooked_read_unsigned (regcache, ARG1_REGNUM, &val); store_unsigned_integer (valbuf, 4, byte_order, val); regcache_cooked_read_unsigned (regcache, ARG2_REGNUM, &val); - store_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order, val); + store_unsigned_integer (valbuf + 4, len - 4, byte_order, val); } else error (_("cris_extract_return_value: type length too large")); @@ -1904,7 +1849,7 @@ cris_extract_return_value (struct type *type, struct regcache *regcache, /* Handle the CRIS return value convention. */ static enum return_value_convention -cris_return_value (struct gdbarch *gdbarch, struct type *func_type, +cris_return_value (struct gdbarch *gdbarch, struct value *function, struct type *type, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf) { @@ -1927,13 +1872,13 @@ cris_return_value (struct gdbarch *gdbarch, struct type *func_type, instruction. It stems from cris_constraint, found in cris-dis.c. */ static int -constraint (unsigned int insn, const signed char *inst_args, +constraint (unsigned int insn, const char *inst_args, inst_env_type *inst_env) { int retval = 0; int tmp, i; - const char *s = inst_args; + const gdb_byte *s = (const gdb_byte *) inst_args; for (; *s; s++) switch (*s) @@ -2230,9 +2175,6 @@ static unsigned long get_data_from_address (unsigned short *inst, static void bdap_prefix (unsigned short inst, inst_env_type *inst_env) { - - long offset; - /* It's invalid to be in a delay slot. */ if (inst_env->slot_needed || inst_env->prefix_found) { @@ -2567,7 +2509,7 @@ asrq_op (unsigned short inst, inst_env_type *inst_env) return; } /* The shift size is given as a 5 bit quick value, i.e. we don't - want the the sign bit of the quick value. */ + want the sign bit of the quick value. */ shift_steps = cris_get_asr_shift_steps (inst); value = inst_env->reg[REG_PC]; if (value & SIGNED_DWORD_MASK) @@ -2891,7 +2833,7 @@ none_reg_mode_jump_op (unsigned short inst, inst_env_type *inst_env) { check_assign (inst, inst_env); - /* Get the new value for the the PC. */ + /* Get the new value for the PC. */ newpc = read_memory_unsigned_integer ((CORE_ADDR) inst_env->prefix_value, 4, inst_env->byte_order); @@ -3870,26 +3812,25 @@ cris_delayed_get_disassembler (bfd_vma addr, struct disassemble_info *info) return print_insn (addr, info); } -/* Copied from . */ -typedef unsigned long elf_greg_t; +/* Originally from . */ +typedef unsigned char cris_elf_greg_t[4]; /* Same as user_regs_struct struct in . */ #define CRISV10_ELF_NGREG 35 -typedef elf_greg_t elf_gregset_t[CRISV10_ELF_NGREG]; +typedef cris_elf_greg_t cris_elf_gregset_t[CRISV10_ELF_NGREG]; #define CRISV32_ELF_NGREG 32 -typedef elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; +typedef cris_elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; -/* Unpack an elf_gregset_t into GDB's register cache. */ +/* Unpack a cris_elf_gregset_t into GDB's register cache. */ static void -cris_supply_gregset (struct regcache *regcache, elf_gregset_t *gregsetp) +cris_supply_gregset (struct regcache *regcache, cris_elf_gregset_t *gregsetp) { struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int i; - elf_greg_t *regp = *gregsetp; - static char zerobuf[4] = {0}; + cris_elf_greg_t *regp = *gregsetp; /* The kernel dumps all 32 registers as unsigned longs, but supply_register knows about the actual size of each register so that's no problem. */ @@ -3919,12 +3860,12 @@ fetch_core_registers (struct regcache *regcache, char *core_reg_sect, unsigned core_reg_size, int which, CORE_ADDR reg_addr) { - elf_gregset_t gregset; + cris_elf_gregset_t gregset; switch (which) { case 0: - if (core_reg_size != sizeof (elf_gregset_t) + if (core_reg_size != sizeof (cris_elf_gregset_t) && core_reg_size != sizeof (crisv32_elf_gregset_t)) { warning (_("wrong size gregset struct in core file")); @@ -3957,25 +3898,22 @@ extern initialize_file_ftype _initialize_cris_tdep; /* -Wmissing-prototypes */ void _initialize_cris_tdep (void) { - static struct cmd_list_element *cris_set_cmdlist; - static struct cmd_list_element *cris_show_cmdlist; - struct cmd_list_element *c; gdbarch_register (bfd_arch_cris, cris_gdbarch_init, cris_dump_tdep); /* CRIS-specific user-commands. */ - add_setshow_uinteger_cmd ("cris-version", class_support, - &usr_cmd_cris_version, - _("Set the current CRIS version."), - _("Show the current CRIS version."), - _("\ + add_setshow_zuinteger_cmd ("cris-version", class_support, + &usr_cmd_cris_version, + _("Set the current CRIS version."), + _("Show the current CRIS version."), + _("\ Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n\ Defaults to 10. "), - set_cris_version, - NULL, /* FIXME: i18n: Current CRIS version - is %s. */ - &setlist, &showlist); + set_cris_version, + NULL, /* FIXME: i18n: Current CRIS version + is %s. */ + &setlist, &showlist); add_setshow_enum_cmd ("cris-mode", class_support, cris_modes, &usr_cmd_cris_mode, @@ -4064,7 +4002,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { struct gdbarch *gdbarch; struct gdbarch_tdep *tdep; - int cris_version; + unsigned int cris_version; if (usr_cmd_cris_version_valid) { @@ -4227,9 +4165,9 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) frame_unwind_append_unwinder (gdbarch, &cris_frame_unwind); frame_base_set_default (gdbarch, &cris_frame_base); - set_solib_svr4_fetch_link_map_offsets - (gdbarch, svr4_ilp32_fetch_link_map_offsets); - + /* Hook in ABI-specific overrides, if they have been registered. */ + gdbarch_init_osabi (info, gdbarch); + /* FIXME: cagney/2003-08-27: It should be possible to select a CRIS disassembler, even when there is no BFD. Does something like "gdb; target remote; disassmeble *0x123" work? */