xnu-6153.141.1.tar.gz

[apple/xnu.git] / osfmk / mach / vm_region.h

diff --git a/osfmk/mach/vm_region.h b/osfmk/mach/vm_region.h
index 729c7d81f89b241812c9653d5d68b70f50400f2c..21abcad6e55e1388a3370a0f5a3927bd13636793 100644 (file)
--- a/osfmk/mach/vm_region.h
+++ b/osfmk/mach/vm_region.h
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,7 +22,7 @@
  * 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.
  * 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@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -35,7 +35,7 @@
  *
  */
 
  *
  */
 

-#ifndef        _MACH_VM_REGION_H_
+#ifndef _MACH_VM_REGION_H_

 #define _MACH_VM_REGION_H_
 
 #include <mach/boolean.h>
 #define _MACH_VM_REGION_H_
 
 #include <mach/boolean.h>


@@ -50,7 +50,7 @@
 
 #include <sys/cdefs.h>
 
 
 #include <sys/cdefs.h>
 

-#pragma pack(4)
+#pragma pack(push, 4)

 
 // LP64todo: all the current tools are 32bit, obviously never worked for 64b
 // so probably should be a real 32b ID vs. ptr.
 
 // LP64todo: all the current tools are 32bit, obviously never worked for 64b
 // so probably should be a real 32b ID vs. ptr.


@@ -64,28 +64,28 @@ typedef uint32_t vm32_object_id_t;
  */
 
 #define VM_REGION_INFO_MAX      (1024)
  */
 
 #define VM_REGION_INFO_MAX      (1024)

-typedef int    *vm_region_info_t;
-typedef int    *vm_region_info_64_t;
-typedef int    *vm_region_recurse_info_t;
-typedef int    *vm_region_recurse_info_64_t;
-typedef int     vm_region_flavor_t;
-typedef int     vm_region_info_data_t[VM_REGION_INFO_MAX];
-
-#define VM_REGION_BASIC_INFO_64                9
+typedef int     *vm_region_info_t;
+typedef int     *vm_region_info_64_t;
+typedef int     *vm_region_recurse_info_t;
+typedef int     *vm_region_recurse_info_64_t;
+typedef int      vm_region_flavor_t;
+typedef int      vm_region_info_data_t[VM_REGION_INFO_MAX];
+
+#define VM_REGION_BASIC_INFO_64         9

 struct vm_region_basic_info_64 {
 struct vm_region_basic_info_64 {

-       vm_prot_t               protection;
-       vm_prot_t               max_protection;
-       vm_inherit_t            inheritance;
-       boolean_t               shared;
-       boolean_t               reserved;
-       memory_object_offset_t  offset;
-       vm_behavior_t           behavior;
-       unsigned short          user_wired_count;
+       vm_prot_t               protection;
+       vm_prot_t               max_protection;
+       vm_inherit_t            inheritance;
+       boolean_t               shared;
+       boolean_t               reserved;
+       memory_object_offset_t  offset;
+       vm_behavior_t           behavior;
+       unsigned short          user_wired_count;

 };
 };

-typedef struct vm_region_basic_info_64         *vm_region_basic_info_64_t;
-typedef struct vm_region_basic_info_64          vm_region_basic_info_data_64_t;
+typedef struct vm_region_basic_info_64          *vm_region_basic_info_64_t;
+typedef struct vm_region_basic_info_64           vm_region_basic_info_data_64_t;

 
 

-#define VM_REGION_BASIC_INFO_COUNT_64  ((mach_msg_type_number_t) \
+#define VM_REGION_BASIC_INFO_COUNT_64   ((mach_msg_type_number_t) \

        (sizeof(vm_region_basic_info_data_64_t)/sizeof(int)))
 
 /*
        (sizeof(vm_region_basic_info_data_64_t)/sizeof(int)))
 
 /*


@@ -93,7 +93,7 @@ typedef struct vm_region_basic_info_64                 vm_region_basic_info_data_64_t;
  * automatically converts it to a VM_REGION_BASIC_INFO_64.
  * Please use that explicitly instead.
  */
  * automatically converts it to a VM_REGION_BASIC_INFO_64.
  * Please use that explicitly instead.
  */

