xnu-4903.270.47.tar.gz

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

diff --git a/bsd/sys/vm.h b/bsd/sys/vm.h
index 2ff69a04b7c0df9eba26295d4890374cb21a070d..f23c43c8851741860ff1fb67d078bd1e5b21fe5a 100644 (file)
--- a/bsd/sys/vm.h
+++ b/bsd/sys/vm.h
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

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


@@ -56,7 +62,7 @@
  */
 /* HISTORY
  *  05-Jun-95  Mac Gillon (mgillon) at NeXT
  */
 /* HISTORY
  *  05-Jun-95  Mac Gillon (mgillon) at NeXT

- *     4.4 code uses this file to import MACH API
+ *      4.4 code uses this file to import MACH API

  */
 
 #ifndef _SYS_VM_H
  */
 
 #ifndef _SYS_VM_H


@@ -68,7 +74,7 @@
 #ifdef BSD_KERNEL_PRIVATE
 
 /* Machine specific config stuff */
 #ifdef BSD_KERNEL_PRIVATE
 
 /* Machine specific config stuff */

-#if    defined(KERNEL) && !defined(MACH_USER_API)      
+#if     defined(KERNEL) && !defined(MACH_USER_API)

 #include <sys/vmmeter.h>
 #include <sys/queue.h>
 #include <mach/vm_param.h>
 #include <sys/vmmeter.h>
 #include <sys/queue.h>
 #include <mach/vm_param.h>


@@ -80,60 +86,67 @@
  * Several fields are temporary (text, data stuff).
  */
 struct vmspace {
  * Several fields are temporary (text, data stuff).
  */
 struct vmspace {

-       int     vm_refcnt;      /* number of references */
-       caddr_t vm_shm;         /* SYS5 shared memory private data XXX */
+       int     vm_refcnt;      /* number of references */
+       caddr_t vm_shm;         /* SYS5 shared memory private data XXX */

 /* we copy from vm_startcopy to the end of the structure on fork */
 #define vm_startcopy vm_rssize
 /* we copy from vm_startcopy to the end of the structure on fork */
 #define vm_startcopy vm_rssize

-       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) */
-       caddr_t vm_taddr;       /* user virtual address of text XXX */
-       caddr_t vm_daddr;       /* user virtual address of data XXX */
-       caddr_t vm_maxsaddr;    /* user VA at max stack growth */
+       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) */
+       caddr_t vm_taddr;       /* user virtual address of text XXX */
+       caddr_t vm_daddr;       /* user virtual address of data XXX */
+       caddr_t vm_maxsaddr;    /* user VA at max stack growth */

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-// LP64todo - should this move?
-/* LP64 version of vmspace.  all pointers 
+/* LP64 version of vmspace.  all pointers

  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with vmspace
  */
 
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with vmspace
  */
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
+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 {
 struct user_vmspace {

-       int             vm_refcnt;      /* number of references */
-       user_addr_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) */
-       user_addr_t     vm_taddr;       /* 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 */
+       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 */

 };
 
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif /* KERNEL */
 
 #include <kern/thread.h>
 
 #else /* BSD_KERNEL_PRIVATE */
 #endif /* KERNEL */
 
 #include <kern/thread.h>
 
 #else /* BSD_KERNEL_PRIVATE */

+
+#include <sys/_types/_caddr_t.h> /* caddr_t */
+#include <sys/_types/_int32_t.h> /* int32_t */
+

 /* just to keep kinfo_proc happy */
 /* NOTE: Pointer fields are size variant for LP64 */
 struct vmspace {
 /* just to keep kinfo_proc happy */
 /* NOTE: Pointer fields are size variant for LP64 */
 struct vmspace {

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

 };
 
 #endif /* BSD_KERNEL_PRIVATE */
 };
 
 #endif /* BSD_KERNEL_PRIVATE */