[PATCH/SPARC] Add/Fix NetBSD signal trampoline handling
Mark Kettenis
kettenis@chello.nl
Thu Jan 1 20:34:00 GMT 2004
This patch adds signal trampoline handling for NetBSD/sparc64. While
doing so I discovered some bugs in the NetBSD/sparc code, so this
patch fixes that too.
Committed to the branch.
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* sparc64-tdep.h: Update copyright year.
(BIAS): Define.
* sparc64nbsd-tdep.c: Update copyright year. Include "frame.h",
"frame-unwind.h", "symtab.h", "trad-frame.h" and "gdb_assert.h".
(sparc64nbsd_sigtramp_start, sparc64nbsd_sigtramp_end): New
variables.
(sparc64nbsd_pc_in_sigtramp, sparc64nbsd_sigcontext_frame_cache)
(sparc64nbsd_sigcontext_frame_this_id)
(sparc64nbsd_sigcontext_frame_prev_register): New functions.
(sparc64nbsd_sigcontext_frame_unwind): New variable.
(sparc64nbsd_sigtramp_frame_sniffer): New function.
(sparc64nbsd_init_abi): Set pc_in_sigtramp to
sparc64nbsd_in_sigtramp. Append sparc64nbsd_sigtramp_sniffer.
* sparcnbsd-tdep.c (sparc32nbsd_sigcontext_frame_cache): Provide
location where %y is saved. Provide correct location for saved
floating-point registers.
Index: sparc64nbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/Attic/sparc64nbsd-tdep.c,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 sparc64nbsd-tdep.c
--- sparc64nbsd-tdep.c 26 Dec 2003 23:42:59 -0000 1.1.2.1
+++ sparc64nbsd-tdep.c 1 Jan 2004 20:09:02 -0000
@@ -1,6 +1,6 @@
/* Target-dependent code for NetBSD/sparc64.
- Copyright 2002, 2003 Free Software Foundation, Inc.
+ Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
Contributed by Wasabi Systems, Inc.
This file is part of GDB.
@@ -21,16 +21,22 @@
Boston, MA 02111-1307, USA. */
#include "defs.h"
+#include "frame.h"
+#include "frame-unwind.h"
#include "gdbcore.h"
#include "osabi.h"
#include "regcache.h"
+#include "symtab.h"
#include "solib-svr4.h"
+#include "trad-frame.h"
+#include "gdb_assert.h"
#include "gdb_string.h"
#include "sparc64-tdep.h"
#include "nbsd-tdep.h"
+/* From <machine/reg.h>. */
const struct sparc_gregset sparc64nbsd_gregset =
{
0 * 8, /* "tstate" */
@@ -83,13 +89,156 @@ static struct core_fns sparc64nbsd_core_
fetch_core_registers, /* core_read_registers */
NULL
};
+
+/* Signal trampolines. */
+
+/* The following variables describe the location of an on-stack signal
+ trampoline. The current values correspond to the memory layout for
+ NetBSD 1.3 and up. These shouldn't be necessary for NetBSD 2.0 and
+ up, since NetBSD uses signal trampolines provided by libc now. */
+
+static const CORE_ADDR sparc64nbsd_sigtramp_start = 0xffffffffffffdee4;
+static const CORE_ADDR sparc64nbsd_sigtramp_end = 0xffffffffffffe000;
+
+static int
+sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+{
+ if (pc >= sparc64nbsd_sigtramp_start && pc < sparc64nbsd_sigtramp_end)
+ return 1;
+
+ return nbsd_pc_in_sigtramp (pc, name);
+}
+
+static struct sparc_frame_cache *
+sparc64nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
+ void **this_cache)
+{
+ struct sparc_frame_cache *cache;
+ CORE_ADDR addr, sigcontext_addr, sp;
+ LONGEST fprs;
+ int regnum, delta;
+
+ if (*this_cache)
+ return *this_cache;
+
+ cache = sparc_frame_cache (next_frame, this_cache);
+ gdb_assert (cache == *this_cache);
+
+ /* The registers are saved in bits and pieces scattered all over the
+ place. The code below records their location on the assumption
+ that the part of the signal trampoline that saves the state has
+ been executed. */
+
+ /* If we couldn't find the frame's function, we're probably dealing
+ with an on-stack signal trampoline. */
+ if (cache->pc == 0)
+ {
+ cache->pc = sparc64nbsd_sigtramp_start;
+
+ /* Since we couldn't find the frame's function, the cache was
+ initialized under the assumption that we're frameless. */
+ cache->frameless_p = 0;
+ addr = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM);
+ cache->base = addr;
+ }
+
+ cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+
+ /* We find the appropriate instance of `struct sigcontext' at a
+ fixed offset in the signal frame. */
+ sigcontext_addr = cache->base + BIAS + 128 + 8;
+
+ cache->saved_regs[SPARC_SP_REGNUM].addr = sigcontext_addr + 8;
+ cache->saved_regs[SPARC64_PC_REGNUM].addr = sigcontext_addr + 16;
+ cache->saved_regs[SPARC64_NPC_REGNUM].addr = sigcontext_addr + 24;
+ cache->saved_regs[SPARC64_STATE_REGNUM].addr = sigcontext_addr + 32;
+ cache->saved_regs[SPARC_G1_REGNUM].addr = sigcontext_addr + 40;
+ cache->saved_regs[SPARC_O0_REGNUM].addr = sigcontext_addr + 48;
+
+ /* The remaining `global' registers and %y are saved in the `local'
+ registers. */
+ delta = SPARC_L0_REGNUM - SPARC_G0_REGNUM;
+ for (regnum = SPARC_G2_REGNUM; regnum <= SPARC_G7_REGNUM; regnum++)
+ cache->saved_regs[regnum].realreg = regnum + delta;
+ cache->saved_regs[SPARC64_Y_REGNUM].realreg = SPARC_L1_REGNUM;
+
+ /* The remaining `out' registers can be found in the current frame's
+ `in' registers. */
+ delta = SPARC_I0_REGNUM - SPARC_O0_REGNUM;
+ for (regnum = SPARC_O1_REGNUM; regnum <= SPARC_O5_REGNUM; regnum++)
+ cache->saved_regs[regnum].realreg = regnum + delta;
+ cache->saved_regs[SPARC_O7_REGNUM].realreg = SPARC_I7_REGNUM;
+
+ /* The `local' and `in' registers have been saved in the register
+ save area. */
+ addr = cache->saved_regs[SPARC_SP_REGNUM].addr;
+ sp = get_frame_memory_unsigned (next_frame, addr, 8);
+ for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS;
+ regnum <= SPARC_I7_REGNUM; regnum++, addr += 8)
+ cache->saved_regs[regnum].addr = addr;
+
+ /* TODO: Handle the floating-point registers. */
+
+ return cache;
+}
+
+static void
+sparc64nbsd_sigcontext_frame_this_id (struct frame_info *next_frame,
+ void **this_cache,
+ struct frame_id *this_id)
+{
+ struct sparc_frame_cache *cache =
+ sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache);
+
+ (*this_id) = frame_id_build (cache->base, cache->pc);
+}
+
+static void
+sparc64nbsd_sigcontext_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)
+{
+ struct sparc_frame_cache *cache =
+ sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache);
+
+ trad_frame_prev_register (next_frame, cache->saved_regs, regnum,
+ optimizedp, lvalp, addrp, realnump, valuep);
+}
+
+static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
+{
+ SIGTRAMP_FRAME,
+ sparc64nbsd_sigcontext_frame_this_id,
+ sparc64nbsd_sigcontext_frame_prev_register
+};
+
+static const struct frame_unwind *
+sparc64nbsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
+{
+ CORE_ADDR pc = frame_pc_unwind (next_frame);
+ char *name;
+
+ find_pc_partial_function (pc, &name, NULL, NULL);
+ if (sparc64nbsd_pc_in_sigtramp (pc, name))
+ {
+ if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21))
+ return &sparc64nbsd_sigcontext_frame_unwind;
+ }
+
+ return NULL;
+}
+
static void
sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
- sparc64_init_abi (info, gdbarch);
+ set_gdbarch_pc_in_sigtramp (gdbarch, sparc64nbsd_pc_in_sigtramp);
+ frame_unwind_append_sniffer (gdbarch, sparc64nbsd_sigtramp_frame_sniffer);
- set_gdbarch_pc_in_sigtramp (gdbarch, nbsd_pc_in_sigtramp);
+ sparc64_init_abi (info, gdbarch);
set_solib_svr4_fetch_link_map_offsets
(gdbarch, nbsd_lp64_solib_svr4_fetch_link_map_offsets);
Index: sparcnbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparcnbsd-tdep.c,v
retrieving revision 1.7.2.5
diff -u -p -r1.7.2.5 sparcnbsd-tdep.c
--- sparcnbsd-tdep.c 31 Dec 2003 20:46:51 -0000 1.7.2.5
+++ sparcnbsd-tdep.c 1 Jan 2004 20:09:02 -0000
@@ -164,11 +164,12 @@ sparc32nbsd_sigcontext_frame_cache (stru
cache->saved_regs[SPARC_G1_REGNUM].addr = sigcontext_addr + 24;
cache->saved_regs[SPARC_O0_REGNUM].addr = sigcontext_addr + 28;
- /* The remaining `global' registers are saved in the `local'
+ /* The remaining `global' registers and %y are saved in the `local'
registers. */
delta = SPARC_L0_REGNUM - SPARC_G0_REGNUM;
for (regnum = SPARC_G2_REGNUM; regnum <= SPARC_G7_REGNUM; regnum++)
cache->saved_regs[regnum].realreg = regnum + delta;
+ cache->saved_regs[SPARC32_Y_REGNUM].realreg = SPARC_L1_REGNUM;
/* The remaining `out' registers can be found in the current frame's
`in' registers. */
@@ -194,8 +195,11 @@ sparc32nbsd_sigcontext_frame_cache (stru
psr = get_frame_memory_unsigned (next_frame, addr, 4);
if (psr & PSR_EF)
{
- addr = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM);
- for (regnum = SPARC_F0_REGNUM;
+ CORE_ADDR sp;
+
+ sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM);
+ cache->saved_regs[SPARC32_FSR_REGNUM].addr = sp + 96;
+ for (regnum = SPARC_F0_REGNUM, addr = sp + 96 + 8;
regnum <= SPARC_F31_REGNUM; regnum++, addr += 4)
cache->saved_regs[regnum].addr = addr;
}
More information about the Gdb-patches
mailing list