-#define VM_REGION_BASIC_INFO           10
+#define VM_REGION_BASIC_INFO            10

 
 /*
  * This is the legacy basic info structure.  It is
 
 /*
  * This is the legacy basic info structure.  It is


@@ -101,18 +101,18 @@ typedef struct vm_region_basic_info_64             vm_region_basic_info_data_64_t;
  * offset back - too small for many larger objects (e.g. files).
  */
 struct vm_region_basic_info {
  * offset back - too small for many larger objects (e.g. files).
  */
 struct vm_region_basic_info {

-       vm_prot_t               protection;
-       vm_prot_t               max_protection;
-       vm_inherit_t            inheritance;
-       boolean_t               shared;
-       boolean_t               reserved;
-       uint32_t                offset; /* too small for a real offset */
-       vm_behavior_t           behavior;
-       unsigned short          user_wired_count;
+       vm_prot_t               protection;
+       vm_prot_t               max_protection;
+       vm_inherit_t            inheritance;
+       boolean_t               shared;
+       boolean_t               reserved;
+       uint32_t                offset; /* too small for a real offset */
+       vm_behavior_t           behavior;
+       unsigned short          user_wired_count;

 };
 
 };
 

-typedef struct vm_region_basic_info            *vm_region_basic_info_t;
-typedef struct vm_region_basic_info             vm_region_basic_info_data_t;
+typedef struct vm_region_basic_info             *vm_region_basic_info_t;
+typedef struct vm_region_basic_info              vm_region_basic_info_data_t;

 
 #define VM_REGION_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
        (sizeof(vm_region_basic_info_data_t)/sizeof(int)))
 
 #define VM_REGION_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
        (sizeof(vm_region_basic_info_data_t)/sizeof(int)))


@@ -126,7 +126,7 @@ typedef struct vm_region_basic_info          vm_region_basic_info_data_t;
 #define SM_SHARED_ALIASED  7
 #define SM_LARGE_PAGE      8
 
 #define SM_SHARED_ALIASED  7
 #define SM_LARGE_PAGE      8
 

-/* 
+/*

  * For submap info,  the SM flags above are overlayed when a submap
  * is encountered.  The field denotes whether or not machine level mapping
  * information is being shared.  PTE's etc.  When such sharing is taking
  * For submap info,  the SM flags above are overlayed when a submap
  * is encountered.  The field denotes whether or not machine level mapping
  * information is being shared.  PTE's etc.  When such sharing is taking


@@ -134,19 +134,19 @@ typedef struct vm_region_basic_info                vm_region_basic_info_data_t;
  * back.
  */
 
  * back.
  */
 

-#if MACH_KERNEL_PRIVATE
-#define VM_REGION_EXTENDED_INFO__legacy        11
+#ifdef MACH_KERNEL_PRIVATE
+#define VM_REGION_EXTENDED_INFO__legacy 11

 struct vm_region_extended_info__legacy {
 struct vm_region_extended_info__legacy {

-       vm_prot_t               protection;
-        unsigned int            user_tag;
-        unsigned int            pages_resident;
-        unsigned int            pages_shared_now_private;
-        unsigned int            pages_swapped_out;
-        unsigned int            pages_dirtied;
-        unsigned int            ref_count;
-        unsigned short          shadow_depth;
-        unsigned char           external_pager;
-        unsigned char           share_mode;
+       vm_prot_t               protection;
+       unsigned int            user_tag;
+       unsigned int            pages_resident;
+       unsigned int            pages_shared_now_private;
+       unsigned int            pages_swapped_out;
+       unsigned int            pages_dirtied;
+       unsigned int            ref_count;
+       unsigned short          shadow_depth;
+       unsigned char           external_pager;
+       unsigned char           share_mode;

        /*
         * XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
         *  DO NOT EXTEND THIS DATA STRUCTURE.
        /*
         * XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
         *  DO NOT EXTEND THIS DATA STRUCTURE.


@@ -154,57 +154,57 @@ struct vm_region_extended_info__legacy {
         * XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
         */
 };
         * XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
         */
 };

-#define VM_REGION_EXTENDED_INFO_COUNT__legacy              \
-       ((mach_msg_type_number_t)                           \
+#define VM_REGION_EXTENDED_INFO_COUNT__legacy               \
+       ((mach_msg_type_number_t)                           \

         (sizeof (struct vm_region_extended_info__legacy) / \
          sizeof (natural_t)))
 #endif /* MACH_KERNEL_PRIVATE */
 
 
 
         (sizeof (struct vm_region_extended_info__legacy) / \
          sizeof (natural_t)))
 #endif /* MACH_KERNEL_PRIVATE */
 
 
 

