X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..HEAD:/osfmk/mach_debug/vm_info.h diff --git a/osfmk/mach_debug/vm_info.h b/osfmk/mach_debug/vm_info.h index 3d840aebd..8e2eb5f05 100644 --- a/osfmk/mach_debug/vm_info.h +++ b/osfmk/mach_debug/vm_info.h @@ -1,8 +1,8 @@ /* - * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2006 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 @@ -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. - * + * * 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, @@ -22,39 +22,37 @@ * 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@ */ /* * @OSF_COPYRIGHT@ */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ -/* - */ /* * File: mach_debug/vm_info.h * Author: Rich Draves @@ -63,7 +61,7 @@ * Definitions for the VM debugging interface. */ -#ifndef _MACH_DEBUG_VM_INFO_H_ +#ifndef _MACH_DEBUG_VM_INFO_H_ #define _MACH_DEBUG_VM_INFO_H_ #include @@ -72,67 +70,65 @@ #include #include -#if __DARWIN_ALIGN_POWER -#pragma options align=power -#endif +#pragma pack(4) /* * 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 */ + 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 { - 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 */ - vm_inherit_t vir_inheritance; /* inheritance */ - natural_t vir_wired_count; /* number of times wired */ + 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 */ + 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 */ } vm_info_region_64_t; typedef struct vm_info_region { - 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 */ - vm_inherit_t vir_inheritance; /* inheritance */ - natural_t vir_wired_count; /* number of times wired */ + 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 */ + 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 */ } vm_info_region_t; typedef struct vm_info_object { - 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 */ + 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 */ - 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 */ + unsigned int vio_absent_count; /* number requested but not filled */ + 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 */ + /* how to handle data copy */ + vm_offset_t vio_last_alloc; /* offset of last allocation */ /* many random attributes */ unsigned int vio_paging_in_progress; boolean_t vio_pager_created; @@ -148,8 +144,6 @@ typedef struct vm_info_object { typedef vm_info_object_t *vm_info_object_array_t; -#if __DARWIN_ALIGN_POWER -#pragma options align=reset -#endif +#pragma pack() -#endif /* _MACH_DEBUG_VM_INFO_H_ */ +#endif /* _MACH_DEBUG_VM_INFO_H_ */