diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-07-21 04:28:37 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-07-21 04:28:37 +0000 |
commit | f4fff67706933b19c5ae382fc1ea4266ffae5d36 (patch) | |
tree | 3a117db5197dc8b68a14e054f2777430247e86c4 /sys/arch | |
parent | 3c077118c620d5616657a35be79acc246e6d5319 (diff) |
skip break insn in the proper place, print cr28 in ddb, some debugging cruft
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/hppa/hppa/db_interface.c | 7 | ||||
-rw-r--r-- | sys/arch/hppa/hppa/trap.c | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sys/arch/hppa/hppa/db_interface.c b/sys/arch/hppa/hppa/db_interface.c index db541608ea7..4db4d93ec97 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.5 1999/07/12 18:12:49 mickey Exp $ */ +/* $OpenBSD: db_interface.c,v 1.6 1999/07/21 04:28:36 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -116,6 +116,7 @@ struct db_variable db_regs[] = { { "hptm", (long *)&ddb_regs.tf_hptm, FCN_NULL }, { "vtop", (long *)&ddb_regs.tf_vtop, FCN_NULL }, + { "cr28", (long *)&ddb_regs.tf_cr28, FCN_NULL }, #if 0 u_int ccr; /* cr10 */ u_int tr2; /* cr26 */ @@ -183,10 +184,6 @@ kdb_trap(type, code, regs) /* XXX Should switch to kdb`s own stack here. */ - /* skip break instruction */ - regs->tf_iioq_head += 4; - regs->tf_iioq_tail += 4; - ddb_regs = *regs; s = splhigh(); diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 0755beeb20f..bc1312a1541 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.5 1999/07/16 01:59:26 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.6 1999/07/21 04:28:36 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -211,9 +211,12 @@ trap(type, frame) break; #endif + case T_IBREAK: + /* skip break instruction */ + frame->tf_iioq_head += 4; + frame->tf_iioq_tail += 4; case T_DATALIGN: case T_DBREAK: - case T_IBREAK: if (kdb_trap (type, 0, frame)) return; break; @@ -275,6 +278,11 @@ trap(type, frame) case T_DTLBMISS | T_USER: case T_DTLBMISSNA: case T_DTLBMISSNA | T_USER: +#if 0 +if (kdb_trap (type, 0, frame)) +return; +break; +#endif va = trunc_page(va); map = &p->p_vmspace->vm_map; |