diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/m88k/include/asm.h | 25 | ||||
| -rw-r--r-- | sys/arch/m88k/include/param.h | 9 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/m88k/include/asm.h b/sys/arch/m88k/include/asm.h index aa408898a03..20b21b078ca 100644 --- a/sys/arch/m88k/include/asm.h +++ b/sys/arch/m88k/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.5 2005/04/30 16:46:49 miod Exp $ */ +/* $OpenBSD: asm.h,v 1.6 2005/10/13 19:47:12 miod Exp $ */ /* * Mach Operating System @@ -80,6 +80,7 @@ #ifdef _KERNEL +#ifdef _LOCORE /* * Control register symbolic names */ @@ -154,23 +155,15 @@ * instruction always synchronizes, and this particular instruction * will never actually take the trap). */ -#if 0 -#define FLUSH_PIPELINE tcnd ne0, r0, 0 -#define FLUSH_PIPELINE_STRING "tcnd ne0, r0, 0" -#else #define FLUSH_PIPELINE tb1 0, r0, 0 -#define FLUSH_PIPELINE_STRING "tb1 0, r0, 0" -#endif #define NOP or r0, r0, r0 -#define NOP_STRING "or r0, r0, r0" - -#define RTE NOP ; rte +#define RTE NOP ; rte /* * Fields in cr18. More bits are used privately in the exception handling * code. */ -#define FLAG_CPU_FIELD_WIDTH 2 /* must match cpu_number.h */ +#define FLAG_CPU_FIELD_WIDTH 2 /* must match cpu_number() */ /* * Info about the PSR @@ -188,6 +181,13 @@ #define PSR_CARRY_BIT 28 #define PSR_SERIALIZE_BIT 25 +#define VECTOR(x) \ + word _C_LABEL(x) + +#endif /* _LOCORE */ + +#define FLUSH_PIPELINE_STRING "tb1 0, r0, 0" + /* * Status bits for an SXIP/SNIP/SFIP address. */ @@ -209,9 +209,6 @@ #define UNKNOWN_HANDLER 0xffffffff #define END_OF_VECTOR_LIST 0xfffffffe -#define VECTOR(x) \ - word _C_LABEL(x) - #endif /* _KERNEL */ #endif /* __M88K_ASM_H__ */ diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h index 6a41569f6a3..55a935af70c 100644 --- a/sys/arch/m88k/include/param.h +++ b/sys/arch/m88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.7 2005/10/12 19:05:43 miod Exp $ */ +/* $OpenBSD: param.h,v 1.8 2005/10/13 19:47:12 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -130,9 +130,11 @@ #include <machine/intr.h> #ifdef _KERNEL -extern void delay(int); + #define DELAY(x) delay(x) +#if !defined(_LOCORE) +extern void delay(int); extern int cputyp; #endif @@ -155,4 +157,5 @@ extern int cputyp; #define CPU_IS88110 1 #endif -#endif /* !_M88K_PARAM_H_ */ +#endif /* _KERNEL */ +#endif /* !_M88K_PARAM_H_ */ |