X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparc64-sol2-tdep.c;h=a1367423c35f852618bf7a101462b3de3734a1ad;hb=441af85bd9c68dbc0c2a1dbe23bf07c6cb3c3f5d;hp=ab9a4610d4a6ac52578a6a5f2fb4f6582e0e4882;hpb=203c3895a5003367e77494ca9428446417fce1bc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c index ab9a4610d4..a1367423c3 100644 --- a/gdb/sparc64-sol2-tdep.c +++ b/gdb/sparc64-sol2-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for Solaris UltraSPARC. - Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -25,15 +25,14 @@ #include "objfiles.h" #include "osabi.h" #include "trad-frame.h" - -#include "gdb_assert.h" +#include "regset.h" #include "sol2-tdep.h" #include "sparc64-tdep.h" #include "solib-svr4.h" /* From . */ -const struct sparc_gregset sparc64_sol2_gregset = +const struct sparc_gregmap sparc64_sol2_gregmap = { 32 * 8, /* "tstate" */ 33 * 8, /* %pc */ @@ -45,10 +44,62 @@ const struct sparc_gregset sparc64_sol2_gregset = 16 * 8, /* %l0 */ 8 /* sizeof (%y) */ }; + +const struct sparc_fpregmap sparc64_sol2_fpregmap = +{ + 0 * 8, /* %f0 */ + 33 * 8, /* %fsr */ +}; + +static void +sparc64_sol2_supply_core_gregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + sparc64_supply_gregset (&sparc64_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc64_sol2_collect_core_gregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + sparc64_collect_gregset (&sparc64_sol2_gregmap, regcache, regnum, gregs); +} + +static void +sparc64_sol2_supply_core_fpregset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *fpregs, size_t len) +{ + sparc64_supply_fpregset (&sparc64_sol2_fpregmap, regcache, regnum, fpregs); +} + +static void +sparc64_sol2_collect_core_fpregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *fpregs, size_t len) +{ + sparc64_collect_fpregset (&sparc64_sol2_fpregmap, regcache, regnum, fpregs); +} + +static const struct regset sparc64_sol2_gregset = + { + NULL, + sparc64_sol2_supply_core_gregset, + sparc64_sol2_collect_core_gregset + }; + +static const struct regset sparc64_sol2_fpregset = + { + NULL, + sparc64_sol2_supply_core_fpregset, + sparc64_sol2_collect_core_fpregset + }; static struct sparc_frame_cache * -sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, +sparc64_sol2_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) { struct sparc_frame_cache *cache; @@ -56,18 +107,19 @@ sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, int regnum; if (*this_cache) - return *this_cache; + return (struct sparc_frame_cache *) *this_cache; - cache = sparc_frame_cache (next_frame, this_cache); + cache = sparc_frame_cache (this_frame, this_cache); gdb_assert (cache == *this_cache); - cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); + cache->saved_regs = trad_frame_alloc_saved_regs (this_frame); /* The third argument is a pointer to an instance of `ucontext_t', which has a member `uc_mcontext' that contains the saved registers. */ - regnum = (cache->frameless_p ? SPARC_O2_REGNUM : SPARC_I2_REGNUM); - mcontext_addr = frame_unwind_register_unsigned (next_frame, regnum) + 64; + regnum = + (cache->copied_regs_mask & 0x04) ? SPARC_I2_REGNUM : SPARC_O2_REGNUM; + mcontext_addr = get_frame_register_unsigned (this_frame, regnum) + 64; cache->saved_regs[SPARC64_CCR_REGNUM].addr = mcontext_addr + 0 * 8; cache->saved_regs[SPARC64_PC_REGNUM].addr = mcontext_addr + 1 * 8; @@ -81,7 +133,7 @@ sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, regnum <= SPARC_O7_REGNUM; regnum++, addr += 8) cache->saved_regs[regnum].addr = addr; - if (get_frame_memory_unsigned (next_frame, mcontext_addr + 21 * 8, 8)) + if (get_frame_memory_unsigned (this_frame, mcontext_addr + 21 * 8, 8)) { /* The register windows haven't been flushed. */ for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++) @@ -92,7 +144,7 @@ sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, CORE_ADDR sp; addr = cache->saved_regs[SPARC_SP_REGNUM].addr; - sp = get_frame_memory_unsigned (next_frame, addr, 8); + sp = get_frame_memory_unsigned (this_frame, addr, 8); for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS; regnum <= SPARC_I7_REGNUM; regnum++, addr += 8) cache->saved_regs[regnum].addr = addr; @@ -102,50 +154,51 @@ sparc64_sol2_sigtramp_frame_cache (struct frame_info *next_frame, } static void -sparc64_sol2_sigtramp_frame_this_id (struct frame_info *next_frame, +sparc64_sol2_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { struct sparc_frame_cache *cache = - sparc64_sol2_sigtramp_frame_cache (next_frame, this_cache); + sparc64_sol2_sigtramp_frame_cache (this_frame, this_cache); (*this_id) = frame_id_build (cache->base, cache->pc); } -static void -sparc64_sol2_sigtramp_frame_prev_register (struct frame_info *next_frame, +static struct value * +sparc64_sol2_sigtramp_frame_prev_register (struct frame_info *this_frame, void **this_cache, - int regnum, int *optimizedp, - enum lval_type *lvalp, - CORE_ADDR *addrp, - int *realnump, gdb_byte *valuep) + int regnum) { struct sparc_frame_cache *cache = - sparc64_sol2_sigtramp_frame_cache (next_frame, this_cache); + sparc64_sol2_sigtramp_frame_cache (this_frame, this_cache); - trad_frame_get_prev_register (next_frame, cache->saved_regs, regnum, - optimizedp, lvalp, addrp, realnump, valuep); + return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum); } -static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind = -{ - SIGTRAMP_FRAME, - sparc64_sol2_sigtramp_frame_this_id, - sparc64_sol2_sigtramp_frame_prev_register -}; - -static const struct frame_unwind * -sparc64_sol2_sigtramp_frame_sniffer (struct frame_info *next_frame) +static int +sparc64_sol2_sigtramp_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_cache) { - CORE_ADDR pc = frame_pc_unwind (next_frame); - char *name; + CORE_ADDR pc = get_frame_pc (this_frame); + const char *name; find_pc_partial_function (pc, &name, NULL, NULL); if (sparc_sol2_pc_in_sigtramp (pc, name)) - return &sparc64_sol2_sigtramp_frame_unwind; + return 1; - return NULL; + return 0; } +static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + default_frame_unwind_stop_reason, + sparc64_sol2_sigtramp_frame_this_id, + sparc64_sol2_sigtramp_frame_prev_register, + NULL, + sparc64_sol2_sigtramp_frame_sniffer +}; + void @@ -153,7 +206,13 @@ sparc64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - frame_unwind_append_sniffer (gdbarch, sparc64_sol2_sigtramp_frame_sniffer); + tdep->gregset = &sparc64_sol2_gregset; + tdep->sizeof_gregset = 304; + + tdep->fpregset = &sparc64_sol2_fpregset; + tdep->sizeof_fpregset = 544; + + frame_unwind_append_unwinder (gdbarch, &sparc64_sol2_sigtramp_frame_unwind); sparc64_init_abi (info, gdbarch); @@ -179,11 +238,10 @@ sparc64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* Solaris has kernel-assisted single-stepping support. */ set_gdbarch_software_single_step (gdbarch, NULL); -} - -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_sparc64_sol2_tdep (void); + /* How to print LWP PTIDs from core files. */ + set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str); +} void _initialize_sparc64_sol2_tdep (void)