diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-27 20:39:28 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-27 20:39:28 +0000 |
| commit | 6208d149720daeacdcd839c01029b1e4e87dd803 (patch) | |
| tree | b3effe1232ba60dd396811b052122886abcf576f /sys/arch | |
| parent | 5781f682299c5e0825de09c3c82bef832efc4e73 (diff) | |
R5K seems to have bugs/hazards
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mips64/include/asm.h | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/tlbhandler.S | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index 196ae7bca01..189b1931be2 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.5 2004/09/27 19:16:06 pefo Exp $ */ +/* $OpenBSD: asm.h,v 1.6 2004/09/27 20:39:27 pefo Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -33,7 +33,7 @@ #ifdef NEED_OLD_RM7KFIX #define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; #else -#define ITLBNOPFIX nop +#define ITLBNOPFIX nop;nop;nop;nop #endif #define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S index 3e390d7d4b1..75858063644 100644 --- a/sys/arch/mips64/mips64/tlbhandler.S +++ b/sys/arch/mips64/mips64/tlbhandler.S @@ -1,4 +1,4 @@ -/* $OpenBSD: tlbhandler.S,v 1.8 2004/09/27 19:13:25 pefo Exp $ */ +/* $OpenBSD: tlbhandler.S,v 1.9 2004/09/27 20:39:27 pefo Exp $ */ /* * Copyright (c) 1995-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -213,9 +213,10 @@ NLEAF(k_tlb_inv, 0) PTR_SRL k0, k0, PGSHIFT sltu k1, k0, k1 beq k1, zero, sys_stk_chk # No. check for valid stack - PTR_SLL k0, k0, 2 # compute offset from index + nop PTR_L k1, Sysmap + PTR_SLL k0, k0, 2 # compute offset from index tlbp # Probe the invalid entry PTR_ADDU k1, k1, k0 and k0, k0, 4 # check even/odd page |