summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-25 04:51:41 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-25 04:51:41 +0000
commit1750f4bb3542e35d7fd167521818777ccec9120a (patch)
tree9568df3c8762b1888e9c11fd3c3e97a0fa2eb641
parent5eb9490161e0cb854e933b8fa226b0f203333f02 (diff)
better kdbprinttrap() and copy over the frame into the db_regs when already spl-high
-rw-r--r--sys/arch/hppa/hppa/db_interface.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/hppa/db_interface.c b/sys/arch/hppa/hppa/db_interface.c
index 62af6065233..0298d8687a5 100644
--- a/sys/arch/hppa/hppa/db_interface.c
+++ b/sys/arch/hppa/hppa/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.22 2002/07/23 16:56:52 mickey Exp $ */
+/* $OpenBSD: db_interface.c,v 1.23 2002/07/25 04:51:40 mickey Exp $ */
/*
* Copyright (c) 1999-2000 Michael Shalayeff
@@ -174,12 +174,13 @@ void
kdbprinttrap(type, code)
int type, code;
{
+ type &= ~T_USER; /* just in case */
db_printf("kernel: ");
if (type >= trap_types || type < 0)
- db_printf("type %d", type);
+ db_printf("type 0x%x", type);
else
db_printf("%s", trap_type[type]);
- db_printf(" trap, code=%x\n", code);
+ db_printf(" trap, code=0x%x\n", code);
}
/*
@@ -210,9 +211,8 @@ kdb_trap(type, code, regs)
/* XXX Should switch to kdb`s own stack here. */
- ddb_regs = *regs;
-
s = splhigh();
+ ddb_regs = *regs;
db_active++;
cnpollc(TRUE);
db_trap(type, code);