Module Name: src
Committed By: christos
Date: Sat Jan 25 05:09:59 UTC 2014
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c
src/sys/arch/amd64/include: vmparam.h
Log Message:
provide propert address defaults for topdown and bottomup allocation
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/include/vmparam.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.87 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.88
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.87 Fri Jan 3 19:10:02 2014
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sat Jan 25 00:09:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.87 2014/01/04 00:10:02 dsl Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.88 2014/01/25 05:09:59 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.87 2014/01/04 00:10:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.88 2014/01/25 05:09:59 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1042,9 +1042,12 @@ cpu_mcontext32_validate(struct lwp *l, c
}
vaddr_t
-netbsd32_vm_default_addr(struct proc *p, vaddr_t base, vsize_t size)
+netbsd32_vm_default_addr(struct proc *p, vaddr_t base, vsize_t sz)
{
- return VM_DEFAULT_ADDRESS32(base, size);
+ if (p->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN)
+ return VM_DEFAULT_ADDRESS32_TOPDOWN(base, sz);
+ else
+ return VM_DEFAULT_ADDRESS32_BOTTOMUP(base, sz);
}
#ifdef COMPAT_13
Index: src/sys/arch/amd64/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.32 src/sys/arch/amd64/include/vmparam.h:1.33
--- src/sys/arch/amd64/include/vmparam.h:1.32 Tue Nov 13 09:10:24 2012
+++ src/sys/arch/amd64/include/vmparam.h Sat Jan 25 00:09:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.32 2012/11/13 14:10:24 chs Exp $ */
+/* $NetBSD: vmparam.h,v 1.33 2014/01/25 05:09:59 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -133,10 +133,16 @@
#include "opt_uvm.h"
#endif
#define __USE_TOPDOWN_VM
-#define VM_DEFAULT_ADDRESS(da, sz) \
- trunc_page(USRSTACK - MAXSSIZ - (sz))
-#define VM_DEFAULT_ADDRESS32(da, sz) \
+#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
+ trunc_page(USRSTACK - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS(da, sz) VM_DEFAULT_ADDRESS_TOPDOWN(da, sz)
+
+#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)maxdmap)
+#define VM_DEFAULT_ADDRESS32_TOPDOWN(da, sz) \
trunc_page(USRSTACK32 - MAXSSIZ32 - (sz))
+#define VM_DEFAULT_ADDRESS32_BOTTOMUP(da, sz) \
+ round_page((vaddr_t)(da) + (vsize_t)MAXDSIZ32)
/*
* XXXfvdl we have plenty of KVM now, remove this.
