2002-05-28 Roland McGrath <roland@frob.com>

* alpha/alpha/prom_interface.h: Fix obsolescent #else/#endif syntax.
	* alpha/alpha/pmap.c: Likewise.
	* alpha/alpha/pmap.h: Likewise.
	* alpha/alpha/pcb.c: Likewise.
	* alpha/alpha/context.h: Likewise.
	* alpha/alpha/thread.h: Likewise.
	* alpha/include/mach/alpha/alpha_instruction.h: Likewise.
	* alpha/include/mach/alpha/vm_param.h: Likewise.
	* alpha/include/mach/alpha/vm_types.h: Likewise.
	* alpha/include/mach/alpha/boolean.h: Likewise.
	* alpha/include/mach/alpha/kern_return.h: Likewise.
	* alpha/include/mach/alpha/thread_status.h: Likewise.
	* alpha/include/mach/alpha/syscall_sw.h: Likewise.
	* alpha/include/mach/alpha/exception.h: Likewise.
	* alpha/alpha/alpha_copyin.S: Likewise.
	* alpha/alpha/machspl.h: Likewise.
	* alpha/alpha/trap.c: Likewise.
	* alpha/alpha/alpha_instruction.c: Likewise.
	* alpha/alpha/alpha_init.c: Likewise.
	* alpha/alpha/setjmp.h: Likewise.
	* alpha/alpha/vm_tuning.h: Likewise.

20 files changed, 314 insertions, 257 deletions

diff --git a/alpha/alpha/alpha_copyin.S b/alpha/alpha/alpha_copyin.S
index 67ce51b8..df2bc745 100644
--- a/alpha/alpha/alpha_copyin.S
+++ b/alpha/alpha/alpha_copyin.S
@@ -1,43 +1,46 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	alpha_copyin.s,v $
+ * $Log: alpha_copyin.S,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.4  93/05/20  21:01:52  mrt
  * 	Changed use of zero to ra in call to NESTED.
  * 	[93/05/18            mrt]
- * 
+ *
  * Revision 2.3  93/01/19  08:57:31  danner
  * 	Added fast aligned_block_copy.
  * 	[93/01/19            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:10:58  danner
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:10:27  af]
- * 
+ *
  * 	Created.
  * 	[92/12/10  14:48:32  af]
  */
@@ -65,7 +68,7 @@
 #include <alpha/alpha_cpu.h>
 #include <mach/alpha/alpha_instruction.h>
 
-#include <assym.s>
+#include "alphaasm.h"
 
 	.set	noreorder
 
@@ -129,7 +132,7 @@ NESTED(copyin, 3, FRAMESIZE, ra, 0, 0)
 copy_error:
 	addq	zero,1,v0
 copy_ok:
-	stq	zero,THREAD_RECOVER(s0)	
+	stq	zero,THREAD_RECOVER(s0)
 	ldq	ra,FRAMESIZE-8(sp)
 	ldq	s0,FRAMESIZE-16(sp)
 	lda	sp,FRAMESIZE(sp)
@@ -455,7 +458,7 @@ bybytes:
 	sb	t0,3(a0)
 	b	kdb_iomem_ok
 	nop
-#endif	
+#endif
 	RET
 	END(kdb_putiomem)
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
diff --git a/alpha/alpha/alpha_init.c b/alpha/alpha/alpha_init.c
index 0a773af1..9f65b2b5 100644
--- a/alpha/alpha/alpha_init.c
+++ b/alpha/alpha/alpha_init.c
@@ -2,60 +2,63 @@
  * Mach Operating System
  * Copyright (c) 1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	alpha_init.c,v $
+ * $Log: alpha_init.c,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.5  93/05/15  19:10:51  mrt
  * 	machparam.h -> machspl.h
- * 
+ *
  * Revision 2.4  93/03/11  13:57:46  danner
  * 	Corrected boot time page stealing commentary.
  * 	[93/03/11            danner]
- * 
+ *
  * Revision 2.3  93/03/09  10:49:03  danner
  * 	GCC quiets, protos, standard boothowto, lint.
  * 	[93/03/05            af]
- * 
+ *
  * Revision 2.2  93/02/05  07:57:03  danner
  * 	No more ISP hacks.  Now we parse args.
  * 	Fixed bug in memory stealing call.
  * 	[93/02/04  00:56:23  af]
- * 
+ *
  * 	MP Icache sanity call, help Jeffrey in dprintf by delaying
  * 	dropping of bootstrap VM spaces.
  * 	[93/01/15            af]
  * 	Set vm_page_big_pagenum to support vm_page_grab_contiguous_pages.
  * 	[92/12/25  01:42:54  af]
