Inclusion from assembly code is detected with _LOCORE, no more fancy symbols.

13 files changed, 44 insertions, 36 deletions

diff --git a/sys/arch/mvme88k/include/asm.h b/sys/arch/mvme88k/include/asm.h
index 4540ecdc0b9..40a1cd2caf0 100644
--- a/sys/arch/mvme88k/include/asm.h
+++ b/sys/arch/mvme88k/include/asm.h
@@ -294,7 +294,7 @@
 /*
  * These things for vector_init.c and locore.c
  */
-#if defined(ASSEMBLER)
+#if defined(_LOCORE)
 # define  PREDEFINED_BY_ROM       0xffffffff
 # define  END_OF_VECTOR_LIST      0xfffffffe
 #else
diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index b69e13778ca..3e2bc8788f2 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.8 2001/02/01 03:38:17 smurph Exp $ */
+/*	$OpenBSD: board.h,v 1.9 2001/03/07 23:37:15 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -52,7 +52,7 @@
  * Something to put append a 'U' to a long constant if it's C so that
  * it'll be unsigned in both ANSI and traditional.
  */
-#if defined(ASSEMBLER)
+#if defined(_LOCORE)
 #	define U(num)	num
 #else
 #  if defined(__STDC__)
diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
index 7a8a2a3e803..bb0b8a42833 100644
--- a/sys/arch/mvme88k/include/cmmu.h
+++ b/sys/arch/mvme88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.1 1999/09/27 20:46:17 smurph Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.2 2001/03/07 23:37:15 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -33,7 +33,7 @@
 #ifndef	__MACHINE_CMMU_H__
 #define	__MACHINE_CMMU_H__
 
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 #include <machine/mmu.h>		 /* batc_template_t */
 #endif
 
@@ -61,7 +61,7 @@
 #define FLUSH_ALL       ((vm_offset_t)~0)
 
 
-#ifndef	ASSEMBLER
+#ifndef	_LOCORE
 /*
  * Prototypes and stuff for cmmu.c.
  */
@@ -125,6 +125,6 @@ void cmmu_set_pair_batc_entry(
      unsigned entry_no,
      unsigned value);  /* the value to stuff into the batc */
 
-#endif	/* ASSEMBLER */
+#endif	/* _LOCORE */
 
 #endif	/* __MACHINE_CMMU_H__ */
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h
index f6319e19143..d6e28f30b1f 100644
--- a/sys/arch/mvme88k/include/cpu_number.h
+++ b/sys/arch/mvme88k/include/cpu_number.h
@@ -27,12 +27,12 @@
 #ifndef	_M88K_CPU_NUMBER_
 #define _M88K_CPU_NUMBER_
  
-#ifdef	KERNEL
-#ifndef ASSEMBLER
+#ifdef	_KERNEL
+#ifndef _LOCORE
 #include <machine/param.h>
 extern unsigned number_cpus;
 
-static __inline__ unsigned cpu_number(void);
+static unsigned cpu_number __P((void));
 
 static __inline__ unsigned cpu_number(void)
 {
@@ -42,6 +42,6 @@ static __inline__ unsigned cpu_number(void)
 	__asm__ ("ldcr %0, cr18" : "=r" (cpu));
 	return (cpu & 3);
 }
-#endif /* ASSEMBLER */
-#endif /* KERNEL */
+#endif /* _LOCORE */
+#endif /* _KERNEL */
 #endif /* _M88K_CPU_NUMBER_ */
diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h
index 658308f33b8..e20f68db00f 100644
--- a/sys/arch/mvme88k/include/cpus.h
+++ b/sys/arch/mvme88k/include/cpus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpus.h,v 1.6 2001/01/14 20:25:23 smurph Exp $ */
+/*	$OpenBSD: cpus.h,v 1.7 2001/03/07 23:37:16 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -38,7 +38,7 @@
 /*
  * cpu Processor Identification Register (PID).
  */
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 union cpupid {
    unsigned cpupid;
    struct {
@@ -56,7 +56,7 @@ union cpupid {
       /*empty*/:16;
    } m88200;
 };
-#endif ASSEMBLER
+#endif _LOCORE
 
 #define M88100 0
 #define M88200 5
diff --git a/sys/arch/mvme88k/include/m88100.h b/sys/arch/mvme88k/include/m88100.h
index 57b8111f5fd..fd0352d6252 100644
--- a/sys/arch/mvme88k/include/m88100.h
+++ b/sys/arch/mvme88k/include/m88100.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88100.h,v 1.6 2001/02/01 03:38:17 smurph Exp $ */
+/*	$OpenBSD: m88100.h,v 1.7 2001/03/07 23:37:16 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -51,7 +51,7 @@
 #define DMT_WRITE	0x00000002	/* Read/Write Transaction Bit */
 #define	DMT_VALID	0x00000001	/* Valid Transaction Bit */
 
-#ifndef	ASSEMBLER
+#ifndef	_LOCORE
 #include "sys/types.h"
 
 /* dmt_skip is never set by the cpu.  It is used to 
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index 21f96cbf894..66ffb2900bf 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: m88110.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: m88110.h,v 1.3 2001/03/07 23:37:16 miod Exp $ */
 
 #ifndef	__MACHINE_M88110_H__
 #define	__MACHINE_M88110_H__
 
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 # include <machine/mmu.h>		 /* batc_template_t */
 #endif
 
@@ -110,7 +110,7 @@
 #define CMMU_DATA 1
 #define CMMU_INST 0
 
-#ifndef	ASSEMBLER
+#ifndef	_LOCORE
 /*
  * Prototypes from "mvme88k/mvme88k/m197_cmmu.c"
  */
@@ -224,6 +224,6 @@ unsigned get_dsr  (void);
 unsigned get_dlar (void);
 unsigned get_dpar (void);
 
-#endif	/* ASSEMBLER */
+#endif	/* _LOCORE */
 
 #endif __MACHINE_M88110_H__
diff --git a/sys/arch/mvme88k/include/m882xx.h b/sys/arch/mvme88k/include/m882xx.h
index 2898ccff594..d4b5260f0af 100644
--- a/sys/arch/mvme88k/include/m882xx.h
+++ b/sys/arch/mvme88k/include/m882xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m882xx.h,v 1.5 1999/09/27 20:46:18 smurph Exp $ */
+/*	$OpenBSD: m882xx.h,v 1.6 2001/03/07 23:37:16 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -33,7 +33,7 @@
 #ifndef	__MACHINE_M882XX_H__
 #define	__MACHINE_M882XX_H__
 
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 # include <machine/mmu.h>		 /* batc_template_t */
 #endif
 
@@ -130,7 +130,7 @@
 #define CMMU_PFSR_SUPER		6	/* supervisor violation */
 #define CMMU_PFSR_WRITE		7	/* writer violation */
 
-#ifndef	ASSEMBLER
+#ifndef	_LOCORE
 
 /*
  * Prototypes from "mvme88k/mvme88k/m18x_cmmu.c"
@@ -188,7 +188,7 @@ void m18x_cmmu_set_pair_batc_entry(
      unsigned entry_no,
      unsigned value);  /* the value to stuff into the batc */
 
-#endif	/* ASSEMBLER */
+#endif	/* _LOCORE */
 
 /*
  * Possible MVME188 board configurations
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 039e396c09a..1df205a0662 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.3 2001/02/01 03:38:18 smurph Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.4 2001/03/07 23:37:16 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -51,7 +51,7 @@
  * it'll be unsigned in both ANSI and traditional.
  */
 #ifndef UDEFINED
-#if defined(ASSEMBLER)
+#if defined(_LOCORE)
 #	define U(num)	num
 #else
 #  if defined(__STDC__)
@@ -369,7 +369,7 @@
 #define DART_OPRS		U(0xfff82038)	/* output port set */
 #define DART_OPRR		U(0xfff8203c)	/* output port reset */
 
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 
 /*
  * Externals
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index 3bf85c1f38c..0374d75b5b5 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.3 2001/02/01 03:38:18 smurph Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.4 2001/03/07 23:37:17 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -54,7 +54,7 @@
  * it'll be unsigned in both ANSI and traditional.
  */
 #ifndef UDEFINED
-#if defined(ASSEMBLER)
+#if defined(_LOCORE)
 #	define U(num)	num
 #else
 #  if defined(__STDC__)
diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h
index a8b9a652fb4..23b6295474f 100644
--- a/sys/arch/mvme88k/include/psl.h
+++ b/sys/arch/mvme88k/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.6 2001/02/12 08:16:23 smurph Exp $ */
+/*	$OpenBSD: psl.h,v 1.7 2001/03/07 23:37:17 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -78,10 +78,18 @@ extern int intrcnt[M88K_NIRQ];
 
 /* needs major cleanup - XXX nivas */
 
+#ifndef _LOCORE
+unsigned setipl __P((unsigned));
+#endif
+
 #if 0
 spl0 is a function by itself. I really am serious about the clean up
 above...
 #define spl0()		spln(0)
+#else
+#ifndef _LOCORE
+int spl0 __P((void));
+#endif
 #endif /* 0 */
 #define spl1()		setipl(1)
 #define spl2()		setipl(2)
@@ -178,7 +186,7 @@ above...
 #define PSR_USER	(PSR_SFD)
 #define PSR_SET_BY_USER	(PSR_BO | PSR_SER | PSR_C | PSR_MXM)
 
-#ifndef	ASSEMBLER
+#ifndef	_LOCORE
 struct psr {
     unsigned
 	psr_mode: 1,
diff --git a/sys/arch/mvme88k/include/vid.h b/sys/arch/mvme88k/include/vid.h
index 518da55de15..58deccae24a 100644
--- a/sys/arch/mvme88k/include/vid.h
+++ b/sys/arch/mvme88k/include/vid.h
@@ -5,7 +5,7 @@
 #define LOADER_SIZE 2
 #define LOADER_ADDRESS 0x1F0000
 
-#ifndef __ASSEMBLER__
+#ifndef _LOCORE
 struct vid {
 	unsigned char	vid_id[4];
 	unsigned char	vid_0[16];
diff --git a/sys/arch/mvme88k/include/vmparam.h b/sys/arch/mvme88k/include/vmparam.h
index baa95477c0d..e6fbbe5e2b0 100644
--- a/sys/arch/mvme88k/include/vmparam.h
+++ b/sys/arch/mvme88k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.8 2001/01/13 05:18:59 smurph Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.9 2001/03/07 23:37:17 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -201,7 +201,7 @@
 #define VM_NFREELIST		1
 #define VM_FREELIST_DEFAULT	0
 
-#ifndef ASSEMBLER
+#ifndef _LOCORE
 /*
  * pmap-specific data stored in the vm_physmem[] array.
  */
@@ -210,7 +210,7 @@ struct pmap_physseg {
 	char *attrs;			/* page modify list for this seg */
 	struct simplelock *plock;	/* page lock for this seg */
 };
-#endif /* ASSEMBLER */
+#endif /* _LOCORE */
 
 #endif /* MACHINE_NEW_NONCONTIG */