-#define VM_REGION_EXTENDED_INFO        13
+#define VM_REGION_EXTENDED_INFO 13

 struct vm_region_extended_info {
 struct vm_region_extended_info {

-       vm_prot_t               protection;
-        unsigned int            user_tag;
-        unsigned int            pages_resident;
-        unsigned int            pages_shared_now_private;
-        unsigned int            pages_swapped_out;
-        unsigned int            pages_dirtied;
-        unsigned int            ref_count;
-        unsigned short          shadow_depth;
-        unsigned char           external_pager;
-        unsigned char           share_mode;
-       unsigned int            pages_reusable;
+       vm_prot_t               protection;
+       unsigned int            user_tag;
+       unsigned int            pages_resident;
+       unsigned int            pages_shared_now_private;
+       unsigned int            pages_swapped_out;
+       unsigned int            pages_dirtied;
+       unsigned int            ref_count;
+       unsigned short          shadow_depth;
+       unsigned char           external_pager;
+       unsigned char           share_mode;
+       unsigned int            pages_reusable;

 };
 };

-typedef struct vm_region_extended_info         *vm_region_extended_info_t;
-typedef struct vm_region_extended_info          vm_region_extended_info_data_t;
-#define VM_REGION_EXTENDED_INFO_COUNT                  \
-       ((mach_msg_type_number_t)                       \
+typedef struct vm_region_extended_info          *vm_region_extended_info_t;
+typedef struct vm_region_extended_info           vm_region_extended_info_data_t;
+#define VM_REGION_EXTENDED_INFO_COUNT                   \
+       ((mach_msg_type_number_t)                       \

         (sizeof (vm_region_extended_info_data_t) / sizeof (natural_t)))
 
 
 
 
         (sizeof (vm_region_extended_info_data_t) / sizeof (natural_t)))
 
 
 
 

-#define VM_REGION_TOP_INFO     12
+#define VM_REGION_TOP_INFO      12

 
 struct vm_region_top_info {
 
 struct vm_region_top_info {

-        unsigned int            obj_id;
-        unsigned int            ref_count;
-        unsigned int            private_pages_resident;
-        unsigned int            shared_pages_resident;
-        unsigned char           share_mode;
+       unsigned int            obj_id;
+       unsigned int            ref_count;
+       unsigned int            private_pages_resident;
+       unsigned int            shared_pages_resident;
+       unsigned char           share_mode;

 };
 
 };
 

-typedef struct vm_region_top_info              *vm_region_top_info_t;
-typedef struct vm_region_top_info               vm_region_top_info_data_t;
+typedef struct vm_region_top_info               *vm_region_top_info_t;
+typedef struct vm_region_top_info                vm_region_top_info_data_t;

 
 

-#define VM_REGION_TOP_INFO_COUNT                                       \
-       ((mach_msg_type_number_t)                                       \
+#define VM_REGION_TOP_INFO_COUNT                                        \
+       ((mach_msg_type_number_t)                                       \

         (sizeof(vm_region_top_info_data_t) / sizeof(natural_t)))
 
 
 
         (sizeof(vm_region_top_info_data_t) / sizeof(natural_t)))
 
 
 

