From 1ed586ce1dd53225383bdc7a09ff0939266994b6 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 28 Feb 2014 23:06:14 +0100 Subject: [PATCH] Enable rthreads supports on OpenBSD/sparc64. gdb/ChangeLog: * configure.host (sparc64-*-openbsd*): Set gdb_host to obsd64. * config/sparc/obsd64.mh: New file. * sparc64obsd-nat.c: New file. --- gdb/ChangeLog | 4 ++ gdb/config/sparc/obsd64.mh | 5 ++ gdb/configure.host | 2 +- gdb/sparc64obsd-nat.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 gdb/config/sparc/obsd64.mh create mode 100644 gdb/sparc64obsd-nat.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0633829..ff01d2b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2014-02-28 Mark Kettenis + * configure.host (sparc64-*-openbsd*): Set gdb_host to obsd64. + * config/sparc/obsd64.mh: New file. + * sparc64obsd-nat.c: New file. + * obsd-nat.h: New file. * obsd-nat.c: New file. * Makefile.in (HFILES_NO_SRCDIR): Add obsd-nat.h. diff --git a/gdb/config/sparc/obsd64.mh b/gdb/config/sparc/obsd64.mh new file mode 100644 index 0000000..d15e34d --- /dev/null +++ b/gdb/config/sparc/obsd64.mh @@ -0,0 +1,5 @@ +# Host: OpenBSD/sparc64 +NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \ + sparc64obsd-nat.o sparc-nat.o bsd-kvm.o + +LOADLIBES= -lkvm diff --git a/gdb/configure.host b/gdb/configure.host index 634213f..15a8288 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -164,7 +164,7 @@ sparc-*-netbsdelf* | sparc-*-knetbsd*-gnu) sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu) gdb_host=nbsd64 ;; sparc-*-openbsd*) gdb_host=nbsdelf ;; -sparc64-*-openbsd*) gdb_host=nbsd64 ;; +sparc64-*-openbsd*) gdb_host=obsd64 ;; sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*) gdb_host=sol2 ;; diff --git a/gdb/sparc64obsd-nat.c b/gdb/sparc64obsd-nat.c new file mode 100644 index 0000000..a6cf8b3 --- /dev/null +++ b/gdb/sparc64obsd-nat.c @@ -0,0 +1,131 @@ +/* Native-dependent code for OpenBSD/sparc64. + + Copyright (C) 2003-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" +#include "gdbcore.h" +#include "regcache.h" +#include "target.h" + +#include "sparc64-tdep.h" +#include "sparc-nat.h" +#include "obsd-nat.h" + +/* Determine whether `gregset_t' contains register REGNUM. */ + +static int +sparc64obsd_gregset_supplies_p (struct gdbarch *gdbarch, int regnum) +{ + /* Integer registers. */ + if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM) + || (regnum >= SPARC_O0_REGNUM && regnum <= SPARC_O7_REGNUM) + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_L7_REGNUM) + || (regnum >= SPARC_I0_REGNUM && regnum <= SPARC_I7_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_PC_REGNUM + || regnum == SPARC64_NPC_REGNUM + || regnum == SPARC64_STATE_REGNUM + || regnum == SPARC64_Y_REGNUM) + return 1; + + return 0; +} + +/* Determine whether `fpregset_t' contains register REGNUM. */ + +static int +sparc64obsd_fpregset_supplies_p (struct gdbarch *gdbarch, int regnum) +{ + /* Floating-point registers. */ + if ((regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM) + || (regnum >= SPARC64_F32_REGNUM && regnum <= SPARC64_F62_REGNUM)) + return 1; + + /* Control registers. */ + if (regnum == SPARC64_FSR_REGNUM) + return 1; + + return 0; +} + + +/* Support for debugging kernel virtual memory images. */ + +#include +#include + +#include "bsd-kvm.h" + +static int +sparc64obsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) +{ + u_int64_t state; + int regnum; + + /* The following is true for OpenBSD 3.0: + + The pcb contains %sp and %pc, %pstate and %cwp. From this + information we reconstruct the register state as it would look + when we just returned from cpu_switch(). */ + + /* The stack pointer shouldn't be zero. */ + if (pcb->pcb_sp == 0) + return 0; + + /* If the program counter is zero, this is probably a core dump, and + we can get %pc from the stack. */ + if (pcb->pcb_pc == 0) + read_memory(pcb->pcb_sp + BIAS - 176 + (11 * 8), + (gdb_byte *)&pcb->pcb_pc, sizeof pcb->pcb_pc); + + regcache_raw_supply (regcache, SPARC_SP_REGNUM, &pcb->pcb_sp); + regcache_raw_supply (regcache, SPARC64_PC_REGNUM, &pcb->pcb_pc); + + state = pcb->pcb_pstate << 8 | pcb->pcb_cwp; + regcache_raw_supply (regcache, SPARC64_STATE_REGNUM, &state); + + sparc_supply_rwindow (regcache, pcb->pcb_sp, -1); + + return 1; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_sparc64obsd_nat (void); + +void +_initialize_sparc64obsd_nat (void) +{ + sparc_supply_gregset = sparc64_supply_gregset; + sparc_collect_gregset = sparc64_collect_gregset; + sparc_supply_fpregset = sparc64_supply_fpregset; + sparc_collect_fpregset = sparc64_collect_fpregset; + sparc_gregset_supplies_p = sparc64obsd_gregset_supplies_p; + sparc_fpregset_supplies_p = sparc64obsd_fpregset_supplies_p; + + sparc_gregset = &sparc64nbsd_gregset; + sparc_fpregset = &sparc64_bsd_fpregset; + + /* Add some extra features to the generic SPARC target. */ + obsd_add_target (sparc_target ()); + + /* Support debugging kernel virtual memory images. */ + bsd_kvm_add_target (sparc64obsd_supply_pcb); +} -- 2.7.4