X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparc-sol2-tdep.c;h=381adf9f619282aa8461924981f16b1b0810792c;hb=9fb5010805bdfe0eb8fc5db01e7f4c93b04c8f29;hp=50434f695f7478a8091d76de49498775c429d979;hpb=203c3895a5003367e77494ca9428446417fce1bc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c index 50434f695f..381adf9f61 100644 --- a/gdb/sparc-sol2-tdep.c +++ b/gdb/sparc-sol2-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for Solaris SPARC. - Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -29,7 +29,7 @@ #include "trad-frame.h" #include "gdb_assert.h" -#include "gdb_string.h" +#include #include "sol2-tdep.h" #include "sparc-tdep.h" @@ -47,6 +47,12 @@ const struct sparc_gregset sparc32_sol2_gregset = 1 * 4, /* %g1 */ 16 * 4, /* %l0 */ }; + +const struct sparc_fpregset sparc32_sol2_fpregset = +{ + 0 * 4, /* %f0 */ + 33 * 4, /* %fsr */ +}; /* The Solaris signal trampolines reside in libc. For normal signals, @@ -56,7 +62,7 @@ const struct sparc_gregset sparc32_sol2_gregset = `ucontext_t', which has a member `uc_mcontext' that contains the saved registers. Incidentally, the kernel passes the `ucontext_t' pointer as the third argument of the signal trampoline too, and - `sigacthandler' simply passes it on. However, if you link your + `sigacthandler' simply passes it on. However, if you link your program with "-L/usr/ucblib -R/usr/ucblib -lucb", the function `ucbsigvechandler' will be used, which invokes the using the BSD convention, where the third argument is a pointer to an instance of @@ -66,7 +72,7 @@ const struct sparc_gregset sparc32_sol2_gregset = ignore this. */ int -sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name) +sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name) { return (name && (strcmp (name, "sigacthandler") == 0 || strcmp (name, "ucbsigvechandler") == 0 @@ -74,7 +80,7 @@ sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name) } static struct sparc_frame_cache * -sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, +sparc32_sol2_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) { struct sparc_frame_cache *cache; @@ -84,16 +90,17 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, if (*this_cache) return *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) + 40; + regnum = + (cache->copied_regs_mask & 0x04) ? SPARC_I2_REGNUM : SPARC_O2_REGNUM; + mcontext_addr = get_frame_register_unsigned (this_frame, regnum) + 40; cache->saved_regs[SPARC32_PSR_REGNUM].addr = mcontext_addr + 0 * 4; cache->saved_regs[SPARC32_PC_REGNUM].addr = mcontext_addr + 1 * 4; @@ -105,7 +112,7 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, regnum <= SPARC_O7_REGNUM; regnum++, addr += 4) cache->saved_regs[regnum].addr = addr; - if (get_frame_memory_unsigned (next_frame, mcontext_addr + 19 * 4, 4)) + if (get_frame_memory_unsigned (this_frame, mcontext_addr + 19 * 4, 4)) { /* The register windows haven't been flushed. */ for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++) @@ -114,7 +121,7 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, else { addr = cache->saved_regs[SPARC_SP_REGNUM].addr; - addr = get_frame_memory_unsigned (next_frame, addr, 4); + addr = get_frame_memory_unsigned (this_frame, addr, 4); for (regnum = SPARC_L0_REGNUM; regnum <= SPARC_I7_REGNUM; regnum++, addr += 4) cache->saved_regs[regnum].addr = addr; @@ -124,55 +131,56 @@ sparc32_sol2_sigtramp_frame_cache (struct frame_info *next_frame, } static void -sparc32_sol2_sigtramp_frame_this_id (struct frame_info *next_frame, +sparc32_sol2_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { struct sparc_frame_cache *cache = - sparc32_sol2_sigtramp_frame_cache (next_frame, this_cache); + sparc32_sol2_sigtramp_frame_cache (this_frame, this_cache); (*this_id) = frame_id_build (cache->base, cache->pc); } -static void -sparc32_sol2_sigtramp_frame_prev_register (struct frame_info *next_frame, +static struct value * +sparc32_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 = - sparc32_sol2_sigtramp_frame_cache (next_frame, this_cache); + sparc32_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 sparc32_sol2_sigtramp_frame_unwind = +static int +sparc32_sol2_sigtramp_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_cache) { - SIGTRAMP_FRAME, - sparc32_sol2_sigtramp_frame_this_id, - sparc32_sol2_sigtramp_frame_prev_register -}; - -static const struct frame_unwind * -sparc32_sol2_sigtramp_frame_sniffer (struct frame_info *next_frame) -{ - 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 &sparc32_sol2_sigtramp_frame_unwind; + return 1; - return NULL; + return 0; } +static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind = +{ + SIGTRAMP_FRAME, + default_frame_unwind_stop_reason, + sparc32_sol2_sigtramp_frame_this_id, + sparc32_sol2_sigtramp_frame_prev_register, + NULL, + sparc32_sol2_sigtramp_frame_sniffer +}; + /* Unglobalize NAME. */ -char * -sparc_sol2_static_transform_name (char *name) +const const char * +sparc_sol2_static_transform_name (const char *name) { /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop, SunPRO) convert file static variables into global values, a @@ -229,7 +237,10 @@ sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* Solaris has kernel-assisted single-stepping support. */ set_gdbarch_software_single_step (gdbarch, NULL); - frame_unwind_append_sniffer (gdbarch, sparc32_sol2_sigtramp_frame_sniffer); + frame_unwind_append_unwinder (gdbarch, &sparc32_sol2_sigtramp_frame_unwind); + + /* How to print LWP PTIDs from core files. */ + set_gdbarch_core_pid_to_str (gdbarch, sol2_core_pid_to_str); }