xnu-2782.10.72.tar.gz

[apple/xnu.git] / bsd / sys / vm.h

diff --git a/bsd/sys/vm.h b/bsd/sys/vm.h
index 72eab024a1caaa63420f2f44cc6f7df7581e8187..a4e3df7958621d3ebc19051ea5aaf88c5f7d38eb 100644 (file)
--- a/bsd/sys/vm.h
+++ b/bsd/sys/vm.h
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -66,6 +69,9 @@
 #define _SYS_VM_H
 
 #include <sys/appleapiopts.h>
 #define _SYS_VM_H
 
 #include <sys/appleapiopts.h>

+#include <sys/cdefs.h>
+
+#ifdef BSD_KERNEL_PRIVATE

 
 /* Machine specific config stuff */
 #if    defined(KERNEL) && !defined(MACH_USER_API)      
 
 /* Machine specific config stuff */
 #if    defined(KERNEL) && !defined(MACH_USER_API)      


@@ -74,7 +80,6 @@
 #include <mach/vm_param.h>
 #endif
 
 #include <mach/vm_param.h>
 #endif
 

-#ifdef __APPLE_API_OBSOLETE

 /*
  * Shareable process virtual address space.
  * May eventually be merged with vm_map.
 /*
  * Shareable process virtual address space.
  * May eventually be merged with vm_map.


@@ -95,22 +100,58 @@ struct vmspace {
        caddr_t vm_maxsaddr;    /* user VA at max stack growth */
 };
 
        caddr_t vm_maxsaddr;    /* user VA at max stack growth */
 };
 

-#else /* __APPLE_API_OBSOLETE */
+#ifdef KERNEL
+/* LP64 version of vmspace.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with vmspace
+ */
+
+struct user32_vmspace {
+       int             vm_refcnt;      /* number of references */
+       uint32_t        vm_shm;                 /* SYS5 shared memory private data XXX */
+       segsz_t         vm_rssize;              /* current resident set size in pages */
+       segsz_t         vm_swrss;               /* resident set size before last swap */
+       segsz_t         vm_tsize;               /* text size (pages) XXX */
+       segsz_t         vm_dsize;               /* data size (pages) XXX */
+       segsz_t         vm_ssize;               /* stack size (pages) */
+       uint32_t        vm_taddr;       /* user virtual address of text XXX */
+       uint32_t        vm_daddr;       /* user virtual address of data XXX */
+       uint32_t vm_maxsaddr;   /* user VA at max stack growth */
+};
+struct user_vmspace {
+       int             vm_refcnt;      /* number of references */
+       user_addr_t     vm_shm __attribute((aligned(8)));                       /* SYS5 shared memory private data XXX */
+       segsz_t         vm_rssize;              /* current resident set size in pages */
+       segsz_t         vm_swrss;               /* resident set size before last swap */
+       segsz_t         vm_tsize;               /* text size (pages) XXX */
+       segsz_t         vm_dsize;               /* data size (pages) XXX */
+       segsz_t         vm_ssize;               /* stack size (pages) */
+       user_addr_t     vm_taddr __attribute((aligned(8)));       /* user virtual address of text XXX */
+       user_addr_t     vm_daddr;       /* user virtual address of data XXX */
+       user_addr_t vm_maxsaddr;        /* user VA at max stack growth */
+};
+
+#endif /* KERNEL */
+
+#include <kern/thread.h>
+
+#else /* BSD_KERNEL_PRIVATE */

 /* just to keep kinfo_proc happy */
 /* just to keep kinfo_proc happy */

+/* NOTE: Pointer fields are size variant for LP64 */

 struct vmspace {
 struct vmspace {

-       int32_t dummy[10];
+       int32_t dummy;
+       caddr_t dummy2;
+       int32_t dummy3[5];
+       caddr_t dummy4[3];

 };
 };

-#endif /* __APPLE_API_OBSOLETE */

 
 

-#ifdef KERNEL
+#endif /* BSD_KERNEL_PRIVATE */

 
 

-#ifdef __APPLE_API_PRIVATE
-#ifdef BSD_BUILD
-#include <kern/thread.h>
-#endif /* BSD_BUILD */
-#endif /* __APPLE_API_PRIVATE */
+#ifdef KERNEL

 
 

+__BEGIN_DECLS

 struct proc *current_proc(void);
 struct proc *current_proc(void);

+__END_DECLS

 
 #endif /* KERNEL */
 
 
 #endif /* KERNEL */