X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..36401178fd6817c043cc00b0c00c7f723e58efae:/osfmk/vm/vm_debug.c?ds=sidebyside

diff --git a/osfmk/vm/vm_debug.c b/osfmk/vm/vm_debug.c
index 87b81f23c..702ce6a42 100644
--- a/osfmk/vm/vm_debug.c
+++ b/osfmk/vm/vm_debug.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 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
- * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -83,6 +86,12 @@
 #include <vm/vm_debug.h>
 #endif
 
+#if !MACH_VM_DEBUG
+#define __DEBUG_ONLY __unused
+#else /* !MACH_VM_DEBUG */
+#define __DEBUG_ONLY
+#endif /* !MACH_VM_DEBUG */
+
 /*
  *	Routine:	mach_vm_region_info [kernel call]
  *	Purpose:
@@ -99,11 +108,11 @@
 
 kern_return_t
 mach_vm_region_info(
-	vm_map_t		map,
-	vm_offset_t		address,
-	vm_info_region_t	*regionp,
-	vm_info_object_array_t	*objectsp,
-	mach_msg_type_number_t	*objectsCntp)
+	__DEBUG_ONLY vm_map_t			map,
+	__DEBUG_ONLY vm_offset_t		address,
+	__DEBUG_ONLY vm_info_region_t		*regionp,
+	__DEBUG_ONLY vm_info_object_array_t	*objectsp,
+	__DEBUG_ONLY mach_msg_type_number_t	*objectsCntp)
 {
 #if !MACH_VM_DEBUG
         return KERN_FAILURE;
@@ -133,7 +142,9 @@ mach_vm_region_info(
 		for (cmap = map;; cmap = nmap) {
 			/* cmap is read-locked */
 
