diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-27 19:16:07 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 2004-09-27 19:16:07 +0000 |
| commit | 23ce51ea125bb5370965cf6b3d4a6c95f8954d4b (patch) | |
| tree | 86d22926f6fc8f0cfc781749c701830525f1ed99 /sys/arch | |
| parent | 5d3dbf0cb2ea7e2e448c3d3b8577241b7c3a6f60 (diff) | |
move ITLBNOPFIX to asm.h and make it conditional
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mips64/include/asm.h | 8 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/context.S | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/lcore_access.S | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/lcore_ddb.S | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/lcore_float.S | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index d403fd67ac5..196ae7bca01 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.4 2004/09/09 22:21:41 pefo Exp $ */ +/* $OpenBSD: asm.h,v 1.5 2004/09/27 19:16:06 pefo Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -30,6 +30,12 @@ #include <machine/regdef.h> +#ifdef NEED_OLD_RM7KFIX +#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; +#else +#define ITLBNOPFIX nop +#endif + #define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ #define _MIPS_ISA_MIPS2 2 /* R4000/R6000 */ #define _MIPS_ISA_MIPS3 3 /* R4000 */ diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S index 5d6d0fb28fa..b2a4cdee02e 100644 --- a/sys/arch/mips64/mips64/context.S +++ b/sys/arch/mips64/mips64/context.S @@ -1,4 +1,4 @@ -/* $OpenBSD: context.S,v 1.7 2004/09/27 17:41:56 pefo Exp $ */ +/* $OpenBSD: context.S,v 1.8 2004/09/27 19:16:06 pefo Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -42,8 +42,6 @@ .set noreorder # Noreorder is default style! -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; - /* * Save registers and state used by reboot to take snapshot. */ diff --git a/sys/arch/mips64/mips64/lcore_access.S b/sys/arch/mips64/mips64/lcore_access.S index 3a1a6ec0d46..b1e45a3a211 100644 --- a/sys/arch/mips64/mips64/lcore_access.S +++ b/sys/arch/mips64/mips64/lcore_access.S @@ -1,4 +1,4 @@ -/* $OpenBSD: lcore_access.S,v 1.6 2004/09/10 08:58:27 pefo Exp $ */ +/* $OpenBSD: lcore_access.S,v 1.7 2004/09/27 19:16:06 pefo Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -42,8 +42,6 @@ .set noreorder # Noreorder is default style! -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; - /* * Primitives */ diff --git a/sys/arch/mips64/mips64/lcore_ddb.S b/sys/arch/mips64/mips64/lcore_ddb.S index ab16f6ad3dd..88ba91d6975 100644 --- a/sys/arch/mips64/mips64/lcore_ddb.S +++ b/sys/arch/mips64/mips64/lcore_ddb.S @@ -1,4 +1,4 @@ -/* $OpenBSD: lcore_ddb.S,v 1.6 2004/09/17 13:12:17 miod Exp $ */ +/* $OpenBSD: lcore_ddb.S,v 1.7 2004/09/27 19:16:06 pefo Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -40,8 +40,6 @@ .set noreorder # Noreorder is default style! -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; - #ifdef __LP64__ LEAF(kdbpeekd, 0) PTR_L t0, curprocpaddr diff --git a/sys/arch/mips64/mips64/lcore_float.S b/sys/arch/mips64/mips64/lcore_float.S index 8093cd9a229..482e7085857 100644 --- a/sys/arch/mips64/mips64/lcore_float.S +++ b/sys/arch/mips64/mips64/lcore_float.S @@ -1,4 +1,4 @@ -/* $OpenBSD: lcore_float.S,v 1.6 2004/09/10 08:58:27 pefo Exp $ */ +/* $OpenBSD: lcore_float.S,v 1.7 2004/09/27 19:16:06 pefo Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -42,8 +42,6 @@ .set mips3 -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; - /*---------------------------------------------------------------------------- * * MipsSwitchFPState -- |