release/3.0.0

19 files changed, 95 insertions, 889 deletions

diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 80eb3078a309c..5107274ff18b3 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $Id: alpha_cpu.h,v 1.4 1998/12/23 11:50:50 dfr Exp $ */
+/* $Id: alpha_cpu.h,v 1.2 1998/06/10 10:54:21 dfr Exp $ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*
@@ -273,10 +273,8 @@ typedef unsigned long alpha_pt_entry_t;
  */
 
 #define	ALPHA_AMASK_BWX		0x0001		/* byte/word extension */
-#define	ALPHA_AMASK_FIX		0x0002		/* sqrt and f <-> i conversion extension */
-#define	ALPHA_AMASK_CIX		0x0004		/* count extension */
-#define	ALPHA_AMASK_MVI		0x0100		/* multimedia extension */
-#define	ALPHA_AMASK_PRECISE	0x0200		/* Precise arithmetic traps */
+#define	ALPHA_AMASK_CIX		0x0002		/* count extension */
+#define	ALPHA_AMASK_MAX		0x0100		/* multimedia extension */
 
 /*
  * Chip family IDs returned by implver instruction
@@ -326,6 +324,5 @@ void		alpha_pal_wrusp __P((unsigned long));
 void		alpha_pal_wrvptptr __P((unsigned long));
 void		alpha_pal_wrmces __P((unsigned long));
 void		alpha_pal_wrval __P((unsigned long));
-unsigned long	alpha_pal_wrperfmon __P((unsigned long, unsigned long));
 
 #endif /* __ALPHA_ALPHA_CPU_H__ */
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 09413e7d49f04..aeaba523e6853 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -1,4 +1,4 @@
-/* $Id: ansi.h,v 1.3 1998/10/12 23:57:58 alex Exp $ */
+/* $Id: ansi.h,v 1.2 1998/03/09 05:53:07 jb Exp $ */
 /* From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp */
 
 /*-
@@ -63,6 +63,9 @@ typedef struct {
 #define	_BSD_TIMER_T_		int		/* timer_t */
 #define	_BSD_SUSECONDS_T_	int		/* suseconds_t */
 #define	_BSD_USECONDS_T_	unsigned int	/* useconds_t */
+#define	_BSD_UINT8_T_		unsigned char	/* uint8_t */
+#define	_BSD_UINT16_T_		unsigned short	/* uint16_t */
+#define	_BSD_UINT32_T_		unsigned int	/* uint32_t */
 
 /*
  * Types which are fundamental to the implementation and must be used
@@ -105,20 +108,4 @@ typedef struct {
 #define	_BSD_CLK_TCK_		100
 #define	_BSD_CLOCKS_PER_SEC_	100
 
-/*
- * Internal names for basic integral types.  Omit the typedef if
- * not possible for a machine/compiler combination.
- */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long			  __int64_t;
-typedef	unsigned long		 __uint64_t;
-
-typedef	long			 __intptr_t;
-typedef	unsigned long		__uintptr_t;
-
 #endif	/* _ANSI_H_ */
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index f7a61be4c1f28..74698c5c5a9ab 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chipset.h,v 1.5 1998/10/06 14:18:39 dfr Exp $
+ *	$Id: chipset.h,v 1.4 1998/08/10 07:53:58 dfr Exp $
  */
 
 #ifndef _MACHINE_CHIPSET_H_