-/* 
+/*

  * vm_region_submap_info will return information on a submap or object.
  * The user supplies a nesting level on the call.  When a walk of the
  * user's map is done and a submap is encountered, the nesting count is
  * vm_region_submap_info will return information on a submap or object.
  * The user supplies a nesting level on the call.  When a walk of the
  * user's map is done and a submap is encountered, the nesting count is


@@ -221,66 +221,73 @@ typedef struct vm_region_top_info          vm_region_top_info_data_t;
  *
  * Object only fields are filled in through a walking of the object shadow
  * chain (where one is present), and a walking of the resident page queue.
  *
  * Object only fields are filled in through a walking of the object shadow
  * chain (where one is present), and a walking of the resident page queue.

- * 
+ *

  */
 
 struct vm_region_submap_info {
  */
 
 struct vm_region_submap_info {

-       vm_prot_t               protection;     /* present access protection */
-       vm_prot_t               max_protection; /* max avail through vm_prot */
-       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
-       uint32_t                offset;         /* offset into object/map */
-        unsigned int            user_tag;      /* user tag on map entry */
-        unsigned int            pages_resident;        /* only valid for objects */
-        unsigned int            pages_shared_now_private; /* only for objects */
-        unsigned int            pages_swapped_out; /* only for objects */
-        unsigned int            pages_dirtied;   /* only for objects */
-        unsigned int            ref_count;      /* obj/map mappers, etc */
-        unsigned short          shadow_depth;  /* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;    /* see enumeration */
-       boolean_t               is_submap;      /* submap vs obj */
-       vm_behavior_t           behavior;       /* access behavior hint */
-       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
-       unsigned short          user_wired_count; 
+       vm_prot_t               protection;     /* present access protection */
+       vm_prot_t               max_protection; /* max avail through vm_prot */
+       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
+       uint32_t                offset;         /* offset into object/map */
+       unsigned int            user_tag;       /* user tag on map entry */
+       unsigned int            pages_resident; /* only valid for objects */
+       unsigned int            pages_shared_now_private; /* only for objects */
+       unsigned int            pages_swapped_out; /* only for objects */
+       unsigned int            pages_dirtied;   /* only for objects */
+       unsigned int            ref_count;       /* obj/map mappers, etc */
+       unsigned short          shadow_depth;   /* only for obj */
+       unsigned char           external_pager;  /* only for obj */
+       unsigned char           share_mode;     /* see enumeration */
+       boolean_t               is_submap;      /* submap vs obj */
+       vm_behavior_t           behavior;       /* access behavior hint */
+       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
+       unsigned short          user_wired_count;

 };
 
 };
 

-typedef struct vm_region_submap_info           *vm_region_submap_info_t;
-typedef struct vm_region_submap_info            vm_region_submap_info_data_t;
+typedef struct vm_region_submap_info            *vm_region_submap_info_t;
+typedef struct vm_region_submap_info             vm_region_submap_info_data_t;

 
 

-#define VM_REGION_SUBMAP_INFO_COUNT                                    \
-       ((mach_msg_type_number_t)                                       \
+#define VM_REGION_SUBMAP_INFO_COUNT                                     \
+       ((mach_msg_type_number_t)                                       \

         (sizeof(vm_region_submap_info_data_t) / sizeof(natural_t)))
 
 struct vm_region_submap_info_64 {
         (sizeof(vm_region_submap_info_data_t) / sizeof(natural_t)))
 
 struct vm_region_submap_info_64 {

-       vm_prot_t               protection;     /* present access protection */
-       vm_prot_t               max_protection; /* max avail through vm_prot */
-       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
-       memory_object_offset_t  offset;         /* offset into object/map */
-        unsigned int            user_tag;      /* user tag on map entry */
-        unsigned int            pages_resident;        /* only valid for objects */
-        unsigned int            pages_shared_now_private; /* only for objects */
-        unsigned int            pages_swapped_out; /* only for objects */
-        unsigned int            pages_dirtied;   /* only for objects */
-        unsigned int            ref_count;      /* obj/map mappers, etc */
-        unsigned short          shadow_depth;  /* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;    /* see enumeration */
-       boolean_t               is_submap;      /* submap vs obj */
-       vm_behavior_t           behavior;       /* access behavior hint */
-       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
-       unsigned short          user_wired_count;
-       unsigned int            pages_reusable;
+       vm_prot_t               protection;     /* present access protection */
+       vm_prot_t               max_protection; /* max avail through vm_prot */
+       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
+       memory_object_offset_t  offset;         /* offset into object/map */
+       unsigned int            user_tag;       /* user tag on map entry */
+       unsigned int            pages_resident; /* only valid for objects */
+       unsigned int            pages_shared_now_private; /* only for objects */
+       unsigned int            pages_swapped_out; /* only for objects */
+       unsigned int            pages_dirtied;   /* only for objects */
+       unsigned int            ref_count;       /* obj/map mappers, etc */
+       unsigned short          shadow_depth;   /* only for obj */
+       unsigned char           external_pager;  /* only for obj */
+       unsigned char           share_mode;     /* see enumeration */
+       boolean_t               is_submap;      /* submap vs obj */
+       vm_behavior_t           behavior;       /* access behavior hint */
+       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
+       unsigned short          user_wired_count;
+       unsigned int            pages_reusable;
+       vm_object_id_t          object_id_full;

 };
 
 };
 

