X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxstormy16-tdep.c;h=9818d97d44a768fa9c33e6d0f8971cc6588e1b63;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=b2f0c5eaeb368efca12345d26f8e2a252cbecceb;hpb=598cc9dc84aeaa66e4a77efa9dc8ff03d5532620;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index b2f0c5eaeb..9818d97d44 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-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,7 @@ #include "frame.h" #include "frame-base.h" #include "frame-unwind.h" -#include "dwarf2-frame.h" +#include "dwarf2/frame.h" #include "symtab.h" #include "gdbtypes.h" #include "gdbcmd.h" @@ -30,11 +30,10 @@ #include "dis-asm.h" #include "inferior.h" #include "arch-utils.h" -#include "floatformat.h" #include "regcache.h" -#include "doublest.h" #include "osabi.h" #include "objfiles.h" +#include "gdbsupport/byte-vector.h" enum gdb_regnum { @@ -44,7 +43,7 @@ enum gdb_regnum to the function in r2. Further arguments are beginning in r3 then. R13 is used as frame pointer when GCC compiles w/o optimization R14 is used as "PSW", displaying the CPU status. - R15 is used implicitely as stack pointer. */ + R15 is used implicitly as stack pointer. */ E_R0_REGNUM, E_R1_REGNUM, E_R2_REGNUM, E_1ST_ARG_REGNUM = E_R2_REGNUM, E_PTR_RET_REGNUM = E_R2_REGNUM, @@ -103,7 +102,7 @@ enum static const char * xstormy16_register_name (struct gdbarch *gdbarch, int regnum) { - static char *register_names[] = { + static const char *register_names[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13", "psw", "sp", "pc" @@ -134,9 +133,9 @@ xstormy16_register_type (struct gdbarch *gdbarch, int regnum) static int xstormy16_type_is_scalar (struct type *t) { - return (TYPE_CODE(t) != TYPE_CODE_STRUCT - && TYPE_CODE(t) != TYPE_CODE_UNION - && TYPE_CODE(t) != TYPE_CODE_ARRAY); + return (t->code () != TYPE_CODE_STRUCT + && t->code () != TYPE_CODE_UNION + && t->code () != TYPE_CODE_ARRAY); } /* Function: xstormy16_use_struct_convention @@ -164,7 +163,7 @@ xstormy16_extract_return_value (struct type *type, struct regcache *regcache, int i, regnum = E_1ST_ARG_REGNUM; for (i = 0; i < len; i += xstormy16_reg_size) - regcache_raw_read (regcache, regnum++, valbuf + i); + regcache->raw_read (regnum++, valbuf + i); } /* Function: xstormy16_store_return_value @@ -182,7 +181,7 @@ xstormy16_store_return_value (struct type *type, struct regcache *regcache, gdb_byte buf[xstormy16_reg_size]; memset (buf, 0, xstormy16_reg_size); memcpy (buf, valbuf, 1); - regcache_raw_write (regcache, E_1ST_ARG_REGNUM, buf); + regcache->raw_write (E_1ST_ARG_REGNUM, buf); } else { @@ -190,7 +189,7 @@ xstormy16_store_return_value (struct type *type, struct regcache *regcache, int i, regnum = E_1ST_ARG_REGNUM; for (i = 0; i < len; i += xstormy16_reg_size) - regcache_raw_write (regcache, regnum++, valbuf + i); + regcache->raw_write (regnum++, valbuf + i); } } @@ -227,7 +226,8 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, - CORE_ADDR sp, int struct_return, + CORE_ADDR sp, + function_call_return_method return_method, CORE_ADDR struct_addr) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); @@ -235,12 +235,11 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, int argreg = E_1ST_ARG_REGNUM; int i, j; int typelen, slacklen; - const gdb_byte *val; gdb_byte buf[xstormy16_pc_size]; - /* If struct_return is true, then the struct return address will - consume one argument-passing register. */ - if (struct_return) + /* If returning a struct using target ABI method, then the struct return + address will consume one argument-passing register. */ + if (return_method == return_method_struct) { regcache_cooked_write_unsigned (regcache, E_PTR_RET_REGNUM, struct_addr); argreg++; @@ -258,7 +257,7 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, break; /* Put argument into registers wordwise. */ - val = value_contents (args[i]); + const gdb_byte *val = value_contents (args[i]); for (j = 0; j < typelen; j += xstormy16_reg_size) { ULONGEST regval; @@ -276,21 +275,17 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch, wordaligned. */ for (j = nargs - 1; j >= i; j--) { - gdb_byte *val; - struct cleanup *back_to; const gdb_byte *bytes = value_contents (args[j]); typelen = TYPE_LENGTH (value_enclosing_type (args[j])); slacklen = typelen & 1; - val = (gdb_byte *) xmalloc (typelen + slacklen); - back_to = make_cleanup (xfree, val); - memcpy (val, bytes, typelen); - memset (val + typelen, 0, slacklen); + gdb::byte_vector val (typelen + slacklen); + memcpy (val.data (), bytes, typelen); + memset (val.data () + typelen, 0, slacklen); /* Now write this data to the stack. The stack grows upwards. */ - write_memory (stack_dest, val, typelen + slacklen); + write_memory (stack_dest, val.data (), typelen + slacklen); stack_dest += typelen + slacklen; - do_cleanups (back_to); } store_unsigned_integer (buf, xstormy16_pc_size, byte_order, bp_addr); @@ -435,7 +430,7 @@ xstormy16_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) /* Found a function. */ sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol; /* Don't use line number debug info for assembly source files. */ - if (sym && SYMBOL_LANGUAGE (sym) != language_asm) + if (sym && sym->language () != language_asm) { sal = find_pc_line (func_addr, 0); if (sal.end && sal.end < func_end) @@ -506,9 +501,9 @@ xstormy16_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc) return 0; } -static unsigned char breakpoint[] = { 0x06, 0x0 }; +constexpr gdb_byte xstormy16_break_insn[] = { 0x06, 0x0 }; -GDBARCH_BREAKPOINT_MANIPULATION (xstormy16, breakpoint) +typedef BP_MANIPULATION (xstormy16_break_insn) xstormy16_breakpoint; /* Given a pointer to a jump table entry, return the address of the function it jumps to. Return 0 if not found. */ @@ -615,7 +610,7 @@ 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)); + enum type_code target = TYPE_TARGET_TYPE (type)->code (); CORE_ADDR addr = extract_unsigned_integer (buf, TYPE_LENGTH (type), byte_order); @@ -634,7 +629,7 @@ 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)); + enum type_code target = TYPE_TARGET_TYPE (type)->code (); if (target == TYPE_CODE_FUNC || target == TYPE_CODE_METHOD) { @@ -756,26 +751,6 @@ static const struct frame_base xstormy16_frame_base = { xstormy16_frame_base_address }; -static CORE_ADDR -xstormy16_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, E_SP_REGNUM); -} - -static CORE_ADDR -xstormy16_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, E_PC_REGNUM); -} - -static struct frame_id -xstormy16_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) -{ - CORE_ADDR sp = get_frame_register_unsigned (this_frame, E_SP_REGNUM); - return frame_id_build (sp, get_frame_pc (this_frame)); -} - - /* Function: xstormy16_gdbarch_init Initializer function for the xstormy16 gdbarch vector. Called by gdbarch. Sets up the gdbarch vector(s) for this target. */ @@ -809,6 +784,9 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_long_long_bit (gdbarch, 8 * TARGET_CHAR_BIT); + set_gdbarch_wchar_bit (gdbarch, 2 * TARGET_CHAR_BIT); + set_gdbarch_wchar_signed (gdbarch, 1); + set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT); set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT); @@ -826,9 +804,6 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* * Frame Info */ - set_gdbarch_unwind_sp (gdbarch, xstormy16_unwind_sp); - set_gdbarch_unwind_pc (gdbarch, xstormy16_unwind_pc); - set_gdbarch_dummy_id (gdbarch, xstormy16_dummy_id); set_gdbarch_frame_align (gdbarch, xstormy16_frame_align); frame_base_set_default (gdbarch, &xstormy16_frame_base); @@ -838,13 +813,14 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* These values and methods are used when gdb calls a target function. */ set_gdbarch_push_dummy_call (gdbarch, xstormy16_push_dummy_call); - SET_GDBARCH_BREAKPOINT_MANIPULATION (xstormy16); + set_gdbarch_breakpoint_kind_from_pc (gdbarch, + xstormy16_breakpoint::kind_from_pc); + set_gdbarch_sw_breakpoint_from_kind (gdbarch, + xstormy16_breakpoint::bp_from_kind); set_gdbarch_return_value (gdbarch, xstormy16_return_value); set_gdbarch_skip_trampoline_code (gdbarch, xstormy16_skip_trampoline_code); - set_gdbarch_print_insn (gdbarch, print_insn_xstormy16); - gdbarch_init_osabi (info, gdbarch); dwarf2_append_unwinders (gdbarch); @@ -857,11 +833,9 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) Initializer function for the Sanyo Xstormy16a module. Called by gdb at start-up. */ -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_xstormy16_tdep; - +void _initialize_xstormy16_tdep (); void -_initialize_xstormy16_tdep (void) +_initialize_xstormy16_tdep () { register_gdbarch_init (bfd_arch_xstormy16, xstormy16_gdbarch_init); }