diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2017-01-21 14:45:30 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2017-01-21 14:45:30 +0000 |
| commit | ae2b751e7295f20b3bdf506698301206ef97c146 (patch) | |
| tree | 2b6f81b3b196e69ff02f3c3f73e0c48831a266c3 /sys/arch/mips64 | |
| parent | 604ef3032e00b7d145bd3e107c53964087a803a2 (diff) | |
Add _MIPS_ISA_MIPS32 and _MIPS_ISA_MIPS64 defines for clang.
OK deraadt@ phessler@ mpi@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/include/_types.h | 12 | ||||
| -rw-r--r-- | sys/arch/mips64/include/asm.h | 18 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h index 686dcb9a732..225a52bf2a0 100644 --- a/sys/arch/mips64/include/_types.h +++ b/sys/arch/mips64/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.21 2017/01/03 09:51:28 visa Exp $ */ +/* $OpenBSD: _types.h,v 1.22 2017/01/21 14:45:29 visa Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -53,10 +53,12 @@ /* * We need to handle the various ISA levels for sizes. */ -#define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ -#define _MIPS_ISA_MIPS2 2 /* R4000/R6000 */ -#define _MIPS_ISA_MIPS3 3 /* R4000 */ -#define _MIPS_ISA_MIPS4 4 /* TFP (R1x000) */ +#define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ +#define _MIPS_ISA_MIPS2 2 /* R4000/R6000 */ +#define _MIPS_ISA_MIPS3 3 /* R4000 */ +#define _MIPS_ISA_MIPS4 4 /* TFP (R1x000) */ +#define _MIPS_ISA_MIPS32 32 /* MIPS32 */ +#define _MIPS_ISA_MIPS64 64 /* MIPS64 */ /* 7.18.1.1 Exact-width integer types */ typedef signed char __int8_t; diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h index 7267fedbb23..cf055095288 100644 --- a/sys/arch/mips64/include/asm.h +++ b/sys/arch/mips64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.22 2015/09/21 21:22:44 miod Exp $ */ +/* $OpenBSD: asm.h,v 1.23 2017/01/21 14:45:29 visa Exp $ */ /* * Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -30,10 +30,12 @@ #include <machine/regdef.h> -#define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ -#define _MIPS_ISA_MIPS2 2 /* R4000/R6000 */ -#define _MIPS_ISA_MIPS3 3 /* R4000 */ -#define _MIPS_ISA_MIPS4 4 /* TFP (R1x000) */ +#define _MIPS_ISA_MIPS1 1 /* R2000/R3000 */ +#define _MIPS_ISA_MIPS2 2 /* R4000/R6000 */ +#define _MIPS_ISA_MIPS3 3 /* R4000 */ +#define _MIPS_ISA_MIPS4 4 /* TFP (R1x000) */ +#define _MIPS_ISA_MIPS32 32 /* MIPS32 */ +#define _MIPS_ISA_MIPS64 64 /* MIPS64 */ #if !defined(ABICALLS) && !defined(_NO_ABICALLS) #define ABICALLS .abicalls @@ -128,7 +130,8 @@ /* * Basic register operations based on selected ISA */ -#if (_MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2) +#if (_MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 || \ + _MIPS_ISA == _MIPS_ISA_MIPS32) #define REGSZ 4 /* 32 bit mode register size */ #define LOGREGSZ 2 /* log rsize */ #define REG_S sw @@ -138,7 +141,8 @@ #define CF_RA_OFFS 20 /* Call ra save offset */ #endif -#if (_MIPS_ISA == _MIPS_ISA_MIPS3 || _MIPS_ISA == _MIPS_ISA_MIPS4) +#if (_MIPS_ISA == _MIPS_ISA_MIPS3 || _MIPS_ISA == _MIPS_ISA_MIPS4 || \ + _MIPS_ISA == _MIPS_ISA_MIPS64) #define REGSZ 8 /* 64 bit mode register size */ #define LOGREGSZ 3 /* log rsize */ #define REG_S sd |