refactor sys/param.h and machine/param.h. A lot of #ifdef _KERNEL is added

to keep definitions our of user space.  The MD files now follow a consistant
order -- all namespace intrusion is at the tail can be cleaned up
independently.  locore, bootblocks, and libkvm still see enough visibility to
build.  Checked on 90% of platforms...

Author: deraadt

sys/arch/alpha/include/param.h

@@ -1,5 +1,4 @@
-/* $OpenBSD: param.h,v 1.36 2012/06/26 01:59:47 deraadt Exp $ */
-/* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
+/* $OpenBSD: param.h,v 1.37 2013/03/23 16:12:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -33,15 +32,11 @@
  * 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.
- *
- * from: Utah $Hdr: machparam.h 1.11 89/08/14$
- *
- *	@(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
-/*
- * Machine dependent constants for the Alpha.
- */
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
+
 #define	_MACHINE	alpha
 #define	MACHINE		"alpha"
 #define	_MACHINE_ARCH	alpha
@@ -56,53 +51,34 @@
 #define	ALIGN(p)		_ALIGN(p)
 #define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
 
-#define	NBPG		(1 << 13)		/* bytes/page */
-#define	PGOFSET		(NBPG-1)		/* byte off. into pg */
-#define	PGSHIFT		13			/* LOG2(NBPG) */
-
-#define PAGE_SHIFT	13
-#define PAGE_SIZE	(1 << PAGE_SHIFT)
-#define PAGE_MASK	(PAGE_SIZE - 1)
+#define	PAGE_SHIFT	13
+#define	PAGE_SIZE	(1 << PAGE_SHIFT)
+#define	PAGE_MASK	(PAGE_SIZE - 1)
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xfffffc0000580000	/* start of kernel virtual */
 
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define	DEV_BSIZE	(1 << DEV_BSHIFT)
-#define	BLKDEV_IOSIZE	2048
-#ifndef	MAXPHYS
-#define	MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-#endif
+#ifdef _KERNEL
 
-#define	UPAGES		2			/* pages of u-area */
-#define	USPACE		(UPAGES * NBPG)		/* total size of u-area */
-#define	USPACE_ALIGN	(0)			/* u-area alignment 0-none */
+#define	NBPG		PAGE_SIZE		/* bytes/page */
 
-#ifndef MSGBUFSIZE
-#define MSGBUFSIZE	NBPG		/* default message buffer size */
-#endif
+#define	UPAGES		2			/* pages of u-area */
+#define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
+#define	USPACE_ALIGN	0			/* u-area alignment 0-none */
 
-/*
- * Constants related to network buffer management.
- */
-#define	NMBCLUSTERS	4096		/* map size, max cluster allocation */
+#define	NMBCLUSTERS	4096			/* map size, max cluster allocation */
 
+#ifndef	MSGBUFSIZE
+#define	MSGBUFSIZE	(2 * PAGE_SIZE)		/* default message buffer size */
+#endif
 
 /*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * Maximum size of the kernel malloc arena in PAGE_SIZE-sized
  * logical pages.
  */
-#define	NKMEMPAGES_MIN_DEFAULT	((8 * 1024 * 1024) >> PAGE_SHIFT)
 #define	NKMEMPAGES_MAX_DEFAULT	((128 * 1024 * 1024) >> PAGE_SHIFT)
 
-/* pages ("clicks") to disk blocks */
-#define	ctod(x)		((x) << (PGSHIFT - DEV_BSHIFT))
-#define	dtoc(x)		((x) >> (PGSHIFT - DEV_BSHIFT))
-
-/* bytes to disk blocks */
-#define	btodb(x)	((x) >> DEV_BSHIFT)
-#define	dbtob(x)	((x) << DEV_BSHIFT)
-
-#ifdef _KERNEL
 #ifndef _LOCORE
 
 #include <machine/intr.h>
@@ -120,3 +96,5 @@ paddr_t alpha_XXX_dmamap(vaddr_t);
 
 #endif
 #endif /* !_KERNEL */
+
+#endif /* _MACHINE_PARAM_H_ */

sys/arch/alpha/include/vmparam.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.21 2011/05/30 22:25:20 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.22 2013/03/23 16:12:18 deraadt Exp $ */
 /* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */
 
 /*
@@ -57,7 +57,7 @@
  * consider doing that at some point, but it might require changes
  * to the exec code.
  */
-#define	USRTEXT		NBPG
+#define	USRTEXT		PAGE_SIZE
 #define	USRSTACK	((vaddr_t)0x0000000200000000)		/* 8G */
 
 /*
@@ -116,7 +116,7 @@
 #define VM_PIE_MAX_ADDR		0x80000000
 
 /* virtual sizes (bytes) for various kernel submaps */
-#define VM_PHYS_SIZE		(USRIOSIZE*NBPG)
+#define VM_PHYS_SIZE		(USRIOSIZE * PAGE_SIZE)
 
 /* some Alpha-specific constants */
 #define	VPTBASE		((vaddr_t)0xfffffffc00000000)	/* Virt. pg table */

sys/arch/amd64/include/biosvar.h

@@ -1,5 +1,5 @@
 /* XXX - DSR */
-/*	$OpenBSD: biosvar.h,v 1.17 2012/10/09 12:58:07 jsing Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.18 2013/03/23 16:12:20 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -33,8 +33,8 @@
 #define _MACHINE_BIOSVAR_H_
 
 	/* some boxes put apm data seg in the 2nd page */
