diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-10-23 19:06:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-10-23 19:06:55 +0000 |
| commit | 21b501ec1384917d8dae22f6ab6d312fcc154d57 (patch) | |
| tree | bb90c80de3dd0f6de65ff1e6fd0a753ea5ad6245 /sys/arch | |
| parent | 26f40308b52a8c3cabca4d2ff6ae95ee464df1a0 (diff) | |
Correctly recover from bus error during guarded_access() on 88110.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/trap.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c index 82e506a52ed..e6a4101c0b4 100644 --- a/sys/arch/mvme88k/mvme88k/trap.c +++ b/sys/arch/mvme88k/mvme88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.55 2003/10/09 16:30:58 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.56 2003/10/23 19:06:54 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -648,10 +648,10 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame) unsigned nss, fault_addr; struct vmspace *vm; union sigval sv; + int result; #ifdef DDB int s; /* IPL */ #endif - int result; int sig = 0; unsigned pc = PC_REGS(frame); /* get program counter (exip) */ pt_entry_t *pte; @@ -659,6 +659,7 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame) extern struct vm_map *kernel_map; extern unsigned guarded_access_start; extern unsigned guarded_access_end; + extern unsigned guarded_access_bad; extern pt_entry_t *pmap_pte(pmap_t, vaddr_t); uvmexp.traps++; @@ -710,21 +711,21 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame) case T_KDB_TRACE: s = splhigh(); db_enable_interrupt(); - ddb_break_trap(T_KDB_TRACE,(db_regs_t*)frame); + ddb_break_trap(T_KDB_TRACE, (db_regs_t*)frame); db_disable_interrupt(); splx(s); return; case T_KDB_BREAK: s = splhigh(); db_enable_interrupt(); - ddb_break_trap(T_KDB_BREAK,(db_regs_t*)frame); + ddb_break_trap(T_KDB_BREAK, (db_regs_t*)frame); db_disable_interrupt(); splx(s); return; case T_KDB_ENTRY: s = splhigh(); db_enable_interrupt(); - ddb_entry_trap(T_KDB_ENTRY,(db_regs_t*)frame); + ddb_entry_trap(T_KDB_ENTRY, (db_regs_t*)frame); db_disable_interrupt(); if (frame->enip) { frame->exip = frame->enip; @@ -809,6 +810,7 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame) (unsigned)&guarded_access_start && (frame->exip & XIP_ADDR) <= (unsigned)&guarded_access_end) { + frame->exip = (unsigned)&guarded_access_bad; return; } } |