X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..0b4c1975fb5e4eccf1012a35081f7e7799b81046:/osfmk/vm/vm_external.c

diff --git a/osfmk/vm/vm_external.c b/osfmk/vm/vm_external.c
index f54dc1bb4..db0c32d09 100644
--- a/osfmk/vm/vm_external.c
+++ b/osfmk/vm/vm_external.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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 
- * 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 
+ * 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@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -108,12 +106,12 @@
 #define	SMALL_SIZE	KALLOC_MINSIZE
 #define	LARGE_SIZE	PAGE_SIZE
 
-static vm_size_t power_of_2(vm_size_t size);
+static vm_object_size_t power_of_2(vm_object_size_t size);
 
-static vm_size_t
-power_of_2(vm_size_t size)
+static vm_object_size_t
+power_of_2(vm_object_size_t size)
 {
-	vm_size_t power;
+	vm_object_size_t power;
 
 	power = 2 * SMALL_SIZE;
 	while (power < size) {
@@ -124,21 +122,25 @@ power_of_2(vm_size_t size)
 
 vm_external_map_t
 vm_external_create(
-	vm_offset_t	size)
+	vm_object_offset_t	size)
 {
-	vm_size_t		bytes;
+	vm_object_size_t	bytes;
 	vm_external_map_t	result = VM_EXTERNAL_NULL;
 
 	bytes = stob(size);
 	if (bytes <= SMALL_SIZE) {
-		if ((result = (vm_external_map_t)kalloc(SMALL_SIZE)) != NULL) {
+		result = (vm_external_map_t)kalloc(SMALL_SIZE);
+		if (result != NULL) {
 			memset(result, 0, SMALL_SIZE);
 		}
 	} else if (bytes <= LARGE_SIZE) {
 		bytes = power_of_2(bytes);
 
-		if ((result = (vm_external_map_t)kalloc(bytes)) != NULL) {
-			memset(result, 0, bytes);
+		assert((vm_size_t) bytes == bytes);
+		result = (vm_external_map_t)kalloc((vm_size_t)bytes);
+		if (result != NULL) {
+			assert((size_t) bytes == bytes);
+			memset(result, 0, (size_t) bytes);
 		}
 	}
 	return(result);
@@ -147,9 +149,9 @@ vm_external_create(
 void
 vm_external_destroy(
 	vm_external_map_t	map,
-	vm_size_t		size)
+	vm_object_size_t	size)
 {
-	vm_size_t bytes;
+	vm_object_size_t bytes;
 
 	if (map == VM_EXTERNAL_NULL)
 		return;
@@ -160,7 +162,8 @@ vm_external_destroy(
 	} else {
 		bytes = power_of_2(bytes);
 	}
-	kfree(map, bytes);
+	assert((vm_size_t) bytes == bytes);
+	kfree(map, (vm_size_t) bytes);
 }
 
 /*
@@ -168,11 +171,11 @@ vm_external_destroy(
  * size of the object to be mapped, i.e. the size of the map that was
  * created by vm_external_create.
  */
-vm_size_t
+vm_object_size_t
 vm_external_map_size(
-	vm_offset_t	size)
+	vm_object_size_t	size)
 {
-	vm_size_t	bytes;
+	vm_object_size_t	bytes;
 
 	bytes = stob(size);
 	if (bytes != 0) {
@@ -188,9 +191,11 @@ vm_external_map_size(
 void
 vm_external_copy(
 	vm_external_map_t	old_map,
-	vm_size_t		old_size,
+	vm_object_size_t	old_size,
 	vm_external_map_t	new_map)
 {
+	vm_object_size_t	bytes;
+
 	/*
 	 * Cannot copy non-existent maps
 	 */
@@ -200,16 +205,18 @@ vm_external_copy(
 	/*
 	 * Copy old map to new
 	 */
-	memcpy(new_map, old_map, stob(old_size));
+	bytes = stob(old_size);
+	assert((size_t) bytes == bytes);
+	memcpy(new_map, old_map, (size_t) bytes);
 }
 
 boolean_t
 vm_external_within(
-	vm_size_t	new_size,
-	vm_size_t	old_size)
+	vm_object_size_t	new_size,
+	vm_object_size_t	old_size)
 {
-	vm_size_t 	new_bytes;
-	vm_size_t 	old_bytes;
+	vm_object_size_t 	new_bytes;
+	vm_object_size_t 	old_bytes;
 
 	assert(new_size >= old_size);
 
@@ -234,14 +241,13 @@ vm_external_within(
 vm_external_state_t
 _vm_external_state_get(
 	vm_external_map_t	map,
-	vm_offset_t		offset)
+	vm_object_offset_t	offset)
 {
-	unsigned
-	int		bit, byte;
+	uint64_t		bit, byte;
 
 	assert (map != VM_EXTERNAL_NULL);
 
-	bit = atop_32(offset);
+	bit = atop_64(offset);
 	byte = bit >> 3;
 	if (map[byte] & (1 << (bit & 07))) {
 		return VM_EXTERNAL_STATE_EXISTS;
@@ -253,15 +259,14 @@ _vm_external_state_get(
 void
 vm_external_state_set(
 	vm_external_map_t	map,
-	vm_offset_t		offset)
+	vm_object_offset_t	offset)
 {
-	unsigned
-	int		bit, byte;
+	uint64_t		bit, byte;
 
 	if (map == VM_EXTERNAL_NULL)
 		return;
 
-	bit = atop_32(offset);
+	bit = atop_64(offset);
 	byte = bit >> 3;
 	map[byte] |= (1 << (bit & 07));
 }
@@ -269,15 +274,14 @@ vm_external_state_set(
 void
 vm_external_state_clr(
 	vm_external_map_t	map,
-	vm_offset_t		offset)
+	vm_object_offset_t	offset)
 {
-	unsigned
-	int		bit, byte;
+	uint64_t		bit, byte;
 
 	if (map == VM_EXTERNAL_NULL)
 		return;
 
-	bit = atop_32(offset);
+	bit = atop_64(offset);
 	byte = bit >> 3;
 	map[byte] &= ~(1 << (bit & 07));
 }