-			if (!vm_map_lookup_entry(cmap, address, &entry)) {
+			if (!vm_map_lookup_entry(cmap, 
+				(vm_map_address_t)address, &entry)) {
+
 				entry = entry->vme_next;
 				if (entry == vm_map_to_entry(cmap)) {
 					vm_map_unlock_read(cmap);
@@ -196,8 +207,6 @@ mach_vm_region_info(
 					cobject->ref_count;
 				vio->vio_resident_page_count =
 					cobject->resident_page_count;
-				vio->vio_absent_count =
-					cobject->absent_count;
 				vio->vio_copy =
 					(vm_offset_t) cobject->copy;
 				vio->vio_shadow =
@@ -226,10 +235,11 @@ mach_vm_region_info(
 					cobject->temporary;
 				vio->vio_alive =
 					cobject->alive;
-				vio->vio_lock_in_progress =
-					cobject->lock_in_progress;
-				vio->vio_lock_restart =
-					cobject->lock_restart;
+				vio->vio_purgable =
+					(cobject->purgable != VM_PURGABLE_DENY);
+				vio->vio_purgable_volatile =
+					(cobject->purgable == VM_PURGABLE_VOLATILE ||
+					 cobject->purgable == VM_PURGABLE_EMPTY);
 			}
 
 			used++;
@@ -254,12 +264,13 @@ mach_vm_region_info(
 			kmem_free(ipc_kernel_map, addr, size);
 		size = round_page_32(2 * used * sizeof(vm_info_object_t));
 
-		kr = vm_allocate(ipc_kernel_map, &addr, size, TRUE);
+		kr = vm_allocate(ipc_kernel_map, &addr, size, VM_FLAGS_ANYWHERE);
 		if (kr != KERN_SUCCESS)
 			return KERN_RESOURCE_SHORTAGE;
 
-		kr = vm_map_wire(ipc_kernel_map, addr, addr + size,
-				     VM_PROT_READ|VM_PROT_WRITE, FALSE);
+		kr = vm_map_wire(ipc_kernel_map, vm_map_trunc_page(addr),
+				 vm_map_round_page(addr + size),
+				 VM_PROT_READ|VM_PROT_WRITE, FALSE);
 		assert(kr == KERN_SUCCESS);
 	}
 
@@ -274,11 +285,12 @@ mach_vm_region_info(
 		vm_size_t size_used =
 			round_page_32(used * sizeof(vm_info_object_t));
 
-		kr = vm_map_unwire(ipc_kernel_map, addr, addr + size_used, FALSE);
+		kr = vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(addr),
+				   vm_map_round_page(addr + size_used), FALSE);
 		assert(kr == KERN_SUCCESS);
 
-		kr = vm_map_copyin(ipc_kernel_map, addr, size_used,
-				   TRUE, &copy);
+		kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)addr,
+				   (vm_map_size_t)size_used, TRUE, &copy);
 		assert(kr == KERN_SUCCESS);
 
 		if (size != size_used)
@@ -292,17 +304,18 @@ mach_vm_region_info(
 	return KERN_SUCCESS;
 #endif /* MACH_VM_DEBUG */
 }
+
 /*
  *  Temporary call for 64 bit data path interface transiotion
  */
 
 kern_return_t
 mach_vm_region_info_64(
-	vm_map_t		map,
-	vm_offset_t		address,
-	vm_info_region_64_t	*regionp,
-	vm_info_object_array_t	*objectsp,
-	mach_msg_type_number_t	*objectsCntp)
+	__DEBUG_ONLY vm_map_t			map,
+	__DEBUG_ONLY vm_offset_t		address,
+	__DEBUG_ONLY vm_info_region_64_t	*regionp,
+	__DEBUG_ONLY vm_info_object_array_t	*objectsp,
+	__DEBUG_ONLY mach_msg_type_number_t	*objectsCntp)
 {
 #if !MACH_VM_DEBUG
         return KERN_FAILURE;
@@ -395,8 +408,6 @@ mach_vm_region_info_64(
 					cobject->ref_count;
 				vio->vio_resident_page_count =
 					cobject->resident_page_count;
-				vio->vio_absent_count =
-					cobject->absent_count;
 				vio->vio_copy =
 					(vm_offset_t) cobject->copy;
 				vio->vio_shadow =
@@ -425,10 +436,11 @@ mach_vm_region_info_64(
 					cobject->temporary;
 				vio->vio_alive =
 					cobject->alive;
-				vio->vio_lock_in_progress =
-					cobject->lock_in_progress;
-				vio->vio_lock_restart =
-					cobject->lock_restart;
+				vio->vio_purgable =
+					(cobject->purgable != VM_PURGABLE_DENY);
+				vio->vio_purgable_volatile =
+					(cobject->purgable == VM_PURGABLE_VOLATILE ||
+					 cobject->purgable == VM_PURGABLE_EMPTY);
 			}
 
 			used++;
@@ -453,12 +465,13 @@ mach_vm_region_info_64(
 			kmem_free(ipc_kernel_map, addr, size);
 		size = round_page_32(2 * used * sizeof(vm_info_object_t));
 
-		kr = vm_allocate(ipc_kernel_map, &addr, size, TRUE);
+		kr = vm_allocate(ipc_kernel_map, &addr, size, VM_FLAGS_ANYWHERE);
 		if (kr != KERN_SUCCESS)
 			return KERN_RESOURCE_SHORTAGE;
 
-		kr = vm_map_wire(ipc_kernel_map, addr, addr + size,
-				     VM_PROT_READ|VM_PROT_WRITE, FALSE);
+		kr = vm_map_wire(ipc_kernel_map, vm_map_trunc_page(addr),
+				 vm_map_round_page(addr + size),
+				 VM_PROT_READ|VM_PROT_WRITE, FALSE);
 		assert(kr == KERN_SUCCESS);
 	}
 
@@ -473,11 +486,12 @@ mach_vm_region_info_64(
 		vm_size_t size_used =
 			round_page_32(used * sizeof(vm_info_object_t));
 
-		kr = vm_map_unwire(ipc_kernel_map, addr, addr + size_used, FALSE);
+		kr = vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(addr),
+				   vm_map_round_page(addr + size_used), FALSE);
 		assert(kr == KERN_SUCCESS);
 
-		kr = vm_map_copyin(ipc_kernel_map, addr, size_used,
-				   TRUE, &copy);
+		kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)addr,
+				   (vm_map_size_t)size_used, TRUE, &copy);
 		assert(kr == KERN_SUCCESS);
 
 		if (size != size_used)
@@ -496,9 +510,9 @@ mach_vm_region_info_64(
  */
 kern_return_t
 vm_mapped_pages_info(
-	vm_map_t		map,
-	page_address_array_t	*pages,
-	mach_msg_type_number_t  *pages_count)
+	__DEBUG_ONLY vm_map_t			map,
+	__DEBUG_ONLY page_address_array_t	*pages,
+	__DEBUG_ONLY mach_msg_type_number_t	*pages_count)
 {
 #if !MACH_VM_DEBUG
         return KERN_FAILURE;
@@ -517,8 +531,9 @@ vm_mapped_pages_info(
 	size = round_page_32(size);
 
 	for (;;) {
-	    (void) vm_allocate(ipc_kernel_map, &addr, size, TRUE);
-	    (void) vm_map_unwire(ipc_kernel_map, addr, addr + size, FALSE);
+	    (void) vm_allocate(ipc_kernel_map, &addr, size, VM_FLAGS_ANYWHERE);
+	    (void) vm_map_unwire(ipc_kernel_map, vm_map_trunc_page(addr),
+				 vm_map_round_page(addr + size), FALSE);
 
 	    list = (page_address_array_t) addr;
 	    space = size / sizeof(vm_offset_t);
@@ -547,13 +562,12 @@ vm_mapped_pages_info(
 	else {
 	    *pages_count = actual;
 	    size_used = round_page_32(actual * sizeof(vm_offset_t));
-	    (void) vm_map_wire(ipc_kernel_map,
-				addr, addr + size, 
+	    (void) vm_map_wire(ipc_kernel_map, vm_map_trunc_page(addr),
+				vm_map_round_page(addr + size), 
 				VM_PROT_READ|VM_PROT_WRITE, FALSE);
-	    (void) vm_map_copyin(
-				ipc_kernel_map,
-				addr,
-				size_used,
+	    (void) vm_map_copyin(ipc_kernel_map,
+				(vm_map_address_t)addr,
+				(vm_map_size_t)size_used,
 				TRUE,
 				(vm_map_copy_t *)pages);
 	    if (size_used != size) {
@@ -581,15 +595,15 @@ vm_mapped_pages_info(
 
 kern_return_t
 host_virtual_physical_table_info(
-	host_t				host,
-	hash_info_bucket_array_t	*infop,
-	mach_msg_type_number_t 		*countp)
+	__DEBUG_ONLY host_t			host,
+	__DEBUG_ONLY hash_info_bucket_array_t	*infop,
+	__DEBUG_ONLY mach_msg_type_number_t 	*countp)
 {
 #if !MACH_VM_DEBUG
         return KERN_FAILURE;
 #else
 	vm_offset_t addr;
-	vm_size_t size;
+	vm_size_t size = 0;
 	hash_info_bucket_t *info;
 	unsigned int potential, actual;
 	kern_return_t kr;
@@ -638,8 +652,8 @@ host_virtual_physical_table_info(
 		if (used != size)
 			kmem_free(ipc_kernel_map, addr + used, size - used);
 
-		kr = vm_map_copyin(ipc_kernel_map, addr, used,
-				   TRUE, &copy);
+		kr = vm_map_copyin(ipc_kernel_map, (vm_map_address_t)addr,
+				   (vm_map_size_t)used, TRUE, &copy);
 		assert(kr == KERN_SUCCESS);
 
 		*infop = (hash_info_bucket_t *) copy;