-typedef struct vm_region_submap_info_64                *vm_region_submap_info_64_t;
-typedef struct vm_region_submap_info_64                 vm_region_submap_info_data_64_t;
+typedef struct vm_region_submap_info_64         *vm_region_submap_info_64_t;
+typedef struct vm_region_submap_info_64          vm_region_submap_info_data_64_t;

 
 

-#define VM_REGION_SUBMAP_INFO_V1_SIZE  \
+#define VM_REGION_SUBMAP_INFO_V2_SIZE   \

        (sizeof (vm_region_submap_info_data_64_t))
        (sizeof (vm_region_submap_info_data_64_t))

-#define VM_REGION_SUBMAP_INFO_V0_SIZE  \
+#define VM_REGION_SUBMAP_INFO_V1_SIZE   \
+       (VM_REGION_SUBMAP_INFO_V2_SIZE - \
+        sizeof (vm_object_id_t) /* object_id_full */ )
+#define VM_REGION_SUBMAP_INFO_V0_SIZE   \

        (VM_REGION_SUBMAP_INFO_V1_SIZE - \
        (VM_REGION_SUBMAP_INFO_V1_SIZE - \

-        sizeof (unsigned int) /* pages_reusable */)
+        sizeof (unsigned int) /* pages_reusable */ )

 
 

+#define VM_REGION_SUBMAP_INFO_V2_COUNT_64 \
+       ((mach_msg_type_number_t) \
+        (VM_REGION_SUBMAP_INFO_V2_SIZE / sizeof (natural_t)))

 #define VM_REGION_SUBMAP_INFO_V1_COUNT_64 \
        ((mach_msg_type_number_t) \
         (VM_REGION_SUBMAP_INFO_V1_SIZE / sizeof (natural_t)))
 #define VM_REGION_SUBMAP_INFO_V1_COUNT_64 \
        ((mach_msg_type_number_t) \
         (VM_REGION_SUBMAP_INFO_V1_SIZE / sizeof (natural_t)))


@@ -289,81 +296,79 @@ typedef struct vm_region_submap_info_64            vm_region_submap_info_data_64_t;
         (VM_REGION_SUBMAP_INFO_V0_SIZE / sizeof (natural_t)))
 
 /* set this to the latest version */
         (VM_REGION_SUBMAP_INFO_V0_SIZE / sizeof (natural_t)))
 
 /* set this to the latest version */

-#define VM_REGION_SUBMAP_INFO_COUNT_64         VM_REGION_SUBMAP_INFO_V1_COUNT_64
+#define VM_REGION_SUBMAP_INFO_COUNT_64          VM_REGION_SUBMAP_INFO_V2_COUNT_64

 
 struct vm_region_submap_short_info_64 {
 
 struct vm_region_submap_short_info_64 {

-       vm_prot_t               protection;     /* present access protection */
-       vm_prot_t               max_protection; /* max avail through vm_prot */
-       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
-       memory_object_offset_t  offset;         /* offset into object/map */
-        unsigned int            user_tag;      /* user tag on map entry */
-        unsigned int            ref_count;      /* obj/map mappers, etc */
-        unsigned short          shadow_depth;  /* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;    /* see enumeration */
-       boolean_t               is_submap;      /* submap vs obj */
-       vm_behavior_t           behavior;       /* access behavior hint */
-       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
-       unsigned short          user_wired_count; 
+       vm_prot_t               protection;     /* present access protection */
+       vm_prot_t               max_protection; /* max avail through vm_prot */
+       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
+       memory_object_offset_t  offset;         /* offset into object/map */
+       unsigned int            user_tag;       /* user tag on map entry */
+       unsigned int            ref_count;       /* obj/map mappers, etc */
+       unsigned short          shadow_depth;   /* only for obj */
+       unsigned char           external_pager;  /* only for obj */
+       unsigned char           share_mode;     /* see enumeration */
+       boolean_t               is_submap;      /* submap vs obj */
+       vm_behavior_t           behavior;       /* access behavior hint */
+       vm32_object_id_t        object_id;      /* obj/map name, not a handle */
+       unsigned short          user_wired_count;

 };
 
 };
 

-typedef struct vm_region_submap_short_info_64  *vm_region_submap_short_info_64_t;
-typedef struct vm_region_submap_short_info_64   vm_region_submap_short_info_data_64_t;
+typedef struct vm_region_submap_short_info_64   *vm_region_submap_short_info_64_t;
+typedef struct vm_region_submap_short_info_64    vm_region_submap_short_info_data_64_t;

 
 

