Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Move even more constants into the shared 32-bit vmp...
details: https://anonhg.NetBSD.org/src/rev/0418176a5bcd
branches: trunk
changeset: 518035:0418176a5bcd
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Nov 23 18:16:10 2001 +0000
description:
Move even more constants into the shared 32-bit vmparam.h header.
Cleanup elsewhere will have to be done before we can sanitize this
header any further.
diffstat:
sys/arch/acorn32/include/vmparam.h | 48 +--------------------------------
sys/arch/arm/include/arm32/vmparam.h | 52 +++++++++++++++++++++++++++++++++++-
sys/arch/arm32/include/vmparam.h | 48 +--------------------------------
sys/arch/cats/include/vmparam.h | 48 +--------------------------------
sys/arch/dnard/include/vmparam.h | 48 +--------------------------------
sys/arch/evbarm/include/vmparam.h | 48 +--------------------------------
sys/arch/hpcarm/include/vmparam.h | 49 +---------------------------------
sys/arch/netwinder/include/vmparam.h | 48 +--------------------------------
8 files changed, 58 insertions(+), 331 deletions(-)
diffs (truncated from 617 to 300 lines):
diff -r 72e2d4d639f0 -r 0418176a5bcd sys/arch/acorn32/include/vmparam.h
--- a/sys/arch/acorn32/include/vmparam.h Fri Nov 23 18:14:51 2001 +0000
+++ b/sys/arch/acorn32/include/vmparam.h Fri Nov 23 18:16:10 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.4 2001/11/23 17:39:03 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.5 2001/11/23 18:16:10 thorpej Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -40,34 +40,6 @@
#include <arm/arm32/vmparam.h>
-#define USRTEXT VM_MIN_ADDRESS
-#define USRSTACK VM_MAXUSER_ADDRESS
-
-/*
- * Note that MAXTSIZ mustn't be greater than 32M. Otherwise you'd have
- * to change the compiler to not generate bl instructions
- */
-#define MAXTSIZ (16*1024*1024) /* max text size */
-#ifndef DFLDSIZ
-#define DFLDSIZ (128*1024*1024) /* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define MAXDSIZ (512*1024*1024) /* max data size */
-#endif
-#ifndef DFLSSIZ
-#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
-#endif
-#ifndef MAXSSIZ
-#define MAXSSIZ (8*1024*1024) /* max stack size */
-#endif
-
-/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
/*
* Address space constants
*/
@@ -78,12 +50,6 @@
*/
#define KERNEL_SPACE_START 0xf0000000
-/* total number of page table entries to map 4GB * size of each entry*/
-#define PAGE_TABLE_SPACE ((1 << (32 - PGSHIFT)) * sizeof(pt_entry_t))
-
-/* Address where the page tables are mapped */
-#define PAGE_TABLE_SPACE_START (KERNEL_SPACE_START - PAGE_TABLE_SPACE)
-
/* Various constants used by the MD code*/
#define KERNEL_BASE 0xf0000000
#define KERNEL_TEXT_BASE KERNEL_BASE
@@ -112,18 +78,6 @@
#define PAGER_MAP_SIZE (4 * 1024 * 1024)
/*
- * Mach derived constants
- */
-
-#define VM_MIN_ADDRESS ((vm_offset_t)0x00001000)
-#define VM_MAXUSER_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START - UPAGES * NBPG))
-#define VM_MAX_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START + (KERNEL_SPACE_START >> PGSHIFT) * sizeof(pt_entry_t)))
-
-#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)KERNEL_TEXT_BASE)
-#define VM_MAXKERN_ADDRESS ((vm_offset_t)(KERNEL_VM_BASE + KERNEL_VM_SIZE))
-#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xffffffff)
-
-/*
* Size of User Raw I/O map
*/
diff -r 72e2d4d639f0 -r 0418176a5bcd sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h Fri Nov 23 18:14:51 2001 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h Fri Nov 23 18:16:10 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.2 2001/11/23 17:39:04 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.3 2001/11/23 18:16:10 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -47,6 +47,34 @@
/* for pt_entry_t definition */
#include <arm/arm32/pte.h>
+#define USRTEXT VM_MIN_ADDRESS
+#define USRSTACK VM_MAXUSER_ADDRESS
+
+/*
+ * Note that MAXTSIZ can't be larger than 32M, otherwise the compiler
+ * would have to be changed to not generate "bl" instructions.
+ */
+#define MAXTSIZ (16*1024*1024) /* max text size */
+#ifndef DFLDSIZ
+#define DFLDSIZ (128*1024*1024) /* initial data size limit */
+#endif
+#ifndef MAXDSIZ
+#define MAXDSIZ (512*1024*1024) /* max data size */
+#endif
+#ifndef DFLSSIZ
+#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
+#endif
+#ifndef MAXSSIZ
+#define MAXSSIZ (8*1024*1024) /* max stack size */
+#endif
+
+/*
+ * Size of SysV shared memory map
+ */
+#ifndef SHMMAXPGS
+#define SHMMAXPGS 1024
+#endif
+
/*
* While the ARM architecture defines Section mappings, large pages,
* and small pages, the standard page size is (and will always be) 4K.
@@ -56,6 +84,28 @@
#define PAGE_MASK (PAGE_SIZE - 1)
/*
+ * Linear page table space: number of PTEs required to map the 4G address
+ * space * size of each PTE.
+ */
+#define PAGE_TABLE_SPACE ((1 << (32 - PGSHIFT)) * sizeof(pt_entry_t))
+
+/* Address where the page talbles are mapped. */
+#define PAGE_TABLE_SPACE_START (KERNEL_SPACE_START - PAGE_TABLE_SPACE)
+
+/*
+ * Mach derived constants
+ */
+#define VM_MIN_ADDRESS ((vaddr_t) 0x00001000)
+#define VM_MAXUSER_ADDRESS ((vaddr_t) (PAGE_TABLE_SPACE_START - \
+ UPAGES * NBPG))
+#define VM_MAX_ADDRESS ((vaddr_t) (PAGE_TABLE_SPACE_START + \
+ (KERNEL_SPACE_START >> PGSHIFT) * \
+ sizeof(pt_entry_t)))
+#define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_TEXT_BASE)
+#define VM_MAXKERN_ADDRESS ((vaddr_t) KERNEL_VM_BASE + KERNEL_VM_SIZE)
+#define VM_MAX_KERNEL_ADDRESS ((vaddr_t) 0xffffffff)
+
+/*
* define structure pmap_physseg: there is one of these structures
* for each chunk of noncontig RAM you have.
*/
diff -r 72e2d4d639f0 -r 0418176a5bcd sys/arch/arm32/include/vmparam.h
--- a/sys/arch/arm32/include/vmparam.h Fri Nov 23 18:14:51 2001 +0000
+++ b/sys/arch/arm32/include/vmparam.h Fri Nov 23 18:16:10 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.27 2001/11/23 17:39:04 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.28 2001/11/23 18:16:11 thorpej Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -40,34 +40,6 @@
#include <arm/arm32/vmparam.h>
-#define USRTEXT VM_MIN_ADDRESS
-#define USRSTACK VM_MAXUSER_ADDRESS
-
-/*
- * Note that MAXTSIZ mustn't be greater than 32M. Otherwise you'd have
- * to change the compiler to not generate bl instructions
- */
-#define MAXTSIZ (16*1024*1024) /* max text size */
-#ifndef DFLDSIZ
-#define DFLDSIZ (128*1024*1024) /* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define MAXDSIZ (512*1024*1024) /* max data size */
-#endif
-#ifndef DFLSSIZ
-#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
-#endif
-#ifndef MAXSSIZ
-#define MAXSSIZ (8*1024*1024) /* max stack size */
-#endif
-
-/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
/*
* Address space constants
*/
@@ -78,12 +50,6 @@
*/
#define KERNEL_SPACE_START 0xf0000000
-/* total number of page table entries to map 4GB * size of each entry*/
-#define PAGE_TABLE_SPACE ((1 << (32 - PGSHIFT)) * sizeof(pt_entry_t))
-
-/* Address where the page tables are mapped */
-#define PAGE_TABLE_SPACE_START (KERNEL_SPACE_START - PAGE_TABLE_SPACE)
-
/* Various constants used by the MD code*/
#define KERNEL_BASE 0xf0000000
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x00000000)
@@ -125,18 +91,6 @@
#define PAGER_MAP_SIZE (4 * 1024 * 1024)
/*
- * Mach derived constants
- */
-
-#define VM_MIN_ADDRESS ((vm_offset_t)0x00001000)
-#define VM_MAXUSER_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START - UPAGES * NBPG))
-#define VM_MAX_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START + (KERNEL_SPACE_START >> PGSHIFT) * sizeof(pt_entry_t)))
-
-#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)KERNEL_TEXT_BASE)
-#define VM_MAXKERN_ADDRESS ((vm_offset_t)(KERNEL_VM_BASE + KERNEL_VM_SIZE))
-#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xffffffff)
-
-/*
* Size of User Raw I/O map
*/
diff -r 72e2d4d639f0 -r 0418176a5bcd sys/arch/cats/include/vmparam.h
--- a/sys/arch/cats/include/vmparam.h Fri Nov 23 18:14:51 2001 +0000
+++ b/sys/arch/cats/include/vmparam.h Fri Nov 23 18:16:10 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.6 2001/11/23 17:39:04 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.7 2001/11/23 18:16:11 thorpej Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -40,34 +40,6 @@
#include <arm/arm32/vmparam.h>
-#define USRTEXT VM_MIN_ADDRESS
-#define USRSTACK VM_MAXUSER_ADDRESS
-
-/*
- * Note that MAXTSIZ mustn't be greater than 32M. Otherwise you'd have
- * to change the compiler to not generate bl instructions
- */
-#define MAXTSIZ (16*1024*1024) /* max text size */
-#ifndef DFLDSIZ
-#define DFLDSIZ (128*1024*1024) /* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define MAXDSIZ (512*1024*1024) /* max data size */
-#endif
-#ifndef DFLSSIZ
-#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
-#endif
-#ifndef MAXSSIZ
-#define MAXSSIZ (8*1024*1024) /* max stack size */
-#endif
-
-/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
/*
* Address space constants
*/
@@ -78,12 +50,6 @@
*/
#define KERNEL_SPACE_START 0xf0000000
-/* total number of page table entries to map 4GB * size of each entry*/
-#define PAGE_TABLE_SPACE ((1 << (32 - PGSHIFT)) * sizeof(pt_entry_t))
-
-/* Address where the page tables are mapped */
-#define PAGE_TABLE_SPACE_START (KERNEL_SPACE_START - PAGE_TABLE_SPACE)
-
/* Various constants used by the MD code*/
#define KERNEL_BASE 0xf0000000
#define KERNEL_TEXT_BASE KERNEL_BASE
@@ -112,18 +78,6 @@
#define PAGER_MAP_SIZE (4 * 1024 * 1024)
/*
- * Mach derived constants
- */
-
-#define VM_MIN_ADDRESS ((vm_offset_t)0x00001000)
-#define VM_MAXUSER_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START - UPAGES * NBPG))
-#define VM_MAX_ADDRESS ((vm_offset_t)(PAGE_TABLE_SPACE_START + (KERNEL_SPACE_START >> PGSHIFT) * sizeof(pt_entry_t)))
-
-#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)KERNEL_TEXT_BASE)
-#define VM_MAXKERN_ADDRESS ((vm_offset_t)(KERNEL_VM_BASE + KERNEL_VM_SIZE))
-#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xffffffff)
-
-/*
* Size of User Raw I/O map
*/
Home |
Main Index |
Thread Index |
Old Index