- * 
+ *
  * 	Added reference to doc for the HWRPB &co.
  * 	[92/12/22            af]
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:11:03  af]
- * 
+ *
  * 	Created.
  * 	[92/06/03            af]
- * 
+ *
  */
 /*
  *	File: alpha_init.c
@@ -102,9 +105,9 @@ extern struct pcb boot_pcb;
 
 #if	MACH_KDB
 int		boothowto = RB_KDB;
-#else	MACH_KDB
+#else	/* MACH_KDB */
 int		boothowto = 0;
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 static init_memory( vm_offset_t first_page);	/* forward */
 
@@ -229,7 +232,7 @@ alpha_init( boolean_t gcc_compiled )
 #if	MACH_KDB
 	if ((boothowto&RB_HALT) && (boothowto&RB_KDB))
 		gimmeabreak();
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 	printf("Alpha boot: memory from 0x%x to 0x%x\n",
 	       memory_start, avail_end);
@@ -269,7 +272,7 @@ alpha_slave_init()
 
 	slave_main();
 }
-#endif	(NCPUS > 1)
+#endif	/* (NCPUS > 1) */
 
 static
 init_memory( vm_offset_t first_page)
@@ -313,4 +316,3 @@ init_memory( vm_offset_t first_page)
 	avail_start = (vm_offset_t)alpha_ptob(first_page);
 	avail_end   = (vm_offset_t)mem_size;
 }
-
diff --git a/alpha/alpha/alpha_instruction.c b/alpha/alpha/alpha_instruction.c
index ec491b5a..5caa9de2 100644
--- a/alpha/alpha/alpha_instruction.c
+++ b/alpha/alpha/alpha_instruction.c
@@ -1,38 +1,41 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	alpha_instruction.c,v $
+ * $Log: alpha_instruction.c,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:11:16  danner
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:11:14  af]
- * 
+ *
  * 	Created.
  * 	[92/06/01            af]
- * 
+ *
  */
 /*
  *	File: alpha_instruction.c
@@ -257,7 +260,7 @@ isa_load_store(ins, dest_addr, getreg, arg)
 	     (ins.mem_format.opcode <= op_stq_c))) {
 
 		/*
-		 * The only address calculation is register+displacement 
+		 * The only address calculation is register+displacement
 		 */
 		*dest_addr = (vm_offset_t) (ins.mem_format.displacement +
 					 (*getreg) (ins.mem_format.rs, arg));
@@ -383,7 +386,7 @@ db_restore_regs(ssp, sp, proc_pc, cur_pc, task)
 		ins.bits = db_get_task_value(pc, sizeof(alpha_instruction), FALSE, task);
 
 		if (ins.mem_format.opcode == op_lda
-			|| ins.mem_format.opcode == op_ldah) 
+			|| ins.mem_format.opcode == op_ldah)
 			continue;
 
 		if ((ins.mem_format.rs == SP) &&
@@ -395,7 +398,7 @@ db_restore_regs(ssp, sp, proc_pc, cur_pc, task)
 							 8, FALSE, task);
 			}
 			continue;
-		} 
+		}
 	end_prolog:
 		/*
 		 * end of prolog code.  look one more instruction.
@@ -405,4 +408,4 @@ db_restore_regs(ssp, sp, proc_pc, cur_pc, task)
 	}
 }
 
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
diff --git a/alpha/alpha/machspl.h b/alpha/alpha/machspl.h
index 2f0bcf6d..f186020d 100644
--- a/alpha/alpha/machspl.h
+++ b/alpha/alpha/machspl.h
@@ -1,36 +1,39 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	machspl.h,v $
+ * $Log: machspl.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/05/15  20:59:16  mrt
  * 	Used to be machparam.h
  * 	[93/05/15            mrt]
- * 
- * 
+ *
+ *
  */
 /*
  *	File: machspl.h
@@ -65,4 +68,4 @@ extern spl_t			alpha_swap_ipl( spl_t );
 #define	splvm()			splhigh()
 #define	splsched()		splhigh()
 
-#endif	_MACHINE_MACHSPL_H_
+#endif	/* _MACHINE_MACHSPL_H_ */
diff --git a/alpha/alpha/pcb.c b/alpha/alpha/pcb.c
index f0d35942..8f65d7b0 100644
--- a/alpha/alpha/pcb.c
+++ b/alpha/alpha/pcb.c
@@ -1,47 +1,50 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	pcb.c,v $
+ * $Log: pcb.c,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.4  93/05/15  19:11:18  mrt
  * 	machparam.h -> machspl.h
- * 
+ *
  * Revision 2.3  93/01/19  08:59:32  danner
  * 	Horrible mess to cope with cache-coherency bugs on ADU MP.
  * 	There is also some other bug at large that prevents proper
  * 	cleanup of the switch functions. Sigh.
  * 	[93/01/15            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:13:36  danner
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:15:36  af]
- * 
+ *
  * 	Created.
  * 	[92/12/10  14:59:58  af]
