From 28d11a42f4cf335fb13a37aafcb24db0c83c3555 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 4 Mar 2013 20:10:50 +0000 Subject: [PATCH] make crash traces work on sparc64 --- usr.sbin/crash/Makefile | 5 ++- usr.sbin/crash/arch/sparc.c | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 usr.sbin/crash/arch/sparc.c diff --git a/usr.sbin/crash/Makefile b/usr.sbin/crash/Makefile index bdb0e803edb6..bc5442a5ec68 100644 --- a/usr.sbin/crash/Makefile +++ b/usr.sbin/crash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/11/04 11:12:32 apb Exp $ +# $NetBSD: Makefile,v 1.24 2013/03/04 20:10:50 christos Exp $ PROG= crash MAN= crash.8 @@ -53,6 +53,9 @@ MACHINE_FAMILY = x86 . elif ${MACHINE_ARCH} == "m68k" \ || ${MACHINE_ARCH} == "arm" MACHINE_FAMILY = ${MACHINE_ARCH} +. elif ${MACHINE} == "sparc64" \ + || ${MACHINE} == "sparc64" +MACHINE_FAMILY = sparc . else MACHINE_FAMILY = ${MACHINE} . endif diff --git a/usr.sbin/crash/arch/sparc.c b/usr.sbin/crash/arch/sparc.c new file mode 100644 index 000000000000..4f630b19da64 --- /dev/null +++ b/usr.sbin/crash/arch/sparc.c @@ -0,0 +1,66 @@ +/* $NetBSD: sparc.c,v 1.1 2013/03/04 20:10:51 christos Exp $ */ + +/*- + * Copyright (c) 2009 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Andrew Doran. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#ifndef lint +__RCSID("$NetBSD: sparc.c,v 1.1 2013/03/04 20:10:51 christos Exp $"); +#endif /* not lint */ + +#include + +#include +#include +#include +#include + +#include + +#include "extern.h" + +static struct nlist nl[] = { + { .n_name = "dumppcb" }, + { .n_name = NULL }, +}; + +struct pcb pcb; + +void +db_mach_init(kvm_t *kd) +{ + + if (kvm_nlist(kd, nl) == -1) { + errx(EXIT_FAILURE, "kvm_nlist: %s", kvm_geterr(kd)); + } + if ((size_t)kvm_read(kd, nl[0].n_value, &pcb, sizeof(pcb)) != + sizeof(pcb)) { + errx(EXIT_FAILURE, "cannot read dumppcb: %s", kvm_geterr(kd)); + } +}