assym.s -> assym.h

9 files changed, 20 insertions, 47 deletions

diff --git a/sys/arch/mvme88k/include/asm.h b/sys/arch/mvme88k/include/asm.h
index 40a1cd2caf0..01bbcc358e6 100644
--- a/sys/arch/mvme88k/include/asm.h
+++ b/sys/arch/mvme88k/include/asm.h
@@ -39,11 +39,6 @@
 #define EH_DEBUG 1
 #endif	EH_DEBUG
 
-#if 0
-/* this gives the offsets into various structures of various elements, etc */
-#include "assym.s"
-#endif
-
 #define	ENTRY(NAME) \
     .align 8; .globl FUNC(NAME); FUNC(NAME):
     
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 0b7b53ab351..3b3158d8238 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.12 2001/03/09 05:44:41 smurph Exp $   */
+/*   $OpenBSD: eh.S,v 1.13 2001/05/20 05:53:09 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -212,11 +212,8 @@
  * restored and control returns to where the exception occurred.
  *
  */
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
 
-#include "assym.s"
+#include "assym.h"
 #include <machine/trap.h>           /* for T_ defines */
 #include <machine/asm.h>
 
diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S
index 351d5f37122..005d7af47a9 100644
--- a/sys/arch/mvme88k/mvme88k/locore.S
+++ b/sys/arch/mvme88k/mvme88k/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.15 2001/04/29 19:00:02 miod Exp $	*/
+/*	$OpenBSD: locore.S,v 1.16 2001/05/20 05:53:09 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -57,11 +57,7 @@
  * rights to redistribute these changes.
  */
 
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
-
-#include "assym.s"
+#include "assym.h"
 #include "ksyms.h"
 #include <machine/asm.h>
 #include <machine/trap.h>
diff --git a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
index aa9eb98d1ae..15c84d915e4 100644
--- a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
+++ b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore_asm_routines.S,v 1.13 2001/03/09 05:44:41 smurph Exp $	*/
+/* $OpenBSD: locore_asm_routines.S,v 1.14 2001/05/20 05:53:09 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -36,11 +36,7 @@
  *
  **************************************************************RCS*****/
 
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
-
-#include "assym.s"
+#include "assym.h"
 #include <machine/trap.h>
 #include <machine/cpu_number.h>
 #include <machine/board.h>
diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c
index abadd8781cb..3215391e778 100644
--- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c
+++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore_c_routines.c,v 1.10 2001/03/09 05:44:41 smurph Exp $	*/
+/* $OpenBSD: locore_c_routines.c,v 1.11 2001/05/20 05:53:10 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -30,6 +30,8 @@
  *****************************************************************RCS**/
 /* This file created by Omron Corporation, 1990. */
 
+#include "assym.h"
+
 #include <sys/types.h>
 #include <sys/systm.h>
 
@@ -37,7 +39,6 @@
 #include <machine/cpu_number.h>		/* cpu_number()		*/
 #include <machine/board.h>		/* m188 bit defines	*/
 #include <machine/m88100.h>		/* DMT_VALID		*/
-#include <assym.s>			/* EF_NREGS, etc.	*/
 #include <machine/asm.h>		/* END_OF_VECTOR_LIST, etc.	*/
 #include <machine/asm_macro.h>		/* enable/disable interrupts	*/
 #include <machine/locore.h>
diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S
index 842a3360569..d1824335c06 100644
--- a/sys/arch/mvme88k/mvme88k/m88100_fp.S
+++ b/sys/arch/mvme88k/mvme88k/m88100_fp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88100_fp.S,v 1.8 2001/03/09 05:44:41 smurph Exp $	*/
+/* $OpenBSD: m88100_fp.S,v 1.9 2001/05/20 05:53:10 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -27,11 +27,7 @@
  */
 
 /* Floating point trouble routines */
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
-
-#include "assym.s"
+#include "assym.h"
 #include <machine/trap.h>
 #include <machine/asm.h>
 
diff --git a/sys/arch/mvme88k/mvme88k/m88110_fp.S b/sys/arch/mvme88k/mvme88k/m88110_fp.S
index f86e1c7b12c..3fda66c8e14 100644
--- a/sys/arch/mvme88k/mvme88k/m88110_fp.S
+++ b/sys/arch/mvme88k/mvme88k/m88110_fp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88110_fp.S,v 1.3 2001/03/09 05:44:42 smurph Exp $	*/
+/* $OpenBSD: m88110_fp.S,v 1.4 2001/05/20 05:53:10 miod Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -48,11 +48,7 @@
  * 2) Floating Point Privilege Violation
  */
 
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
-
-#include "assym.s"
+#include "assym.h"
 #include <machine/trap.h>
 #include <machine/asm.h>
 
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 1c81ac4c65a..96c66f18b0d 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.35 2001/05/17 18:41:49 provos Exp $	*/
+/* $OpenBSD: machdep.c,v 1.36 2001/05/20 05:53:10 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -103,7 +103,7 @@
 #include <mvme88k/dev/sysconreg.h>
 #include <mvme88k/dev/pcctworeg.h>
 
-#include "assym.s"			/* EF_EPSR, etc. */
+#include "assym.h"			/* EF_EPSR, etc. */
 #include "ksyms.h"
 #if DDB
 #include <machine/db_machdep.h>
diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S
index 1349049dcdc..1c8b2d005eb 100644
--- a/sys/arch/mvme88k/mvme88k/process.S
+++ b/sys/arch/mvme88k/mvme88k/process.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.S,v 1.8 2001/03/09 05:44:42 smurph Exp $	*/
+/*	$OpenBSD: process.S,v 1.9 2001/05/20 05:53:10 miod Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -30,14 +30,10 @@
  *
  */
 
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
-
-#include "assym.s"
-#include "machine/asm.h"
-#include "machine/psl.h"
-#include "machine/intr.h"
+#include "assym.h"
+#include <machine/asm.h>
+#include <machine/psl.h>
+#include <machine/intr.h>
 
 	data
 	align 4