- * 
+ *
  */
 /*
  *	File: pcb.c
@@ -210,7 +213,7 @@ void stack_alloc(thread, continuation)
 		stack = PHYS_TO_K0SEG(m->phys_addr);
 #if	MACH_DEBUG
 		stack_init(stack);
-#endif	MACH_DEBUG
+#endif	/* MACH_DEBUG */
 		STACK_MSB(stack)->page = m;
 #endif	/* ALLOCATE_STACK_WITH_GARD_PAGES */
 	}
@@ -270,7 +273,7 @@ void stack_collect()
 
 #if		MACH_DEBUG
 		stack_finalize(stack);
-#endif		MACH_DEBUG
+#endif		/* MACH_DEBUG */
 		vm_page_release(STACK_MSB(stack)->page);
 
 		s = splsched();
@@ -323,12 +326,12 @@ void stack_statistics(totalp, maxusagep)
 	*totalp = stack_free_count;
 	(void) splx(s);
 }
-#endif	MACH_DEBUG
+#endif	/* MACH_DEBUG */
 
 /* Cannot optimize this because multiP */
 static
 unload_fpa(pcb)
-	pcb_t	pcb;	
+	pcb_t	pcb;
 {
 	register struct alpha_float_state	*mfs;
 
diff --git a/alpha/alpha/pmap.c b/alpha/alpha/pmap.c
index 56d753a6..d93e6451 100644
--- a/alpha/alpha/pmap.c
+++ b/alpha/alpha/pmap.c
@@ -2,54 +2,57 @@
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	pmap.c,v $
+ * $Log: pmap.c,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.4  93/05/15  19:11:31  mrt
  * 	machparam.h -> machspl.h
- * 
+ *
  * Revision 2.3  93/03/09  10:50:31  danner
  * 	GCC quiets.
  * 	[93/03/05            af]
- * 
+ *
  * Revision 2.2  93/02/05  07:59:42  danner
  * 	Added pmap_set_modify, for some smart device driver.
  * 	[93/02/04  00:51:56  af]
- * 
+ *
  * 	Fixed locking bug: at interrupt time one should not call
  * 	pmap_extract()  !  Made kvtophys() call the safer one.
  * 	[93/01/15            af]
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:17:39  af]
- * 
+ *
  * 	Support for new MI multiP ddb.  Code probably belongs elsewhere.
  * 	[92/12/16  12:45:52  af]
- * 
+ *
  * 	Created, starting from i386 version and extending it with
  * 	one more layer in the pagetable tree.
  * 	[92/12/10  15:02:31  af]
- * 
+ *
  */
 
 /*
@@ -409,7 +412,7 @@ volatile boolean_t	cpu_update_needed[NCPUS];
 	} \
 }
 
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 
 #define SPLVM(spl)
 #define SPLX(spl)
@@ -718,7 +721,7 @@ pmap_map_io(phys, size)
 	pte_ktemplate(template,phys,VM_PROT_READ|VM_PROT_WRITE);
 
 	phys = virtual_avail;
-	virtual_avail += round_page(size);	
+	virtual_avail += round_page(size);
 
 	while (size > 0) {
 		*pte++ = template;
@@ -1247,7 +1250,7 @@ void pmap_remove(map, s, e)
 	if (map == PMAP_NULL)
 		return;
 
-if (pmap_debug || ((s > pmap_suspect_vs) && (s < pmap_suspect_ve))) 
+if (pmap_debug || ((s > pmap_suspect_vs) && (s < pmap_suspect_ve)))
 db_printf("[%d]pmap_remove(%x,%x,%x)\n", cpu_number(), map, s, e);
 	PMAP_READ_LOCK(map, spl);
 
@@ -1456,7 +1459,7 @@ void pmap_protect(map, s, e, prot)
 	if (map == PMAP_NULL)
 		return;
 
-if (pmap_debug || ((s > pmap_suspect_vs) && (s < pmap_suspect_ve))) 
+if (pmap_debug || ((s > pmap_suspect_vs) && (s < pmap_suspect_ve)))
 db_printf("[%d]pmap_protect(%x,%x,%x,%x)\n", cpu_number(), map, s, e, prot);
 	/*
 	 * Determine the new protection.
@@ -1530,7 +1533,7 @@ void pmap_enter(pmap, v, pa, prot, wired)
 	vm_offset_t		old_pa;
 
 	assert(pa != vm_page_fictitious_addr);
-if (pmap_debug || ((v > pmap_suspect_vs) && (v < pmap_suspect_ve))) 
+if (pmap_debug || ((v > pmap_suspect_vs) && (v < pmap_suspect_ve)))
 db_printf("[%d]pmap_enter(%x(%d), %x, %x, %x, %x)\n", cpu_number(), pmap, pmap->pid, v, pa, prot, wired);
 	if (pmap == PMAP_NULL)
 		return;
@@ -1573,7 +1576,7 @@ Retry:
 	    /*
 	     *	May be changing its wired attribute or protection
 	     */
