diff options
| -rw-r--r-- | sys/arch/i386/i386/genassym.cf | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 8 | ||||
| -rw-r--r-- | sys/arch/i386/include/pmap.h | 9 | ||||
| -rw-r--r-- | sys/arch/i386/include/vmparam.h | 13 |
4 files changed, 12 insertions, 22 deletions
diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf index f4db5a69833..98f8a05b02c 100644 --- a/sys/arch/i386/i386/genassym.cf +++ b/sys/arch/i386/i386/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.21 2005/07/18 14:55:49 mickey Exp $ +# $OpenBSD: genassym.cf,v 1.22 2005/11/23 16:51:28 mickey Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -78,9 +78,9 @@ export SONPROC # values for page tables export PDSLOT_KERN export PDSLOT_PTE +export PDSLOT_APTE export NKPTP_MIN export NKPTP_MAX -export APTDPTDI # values for virtual memory export VM_MAXUSER_ADDRESS diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index 09abd823477..3360c754fe0 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.93 2005/10/26 20:32:59 marco Exp $ */ +/* $OpenBSD: locore.s,v 1.94 2005/11/23 16:51:28 mickey Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -191,10 +191,10 @@ * It's used when modifying another process's page tables. */ .globl _C_LABEL(APTmap), _C_LABEL(APTD), _C_LABEL(APTDpde) - .set _C_LABEL(APTmap), (APTDPTDI << PDSHIFT) - .set _C_LABEL(APTD), (_C_LABEL(APTmap) + APTDPTDI * NBPG) + .set _C_LABEL(APTmap), (PDSLOT_APTE << PDSHIFT) + .set _C_LABEL(APTD), (_C_LABEL(APTmap) + PDSLOT_APTE * NBPG) # XXX 4 == sizeof pde - .set _C_LABEL(APTDpde), (_C_LABEL(PTD) + APTDPTDI * 4) + .set _C_LABEL(APTDpde), (_C_LABEL(PTD) + PDSLOT_APTE * 4) /* * Initialization diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h index a8f6e01a08d..e0314a635d8 100644 --- a/sys/arch/i386/include/pmap.h +++ b/sys/arch/i386/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.39 2005/11/22 12:52:12 mickey Exp $ */ +/* $OpenBSD: pmap.h,v 1.40 2005/11/23 16:51:28 mickey Exp $ */ /* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */ /* @@ -166,13 +166,6 @@ #define APDP_PDE (PDP_BASE + PDSLOT_APTE) /* - * XXXCDC: tmp xlate from old names: - * PTDPTDI -> PDSLOT_PTE - * KPTDI -> PDSLOT_KERN - * APTDPTDI -> PDSLOT_APTE - */ - -/* * The following define determines how many PTPs should be set up for the * kernel by locore.s at boot time. This should be large enough to * get the VM system running. Once the VM system is running, the diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h index a7703cda6a3..48a81ce48f1 100644 --- a/sys/arch/i386/include/vmparam.h +++ b/sys/arch/i386/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.32 2005/08/01 19:44:53 jmc Exp $ */ +/* $OpenBSD: vmparam.h,v 1.33 2005/11/23 16:51:28 mickey Exp $ */ /* $NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $ */ /*- @@ -89,16 +89,13 @@ */ #define USRIOSIZE 300 -/* XXX Compatibility */ -#define APTDPTDI PDSLOT_APTE -#define PTDPTDI PDSLOT_PTE - /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vaddr_t)0) -#define VM_MAXUSER_ADDRESS ((vaddr_t)((PTDPTDI<<PDSHIFT) - USPACE)) -#define VM_MAX_ADDRESS ((vaddr_t)((PTDPTDI<<PDSHIFT) + (PTDPTDI<<PGSHIFT))) +#define VM_MAXUSER_ADDRESS ((vaddr_t)((PDSLOT_PTE<<PDSHIFT) - USPACE)) +#define VM_MAX_ADDRESS ((vaddr_t)((PDSLOT_PTE<<PDSHIFT) + \ + (PDSLOT_PTE<<PGSHIFT))) #define VM_MIN_KERNEL_ADDRESS ((vaddr_t)KERNBASE) -#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(APTDPTDI<<PDSHIFT)) +#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(PDSLOT_APTE<<PDSHIFT)) /* virtual sizes (bytes) for various kernel submaps */ #define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE) |