@@ -54,8 +54,7 @@ typedef void		alpha_chipset_cfgwritew_t(u_int, u_int, u_int, u_int,
 typedef void		alpha_chipset_cfgwritel_t(u_int, u_int, u_int, u_int,
 						  u_int32_t);
 typedef vm_offset_t     alpha_chipset_addrcvt_t(vm_offset_t);
-typedef u_int64_t	alpha_chipset_read_hae_t(void);
-typedef void		alpha_chipset_write_hae_t(u_int64_t);
+
 
 typedef struct alpha_chipset {
     /*
@@ -92,14 +91,8 @@ typedef struct alpha_chipset {
     /*
      * PCI address space translation functions
      */
-    alpha_chipset_addrcvt_t*	cvt_to_dense;
-    alpha_chipset_addrcvt_t*	cvt_to_bwx;
-
-    /*
-     * Access the HAE register
-     */
-    alpha_chipset_read_hae_t*	read_hae;
-    alpha_chipset_write_hae_t*	write_hae;
+    alpha_chipset_addrcvt_t*   cvt_to_dense;
+    alpha_chipset_addrcvt_t*   cvt_to_bwx;
 
     /*
      * PCI interrupt device.
@@ -111,14 +104,4 @@ typedef struct alpha_chipset {
 
 extern alpha_chipset_t chipset;
 
-/*
- * Exported sysctl variables describing the PCI chipset.
- */
-extern char chipset_type[10];
-extern int chipset_bwx;
-extern long chipset_ports;
-extern long chipset_memory;
-extern long chipset_dense;
-extern long chipset_hae_mask;
-
 #endif /* !_MACHINE_CHIPSET_H_ */
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index 52ef8d1649df8..d74797622648f 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.40 1998/09/17 09:38:36 dfr Exp $
+ *	$Id: console.h,v 1.39 1998/08/06 09:15:52 dfr Exp $
  *	from: i386/include console.h,v 1.39
  */
 
@@ -304,7 +304,7 @@ struct video_info {
     int			vi_flags;
 #define V_INFO_COLOR	(1<<0)
 #define V_INFO_GRAPHICS	(1<<1)
-#define V_INFO_LINEAR	(1<<2)
+#define V_INFO_LENEAR	(1<<2)
 #define V_INFO_VESA	(1<<3)
     int			vi_width;
     int			vi_height;
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
deleted file mode 100644
index c9efceed02930..0000000000000
--- a/sys/alpha/include/fpu.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 1998 Doug Rabson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id: fpu.h,v 1.1 1998/12/04 10:52:48 dfr Exp $
- */
-
-#ifndef _MACHINE_FPU_H_
-#define _MACHINE_FPU_H_
-
-/*
- * Floating point control register bits.
- *
- * From Alpha AXP Architecture Reference Manual, Instruction
- * Descriptions (I) PP 4-69. 
- */
-
-#define FPCR_INVD	(1LL << 49)	/* Invalid Operation DIsable */
-#define FPCR_DZED	(1LL << 50)	/* Division by Zero Disable */
-#define FPCR_OVFD	(1LL << 51)	/* Overflow Disable */
-#define FPCR_INV	(1LL << 52)	/* Invalid Operation */
-#define FPCR_DZE	(1LL << 53)	/* Division by Zero */
-#define FPCR_OVF	(1LL << 54)	/* Overflow */
-#define FPCR_UNF	(1LL << 55)	/* Underflow */
-#define FPCR_INE	(1LL << 56)	/* Inexact Result */
-#define FPCR_IOV	(1LL << 57)	/* Integer Overflow */
-#define FPCR_DYN_CHOPPED (0LL << 58)	/* Chopped rounding mode */
-#define FPCR_DYN_MINUS	(1LL << 58)	/* Minus infinity */
-#define FPCR_DYN_NORMAL (2LL << 58)	/* Normal rounding */
-#define FPCR_DYN_PLUS	(3LL << 58)	/* Plus infinity */
-#define FPCR_DYN_MASK	(3LL << 58)	/* Rounding mode mask */
-#define FPCR_DYN_SHIFT	58
-#define FPCR_UNDZ	(1LL << 60)	/* Underflow to Zero */
-#define FPCR_UNFD	(1LL << 61)	/* Underflow Disable */
-#define FPCR_INED	(1LL << 62)	/* Inexact Disable */
-#define FPCR_SUM	(1LL << 63)	/* Summary Bit */
-#define FPCR_MASK	(~0LL << 49)
-
-/*
- * Exception summary bits.
- *
- * From Alpha AXP Architecture Reference Manual, DEC OSF/1 Exceptions
- * and Interrupts (II-B) PP 5-5.
- */
-
-#define EXCSUM_SWC	(1LL << 0)	/* Software completion */
-#define EXCSUM_INV	(1LL << 1)	/* Invalid operation */
-#define EXCSUM_DZE	(1LL << 2)	/* Division by zero */
-#define EXCSUM_OVF	(1LL << 3)	/* Overflow */
-#define EXCSUM_UNF	(1LL << 4)	/* Underflow */
-#define EXCSUM_INE	(1LL << 5)	/* Inexact result */
-#define EXCSUM_IOV	(1LL << 6)	/* Integer overflow */
-
-/*
- * Definitions for IEEE trap enables.  These are implemented in
- * software and should be compatible with OSF/1 and Linux.
- */
-
-/* read/write flags */
-#define IEEE_TRAP_ENABLE_INV	(1LL << 1) /* Invalid operation */
-#define IEEE_TRAP_ENABLE_DZE	(1LL << 2) /* Division by zero */
-#define IEEE_TRAP_ENABLE_OVF	(1LL << 3) /* Overflow */
-#define IEEE_TRAP_ENABLE_UNF	(1LL << 4) /* Underflow */
-#define IEEE_TRAP_ENABLE_INE	(1LL << 5) /* Inexact result */
-#define IEEE_TRAP_ENABLE_MASK	(IEEE_TRAP_ENABLE_INV		\
-				 | IEEE_TRAP_ENABLE_DZE		\
-				 | IEEE_TRAP_ENABLE_OVF		\
-				 | IEEE_TRAP_ENABLE_UNF		\
-				 | IEEE_TRAP_ENABLE_INE)
-
-/* read only flags */
-#define IEEE_STATUS_INV		(1LL << 17) /* Invalid operation */
-#define IEEE_STATUS_DZE		(1LL << 18) /* Division by zero */
-#define IEEE_STATUS_OVF		(1LL << 19) /* Overflow */
-#define IEEE_STATUS_UNF		(1LL << 20) /* Underflow */
-#define IEEE_STATUS_INE		(1LL << 21) /* Inexact result */
-#define IEEE_STATUS_MASK	(IEEE_STATUS_INV		\
-				 | IEEE_STATUS_DZE		\
-				 | IEEE_STATUS_OVF		\
-				 | IEEE_STATUS_UNF		\
-				 | IEEE_STATUS_INE)
-#define IEEE_STATUS_TO_EXCSUM_SHIFT	16 /* convert to excsum */
-#define IEEE_STATUS_TO_FPCR_SHIFT	35 /* convert to fpcr */
-
-#define IEEE_INHERIT		(1LL << 63) /* inherit on fork */
-
-/* read and write floating point control register */
-#define GET_FPCR(x) \
-	__asm__("trapb"); \
-	__asm__("mf_fpcr %0" : "=f" (x)); \
-	__asm__("trapb")
-#define SET_FPCR(x) \
-	__asm__("trapb"); \
-	__asm__("mt_fpcr %0" : : "f" (x)); \
-	__asm__("trapb")
-
-#ifdef KERNEL
-
-extern int fp_software_completion(u_int64_t regmask, struct proc *p);
-
-#endif
-
-#endif /* ! _MACHINE_FPU_H_ */
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 8af1d71625176..19aaef68ea8db 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/* $Id: frame.h,v 1.1 1998/01/10 10:13:14 jb Exp $ */
+/* $Id$ */
 /* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
 
 /*
@@ -47,39 +47,35 @@
  */
 
 /* Quadword offsets of the registers to be saved. */
-#define	FRAME_V0		0
-#define	FRAME_T0		1
-#define	FRAME_T1		2
-#define	FRAME_T2		3
-#define	FRAME_T3		4
-#define	FRAME_T4		5
-#define	FRAME_T5		6
-#define	FRAME_T6		7
-#define	FRAME_T7		8
-#define	FRAME_S0		9
-#define	FRAME_S1		10
-#define	FRAME_S2		11
-#define	FRAME_S3		12
-#define	FRAME_S4		13
-#define	FRAME_S5		14
-#define	FRAME_S6		15
-#define	FRAME_A3		16
-#define	FRAME_A4		17
-#define	FRAME_A5		18
-#define	FRAME_T8		19
-#define	FRAME_T9		20
-#define	FRAME_T10		21
-#define	FRAME_T11		22
-#define	FRAME_RA		23
-#define	FRAME_T12		24
-#define	FRAME_AT		25
-#define	FRAME_SP		26
-/* The following are set only when a signal is to be delivered to a process. */
-#define FRAME_TRAPARG_A0	27
-#define FRAME_TRAPARG_A1	28
-#define FRAME_TRAPARG_A2	29
+#define	FRAME_V0	0
+#define	FRAME_T0	1
+#define	FRAME_T1	2
+#define	FRAME_T2	3
+#define	FRAME_T3	4
+#define	FRAME_T4	5
+#define	FRAME_T5	6
+#define	FRAME_T6	7
+#define	FRAME_T7	8
+#define	FRAME_S0	9
+#define	FRAME_S1	10
+#define	FRAME_S2	11
+#define	FRAME_S3	12
+#define	FRAME_S4	13
+#define	FRAME_S5	14
+#define	FRAME_S6	15
+#define	FRAME_A3	16
+#define	FRAME_A4	17
+#define	FRAME_A5	18
+#define	FRAME_T8	19
+#define	FRAME_T9	20
+#define	FRAME_T10	21
+#define	FRAME_T11	22
+#define	FRAME_RA	23
+#define	FRAME_T12	24
+#define	FRAME_AT	25
+#define	FRAME_SP	26
 
-#define	FRAME_SW_SIZE	(FRAME_TRAPARG_A2 + 1)
+#define	FRAME_SW_SIZE	(FRAME_SP + 1)
 #define	FRAME_HW_OFFSET	FRAME_SW_SIZE
 
 #define	FRAME_PS	(FRAME_HW_OFFSET + ALPHA_HWFRAME_PS)
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index a838e98919553..c0f4c2f4035c8 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $Id: ieeefp.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $Id$ */
 /* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
 
 /* 
@@ -10,14 +10,12 @@
 #define _ALPHA_IEEEFP_H_
 
 typedef int fp_except;
-#define	FP_X_INV	(1LL << 1)	/* invalid operation exception */
-#define	FP_X_DZ		(1LL << 2)	/* divide-by-zero exception */
-#define	FP_X_OFL	(1LL << 3)	/* overflow exception */
-#define	FP_X_UFL	(1LL << 4)	/* underflow exception */
-#define	FP_X_IMP	(1LL << 5)	/* imprecise(inexact) exception */
-#if 0
-#define	FP_X_IOV	(1LL << 6)	/* integer overflow XXX? */
-#endif
+#define	FP_X_INV	0x01	/* invalid operation exception */
+#define	FP_X_DZ		0x02	/* divide-by-zero exception */
+#define	FP_X_OFL	0x04	/* overflow exception */
+#define	FP_X_UFL	0x08	/* underflow exception */
+#define	FP_X_IMP	0x10	/* imprecise (loss of precision; "inexact") */
+#define	FP_X_IOV	0x20    /* integer overflow XXX? */
 
 typedef enum {
     FP_RZ=0,			/* round to zero (truncate) */
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
deleted file mode 100644
index 27011848b1757..0000000000000
--- a/sys/alpha/include/inst.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/*-
- * Copyright (c) 1998 Doug Rabson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#ifndef _MACHINE_INST_H_
-#define _MACHINE_INST_H_
-
-union alpha_instruction {
-    u_int32_t word;
-    struct {
-	u_int32_t argument	: 26;
-	u_int32_t opcode	: 6;
-#define op_call_pal		0x00
-#define op_lda			0x08
-#define	op_ldah			0x09
-#define op_ldbu			0x0a
-#define op_unop			0x0b
-#define op_ldq_u		0x0b
-#define op_ldwu			0x0c
-#define op_stw			0x0d
-#define op_stb			0x0e
-#define op_stq_u		0x0f
-#define op_inta			0x10
-#define		inta_addl	0x00
-#define		inta_s4addl	0x02
-#define		inta_subl	0x09
-#define		inta_s4subl	0x0b
-#define		inta_cmpbge	0x0f
-#define		inta_s8addl	0x12
-#define		inta_s8subl	0x1b
-#define		inta_cmpult	0x1d
-#define		inta_addq	0x20
-#define		inta_s4addq	0x22
-#define		inta_subq	0x29
-#define		inta_s4subq	0x2b
-#define		inta_cmpeq	0x2d
-#define		inta_s8addq	0x32
-#define		inta_s8subq	0x3b
-#define		inta_cmpule	0x3d
-#define		inta_addlv	0x40
-#define		inta_sublv	0x49
-#define		inta_cmplt	0x4d
-#define		inta_addqv	0x60
-#define		inta_subqv	0x69
-#define		inta_cmple	0x6d
-#define op_intl			0x11
-#define		intl_and	0x00
-#define		intl_andnot	0x08
-#define		intl_bic	0x08
-#define		intl_cmovlbs	0x14
-#define		intl_cmovlbc	0x16
-#define		intl_or		0x20
-#define		intl_bis	0x20
-#define		intl_cmoveq	0x24
-#define		intl_cmovne	0x26
-#define		intl_ornot	0x28
-#define		intl_xor	0x40
-#define		intl_cmovlt	0x44
-#define		intl_cmovge	0x46
-#define		intl_eqv	0x48
-#define		intl_amask	0x61
-#define		intl_cmovle	0x64
-#define		intl_cmovgt	0x66
-#define		intl_implver	0x6c
-#define op_ints			0x12
-#define		ints_mskbl	0x02
-#define		ints_extbl	0x06
-#define		ints_insbl	0x0b
-#define		ints_mskwl	0x12
-#define		ints_extwl	0x16
-#define		ints_inswl	0x1b
-#define		ints_mskll	0x22
-#define		ints_extll	0x26
-#define		ints_insll	0x2b
-#define		ints_zap	0x30
-#define		ints_zapnot	0x31
-#define		ints_mskql	0x32
-#define		ints_srl	0x34
-#define		ints_extql	0x36
-#define		ints_sll	0x39
-#define		ints_insql	0x3b
-#define		ints_sra	0x3c
-#define		ints_mskwh	0x52
-#define		ints_inswh	0x57
-#define		ints_extwh	0x5a
-#define		ints_msklh	0x62
-#define		ints_inslh	0x67
-#define		ints_extlh	0x6a
-#define		ints_mskqh	0x72
-#define		ints_insqh	0x77
-#define		ints_extqh	0x7a
-#define op_intm			0x13
-#define		intm_mull	0x00
-#define		intm_mulq	0x20
-#define		intm_umulh	0x30
-#define		intm_mullv	0x40
-#define		intm_mulqv	0x60
-#define op_opc14		0x14
-#define op_fltv			0x15
-#define op_flti			0x16
-#define		flti_addsc	0x000
-#define		flti_subsc	0x001
-#define		flti_mulsc	0x002
-#define		flti_divsc	0x003
-#define		flti_addtc	0x020
-#define		flti_subtc	0x021
-#define		flti_multc	0x022
-#define		flti_divtc	0x023
-#define		flti_cvttsc	0x02c
-#define		flti_cvttqc	0x02f
-#define		flti_cvtqsc	0x03c
-#define		flti_cvtqtc	0x03e
-
-#define		flti_addsm	0x040
-#define		flti_subsm	0x041
-#define		flti_mulsm	0x042
-#define		flti_divsm	0x043
-#define		flti_addtm	0x060
-#define		flti_subtm	0x061
-#define		flti_multm	0x062
-#define		flti_divtm	0x063
-#define		flti_cvttsm	0x06c
-#define		flti_cvttqm	0x06f
-#define		flti_cvtqsm	0x07c
-#define		flti_cvtqtm	0x07e
-
-#define		flti_adds	0x080
-#define		flti_subs	0x081
-#define		flti_muls	0x082
-#define		flti_divs	0x083
-
-#define		flti_addt	0x0a0
-#define		flti_subt	0x0a1
-#define		flti_mult	0x0a2
-#define		flti_divt	0x0a3
-#define		flti_cmptun	0x0a4
-#define		flti_cmpteq	0x0a5
-#define		flti_cmptlt	0x0a6
-#define		flti_cmptle	0x0a7
-#define		flti_cvtts	0x0ac
-#define		flti_cvttq	0x0af
-#define		flti_cvtqs	0x0bc
-#define		flti_cvtqt	0x0be
-
-#define		flti_addsd	0x0c0
-#define		flti_subsd	0x0c1
-#define		flti_mulsd	0x0c2
-#define		flti_divsd	0x0c3
-#define		flti_addtd	0x0e0
-#define		flti_subtd	0x0e1
-#define		flti_multd	0x0e2
-#define		flti_divtd	0x0e3
-#define		flti_cvttsd	0x0ec
-#define		flti_cvttqd	0x0ef
-#define		flti_cvtqsd	0x0fc
-#define		flti_cvtqtd	0x0fe
-
-#define		flti_addsuc	0x100
-#define		flti_subsuc	0x101
-#define		flti_mulsuc	0x102
-#define		flti_divsuc	0x103
-#define		flti_addtuc	0x120
-#define		flti_subtuc	0x121
-#define		flti_multuc	0x122
-#define		flti_divtuc	0x123
-#define		flti_cvttsuc	0x12c
-#define		flti_cvttqvc	0x12f
-
-#define		flti_addsum	0x140
-#define		flti_subsum	0x141
-#define		flti_mulsum	0x142
-#define		flti_divsum	0x143
-#define		flti_addtum	0x160
-#define		flti_subtum	0x161
-#define		flti_multum	0x162
-#define		flti_divtum	0x163
-#define		flti_cvttsum	0x16c
-#define		flti_cvttqvm	0x16f
-
-#define		flti_addsu	0x180
-#define		flti_subsu	0x181
-#define		flti_mulsu	0x182
-#define		flti_divsu	0x183
-#define		flti_addtu	0x1a0
-#define		flti_subtu	0x1a1
-#define		flti_multu	0x1a2
-#define		flti_divtu	0x1a3
-#define		flti_cvttsu	0x1ac
-#define		flti_cvttqv	0x1af
-
-#define		flti_addsud	0x1c0
-#define		flti_subsud	0x1c1
-#define		flti_mulsud	0x1c2
-#define		flti_divsud	0x1c3
-#define		flti_addtud	0x1e0
-#define		flti_subtud	0x1e1
-#define		flti_multud	0x1e2
-#define		flti_divtud	0x1e3
-#define		flti_cvttsud	0x1ec
-#define		flti_cvttqvd	0x1ef
-
-#define		flti_cvtst	0x2ac
-
-#define		flti_addssuc	0x500
-#define		flti_subssuc	0x501
-#define		flti_mulssuc	0x502
-#define		flti_divssuc	0x503
-#define		flti_addtsuc	0x520
-#define		flti_subtsuc	0x521
-#define		flti_multsuc	0x522
-#define		flti_divtsuc	0x523
-#define		flti_cvttssuc	0x52c
-#define		flti_cvttqsvc	0x52f
-
-#define		flti_addssum	0x540
-#define		flti_subssum	0x541
-#define		flti_mulssum	0x542
-#define		flti_divssum	0x543
-#define		flti_addtsum	0x560
-#define		flti_subtsum	0x561
-#define		flti_multsum	0x562
-#define		flti_divtsum	0x563
-#define		flti_cvttssum	0x56c
-#define		flti_cvttqsvm	0x56f
-
-#define		flti_addssu	0x580
-#define		flti_subssu	0x581
-#define		flti_mulssu	0x582
-#define		flti_divssu	0x583
-#define		flti_addtsu	0x5a0
-#define		flti_subtsu	0x5a1
-#define		flti_multsu	0x5a2
-#define		flti_divtsu	0x5a3
-#define		flti_cmptunsu	0x5a4
-#define		flti_cmpteqsu	0x5a5
-#define		flti_cmptltsu	0x5a6
-#define		flti_cmptlesu	0x5a7
-#define		flti_cvttssu	0x5ac
-#define		flti_cvttqsv	0x5af
-
-#define		flti_addssud	0x5c0
-#define		flti_subssud	0x5c1
-#define		flti_mulssud	0x5c2
-#define		flti_divssud	0x5c3
-#define		flti_addtsud	0x5e0
-#define		flti_subtsud	0x5e1
-#define		flti_multsud	0x5e2
-#define		flti_divtsud	0x5e3
-#define		flti_cvttssud	0x5ec
-#define		flti_cvttqsvd	0x5ef
-
-#define		flti_cvtsts	0x6ac
-
-#define		flti_addssuic	0x700
-#define		flti_subssuic	0x701
-#define		flti_mulssuic	0x702
-#define		flti_divssuic	0x703
-#define		flti_addtsuic	0x720
-#define		flti_subtsuic	0x721
-#define		flti_multsuic	0x722
-#define		flti_divtsuic	0x723
-#define		flti_cvttssuic	0x72c
-#define		flti_cvttqsvic	0x72f
-#define		flti_cvtqssuic	0x73c
-#define		flti_cvtqtsuic	0x73e
-
-#define		flti_addssuim	0x740
-#define		flti_subssuim	0x741
-#define		flti_mulssuim	0x742
-#define		flti_divssuim	0x743
-#define		flti_addtsuim	0x760
-#define		flti_subtsuim	0x761
-#define		flti_multsuim	0x762
-#define		flti_divtsuim	0x763
-#define		flti_cvttssuim	0x76c
-#define		flti_cvttqsvim	0x76f
-#define		flti_cvtqssuim	0x77c
-#define		flti_cvtqtsuim	0x77e
-
-#define		flti_addssui	0x780
-#define		flti_subssui	0x781
-#define		flti_mulssui	0x782
-#define		flti_divssui	0x783
-#define		flti_addtsui	0x7a0
-#define		flti_subtsui	0x7a1
-#define		flti_multsui	0x7a2
-#define		flti_divtsui	0x7a3
-#define		flti_cmptunsui	0x7a4
-#define		flti_cmpteqsui	0x7a5
-#define		flti_cmptltsui	0x7a6
-#define		flti_cmptlesui	0x7a7
-#define		flti_cvttssui	0x7ac
-#define		flti_cvttqsvi	0x7af
-#define		flti_cvtqssui	0x7bc
-#define		flti_cvtqtsui	0x7bc
-
-#define		flti_addssuid	0x7c0
-#define		flti_subssuid	0x7c1
-#define		flti_mulssuid	0x7c2
-#define		flti_divssuid	0x7c3
-#define		flti_addtsuid	0x7e0
-#define		flti_subtsuid	0x7e1
-#define		flti_multsuid	0x7e2
-#define		flti_divtsuid	0x7e3
-#define		flti_cvttssuid	0x7ec
-#define		flti_cvttqsvid	0x7ef
-#define		flti_cvtqssuid	0x7fc
-#define		flti_cvtqtsuid	0x7fc
-
-#define op_fltl			0x17
-#define		fltl_cvtlq	0x010
-#define		fltl_cpys	0x020
-#define		fltl_cpysn	0x021
-#define		fltl_cpyse	0x022
-#define		fltl_mt_fpcr	0x024
-#define		fltl_mf_fpcr	0x025
-#define		fltl_fcmoveq	0x02a
-#define		fltl_fcmovne	0x02b
-#define		fltl_fcmovlt	0x02c
-#define		fltl_fcmovge	0x02d
-#define		fltl_fcmovle	0x02e
-#define		fltl_fcmovgt	0x02f
-#define		fltl_cvtql	0x030
-#define		fltl_cvtqlv	0x130
-#define		fltl_cvtqlsv	0x530
-
-#define op_misc			0x18
-#define		misc_trapb	0x0000
-#define		misc_excb	0x0400
-#define		misc_mb		0x4000
-#define		misc_wmb	0x4400
-#define		misc_fetch	0x8000
-#define		misc_fetch_m	0xa000
-#define		misc_rpcc	0xc000
-#define		misc_rc		0xe000
-#define		misc_ecb	0xe800
-#define		misc_rs		0xf000
-#define		misc_wh64	0xf800
-
-#define op_pal19		0x19
-#define op_jsr			0x1a
-#define op_pal1b		0x1b
-#define op_pal1c		0x1c
-#define op_pal1d		0x1d
-#define op_pal1e		0x1e
-#define op_pal1f		0x1f
-#define op_ldf			0x20
-#define op_ldg			0x21
-#define op_lds			0x22
-#define op_ldt			0x23
-#define op_stf			0x24
-#define op_stg			0x25
-#define op_sts			0x26
-#define op_stt			0x27
-#define op_ldl			0x28
-#define op_ldq			0x29
-#define op_ldl_l		0x2a
-#define op_ldq_l		0x2b
-#define op_stl			0x2c
-#define op_stq			0x2d
-#define op_stl_c		0x2e
-#define op_stq_c		0x2f
-#define op_br			0x30
-#define op_fbeq			0x31
-#define op_fblt			0x32
-#define op_fble			0x33
-#define op_bsr			0x34
-#define op_fbne			0x35
-#define op_fbge			0x36
-#define op_fbgt			0x37
-#define op_blbc			0x38
-#define op_beq			0x39
-#define op_blt			0x3a
-#define op_ble			0x3b
-#define op_blbs			0x3c
-#define op_bne			0x3d
-#define op_bge			0x3e
-#define op_bgt			0x3f
-    } common;
-    struct {
-	u_int32_t function	: 16;
-	u_int32_t rb		: 5;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } memory_format;
-    struct {
-	u_int32_t hint		: 14;
-	u_int32_t function	: 2;
-#define jsr_jmp			0
-#define jsr_jsr			1
-#define jsr_ret			2
-#define jsr_jsr_coroutine	3
-	u_int32_t rb		: 5;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } j_format;
-    struct {
-	int32_t memory_displacement : 16;
-	u_int32_t rb		: 5;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } m_format;
-    struct {
-	u_int32_t rc		: 5;
-	u_int32_t function	: 7;
-	u_int32_t form		: 1;
-	u_int32_t sbz		: 3;
-	u_int32_t rb		: 5;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } o_format;
-    struct {
-	u_int32_t rc		: 5;
-	u_int32_t function	: 7;
-	u_int32_t form		: 1;
-	u_int32_t literal	: 8;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } l_format;
-    struct {
-	u_int32_t fc		: 5;
-	u_int32_t function	: 11;
-	u_int32_t fb		: 5;
-	u_int32_t fa		: 5;
-	u_int32_t opcode	: 6;
-    } f_format;
-    struct {
-	u_int32_t function	: 26;
-	u_int32_t opcode	: 6;
-    } pal_format;
-    struct {
-	int32_t branch_displacement : 21;
-	u_int32_t ra		: 5;
-	u_int32_t opcode	: 6;
-    } b_format;
-};
-
-#endif /* _MACHINE_INST_H_ */
diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h
index ea5408920b881..79af6fd9fa6dd 100644
--- a/sys/alpha/include/intr.h
+++ b/sys/alpha/include/intr.h
@@ -23,15 +23,24 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr.h,v 1.4 1998/11/15 18:25:16 dfr Exp $
+ *	$Id: intr.h,v 1.2 1998/07/12 16:09:30 dfr Exp $
  */
 
 #ifndef _MACHINE_INTR_H_
 #define _MACHINE_INTR_H_
 
-int alpha_setup_intr(int vector, driver_intr_t *intr, void *arg,
-		     void **cookiep, volatile long *cntp);
-int alpha_teardown_intr(void *cookie);
+LIST_HEAD(alpha_intr_list, alpha_intr);
+
+struct alpha_intr {
+    LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */
+    int			vector;	/* vector to match */
+    driver_intr_t	*intr;	/* handler function */
+    void		*arg;	/* argument to handler */
+};
+
+struct alpha_intr *alpha_create_intr(int vector,
+				     driver_intr_t *intr, void *arg);
+int alpha_connect_intr(struct alpha_intr *i);
 void alpha_dispatch_intr(void *frame, unsigned long vector);
 
 #endif /* !_MACHINE_INTR_H_ */
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
deleted file mode 100644
index cd9e70173156d..0000000000000
--- a/sys/alpha/include/intrcnt.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $Id$ */
-/* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
-
-/*
- * Copyright (c) 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#define	INTRCNT_CLOCK		0
-#define	INTRCNT_ISA_IRQ		(INTRCNT_CLOCK + 1)
-#define	INTRCNT_ISA_IRQ_LEN	16
-#define	INTRCNT_OTHER_BASE	(INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN)
-#define	INTRCNT_OTHER_LEN	48
-#define	INTRCNT_COUNT (INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN)
-
-#define	INTRCNT_A12_IRQ			INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_1000A_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_1000_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_2100_A500_IRQ	INTRCNT_OTHER_BASE
-#define	INTRCNT_DEC_550_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB164_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB64PLUS_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_EB66_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_IOASIC			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN15			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN16			INTRCNT_OTHER_BASE
-#define	INTRCNT_KN20AA_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_KN300_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_KN8AE_IRQ		INTRCNT_OTHER_BASE
-#define	INTRCNT_TCDS			INTRCNT_OTHER_BASE
-
-#define	INTRCNT_A12_IRQ_LEN		10
-#define	INTRCNT_DEC_1000A_IRQ_LEN	32
-#define	INTRCNT_DEC_1000_IRQ_LEN	16
-#define	INTRCNT_DEC_2100_A500_IRQ_LEN	16
-#define	INTRCNT_DEC_550_IRQ_LEN		48
-#define	INTRCNT_EB164_IRQ_LEN		24
-#define	INTRCNT_EB64PLUS_IRQ_LEN	32
-#define	INTRCNT_EB66_IRQ_LEN		32
-#define	INTRCNT_IOASIC_LEN		4
-#define	INTRCNT_ISA_IRQ_LEN		16
-#define	INTRCNT_KN15_LEN		9
-#define	INTRCNT_KN16_LEN		5
-#define	INTRCNT_KN20AA_IRQ_LEN		32
-#define	INTRCNT_KN300_LEN		19
-#define	INTRCNT_KN8AE_IRQ_LEN		2
-#define	INTRCNT_TCDS_LEN		2
-
-#	define	INTRCNT_KN300_NCR810	INTRCNT_KN300_IRQ + 16
-#	define	INTRCNT_KN300_I2C_CTRL	INTRCNT_KN300_IRQ + 17
-#	define	INTRCNT_KN300_I2C_BUS	INTRCNT_KN300_IRQ + 18
-
-#ifdef KERNEL
-#ifndef _LOCORE
-extern volatile long intrcnt[];
-#endif
-#endif
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index c8db0523ed918..b3925f7474c4c 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.4 1998/09/26 12:22:53 dfr Exp $
+ *	$Id: md_var.h,v 1.3 1998/09/14 22:43:24 jdp Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -44,6 +44,7 @@ struct proc;
 struct reg;
 struct cam_sim;
 
+void	cpu_power_down __P((void));
 void	cpu_halt __P((void));
 void	cpu_reset __P((void));
 int	is_physical_memory __P((vm_offset_t addr));
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index 2abce2cd01c92..3e63ba760f129 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.11 1998/08/06 09:15:52 dfr Exp $
+ *	$Id$
  *	from: i386/include mouse.h,v 1.10
  */
 
@@ -114,7 +114,6 @@ typedef struct mousehw {
 #define MOUSE_MODEL_THINK		5
 #define MOUSE_MODEL_EASYSCROLL		6
 #define MOUSE_MODEL_MOUSEMANPLUS	7
-#define MOUSE_MODEL_KIDSPAD		8
 
 typedef struct mousemode {
 	int protocol;		/* MOUSE_PROTO_XXX */
@@ -142,7 +141,6 @@ typedef struct mousemode {
 #define MOUSE_PROTO_THINK	11	/* Kensignton Thinking Mouse, 3/4 bytes */
 #define MOUSE_PROTO_SYSMOUSE	12	/* /dev/sysmouse */
 #define MOUSE_PROTO_X10MOUSEREM	13	/* X10 MouseRemote, 3 bytes */
-#define MOUSE_PROTO_KIDSPAD	14	/* Genius Kidspad */
 
 #define MOUSE_RES_UNKNOWN	(-1)
 #define MOUSE_RES_DEFAULT	0
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index a6d4a18bde20a..445617ea71dcc 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/* $Id: pcb.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $Id$ */
 /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
 
 /*
@@ -50,7 +50,6 @@ struct pcb {
 	struct alpha_pcb pcb_hw;		/* PALcode defined */
 	unsigned long	pcb_context[9];		/* s[0-6], ra, ps	[SW] */
 	struct fpreg	pcb_fp;			/* FP registers		[SW] */
-	u_int64_t	pcb_fp_control;		/* IEEE control word	[SW] */
 	unsigned long	pcb_onfault;		/* for copy faults	[SW] */
 	unsigned long	pcb_accessaddr;		/* for [fs]uswintr	[SW] */
 };
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 68add90c72556..6a1af705706e3 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/* $Id: proc.h,v 1.4 1998/11/15 18:25:16 dfr Exp $ */
+/* $Id: proc.h,v 1.2 1998/06/10 10:55:17 dfr Exp $ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*
@@ -38,15 +38,12 @@ struct mdbpt {
 };
 
 struct mdproc {
-	u_long		md_flags;
+	u_long	md_flags;
 	struct	trapframe *md_tf;	/* trap/syscall registers */
-	struct pcb	*md_pcbpaddr;	/* phys addr of the pcb */
-	struct mdbpt	md_sstep[2];	/* two single step breakpoints */
-	u_int64_t	md_hae;		/* user HAE register value */
-	void            *osf_sigtramp;  /* user-level signal trampoline */
+	struct pcb *md_pcbpaddr;	/* phys addr of the pcb */
+	struct mdbpt md_sstep[2];	/* two single step breakpoints */
 };
 
 #define	MDP_FPUSED	0x0001		/* Process used the FPU */
 #define MDP_STEP1	0x0002		/* Single step normal instruction */
 #define MDP_STEP2	0x0004		/* Single step branch instruction */
-#define MDP_HAEUSED	0x0008		/* Process used the HAE */
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
deleted file mode 100644
index 44763783d9ab4..0000000000000
--- a/sys/alpha/include/resource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $Id$ */
-/*
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _MACHINE_RESOURCE_H_
-#define	_MACHINE_RESOURCE_H_	1
-
-/*
- * Definitions of resource types for Intel Architecture machines
- * with support for legacy ISA devices and drivers.
- */
-
-#define	SYS_RES_IRQ	1
-#define	SYS_RES_DRQ	2
-#define	SYS_RES_MEMORY	3
-#define	SYS_RES_IOPORT	4
-
-#endif /* !_MACHINE_RESOURCE_H_ */
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index eb335c0639811..32f14c210aa4f 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/* $Id: signal.h,v 1.1 1998/01/10 10:13:16 jb Exp $ */
+/* $Id$ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*
@@ -56,11 +56,7 @@ struct  sigcontext {
 	unsigned long sc_fpcr;		/* FP control register (see above) */
 	unsigned long sc_fp_control;	/* FP software control word */
 	long	sc_reserved[2];		/* XXX */
-	long	sc_xxx1[2];		/* sc_ssize, sc_sbase on DUX */
-	unsigned long sc_traparg_a0;	/* a0 argument to trap at exception */
-	unsigned long sc_traparg_a1;	/* a1 argument to trap at exception */
-	unsigned long sc_traparg_a2;	/* a2 argument to trap at exception */
-	long	sc_xxx2[3];		/* sc_fp_trap_pc, sc_fp_trigger_sum, sc_fp_trigger_inst */
+	long	sc_xxx[8];		/* XXX */
 };
 
 #endif /* !_ANSI_SOURCE */
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
deleted file mode 100644
index e0e0a6b9b6178..0000000000000
--- a/sys/alpha/include/sysarch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1993 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id: sysarch.h,v 1.1 1998/11/17 10:40:07 dfr Exp $
- */
-
-/*
- * Architecture specific syscalls (alpha)
- */
-#ifndef _MACHINE_SYSARCH_H_
-#define _MACHINE_SYSARCH_H_
-
-#define ALPHA_SETHAE		0
-#define ALPHA_GET_FPMASK	1
-#define ALPHA_SET_FPMASK	2
-
-#ifndef KERNEL
-#include <sys/cdefs.h>
-
-union descriptor;
-
-__BEGIN_DECLS
-int		alpha_sethae __P((u_int64_t));
-__END_DECLS
-#endif /* !KERNEL */
-
-#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h
index f293bc5268dad..1bf185c651937 100644
--- a/sys/alpha/include/types.h
+++ b/sys/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $Id: types.h,v 1.8 1998/07/14 05:09:42 bde Exp $ */
+/* $Id: types.h,v 1.7 1998/07/10 02:34:50 bde Exp $ */
 /* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */
 
 /*-
@@ -56,16 +56,34 @@ typedef	long		vm_ooffset_t;
 typedef	unsigned long	vm_pindex_t;
 typedef	unsigned long	vm_size_t;
 
+/*
+ * Basic integral types.  Omit the typedef if
+ * not possible for a machine/compiler combination.
+ */
+#define __BIT_TYPES_DEFINED__
+typedef	__signed char		   int8_t;
+typedef	unsigned char		 u_int8_t;
+typedef	short			  int16_t;
+typedef	unsigned short		u_int16_t;
+typedef	int			  int32_t;
+typedef	unsigned int		u_int32_t;
+typedef	long			  int64_t;
+typedef	unsigned long		u_int64_t;
+
+typedef int64_t			register_t;
 
-typedef __int64_t		register_t;
+typedef int32_t			ufs_daddr_t;
 
 #ifdef KERNEL
 typedef	long		intfptr_t;
 typedef	unsigned long	uintfptr_t;
+typedef	long		intptr_t;
+typedef	unsigned long	uintptr_t;
+typedef	unsigned long	uoff_t;
 #endif
 
 /* Interrupt mask (spl, xxx_imask, etc) */
-typedef __uint32_t		intrmask_t;
+typedef u_int32_t		intrmask_t;
 
 /* Interrupt handler function type - arg should be "void *" one day */
 typedef void			inthand2_t(int _unit);
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index 04c62a65a5460..fead056e3d0c4 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $Id: vmparam.h,v 1.3 1998/06/14 13:45:15 dfr Exp $ */
+/* $Id: vmparam.h,v 1.2 1998/06/10 10:55:30 dfr Exp $ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_ALPHA_VMPARAM_H
 #define	_ALPHA_VMPARAM_H
@@ -54,15 +54,7 @@
  * kernel stack.
  */
 #define	USRTEXT		CLBYTES
-/* #define	USRSTACK	VM_MAXUSER_ADDRESS */
-
-/*
- * This stack location is suitable for OSF1 emulation.  Some OSF
- * programs are built as 32bit and assume that the stack is reachable
- * with a 32bit value.  OSF1 manages to have a variable location for
- * the user stack which we should probably also support.
- */
-#define USRSTACK	(0x12000000LL - (UPAGES*PAGE_SIZE))
+#define	USRSTACK	VM_MAXUSER_ADDRESS
 
 /*
  * Virtual memory related constants, all in bytes