diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-06-17 00:30:09 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-06-17 00:30:09 +0000 |
| commit | f155c5c97c1ba3f46dff145a5abb408e5506a4e7 (patch) | |
| tree | 9aa1845405c7cc039cbefbed7faa73a1883c69d3 /sys | |
| parent | 41617db5bef34e0a4342605b86874f1a65902f8d (diff) | |
use local var copy of frame->tf_iir everywhere and fix one panic
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/hppa/trap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 858efe3487e..c5c1fbd9052 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.77 2004/06/16 02:09:55 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.78 2004/06/17 00:30:08 mickey Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -405,8 +405,8 @@ trap(type, frame) /* dig probe insn */ if (ret && trapnum == T_DTLBMISSNA && - (frame->tf_iir & 0xfc001f80) == 0x04001180) { - frame_regmap(frame, frame->tf_iir & 0x1f) = 0; + (opcode & 0xfc001f80) == 0x04001180) { + frame_regmap(frame, opcode & 0x1f) = 0; frame->tf_ipsw |= PSL_N; break; } @@ -446,7 +446,7 @@ trap(type, frame) } else { panic("trap: " "uvm_fault(%p, %lx, %d, %d): %d", - map, va, 0, vftype, ret); + map, va, fault, vftype, ret); } } } @@ -469,8 +469,8 @@ trap(type, frame) case T_ILLEGAL: case T_ILLEGAL | T_USER: /* see if it's a SPOP1,,0 */ - if ((frame->tf_iir & 0xfffffe00) == 0x10000200) { - frame_regmap(frame, frame->tf_iir & 0x1f) = 0; + if ((opcode & 0xfffffe00) == 0x10000200) { + frame_regmap(frame, opcode & 0x1f) = 0; frame->tf_ipsw |= PSL_N; break; } |