-		
+
 	    if (wired && !(*pte & ALPHA_PTE_WIRED))
 		pmap->stats.wired_count++;
 	    else if (!wired && (*pte & ALPHA_PTE_WIRED))
@@ -1646,7 +1649,7 @@ Retry:
 			}
 		    }
 #endif	/* DEBUG */
-		    
+
 		    /*
 		     *	Add new pv_entry after header.
 		     */
@@ -2436,7 +2439,7 @@ if (pmap_debug) db_printf("pmap_is_ref(%x)\n", phys);
 #if	NCPUS > 1
 /*
 *	    TLB Coherence Code (TLB "shootdown" code)
-* 
+*
 * Threads that belong to the same task share the same address space and
 * hence share a pmap.  However, they  may run on distinct cpus and thus
 * have distinct TLBs that cache page table entries. In order to guarantee
@@ -2449,7 +2452,7 @@ if (pmap_debug) db_printf("pmap_is_ref(%x)\n", phys);
 * flush its own TLB; a processor that needs to invalidate another TLB
 * needs to interrupt the processor that owns that TLB to signal the
 * update.
-* 
+*
 * Whenever a pmap is updated, the lock on that pmap is locked, and all
 * cpus using the pmap are signaled to invalidate. All threads that need
 * to activate a pmap must wait for the lock to clear to await any updates
@@ -2458,7 +2461,7 @@ if (pmap_debug) db_printf("pmap_is_ref(%x)\n", phys);
 * throughout the TLB code is that all kernel code that runs at or higher
 * than splvm blocks out update interrupts, and that such code does not
 * touch pageable pages.
-* 
+*
 * A shootdown interrupt serves another function besides signaling a
 * processor to invalidate. The interrupt routine (pmap_update_interrupt)
 * waits for the both the pmap lock (and the kernel pmap lock) to clear,
@@ -2471,17 +2474,17 @@ if (pmap_debug) db_printf("pmap_is_ref(%x)\n", phys);
 * Spinning on the VALUES of the locks is sufficient (rather than
 * having to acquire the locks) because any updates that occur subsequent
 * to finding the lock unlocked will be signaled via another interrupt.
-* (This assumes the interrupt is cleared before the low level interrupt code 
-* calls pmap_update_interrupt()). 
-* 
+* (This assumes the interrupt is cleared before the low level interrupt code
+* calls pmap_update_interrupt()).
+*
 * The signaling processor must wait for any implicit updates in progress
 * to terminate before continuing with its update. Thus it must wait for an
 * acknowledgement of the interrupt from each processor for which such
 * references could be made. For maintaining this information, a set
-* cpus_active is used. A cpu is in this set if and only if it can 
+* cpus_active is used. A cpu is in this set if and only if it can
 * use a pmap. When pmap_update_interrupt() is entered, a cpu is removed from
 * this set; when all such cpus are removed, it is safe to update.
-* 
+*
 * Before attempting to acquire the update lock on a pmap, a cpu (A) must
 * be at least at the priority of the interprocessor interrupt
 * (splip<=splvm). Otherwise, A could grab a lock and be interrupted by a
@@ -2642,12 +2645,12 @@ if (cpu_number() == suicide_cpu) halt();
 	    i_bit_set(my_cpu, &cpus_active);
 
 	} while (cpu_update_needed[my_cpu]);
-	
+
 	splx(s);
 out:
 	db_inside_pmap_update[my_cpu]--;
 }
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 /*
  *	Dummy routine to satisfy external reference.
  */
diff --git a/alpha/alpha/pmap.h b/alpha/alpha/pmap.h
index 489bdbf1..9916953a 100644
--- a/alpha/alpha/pmap.h
+++ b/alpha/alpha/pmap.h
@@ -2,39 +2,42 @@
  * Mach Operating System
  * Copyright (c) 1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	pmap.h,v $
