From 186e16d63ec4a6b62dd3f8f1b796fe9763ab4e3d Mon Sep 17 00:00:00 2001 From: ragge Date: Tue, 16 Aug 1994 23:41:53 +0000 Subject: [PATCH] Minor updates of some errouneous parameters. --- sys/arch/vax/include/aout_machdep.h | 4 ++-- sys/arch/vax/include/exec.h | 4 ++-- sys/arch/vax/include/param.h | 10 +++++----- sys/arch/vax/include/pmap.h | 7 ++++--- sys/arch/vax/include/vmparam.h | 13 ++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/arch/vax/include/aout_machdep.h b/sys/arch/vax/include/aout_machdep.h index 4ef39de2fbfc..c5756774fa37 100644 --- a/sys/arch/vax/include/aout_machdep.h +++ b/sys/arch/vax/include/aout_machdep.h @@ -27,11 +27,11 @@ * (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: aout_machdep.h,v 1.1 1994/08/02 20:20:20 ragge Exp $ + * $Id: aout_machdep.h,v 1.2 1994/08/16 23:41:53 ragge Exp $ */ /* All bugs are subject to removal without further notice */ -#define __LDPGSZ 8192 /* XXX This is not important now... */ +#define __LDPGSZ 1024 diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h index 9593a525f635..dea99faa5324 100644 --- a/sys/arch/vax/include/exec.h +++ b/sys/arch/vax/include/exec.h @@ -27,11 +27,11 @@ * (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: exec.h,v 1.1 1994/08/02 20:20:20 ragge Exp $ + * $Id: exec.h,v 1.2 1994/08/16 23:41:53 ragge Exp $ */ /* All bugs are subject to removal without further notice */ -#define __LDPGSZ 8192 /* XXX This is not important now... */ +#define __LDPGSZ 1024 diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h index 63394bafde1e..e5f8f851cf2e 100644 --- a/sys/arch/vax/include/param.h +++ b/sys/arch/vax/include/param.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.1 1994/08/02 20:20:40 ragge Exp $ + * $Id: param.h,v 1.2 1994/08/16 23:41:54 ragge Exp $ */ #ifndef PARAM_H @@ -75,8 +75,8 @@ #define BLKDEV_IOSIZE 2048 #define MAXPHYS (63 * 1024) /* max raw I/O transfer size */ -#define CLSIZELOG2 2 -#define CLSIZE (1 << CLSIZELOG2) +#define CLSIZELOG2 1 +#define CLSIZE 2 /* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */ #define SSIZE 4 /* initial stack size/NBPG */ @@ -122,12 +122,12 @@ * Some macros for units conversion */ -/* Core clicks (4096 bytes) to segments and vice versa */ +/* Core clicks (512 bytes) to segments and vice versa */ #define ctos(x) (x) #define stoc(x) (x) -/* Core clicks (4096 bytes) to disk blocks */ +/* Core clicks (512 bytes) to disk blocks */ #define ctod(x) ((x)<<(PGSHIFT-DEV_BSHIFT)) #define dtoc(x) ((x)>>(PGSHIFT-DEV_BSHIFT)) diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index 251002360394..653513e1026f 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.h 7.6 (Berkeley) 5/10/91 - * $Id: pmap.h,v 1.1 1994/08/02 20:20:44 ragge Exp $ + * $Id: pmap.h,v 1.2 1994/08/16 23:41:56 ragge Exp $ */ @@ -99,7 +99,7 @@ extern pmap_t kernel_pmap; typedef struct pv_entry { struct pv_entry *pv_next; /* next pv_entry */ - struct pmap *pv_pmap; /* if not NULL, pmap where mapping lies */ + struct pmap *pv_pmap;/* if not NULL, pmap where mapping lies */ vm_offset_t pv_va; /* virtual address for mapping */ int pv_flags; /* flags */ } *pv_entry_t; @@ -108,7 +108,8 @@ typedef struct pv_entry { #define PV_PTPAGE 0x02 /* entry maps a page table page */ #ifdef KERNEL -pv_entry_t pv_table; /* array of entries, one per page */ +pv_entry_t pv_table; /* array of entries, + one per LOGICAL page */ #define pa_index(pa) atop(pa) #define pa_to_pvh(pa) (&pv_table[atop(pa)]) diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h index 8a278ceaf0a2..1b1d8c79c5c9 100644 --- a/sys/arch/vax/include/vmparam.h +++ b/sys/arch/vax/include/vmparam.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $Id: vmparam.h,v 1.1 1994/08/02 20:21:05 ragge Exp $ + * $Id: vmparam.h,v 1.2 1994/08/16 23:41:57 ragge Exp $ */ #ifndef ASSEMBLER #include @@ -58,9 +58,6 @@ #define USRTEXT 0 #define USRSTACK 0x80000000 -/*#define BTOPUSRSTACK (0xFDC00-(UPAGES)) /* btop(USRSTACK) */ -/*#define LOWPAGES 0 */ -/*#define HIGHPAGES UPAGES */ /* * Virtual memory related constants, all in bytes @@ -83,7 +80,9 @@ #endif /* (We think) the page table will only need to grow this much */ -#define VAX_MAX_PT_SIZE ((MAXTSIZ+MAXDSIZ+MAXSSIZ)/0x80) +#define VAX_MAX_PT_SIZE ((MAXTSIZ+MAXDSIZ+MAXSSIZ)>>7) +/* XXX Text size is already set to a predefined size, why alloc + more page tables for it than needed??? */ /* * Default sizes of swap allocation chunks (see dmap.h). @@ -235,8 +234,8 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vm_offset_t)0) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x40000000) -#define VM_MAX_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAX_ADDRESS ((vm_offset_t)0xC0000000) #define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0x80000000) #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)(VM_MIN_KERNEL_ADDRESS+\ (VM_KERNEL_PT_PAGES*0x10000)))