diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mips64/include/pte.h | 8 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/context.S | 12 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/exception_tfp.S | 5 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/tlbhandler.S | 12 |
4 files changed, 10 insertions, 27 deletions
diff --git a/sys/arch/mips64/include/pte.h b/sys/arch/mips64/include/pte.h index 64a173c6889..eb385fa7d40 100644 --- a/sys/arch/mips64/include/pte.h +++ b/sys/arch/mips64/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.19 2016/08/14 08:23:52 visa Exp $ */ +/* $OpenBSD: pte.h,v 1.20 2016/09/06 13:41:29 visa Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -66,8 +66,14 @@ typedef u_int32_t pt_entry_t; #ifdef MIPS_PTE64 #define PTE_BITS 64 +#define PTE_LOAD ld +#define PTE_LOG 3 +#define PTE_OFFS 8 #else #define PTE_BITS 32 +#define PTE_LOAD lwu +#define PTE_LOG 2 +#define PTE_OFFS 4 #endif #ifdef CPU_MIPS64R2 diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S index 94d0e5cc586..850bd2799b1 100644 --- a/sys/arch/mips64/mips64/context.S +++ b/sys/arch/mips64/mips64/context.S @@ -1,4 +1,4 @@ -/* $OpenBSD: context.S,v 1.56 2016/08/16 13:03:58 visa Exp $ */ +/* $OpenBSD: context.S,v 1.57 2016/09/06 13:41:29 visa Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -41,16 +41,6 @@ #include "assym.h" -#ifdef MIPS_PTE64 -#define PTE_LOG 3 -#define PTE_LOAD ld -#define PTE_OFFS 8 -#else -#define PTE_LOG 2 -#define PTE_LOAD lw -#define PTE_OFFS 4 -#endif - .set mips3 .set noreorder # Noreorder is default style! diff --git a/sys/arch/mips64/mips64/exception_tfp.S b/sys/arch/mips64/mips64/exception_tfp.S index f598dc701cb..fb603a1b257 100644 --- a/sys/arch/mips64/mips64/exception_tfp.S +++ b/sys/arch/mips64/mips64/exception_tfp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exception_tfp.S,v 1.4 2015/09/20 11:52:33 miod Exp $ */ +/* $OpenBSD: exception_tfp.S,v 1.5 2016/09/06 13:41:29 visa Exp $ */ /* * Copyright (c) 2012 Miodrag Vallat. @@ -61,9 +61,6 @@ #ifdef MIPS_PTE64 #error "R8000 doesn't need 64-bit PTE" -#else -#define PTE_LOG 2 -#define PTE_LOAD lwu #endif #define TLBW .align 4; .word 0x43000002 diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S index 7414e9a12b9..5b603ed3ebe 100644 --- a/sys/arch/mips64/mips64/tlbhandler.S +++ b/sys/arch/mips64/mips64/tlbhandler.S @@ -1,4 +1,4 @@ -/* $OpenBSD: tlbhandler.S,v 1.45 2016/08/14 08:23:52 visa Exp $ */ +/* $OpenBSD: tlbhandler.S,v 1.46 2016/09/06 13:41:29 visa Exp $ */ /* * Copyright (c) 1995-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -43,16 +43,6 @@ #include "assym.h" -#ifdef MIPS_PTE64 -#define PTE_LOG 3 -#define PTE_LOAD ld -#define PTE_OFFS 8 -#else -#define PTE_LOG 2 -#define PTE_LOAD lw -#define PTE_OFFS 4 -#endif - .set mips3 .set noreorder /* Default reorder mode */ |