-#define	BOOTARG_OFF	(NBPG*2)
-#define	BOOTARG_LEN	(NBPG*1)
+#define	BOOTARG_OFF	(PAGE_SIZE * 2)
+#define	BOOTARG_LEN	(PAGE_SIZE * 1)
 #define	BOOTBIOS_ADDR	(0x7c00)
 #define	BOOTBIOS_MAXSEC	((1 << 28) - 1)
 

sys/arch/amd64/include/param.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.19 2013/03/21 15:50:28 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.20 2013/03/23 16:12:20 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -30,10 +30,11 @@
  * 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.
- *
- *	@(#)param.h     5.8 (Berkeley) 6/28/91
  */
 
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
+
 #ifdef _KERNEL
 #ifdef _LOCORE
 #include <machine/psl.h>
@@ -46,69 +47,47 @@
 #define	MACHINE		"amd64"
 #define	_MACHINE_ARCH	amd64
 #define	MACHINE_ARCH	"amd64"
-#define MID_MACHINE	MID_AMD64
+#define	MID_MACHINE	MID_AMD64
 
 #define	ALIGNBYTES		_ALIGNBYTES
 #define	ALIGN(p)		_ALIGN(p)
 #define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
 
-#define	PGSHIFT		12		/* LOG2(NBPG) */
-#define	NBPG		(1 << PGSHIFT)	/* bytes/page */
-#define	PGOFSET		(NBPG-1)	/* byte offset into page */
+#define	PAGE_SHIFT	12
+#define	PAGE_SIZE	(1 << PAGE_SHIFT)
+#define	PAGE_MASK	(PAGE_SIZE - 1)
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
-#define PAGE_SHIFT	12
-#define PAGE_SIZE	(1 << PAGE_SHIFT)
-#define PAGE_MASK	(PAGE_SIZE - 1)
+#define	KERNBASE	0xffffffff80000000	/* start of kernel virtual space */
 
-#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
+#ifdef _KERNEL
 
-#define	KERNBASE	0xffffffff80000000 /* start of kernel virtual space */
-#define KERNTEXTOFF	(KERNBASE+0x1000000)	/* start of kernel text */
+#define	KERNTEXTOFF	(KERNBASE+0x1000000)	/* start of kernel text */
+#define	KERNTEXTOFF_HI	0xffffffff
+#define	KERNTEXTOFF_LO	0x81000000
 
-#define KERNTEXTOFF_HI	0xffffffff
-#define KERNTEXTOFF_LO	0x81000000
+#define	KERNBASE_HI	0xffffffff
+#define	KERNBASE_LO	0x80000000
 
-#define KERNBASE_HI	0xffffffff
-#define KERNBASE_LO	0x80000000
+#define	NBPG		PAGE_SIZE		/* bytes/page */
 
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define	DEV_BSIZE	(1 << DEV_BSHIFT)
-#define	BLKDEV_IOSIZE	2048
-#ifndef	MAXPHYS
-#define	MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-#endif
+#define	UPAGES		5			/* pages of u-area */
+#define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
+#define	USPACE_ALIGN	0			/* u-area alignment 0-none */
 
-#define	UPAGES		5		/* pages of u-area */
-#define	USPACE		(UPAGES * NBPG)	/* total size of u-area */
-#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
+#define	NMBCLUSTERS	6144			/* map size, max cluster allocation */
 
-#ifndef MSGBUFSIZE
-#define MSGBUFSIZE	16*NBPG		/* default message buffer size */
+#ifndef	MSGBUFSIZE
+#define	MSGBUFSIZE	(16 * PAGE_SIZE)	/* default message buffer size */
 #endif
 
 /*
- * Constants related to network buffer management.
- */
-#define	NMBCLUSTERS	6144		/* map size, max cluster allocation */
-
-/*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * Maximum size of the kernel malloc arena in PAGE_SIZE-sized
  * logical pages.
  */
-#define	NKMEMPAGES_MIN_DEFAULT	((8 * 1024 * 1024) >> PAGE_SHIFT)
 #define	NKMEMPAGES_MAX_DEFAULT	((128 * 1024 * 1024) >> PAGE_SHIFT)
 
-/* pages ("clicks") to disk blocks */
-#define	ctod(x)		((x) << (PGSHIFT - DEV_BSHIFT))
-#define	dtoc(x)		((x) >> (PGSHIFT - DEV_BSHIFT))
-
-/* bytes to disk blocks */
-#define	dbtob(x)	((x) << DEV_BSHIFT)
-#define	btodb(x)	((x) >> DEV_BSHIFT)
+#endif /* _KERNEL */
 
-/*
- * Mach derived conversion macros
- */
-#define	x86_round_pdr(x) \
-	((((unsigned long)(x)) + (NBPD_L2 - 1)) & ~(NBPD_L2 - 1))
-#define	x86_trunc_pdr(x)	((unsigned long)(x) & ~(NBPD_L2 - 1))
+#endif /* _MACHINE_PARAM_H_ */

sys/arch/amd64/include/pte.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: pte.h,v 1.9 2013/03/23 16:12:20 deraadt Exp $	*/
 /*	$NetBSD: pte.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $	*/
 
 /*
@@ -97,6 +97,9 @@ typedef u_int64_t pt_entry_t;		/* PTE */
 #define L2_FRAME	(L3_FRAME|L2_MASK)
 #define L1_FRAME	(L2_FRAME|L1_MASK)
 
+#define	x86_round_pdr(x) \
+	((((unsigned long)(x)) + (NBPD_L2 - 1)) & ~(NBPD_L2 - 1))
+
 /*
  * PDE/PTE bits. These are no different from their i386 counterparts.
  */