From 41efc3bb1a89556c039a2c58241ad9864bd9f375 Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Wed, 17 Feb 1999 20:40:33 +0000
Subject: join

---
 sys/arch/hppa/include/break.h | 66 -------------------------------------------
 sys/arch/hppa/include/trap.h  | 35 ++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 67 deletions(-)
 delete mode 100644 sys/arch/hppa/include/break.h

diff --git a/sys/arch/hppa/include/break.h b/sys/arch/hppa/include/break.h
deleted file mode 100644
index 8691a9dcda3..00000000000
--- a/sys/arch/hppa/include/break.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$OpenBSD: break.h,v 1.1 1998/07/07 21:32:38 mickey Exp $	*/
-
-/* 
- * Copyright (c) 1990, 1991, 1994 The University of Utah and
- * the Computer Systems Laboratory at the University of Utah (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation, and (3) all advertising
- * materials mentioning features or use of this software display the following
- * acknowledgement: ``This product includes software developed by the
- * Computer Systems Laboratory at the University of Utah.''
- *
- * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
- * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
- * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- * 	Utah $Hdr: break.h 1.10 94/12/14$
- *	Author: Bob Wheeler, University of Utah CSL
- */
-
-/*
- *	Values for break instructions
- */
-
-/*
- * values for the im5 field of the break instruction
- */
-#define BREAK_KERNEL	0
-#define BREAK_MAYDEBUG	31	/* Reserved for Mayfly debugger. */
-
-/*
- * values for the im13 field of the break instruction
- *
- * BREAK_PDC_CALL calls the PDC routine. Users should use the routine 
- * pdc_call() which sets up the registers for this call. 
- */
-#define BREAK_PDC_CALL		1
-#define BREAK_PDC_DUMP  	2
-#define BREAK_KERNTRACE		3
-#define BREAK_MACH_DEBUGGER	4
-#define BREAK_KGDB		5
-#define BREAK_KERNPRINT		6
-#define BREAK_IVA		7
-#define BREAK_PDC_IODC_CALL	8
-#define BREAK_GDB		8	/* Standard GDB breakpoint.  */
-#define	BREAK_THREAD_SETSTATE	9	/* XXX */
-
-/*
- * Tear apart a break instruction to find its type.
- */
-#define break5(x)	((x) & 0x1F)
-#define break13(x)	(((x) >> 13) & 0x1FFF)
-
-/*
- * Trace debugging.
- */
-#define TRACE_OFF	0
-#define TRACE_JUMP      -1
-#define TRACE_SUSPEND   -2
-#define TRACE_RESUME    -3
diff --git a/sys/arch/hppa/include/trap.h b/sys/arch/hppa/include/trap.h
index e1fea2b72fd..ab1a9b70241 100644
--- a/sys/arch/hppa/include/trap.h
+++ b/sys/arch/hppa/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.2 1998/08/29 01:22:36 mickey Exp $	*/
+/*	$OpenBSD: trap.h,v 1.3 1999/02/17 20:40:32 mickey Exp $	*/
 
 /* 
  * Copyright (c) 1988-1994, The University of Utah and
@@ -21,6 +21,9 @@
  * improvements that they make and grant CSL redistribution rights.
  *
  * 	Utah $Hdr: trap.h 1.6 94/12/16$
+ *
+ * 	Utah $Hdr: break.h 1.10 94/12/14$
+ *	Author: Bob Wheeler, University of Utah CSL
  */
 
 #ifndef _MACHINE_TRAP_H_
@@ -67,4 +70,34 @@
 
 #define	T_USER		0x20	/* user-mode flag or'ed with type */
 
+/*  Values for break instructions */
+
+/* values for the im5 field of the break instruction */
+#define	HPPA_BREAK_KERNEL	0
+#define	HPPA_BREAK_MAYDEBUG	31	/* Reserved for Mayfly debugger. */
+
+/* values for the im13 field of the break instruction */
+#define	HPPA_BREAK_PDC_DUMP  		2
+#define	HPPA_BREAK_KERNTRACE		3
+#define	HPPA_BREAK_MACH_DEBUGGER	4
+#define	HPPA_BREAK_KGDB			5
+#define	HPPA_BREAK_KERNPRINT		6
+#define	HPPA_BREAK_IVA			7
+#define	HPPA_BREAK_PDC_IODC_CALL	8
+#define	HPPA_BREAK_GDB			8	/* Standard GDB breakpoint.  */
+
+/*
+ * Tear apart a break instruction to find its type.
+ */
+#define	break5(x)	((x) & 0x1F)
+#define	break13(x)	(((x) >> 13) & 0x1FFF)
+
+/*
+ * Trace debugging.
+ */
+#define	HPPA_TRACE_OFF	0
+#define	HPPA_TRACE_JUMP      -1
+#define	HPPA_TRACE_SUSPEND   -2
+#define	HPPA_TRACE_RESUME    -3
+
 #endif /* _MACHINE_TRAP_H_ */
-- 
cgit v1.2.3