+ * $Log: pmap.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.3  93/01/19  08:59:45  danner
  * 	Do not allocate cpusets as commons, to avoid
  * 	cacheline conflicts.
  * 	[93/01/15            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:13:51  danner
  * 	Created, from dbg's i386 pmap module.
  * 	[92/06/15            af]
- * 
+ *
  *
  */
 
@@ -65,7 +68,7 @@
 typedef unsigned long	pt_entry_t;
 #define PT_ENTRY_NULL	((pt_entry_t *) 0)
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
 #define ALPHA_OFFMASK	(ALPHA_PGBYTES-1)	/* offset within page */
 
@@ -187,7 +190,7 @@ void		process_pmap_updates();
 void		pmap_update_interrupt();
 extern	pmap_t	kernel_pmap;
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 /*
  *	Machine dependent routines that are used only for Alpha.
@@ -345,7 +348,7 @@ pt_entry_t	*pmap_pte();
 	splx(s);							\
 }
 
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 
 /*
  *	With only one CPU, we just have to indicate whether the pmap is
@@ -376,7 +379,7 @@ pt_entry_t	*pmap_pte();
 	    (pmap)->cpus_using = FALSE;					\
 }
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 #define	pmap_kernel()			(kernel_pmap)
 #define pmap_resident_count(pmap)	((pmap)->stats.resident_count)
@@ -392,7 +395,7 @@ pt_entry_t	*pmap_pte();
 extern pmap_t		kernel_pmap;	/* pointer to the kernel pmap	*/
 
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
 /*
  *	We want to implement pmap_steal_memory and pmap_startup.
@@ -400,4 +403,4 @@ extern pmap_t		kernel_pmap;	/* pointer to the kernel pmap	*/
 
 #define	MACHINE_PAGES
 
-#endif	_PMAP_MACHINE_
+#endif	/* _PMAP_MACHINE_ */
diff --git a/alpha/alpha/prom_interface.h b/alpha/alpha/prom_interface.h
index fc2499db..2bf3de6e 100644
--- a/alpha/alpha/prom_interface.h
+++ b/alpha/alpha/prom_interface.h
@@ -1,53 +1,56 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	prom_interface.h,v $
+ * $Log: prom_interface.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.4  93/08/10  15:15:37  mrt
  * 	"..all the systems implemented the fields backwards, so that
  * 	" MAJOR and MINOR were switched.  The SRM was changed to match.."
  * 	Consequently, we switched our definition in the struct per_cpu_slot.
  * 	[93/08/06            af]
- * 
+ *
  * Revision 2.3  93/03/09  10:50:46  danner
  * 	Changed prom dispatching to be more link-safe.
  * 	[93/02/20            af]
- * 
+ *
  * Revision 2.2  93/02/05  07:59:57  danner
  * 	Working version, taken from boot directory.
  * 	[93/02/04  00:57:09  af]
- * 
+ *
  * 	Added reference to doc for the HWRPB &co.
  * 	[92/12/22            af]
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:17:51  af]
- * 
+ *
  * 	Created.
  * 	[92/06/02            af]
- * 
+ *
  */
 /*
  *	File: prom_interface.h
@@ -105,7 +108,7 @@ typedef union {
 } prom_return_t;
 
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
 /*
  * Callback codes
@@ -315,8 +318,4 @@ struct per_cpu_slot {
 #define	PHALT_FROM_KERNEL	5
 #define	PHALT_DOUBLE_ABORT	6
 
-#endif ASSEMBLER
-
-
-
-
+#endif /* ASSEMBLER */
diff --git a/alpha/alpha/setjmp.h b/alpha/alpha/setjmp.h
index 1f98e9ec..4d7c38be 100644
--- a/alpha/alpha/setjmp.h
+++ b/alpha/alpha/setjmp.h
@@ -1,35 +1,38 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	setjmp.h,v $
+ * $Log: setjmp.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:14:10  danner
  * 	Copied from mips.
  * 	[92/05/31            af]
- * 
+ *
  */
 /*
  *	File: setjmp.h
@@ -45,4 +48,4 @@
 #include <alpha/context.h>		/* It's defined here */
 typedef jmp_buf	jmp_buf_t;		/* The expected name */
 
-#endif	_ALPHA_SETJMP_H_
+#endif	/* _ALPHA_SETJMP_H_ */
diff --git a/alpha/alpha/thread.h b/alpha/alpha/thread.h
index 56fe47b7..773eda45 100644
--- a/alpha/alpha/thread.h
+++ b/alpha/alpha/thread.h
@@ -1,43 +1,46 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	thread.h,v $
+ * $Log: thread.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.4  93/03/09  10:51:09  danner
  * 	There was no indirection bug, thread->pcb truly is a pointer.
  * 	[93/03/05            af]
- * 
+ *
  * Revision 2.3  93/02/04  07:55:19  danner
  * 	Missing indirection in user_regs declaration.
  * 	[93/02/02            danner]
- * 
+ *
  * Revision 2.2  93/01/14  17:14:28  danner
  * 	Created, from mips version.
  * 	[92/05/31            af]
