xnu-792.12.6.tar.gz

[apple/xnu.git] / osfmk / mach_debug / vm_info.h

diff --git a/osfmk/mach_debug/vm_info.h b/osfmk/mach_debug/vm_info.h
index 38aa6e6b16c6a71fb16cd312e8ca6f27771af486..671c640c56ef02a03b5cdcba6d9e543901b0afd2 100644 (file)
--- a/osfmk/mach_debug/vm_info.h
+++ b/osfmk/mach_debug/vm_info.h
@@ -1,23 +1,31 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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
- * 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@
+ * 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, 
+ * 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_LICENSE_OSREFERENCE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -66,15 +74,32 @@
 #include <mach/vm_prot.h>
 #include <mach/memory_object_types.h>
 
 #include <mach/vm_prot.h>
 #include <mach/memory_object_types.h>
 

+#if __DARWIN_ALIGN_POWER
+#pragma options align=power
+#endif
+

 /*
  *     Remember to update the mig type definitions
  *     in mach_debug_types.defs when adding/removing fields.
  */
 /*
  *     Remember to update the mig type definitions
  *     in mach_debug_types.defs when adding/removing fields.
  */

+typedef struct mach_vm_info_region {
+       mach_vm_offset_t vir_start;     /* start of region */
+       mach_vm_offset_t vir_end;       /* end of region */
+       mach_vm_offset_t vir_object;    /* the mapped object(kernal addr) */
+       memory_object_offset_t vir_offset;      /* offset into object */
+       boolean_t vir_needs_copy;       /* does object need to be copied? */
+       vm_prot_t vir_protection;       /* protection code */
+       vm_prot_t vir_max_protection;   /* maximum protection */
+       vm_inherit_t vir_inheritance;   /* inheritance */
+       natural_t vir_wired_count;      /* number of times wired */
+       natural_t vir_user_wired_count; /* number of times user has wired */
+} mach_vm_info_region_t;
+

 typedef struct vm_info_region_64 {
 typedef struct vm_info_region_64 {

-       vm_offset_t vir_start;          /* start of region */
-       vm_offset_t vir_end;            /* end of region */
-       vm_offset_t vir_object;         /* the mapped object */
-       vm_object_offset_t vir_offset;  /* offset into object */
+       natural_t vir_start;            /* start of region */
+       natural_t vir_end;              /* end of region */
+       natural_t vir_object;           /* the mapped object */
+       memory_object_offset_t vir_offset;      /* offset into object */

        boolean_t vir_needs_copy;       /* does object need to be copied? */
        vm_prot_t vir_protection;       /* protection code */
        vm_prot_t vir_max_protection;   /* maximum protection */
        boolean_t vir_needs_copy;       /* does object need to be copied? */
        vm_prot_t vir_protection;       /* protection code */
        vm_prot_t vir_max_protection;   /* maximum protection */


@@ -84,10 +109,10 @@ typedef struct vm_info_region_64 {
 } vm_info_region_64_t;
 
 typedef struct vm_info_region {
 } vm_info_region_64_t;
 
 typedef struct vm_info_region {

-       vm_offset_t vir_start;          /* start of region */
-       vm_offset_t vir_end;            /* end of region */
-       vm_offset_t vir_object;         /* the mapped object */
-       vm_offset_t vir_offset;         /* offset into object */
+       natural_t vir_start;            /* start of region */
+       natural_t vir_end;              /* end of region */
+       natural_t vir_object;           /* the mapped object */
+       natural_t vir_offset;           /* offset into object */

        boolean_t vir_needs_copy;       /* does object need to be copied? */
        vm_prot_t vir_protection;       /* protection code */
        vm_prot_t vir_max_protection;   /* maximum protection */
        boolean_t vir_needs_copy;       /* does object need to be copied? */
        vm_prot_t vir_protection;       /* protection code */
        vm_prot_t vir_max_protection;   /* maximum protection */


@@ -98,15 +123,15 @@ typedef struct vm_info_region {
 
 
 typedef struct vm_info_object {
 
 
 typedef struct vm_info_object {

-       vm_offset_t vio_object;         /* this object */
-       vm_size_t vio_size;             /* object size (valid if internal) */
+       natural_t vio_object;           /* this object */
+       natural_t vio_size;             /* object size (valid if internal - but too small) */

        unsigned int vio_ref_count;     /* number of references */
        unsigned int vio_resident_page_count; /* number of resident pages */
        unsigned int vio_absent_count;  /* number requested but not filled */
        unsigned int vio_ref_count;     /* number of references */
        unsigned int vio_resident_page_count; /* number of resident pages */
        unsigned int vio_absent_count;  /* number requested but not filled */

-       vm_offset_t vio_copy;           /* copy object */
-       vm_offset_t vio_shadow;         /* shadow object */
-       vm_offset_t vio_shadow_offset;  /* offset into shadow object */
-       vm_offset_t vio_paging_offset;  /* offset into memory object */
+       natural_t vio_copy;             /* copy object */
+       natural_t vio_shadow;           /* shadow object */
+       natural_t vio_shadow_offset;    /* offset into shadow object */
+       natural_t vio_paging_offset;    /* offset into memory object */

        memory_object_copy_strategy_t vio_copy_strategy;
                                        /* how to handle data copy */
        vm_offset_t vio_last_alloc;     /* offset of last allocation */
        memory_object_copy_strategy_t vio_copy_strategy;
                                        /* how to handle data copy */
        vm_offset_t vio_last_alloc;     /* offset of last allocation */


@@ -119,10 +144,14 @@ typedef struct vm_info_object {
        boolean_t vio_internal;
        boolean_t vio_temporary;
        boolean_t vio_alive;
        boolean_t vio_internal;
        boolean_t vio_temporary;
        boolean_t vio_alive;

-       boolean_t vio_lock_in_progress;
-       boolean_t vio_lock_restart;
+       boolean_t vio_purgable;
+       boolean_t vio_purgable_volatile;

 } vm_info_object_t;
 
 typedef vm_info_object_t *vm_info_object_array_t;
 
 } vm_info_object_t;
 
 typedef vm_info_object_t *vm_info_object_array_t;
 

+#if __DARWIN_ALIGN_POWER
+#pragma options align=reset
+#endif
+

 #endif /* _MACH_DEBUG_VM_INFO_H_ */
 #endif /* _MACH_DEBUG_VM_INFO_H_ */