Module Name: src
Committed By: matt
Date: Wed Aug 1 16:35:50 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke: trap.c
src/sys/arch/powerpc/include/booke: cpuvar.h
Log Message:
Export dump_trapframe.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/booke/cpuvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.18 src/sys/arch/powerpc/booke/trap.c:1.19
--- src/sys/arch/powerpc/booke/trap.c:1.18 Mon Jul 23 04:13:06 2012
+++ src/sys/arch/powerpc/booke/trap.c Wed Aug 1 16:35:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.18 2012/07/23 04:13:06 matt Exp $ */
+/* $NetBSD: trap.c,v 1.19 2012/08/01 16:35:50 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.18 2012/07/23 04:13:06 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.19 2012/08/01 16:35:50 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,6 @@ __KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.1
#include <powerpc/booke/pte.h>
void trap(enum ppc_booke_exceptions, struct trapframe *);
-static void dump_trapframe(const struct trapframe *);
static const char trap_names[][8] = {
[T_CRITIAL_INPUT] = "CRIT",
@@ -620,7 +619,7 @@ embedded_fp_round_exception(struct trapf
return rv;
}
-static void
+void
dump_trapframe(const struct trapframe *tf)
{
printf("trapframe %p (exc=%x srr0/1=%#lx/%#lx esr/dear=%#x/%#lx)\n",
Index: src/sys/arch/powerpc/include/booke/cpuvar.h
diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.14 src/sys/arch/powerpc/include/booke/cpuvar.h:1.15
--- src/sys/arch/powerpc/include/booke/cpuvar.h:1.14 Sun Jul 29 21:39:43 2012
+++ src/sys/arch/powerpc/include/booke/cpuvar.h Wed Aug 1 16:35:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.14 2012/07/29 21:39:43 matt Exp $ */
+/* $NetBSD: cpuvar.h,v 1.15 2012/08/01 16:35:50 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -62,6 +62,8 @@ struct cpu_softc {
struct evcnt cpu_ev_late_clock;
u_long cpu_ticks_per_clock_intr;
struct evcnt cpu_ev_exec_trap_sync;
+
+ uint64_t cpu_spl_tb[NIPL][NIPL];
};
struct cpunode_locators {
@@ -194,6 +196,9 @@ void *board_info_get_object(const char *
const void *
board_info_get_data(const char *, size_t *);
+/* trap.c */
+void dump_trapframe(const struct trapframe *);
+
extern char root_string[];
extern paddr_t msgbuf_paddr;
extern prop_dictionary_t board_properties;
