diff options
| -rw-r--r-- | sys/arch/mips64/include/asm.h | 16 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/exception.S | 6 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index 0180f0368ff..2c8abd34be6 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.19 2013/03/28 17:41:04 martynas Exp $ */ +/* $OpenBSD: asm.h,v 1.20 2014/03/11 07:50:49 jasper Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -148,19 +148,6 @@ #define CF_RA_OFFS 40 /* Call ra save offset */ #endif -#ifndef __LP64__ -#define PTR_L lw -#define PTR_S sw -#define PTR_SUB sub -#define PTR_ADD add -#define PTR_SUBU subu -#define PTR_ADDU addu -#define LI li -#define LA la -#define PTR_SLL sll -#define PTR_SRL srl -#define PTR_VAL .word -#else #define PTR_L ld #define PTR_S sd #define PTR_ADD dadd @@ -172,7 +159,6 @@ #define PTR_SLL dsll #define PTR_SRL dsrl #define PTR_VAL .dword -#endif /* * The following macros are here to benefit the R8000 processor: diff --git a/sys/arch/mips64/mips64/exception.S b/sys/arch/mips64/mips64/exception.S index 1faa2eec42a..31d21230b82 100644 --- a/sys/arch/mips64/mips64/exception.S +++ b/sys/arch/mips64/mips64/exception.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exception.S,v 1.36 2012/10/03 11:18:23 miod Exp $ */ +/* $OpenBSD: exception.S,v 1.37 2014/03/11 07:50:49 jasper Exp $ */ /* * Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -155,9 +155,7 @@ exception: LA k0, u_exception_table PTR_ADDU k0, k0, k1 -#ifdef __LP64__ PTR_ADDU k0, k0, k1 # yes, twice... -#endif PTR_L k0, 0(k0) j k0 nop @@ -165,9 +163,7 @@ exception: k_exception: LA k0, k_exception_table PTR_ADDU k0, k0, k1 -#ifdef __LP64__ PTR_ADDU k0, k0, k1 # yes, twice... -#endif PTR_L k0, 0(k0) j k0 nop |