- * 
+ *
  */
 /*
  *	File:	thread.h
@@ -205,7 +208,7 @@ void		pcb_init(), pcb_terminate(), pcb_collect();
 kern_return_t	thread_setstatus(), thread_getstatus();
 void		syscall_emulation_sync();
 
-#endif	!defined(ASSEMBLER)
+#endif	/* !defined(ASSEMBLER) */
 
 /*
  *	Later on..
@@ -220,4 +223,4 @@ void		syscall_emulation_sync();
  */
 #define	MACHINE_STACK
 
-#endif	_ALPHA_THREAD_H_
+#endif	/* _ALPHA_THREAD_H_ */
diff --git a/alpha/alpha/trap.c b/alpha/alpha/trap.c
index 97d96d56..2005fbd2 100644
--- a/alpha/alpha/trap.c
+++ b/alpha/alpha/trap.c
@@ -2,24 +2,24 @@
  * Mach Operating System
  * Copyright (c) 1994,1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon the
  * the rights to redistribute these changes.
  */
@@ -29,36 +29,39 @@
  *	Added extern declaration of exception(), so that we do
  *	not lose the high 32 bits of a bad virtual address.
  *
- * $Log:	trap.c,v $
+ * $Log: trap.c,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.7  93/05/15  19:11:41  mrt
  * 	machparam.h -> machspl.h
- * 
+ *
  * Revision 2.6  93/03/09  10:51:42  danner
  * 	Proto for Thread_syscall_return with GCC.
  * 	[93/03/07            af]
  * 	Fixed pcsample botch.
  * 	[93/03/05            af]
- * 
+ *
  * Revision 2.5  93/02/05  08:00:14  danner
  * 	Added machine check handler (jeffreyh).
  * 	[93/02/04  00:45:20  af]
- * 
+ *
  * Revision 2.4  93/02/04  07:55:25  danner
  * 	Added pc_sampling support
  * 	[93/02/02            danner]
- * 
+ *
  * Revision 2.3  93/01/19  09:00:01  danner
  * 	Better MP printouts.  Save more state before getting to ddb
  * 	in crashes.  Still cannot continue from a crash, though.
  * 	[93/01/15            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:14:37  danner
  * 	Added reference to documentation source(s).
  * 	[92/12/16  15:18:18  af]
- * 
+ *
  * 	Created.
  * 	[92/12/10  15:06:12  af]
- * 
+ *
  */
 /*
  *	File: trap.c
@@ -107,7 +110,7 @@ boolean_t	debug_all_traps_with_kdb = FALSE;
 extern struct db_watchpoint *db_watchpoint_list;
 extern boolean_t db_watchpoints_inserted;
 
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 void
 user_page_fault_continue(kr)
@@ -129,7 +132,7 @@ db_printf("Fix trap.c & watchpoints");
 				(void) kdb_trap(mss, 2);
 #endif
 		}
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 		thread_exception_return();
 		/*NOTREACHED*/
 	}
@@ -140,7 +143,7 @@ db_printf("Fix trap.c & watchpoints");
 		thread_exception_return();
 		/*NOTREACHED*/
 	}
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 	exception(EXC_BAD_ACCESS, kr, current_thread()->pcb->mss.bad_address);
 	/*NOTREACHED*/
@@ -230,7 +233,7 @@ if (debug_verbose) db_printf("{[%d]trap[%x](%x %x %x %x)}\n",
 					       vaddr,
 					       ss_ptr))
 				(void) kdb_trap(ss_ptr, 2);
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 			return;
 		}
 
