svn commit: r206252 - user/jmallett/octeon/sys/mips/include

[Juli Mallett]

Author: jmallett
Date: Tue Apr  6 07:49:06 2010
New Revision: 206252
URL: http://svn.freebsd.org/changeset/base/206252

Log:
  o) Add XUSEG start and end macros.
  o) Calculate the address space we can handle for user space based on our page
     table layout.

Modified:
  user/jmallett/octeon/sys/mips/include/cpuregs.h
  user/jmallett/octeon/sys/mips/include/vmparam.h

Modified: user/jmallett/octeon/sys/mips/include/cpuregs.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/cpuregs.h	Tue Apr  6 07:40:43 2010	(r206251)
+++ user/jmallett/octeon/sys/mips/include/cpuregs.h	Tue Apr  6 07:49:06 2010	(r206252)
@@ -88,7 +88,7 @@
 #define	KSEG_ADDRESS(x)	((intptr_t)(int32_t)__CONCAT(0x, x))
 #endif
 
-#define	MIPS_KUSEG_START		0x0
+#define	MIPS_KUSEG_START		0x00000000
 #define	MIPS_KSEG0_START		KSEG_ADDRESS(80000000)
 #define	MIPS_KSEG0_END			KSEG_ADDRESS(9fffffff)
 #define	MIPS_KSEG1_START		KSEG_ADDRESS(a0000000)
@@ -113,6 +113,9 @@
 	((0x2ULL << 62) | ((unsigned long long)(cca) << 59) | (x))
 #define	MIPS_XKPHYS_TO_PHYS(x)	((x) & 0x07ffffffffffffffULL)
 
+#define	MIPS_XUSEG_START		0x0000000000000000
+#define	MIPS_XUSEG_END			0x0000010000000000
+
 #define	MIPS_XKSEG_START		0xc000000000000000
 #define	MIPS_XKSEG_END			0xc00000ff80000000
 

Modified: user/jmallett/octeon/sys/mips/include/vmparam.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/vmparam.h	Tue Apr  6 07:40:43 2010	(r206251)
+++ user/jmallett/octeon/sys/mips/include/vmparam.h	Tue Apr  6 07:49:06 2010	(r206252)
@@ -106,10 +106,11 @@
 #define	VM_MIN_ADDRESS		((vm_offset_t)0x00000000)
 #define	VM_MAX_ADDRESS		((vm_offset_t)(intptr_t)(int32_t)0xffffffff)
 
+#define	VM_MINUSER_ADDRESS	((vm_offset_t)0x00000000)
 #if defined(__mips_n64)
-#define	VM_MAXUSER_ADDRESS	((vm_offset_t)0x0000010000000000)	/* XUSEG_END */
+#define	VM_MAXUSER_ADDRESS	(VM_MINUSER_ADDRESS + (NPDEPG * NPTEPG * PAGE_SIZE))
 #else
-#define	VM_MAXUSER_ADDRESS	((vm_offset_t)0x80000000)		/* USEG_END */
+#define	VM_MAXUSER_ADDRESS	((vm_offset_t)0x80000000)
 #endif
 #define	VM_MAX_MMAP_ADDR	VM_MAXUSER_ADDRESS
 
@@ -121,8 +122,8 @@
 #define	VM_MIN_KERNEL_ADDRESS		((vm_offset_t)0xc000000000000000)
 #define	VM_MAX_KERNEL_ADDRESS		(VM_MIN_KERNEL_ADDRESS + (NPDEPG * NPTEPG * PAGE_SIZE))
 #else
-#define	VM_MIN_KERNEL_ADDRESS		((vm_offset_t)(intptr_t)(int32_t)0xC0000000)
-#define	VM_MAX_KERNEL_ADDRESS		((vm_offset_t)(intptr_t)(int32_t)0xFFFFC000)
+#define	VM_MIN_KERNEL_ADDRESS		((vm_offset_t)0xC0000000)
+#define	VM_MAX_KERNEL_ADDRESS		((vm_offset_t)0xFFFFC000)
 #endif
 #define	VM_KERNEL_WIRED_ADDR_END	(VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET)
 #if 0