-#define VM_REGION_SUBMAP_SHORT_INFO_COUNT_64                           \
-       ((mach_msg_type_number_t)                                       \
+#define VM_REGION_SUBMAP_SHORT_INFO_COUNT_64                            \
+       ((mach_msg_type_number_t)                                       \

         (sizeof (vm_region_submap_short_info_data_64_t) / sizeof (natural_t)))
 
         (sizeof (vm_region_submap_short_info_data_64_t) / sizeof (natural_t)))
 

-
-

 struct mach_vm_read_entry {
        mach_vm_address_t address;
        mach_vm_size_t size;
 };
 
 struct vm_read_entry {
 struct mach_vm_read_entry {
        mach_vm_address_t address;
        mach_vm_size_t size;
 };
 
 struct vm_read_entry {

-       vm_address_t    address;
-       vm_size_t       size;
+       vm_address_t    address;
+       vm_size_t       size;

 };
 
 };
 

-#if VM32_SUPPORT
+#ifdef VM32_SUPPORT

 struct vm32_read_entry {
 struct vm32_read_entry {

-       vm32_address_t  address;
-       vm32_size_t     size;
+       vm32_address_t  address;
+       vm32_size_t     size;

 };
 #endif
 
 
 #define VM_MAP_ENTRY_MAX  (256)
 
 };
 #endif
 
 
 #define VM_MAP_ENTRY_MAX  (256)
 

-typedef struct mach_vm_read_entry      mach_vm_read_entry_t[VM_MAP_ENTRY_MAX];
-typedef struct vm_read_entry           vm_read_entry_t[VM_MAP_ENTRY_MAX];
-#if VM32_SUPPORT
-typedef struct vm32_read_entry         vm32_read_entry_t[VM_MAP_ENTRY_MAX];
+typedef struct mach_vm_read_entry       mach_vm_read_entry_t[VM_MAP_ENTRY_MAX];
+typedef struct vm_read_entry            vm_read_entry_t[VM_MAP_ENTRY_MAX];
+#ifdef VM32_SUPPORT
+typedef struct vm32_read_entry          vm32_read_entry_t[VM_MAP_ENTRY_MAX];

 #endif
 
 #endif
 

-#pragma pack()
+#pragma pack(pop)

 
 
 
 

-#define VM_PAGE_INFO_MAX 
+#define VM_PAGE_INFO_MAX

 typedef int *vm_page_info_t;
 typedef int vm_page_info_data_t[VM_PAGE_INFO_MAX];
 typedef int vm_page_info_flavor_t;
 
 typedef int *vm_page_info_t;
 typedef int vm_page_info_data_t[VM_PAGE_INFO_MAX];
 typedef int vm_page_info_flavor_t;
 

-#define VM_PAGE_INFO_BASIC             1
+#define VM_PAGE_INFO_BASIC              1

 struct vm_page_info_basic {
 struct vm_page_info_basic {

-       int                     disposition;
-       int                     ref_count;
-       vm_object_id_t          object_id;
-       memory_object_offset_t  offset;
-       int                     depth;
-       int                     __pad; /* pad to 64-bit boundary */
+       int                     disposition;
+       int                     ref_count;
+       vm_object_id_t          object_id;
+       memory_object_offset_t  offset;
+       int                     depth;
+       int                     __pad; /* pad to 64-bit boundary */

 };
 };

-typedef struct vm_page_info_basic              *vm_page_info_basic_t;
-typedef struct vm_page_info_basic              vm_page_info_basic_data_t;
+typedef struct vm_page_info_basic               *vm_page_info_basic_t;
+typedef struct vm_page_info_basic               vm_page_info_basic_data_t;

 
 

-#define VM_PAGE_INFO_BASIC_COUNT       ((mach_msg_type_number_t) \
+#define VM_PAGE_INFO_BASIC_COUNT        ((mach_msg_type_number_t) \

        (sizeof(vm_page_info_basic_data_t)/sizeof(int)))
 
 
        (sizeof(vm_page_info_basic_data_t)/sizeof(int)))
 
 

-#endif /*_MACH_VM_REGION_H_*/
+#endif  /*_MACH_VM_REGION_H_*/