@@ -249,8 +252,8 @@ if (debug_verbose) db_printf("{[%d]trap[%x](%x %x %x %x)}\n",
 	case T_SCHECK:
 	case T_PCHECK:
 	    if (alpha_machine_check){
-		    (*alpha_machine_check)();	    /* XXXThis will need to 
-						     * XXXtake args if it is 
+		    (*alpha_machine_check)();	    /* XXXThis will need to
+						     * XXXtake args if it is
 						     * made real
 						     */
 		    return ;
@@ -376,7 +379,7 @@ if (!memo++) db_printf("Remember to stress-test FPA usage\n");
 	ss_ptr->cause = cause;
 	if (debug_all_traps_with_kdb && kdb_trap(ss_ptr, 1))
 		return;
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 	/* Deliver the exception */
 	exception(exc_type, exc_code, cause);
@@ -832,7 +835,7 @@ prepare_sstep(msss, mss)
 		if (brpc != pc) {
 			bp->address = (vm_offset_t) brpc;
 			if (copyin(brpc, &bp->instruction, sizeof ins))
-				goto seq;	/* he'll get hurt */	
+				goto seq;	/* he'll get hurt */
 			if (poke_instruction(brpc, SSTEP_INSTRUCTION))
 				goto seq;	/* ditto */
 			msss->ss_count++, bp++;
@@ -842,7 +845,7 @@ seq:
 	pc += 1;
 	bp->address = (vm_offset_t) pc;
 	if (copyin(pc, &bp->instruction, sizeof ins))
-		return;			/* he'll get hurt */	
+		return;			/* he'll get hurt */
 	if (poke_instruction(pc, SSTEP_INSTRUCTION))
 		return;
 	msss->ss_count++;
@@ -886,7 +889,7 @@ poke_instruction(loc, ins)
 {
 	vm_map_t	 map = current_thread()->task->map;
 	vm_offset_t	 pa;
-	kern_return_t	 ret;	
+	kern_return_t	 ret;
 again:
 	pa = pmap_extract(map->pmap, (vm_offset_t) loc);
 	if (pa == 0) {
@@ -918,7 +921,7 @@ thread_kdb_return()
 		/*NOTREACHED*/
 	}
 }
-#endif	MACH_KDB
+#endif	/* MACH_KDB */
 
 #if	MACH_PCSAMPLE
 /*
diff --git a/alpha/alpha/vm_tuning.h b/alpha/alpha/vm_tuning.h
index 6c8fe8ed..2ca102ba 100644
--- a/alpha/alpha/vm_tuning.h
+++ b/alpha/alpha/vm_tuning.h
@@ -1,35 +1,38 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	vm_tuning.h,v $
+ * $Log: vm_tuning.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:15:01  danner
  * 	Created, obsolete.
  * 	[92/06/02            af]
- * 
+ *
  */
 /*
  *	File:	alpha/vm_tuning.h
@@ -42,4 +45,4 @@
 #ifndef	_ALPHA_VM_TUNING_H_
 #define	_ALPHA_VM_TUNING_H_
 
-#endif	_ALPHA_VM_TUNING_H_
+#endif	/* _ALPHA_VM_TUNING_H_ */
diff --git a/alpha/include/mach/alpha/alpha_instruction.h b/alpha/include/mach/alpha/alpha_instruction.h
index 9635f1dd..800a9f5d 100644
--- a/alpha/include/mach/alpha/alpha_instruction.h
+++ b/alpha/include/mach/alpha/alpha_instruction.h
@@ -1,42 +1,45 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1993,1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	alpha_instruction.h,v $
+ * $Log: alpha_instruction.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.3  93/01/19  09:01:18  danner
  * 	Added some, removed some PAL calls.
  * 	Chosed not to put here PAL instructions (for ddb)
  * 	because I am sadly afraid they might be chip-specific.
  * 	We'll see.
  * 	[93/01/15            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:40:36  danner
  * 	Created.
  * 	[91/12/05            af]
- * 
+ *
  */
 
 /*
@@ -158,7 +161,7 @@ typedef union {
 
 } alpha_instruction;
 
-#endif	!defined(ASSEMBLER)
+#endif	/* !defined(ASSEMBLER) */
 
 /*
  *
diff --git a/alpha/include/mach/alpha/boolean.h b/alpha/include/mach/alpha/boolean.h
index f9d92a6f..88c7fe6d 100644
--- a/alpha/include/mach/alpha/boolean.h
+++ b/alpha/include/mach/alpha/boolean.h
@@ -2,34 +2,37 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	boolean.h,v $
+ * $Log: boolean.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:40:47  danner
  * 	Copied for alpha.
  * 	[92/12/17            af]
- * 
+ *
  */
 
 /*
@@ -47,4 +50,4 @@
 
 typedef int		boolean_t;
 
-#endif	_MACH_ALPHA_BOOLEAN_H_
+#endif	/* _MACH_ALPHA_BOOLEAN_H_ */
diff --git a/alpha/include/mach/alpha/exception.h b/alpha/include/mach/alpha/exception.h
index d53e7521..79eb54aa 100644
--- a/alpha/include/mach/alpha/exception.h
+++ b/alpha/include/mach/alpha/exception.h
@@ -1,35 +1,38 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	exception.h,v $
+ * $Log: exception.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:40:51  danner
  * 	Created.
  * 	[91/12/29            af]
- * 
+ *
  */
 /*
  *	File: alpha/exception.h
@@ -85,4 +88,4 @@
 #define	EXC_BREAK_SSTEP			1
 
 
-#endif	_MACH_ALPHA_EXCEPTION_H_
+#endif /* _MACH_ALPHA_EXCEPTION_H_ */
diff --git a/alpha/include/mach/alpha/kern_return.h b/alpha/include/mach/alpha/kern_return.h
index 0eb90a1f..86442e51 100644
--- a/alpha/include/mach/alpha/kern_return.h
+++ b/alpha/include/mach/alpha/kern_return.h
@@ -2,34 +2,37 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	kern_return.h,v $
+ * $Log: kern_return.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:40:55  danner
  * 	Created.
  * 	[91/12/29            af]
- * 
+ *
  */
 
 /*
@@ -52,6 +55,6 @@
  * hurt MiG badly to do so.
  */
 typedef	int		kern_return_t;
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
-#endif	_MACH_ALPHA_KERN_RETURN_H_
+#endif	/* _MACH_ALPHA_KERN_RETURN_H_ */
diff --git a/alpha/include/mach/alpha/syscall_sw.h b/alpha/include/mach/alpha/syscall_sw.h
index a382d5e0..4f93d75a 100644
--- a/alpha/include/mach/alpha/syscall_sw.h
+++ b/alpha/include/mach/alpha/syscall_sw.h
@@ -2,38 +2,41 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	syscall_sw.h,v $
+ * $Log: syscall_sw.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.3  93/03/09  10:55:56  danner
  * 	Changed .ent stmts to use spaces.
  * 	[93/02/15            af]
- * 
+ *
  * Revision 2.2  93/01/14  17:41:03  danner
  * 	Created.
  * 	[91/12/29            af]
- * 
+ *
  */
 
 /*
@@ -136,4 +139,4 @@ trap_name:;						 	\
 	kernel_trap_/**/nargs(trap_name,trap_number)
 #endif
 
-#endif	_MACH_ALPHA_SYSCALL_SW_H_
+#endif /* _MACH_ALPHA_SYSCALL_SW_H_ */
diff --git a/alpha/include/mach/alpha/thread_status.h b/alpha/include/mach/alpha/thread_status.h
index 3060746b..60887f1d 100644
--- a/alpha/include/mach/alpha/thread_status.h
+++ b/alpha/include/mach/alpha/thread_status.h
@@ -2,37 +2,40 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	thread_status.h,v $
+ * $Log: thread_status.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:41:08  danner
  * 	Revised for new calling sequence.
  * 	[92/06/07            af]
- * 
+ *
  * 	Created.
  * 	[91/12/29            af]
- * 
+ *
  */
 
 /*
@@ -153,4 +156,4 @@ struct alpha_exc_state {
 
 #define	ALPHA_EXC_STATE_COUNT	(sizeof(struct alpha_exc_state)/sizeof(natural_t))
 
-#endif	_MACH_ALPHA_THREAD_STATE_
+#endif	/* _MACH_ALPHA_THREAD_STATE_ */
diff --git a/alpha/include/mach/alpha/vm_param.h b/alpha/include/mach/alpha/vm_param.h
index 5d3b6a0e..4b8c099f 100644
--- a/alpha/include/mach/alpha/vm_param.h
+++ b/alpha/include/mach/alpha/vm_param.h
@@ -2,34 +2,37 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	vm_param.h,v $
+ * $Log: vm_param.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:41:15  danner
  * 	Created, partly empty.
  * 	[91/12/29            af]
- * 
+ *
  */
 
 /*
@@ -52,6 +55,8 @@
 #define ALPHA_PGBYTES	8192	/* bytes per alpha (min) phys page */
 #define ALPHA_PGSHIFT	13	/* number of bits to shift for pages */
 
+#define PAGE_SHIFT	ALPHA_PGSHIFT
+
 /*
  *	Convert bytes to pages and convert pages to bytes.
  *	No rounding is used.
@@ -100,4 +105,4 @@
 #define vm_to_alpha(p)		(alpha_btop(ptoa(p)))
 
 
-#endif	_MACH_ALPHA_VM_PARAM_H_
+#endif	/* _MACH_ALPHA_VM_PARAM_H_ */
diff --git a/alpha/include/mach/alpha/vm_types.h b/alpha/include/mach/alpha/vm_types.h
index 17343132..ebca7882 100644
--- a/alpha/include/mach/alpha/vm_types.h
+++ b/alpha/include/mach/alpha/vm_types.h
@@ -1,35 +1,38 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * 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 Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
- * $Log:	vm_types.h,v $
+ * $Log: vm_types.h,v $
+ * Revision 1.1  2002/05/28 06:27:03  roland
+ * Alpha support files verbatim from CMU release MK83a.
+ *
  * Revision 2.2  93/01/14  17:41:19  danner
  * 	Created.
  * 	[91/12/29            af]
- * 
+ *
  */
 /*
  *	File:	alpha/vm_types.h
@@ -44,7 +47,7 @@
 #define	_MACHINE_VM_TYPES_H_	1
 
 #ifdef	ASSEMBLER
-#else	ASSEMBLER
+#else	/* ASSEMBLER */
 
 /*
  * A natural_t is the type for the native
@@ -87,7 +90,7 @@ typedef	natural_t	vm_offset_t;
  */
 typedef	natural_t	vm_size_t;
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
 /*
  * If composing messages by hand (please dont)