svn commit: r229170 - stable/9/sys/powerpc/include

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Jan  1 16:04:02 2012
New Revision: 229170
URL: http://svn.freebsd.org/changeset/base/229170

Log:
  Increase the available virtual address space for user programs on PowerPC
  AIM systems to 4 GB on 32-bit systems and 2^64 bytes on 64-bit systems.
  VM_MAXUSER_ADDRESS remains at 2 GB on Book-E, due to a different memory
  layout used on this platform.

Modified:
  stable/9/sys/powerpc/include/vmparam.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/include/vmparam.h
==============================================================================
--- stable/9/sys/powerpc/include/vmparam.h	Sun Jan  1 15:56:15 2012	(r229169)
+++ stable/9/sys/powerpc/include/vmparam.h	Sun Jan  1 16:04:02 2012	(r229170)
@@ -57,29 +57,34 @@
 #define	MAXSSIZ		(64*1024*1024)		/* max stack size */
 #endif
 
+#ifdef AIM
+#define	VM_MAXUSER_ADDRESS32	((vm_offset_t)0xfffff000)
+#else
+#define	VM_MAXUSER_ADDRESS32	((vm_offset_t)0x7ffff000)
+#endif
+
 /*
  * Would like to have MAX addresses = 0, but this doesn't (currently) work
  */
 #if !defined(LOCORE)
 #ifdef __powerpc64__
 #define	VM_MIN_ADDRESS		(0x0000000000000000UL)
-#define	VM_MAXUSER_ADDRESS	(0x7ffffffffffff000UL)
-#define	SHAREDPAGE		(VM_MAXUSER_ADDRESS - PAGE_SIZE)
+#define	VM_MAXUSER_ADDRESS	(0xfffffffffffff000UL)
 #define	VM_MAX_ADDRESS		(0xffffffffffffffffUL)
 #else
 #define	VM_MIN_ADDRESS		((vm_offset_t)0)
-#define	VM_MAXUSER_ADDRESS	((vm_offset_t)0x7ffff000)
-#define	SHAREDPAGE		(VM_MAXUSER_ADDRESS - PAGE_SIZE)
-#define	VM_MAX_ADDRESS		VM_MAXUSER_ADDRESS
+#define	VM_MAXUSER_ADDRESS	VM_MAXUSER_ADDRESS32
+#define	VM_MAX_ADDRESS		((vm_offset_t)0xffffffff)
 #endif
+#define	SHAREDPAGE		(VM_MAXUSER_ADDRESS - PAGE_SIZE)
 #else /* LOCORE */
-#ifndef __powerpc64__
+#if !defined(__powerpc64__) && defined(E500)
 #define	VM_MIN_ADDRESS		0
 #define	VM_MAXUSER_ADDRESS	0x7ffff000
 #endif
 #endif /* LOCORE */
 
-#define	FREEBSD32_SHAREDPAGE	(0x7ffff000 - PAGE_SIZE)
+#define	FREEBSD32_SHAREDPAGE	(VM_MAXUSER_ADDRESS32 - PAGE_SIZE)
 #define	FREEBSD32_USRSTACK	FREEBSD32_SHAREDPAGE
 
 #ifdef AIM