]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/vm/vm_map.c
xnu-792.25.20.tar.gz
[apple/xnu.git] / osfmk / vm / vm_map.c
index 40e3da3fa35c077acdb9ceeea6c0ea88a9bc51fc..3f0d8bf3148339742d8e767740e1cafb40930c98 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *     Virtual memory mapping module.
  */
 
-#include <cpus.h>
 #include <task_swapper.h>
 #include <mach_assert.h>
+#include <libkern/OSAtomic.h>
 
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <mach/vm_attributes.h>
 #include <mach/vm_param.h>
 #include <mach/vm_behavior.h>
+#include <mach/vm_statistics.h>
+#include <mach/memory_object.h>
+#include <mach/mach_vm.h>
+#include <machine/cpu_capabilities.h>
+
 #include <kern/assert.h>
 #include <kern/counters.h>
+#include <kern/kalloc.h>
 #include <kern/zalloc.h>
+
+#include <vm/cpm.h>
 #include <vm/vm_init.h>
 #include <vm/vm_fault.h>
 #include <vm/vm_map.h>
 #include <ipc/ipc_port.h>
 #include <kern/sched_prim.h>
 #include <kern/misc_protos.h>
-#include <mach/vm_map_server.h>
-#include <mach/mach_host_server.h>
 #include <ddb/tr.h>
+#include <machine/db_machdep.h>
 #include <kern/xpr.h>
 
+#include <mach/vm_map_server.h>
+#include <mach/mach_host_server.h>
+#include <vm/vm_shared_memory_server.h>
+#include <vm/vm_protos.h>       // for vm_map_commpage64 and vm_map_remove_compage64
+
+#ifdef ppc
+#include <ppc/mappings.h>
+#endif /* ppc */
+
+#include <vm/vm_protos.h>
+
 /* Internal prototypes
  */
-extern boolean_t vm_map_range_check(
+static void vm_map_simplify_range(
+       vm_map_t        map,
+       vm_map_offset_t start,
+       vm_map_offset_t end);   /* forward */
+
+static boolean_t       vm_map_range_check(
                                vm_map_t        map,
-                               vm_offset_t     start,
-                               vm_offset_t     end,
+                               vm_map_offset_t start,
+                               vm_map_offset_t end,
                                vm_map_entry_t  *entry);
 
-extern vm_map_entry_t  _vm_map_entry_create(
+static vm_map_entry_t  _vm_map_entry_create(
                                struct vm_map_header    *map_header);
 
-extern void            _vm_map_entry_dispose(
+static void            _vm_map_entry_dispose(
                                struct vm_map_header    *map_header,
                                vm_map_entry_t          entry);
 
-extern void            vm_map_pmap_enter(
+static void            vm_map_pmap_enter(
                                vm_map_t                map,
-                               vm_offset_t             addr,
-                               vm_offset_t             end_addr,
+                               vm_map_offset_t         addr,
+                               vm_map_offset_t         end_addr,
                                vm_object_t             object,
                                vm_object_offset_t      offset,
                                vm_prot_t               protection);
 
-extern void            _vm_map_clip_end(
+static void            _vm_map_clip_end(
                                struct vm_map_header    *map_header,
                                vm_map_entry_t          entry,
-                               vm_offset_t             end);
+                               vm_map_offset_t         end);
 
-extern void            vm_map_entry_delete(
+static void            _vm_map_clip_start(
+                               struct vm_map_header    *map_header,
+                               vm_map_entry_t          entry,
+                               vm_map_offset_t         start);
+
+static void            vm_map_entry_delete(
                                vm_map_t        map,
                                vm_map_entry_t  entry);
 
-extern kern_return_t   vm_map_delete(
+static kern_return_t   vm_map_delete(
                                vm_map_t        map,
-                               vm_offset_t     start,
-                               vm_offset_t     end,
-                               int             flags);
-
-extern void            vm_map_copy_steal_pages(
-                               vm_map_copy_t   copy);
+                               vm_map_offset_t start,
+                               vm_map_offset_t end,
+                               int             flags,
+                               vm_map_t        zap_map);
 
-extern kern_return_t   vm_map_copy_overwrite_unaligned(
+static kern_return_t   vm_map_copy_overwrite_unaligned(
                                vm_map_t        dst_map,
                                vm_map_entry_t  entry,
                                vm_map_copy_t   copy,
-                               vm_offset_t     start);
+                               vm_map_address_t start);
 
-extern kern_return_t   vm_map_copy_overwrite_aligned(
+static kern_return_t   vm_map_copy_overwrite_aligned(
                                vm_map_t        dst_map,
                                vm_map_entry_t  tmp_entry,
                                vm_map_copy_t   copy,
-                               vm_offset_t     start,
+                               vm_map_offset_t start,
                                pmap_t          pmap);
 
-extern kern_return_t   vm_map_copyin_kernel_buffer(
+static kern_return_t   vm_map_copyin_kernel_buffer(
                                vm_map_t        src_map,
-                               vm_offset_t     src_addr,
-                               vm_size_t       len,
+                               vm_map_address_t src_addr,
+                               vm_map_size_t   len,
                                boolean_t       src_destroy,
                                vm_map_copy_t   *copy_result);  /* OUT */
 
-extern kern_return_t   vm_map_copyout_kernel_buffer(
+static kern_return_t   vm_map_copyout_kernel_buffer(
                                vm_map_t        map,
-                               vm_offset_t     *addr,  /* IN/OUT */
+                               vm_map_address_t *addr, /* IN/OUT */
                                vm_map_copy_t   copy,
                                boolean_t       overwrite);
 
-extern void            vm_map_fork_share(
+static void            vm_map_fork_share(
                                vm_map_t        old_map,
                                vm_map_entry_t  old_entry,
                                vm_map_t        new_map);
 
-extern boolean_t       vm_map_fork_copy(
+static boolean_t       vm_map_fork_copy(
                                vm_map_t        old_map,
                                vm_map_entry_t  *old_entry_p,
                                vm_map_t        new_map);
 
-extern kern_return_t   vm_remap_range_allocate(
-                               vm_map_t        map,
-                               vm_offset_t     *address,       /* IN/OUT */
-                               vm_size_t       size,
-                               vm_offset_t     mask,
-                               boolean_t       anywhere,
-                               vm_map_entry_t  *map_entry);    /* OUT */
-
-extern void            _vm_map_clip_start(
-                               struct vm_map_header    *map_header,
-                               vm_map_entry_t          entry,
-                               vm_offset_t             start);
-
-void                   vm_region_top_walk(
+void           vm_map_region_top_walk(
                                vm_map_entry_t             entry,
                                vm_region_top_info_t       top);
 
-void                   vm_region_walk(
+void           vm_map_region_walk(
+                               vm_map_t                   map,
+                               vm_map_offset_t            va,
                                vm_map_entry_t             entry,
-                               vm_region_extended_info_t  extended,
                                vm_object_offset_t         offset,
-                               vm_offset_t                range,
+                               vm_object_size_t           range,
+                               vm_region_extended_info_t  extended);
+
+static kern_return_t   vm_map_wire_nested(
+                               vm_map_t                   map,
+                               vm_map_offset_t            start,
+                               vm_map_offset_t            end,
+                               vm_prot_t                  access_type,
+                               boolean_t                  user_wire,
+                               pmap_t                     map_pmap, 
+                               vm_map_offset_t            pmap_addr);
+
+static kern_return_t   vm_map_unwire_nested(
                                vm_map_t                   map,
-                               vm_offset_t                va);
+                               vm_map_offset_t            start,
+                               vm_map_offset_t            end,
+                               boolean_t                  user_wire,
+                               pmap_t                     map_pmap,
+                               vm_map_offset_t            pmap_addr);
+
+static kern_return_t   vm_map_overwrite_submap_recurse(
+                               vm_map_t                   dst_map,
+                               vm_map_offset_t            dst_addr,
+                               vm_map_size_t              dst_size);
+
+static kern_return_t   vm_map_copy_overwrite_nested(
+                               vm_map_t                   dst_map,
+                               vm_map_offset_t            dst_addr,
+                               vm_map_copy_t              copy,
+                               boolean_t                  interruptible,
+                               pmap_t                     pmap);
+
+static kern_return_t   vm_map_remap_extract(
+                               vm_map_t                map,
+                               vm_map_offset_t         addr,
+                               vm_map_size_t           size,
+                               boolean_t               copy,
+                               struct vm_map_header    *map_header,
+                               vm_prot_t               *cur_protection,
+                               vm_prot_t               *max_protection,
+                               vm_inherit_t            inheritance,
+                               boolean_t               pageable);
+
+static kern_return_t   vm_map_remap_range_allocate(
+                               vm_map_t                map,
+                               vm_map_address_t        *address,
+                               vm_map_size_t           size,
+                               vm_map_offset_t         mask,
+                               boolean_t               anywhere,
+                               vm_map_entry_t          *map_entry);
+
+static void            vm_map_region_look_for_page(
+                               vm_map_t                   map,
+                               vm_map_offset_t            va,
+                               vm_object_t                object,
+                               vm_object_offset_t         offset,
+                               int                        max_refcnt,
+                               int                        depth,
+                               vm_region_extended_info_t  extended);
+
+static int             vm_map_region_count_obj_refs(
+                               vm_map_entry_t             entry,
+                               vm_object_t                object);
 
 /*
  * Macros to copy a vm_map_entry. We must be careful to correctly
@@ -249,10 +324,10 @@ MACRO_END
  *     vm_object_copy_strategically() in vm_object.c.
  */
 
-zone_t         vm_map_zone;            /* zone for vm_map structures */
-zone_t         vm_map_entry_zone;      /* zone for vm_map_entry structures */
-zone_t         vm_map_kentry_zone;     /* zone for kernel entry structures */
-zone_t         vm_map_copy_zone;       /* zone for vm_map_copy structures */
+static zone_t  vm_map_zone;            /* zone for vm_map structures */
+static zone_t  vm_map_entry_zone;      /* zone for vm_map_entry structures */
+static zone_t  vm_map_kentry_zone;     /* zone for kernel entry structures */
+static zone_t  vm_map_copy_zone;       /* zone for vm_map_copy structures */
 
 
 /*
@@ -285,11 +360,11 @@ vm_object_t       vm_submap_object;
  *     of a new entry.
  */
 
-vm_offset_t    map_data;
-vm_size_t      map_data_size;
-vm_offset_t    kentry_data;
-vm_size_t      kentry_data_size;
-int            kentry_count = 2048;            /* to init kentry_data_size */
+static void            *map_data;
+static vm_map_size_t   map_data_size;
+static void            *kentry_data;
+static vm_map_size_t   kentry_data_size;
+static int             kentry_count = 2048;            /* to init kentry_data_size */
 
 #define         NO_COALESCE_LIMIT  (1024 * 128)
 
@@ -297,24 +372,112 @@ int              kentry_count = 2048;            /* to init kentry_data_size */
  *     Threshold for aggressive (eager) page map entering for vm copyout
  *     operations.  Any copyout larger will NOT be aggressively entered.
  */
-vm_size_t vm_map_aggressive_enter_max;         /* set by bootstrap */
+static vm_map_size_t vm_map_aggressive_enter_max;              /* set by bootstrap */
+
+/* Skip acquiring locks if we're in the midst of a kernel core dump */
+extern unsigned int not_in_kdp;
+
+#ifdef __i386__
+kern_return_t
+vm_map_apple_protected(
+       vm_map_t        map,
+       vm_map_offset_t start,
+       vm_map_offset_t end)
+{
+       boolean_t       map_locked;
+       kern_return_t   kr;
+       vm_map_entry_t  map_entry;
+       memory_object_t protected_mem_obj;
+       vm_object_t     protected_object;
+       vm_map_offset_t map_addr;
+
+       vm_map_lock_read(map);
+       map_locked = TRUE;
+
+       /* lookup the protected VM object */
+       if (!vm_map_lookup_entry(map,
+                                start,
+                                &map_entry) ||
+           map_entry->vme_end != end ||
+           map_entry->is_sub_map) {
+               /* that memory is not properly mapped */
+               kr = KERN_INVALID_ARGUMENT;
+               goto done;
+       }
+       protected_object = map_entry->object.vm_object;
+       if (protected_object == VM_OBJECT_NULL) {
+               /* there should be a VM object here at this point */
+               kr = KERN_INVALID_ARGUMENT;
+               goto done;
+       }
+
+       /*
+        * Lookup (and create if necessary) the protected memory object
+        * matching that VM object.
+        * If successful, this also grabs a reference on the memory object,
+        * to guarantee that it doesn't go away before we get a chance to map
+        * it.
+        */
+        
+       protected_mem_obj = apple_protect_pager_setup(protected_object);
+       if (protected_mem_obj == NULL) {
+               kr = KERN_FAILURE;
+               goto done;
+       }
+
+       vm_map_unlock_read(map);
+       map_locked = FALSE;
+
+       /* map this memory object in place of the current one */
+       map_addr = start;
+       kr = mach_vm_map(map,
+                        &map_addr,
+                        end - start,
+                        (mach_vm_offset_t) 0,
+                        VM_FLAGS_FIXED | VM_FLAGS_OVERWRITE,
+                        (ipc_port_t) protected_mem_obj,
+                        map_entry->offset + (start - map_entry->vme_start),
+                        TRUE,
+                        map_entry->protection,
+                        map_entry->max_protection,
+                        map_entry->inheritance);
+       assert(map_addr == start);
+       if (kr == KERN_SUCCESS) {
+               /* let the pager know that this mem_obj is mapped */
+               apple_protect_pager_map(protected_mem_obj);
+       }
+       /*
+        * Release the reference obtained by apple_protect_pager_setup().
+        * The mapping (if it succeeded) is now holding a reference on the
+        * memory object.
+        */
+       memory_object_deallocate(protected_mem_obj);
+
+done:
+       if (map_locked) {
+               vm_map_unlock_read(map);
+       }
+       return kr;
+}
+#endif /* __i386__ */
+
 
 void
 vm_map_init(
        void)
 {
-       vm_map_zone = zinit((vm_size_t) sizeof(struct vm_map), 40*1024,
+       vm_map_zone = zinit((vm_map_size_t) sizeof(struct vm_map), 40*1024,
                                        PAGE_SIZE, "maps");
 
-       vm_map_entry_zone = zinit((vm_size_t) sizeof(struct vm_map_entry),
+       vm_map_entry_zone = zinit((vm_map_size_t) sizeof(struct vm_map_entry),
                                        1024*1024, PAGE_SIZE*5,
                                        "non-kernel map entries");
 
-       vm_map_kentry_zone = zinit((vm_size_t) sizeof(struct vm_map_entry),
+       vm_map_kentry_zone = zinit((vm_map_size_t) sizeof(struct vm_map_entry),
                                        kentry_data_size, kentry_data_size,
                                        "kernel map entries");
 
-       vm_map_copy_zone = zinit((vm_size_t) sizeof(struct vm_map_copy),
+       vm_map_copy_zone = zinit((vm_map_size_t) sizeof(struct vm_map_copy),
                                        16*1024, PAGE_SIZE, "map copies");
 
        /*
@@ -332,7 +495,7 @@ void
 vm_map_steal_memory(
        void)
 {
-       map_data_size = round_page(10 * sizeof(struct vm_map));
+       map_data_size = vm_map_round_page(10 * sizeof(struct vm_map));
        map_data = pmap_steal_memory(map_data_size);
 
 #if 0
@@ -348,7 +511,7 @@ vm_map_steal_memory(
 
 
        kentry_data_size =
-               round_page(kentry_count * sizeof(struct vm_map_entry));
+               vm_map_round_page(kentry_count * sizeof(struct vm_map_entry));
        kentry_data = pmap_steal_memory(kentry_data_size);
 }
 
@@ -361,10 +524,10 @@ vm_map_steal_memory(
  */
 vm_map_t
 vm_map_create(
-       pmap_t          pmap,
-       vm_offset_t     min,
-       vm_offset_t     max,
-       boolean_t       pageable)
+       pmap_t                  pmap,
+       vm_map_offset_t min,
+       vm_map_offset_t max,
+       boolean_t               pageable)
 {
        register vm_map_t       result;
 
@@ -388,11 +551,12 @@ vm_map_create(
        result->max_offset = max;
        result->wiring_required = FALSE;
        result->no_zero_fill = FALSE;
+       result->mapped = FALSE;
        result->wait_for_space = FALSE;
        result->first_free = vm_map_to_entry(result);
        result->hint = vm_map_to_entry(result);
        vm_map_lock_init(result);
-       mutex_init(&result->s_lock, ETAP_VM_RESULT);
+       mutex_init(&result->s_lock, 0);
 
        return(result);
 }
@@ -409,7 +573,7 @@ vm_map_create(
 #define        vm_map_copy_entry_create(copy) \
            _vm_map_entry_create(&(copy)->cpy_hdr)
 
-vm_map_entry_t
+static vm_map_entry_t
 _vm_map_entry_create(
        register struct vm_map_header   *map_header)
 {
@@ -445,7 +609,7 @@ MACRO_END
 #define        vm_map_copy_entry_dispose(map, entry) \
        _vm_map_entry_dispose(&(copy)->cpy_hdr, (entry))
 
-void
+static void
 _vm_map_entry_dispose(
        register struct vm_map_header   *map_header,
        register vm_map_entry_t         entry)
@@ -457,12 +621,13 @@ _vm_map_entry_dispose(
        else
            zone = vm_map_kentry_zone;
 
-       zfree(zone, (vm_offset_t) entry);
+       zfree(zone, entry);
 }
 
-boolean_t first_free_is_valid(vm_map_t map);   /* forward */
-boolean_t first_free_check = FALSE;
-boolean_t
+#if MACH_ASSERT
+static boolean_t first_free_is_valid(vm_map_t map);    /* forward */
+static boolean_t first_free_check = FALSE;
+static boolean_t
 first_free_is_valid(
        vm_map_t        map)
 {
@@ -473,8 +638,8 @@ first_free_is_valid(
                
        entry = vm_map_to_entry(map);
        next = entry->vme_next;
-       while (trunc_page(next->vme_start) == trunc_page(entry->vme_end) ||
-              (trunc_page(next->vme_start) == trunc_page(entry->vme_start) &&
+       while (vm_map_trunc_page(next->vme_start) == vm_map_trunc_page(entry->vme_end) ||
+              (vm_map_trunc_page(next->vme_start) == vm_map_trunc_page(entry->vme_start) &&
                next != vm_map_to_entry(map))) {
                entry = next;
                next = entry->vme_next;
@@ -488,6 +653,7 @@ first_free_is_valid(
        }
        return TRUE;
 }
+#endif /* MACH_ASSERT */
 
 /*
  *     UPDATE_FIRST_FREE:
@@ -504,10 +670,10 @@ MACRO_BEGIN                                                               \
        UFF_map = (map);                                                \
        UFF_first_free = (new_first_free);                              \
        UFF_next_entry = UFF_first_free->vme_next;                      \
-       while (trunc_page(UFF_next_entry->vme_start) ==                 \
-              trunc_page(UFF_first_free->vme_end) ||                   \
-              (trunc_page(UFF_next_entry->vme_start) ==                \
-               trunc_page(UFF_first_free->vme_start) &&                \
+       while (vm_map_trunc_page(UFF_next_entry->vme_start) ==          \
+              vm_map_trunc_page(UFF_first_free->vme_end) ||                    \
+              (vm_map_trunc_page(UFF_next_entry->vme_start) ==                 \
+               vm_map_trunc_page(UFF_first_free->vme_start) &&         \
                UFF_next_entry != vm_map_to_entry(UFF_map))) {          \
                UFF_first_free = UFF_next_entry;                        \
                UFF_next_entry = UFF_first_free->vme_next;              \
@@ -570,53 +736,7 @@ MACRO_END
        (entry)->vme_prev->vme_next = (entry)->vme_next;                \
        MACRO_END
 
-/*
- *     kernel_vm_map_reference:
- *
- *     kernel internal export version for iokit and bsd components
- *     in lieu of component interface semantics.
- *
- */
-void
-kernel_vm_map_reference(
-       register vm_map_t       map)
-{
-       if (map == VM_MAP_NULL)
-               return;
-
-       mutex_lock(&map->s_lock);
-#if    TASK_SWAPPER
-       assert(map->res_count > 0);
-       assert(map->ref_count >= map->res_count);
-       map->res_count++;
-#endif
-       map->ref_count++;
-       mutex_unlock(&map->s_lock);
-}
-
 #if    MACH_ASSERT && TASK_SWAPPER
-/*
- *     vm_map_reference:
- *
- *     Adds valid reference and residence counts to the given map.
- *     The map must be in memory (i.e. non-zero residence count).
- *
- */
-void
-vm_map_reference(
-       register vm_map_t       map)
-{
-       if (map == VM_MAP_NULL)
-               return;
-
-       mutex_lock(&map->s_lock);
-       assert(map->res_count > 0);
-       assert(map->ref_count >= map->res_count);
-       map->ref_count++;
-       map->res_count++;
-       mutex_unlock(&map->s_lock);
-}
-
 /*
  *     vm_map_res_reference:
  *
@@ -685,44 +805,6 @@ void vm_map_res_deallocate(register vm_map_t map)
 }
 #endif /* MACH_ASSERT && TASK_SWAPPER */
 
-/*
- *     vm_map_deallocate:
- *
- *     Removes a reference from the specified map,
- *     destroying it if no references remain.
- *     The map should not be locked.
- */
-void
-vm_map_deallocate(
-       register vm_map_t       map)
-{
-       unsigned int            ref;
-
-       if (map == VM_MAP_NULL)
-               return;
-
-       mutex_lock(&map->s_lock);
-       ref = --map->ref_count;
-       if (ref > 0) {
-               vm_map_res_deallocate(map);
-               mutex_unlock(&map->s_lock);
-               return;
-       }
-       assert(map->ref_count == 0);
-       mutex_unlock(&map->s_lock);
-
-#if    TASK_SWAPPER
-       /*
-        * The map residence count isn't decremented here because
-        * the vm_map_delete below will traverse the entire map, 
-        * deleting entries, and the residence counts on objects
-        * and sharing maps will go away then.
-        */
-#endif
-
-       vm_map_destroy(map);
-}
-
 /*
  *     vm_map_destroy:
  *
@@ -731,15 +813,25 @@ vm_map_deallocate(
 void
 vm_map_destroy(
        register vm_map_t       map)
-{
+{      
        vm_map_lock(map);
        (void) vm_map_delete(map, map->min_offset,
-                            map->max_offset, VM_MAP_NO_FLAGS);
+                            map->max_offset, VM_MAP_NO_FLAGS,
+                            VM_MAP_NULL);
        vm_map_unlock(map);
+       
+       if (map->hdr.nentries!=0)
+               vm_map_remove_commpage(map);
+       
+//     assert(map->hdr.nentries==0);
+//     if(map->hdr.nentries) {                         /* (BRINGUP) */
+//             panic("vm_map_destroy: hdr.nentries is not 0 (%d) in map %08X\n", map->hdr.nentries, map);
+//     }
 
-       pmap_destroy(map->pmap);
+       if(map->pmap)
+               pmap_destroy(map->pmap);
 
-       zfree(vm_map_zone, (vm_offset_t) map);
+       zfree(vm_map_zone, map);
 }
 
 #if    TASK_SWAPPER
@@ -927,15 +1019,33 @@ void vm_map_swapout(vm_map_t map)
 
 
 /*
- *     SAVE_HINT:
+ *     SAVE_HINT_MAP_READ:
+ *
+ *     Saves the specified entry as the hint for
+ *     future lookups.  only a read lock is held on map,
+ *     so make sure the store is atomic... OSCompareAndSwap
+ *     guarantees this... also, we don't care if we collide
+ *     and someone else wins and stores their 'hint'
+ */
+#define        SAVE_HINT_MAP_READ(map,value) \
+MACRO_BEGIN \
+                OSCompareAndSwap((UInt32)((map)->hint), (UInt32)value, (UInt32 *)(&(map)->hint)); \
+MACRO_END
+
+
+/*
+ *     SAVE_HINT_MAP_WRITE:
  *
  *     Saves the specified entry as the hint for
- *     future lookups.  Performs necessary interlocks.
+ *     future lookups.  write lock held on map,
+ *     so no one else can be writing or looking
+ *     until the lock is dropped, so it's safe
+ *     to just do an assignment
  */
-#define        SAVE_HINT(map,value) \
-               mutex_lock(&(map)->s_lock); \
+#define        SAVE_HINT_MAP_WRITE(map,value) \
+MACRO_BEGIN \
                (map)->hint = (value); \
-               mutex_unlock(&(map)->s_lock);
+MACRO_END
 
 /*
  *     vm_map_lookup_entry:    [ internal use only ]
@@ -949,8 +1059,8 @@ void vm_map_swapout(vm_map_t map)
  */
 boolean_t
 vm_map_lookup_entry(
-       register vm_map_t       map,
-       register vm_offset_t    address,
+       register vm_map_t               map,
+       register vm_map_offset_t        address,
        vm_map_entry_t          *entry)         /* OUT */
 {
        register vm_map_entry_t         cur;
@@ -960,10 +1070,7 @@ vm_map_lookup_entry(
         *      Start looking either from the head of the
         *      list, or from the hint.
         */
-
-       mutex_lock(&map->s_lock);
        cur = map->hint;
-       mutex_unlock(&map->s_lock);
 
        if (cur == vm_map_to_entry(map))
                cur = cur->vme_next;
@@ -1007,7 +1114,8 @@ vm_map_lookup_entry(
                                 */
 
                                *entry = cur;
-                               SAVE_HINT(map, cur);
+                               SAVE_HINT_MAP_READ(map, cur);
+
                                return(TRUE);
                        }
                        break;
@@ -1015,7 +1123,8 @@ vm_map_lookup_entry(
                cur = cur->vme_next;
        }
        *entry = cur->vme_prev;
-       SAVE_HINT(map, *entry);
+       SAVE_HINT_MAP_READ(map, *entry);
+
        return(FALSE);
 }
 
@@ -1035,14 +1144,20 @@ vm_map_lookup_entry(
 kern_return_t
 vm_map_find_space(
        register vm_map_t       map,
-       vm_offset_t             *address,       /* OUT */
-       vm_size_t               size,
-       vm_offset_t             mask,
+       vm_map_offset_t         *address,       /* OUT */
+       vm_map_size_t           size,
+       vm_map_offset_t         mask,
+       int                     flags,
        vm_map_entry_t          *o_entry)       /* OUT */
 {
        register vm_map_entry_t entry, new_entry;
-       register vm_offset_t    start;
-       register vm_offset_t    end;
+       register vm_map_offset_t        start;
+       register vm_map_offset_t        end;
+
+       if (size == 0) {
+               *address = 0;
+               return KERN_INVALID_ARGUMENT;
+       }
 
        new_entry = vm_map_entry_create(map);
 
@@ -1147,6 +1262,8 @@ vm_map_find_space(
        new_entry->in_transition = FALSE;
        new_entry->needs_wakeup = FALSE;
 
+       VM_GET_FLAGS_ALIAS(flags, new_entry->alias);
+
        /*
         *      Insert the new entry into the list
         */
@@ -1158,7 +1275,7 @@ vm_map_find_space(
        /*
         *      Update the lookup hint
         */
-       SAVE_HINT(map, new_entry);
+       SAVE_HINT_MAP_WRITE(map, new_entry);
 
        *o_entry = new_entry;
        return(KERN_SUCCESS);
@@ -1168,7 +1285,7 @@ int vm_map_pmap_enter_print = FALSE;
 int vm_map_pmap_enter_enable = FALSE;
 
 /*
- *     Routine:        vm_map_pmap_enter
+ *     Routine:        vm_map_pmap_enter [internal only]
  *
  *     Description:
  *             Force pages from the specified object to be entered into
@@ -1181,18 +1298,20 @@ int vm_map_pmap_enter_enable = FALSE;
  *     In/out conditions:
  *             The source map should not be locked on entry.
  */
-void
+static void
 vm_map_pmap_enter(
        vm_map_t                map,
-       register vm_offset_t    addr,
-       register vm_offset_t    end_addr,
+       register vm_map_offset_t        addr,
+       register vm_map_offset_t        end_addr,
        register vm_object_t    object,
        vm_object_offset_t      offset,
        vm_prot_t               protection)
 {
+       unsigned int            cache_attr;
+
+       if(map->pmap == 0)
+               return;
 
-       vm_machine_attribute_val_t mv_cache_sync = MATTR_VAL_CACHE_SYNC;
-       
        while (addr < end_addr) {
                register vm_page_t      m;
 
@@ -1200,7 +1319,12 @@ vm_map_pmap_enter(
                vm_object_paging_begin(object);
 
                m = vm_page_lookup(object, offset);
-               if (m == VM_PAGE_NULL || m->busy ||
+               /*
+                * ENCRYPTED SWAP:
+                * The user should never see encrypted data, so do not
+                * enter an encrypted page in the page table.
+                */
+               if (m == VM_PAGE_NULL || m->busy || m->encrypted ||
                    (m->unusual && ( m->error || m->restart || m->absent ||
                                    protection & m->page_lock))) {
 
@@ -1213,27 +1337,24 @@ vm_map_pmap_enter(
 
                if (vm_map_pmap_enter_print) {
                        printf("vm_map_pmap_enter:");
-                       printf("map: %x, addr: %x, object: %x, offset: %x\n",
-                               map, addr, object, offset);
+                       printf("map: %x, addr: %llx, object: %x, offset: %llx\n",
+                               map, (unsigned long long)addr, object, (unsigned long long)offset);
                }
-
                m->busy = TRUE;
+
+               if (m->no_isync == TRUE) {
+                       pmap_sync_page_data_phys(m->phys_page);
+                       m->no_isync = FALSE;
+               }
+
+               cache_attr = ((unsigned int)object->wimg_bits) & VM_WIMG_MASK;
                vm_object_unlock(object);
 
-               PMAP_ENTER(map->pmap, addr, m,
-                          protection, FALSE);
+               PMAP_ENTER(map->pmap, addr, m, 
+                               protection, cache_attr, FALSE);
 
-               if (m->no_isync) {
-                       pmap_attribute(map->pmap,
-                              addr,
-                              PAGE_SIZE,
-                              MATTR_CACHE,
-                              &mv_cache_sync);
-               }
                vm_object_lock(object);
 
-               m->no_isync = FALSE;
-
                PAGE_WAKEUP_DONE(m);
                vm_page_lock_queues();
                if (!m->active && !m->inactive)
@@ -1247,6 +1368,35 @@ vm_map_pmap_enter(
        }
 }
 
+boolean_t vm_map_pmap_is_empty(
+       vm_map_t        map,
+       vm_map_offset_t start,
+       vm_map_offset_t end);
+boolean_t vm_map_pmap_is_empty(
+       vm_map_t        map,
+       vm_map_offset_t start,
+       vm_map_offset_t end)
+{
+       vm_map_offset_t offset;
+       ppnum_t         phys_page;
+
+       if (map->pmap == NULL) {
+               return TRUE;
+       }
+       for (offset = start;
+            offset < end;
+            offset += PAGE_SIZE) {
+               phys_page = pmap_find_phys(map->pmap, offset);
+               if (phys_page) {
+                       kprintf("vm_map_pmap_is_empty(%p,0x%llx,0x%llx): "
+                               "page %d at 0x%llx\n",
+                               map, start, end, phys_page, offset);
+                       return FALSE;
+               }
+       }
+       return TRUE;
+}
+
 /*
  *     Routine:        vm_map_enter
  *
@@ -1257,12 +1407,15 @@ vm_map_pmap_enter(
  *
  *             Arguments are as defined in the vm_map call.
  */
+int _map_enter_debug = 0;
+static unsigned int vm_map_enter_restore_successes = 0;
+static unsigned int vm_map_enter_restore_failures = 0;
 kern_return_t
 vm_map_enter(
-       register vm_map_t       map,
-       vm_offset_t             *address,       /* IN/OUT */
-       vm_size_t               size,
-       vm_offset_t             mask,
+       vm_map_t                map,
+       vm_map_offset_t *address,       /* IN/OUT */
+       vm_map_size_t           size,
+       vm_map_offset_t mask,
        int                     flags,
        vm_object_t             object,
        vm_object_offset_t      offset,
@@ -1271,26 +1424,67 @@ vm_map_enter(
        vm_prot_t               max_protection,
        vm_inherit_t            inheritance)
 {
-       vm_map_entry_t          entry;
-       register vm_offset_t    start;
-       register vm_offset_t    end;
+       vm_map_entry_t          entry, new_entry;
+       vm_map_offset_t         start, tmp_start;
+       vm_map_offset_t         end, tmp_end;
        kern_return_t           result = KERN_SUCCESS;
-
-       boolean_t               anywhere = VM_FLAGS_ANYWHERE & flags;
+       vm_map_t                zap_old_map = VM_MAP_NULL;
+       vm_map_t                zap_new_map = VM_MAP_NULL;
+       boolean_t               map_locked = FALSE;
+       boolean_t               pmap_empty = TRUE;
+       boolean_t               new_mapping_established = FALSE;
+       boolean_t               anywhere = ((flags & VM_FLAGS_ANYWHERE) != 0);
+       boolean_t               purgable = ((flags & VM_FLAGS_PURGABLE) != 0);
+       boolean_t               overwrite = ((flags & VM_FLAGS_OVERWRITE) != 0);
        char                    alias;
 
-       VM_GET_FLAGS_ALIAS(flags, alias);
+       if (size == 0) {
+               *address = 0;
+               return KERN_INVALID_ARGUMENT;
+       }
 
+       VM_GET_FLAGS_ALIAS(flags, alias);
+       
 #define        RETURN(value)   { result = value; goto BailOut; }
 
        assert(page_aligned(*address));
        assert(page_aligned(size));
+
+       /*
+        * Only zero-fill objects are allowed to be purgable.
+        * LP64todo - limit purgable objects to 32-bits for now
+        */
+       if (purgable &&
+           (offset != 0 ||
+            (object != VM_OBJECT_NULL &&
+             (object->size != size ||
+              object->purgable == VM_OBJECT_NONPURGABLE))
+            || size > VM_MAX_ADDRESS)) /* LP64todo: remove when dp capable */
+               return KERN_INVALID_ARGUMENT;
+
+       if (!anywhere && overwrite) {
+               /*
+                * Create a temporary VM map to hold the old mappings in the
+                * affected area while we create the new one.
+                * This avoids releasing the VM map lock in
+                * vm_map_entry_delete() and allows atomicity
+                * when we want to replace some mappings with a new one.
+                * It also allows us to restore the old VM mappings if the
+                * new mapping fails.
+                */
+               zap_old_map = vm_map_create(PMAP_NULL,
+                                           *address,
+                                           *address + size,
+                                           TRUE);
+       }
+
  StartAgain: ;
 
        start = *address;
 
        if (anywhere) {
                vm_map_lock(map);
+               map_locked = TRUE;
 
                /*
                 *      Calculate the first possible address.
@@ -1346,7 +1540,8 @@ vm_map_enter(
                                                assert_wait((event_t)map,
                                                            THREAD_ABORTSAFE);
                                                vm_map_unlock(map);
-                                               thread_block((void (*)(void))0);
+                                               map_locked = FALSE;
+                                               thread_block(THREAD_CONTINUE_NULL);
                                                goto StartAgain;
                                        }
                                }
@@ -1387,6 +1582,7 @@ vm_map_enter(
                 */
 
                vm_map_lock(map);
+               map_locked = TRUE;
                if ((start & mask) != 0)
                        RETURN(KERN_NO_SPACE);
 
@@ -1402,6 +1598,17 @@ vm_map_enter(
                        RETURN(KERN_INVALID_ADDRESS);
                }
 
+               if (overwrite && zap_old_map != VM_MAP_NULL) {
+                       /*
+                        * Fixed mapping and "overwrite" flag: attempt to
+                        * remove all existing mappings in the specified
+                        * address range, saving them in our "zap_old_map".
+                        */
+                       (void) vm_map_delete(map, start, end,
+                                            VM_MAP_REMOVE_SAVE_ENTRIES,
+                                            zap_old_map);
+               }
+
                /*
                 *      ...     the starting address isn't allocated
                 */
@@ -1434,10 +1641,20 @@ vm_map_enter(
        /*
         *      See whether we can avoid creating a new entry (and object) by
         *      extending one of our neighbors.  [So far, we only attempt to
-        *      extend from below.]
+        *      extend from below.]  Note that we can never extend/join
+        *      purgable objects because they need to remain distinct
+        *      entities in order to implement their "volatile object"
+        *      semantics.
         */
 
-       if ((object == VM_OBJECT_NULL) &&
+       if (purgable) {
+               if (object == VM_OBJECT_NULL) {
+                       object = vm_object_allocate(size);
+                       object->copy_strategy = MEMORY_OBJECT_COPY_NONE;
+                       object->purgable = VM_OBJECT_PURGABLE_NONVOLATILE;
+                       offset = (vm_object_offset_t)0;
+               }
+       } else if ((object == VM_OBJECT_NULL) &&
            (entry != vm_map_to_entry(map)) &&
            (entry->vme_end == start) &&
            (!entry->is_shared) &&
@@ -1448,14 +1665,14 @@ vm_map_enter(
            (entry->max_protection == max_protection) &&
            (entry->behavior == VM_BEHAVIOR_DEFAULT) &&
            (entry->in_transition == 0) &&
-           ((entry->vme_end - entry->vme_start) + size < NO_COALESCE_LIMIT) &&
+           ((alias == VM_MEMORY_REALLOC) || ((entry->vme_end - entry->vme_start) + size < NO_COALESCE_LIMIT)) &&
            (entry->wired_count == 0)) { /* implies user_wired_count == 0 */
                if (vm_object_coalesce(entry->object.vm_object,
                                VM_OBJECT_NULL,
                                entry->offset,
                                (vm_object_offset_t) 0,
-                               (vm_size_t)(entry->vme_end - entry->vme_start),
-                               (vm_size_t)(end - entry->vme_end))) {
+                               (vm_map_size_t)(entry->vme_end - entry->vme_start),
+                               (vm_map_size_t)(end - entry->vme_end))) {
 
                        /*
                         *      Coalesced the two objects - can extend
@@ -1471,25 +1688,51 @@ vm_map_enter(
 
        /*
         *      Create a new entry
+        *      LP64todo - for now, we can only allocate 4GB internal objects
+        *      because the default pager can't page bigger ones.  Remove this
+        *      when it can.
+        *
+        * XXX FBDP
+        * The reserved "page zero" in each process's address space can
+        * be arbitrarily large.  Splitting it into separate 4GB objects and
+        * therefore different VM map entries serves no purpose and just
+        * slows down operations on the VM map, so let's not split the
+        * allocation into 4GB chunks if the max protection is NONE.  That
+        * memory should never be accessible, so it will never get to the
+        * default pager.
         */
-
-       { /**/
-       register vm_map_entry_t new_entry;
-
-       new_entry = vm_map_entry_insert(map, entry, start, end, object,
-                                       offset, needs_copy, FALSE, FALSE,
+       tmp_start = start;
+       if (object == VM_OBJECT_NULL &&
+           size > (vm_map_size_t)VM_MAX_ADDRESS &&
+           max_protection != VM_PROT_NONE) 
+               tmp_end = tmp_start + (vm_map_size_t)VM_MAX_ADDRESS;
+       else
+               tmp_end = end;
+       do {
+               new_entry = vm_map_entry_insert(map, entry, tmp_start, tmp_end,
+                                       object, offset, needs_copy, FALSE, FALSE,
                                        cur_protection, max_protection,
                                        VM_BEHAVIOR_DEFAULT, inheritance, 0);
-       new_entry->alias = alias;
+               new_entry->alias = alias;
+               entry = new_entry;
+       } while (tmp_end != end && 
+                (tmp_start = tmp_end) &&
+                (tmp_end = (end - tmp_end > (vm_map_size_t)VM_MAX_ADDRESS) ? 
+                 tmp_end + (vm_map_size_t)VM_MAX_ADDRESS : end));
+
        vm_map_unlock(map);
+       map_locked = FALSE;
+
+       new_mapping_established = TRUE;
 
        /*      Wire down the new entry if the user
         *      requested all new map entries be wired.
         */
        if (map->wiring_required) {
+               pmap_empty = FALSE; /* pmap won't be empty */
                result = vm_map_wire(map, start, end,
-                                   new_entry->protection, TRUE);
-               return(result);
+                                    new_entry->protection, TRUE);
+               RETURN(result);
        }
 
        if ((object != VM_OBJECT_NULL) &&
@@ -1497,57 +1740,385 @@ vm_map_enter(
            (!anywhere)  &&
            (!needs_copy) && 
            (size < (128*1024))) {
+               pmap_empty = FALSE; /* pmap won't be empty */
+
+#ifdef STACK_ONLY_NX
+               if (alias != VM_MEMORY_STACK && cur_protection)
+                       cur_protection |= VM_PROT_EXECUTE;
+#endif
                vm_map_pmap_enter(map, start, end, 
                                  object, offset, cur_protection);
        }
 
-       return(result);
-       } /**/
-
  BailOut: ;
-       vm_map_unlock(map);
-       return(result);
+       if (result == KERN_SUCCESS &&
+           pmap_empty &&
+           !(flags & VM_FLAGS_NO_PMAP_CHECK)) {
+               assert(vm_map_pmap_is_empty(map, *address, *address+size));
+       }
 
-#undef RETURN
-}
+       if (result != KERN_SUCCESS) {
+               if (new_mapping_established) {
+                       /*
+                        * We have to get rid of the new mappings since we
+                        * won't make them available to the user.
+                        * Try and do that atomically, to minimize the risk
+                        * that someone else create new mappings that range.
+                        */
+                       zap_new_map = vm_map_create(PMAP_NULL,
+                                                   *address,
+                                                   *address + size,
+                                                   TRUE);
+                       if (!map_locked) {
+                               vm_map_lock(map);
+                               map_locked = TRUE;
+                       }
+                       (void) vm_map_delete(map, *address, *address+size,
+                                            VM_MAP_REMOVE_SAVE_ENTRIES,
+                                            zap_new_map);
+               }
+               if (zap_old_map != VM_MAP_NULL &&
+                   zap_old_map->hdr.nentries != 0) {
+                       vm_map_entry_t  entry1, entry2;
 
-/*
- *     vm_map_clip_start:      [ internal use only ]
- *
- *     Asserts that the given entry begins at or after
- *     the specified address; if necessary,
- *     it splits the entry into two.
- */
-#ifndef i386
-#define vm_map_clip_start(map, entry, startaddr)                       \
-MACRO_BEGIN                                                            \
-       vm_map_t VMCS_map;                                              \
-       vm_map_entry_t VMCS_entry;                                      \
-       vm_offset_t VMCS_startaddr;                                     \
-       VMCS_map = (map);                                               \
-       VMCS_entry = (entry);                                           \
-       VMCS_startaddr = (startaddr);                                   \
-       if (VMCS_startaddr > VMCS_entry->vme_start) {                   \
-               if(entry->use_pmap) {                                   \
-                       vm_offset_t     pmap_base_addr;                 \
-                       vm_offset_t     pmap_end_addr;                  \
-                                                                       \
-                       pmap_base_addr = 0xF0000000 & entry->vme_start; \
-                       pmap_end_addr = (pmap_base_addr + 0x10000000) - 1; \
-                       pmap_unnest(map->pmap, pmap_base_addr,          \
-                               (pmap_end_addr - pmap_base_addr) + 1);  \
-                       entry->use_pmap = FALSE;                        \
-               }                                                       \
-               _vm_map_clip_start(&VMCS_map->hdr,VMCS_entry,VMCS_startaddr);\
-       }                                                               \
-       UPDATE_FIRST_FREE(VMCS_map, VMCS_map->first_free);              \
-MACRO_END
-#else
-#define vm_map_clip_start(map, entry, startaddr)                       \
-MACRO_BEGIN                                                            \
+                       /*
+                        * The new mapping failed.  Attempt to restore
+                        * the old mappings, saved in the "zap_old_map".
+                        */
+                       if (!map_locked) {
+                               vm_map_lock(map);
+                               map_locked = TRUE;
+                       }
+
+                       /* first check if the coast is still clear */
+                       start = vm_map_first_entry(zap_old_map)->vme_start;
+                       end = vm_map_last_entry(zap_old_map)->vme_end;
+                       if (vm_map_lookup_entry(map, start, &entry1) ||
+                           vm_map_lookup_entry(map, end, &entry2) ||
+                           entry1 != entry2) {
+                               /*
+                                * Part of that range has already been
+                                * re-mapped:  we can't restore the old
+                                * mappings...
+                                */
+                               vm_map_enter_restore_failures++;
+                       } else {
+                               /*
+                                * Transfer the saved map entries from
+                                * "zap_old_map" to the original "map",
+                                * inserting them all after "entry1".
+                                */
+                               for (entry2 = vm_map_first_entry(zap_old_map);
+                                    entry2 != vm_map_to_entry(zap_old_map);
+                                    entry2 = vm_map_first_entry(zap_old_map)) {
+                                       vm_map_entry_unlink(zap_old_map,
+                                                           entry2);
+                                       vm_map_entry_link(map, entry1, entry2);
+                                       entry1 = entry2;
+                               }
+                               if (map->wiring_required) {
+                                       /*
+                                        * XXX TODO: we should rewire the
+                                        * old pages here...
+                                        */
+                               }
+                               vm_map_enter_restore_successes++;
+                       }
+               }
+       }
+
+       if (map_locked) {
+               vm_map_unlock(map);
+       }
+
+       /*
+        * Get rid of the "zap_maps" and all the map entries that
+        * they may still contain.
+        */
+       if (zap_old_map != VM_MAP_NULL) {
+               vm_map_destroy(zap_old_map);
+               zap_old_map = VM_MAP_NULL;
+       }
+       if (zap_new_map != VM_MAP_NULL) {
+               vm_map_destroy(zap_new_map);
+               zap_new_map = VM_MAP_NULL;
+       }
+
+       return result;
+
+#undef RETURN
+}
+
+
+#if    VM_CPM
+
+#ifdef MACH_ASSERT
+extern pmap_paddr_t    avail_start, avail_end;
+#endif
+
+/*
+ *     Allocate memory in the specified map, with the caveat that
+ *     the memory is physically contiguous.  This call may fail
+ *     if the system can't find sufficient contiguous memory.
+ *     This call may cause or lead to heart-stopping amounts of
+ *     paging activity.
+ *
+ *     Memory obtained from this call should be freed in the
+ *     normal way, viz., via vm_deallocate.
+ */
+kern_return_t
+vm_map_enter_cpm(
+       vm_map_t                map,
+       vm_map_offset_t *addr,
+       vm_map_size_t           size,
+       int                     flags)
+{
+       vm_object_t             cpm_obj;
+       pmap_t                  pmap;
+       vm_page_t               m, pages;
+       kern_return_t           kr;
+       vm_map_offset_t         va, start, end, offset;
+#if    MACH_ASSERT
+       vm_map_offset_t         prev_addr;
+#endif /* MACH_ASSERT */
+
+       boolean_t               anywhere = ((VM_FLAGS_ANYWHERE & flags) != 0);
+
+       if (!vm_allocate_cpm_enabled)
+               return KERN_FAILURE;
+
+       if (size == 0) {
+               *addr = 0;
+               return KERN_SUCCESS;
+       }
+
+       if (anywhere)
+               *addr = vm_map_min(map);
+       else
+               *addr = vm_map_trunc_page(*addr);
+       size = vm_map_round_page(size);
+
+       /*
+        * LP64todo - cpm_allocate should probably allow
+        * allocations of >4GB, but not with the current
+        * algorithm, so just cast down the size for now.
+        */
+       if (size > VM_MAX_ADDRESS)
+               return KERN_RESOURCE_SHORTAGE;
+       if ((kr = cpm_allocate(CAST_DOWN(vm_size_t, size),
+                              &pages, TRUE)) != KERN_SUCCESS)
+               return kr;
+
+       cpm_obj = vm_object_allocate((vm_object_size_t)size);
+       assert(cpm_obj != VM_OBJECT_NULL);
+       assert(cpm_obj->internal);
+       assert(cpm_obj->size == (vm_object_size_t)size);
+       assert(cpm_obj->can_persist == FALSE);
+       assert(cpm_obj->pager_created == FALSE);
+       assert(cpm_obj->pageout == FALSE);
+       assert(cpm_obj->shadow == VM_OBJECT_NULL);
+
+       /*
+        *      Insert pages into object.
+        */
+
+       vm_object_lock(cpm_obj);
+       for (offset = 0; offset < size; offset += PAGE_SIZE) {
+               m = pages;
+               pages = NEXT_PAGE(m);
+               *(NEXT_PAGE_PTR(m)) = VM_PAGE_NULL;
+
+               assert(!m->gobbled);
+               assert(!m->wanted);
+               assert(!m->pageout);
+               assert(!m->tabled);
+               /*
+                * ENCRYPTED SWAP:
+                * "m" is not supposed to be pageable, so it
+                * should not be encrypted.  It wouldn't be safe
+                * to enter it in a new VM object while encrypted.
+                */
+               ASSERT_PAGE_DECRYPTED(m);
+               assert(m->busy);
+               assert(m->phys_page>=(avail_start>>PAGE_SHIFT) && m->phys_page<=(avail_end>>PAGE_SHIFT));
+
+               m->busy = FALSE;
+               vm_page_insert(m, cpm_obj, offset);
+       }
+       assert(cpm_obj->resident_page_count == size / PAGE_SIZE);
+       vm_object_unlock(cpm_obj);
+
+       /*
+        *      Hang onto a reference on the object in case a
+        *      multi-threaded application for some reason decides
+        *      to deallocate the portion of the address space into
+        *      which we will insert this object.
+        *
+        *      Unfortunately, we must insert the object now before
+        *      we can talk to the pmap module about which addresses
+        *      must be wired down.  Hence, the race with a multi-
+        *      threaded app.
+        */
+       vm_object_reference(cpm_obj);
+
+       /*
+        *      Insert object into map.
+        */
+
+       kr = vm_map_enter(
+                         map,
+                         addr,
+                         size,
+                         (vm_map_offset_t)0,
+                         flags,
+                         cpm_obj,
+                         (vm_object_offset_t)0,
+                         FALSE,
+                         VM_PROT_ALL,
+                         VM_PROT_ALL,
+                         VM_INHERIT_DEFAULT);
+
+       if (kr != KERN_SUCCESS) {
+               /*
+                *      A CPM object doesn't have can_persist set,
+                *      so all we have to do is deallocate it to
+                *      free up these pages.
+                */
+               assert(cpm_obj->pager_created == FALSE);
+               assert(cpm_obj->can_persist == FALSE);
+               assert(cpm_obj->pageout == FALSE);
+               assert(cpm_obj->shadow == VM_OBJECT_NULL);
+               vm_object_deallocate(cpm_obj); /* kill acquired ref */
+               vm_object_deallocate(cpm_obj); /* kill creation ref */
+       }
+
+       /*
+        *      Inform the physical mapping system that the
+        *      range of addresses may not fault, so that
+        *      page tables and such can be locked down as well.
+        */
+       start = *addr;
+       end = start + size;
+       pmap = vm_map_pmap(map);
+       pmap_pageable(pmap, start, end, FALSE);
+
+       /*
+        *      Enter each page into the pmap, to avoid faults.
+        *      Note that this loop could be coded more efficiently,
+        *      if the need arose, rather than looking up each page
+        *      again.
+        */
+       for (offset = 0, va = start; offset < size;
+            va += PAGE_SIZE, offset += PAGE_SIZE) {
+               vm_object_lock(cpm_obj);
+               m = vm_page_lookup(cpm_obj, (vm_object_offset_t)offset);
+               vm_object_unlock(cpm_obj);
+               assert(m != VM_PAGE_NULL);
+               PMAP_ENTER(pmap, va, m, VM_PROT_ALL,    
+                       ((unsigned int)(m->object->wimg_bits)) & VM_WIMG_MASK,
+                       TRUE);
+       }
+
+#if    MACH_ASSERT
+       /*
+        *      Verify ordering in address space.
+        */
+       for (offset = 0; offset < size; offset += PAGE_SIZE) {
+               vm_object_lock(cpm_obj);
+               m = vm_page_lookup(cpm_obj, (vm_object_offset_t)offset);
+               vm_object_unlock(cpm_obj);
+               if (m == VM_PAGE_NULL)
+                       panic("vm_allocate_cpm:  obj 0x%x off 0x%x no page",
+                             cpm_obj, offset);
+               assert(m->tabled);
+               assert(!m->busy);
+               assert(!m->wanted);
+               assert(!m->fictitious);
+               assert(!m->private);
+               assert(!m->absent);
+               assert(!m->error);
+               assert(!m->cleaning);
+               assert(!m->precious);
+               assert(!m->clustered);
+               if (offset != 0) {
+                       if (m->phys_page != prev_addr + 1) {
+                               printf("start 0x%x end 0x%x va 0x%x\n",
+                                      start, end, va);
+                               printf("obj 0x%x off 0x%x\n", cpm_obj, offset);
+                               printf("m 0x%x prev_address 0x%x\n", m,
+                                      prev_addr);
+                               panic("vm_allocate_cpm:  pages not contig!");
+                       }
+               }
+               prev_addr = m->phys_page;
+       }
+#endif /* MACH_ASSERT */
+
+       vm_object_deallocate(cpm_obj); /* kill extra ref */
+
+       return kr;
+}
+
+
+#else  /* VM_CPM */
+
+/*
+ *     Interface is defined in all cases, but unless the kernel
+ *     is built explicitly for this option, the interface does
+ *     nothing.
+ */
+
+kern_return_t
+vm_map_enter_cpm(
+       __unused vm_map_t       map,
+       __unused vm_map_offset_t        *addr,
+       __unused vm_map_size_t  size,
+       __unused int            flags)
+{
+       return KERN_FAILURE;
+}
+#endif /* VM_CPM */
+
+/*
+ *     vm_map_clip_start:      [ internal use only ]
+ *
+ *     Asserts that the given entry begins at or after
+ *     the specified address; if necessary,
+ *     it splits the entry into two.
+ */
+#ifndef NO_NESTED_PMAP
+#define vm_map_clip_start(map, entry, startaddr)                       \
+MACRO_BEGIN                                                            \
+       vm_map_t VMCS_map;                                              \
+       vm_map_entry_t VMCS_entry;                                      \
+       vm_map_offset_t VMCS_startaddr;                                 \
+       VMCS_map = (map);                                               \
+       VMCS_entry = (entry);                                           \
+       VMCS_startaddr = (startaddr);                                   \
+       if (VMCS_startaddr > VMCS_entry->vme_start) {                   \
+               if(entry->use_pmap) {                                   \
+                       vm_map_offset_t pmap_base_addr;                 \
+                                                                       \
+                       pmap_base_addr = 0xF0000000 & entry->vme_start; \
+                       pmap_unnest(map->pmap, (addr64_t)pmap_base_addr); \
+                       entry->use_pmap = FALSE;                        \
+               } else if(entry->object.vm_object                       \
+                       && !entry->is_sub_map                           \
+                       && entry->object.vm_object->phys_contiguous) {  \
+                       pmap_remove(map->pmap,                          \
+                               (addr64_t)(entry->vme_start),           \
+                               (addr64_t)(entry->vme_end));            \
+               }                                                       \
+               _vm_map_clip_start(&VMCS_map->hdr,VMCS_entry,VMCS_startaddr);\
+       }                                                               \
+       UPDATE_FIRST_FREE(VMCS_map, VMCS_map->first_free);              \
+MACRO_END
+#else /* NO_NESTED_PMAP */
+#define vm_map_clip_start(map, entry, startaddr)                       \
+MACRO_BEGIN                                                            \
        vm_map_t VMCS_map;                                              \
        vm_map_entry_t VMCS_entry;                                      \
-       vm_offset_t VMCS_startaddr;                                     \
+       vm_map_offset_t VMCS_startaddr;                                 \
        VMCS_map = (map);                                               \
        VMCS_entry = (entry);                                           \
        VMCS_startaddr = (startaddr);                                   \
@@ -1556,7 +2127,7 @@ MACRO_BEGIN                                                               \
        }                                                               \
        UPDATE_FIRST_FREE(VMCS_map, VMCS_map->first_free);              \
 MACRO_END
-#endif
+#endif /* NO_NESTED_PMAP */
 
 #define vm_map_copy_clip_start(copy, entry, startaddr) \
        MACRO_BEGIN \
@@ -1568,11 +2139,11 @@ MACRO_END
  *     This routine is called only when it is known that
  *     the entry must be split.
  */
-void
+static void
 _vm_map_clip_start(
        register struct vm_map_header   *map_header,
        register vm_map_entry_t         entry,
-       register vm_offset_t            start)
+       register vm_map_offset_t                start)
 {
        register vm_map_entry_t new_entry;
 
@@ -1607,36 +2178,39 @@ _vm_map_clip_start(
  *     the specified address; if necessary,
  *     it splits the entry into two.
  */
-#ifndef i386
+#ifndef NO_NESTED_PMAP 
 #define vm_map_clip_end(map, entry, endaddr)                           \
 MACRO_BEGIN                                                            \
        vm_map_t VMCE_map;                                              \
        vm_map_entry_t VMCE_entry;                                      \
-       vm_offset_t VMCE_endaddr;                                       \
+       vm_map_offset_t VMCE_endaddr;                                   \
        VMCE_map = (map);                                               \
        VMCE_entry = (entry);                                           \
        VMCE_endaddr = (endaddr);                                       \
        if (VMCE_endaddr < VMCE_entry->vme_end) {                       \
                if(entry->use_pmap) {                                   \
-                       vm_offset_t     pmap_base_addr;                 \
-                       vm_offset_t     pmap_end_addr;                  \
+                       vm_map_offset_t pmap_base_addr;                 \
                                                                        \
                        pmap_base_addr = 0xF0000000 & entry->vme_start; \
-                       pmap_end_addr = (pmap_base_addr + 0x10000000) - 1; \
-                       pmap_unnest(map->pmap, pmap_base_addr,          \
-                               (pmap_end_addr - pmap_base_addr) + 1);  \
+                       pmap_unnest(map->pmap, (addr64_t)pmap_base_addr); \
                        entry->use_pmap = FALSE;                        \
+               } else if(entry->object.vm_object                       \
+                       && !entry->is_sub_map                           \
+                       && entry->object.vm_object->phys_contiguous) {  \
+                       pmap_remove(map->pmap,                          \
+                               (addr64_t)(entry->vme_start),           \
+                               (addr64_t)(entry->vme_end));            \
                }                                                       \
                _vm_map_clip_end(&VMCE_map->hdr,VMCE_entry,VMCE_endaddr); \
        }                                                               \
        UPDATE_FIRST_FREE(VMCE_map, VMCE_map->first_free);              \
 MACRO_END
-#else
+#else  /* NO_NESTED_PMAP */
 #define vm_map_clip_end(map, entry, endaddr)                           \
 MACRO_BEGIN                                                            \
        vm_map_t VMCE_map;                                              \
        vm_map_entry_t VMCE_entry;                                      \
-       vm_offset_t VMCE_endaddr;                                       \
+       vm_map_offset_t VMCE_endaddr;                                   \
        VMCE_map = (map);                                               \
        VMCE_entry = (entry);                                           \
        VMCE_endaddr = (endaddr);                                       \
@@ -1645,7 +2219,8 @@ MACRO_BEGIN                                                               \
        }                                                               \
        UPDATE_FIRST_FREE(VMCE_map, VMCE_map->first_free);              \
 MACRO_END
-#endif
+#endif /* NO_NESTED_PMAP */
+
 
 #define vm_map_copy_clip_end(copy, entry, endaddr) \
        MACRO_BEGIN \
@@ -1657,11 +2232,11 @@ MACRO_END
  *     This routine is called only when it is known that
  *     the entry must be split.
  */
-void
+static void
 _vm_map_clip_end(
        register struct vm_map_header   *map_header,
        register vm_map_entry_t         entry,
-       register vm_offset_t            end)
+       register vm_map_offset_t                end)
 {
        register vm_map_entry_t new_entry;
 
@@ -1715,15 +2290,15 @@ _vm_map_clip_end(
  *
  *     The map is locked for reading on entry and is left locked.
  */
-boolean_t
+static boolean_t
 vm_map_range_check(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        vm_map_entry_t          *entry)
 {
        vm_map_entry_t          cur;
-       register vm_offset_t    prev;
+       register vm_map_offset_t        prev;
 
        /*
         *      Basic sanity checks first
@@ -1782,11 +2357,14 @@ vm_map_range_check(
  */
 kern_return_t
 vm_map_submap(
-       register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       vm_map_t                map,
+       vm_map_offset_t start,
+       vm_map_offset_t end,
        vm_map_t                submap,
-       vm_offset_t             offset,
+       vm_map_offset_t offset,
+#ifdef NO_NESTED_PMAP
+       __unused
+#endif /* NO_NESTED_PMAP */
        boolean_t               use_pmap)
 {
        vm_map_entry_t          entry;
@@ -1795,6 +2373,8 @@ vm_map_submap(
 
        vm_map_lock(map);
 
+       submap->mapped = TRUE;
+
        VM_MAP_RANGE_CHECK(map, start, end);
 
        if (vm_map_lookup_entry(map, start, &entry)) {
@@ -1817,25 +2397,34 @@ vm_map_submap(
            (object->copy == VM_OBJECT_NULL) &&
            (object->shadow == VM_OBJECT_NULL) &&
            (!object->pager_created)) {
-               entry->offset = (vm_object_offset_t)offset;
-               entry->object.vm_object = VM_OBJECT_NULL;
-               vm_object_deallocate(object);
-               entry->is_sub_map = TRUE;
-               vm_map_reference(entry->object.sub_map = submap);
-#ifndef i386
-               if ((use_pmap) && (offset == 0)) {
-                       /* nest if platform code will allow */
-                       result = pmap_nest(map->pmap, (entry->object.sub_map)->pmap, 
-                                                       start, end - start);
-                       if(result)
-                               panic("pmap_nest failed!");
-                       entry->use_pmap = TRUE;
-               }
-#endif
-#ifdef i386
-               pmap_remove(map->pmap, start, end);
-#endif
-               result = KERN_SUCCESS;
+                       entry->offset = (vm_object_offset_t)offset;
+                       entry->object.vm_object = VM_OBJECT_NULL;
+                       vm_object_deallocate(object);
+                       entry->is_sub_map = TRUE;
+                       entry->object.sub_map = submap;
+                       vm_map_reference(submap);
+#ifndef NO_NESTED_PMAP
+                       if ((use_pmap) && (offset == 0)) {
+                               /* nest if platform code will allow */
+                               if(submap->pmap == NULL) {
+                                       submap->pmap = pmap_create((vm_map_size_t) 0, FALSE);
+                                       if(submap->pmap == PMAP_NULL) {
+                                               vm_map_unlock(map);
+                                               return(KERN_NO_SPACE);
+                                       }
+                               }
+                               result = pmap_nest(map->pmap, (entry->object.sub_map)->pmap, 
+                                                  (addr64_t)start,
+                                                  (addr64_t)start,
+                                                  (uint64_t)(end - start));
+                               if(result)
+                                       panic("vm_map_submap: pmap_nest failed, rc = %08X\n", result);
+                               entry->use_pmap = TRUE;
+                       }
+#else  /* NO_NESTED_PMAP */
+                       pmap_remove(map->pmap, (addr64_t)start, (addr64_t)end);
+#endif /* NO_NESTED_PMAP */
+                       result = KERN_SUCCESS;
        }
        vm_map_unlock(map);
 
@@ -1853,13 +2442,13 @@ vm_map_submap(
 kern_return_t
 vm_map_protect(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        register vm_prot_t      new_prot,
        register boolean_t      set_max)
 {
        register vm_map_entry_t         current;
-       register vm_offset_t            prev;
+       register vm_map_offset_t                prev;
        vm_map_entry_t                  entry;
        vm_prot_t                       new_max;
        boolean_t                       clip;
@@ -1870,6 +2459,15 @@ vm_map_protect(
 
        vm_map_lock(map);
 
+       /* LP64todo - remove this check when vm_map_commpage64()
+        * no longer has to stuff in a map_entry for the commpage
+        * above the map's max_offset.
+        */
+       if (start >= map->max_offset) {
+               vm_map_unlock(map);
+               return(KERN_INVALID_ADDRESS);
+       }
+
        /*
         *      Lookup the entry.  If it doesn't start in a valid
         *      entry, return an error.  Remember if we need to
@@ -1972,13 +2570,17 @@ vm_map_protect(
                /* the 256M hack for existing hardware limitations */
                if (current->protection != old_prot) {
                   if(current->is_sub_map && current->use_pmap) {
-                       vm_offset_t     pmap_base_addr;
-                       vm_offset_t     pmap_end_addr;
+                       vm_map_offset_t pmap_base_addr;
+                       vm_map_offset_t pmap_end_addr;
+#ifdef NO_NESTED_PMAP
+                       __unused
+#endif /* NO_NESTED_PMAP */
                        vm_map_entry_t  local_entry;
 
+
                        pmap_base_addr = 0xF0000000 & current->vme_start;
                        pmap_end_addr = (pmap_base_addr + 0x10000000) - 1;
-#ifndef i386
+#ifndef NO_NESTED_PMAP
                        if(!vm_map_lookup_entry(map, 
                                        pmap_base_addr, &local_entry))
                           panic("vm_map_protect: nested pmap area is missing");
@@ -1987,29 +2589,43 @@ vm_map_protect(
                                local_entry->use_pmap = FALSE;
                                local_entry = local_entry->vme_next;
                           }
-                          pmap_unnest(map->pmap, pmap_base_addr,
-                                       (pmap_end_addr - pmap_base_addr) + 1);
-#endif
+                          pmap_unnest(map->pmap, (addr64_t)pmap_base_addr);
+#endif /* NO_NESTED_PMAP */
                   }
                   if (!(current->protection & VM_PROT_WRITE)) {
                        /* Look one level in we support nested pmaps */
                        /* from mapped submaps which are direct entries */
                        /* in our map */
-                       if(current->is_sub_map && current->use_pmap) {
+
+                       vm_prot_t prot;
+
+                       prot = current->protection;
+#ifdef STACK_ONLY_NX
+                       if (current->alias != VM_MEMORY_STACK && prot)
+                               prot |= VM_PROT_EXECUTE;
+#endif
+                       if (current->is_sub_map && current->use_pmap) {
                                pmap_protect(current->object.sub_map->pmap, 
                                        current->vme_start,
                                        current->vme_end,
-                                       current->protection);
+                                       prot);
                        } else {
                                pmap_protect(map->pmap, current->vme_start,
                                        current->vme_end,
-                                       current->protection);
+                                       prot);
                        }
                   }
                }
                current = current->vme_next;
        }
 
+       current = entry;
+       while ((current != vm_map_to_entry(map)) &&
+              (current->vme_start <= end)) {
+               vm_map_simplify_entry(map, current);
+               current = current->vme_next;
+       }
+
        vm_map_unlock(map);
        return(KERN_SUCCESS);
 }
@@ -2025,8 +2641,8 @@ vm_map_protect(
 kern_return_t
 vm_map_inherit(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        register vm_inherit_t   new_inheritance)
 {
        register vm_map_entry_t entry;
@@ -2049,8 +2665,10 @@ vm_map_inherit(
        /* given inheritance. */
        while ((entry != vm_map_to_entry(map)) && (entry->vme_start < end)) {
                if(entry->is_sub_map) {
-                       if(new_inheritance == VM_INHERIT_COPY)
+                       if(new_inheritance == VM_INHERIT_COPY) {
+                               vm_map_unlock(map);
                                return(KERN_INVALID_ARGUMENT);
+                       }
                }
 
                entry = entry->vme_next;
@@ -2083,26 +2701,27 @@ vm_map_inherit(
  *     The map must not be locked, but a reference must remain to the
  *     map throughout the call.
  */
-kern_return_t
+static kern_return_t
 vm_map_wire_nested(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        register vm_prot_t      access_type,
        boolean_t               user_wire,
-       pmap_t                  map_pmap)
+       pmap_t                  map_pmap, 
+       vm_map_offset_t         pmap_addr)
 {
        register vm_map_entry_t entry;
        struct vm_map_entry     *first_entry, tmp_entry;
-       vm_map_t                pmap_map;
-       register vm_offset_t    s,e;
+       vm_map_t                real_map;
+       register vm_map_offset_t        s,e;
        kern_return_t           rc;
        boolean_t               need_wakeup;
        boolean_t               main_map = FALSE;
-       boolean_t               interruptible_state;
+       wait_interrupt_t        interruptible_state;
        thread_t                cur_thread;
        unsigned int            last_timestamp;
-       vm_size_t               size;
+       vm_map_size_t           size;
 
        vm_map_lock(map);
        if(map_pmap == NULL)
@@ -2136,6 +2755,8 @@ vm_map_wire_nested(
                 * block after informing other thread to wake us up.
                 */
                if (entry->in_transition) {
+                       wait_result_t wait_result;
+
                        /*
                         * We have not clipped the entry.  Make sure that
                         * the start address is in range so that the lookup
@@ -2156,22 +2777,21 @@ vm_map_wire_nested(
                        /*
                         * User wiring is interruptible
                         */
-                       vm_map_entry_wait(map, 
+                       wait_result = vm_map_entry_wait(map, 
                                          (user_wire) ? THREAD_ABORTSAFE :
                                                        THREAD_UNINT);
-                       if (user_wire && cur_thread->wait_result ==
-                                                       THREAD_INTERRUPTED) {
+                       if (user_wire && wait_result == THREAD_INTERRUPTED) {
                                /*
                                 * undo the wirings we have done so far
                                 * We do not clear the needs_wakeup flag,
                                 * because we cannot tell if we were the
                                 * only one waiting.
                                 */
+                               vm_map_unlock(map);
                                vm_map_unwire(map, start, s, user_wire);
                                return(KERN_FAILURE);
                        }
 
-                       vm_map_lock(map);
                        /*
                         * Cannot avoid a lookup here. reset timestamp.
                         */
@@ -2199,15 +2819,16 @@ vm_map_wire_nested(
                }
                
                if(entry->is_sub_map) {
-                       vm_offset_t     sub_start;
-                       vm_offset_t     sub_end;
-                       vm_offset_t     local_end;
+                       vm_map_offset_t sub_start;
+                       vm_map_offset_t sub_end;
+                       vm_map_offset_t local_start;
+                       vm_map_offset_t local_end;
                        pmap_t          pmap;
                        
                        vm_map_clip_start(map, entry, start);
                        vm_map_clip_end(map, entry, end);
 
-                       sub_start += entry->offset;
+                       sub_start = entry->offset;
                        sub_end = entry->vme_end - entry->vme_start;
                        sub_end += entry->offset;
                        
@@ -2215,8 +2836,16 @@ vm_map_wire_nested(
                        if(map_pmap == NULL) {
                                if(entry->use_pmap) {
                                        pmap = entry->object.sub_map->pmap;
+                                       /* ppc implementation requires that */
+                                       /* submaps pmap address ranges line */
+                                       /* up with parent map */
+#ifdef notdef
+                                       pmap_addr = sub_start;
+#endif
+                                       pmap_addr = start;
                                } else {
                                        pmap = map->pmap;
+                                       pmap_addr = start;
                                }
                                if (entry->wired_count) {
                                        if (entry->wired_count 
@@ -2231,21 +2860,22 @@ vm_map_wire_nested(
                                                entry->vme_start, user_wire);
                                           return(KERN_FAILURE);
                                        }
-                                       if (!user_wire || 
-                                             (entry->user_wired_count++ == 0))
+                                       if(user_wire)
+                                               entry->user_wired_count++;
+                                       if((!user_wire) ||
+                                            (entry->user_wired_count == 0))
                                                entry->wired_count++;
                                        entry = entry->vme_next;
                                        continue;
 
                                } else {
                                        vm_object_t             object;
-                                       vm_object_offset_t      offset_hi;
-                                       vm_object_offset_t      offset_lo;
+                                       vm_map_offset_t         offset_hi;
+                                       vm_map_offset_t         offset_lo;
                                        vm_object_offset_t      offset;
                                        vm_prot_t               prot;
                                        boolean_t               wired;
                                        vm_behavior_t           behavior;
-                                       vm_offset_t             local_start;
                                        vm_map_entry_t          local_entry;
                                        vm_map_version_t         version;
                                        vm_map_t                lookup_map;
@@ -2258,30 +2888,24 @@ vm_map_wire_nested(
                                        vm_map_lock_write_to_read(map);
                                        if(vm_map_lookup_locked(
                                                &lookup_map, local_start, 
-                                               VM_PROT_WRITE,
+                                               access_type,
                                                &version, &object,
                                                &offset, &prot, &wired,
                                                &behavior, &offset_lo,
-                                               &offset_hi, &pmap_map)) {
+                                               &offset_hi, &real_map)) {
                                                
-                                               vm_map_unlock(lookup_map);
+                                               vm_map_unlock_read(lookup_map);
                                                vm_map_unwire(map, start,
                                                   entry->vme_start, user_wire);
                                                return(KERN_FAILURE);
                                        }
-                                       if(pmap_map != lookup_map)
-                                               vm_map_unlock(pmap_map);
-                                       if(lookup_map != map) {
-                                               vm_map_unlock(lookup_map);
-                                               vm_map_lock(map);
-                                       } else {
-                                               vm_map_unlock(map);
-                                               vm_map_lock(map);
-                                       }
-                                       last_timestamp = 
-                                               version.main_timestamp;
+                                       if(real_map != lookup_map)
+                                               vm_map_unlock(real_map);
+                                       vm_map_unlock_read(lookup_map);
+                                       vm_map_lock(map);
                                        vm_object_unlock(object);
-                                       if (vm_map_lookup_entry(map, 
+
+                                       if (!vm_map_lookup_entry(map, 
                                                local_start, &local_entry)) {
                                                vm_map_unlock(map);
                                                vm_map_unwire(map, start,
@@ -2289,11 +2913,15 @@ vm_map_wire_nested(
                                                return(KERN_FAILURE);
                                        }
                                        /* did we have a change of type? */
-                                       if (!local_entry->is_sub_map)
+                                       if (!local_entry->is_sub_map) {
+                                               last_timestamp = map->timestamp;
                                                continue;
+                                       }
                                        entry = local_entry;
                                        if (user_wire)
                                                entry->user_wired_count++;
+                                       if((!user_wire) || 
+                                               (entry->user_wired_count == 1))
                                        entry->wired_count++;
 
                                        entry->in_transition = TRUE;
@@ -2303,32 +2931,34 @@ vm_map_wire_nested(
                                                entry->object.sub_map, 
                                                sub_start, sub_end,
                                                access_type, 
-                                               user_wire, pmap);
+                                               user_wire, pmap, pmap_addr);
                                        vm_map_lock(map);
-                                       last_timestamp = map->timestamp;
                                }
                        } else {
+                               local_start = entry->vme_start;
+                               if (user_wire)
+                                       entry->user_wired_count++;
+                               if((!user_wire) || 
+                                       (entry->user_wired_count == 1))
+                                       entry->wired_count++;
                                vm_map_unlock(map);
                                rc = vm_map_wire_nested(entry->object.sub_map, 
                                                sub_start, sub_end,
                                                access_type, 
-                                               user_wire, pmap);
+                                               user_wire, map_pmap, pmap_addr);
                                vm_map_lock(map);
-                               last_timestamp = map->timestamp;
                        }
                        s = entry->vme_start;
                        e = entry->vme_end;
-                       if (last_timestamp+1 != map->timestamp) {
+
                        /*
                         * Find the entry again.  It could have been clipped
                         * after we unlocked the map.
                         */
-                               if (!vm_map_lookup_entry(map, local_end,
-                                                        &first_entry))
-                                       panic("vm_map_wire: re-lookup failed");
-
-                               entry = first_entry;
-                       }
+                       if (!vm_map_lookup_entry(map, local_start,
+                                                &first_entry))
+                               panic("vm_map_wire: re-lookup failed");
+                       entry = first_entry;
 
                        last_timestamp = map->timestamp;
                        while ((entry != vm_map_to_entry(map)) &&
@@ -2340,11 +2970,11 @@ vm_map_wire_nested(
                                        need_wakeup = TRUE;
                                }
                                if (rc != KERN_SUCCESS) {/* from vm_*_wire */
-                                  if(main_map) {
                                        if (user_wire)
                                                entry->user_wired_count--;
-                                       entry->wired_count--;
-                                  }
+                                       if ((!user_wire) || 
+                                               (entry->user_wired_count == 0))
+                                               entry->wired_count--;
                                }
                                entry = entry->vme_next;
                        }
@@ -2365,7 +2995,7 @@ vm_map_wire_nested(
                 * If this entry is already wired then increment
                 * the appropriate wire reference count.
                 */
-               if (entry->wired_count && main_map) {
+               if (entry->wired_count) {
                        /* sanity check: wired_count is a short */
                        if (entry->wired_count >= MAX_WIRE_COUNT)
                                panic("vm_map_wire: too many wirings");
@@ -2383,7 +3013,9 @@ vm_map_wire_nested(
                         */
                        vm_map_clip_start(map, entry, start);
                        vm_map_clip_end(map, entry, end);
-                       if (!user_wire || (entry->user_wired_count++ == 0))
+                       if (user_wire)
+                               entry->user_wired_count++;
+                       if ((!user_wire) || (entry->user_wired_count == 1))
                                entry->wired_count++;
 
                        entry = entry->vme_next;
@@ -2449,11 +3081,10 @@ vm_map_wire_nested(
 
                assert(entry->wired_count == 0 && entry->user_wired_count == 0);
 
-               if(main_map) {
-                       if (user_wire)
-                               entry->user_wired_count++;
+               if (user_wire)
+                       entry->user_wired_count++;
+               if ((!user_wire) || (entry->user_wired_count == 1))
                        entry->wired_count++;
-               }
 
                entry->in_transition = TRUE;
 
@@ -2475,18 +3106,21 @@ vm_map_wire_nested(
                 */
                vm_map_unlock(map);
 
-               if (!user_wire && cur_thread != THREAD_NULL) {
-                       interruptible_state = cur_thread->interruptible;
-                       cur_thread->interruptible = FALSE;
-               }
-                 
+               if (!user_wire && cur_thread != THREAD_NULL)
+                       interruptible_state = thread_interrupt_level(THREAD_UNINT);
+               else
+                       interruptible_state = THREAD_UNINT;
+
                if(map_pmap)
-                       rc = vm_fault_wire(map, &tmp_entry, map_pmap);
+                       rc = vm_fault_wire(map, 
+                                       &tmp_entry, map_pmap, pmap_addr);
                else
-                       rc = vm_fault_wire(map, &tmp_entry, map->pmap);
+                       rc = vm_fault_wire(map, 
+                                       &tmp_entry, map->pmap, 
+                                       tmp_entry.vme_start);
 
                if (!user_wire && cur_thread != THREAD_NULL)
-                       cur_thread->interruptible = interruptible_state;
+                       thread_interrupt_level(interruptible_state);
 
                vm_map_lock(map);
 
@@ -2513,11 +3147,11 @@ vm_map_wire_nested(
                                need_wakeup = TRUE;
                        }
                        if (rc != KERN_SUCCESS) {       /* from vm_*_wire */
-                               if(main_map) {
-                                       if (user_wire)
-                                               entry->user_wired_count--;
+                               if (user_wire)
+                                       entry->user_wired_count--;
+                               if ((!user_wire) || 
+                                               (entry->user_wired_count == 0))
                                        entry->wired_count--;
-                               }
                        }
                        entry = entry->vme_next;
                }
@@ -2548,8 +3182,8 @@ vm_map_wire_nested(
 kern_return_t
 vm_map_wire(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        register vm_prot_t      access_type,
        boolean_t               user_wire)
 {
@@ -2570,7 +3204,7 @@ vm_map_wire(
         mapping_prealloc(end - start);
 #endif
        kret = vm_map_wire_nested(map, start, end, access_type, 
-                                               user_wire, (pmap_t)NULL);
+                                               user_wire, (pmap_t)NULL, 0);
 #ifdef ppc
        mapping_relpre();
 #endif
@@ -2590,13 +3224,14 @@ vm_map_wire(
  *     unwired and intransition entries to avoid losing memory by leaving
  *     it unwired.
  */
-kern_return_t
+static kern_return_t
 vm_map_unwire_nested(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        boolean_t               user_wire,
-       pmap_t                  map_pmap)
+       pmap_t                  map_pmap,
+       vm_map_offset_t         pmap_addr)
 {
        register vm_map_entry_t entry;
        struct vm_map_entry     *first_entry, tmp_entry;
@@ -2647,9 +3282,9 @@ vm_map_unwire_nested(
                }
 
                if(entry->is_sub_map) {
-                       vm_offset_t     sub_start;
-                       vm_offset_t     sub_end;
-                       vm_offset_t     local_end;
+                       vm_map_offset_t sub_start;
+                       vm_map_offset_t sub_end;
+                       vm_map_offset_t local_end;
                        pmap_t          pmap;
                        
 
@@ -2663,8 +3298,10 @@ vm_map_unwire_nested(
                        if(map_pmap == NULL) {
                           if(entry->use_pmap) {
                                        pmap = entry->object.sub_map->pmap;
+                                       pmap_addr = sub_start;
                           } else {
                                        pmap = map->pmap;
+                                       pmap_addr = start;
                           }
                           if (entry->wired_count == 0 ||
                               (user_wire && entry->user_wired_count == 0)) {
@@ -2708,7 +3345,7 @@ vm_map_unwire_nested(
                            */
                           vm_map_unlock(map);
                           vm_map_unwire_nested(entry->object.sub_map, 
-                                       sub_start, sub_end, user_wire, pmap);
+                               sub_start, sub_end, user_wire, pmap, pmap_addr);
                           vm_map_lock(map);
 
                           if (last_timestamp+1 != map->timestamp) {
@@ -2745,8 +3382,9 @@ vm_map_unwire_nested(
                           continue;
                        } else {
                           vm_map_unlock(map);
-                          vm_map_unwire_nested(entry->object.sub_map, 
-                                       sub_start, sub_end, user_wire, pmap);
+                          vm_map_unwire_nested(entry->object.sub_map,
+                               sub_start, sub_end, user_wire, map_pmap,
+                               pmap_addr);
                           vm_map_lock(map);
 
                           if (last_timestamp+1 != map->timestamp) {
@@ -2768,8 +3406,8 @@ vm_map_unwire_nested(
                }
 
 
-               if (main_map && (entry->wired_count == 0 ||
-                  (user_wire && entry->user_wired_count == 0))) {
+               if ((entry->wired_count == 0) ||
+                  (user_wire && entry->user_wired_count == 0)) {
                        if (!user_wire)
                                panic("vm_map_unwire: entry is unwired");
 
@@ -2798,14 +3436,12 @@ vm_map_unwire_nested(
                        continue;
                }
 
-               if(main_map) {
-                  if (!user_wire || (--entry->user_wired_count == 0))
+               if (!user_wire || (--entry->user_wired_count == 0))
                        entry->wired_count--;
 
-                  if (entry->wired_count != 0) {
+               if (entry->wired_count != 0) {
                        entry = entry->vme_next;
                        continue;
-                  }
                }
 
                entry->in_transition = TRUE;
@@ -2817,9 +3453,12 @@ vm_map_unwire_nested(
                 */
                vm_map_unlock(map);
                if(map_pmap) {
-                       vm_fault_unwire(map, &tmp_entry, FALSE, map_pmap);
+                       vm_fault_unwire(map, 
+                               &tmp_entry, FALSE, map_pmap, pmap_addr);
                } else {
-                       vm_fault_unwire(map, &tmp_entry, FALSE, map->pmap);
+                       vm_fault_unwire(map, 
+                               &tmp_entry, FALSE, map->pmap, 
+                               tmp_entry.vme_start);
                }
                vm_map_lock(map);
 
@@ -2854,6 +3493,17 @@ vm_map_unwire_nested(
                        entry = entry->vme_next;
                }
        }
+
+       /*
+        * We might have fragmented the address space when we wired this
+        * range of addresses.  Attempt to re-coalesce these VM map entries
+        * with their neighbors now that they're no longer wired.
+        * Under some circumstances, address space fragmentation can
+        * prevent VM object shadow chain collapsing, which can cause
+        * swap space leaks.
+        */
+       vm_map_simplify_range(map, start, end);
+
        vm_map_unlock(map);
        /*
         * wake up anybody waiting on entries that we have unwired.
@@ -2867,11 +3517,12 @@ vm_map_unwire_nested(
 kern_return_t
 vm_map_unwire(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        boolean_t               user_wire)
 {
-       return vm_map_unwire_nested(map, start, end, user_wire, (pmap_t)NULL);
+       return vm_map_unwire_nested(map, start, end, 
+                                       user_wire, (pmap_t)NULL, 0);
 }
 
 
@@ -2880,15 +3531,14 @@ vm_map_unwire(
  *
  *     Deallocate the given entry from the target map.
  */            
-void
+static void
 vm_map_entry_delete(
        register vm_map_t       map,
        register vm_map_entry_t entry)
 {
-       register vm_offset_t    s, e;
+       register vm_map_offset_t        s, e;
        register vm_object_t    object;
        register vm_map_t       submap;
-       extern vm_object_t      kernel_object;
 
        s = entry->vme_start;
        e = entry->vme_end;
@@ -2922,18 +3572,18 @@ vm_map_entry_delete(
 
 }
 
+
 void
 vm_map_submap_pmap_clean(
        vm_map_t        map,
-       vm_offset_t     start,
-       vm_offset_t     end,
+       vm_map_offset_t start,
+       vm_map_offset_t end,
        vm_map_t        sub_map,
-       vm_offset_t     offset)
+       vm_map_offset_t offset)
 {
-       vm_offset_t     submap_start;
-       vm_offset_t     submap_end;
-       vm_offset_t     addr;
-       vm_size_t       remove_size;
+       vm_map_offset_t submap_start;
+       vm_map_offset_t submap_end;
+       vm_map_size_t   remove_size;
        vm_map_entry_t  entry;
 
        submap_end = offset + (end - start);
@@ -2957,7 +3607,21 @@ vm_map_submap_pmap_clean(
                                entry->object.sub_map,
                                entry->offset);
                } else {
-                       pmap_remove(map->pmap, start, start + remove_size);
+
+                       if((map->mapped) && (map->ref_count)
+                               && (entry->object.vm_object != NULL)) {
+                               vm_object_pmap_protect(
+                                       entry->object.vm_object,
+                                       entry->offset,
+                                       remove_size,
+                                       PMAP_NULL,
+                                       entry->vme_start,
+                                       VM_PROT_NONE);
+                       } else {
+                               pmap_remove(map->pmap, 
+                                       (addr64_t)start, 
+                                       (addr64_t)(start + remove_size));
+                       }
                }
        }
 
@@ -2977,9 +3641,22 @@ vm_map_submap_pmap_clean(
                                entry->object.sub_map,
                                entry->offset);
                } else {
-                       pmap_remove(map->pmap, 
-                               (start + entry->vme_start) - offset,
-                               ((start + entry->vme_start) - offset) + remove_size);
+                       if((map->mapped) && (map->ref_count)
+                               && (entry->object.vm_object != NULL)) {
+                               vm_object_pmap_protect(
+                                       entry->object.vm_object,
+                                       entry->offset,
+                                       remove_size,
+                                       PMAP_NULL,
+                                       entry->vme_start,
+                                       VM_PROT_NONE);
+                       } else {
+                               pmap_remove(map->pmap, 
+                                  (addr64_t)((start + entry->vme_start) 
+                                                               - offset),
+                                  (addr64_t)(((start + entry->vme_start) 
+                                       - offset) + remove_size));
+                       }
                }
                entry = entry->vme_next;
        } 
@@ -2997,21 +3674,21 @@ vm_map_submap_pmap_clean(
  *
  *     This routine is called with map locked and leaves map locked.
  */
-kern_return_t
+static kern_return_t
 vm_map_delete(
-       register vm_map_t       map,
-       vm_offset_t             start,
-       register vm_offset_t    end,
-       int                     flags)
+       vm_map_t                map,
+       vm_map_offset_t         start,
+       vm_map_offset_t         end,
+       int                     flags,
+       vm_map_t                zap_map)
 {
        vm_map_entry_t          entry, next;
        struct   vm_map_entry   *first_entry, tmp_entry;
-       register vm_offset_t    s, e;
+       register vm_map_offset_t        s, e;
        register vm_object_t    object;
        boolean_t               need_wakeup;
        unsigned int            last_timestamp = ~0; /* unlikely value */
        int                     interruptible;
-       extern vm_map_t         kernel_map;
 
        interruptible = (flags & VM_MAP_REMOVE_INTERRUPTIBLE) ? 
                        THREAD_ABORTSAFE : THREAD_UNINT;
@@ -3040,7 +3717,7 @@ vm_map_delete(
                 *      Fix the lookup hint now, rather than each
                 *      time through the loop.
                 */
-               SAVE_HINT(map, entry->vme_prev);
+               SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
        } else {
                entry = first_entry->vme_next;
        }
@@ -3053,6 +3730,8 @@ vm_map_delete(
 
                vm_map_clip_end(map, entry, end);
                if (entry->in_transition) {
+                       wait_result_t wait_result;
+
                        /*
                         * Another thread is wiring/unwiring this entry.
                         * Let the other thread know we are waiting.
@@ -3069,21 +3748,17 @@ vm_map_delete(
                                need_wakeup = FALSE;
                        }
 
-                       vm_map_entry_wait(map, interruptible);
+                       wait_result = vm_map_entry_wait(map, interruptible);
 
                        if (interruptible &&
-                          current_thread()->wait_result == THREAD_INTERRUPTED)
+                           wait_result == THREAD_INTERRUPTED) {
                                /*
                                 * We do not clear the needs_wakeup flag,
                                 * since we cannot tell if we were the only one.
                                 */
+                               vm_map_unlock(map);
                                return KERN_ABORTED;
-
-                       vm_map_lock(map);
-                       /*
-                        * Cannot avoid a lookup here. reset timestamp.
-                        */
-                       last_timestamp = map->timestamp;
+                       }
 
                        /*
                         * The entry could have been clipped or it
@@ -3098,8 +3773,9 @@ vm_map_delete(
                                entry = first_entry->vme_next;
                        } else {
                                entry = first_entry;
-                               SAVE_HINT(map, entry->vme_prev);
+                               SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
                        }
+                       last_timestamp = map->timestamp;
                        continue;
                } /* end in_transition */
 
@@ -3126,28 +3802,24 @@ vm_map_delete(
                                 * error.
                                 */
                                if (flags & VM_MAP_REMOVE_WAIT_FOR_KWIRE) {
+                                       wait_result_t wait_result;
 
                                        s = entry->vme_start;
                                        entry->needs_wakeup = TRUE;
-                                       vm_map_entry_wait(map, interruptible);
+                                       wait_result = vm_map_entry_wait(map,
+                                                               interruptible);
 
                                        if (interruptible &&
-                                           current_thread()->wait_result == 
-                                                       THREAD_INTERRUPTED)
+                                           wait_result == THREAD_INTERRUPTED) {
                                                /*
                                                 * We do not clear the 
                                                 * needs_wakeup flag, since we 
                                                 * cannot tell if we were the 
                                                 * only one.
                                                 */
+                                               vm_map_unlock(map);
                                                return KERN_ABORTED;
-
-                                       vm_map_lock(map);
-                                       /*
-                                        * Cannot avoid a lookup here. reset 
-                                        * timestamp.
-                                        */
-                                       last_timestamp = map->timestamp;
+                                       }
 
                                        /*
                                         * The entry could have been clipped or
@@ -3164,8 +3836,9 @@ vm_map_delete(
                                                entry = first_entry->vme_next;
                                        } else {
                                                entry = first_entry;
-                                               SAVE_HINT(map, entry->vme_prev);
+                                               SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
                                        }
+                                       last_timestamp = map->timestamp;
                                        continue;
                                }
                                else {
@@ -3188,7 +3861,7 @@ vm_map_delete(
                        vm_map_unlock(map);
                        vm_fault_unwire(map, &tmp_entry,
                                tmp_entry.object.vm_object == kernel_object,
-                               map->pmap);
+                               map->pmap, tmp_entry.vme_start);
                        vm_map_lock(map);
 
                        if (last_timestamp+1 != map->timestamp) {
@@ -3201,10 +3874,10 @@ vm_map_delete(
                                               (!entry->is_sub_map));
                                        first_entry = first_entry->vme_next;
                                } else {
-                                       SAVE_HINT(map, entry->vme_prev);
+                                       SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
                                }
                        } else {
-                               SAVE_HINT(map, entry->vme_prev);
+                               SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
                                first_entry = entry;
                        }
 
@@ -3238,10 +3911,18 @@ vm_map_delete(
                    entry->is_sub_map) {
                        if(entry->is_sub_map) {
                           if(entry->use_pmap) {
-#ifndef i386
-                               pmap_unnest(map->pmap, entry->vme_start,
-                                       entry->vme_end - entry->vme_start);
-#endif
+#ifndef NO_NESTED_PMAP
+                               pmap_unnest(map->pmap,
+                                           (addr64_t)entry->vme_start);
+#endif /* NO_NESTED_PMAP */
+                               if((map->mapped) && (map->ref_count)) {
+                                       /* clean up parent map/maps */
+                                       vm_map_submap_pmap_clean(
+                                               map, entry->vme_start,
+                                               entry->vme_end,
+                                               entry->object.sub_map,
+                                               entry->offset);
+                               }
                           } else {
                                vm_map_submap_pmap_clean(
                                        map, entry->vme_start, entry->vme_end,
@@ -3249,21 +3930,57 @@ vm_map_delete(
                                        entry->offset);
                           }
                        } else {
-                               pmap_remove(map->pmap, 
-                                       entry->vme_start, entry->vme_end);
+                          object = entry->object.vm_object;
+                          if((map->mapped) && (map->ref_count)) {
+                             vm_object_pmap_protect(
+                                       object, entry->offset,
+                                       entry->vme_end - entry->vme_start,
+                                       PMAP_NULL,
+                                       entry->vme_start,
+                                       VM_PROT_NONE);
+                          } else {
+                                  pmap_remove(map->pmap,
+                                              (addr64_t)entry->vme_start,
+                                              (addr64_t)entry->vme_end);
+                          }
                        }
                }
 
+               /*
+                * All pmap mappings for this map entry must have been
+                * cleared by now.
+                */
+               assert(vm_map_pmap_is_empty(map,
+                                           entry->vme_start,
+                                           entry->vme_end));
+
                next = entry->vme_next;
                s = next->vme_start;
                last_timestamp = map->timestamp;
-               vm_map_entry_delete(map, entry);
-               /* vm_map_entry_delete unlocks the map */
-               vm_map_lock(map);
-               entry = next;
 
-               if(entry == vm_map_to_entry(map)) {
-                       break;
+               if ((flags & VM_MAP_REMOVE_SAVE_ENTRIES) &&
+                   zap_map != VM_MAP_NULL) {
+                       /*
+                        * The caller wants to save the affected VM map entries
+                        * into the "zap_map".  The caller will take care of
+                        * these entries.
+                        */
+                       /* unlink the entry from "map" ... */
+                       vm_map_entry_unlink(map, entry);
+                       /* ... and add it to the end of the "zap_map" */
+                       vm_map_entry_link(zap_map,
+                                         vm_map_last_entry(zap_map),
+                                         entry);
+               } else {
+                       vm_map_entry_delete(map, entry);
+                       /* vm_map_entry_delete unlocks the map */
+                       vm_map_lock(map);
+               }
+
+               entry = next;
+
+               if(entry == vm_map_to_entry(map)) {
+                       break;
                }
                if (last_timestamp+1 != map->timestamp) {
                        /*
@@ -3277,7 +3994,7 @@ vm_map_delete(
                        if (!vm_map_lookup_entry(map, s, &entry)){
                                entry = entry->vme_next;
                        } else {
-                                SAVE_HINT(map, entry->vme_prev);
+                                SAVE_HINT_MAP_WRITE(map, entry->vme_prev);
                                }
                        /* 
                         * others can not only allocate behind us, we can 
@@ -3302,6 +4019,7 @@ vm_map_delete(
        return KERN_SUCCESS;
 }
 
+
 /*
  *     vm_map_remove:
  *
@@ -3311,15 +4029,15 @@ vm_map_delete(
 kern_return_t
 vm_map_remove(
        register vm_map_t       map,
-       register vm_offset_t    start,
-       register vm_offset_t    end,
+       register vm_map_offset_t        start,
+       register vm_map_offset_t        end,
        register boolean_t      flags)
 {
        register kern_return_t  result;
 
        vm_map_lock(map);
        VM_MAP_RANGE_CHECK(map, start, end);
-       result = vm_map_delete(map, start, end, flags);
+       result = vm_map_delete(map, start, end, flags, VM_MAP_NULL);
        vm_map_unlock(map);
 
        return(result);
@@ -3340,7 +4058,7 @@ vm_map_copy_discard(
        TR_DECL("vm_map_copy_discard");
 
 /*     tr3("enter: copy 0x%x type %d", copy, copy->type);*/
-free_next_copy:
+
        if (copy == VM_MAP_COPY_NULL)
                return;
 
@@ -3365,10 +4083,10 @@ free_next_copy:
                 * allocated by a single call to kalloc(), i.e. the
                 * vm_map_copy_t was not allocated out of the zone.
                 */
-               kfree((vm_offset_t) copy, copy->cpy_kalloc_size);
+               kfree(copy, copy->cpy_kalloc_size);
                return;
        }
-       zfree(vm_map_copy_zone, (vm_offset_t) copy);
+       zfree(vm_map_copy_zone, copy);
 }
 
 /*
@@ -3429,13 +4147,13 @@ vm_map_copy_copy(
        return new_copy;
 }
 
-kern_return_t
+static kern_return_t
 vm_map_overwrite_submap_recurse(
        vm_map_t        dst_map,
-       vm_offset_t     dst_addr,
-       vm_size_t       dst_size)
+       vm_map_offset_t dst_addr,
+       vm_map_size_t   dst_size)
 {
-       vm_offset_t     dst_end;
+       vm_map_offset_t dst_end;
        vm_map_entry_t  tmp_entry;
        vm_map_entry_t  entry;
        kern_return_t   result;
@@ -3450,25 +4168,25 @@ vm_map_overwrite_submap_recurse(
         *      splitting entries in strange ways.
         */
 
-       dst_end = round_page(dst_addr + dst_size);
+       dst_end = vm_map_round_page(dst_addr + dst_size);
+       vm_map_lock(dst_map);
 
 start_pass_1:
-       vm_map_lock(dst_map);
        if (!vm_map_lookup_entry(dst_map, dst_addr, &tmp_entry)) {
                vm_map_unlock(dst_map);
                return(KERN_INVALID_ADDRESS);
        }
 
-       vm_map_clip_start(dst_map, tmp_entry, trunc_page(dst_addr));
+       vm_map_clip_start(dst_map, tmp_entry, vm_map_trunc_page(dst_addr));
 
        for (entry = tmp_entry;;) {
                vm_map_entry_t  next;
 
                next = entry->vme_next;
                while(entry->is_sub_map) {
-                       vm_offset_t     sub_start;
-                       vm_offset_t     sub_end;
-                       vm_offset_t     local_end;
+                       vm_map_offset_t sub_start;
+                       vm_map_offset_t sub_end;
+                       vm_map_offset_t local_end;
 
                        if (entry->in_transition) {
                         /*
@@ -3618,24 +4336,24 @@ start_pass_1:
  *             returned.
  */
 
-kern_return_t
+static kern_return_t
 vm_map_copy_overwrite_nested(
-       vm_map_t        dst_map,
-       vm_offset_t     dst_addr,
-       vm_map_copy_t   copy,
-       boolean_t       interruptible,
-       pmap_t          pmap)
+       vm_map_t                dst_map,
+       vm_map_address_t        dst_addr,
+       vm_map_copy_t           copy,
+       boolean_t               interruptible,
+       pmap_t                  pmap)
 {
-       vm_offset_t     dst_end;
-       vm_map_entry_t  tmp_entry;
-       vm_map_entry_t  entry;
-       kern_return_t   kr;
-       boolean_t       aligned = TRUE;
-       boolean_t       contains_permanent_objects = FALSE;
-       boolean_t       encountered_sub_map = FALSE;
-       vm_offset_t     base_addr;
-       vm_size_t       copy_size;
-       vm_size_t       total_size;
+       vm_map_offset_t         dst_end;
+       vm_map_entry_t          tmp_entry;
+       vm_map_entry_t          entry;
+       kern_return_t           kr;
+       boolean_t               aligned = TRUE;
+       boolean_t               contains_permanent_objects = FALSE;
+       boolean_t               encountered_sub_map = FALSE;
+       vm_map_offset_t         base_addr;
+       vm_map_size_t           copy_size;
+       vm_map_size_t           total_size;
 
 
        /*
@@ -3680,25 +4398,35 @@ vm_map_copy_overwrite_nested(
                !page_aligned (dst_addr))
        {
                aligned = FALSE;
-               dst_end = round_page(dst_addr + copy->size);
+               dst_end = vm_map_round_page(dst_addr + copy->size);
        } else {
                dst_end = dst_addr + copy->size;
        }
 
-start_pass_1:
        vm_map_lock(dst_map);
+
+       /* LP64todo - remove this check when vm_map_commpage64()
+        * no longer has to stuff in a map_entry for the commpage
+        * above the map's max_offset.
+        */
+       if (dst_addr >= dst_map->max_offset) {
+               vm_map_unlock(dst_map);
+               return(KERN_INVALID_ADDRESS);
+       }
+        
+start_pass_1:
        if (!vm_map_lookup_entry(dst_map, dst_addr, &tmp_entry)) {
                vm_map_unlock(dst_map);
                return(KERN_INVALID_ADDRESS);
        }
-       vm_map_clip_start(dst_map, tmp_entry, trunc_page(dst_addr));
+       vm_map_clip_start(dst_map, tmp_entry, vm_map_trunc_page(dst_addr));
        for (entry = tmp_entry;;) {
                vm_map_entry_t  next = entry->vme_next;
 
                while(entry->is_sub_map) {
-                       vm_offset_t     sub_start;
-                       vm_offset_t     sub_end;
-                       vm_offset_t     local_end;
+                       vm_map_offset_t sub_start;
+                       vm_map_offset_t sub_end;
+                       vm_map_offset_t local_end;
 
                        if (entry->in_transition) {
 
@@ -3834,11 +4562,11 @@ start_overwrite:
                /* deconstruct the copy object and do in parts */
                /* only in sub_map, interruptable case */
                vm_map_entry_t  copy_entry;
-               vm_map_entry_t  previous_prev;
-               vm_map_entry_t  next_copy;
+               vm_map_entry_t  previous_prev = VM_MAP_ENTRY_NULL;
+               vm_map_entry_t  next_copy = VM_MAP_ENTRY_NULL;
                int             nentries;
-               int             remaining_entries;
-               int             new_offset;
+               int             remaining_entries = 0;
+               int             new_offset = 0;
        
                for (entry = tmp_entry; copy_size == 0;) {
                        vm_map_entry_t  next;
@@ -3860,7 +4588,6 @@ start_overwrite:
                                        entry->needs_wakeup = TRUE;
                                        vm_map_entry_wait(dst_map, THREAD_UNINT);
 
-                               vm_map_lock(dst_map);
                                if(!vm_map_lookup_entry(dst_map, base_addr, 
                                                                &tmp_entry)) {
                                        vm_map_unlock(dst_map);
@@ -3871,9 +4598,9 @@ start_overwrite:
                                continue;
                        }
                        if(entry->is_sub_map) {
-                               vm_offset_t     sub_start;
-                               vm_offset_t     sub_end;
-                               vm_offset_t     local_end;
+                               vm_map_offset_t sub_start;
+                               vm_map_offset_t sub_end;
+                               vm_map_offset_t local_end;
 
                                if (entry->needs_copy) {
                                        /* if this is a COW submap */
@@ -3929,8 +4656,8 @@ start_overwrite:
 
                                /* adjust the copy object */
                                if (total_size > copy_size) {
-                                       vm_size_t       local_size = 0;
-                                       vm_size_t       entry_size;
+                                       vm_map_size_t   local_size = 0;
+                                       vm_map_size_t   entry_size;
 
                                   nentries = 1;
                                   new_offset = copy->offset;
@@ -4060,8 +4787,8 @@ start_overwrite:
 
                /* adjust the copy object */
                if (total_size > copy_size) {
-                       vm_size_t       local_size = 0;
-                       vm_size_t       entry_size;
+                       vm_map_size_t   local_size = 0;
+                       vm_map_size_t   entry_size;
 
                        new_offset = copy->offset;
                        copy_entry = vm_map_copy_first_entry(copy);
@@ -4177,7 +4904,7 @@ start_overwrite:
                                break;
                        }
                }
-               vm_map_clip_start(dst_map, tmp_entry, trunc_page(base_addr));
+               vm_map_clip_start(dst_map, tmp_entry, vm_map_trunc_page(base_addr));
 
                entry = tmp_entry;
        } /* while */
@@ -4193,7 +4920,7 @@ start_overwrite:
 kern_return_t
 vm_map_copy_overwrite(
        vm_map_t        dst_map,
-       vm_offset_t     dst_addr,
+       vm_map_offset_t dst_addr,
        vm_map_copy_t   copy,
        boolean_t       interruptible)
 {
@@ -4203,7 +4930,7 @@ vm_map_copy_overwrite(
 
 
 /*
- *     Routine: vm_map_copy_overwrite_unaligned
+ *     Routine: vm_map_copy_overwrite_unaligned        [internal use only]
  *
  *     Decription:
  *     Physically copy unaligned data
@@ -4225,12 +4952,12 @@ vm_map_copy_overwrite(
  *     unlocked on error.
  */
 
-kern_return_t
+static kern_return_t
 vm_map_copy_overwrite_unaligned(
        vm_map_t        dst_map,
        vm_map_entry_t  entry,
        vm_map_copy_t   copy,
-       vm_offset_t     start)
+       vm_map_offset_t start)
 {
        vm_map_entry_t          copy_entry = vm_map_copy_first_entry(copy);
        vm_map_version_t        version;
@@ -4238,8 +4965,8 @@ vm_map_copy_overwrite_unaligned(
        vm_object_offset_t      dst_offset;
        vm_object_offset_t      src_offset;
        vm_object_offset_t      entry_offset;
-       vm_offset_t             entry_end;
-       vm_size_t               src_size,
+       vm_map_offset_t         entry_end;
+       vm_map_size_t           src_size,
                                dst_size,
                                copy_size,
                                amount_left;
@@ -4247,7 +4974,7 @@ vm_map_copy_overwrite_unaligned(
 
        vm_map_lock_write_to_read(dst_map);
 
-       src_offset = copy->offset - trunc_page_64(copy->offset);
+       src_offset = copy->offset - vm_object_trunc_page(copy->offset);
        amount_left = copy->size;
 /*
  *     unaligned so we never clipped this entry, we need the offset into
@@ -4300,7 +5027,7 @@ vm_map_copy_overwrite_unaligned(
                        }
                        vm_object_shadow(&entry->object.vm_object,
                                        &entry->offset,
-                                       (vm_size_t)(entry->vme_end
+                                       (vm_map_size_t)(entry->vme_end
                                                - entry->vme_start));
                        entry->needs_copy = FALSE;
                        vm_map_lock_write_to_read(dst_map);
@@ -4315,7 +5042,7 @@ vm_map_copy_overwrite_unaligned(
                                vm_map_lock_read(dst_map);
                                goto RetryLookup;
                        }
-                       dst_object = vm_object_allocate((vm_size_t)
+                       dst_object = vm_object_allocate((vm_map_size_t)
                                        entry->vme_end - entry->vme_start);
                        entry->object.vm_object = dst_object;
                        entry->offset = 0;
@@ -4412,14 +5139,11 @@ RetryLookup:
                }
        }/* while */
 
-       /* NOTREACHED ?? */
-       vm_map_unlock_read(dst_map);
-
        return KERN_SUCCESS;
 }/* vm_map_copy_overwrite_unaligned */
 
 /*
- *     Routine:        vm_map_copy_overwrite_aligned
+ *     Routine: vm_map_copy_overwrite_aligned  [internal use only]
  *
  *     Description:
  *     Does all the vm_trickery possible for whole pages.
@@ -4437,18 +5161,21 @@ RetryLookup:
  *     to the above pass and make sure that no wiring is involved.
  */
 
-kern_return_t
+static kern_return_t
 vm_map_copy_overwrite_aligned(
        vm_map_t        dst_map,
        vm_map_entry_t  tmp_entry,
        vm_map_copy_t   copy,
-       vm_offset_t     start,
+       vm_map_offset_t start,
+#if !BAD_OPTIMIZATION
+       __unused
+#endif /* !BAD_OPTIMIZATION */
        pmap_t          pmap)
 {
        vm_object_t     object;
        vm_map_entry_t  copy_entry;
-       vm_size_t       copy_size;
-       vm_size_t       size;
+       vm_map_size_t   copy_size;
+       vm_map_size_t   size;
        vm_map_entry_t  entry;
                
        while ((copy_entry = vm_map_copy_first_entry(copy))
@@ -4542,32 +5269,46 @@ vm_map_copy_overwrite_aligned(
 
                        if (old_object != VM_OBJECT_NULL) {
                                if(entry->is_sub_map) {
-                                  if(entry->use_pmap) {
-#ifndef i386
-                                     pmap_unnest(dst_map->pmap, 
-                                       entry->vme_start,
-                                       entry->vme_end - entry->vme_start);
-#endif
-                                  } else {
-                                     vm_map_submap_pmap_clean(
-                                       dst_map, entry->vme_start, 
-                                       entry->vme_end,
-                                       entry->object.sub_map,
-                                       entry->offset);
-                                  }
-                                  vm_map_deallocate(
+                                       if(entry->use_pmap) {
+#ifndef NO_NESTED_PMAP
+                                               pmap_unnest(dst_map->pmap, 
+                                                           (addr64_t)entry->vme_start);
+#endif /* NO_NESTED_PMAP */
+                                               if(dst_map->mapped) {
+                                                       /* clean up parent */
+                                                       /* map/maps */
+                                                  vm_map_submap_pmap_clean(
+                                                       dst_map, entry->vme_start,
+                                                       entry->vme_end,
+                                                       entry->object.sub_map,
+                                                       entry->offset);
+                                               }
+                                       } else {
+                                               vm_map_submap_pmap_clean(
+                                                       dst_map, entry->vme_start, 
+                                                       entry->vme_end,
+                                                       entry->object.sub_map,
+                                                       entry->offset);
+                                       }
+                                       vm_map_deallocate(
                                                entry->object.sub_map);
-                               } else {
-                                       vm_object_pmap_protect(
-                                               old_object,
-                                               old_offset,
-                                               size,
-                                               pmap,
-                                               tmp_entry->vme_start,
-                                               VM_PROT_NONE);
-
+                               } else {
+                                       if(dst_map->mapped) {
+                                               vm_object_pmap_protect(
+                                                       entry->object.vm_object,
+                                                       entry->offset,
+                                                       entry->vme_end 
+                                                               - entry->vme_start,
+                                                       PMAP_NULL,
+                                                       entry->vme_start,
+                                                       VM_PROT_NONE);
+                                       } else {
+                                          pmap_remove(dst_map->pmap, 
+                                            (addr64_t)(entry->vme_start), 
+                                            (addr64_t)(entry->vme_end));
+                                       }
                                        vm_object_deallocate(old_object);
-                               }
+                               }
                        }
 
                        entry->is_sub_map = FALSE;
@@ -4596,7 +5337,7 @@ vm_map_copy_overwrite_aligned(
                         * (but avoid uninstantiated objects)
                         */
                        if (object != VM_OBJECT_NULL) {
-                           vm_offset_t va = entry->vme_start;
+                           vm_map_offset_t     va = entry->vme_start;
 
                            while (va < entry->vme_end) {
                                register vm_page_t      m;
@@ -4609,9 +5350,17 @@ vm_map_copy_overwrite_aligned(
                                vm_object_lock(object);
                                vm_object_paging_begin(object);
 
+                               /*
+                                * ENCRYPTED SWAP:
+                                * If the page is encrypted, skip it:
+                                * we can't let the user see the encrypted
+                                * contents.  The page will get decrypted
+                                * on demand when the user generates a
+                                * soft-fault when trying to access it.
+                                */
                                if ((m = vm_page_lookup(object,offset)) !=
-                                   VM_PAGE_NULL && !m->busy && 
-                                   !m->fictitious &&
+                                   VM_PAGE_NULL && !m->busy &&
+                                   !m->fictitious && !m->encrypted &&
                                    (!m->unusual || (!m->error &&
                                        !m->restart && !m->absent &&
                                         (prot & m->page_lock) == 0))) {
@@ -4624,21 +5373,28 @@ vm_map_copy_overwrite_aligned(
                                         */
                                        if (entry->needs_copy)
                                                prot &= ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                                       if (entry->alias != VM_MEMORY_STACK && prot)
+                                               prot |= VM_PROT_EXECUTE;
+#endif
                                        /* It is our policy to require */
                                        /* explicit sync from anyone   */
                                        /* writing code and then       */
                                        /* a pc to execute it.         */
                                        /* No isync here */
 
-                                       PMAP_ENTER(pmap, va, m,
-                                                  prot, FALSE);
+                                       PMAP_ENTER(pmap, va, m, prot, 
+                                               ((unsigned int)
+                                                       (m->object->wimg_bits)) 
+                                                       & VM_WIMG_MASK,
+                                               FALSE);
                
                                        vm_object_lock(object);
                                        vm_page_lock_queues();
                                        if (!m->active && !m->inactive)
                                                vm_page_activate(m);
                                        vm_page_unlock_queues();
-                                        PAGE_WAKEUP_DONE(m);
+                                       PAGE_WAKEUP_DONE(m);
                                }
                                vm_object_paging_end(object);
                                vm_object_unlock(object);
@@ -4672,7 +5428,8 @@ vm_map_copy_overwrite_aligned(
 
                        vm_object_reference(dst_object);
 
-                       version.main_timestamp = dst_map->timestamp;
+                       /* account for unlock bumping up timestamp */
+                       version.main_timestamp = dst_map->timestamp + 1;
 
                        vm_map_unlock(dst_map);
 
@@ -4725,7 +5482,7 @@ vm_map_copy_overwrite_aligned(
 
                        start += copy_size;
                        vm_map_lock(dst_map);
-                       if ((version.main_timestamp + 1) == dst_map->timestamp) {
+                       if (version.main_timestamp == dst_map->timestamp) {
                                /* We can safely use saved tmp_entry value */
 
                                vm_map_clip_end(dst_map, tmp_entry, start);
@@ -4746,26 +5503,26 @@ vm_map_copy_overwrite_aligned(
 }/* vm_map_copy_overwrite_aligned */
 
 /*
- *     Routine:        vm_map_copyin_kernel_buffer
+ *     Routine: vm_map_copyin_kernel_buffer [internal use only]
  *
  *     Description:
  *             Copy in data to a kernel buffer from space in the
- *             source map. The original space may be otpionally
+ *             source map. The original space may be optionally
  *             deallocated.
  *
  *             If successful, returns a new copy object.
  */
-kern_return_t
+static kern_return_t
 vm_map_copyin_kernel_buffer(
        vm_map_t        src_map,
-       vm_offset_t     src_addr,
-       vm_size_t       len,
+       vm_map_offset_t src_addr,
+       vm_map_size_t   len,
        boolean_t       src_destroy,
        vm_map_copy_t   *copy_result)
 {
-       boolean_t flags;
+       kern_return_t kr;
        vm_map_copy_t copy;
-       vm_size_t kalloc_size = sizeof(struct vm_map_copy) + len;
+       vm_map_size_t kalloc_size = sizeof(struct vm_map_copy) + len;
 
        copy = (vm_map_copy_t) kalloc(kalloc_size);
        if (copy == VM_MAP_COPY_NULL) {
@@ -4774,34 +5531,28 @@ vm_map_copyin_kernel_buffer(
        copy->type = VM_MAP_COPY_KERNEL_BUFFER;
        copy->size = len;
        copy->offset = 0;
-       copy->cpy_kdata = (vm_offset_t) (copy + 1);
+       copy->cpy_kdata = (void *) (copy + 1);
        copy->cpy_kalloc_size = kalloc_size;
 
-       if (src_map == kernel_map) {
-               bcopy((char *)src_addr, (char *)copy->cpy_kdata, len);
-               flags = VM_MAP_REMOVE_KUNWIRE | VM_MAP_REMOVE_WAIT_FOR_KWIRE |
-                       VM_MAP_REMOVE_INTERRUPTIBLE;
-       } else {
-               kern_return_t kr;
-               kr = copyinmap(src_map, src_addr, copy->cpy_kdata, len);
-               if (kr != KERN_SUCCESS) {
-                       kfree((vm_offset_t)copy, kalloc_size);
-                       return kr;
-               }
-               flags = VM_MAP_REMOVE_WAIT_FOR_KWIRE |
-                       VM_MAP_REMOVE_INTERRUPTIBLE;
+       kr = copyinmap(src_map, src_addr, copy->cpy_kdata, len);
+       if (kr != KERN_SUCCESS) {
+               kfree(copy, kalloc_size);
+               return kr;
        }
        if (src_destroy) {
-               (void) vm_map_remove(src_map, trunc_page(src_addr), 
-                                    round_page(src_addr + len),
-                                    flags);
+               (void) vm_map_remove(src_map, vm_map_trunc_page(src_addr), 
+                               vm_map_round_page(src_addr + len),
+                               VM_MAP_REMOVE_INTERRUPTIBLE |
+                               VM_MAP_REMOVE_WAIT_FOR_KWIRE |
+                               (src_map == kernel_map) ?
+                                       VM_MAP_REMOVE_KUNWIRE : 0);
        }
        *copy_result = copy;
        return KERN_SUCCESS;
 }
 
 /*
- *     Routine:        vm_map_copyout_kernel_buffer
+ *     Routine: vm_map_copyout_kernel_buffer   [internal use only]
  *
  *     Description:
  *             Copy out data from a kernel buffer into space in the
@@ -4811,15 +5562,16 @@ vm_map_copyin_kernel_buffer(
  *             If successful, consumes the copy object.
  *             Otherwise, the caller is responsible for it.
  */
-kern_return_t
+static int vm_map_copyout_kernel_buffer_failures = 0;
+static kern_return_t
 vm_map_copyout_kernel_buffer(
-       vm_map_t        map,
-       vm_offset_t     *addr,  /* IN/OUT */
-       vm_map_copy_t   copy,
-       boolean_t       overwrite)
+       vm_map_t                map,
+       vm_map_address_t        *addr,  /* IN/OUT */
+       vm_map_copy_t           copy,
+       boolean_t               overwrite)
 {
        kern_return_t kr = KERN_SUCCESS;
-       thread_act_t thr_act = current_act();
+       thread_t thread = current_thread();
 
        if (!overwrite) {
 
@@ -4829,9 +5581,9 @@ vm_map_copyout_kernel_buffer(
                *addr = 0;
                kr = vm_map_enter(map, 
                                  addr, 
-                                 round_page(copy->size),
-                                 (vm_offset_t) 0, 
-                                 TRUE,
+                                 vm_map_round_page(copy->size),
+                                 (vm_map_offset_t) 0, 
+                                 VM_FLAGS_ANYWHERE,
                                  VM_OBJECT_NULL, 
                                  (vm_object_offset_t) 0, 
                                  FALSE,
@@ -4839,21 +5591,20 @@ vm_map_copyout_kernel_buffer(
                                  VM_PROT_ALL,
                                  VM_INHERIT_DEFAULT);
                if (kr != KERN_SUCCESS)
-                       return(kr);
+                       return kr;
        }
 
        /*
         * Copyout the data from the kernel buffer to the target map.
         */     
-       if (thr_act->map == map) {
+       if (thread->map == map) {
        
                /*
                 * If the target map is the current map, just do
                 * the copy.
                 */
-               if (copyout((char *)copy->cpy_kdata, (char *)*addr,
-                               copy->size)) {
-                       return(KERN_INVALID_ADDRESS);
+               if (copyout(copy->cpy_kdata, *addr, copy->size)) {
+                       kr = KERN_INVALID_ADDRESS;
                }
        }
        else {
@@ -4867,18 +5618,34 @@ vm_map_copyout_kernel_buffer(
                vm_map_reference(map);
                oldmap = vm_map_switch(map);
 
-               if (copyout((char *)copy->cpy_kdata, (char *)*addr,
-                               copy->size)) {
-                       return(KERN_INVALID_ADDRESS);
+               if (copyout(copy->cpy_kdata, *addr, copy->size)) {
+                       vm_map_copyout_kernel_buffer_failures++;
+                       kr = KERN_INVALID_ADDRESS;
                }
        
                (void) vm_map_switch(oldmap);
                vm_map_deallocate(map);
        }
 
-       kfree((vm_offset_t)copy, copy->cpy_kalloc_size);
+       if (kr != KERN_SUCCESS) {
+               /* the copy failed, clean up */
+               if (!overwrite) {
+                       /*
+                        * Deallocate the space we allocated in the target map.
+                        */
+                       (void) vm_map_remove(map,
+                                            vm_map_trunc_page(*addr),
+                                            vm_map_round_page(*addr +
+                                                              vm_map_round_page(copy->size)),
+                                            VM_MAP_NO_FLAGS);
+                       *addr = 0;
+               }
+       } else {
+               /* copy was successful, dicard the copy structure */
+               kfree(copy, copy->cpy_kalloc_size);
+       }
 
-       return(kr);
+       return kr;
 }
                
 /*
@@ -4906,7 +5673,7 @@ MACRO_BEGIN                                                               \
                ->vme_prev = VMCI_where;                                \
        VMCI_map->hdr.nentries += VMCI_copy->cpy_hdr.nentries;          \
        UPDATE_FIRST_FREE(VMCI_map, VMCI_map->first_free);              \
-       zfree(vm_map_copy_zone, (vm_offset_t) VMCI_copy);               \
+       zfree(vm_map_copy_zone, VMCI_copy);                             \
 MACRO_END
 
 /*
@@ -4921,13 +5688,13 @@ MACRO_END
  */
 kern_return_t
 vm_map_copyout(
-       register vm_map_t       dst_map,
-       vm_offset_t             *dst_addr,      /* OUT */
-       register vm_map_copy_t  copy)
+       vm_map_t                dst_map,
+       vm_map_address_t        *dst_addr,      /* OUT */
+       vm_map_copy_t           copy)
 {
-       vm_size_t               size;
-       vm_size_t               adjustment;
-       vm_offset_t             start;
+       vm_map_size_t           size;
+       vm_map_size_t           adjustment;
+       vm_map_offset_t         start;
        vm_object_offset_t      vm_copy_start;
        vm_map_entry_t          last;
        register
@@ -4952,20 +5719,20 @@ vm_map_copyout(
                kern_return_t           kr;
                vm_object_offset_t      offset;
 
-               offset = trunc_page_64(copy->offset);
-               size = round_page(copy->size + 
-                               (vm_size_t)(copy->offset - offset));
+               offset = vm_object_trunc_page(copy->offset);
+               size = vm_map_round_page(copy->size + 
+                               (vm_map_size_t)(copy->offset - offset));
                *dst_addr = 0;
                kr = vm_map_enter(dst_map, dst_addr, size,
-                                 (vm_offset_t) 0, TRUE,
+                                 (vm_map_offset_t) 0, VM_FLAGS_ANYWHERE,
                                  object, offset, FALSE,
                                  VM_PROT_DEFAULT, VM_PROT_ALL,
                                  VM_INHERIT_DEFAULT);
                if (kr != KERN_SUCCESS)
                        return(kr);
                /* Account for non-pagealigned copy object */
-               *dst_addr += (vm_offset_t)(copy->offset - offset);
-               zfree(vm_map_copy_zone, (vm_offset_t) copy);
+               *dst_addr += (vm_map_offset_t)(copy->offset - offset);
+               zfree(vm_map_copy_zone, copy);
                return(KERN_SUCCESS);
        }
 
@@ -4983,8 +5750,8 @@ vm_map_copyout(
         *      Find space for the data
         */
 
-       vm_copy_start = trunc_page_64(copy->offset);
-       size =  round_page((vm_size_t)copy->offset + copy->size) 
+       vm_copy_start = vm_object_trunc_page(copy->offset);
+       size =  vm_map_round_page((vm_map_size_t)copy->offset + copy->size) 
                                                        - vm_copy_start;
 
  StartAgain: ;
@@ -4996,7 +5763,7 @@ vm_map_copyout(
 
        while (TRUE) {
                vm_map_entry_t  next = last->vme_next;
-               vm_offset_t     end = start + size;
+               vm_map_offset_t end = start + size;
 
                if ((end > dst_map->max_offset) || (end < start)) {
                        if (dst_map->wait_for_space) {
@@ -5004,7 +5771,7 @@ vm_map_copyout(
                                        assert_wait((event_t) dst_map,
                                                    THREAD_INTERRUPTIBLE);
                                        vm_map_unlock(dst_map);
-                                       thread_block((void (*)(void))0);
+                                       thread_block(THREAD_CONTINUE_NULL);
                                        goto StartAgain;
                                }
                        }
@@ -5063,7 +5830,7 @@ vm_map_copyout(
                                vm_map_copy_last_entry(copy),
                                new);
                next = entry->vme_next;
-               zfree(old_zone, (vm_offset_t) entry);
+               zfree(old_zone, entry);
                entry = next;
            }
        }
@@ -5090,9 +5857,10 @@ vm_map_copyout(
                 * map the pages into the destination map.
                 */
                if (entry->wired_count != 0) {
-                   register vm_offset_t va;
+                   register vm_map_offset_t va;
                    vm_object_offset_t   offset;
                    register vm_object_t object;
+                   vm_prot_t prot;
 
                    object = entry->object.vm_object;
                    offset = entry->offset;
@@ -5131,11 +5899,28 @@ vm_map_copyout(
                            m->absent)
                            panic("vm_map_copyout: wiring 0x%x", m);
 
+                       /*
+                        * ENCRYPTED SWAP:
+                        * The page is assumed to be wired here, so it
+                        * shouldn't be encrypted.  Otherwise, we
+                        * couldn't enter it in the page table, since
+                        * we don't want the user to see the encrypted
+                        * data.
+                        */
+                       ASSERT_PAGE_DECRYPTED(m);
+
                        m->busy = TRUE;
                        vm_object_unlock(object);
-
-                       PMAP_ENTER(dst_map->pmap, va, m,
-                                  entry->protection, TRUE);
+                       prot = entry->protection;
+#ifdef STACK_ONLY_NX
+                       if (entry->alias != VM_MEMORY_STACK && prot)
+                               prot |= VM_PROT_EXECUTE;
+#endif
+                       PMAP_ENTER(dst_map->pmap, va, m, prot, 
+                                               ((unsigned int)
+                                                       (m->object->wimg_bits)) 
+                                                       & VM_WIMG_MASK,
+                                               TRUE);
 
                        vm_object_lock(object);
                        PAGE_WAKEUP_DONE(m);
@@ -5149,7 +5934,7 @@ vm_map_copyout(
                }
                else if (size <= vm_map_aggressive_enter_max) {
 
-                       register vm_offset_t    va;
+                       register vm_map_offset_t        va;
                        vm_object_offset_t      offset;
                        register vm_object_t    object;
                        vm_prot_t               prot;
@@ -5170,10 +5955,20 @@ vm_map_copyout(
                                        vm_object_lock(object);
                                        vm_object_paging_begin(object);
 
+                                       /*
+                                        * ENCRYPTED SWAP:
+                                        * If the page is encrypted, skip it:
+                                        * we can't let the user see the
+                                        * encrypted contents.  The page will
+                                        * get decrypted on demand when the
+                                        * user generates a soft-fault when
+                                        * trying to access it.
+                                        */
                                        if (((m = vm_page_lookup(object,
                                                                 offset))
                                             != VM_PAGE_NULL) &&
                                            !m->busy && !m->fictitious &&
+                                           !m->encrypted &&
                                            !m->absent && !m->error) {
                                                m->busy = TRUE;
                                                vm_object_unlock(object);
@@ -5182,9 +5977,16 @@ vm_map_copyout(
                                                prot = entry->protection;
                                                if (entry->needs_copy)
                                                        prot &= ~VM_PROT_WRITE;
-
+#ifdef STACK_ONLY_NX
+                                               if (entry->alias != VM_MEMORY_STACK && prot)
+                                                       prot |= VM_PROT_EXECUTE;
+#endif
                                                PMAP_ENTER(dst_map->pmap, va, 
-                                                          m, prot, FALSE);
+                                                       m, prot, 
+                                                       ((unsigned int)
+                                                       (m->object->wimg_bits)) 
+                                                          & VM_WIMG_MASK,
+                                                       FALSE);
 
                                                vm_object_lock(object);
                                                vm_page_lock_queues();
@@ -5213,7 +6015,7 @@ vm_map_copyout(
         *      Update the hints and the map size
         */
 
-       SAVE_HINT(dst_map, vm_map_copy_last_entry(copy));
+       SAVE_HINT_MAP_WRITE(dst_map, vm_map_copy_last_entry(copy));
 
        dst_map->size += size;
 
@@ -5232,9 +6034,6 @@ vm_map_copyout(
        return(KERN_SUCCESS);
 }
 
-boolean_t       vm_map_aggressive_enter;        /* not used yet */
-
-
 /*
  *     Routine:        vm_map_copyin
  *
@@ -5256,23 +6055,21 @@ boolean_t       vm_map_aggressive_enter;        /* not used yet */
 
 typedef struct submap_map {
        vm_map_t        parent_map;
-       vm_offset_t     base_start;
-       vm_offset_t     base_end;
+       vm_map_offset_t base_start;
+       vm_map_offset_t base_end;
        struct submap_map *next;
 } submap_map_t;
 
 kern_return_t
 vm_map_copyin_common(
        vm_map_t        src_map,
-       vm_offset_t     src_addr,
-       vm_size_t       len,
+       vm_map_address_t src_addr,
+       vm_map_size_t   len,
        boolean_t       src_destroy,
-       boolean_t       src_volatile,
+       __unused boolean_t      src_volatile,
        vm_map_copy_t   *copy_result,   /* OUT */
        boolean_t       use_maxprot)
 {
-       extern int      msg_ool_size_small;
-
        vm_map_entry_t  tmp_entry;      /* Result of last map lookup --
                                         * in multi-level lookup, this
                                         * entry contains the actual
@@ -5281,22 +6078,18 @@ vm_map_copyin_common(
        register
        vm_map_entry_t  new_entry = VM_MAP_ENTRY_NULL;  /* Map entry for copy */
 
-       vm_offset_t     src_start;      /* Start of current entry --
+       vm_map_offset_t src_start;      /* Start of current entry --
                                         * where copy is taking place now
                                         */
-       vm_offset_t     src_end;        /* End of entire region to be
+       vm_map_offset_t src_end;        /* End of entire region to be
                                         * copied */
-       vm_offset_t     base_start;     /* submap fields to save offsets */
-                                       /* in original map */
-       vm_offset_t     base_end;
-       vm_map_t        base_map=src_map;
-       vm_map_entry_t  base_entry;
+       vm_map_t        base_map = src_map;
        boolean_t       map_share=FALSE;
        submap_map_t    *parent_maps = NULL;
 
        register
        vm_map_copy_t   copy;           /* Resulting copy */
-       vm_offset_t     copy_addr;
+       vm_map_address_t        copy_addr;
 
        /*
         *      Check for copies of zero bytes.
@@ -5307,6 +6100,13 @@ vm_map_copyin_common(
                return(KERN_SUCCESS);
        }
 
+       /*
+        *      Check that the end address doesn't overflow
+        */
+       src_end = src_addr + len;
+       if (src_end < src_addr)
+               return KERN_INVALID_ADDRESS;
+
        /*
         * If the copy is sufficiently small, use a kernel buffer instead
         * of making a virtual copy.  The theory being that the cost of
@@ -5318,22 +6118,13 @@ vm_map_copyin_common(
                                             src_destroy, copy_result);
 
        /*
-        *      Compute start and end of region
+        *      Compute (page aligned) start and end of region
         */
-
-       src_start = trunc_page(src_addr);
-       src_end = round_page(src_addr + len);
+       src_start = vm_map_trunc_page(src_addr);
+       src_end = vm_map_round_page(src_end);
 
        XPR(XPR_VM_MAP, "vm_map_copyin_common map 0x%x addr 0x%x len 0x%x dest %d\n", (natural_t)src_map, src_addr, len, src_destroy, 0);
 
-       /*
-        *      Check that the end address doesn't overflow
-        */
-
-       if (src_end <= src_start)
-               if ((src_end < src_start) || (src_start != 0))
-                       return(KERN_INVALID_ADDRESS);
-
        /*
         *      Allocate a header element for the list.
         *
@@ -5356,15 +6147,19 @@ vm_map_copyin_common(
 #define        RETURN(x)                                               \
        MACRO_BEGIN                                             \
        vm_map_unlock(src_map);                                 \
+       if(src_map != base_map)                                 \
+               vm_map_deallocate(src_map);                     \
        if (new_entry != VM_MAP_ENTRY_NULL)                     \
                vm_map_copy_entry_dispose(copy,new_entry);      \
        vm_map_copy_discard(copy);                              \
        {                                                       \
-               submap_map_t    *ptr;                           \
+               submap_map_t    *_ptr;                          \
                                                                \
-               for(ptr = parent_maps; ptr != NULL; ptr = parent_maps) { \
+               for(_ptr = parent_maps; _ptr != NULL; _ptr = parent_maps) { \
                        parent_maps=parent_maps->next;          \
-                       kfree((vm_offset_t)ptr, sizeof(submap_map_t));  \
+                       if (_ptr->parent_map != base_map)       \
+                               vm_map_deallocate(_ptr->parent_map);    \
+                       kfree(_ptr, sizeof(submap_map_t));      \
                }                                               \
        }                                                       \
        MACRO_RETURN(x);                                        \
@@ -5391,7 +6186,7 @@ vm_map_copyin_common(
        while (TRUE) {
                register
                vm_map_entry_t  src_entry = tmp_entry;  /* Top-level entry */
-               vm_size_t       src_size;               /* Size of source
+               vm_map_size_t   src_size;               /* Size of source
                                                         * map entry (in both
                                                         * maps)
                                                         */
@@ -5415,7 +6210,7 @@ vm_map_copyin_common(
                                                         * copy_strategically.
                                                         */
                while(tmp_entry->is_sub_map) {
-                       vm_size_t submap_len;
+                       vm_map_size_t submap_len;
                        submap_map_t *ptr;
 
                        ptr = (submap_map_t *)kalloc(sizeof(submap_map_t));
@@ -5434,6 +6229,9 @@ vm_map_copyin_common(
                        src_end = src_start + submap_len;
                        src_map = tmp_entry->object.sub_map;
                        vm_map_lock(src_map);
+                       /* keep an outstanding reference for all maps in */
+                       /* the parents tree except the base map */
+                       vm_map_reference(src_map);
                        vm_map_unlock(ptr->parent_map);
                        if (!vm_map_lookup_entry(
                                        src_map, src_start, &tmp_entry))
@@ -5445,11 +6243,13 @@ vm_map_copyin_common(
                }
                if ((tmp_entry->object.vm_object != VM_OBJECT_NULL) && 
                    (tmp_entry->object.vm_object->phys_contiguous)) {
-                       /* This is not, cannot be supported for now */
-                       /* we need a description of the caching mode */
-                       /* reflected in the object before we can     */
-                       /* support copyin, and then the support will */
-                       /* be for direct copy */
+                       /* This is not, supported for now.In future */
+                       /* we will need to detect the phys_contig   */
+                       /* condition and then upgrade copy_slowly   */
+                       /* to do physical copy from the device mem  */
+                       /* based object. We can piggy-back off of   */
+                       /* the was wired boolean to set-up the      */
+                       /* proper handling */
                        RETURN(KERN_PROTECTION_FAILURE);
                }
                /*
@@ -5528,8 +6328,9 @@ RestartCopy:
                XPR(XPR_VM_MAP, "vm_map_copyin_common src_obj 0x%x ent 0x%x obj 0x%x was_wired %d\n",
                    src_object, new_entry, new_entry->object.vm_object,
                    was_wired, 0);
-               if (!was_wired &&
-                   vm_object_copy_quickly(
+               if ((src_object == VM_OBJECT_NULL ||
+                       (!was_wired && !map_share && !tmp_entry->is_shared)) &&
+                       vm_object_copy_quickly(
                                &new_entry->object.vm_object,
                                src_offset,
                                src_size,
@@ -5543,49 +6344,24 @@ RestartCopy:
                         */
 
                        if (src_needs_copy && !tmp_entry->needs_copy) {
-                               if (tmp_entry->is_shared  || 
-                                    tmp_entry->object.vm_object->true_share ||
-                                    map_share) {
-                                       vm_map_unlock(src_map);
-                                       new_entry->object.vm_object = 
-                                               vm_object_copy_delayed(
-                                                       src_object,
-                                                       src_offset,     
-                                                       src_size);
-                                       /* dec ref gained in copy_quickly */
-                                       vm_object_lock(src_object);
-                                       src_object->ref_count--;
-                                       assert(src_object->ref_count > 0);
-                                       vm_object_res_deallocate(src_object);
-                                       vm_object_unlock(src_object);
-                                       vm_map_lock(src_map);
-                                       /* 
-                                        * it turns out that we have
-                                        * finished our copy. No matter
-                                        * what the state of the map
-                                        * we will lock it again here
-                                        * knowing that if there is
-                                        * additional data to copy
-                                        * it will be checked at
-                                        * the top of the loop
-                                        *
-                                        * Don't do timestamp check
-                                        */
-                                       
-                               } else {
-                                       vm_object_pmap_protect(
-                                               src_object,
-                                               src_offset,
-                                               src_size,
-                                               (src_entry->is_shared ? 
-                                                       PMAP_NULL
-                                                       : src_map->pmap),
-                                               src_entry->vme_start,
-                                               src_entry->protection &
-                                                       ~VM_PROT_WRITE);
+                               vm_prot_t prot;
 
-                                       tmp_entry->needs_copy = TRUE;
-                               }
+                               prot = src_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                               if (src_entry->alias != VM_MEMORY_STACK && prot)
+                                       prot |= VM_PROT_EXECUTE;
+#endif
+                               vm_object_pmap_protect(
+                                       src_object,
+                                       src_offset,
+                                       src_size,
+                                       (src_entry->is_shared ? 
+                                               PMAP_NULL
+                                               : src_map->pmap),
+                                       src_entry->vme_start,
+                                       prot);
+
+                               tmp_entry->needs_copy = TRUE;
                        }
 
                        /*
@@ -5597,8 +6373,6 @@ RestartCopy:
                        goto CopySuccessful;
                }
 
-               new_entry->needs_copy = FALSE;
-
                /*
                 *      Take an object reference, so that we may
                 *      release the map lock(s).
@@ -5613,13 +6387,14 @@ RestartCopy:
                 */
 
                version.main_timestamp = src_map->timestamp;
-               vm_map_unlock(src_map);
+               vm_map_unlock(src_map); /* Increments timestamp once! */
 
                /*
                 *      Perform the copy
                 */
 
                if (was_wired) {
+               CopySlowly:
                        vm_object_lock(src_object);
                        result = vm_object_copy_slowly(
                                        src_object,
@@ -5629,6 +6404,24 @@ RestartCopy:
                                        &new_entry->object.vm_object);
                        new_entry->offset = 0;
                        new_entry->needs_copy = FALSE;
+
+               }
+               else if (src_object->copy_strategy == MEMORY_OBJECT_COPY_SYMMETRIC &&
+                       (tmp_entry->is_shared  || map_share)) {
+                       vm_object_t new_object;
+
+                       vm_object_lock(src_object);
+                       new_object = vm_object_copy_delayed(
+                                       src_object,
+                                       src_offset,     
+                                       src_size);
+                       if (new_object == VM_OBJECT_NULL)
+                               goto CopySlowly;
+
+                       new_entry->object.vm_object = new_object;
+                       new_entry->needs_copy = TRUE;
+                       result = KERN_SUCCESS;
+
                } else {
                        result = vm_object_copy_strategically(src_object,
                                src_offset,
@@ -5638,7 +6431,6 @@ RestartCopy:
                                &new_entry_needs_copy);
 
                        new_entry->needs_copy = new_entry_needs_copy;
-                       
                }
 
                if (result != KERN_SUCCESS &&
@@ -5658,7 +6450,7 @@ RestartCopy:
                 *      changed while the copy was being made.
                 */
 
-               vm_map_lock(src_map);   /* Increments timestamp once! */
+               vm_map_lock(src_map);
 
                if ((version.main_timestamp + 1) == src_map->timestamp)
                        goto VerificationSuccessful;
@@ -5682,9 +6474,9 @@ RestartCopy:
                src_entry = tmp_entry;
                vm_map_clip_start(src_map, src_entry, src_start);
 
-               if ((src_entry->protection & VM_PROT_READ == VM_PROT_NONE &&
-                       !use_maxprot) ||
-                   src_entry->max_protection & VM_PROT_READ == 0)
+               if ((((src_entry->protection & VM_PROT_READ) == VM_PROT_NONE) &&
+                    !use_maxprot) ||
+                   ((src_entry->max_protection & VM_PROT_READ) == 0))
                        goto VerificationFailed;
 
                if (src_entry->vme_end < new_entry->vme_end)
@@ -5741,8 +6533,9 @@ RestartCopy:
                                ptr = parent_maps;
                                assert(ptr != NULL);
                                parent_maps = parent_maps->next;
-                               vm_map_lock(ptr->parent_map);
                                vm_map_unlock(src_map);
+                               vm_map_deallocate(src_map);
+                               vm_map_lock(ptr->parent_map);
                                src_map = ptr->parent_map;
                                src_start = ptr->base_start;
                                src_end = ptr->base_end;
@@ -5750,7 +6543,7 @@ RestartCopy:
                                              !vm_map_lookup_entry(
                                              src_map, src_start, &tmp_entry))
                                        RETURN(KERN_INVALID_ADDRESS);
-                               kfree((vm_offset_t)ptr, sizeof(submap_map_t));
+                               kfree(ptr, sizeof(submap_map_t));
                                if(parent_maps == NULL)
                                        map_share = FALSE;
                                src_entry = tmp_entry->vme_prev;
@@ -5776,11 +6569,12 @@ RestartCopy:
         */
        if (src_destroy) {
                (void) vm_map_delete(src_map,
-                                    trunc_page(src_addr),
+                                    vm_map_trunc_page(src_addr),
                                     src_end,
                                     (src_map == kernel_map) ?
                                        VM_MAP_REMOVE_KUNWIRE :
-                                       VM_MAP_NO_FLAGS);
+                                       VM_MAP_NO_FLAGS,
+                                    VM_MAP_NULL);
        }
 
        vm_map_unlock(src_map);
@@ -5828,7 +6622,6 @@ vm_map_copyin_object(
        copy = (vm_map_copy_t) zalloc(vm_map_copy_zone);
        copy->type = VM_MAP_COPY_OBJECT;
        copy->cpy_object = object;
-       copy->cpy_index = 0;
        copy->offset = offset;
        copy->size = size;
 
@@ -5836,7 +6629,7 @@ vm_map_copyin_object(
        return(KERN_SUCCESS);
 }
 
-void
+static void
 vm_map_fork_share(
        vm_map_t        old_map,
        vm_map_entry_t  old_entry,
@@ -5844,7 +6637,6 @@ vm_map_fork_share(
 {
        vm_object_t     object;
        vm_map_entry_t  new_entry;
-       kern_return_t   result;
 
        /*
         *      New sharing code.  New map entry
@@ -5859,18 +6651,21 @@ vm_map_fork_share(
        object = old_entry->object.vm_object;
        if (old_entry->is_sub_map) {
                assert(old_entry->wired_count == 0);
-#ifndef i386
+#ifndef NO_NESTED_PMAP
                if(old_entry->use_pmap) {
+                       kern_return_t   result;
+
                        result = pmap_nest(new_map->pmap, 
                                (old_entry->object.sub_map)->pmap, 
-                               old_entry->vme_start,
-                               old_entry->vme_end - old_entry->vme_start);
+                               (addr64_t)old_entry->vme_start,
+                               (addr64_t)old_entry->vme_start,
+                               (uint64_t)(old_entry->vme_end - old_entry->vme_start));
                        if(result)
                                panic("vm_map_fork_share: pmap_nest failed!");
                }
-#endif
+#endif /* NO_NESTED_PMAP */
        } else if (object == VM_OBJECT_NULL) {
-               object = vm_object_allocate((vm_size_t)(old_entry->vme_end -
+               object = vm_object_allocate((vm_map_size_t)(old_entry->vme_end -
                                                        old_entry->vme_start));
                old_entry->offset = 0;
                old_entry->object.vm_object = object;
@@ -5891,7 +6686,7 @@ vm_map_fork_share(
                 (!object->true_share &&        /* case 3 */
                 !old_entry->is_shared &&
                 (object->size >
-                 (vm_size_t)(old_entry->vme_end -
+                 (vm_map_size_t)(old_entry->vme_end -
                              old_entry->vme_start)))) {
                
                /*
@@ -5974,7 +6769,7 @@ vm_map_fork_share(
                assert(!(object->shadowed && old_entry->is_shared));
                vm_object_shadow(&old_entry->object.vm_object,
                                 &old_entry->offset,
-                                (vm_size_t) (old_entry->vme_end -
+                                (vm_map_size_t) (old_entry->vme_end -
                                              old_entry->vme_start));
                
                /*
@@ -5983,19 +6778,29 @@ vm_map_fork_share(
                 *      to remove write permission.
                 */
 
-/* CDY FIX this! page_protect! */
                if (!old_entry->needs_copy &&
                    (old_entry->protection & VM_PROT_WRITE)) {
-                       if(old_entry->is_sub_map && old_entry->use_pmap) {
-                               pmap_protect(old_entry->object.sub_map->pmap,
-                                    old_entry->vme_start,
-                                    old_entry->vme_end,
-                                    old_entry->protection & ~VM_PROT_WRITE);
+                       vm_prot_t prot;
+
+                       prot = old_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                       if (old_entry->alias != VM_MEMORY_STACK && prot)
+                               prot |= VM_PROT_EXECUTE;
+#endif
+                       if (old_map->mapped) {
+                               vm_object_pmap_protect(
+                                       old_entry->object.vm_object,
+                                       old_entry->offset,
+                                       (old_entry->vme_end -
+                                                       old_entry->vme_start),
+                                       PMAP_NULL,
+                                       old_entry->vme_start,
+                                       prot);
                        } else {
-                               pmap_protect(vm_map_pmap(old_map),
+                               pmap_protect(old_map->pmap,
                                     old_entry->vme_start,
                                     old_entry->vme_end,
-                                    old_entry->protection & ~VM_PROT_WRITE);
+                                    prot);
                        }
                }
                
@@ -6057,15 +6862,15 @@ vm_map_fork_share(
        }
 }
 
-boolean_t
+static boolean_t
 vm_map_fork_copy(
        vm_map_t        old_map,
        vm_map_entry_t  *old_entry_p,
        vm_map_t        new_map)
 {
        vm_map_entry_t old_entry = *old_entry_p;
-       vm_size_t entry_size = old_entry->vme_end - old_entry->vme_start;
-       vm_offset_t start = old_entry->vme_start;
+       vm_map_size_t entry_size = old_entry->vme_end - old_entry->vme_start;
+       vm_map_offset_t start = old_entry->vme_start;
        vm_map_copy_t copy;
        vm_map_entry_t last = vm_map_last_entry(new_map);
 
@@ -6086,8 +6891,7 @@ vm_map_fork_copy(
                 */
                vm_map_lock(old_map);
                if (!vm_map_lookup_entry(old_map, start, &last) ||
-                   last->max_protection & VM_PROT_READ ==
-                                        VM_PROT_NONE) {
+                   (last->max_protection & VM_PROT_READ) == VM_PROT_NONE) {
                        last = last->vme_next;
                }
                *old_entry_p = last;
@@ -6138,10 +6942,12 @@ vm_map_t
 vm_map_fork(
        vm_map_t        old_map)
 {
-       pmap_t          new_pmap = pmap_create((vm_size_t) 0);
+       pmap_t          new_pmap = pmap_create(
+                                       (vm_map_size_t) 0,
+                                       task_has_64BitAddr(current_task()));
        vm_map_t        new_map;
        vm_map_entry_t  old_entry;
-       vm_size_t       new_size = 0, entry_size;
+       vm_map_size_t   new_size = 0, entry_size;
        vm_map_entry_t  new_entry;
        boolean_t       src_needs_copy;
        boolean_t       new_entry_needs_copy;
@@ -6180,7 +6986,9 @@ vm_map_fork(
 
                        if(old_entry->is_sub_map)
                                break;
-                       if (old_entry->wired_count != 0) {
+                       if ((old_entry->wired_count != 0) ||
+                               ((old_entry->object.vm_object != NULL) &&
+                               (old_entry->object.vm_object->true_share))) {
                                goto slow_vm_map_fork_copy;
                        }
 
@@ -6205,17 +7013,24 @@ vm_map_fork(
                         */
                        
                        if (src_needs_copy && !old_entry->needs_copy) {
+                               vm_prot_t prot;
+
+                               prot = old_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                               if (old_entry->alias != VM_MEMORY_STACK && prot)
+                                       prot |= VM_PROT_EXECUTE;
+#endif
                                vm_object_pmap_protect(
                                        old_entry->object.vm_object,
                                        old_entry->offset,
                                        (old_entry->vme_end -
                                                        old_entry->vme_start),
                                        ((old_entry->is_shared 
-                                               || old_entry->is_sub_map)
+                                               || old_map->mapped)
                                                        ? PMAP_NULL :
                                                        old_map->pmap),
                                        old_entry->vme_start,
-                                       old_entry->protection & ~VM_PROT_WRITE);
+                                       prot);
 
                                old_entry->needs_copy = TRUE;
                        }
@@ -6275,38 +7090,35 @@ vm_map_fork(
 kern_return_t
 vm_map_lookup_locked(
        vm_map_t                *var_map,       /* IN/OUT */
-       register vm_offset_t    vaddr,
-       register vm_prot_t      fault_type,
+       vm_map_offset_t vaddr,
+       vm_prot_t               fault_type,
        vm_map_version_t        *out_version,   /* OUT */
        vm_object_t             *object,        /* OUT */
        vm_object_offset_t      *offset,        /* OUT */
        vm_prot_t               *out_prot,      /* OUT */
        boolean_t               *wired,         /* OUT */
        int                     *behavior,      /* OUT */
-       vm_object_offset_t      *lo_offset,     /* OUT */
-       vm_object_offset_t      *hi_offset,     /* OUT */
-       vm_map_t                *pmap_map)
+       vm_map_offset_t *lo_offset,     /* OUT */
+       vm_map_offset_t *hi_offset,     /* OUT */
+       vm_map_t                *real_map)
 {
        vm_map_entry_t                  entry;
        register vm_map_t               map = *var_map;
        vm_map_t                        old_map = *var_map;
        vm_map_t                        cow_sub_map_parent = VM_MAP_NULL;
-       vm_offset_t                     cow_parent_vaddr;
-       vm_offset_t                     old_start;
-       vm_offset_t                     old_end;
+       vm_map_offset_t                 cow_parent_vaddr = 0;
+       vm_map_offset_t                 old_start = 0;
+       vm_map_offset_t                 old_end = 0;
        register vm_prot_t              prot;
 
-       *pmap_map = map;
+       *real_map = map;
        RetryLookup: ;
 
        /*
         *      If the map has an interesting hint, try it before calling
         *      full blown lookup routine.
         */
-
-       mutex_lock(&map->s_lock);
        entry = map->hint;
-       mutex_unlock(&map->s_lock);
 
        if ((entry == vm_map_to_entry(map)) ||
            (vaddr < entry->vme_start) || (vaddr >= entry->vme_end)) {
@@ -6319,9 +7131,9 @@ vm_map_lookup_locked(
                if (!vm_map_lookup_entry(map, vaddr, &tmp_entry)) {
                        if((cow_sub_map_parent) && (cow_sub_map_parent != map))
                                vm_map_unlock(cow_sub_map_parent);
-                       if((*pmap_map != map) 
-                                       && (*pmap_map != cow_sub_map_parent))
-                               vm_map_unlock(*pmap_map);
+                       if((*real_map != map) 
+                                       && (*real_map != cow_sub_map_parent))
+                               vm_map_unlock(*real_map);
                        return KERN_INVALID_ADDRESS;
                }
 
@@ -6339,29 +7151,28 @@ vm_map_lookup_locked(
 
 submap_recurse:
        if (entry->is_sub_map) {
-               vm_offset_t             local_vaddr;
-               vm_offset_t             end_delta;
-               vm_offset_t             start_delta; 
-               vm_offset_t             object_start_delta; 
+               vm_map_offset_t         local_vaddr;
+               vm_map_offset_t         end_delta;
+               vm_map_offset_t         start_delta; 
                vm_map_entry_t          submap_entry;
                boolean_t               mapped_needs_copy=FALSE;
 
                local_vaddr = vaddr;
 
                if ((!entry->needs_copy) && (entry->use_pmap)) {
-                       /* if pmap_map equals map we unlock below */
-                       if ((*pmap_map != map) && 
-                                       (*pmap_map != cow_sub_map_parent))
-                               vm_map_unlock(*pmap_map);
-                       *pmap_map = entry->object.sub_map;
+                       /* if real_map equals map we unlock below */
+                       if ((*real_map != map) && 
+                                       (*real_map != cow_sub_map_parent))
+                               vm_map_unlock(*real_map);
+                       *real_map = entry->object.sub_map;
                }
 
                if(entry->needs_copy) {
                        if (!mapped_needs_copy) {
                                if (vm_map_lock_read_to_write(map)) {
                                        vm_map_lock_read(map);
-                                       if(*pmap_map == entry->object.sub_map)
-                                               *pmap_map = map;
+                                       if(*real_map == entry->object.sub_map)
+                                               *real_map = map;
                                        goto RetryLookup;
                                }
                                vm_map_lock_read(entry->object.sub_map);
@@ -6376,7 +7187,7 @@ submap_recurse:
                        } else {
                                vm_map_lock_read(entry->object.sub_map);
                                if((cow_sub_map_parent != map) &&
-                                                       (*pmap_map != map))
+                                                       (*real_map != map))
                                        vm_map_unlock(map);
                        }
                } else {
@@ -6386,7 +7197,7 @@ submap_recurse:
                        /* follow the maps down to the object */
                        /* here we unlock knowing we are not  */
                        /* revisiting the map.  */
-                       if((*pmap_map != map) && (map != cow_sub_map_parent))
+                       if((*real_map != map) && (map != cow_sub_map_parent))
                                vm_map_unlock_read(map);
                }
 
@@ -6400,11 +7211,11 @@ RetrySubMap:
                        if((cow_sub_map_parent) && (cow_sub_map_parent != map)){
                                vm_map_unlock(cow_sub_map_parent);
                        }
-                       if((*pmap_map != map) 
-                                       && (*pmap_map != cow_sub_map_parent)) {
-                               vm_map_unlock(*pmap_map);
+                       if((*real_map != map) 
+                                       && (*real_map != cow_sub_map_parent)) {
+                               vm_map_unlock(*real_map);
                        }
-                       *pmap_map = map;
+                       *real_map = map;
                        return KERN_INVALID_ADDRESS;
                }
                /* find the attenuated shadow of the underlying object */
@@ -6439,8 +7250,8 @@ RetrySubMap:
                if(((fault_type & VM_PROT_WRITE) && cow_sub_map_parent)) {
 
                        vm_object_t     copy_object;
-                       vm_offset_t     local_start;
-                       vm_offset_t     local_end;
+                       vm_map_offset_t local_start;
+                       vm_map_offset_t local_end;
                        boolean_t               copied_slowly = FALSE;
 
                        if (vm_map_lock_read_to_write(map)) {
@@ -6454,10 +7265,10 @@ RetrySubMap:
                        if (submap_entry->object.vm_object == VM_OBJECT_NULL) {
                                submap_entry->object.vm_object = 
                                        vm_object_allocate(
-                                               (vm_size_t)
+                                               (vm_map_size_t)
                                                (submap_entry->vme_end 
                                                - submap_entry->vme_start));
-                                       submap_entry->offset = 0;
+                               submap_entry->offset = 0;
                        }
                        local_start =  local_vaddr - 
                                        (cow_parent_vaddr - old_start);
@@ -6484,22 +7295,27 @@ RetrySubMap:
                                                &copy_object);
                                        copied_slowly = TRUE;
                        } else {
-                               
                                /* set up shadow object */
                                copy_object = submap_entry->object.vm_object;
                                vm_object_reference(copy_object);
                                submap_entry->object.vm_object->shadowed = TRUE;
                                submap_entry->needs_copy = TRUE;
+
+                               prot = submap_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                               if (submap_entry->alias != VM_MEMORY_STACK && prot)
+                                       prot |= VM_PROT_EXECUTE;
+#endif
                                vm_object_pmap_protect(
                                        submap_entry->object.vm_object,
                                        submap_entry->offset,
                                        submap_entry->vme_end - 
                                                submap_entry->vme_start,
-                                       submap_entry->is_shared ?
+                                       (submap_entry->is_shared 
+                                               || map->mapped) ?
                                                PMAP_NULL : map->pmap,
                                        submap_entry->vme_start,
-                                       submap_entry->protection &
-                                               ~VM_PROT_WRITE);
+                                       prot);
                        }
                        
 
@@ -6560,7 +7376,7 @@ RetrySubMap:
                        vm_map_lock_write_to_read(map);
                } else {
                        if((cow_sub_map_parent)
-                                       && (cow_sub_map_parent != *pmap_map)
+                                       && (cow_sub_map_parent != *real_map)
                                        && (cow_sub_map_parent != map)) {
                                vm_map_unlock(cow_sub_map_parent);
                        }
@@ -6573,14 +7389,25 @@ RetrySubMap:
         *      Check whether this task is allowed to have
         *      this page.
         */
-
        prot = entry->protection;
+
+#ifdef STACK_ONLY_NX
+       if (entry->alias != VM_MEMORY_STACK && prot)
+               /*
+                * HACK -- if not a stack, than allow execution
+                */
+               prot |= VM_PROT_EXECUTE;
+#endif
        if ((fault_type & (prot)) != fault_type) {
-         if (*pmap_map != map) {
-               vm_map_unlock(*pmap_map);
-         }
-         *pmap_map = map;
-         return KERN_PROTECTION_FAILURE;
+               if (*real_map != map) {
+                       vm_map_unlock(*real_map);
+               }
+               *real_map = map;
+
+               if ((fault_type & VM_PROT_EXECUTE) && prot)
+                       log_nx_failure((addr64_t)vaddr, prot);
+
+               return KERN_PROTECTION_FAILURE;
        }
 
        /*
@@ -6588,8 +7415,9 @@ RetrySubMap:
         *      it for all possible accesses.
         */
 
-       if (*wired = (entry->wired_count != 0))
-               prot = fault_type = entry->protection;
+       *wired = (entry->wired_count != 0);
+       if (*wired)
+               fault_type = prot;
 
        /*
         *      If the entry was copy-on-write, we either ...
@@ -6604,7 +7432,7 @@ RetrySubMap:
                 *      demote the permissions allowed.
                 */
 
-               if (fault_type & VM_PROT_WRITE || *wired) {
+               if ((fault_type & VM_PROT_WRITE) || *wired) {
                        /*
                         *      Make a new object, and place it in the
                         *      object chain.  Note that no new references
@@ -6618,7 +7446,7 @@ RetrySubMap:
                        }
                        vm_object_shadow(&entry->object.vm_object,
                                         &entry->offset,
-                                        (vm_size_t) (entry->vme_end -
+                                        (vm_map_size_t) (entry->vme_end -
                                                      entry->vme_start));
 
                        entry->object.vm_object->shadowed = TRUE;
@@ -6646,7 +7474,7 @@ RetrySubMap:
                }
 
                entry->object.vm_object = vm_object_allocate(
-                       (vm_size_t)(entry->vme_end - entry->vme_start));
+                       (vm_map_size_t)(entry->vme_end - entry->vme_start));
                entry->offset = 0;
                vm_map_lock_write_to_read(map);
        }
@@ -6714,89 +7542,425 @@ vm_map_verify(
 
 
 /*
- *     vm_region:
- *
- *     User call to obtain information about a region in
- *     a task's address map. Currently, only one flavor is
- *     supported.
- *
- *     XXX The reserved and behavior fields cannot be filled
- *         in until the vm merge from the IK is completed, and
- *         vm_reserve is implemented.
+ *     TEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARY
+ *     Goes away after regular vm_region_recurse function migrates to
+ *     64 bits
+ *     vm_region_recurse: A form of vm_region which follows the
+ *     submaps in a target map
  *
- *     XXX Dependency: syscall_vm_region() also supports only one flavor.
  */
 
 kern_return_t
-vm_region(
+vm_map_region_recurse_64(
        vm_map_t                 map,
-       vm_offset_t             *address,               /* IN/OUT */
-       vm_size_t               *size,                  /* OUT */
-       vm_region_flavor_t       flavor,                /* IN */
-       vm_region_info_t         info,                  /* OUT */
-       mach_msg_type_number_t  *count,                 /* IN/OUT */
-       ipc_port_t              *object_name)           /* OUT */
+       vm_map_offset_t *address,               /* IN/OUT */
+       vm_map_size_t           *size,                  /* OUT */
+       natural_t               *nesting_depth, /* IN/OUT */
+       vm_region_submap_info_64_t      submap_info,    /* IN/OUT */
+       mach_msg_type_number_t  *count) /* IN/OUT */
 {
-       vm_map_entry_t          tmp_entry;
-       register
-       vm_map_entry_t          entry;
-       register
-       vm_offset_t             start;
-       vm_region_basic_info_t  basic;
-       vm_region_extended_info_t       extended;
-       vm_region_top_info_t    top;
+       vm_region_extended_info_data_t  extended;
+       vm_map_entry_t                  tmp_entry;
+       vm_map_offset_t                 user_address;
+       unsigned int                    user_max_depth;
 
-       if (map == VM_MAP_NULL) 
-               return(KERN_INVALID_ARGUMENT);
+       /*
+        * "curr_entry" is the VM map entry preceding or including the
+        * address we're looking for.
+        * "curr_map" is the map or sub-map containing "curr_entry".
+        * "curr_offset" is the cumulated offset of "curr_map" in the
+        * target task's address space.
+        * "curr_depth" is the depth of "curr_map" in the chain of
+        * sub-maps.
+        * "curr_max_offset" is the maximum offset we should take into
+        * account in the current map.  It may be smaller than the current
+        * map's "max_offset" because we might not have mapped it all in
+        * the upper level map.
+        */
+       vm_map_entry_t                  curr_entry;
+       vm_map_offset_t                 curr_offset;
+       vm_map_t                        curr_map;
+       unsigned int                    curr_depth;
+       vm_map_offset_t                 curr_max_offset;
 
-       switch (flavor) {
+       /*
+        * "next_" is the same as "curr_" but for the VM region immediately
+        * after the address we're looking for.  We need to keep track of this
+        * too because we want to return info about that region if the
+        * address we're looking for is not mapped.
+        */
+       vm_map_entry_t                  next_entry;
+       vm_map_offset_t                 next_offset;
+       vm_map_t                        next_map;
+       unsigned int                    next_depth;
+       vm_map_offset_t                 next_max_offset;
+
+       if (map == VM_MAP_NULL) {
+               /* no address space to work on */
+               return KERN_INVALID_ARGUMENT;
+       }
+
+       if (*count < VM_REGION_SUBMAP_INFO_COUNT_64) {
+               /* "info" structure is not big enough and would overflow */
+               return KERN_INVALID_ARGUMENT;
+       }
+
+       *count = VM_REGION_SUBMAP_INFO_COUNT_64;
+
+       user_address = *address;
+       user_max_depth = *nesting_depth;
        
-       case VM_REGION_BASIC_INFO:
-       {
-           if (*count < VM_REGION_BASIC_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
+       curr_entry = NULL;
+       curr_map = map;
+       curr_offset = 0;
+       curr_depth = 0;
+       curr_max_offset = curr_map->max_offset;
 
-           basic = (vm_region_basic_info_t) info;
-           *count = VM_REGION_BASIC_INFO_COUNT;
+       next_entry = NULL;
+       next_map = NULL;
+       next_offset = 0;
+       next_depth = 0;
+       next_max_offset = curr_max_offset;
 
-           vm_map_lock_read(map);
+       if (not_in_kdp) {
+               vm_map_lock_read(curr_map);
+       }
 
-           start = *address;
-           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
+       for (;;) {
+               if (vm_map_lookup_entry(curr_map,
+                                       user_address - curr_offset,
+                                       &tmp_entry)) {
+                       /* tmp_entry contains the address we're looking for */
+                       curr_entry = tmp_entry;
+               } else {
+                       /*
+                        * The address is not mapped.  "tmp_entry" is the
+                        * map entry preceding the address.  We want the next
+                        * one, if it exists.
+                        */
+                       curr_entry = tmp_entry->vme_next;
+                       if (curr_entry == vm_map_to_entry(curr_map) ||
+                           curr_entry->vme_start >= curr_max_offset) {
+                               /* no next entry at this level: stop looking */
+                               if (not_in_kdp) {
+                                       vm_map_unlock_read(curr_map);
+                               }
+                               curr_entry = NULL;
+                               curr_map = NULL;
+                               curr_offset = 0;
+                               curr_depth = 0;
+                               curr_max_offset = 0;
+                               break;
+                       }
                }
-           } else {
-               entry = tmp_entry;
-           }
 
-           start = entry->vme_start;
+               /*
+                * Is the next entry at this level closer to the address (or
+                * deeper in the submap chain) than the one we had
+                * so far ?
+                */
+               tmp_entry = curr_entry->vme_next;
+               if (tmp_entry == vm_map_to_entry(curr_map)) {
+                       /* no next entry at this level */
+               } else if (tmp_entry->vme_start >= curr_max_offset) {
+                       /*
+                        * tmp_entry is beyond the scope of what we mapped of
+                        * this submap in the upper level: ignore it.
+                        */
+               } else if ((next_entry == NULL) ||
+                          (tmp_entry->vme_start + curr_offset <=
+                           next_entry->vme_start + next_offset)) {
+                       /*
+                        * We didn't have a "next_entry" or this one is
+                        * closer to the address we're looking for:
+                        * use this "tmp_entry" as the new "next_entry".
+                        */
+                       if (next_entry != NULL) {
+                               /* unlock the last "next_map" */
+                               if (next_map != curr_map && not_in_kdp) {
+                                       vm_map_unlock_read(next_map);
+                               }
+                       }
+                       next_entry = tmp_entry;
+                       next_map = curr_map;
+                       next_offset = curr_offset;
+                       next_depth = curr_depth;
+                       next_max_offset = curr_max_offset;
+               }
 
-           basic->offset = entry->offset;
-           basic->protection = entry->protection;
-           basic->inheritance = entry->inheritance;
-           basic->max_protection = entry->max_protection;
-           basic->behavior = entry->behavior;
-           basic->user_wired_count = entry->user_wired_count;
-           basic->reserved = entry->is_sub_map;
-           *address = start;
-           *size = (entry->vme_end - start);
+               if (!curr_entry->is_sub_map ||
+                   curr_depth >= user_max_depth) {
+                       /*
+                        * We hit a leaf map or we reached the maximum depth
+                        * we could, so stop looking.  Keep the current map
+                        * locked.
+                        */
+                       break;
+               }
 
-           if (object_name) *object_name = IP_NULL;
-           if (entry->is_sub_map) {
-               basic->shared = FALSE;
-           } else {
-               basic->shared = entry->is_shared;
-           }
+               /*
+                * Get down to the next submap level.
+                */
 
-           vm_map_unlock_read(map);
-           return(KERN_SUCCESS);
+               /*
+                * Lock the next level and unlock the current level,
+                * unless we need to keep it locked to access the "next_entry"
+                * later.
+                */
+               if (not_in_kdp) {
+                       vm_map_lock_read(curr_entry->object.sub_map);
+               }
+               if (curr_map == next_map) {
+                       /* keep "next_map" locked in case we need it */
+               } else {
+                       /* release this map */
+                       vm_map_unlock_read(curr_map);
+               }
+
+               /*
+                * Adjust the offset.  "curr_entry" maps the submap
+                * at relative address "curr_entry->vme_start" in the
+                * curr_map but skips the first "curr_entry->offset"
+                * bytes of the submap.
+                * "curr_offset" always represents the offset of a virtual
+                * address in the curr_map relative to the absolute address
+                * space (i.e. the top-level VM map).
+                */
+               curr_offset +=
+                       (curr_entry->vme_start - curr_entry->offset);
+               /* switch to the submap */
+               curr_map = curr_entry->object.sub_map;
+               curr_depth++;
+               /*
+                * "curr_max_offset" allows us to keep track of the
+                * portion of the submap that is actually mapped at this level:
+                * the rest of that submap is irrelevant to us, since it's not
+                * mapped here.
+                * The relevant portion of the map starts at
+                * "curr_entry->offset" up to the size of "curr_entry".
+                */
+               curr_max_offset =
+                       curr_entry->vme_end - curr_entry->vme_start +
+                       curr_entry->offset;
+               curr_entry = NULL;
        }
-       case VM_REGION_EXTENDED_INFO:
-       {
 
-           if (*count < VM_REGION_EXTENDED_INFO_COUNT)
+       if (curr_entry == NULL) {
+               /* no VM region contains the address... */
+               if (next_entry == NULL) {
+                       /* ... and no VM region follows it either */
+                       return KERN_INVALID_ADDRESS;
+               }
+               /* ... gather info about the next VM region */
+               curr_entry = next_entry;
+               curr_map = next_map;    /* still locked ... */
+               curr_offset = next_offset;
+               curr_depth = next_depth;
+               curr_max_offset = next_max_offset;
+       } else {
+               /* we won't need "next_entry" after all */
+               if (next_entry != NULL) {
+                       /* release "next_map" */
+                       if (next_map != curr_map && not_in_kdp) {
+                               vm_map_unlock_read(next_map);
+                       }
+               }
+       }
+       next_entry = NULL;
+       next_map = NULL;
+       next_offset = 0;
+       next_depth = 0;
+       next_max_offset = 0;
+
+       *nesting_depth = curr_depth;
+       *size = curr_entry->vme_end - curr_entry->vme_start;
+       *address = curr_entry->vme_start + curr_offset;
+
+       submap_info->user_tag = curr_entry->alias;
+       submap_info->offset = curr_entry->offset; 
+       submap_info->protection = curr_entry->protection;
+       submap_info->inheritance = curr_entry->inheritance;
+       submap_info->max_protection = curr_entry->max_protection;
+       submap_info->behavior = curr_entry->behavior;
+       submap_info->user_wired_count = curr_entry->user_wired_count;
+       submap_info->is_submap = curr_entry->is_sub_map;
+       submap_info->object_id = (uint32_t) curr_entry->object.vm_object;
+
+       extended.pages_resident = 0;
+       extended.pages_swapped_out = 0;
+       extended.pages_shared_now_private = 0;
+       extended.pages_dirtied = 0;
+       extended.external_pager = 0;
+       extended.shadow_depth = 0;
+
+       if (not_in_kdp) {
+               if (!curr_entry->is_sub_map) {
+                       vm_map_region_walk(curr_map,
+                                          curr_entry->vme_start,
+                                          curr_entry,
+                                          curr_entry->offset,
+                                          (curr_entry->vme_end -
+                                           curr_entry->vme_start),
+                                          &extended);
+                       submap_info->share_mode = extended.share_mode;
+                       if (extended.external_pager &&
+                           extended.ref_count == 2 &&
+                           extended.share_mode == SM_SHARED) {
+                               submap_info->share_mode = SM_PRIVATE;
+                       }
+                       submap_info->ref_count = extended.ref_count;
+               } else {
+                       if (curr_entry->use_pmap) {
+                               submap_info->share_mode = SM_TRUESHARED;
+                       } else {
+                               submap_info->share_mode = SM_PRIVATE;
+                       }
+                       submap_info->ref_count =
+                               curr_entry->object.sub_map->ref_count;
+               }
+       }
+
+       submap_info->pages_resident = extended.pages_resident;
+       submap_info->pages_swapped_out = extended.pages_swapped_out;
+       submap_info->pages_shared_now_private =
+               extended.pages_shared_now_private;
+       submap_info->pages_dirtied = extended.pages_dirtied;
+       submap_info->external_pager = extended.external_pager;
+       submap_info->shadow_depth = extended.shadow_depth;
+
+       if (not_in_kdp) {
+               vm_map_unlock_read(curr_map);
+       }
+
+       return KERN_SUCCESS;
+}
+
+/*
+ *     vm_region:
+ *
+ *     User call to obtain information about a region in
+ *     a task's address map. Currently, only one flavor is
+ *     supported.
+ *
+ *     XXX The reserved and behavior fields cannot be filled
+ *         in until the vm merge from the IK is completed, and
+ *         vm_reserve is implemented.
+ */
+
+kern_return_t
+vm_map_region(
+       vm_map_t                 map,
+       vm_map_offset_t *address,               /* IN/OUT */
+       vm_map_size_t           *size,                  /* OUT */
+       vm_region_flavor_t       flavor,                /* IN */
+       vm_region_info_t         info,                  /* OUT */
+       mach_msg_type_number_t  *count, /* IN/OUT */
+       mach_port_t             *object_name)           /* OUT */
+{
+       vm_map_entry_t          tmp_entry;
+       vm_map_entry_t          entry;
+       vm_map_offset_t         start;
+
+       if (map == VM_MAP_NULL) 
+               return(KERN_INVALID_ARGUMENT);
+
+       switch (flavor) {
+
+       case VM_REGION_BASIC_INFO:
+       /* legacy for old 32-bit objects info */
+       {
+           vm_region_basic_info_t      basic;
+
+           if (*count < VM_REGION_BASIC_INFO_COUNT)
+               return(KERN_INVALID_ARGUMENT);
+
+           basic = (vm_region_basic_info_t) info;
+           *count = VM_REGION_BASIC_INFO_COUNT;
+
+           vm_map_lock_read(map);
+
+           start = *address;
+           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
+               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
+                       vm_map_unlock_read(map);
+                       return(KERN_INVALID_ADDRESS);
+               }
+           } else {
+               entry = tmp_entry;
+           }
+
+           start = entry->vme_start;
+
+           basic->offset = (uint32_t)entry->offset;
+           basic->protection = entry->protection;
+           basic->inheritance = entry->inheritance;
+           basic->max_protection = entry->max_protection;
+           basic->behavior = entry->behavior;
+           basic->user_wired_count = entry->user_wired_count;
+           basic->reserved = entry->is_sub_map;
+           *address = start;
+           *size = (entry->vme_end - start);
+
+           if (object_name) *object_name = IP_NULL;
+           if (entry->is_sub_map) {
+               basic->shared = FALSE;
+           } else {
+               basic->shared = entry->is_shared;
+           }
+
+           vm_map_unlock_read(map);
+           return(KERN_SUCCESS);
+       }
+
+       case VM_REGION_BASIC_INFO_64:
+       {
+           vm_region_basic_info_64_t   basic;
+
+           if (*count < VM_REGION_BASIC_INFO_COUNT_64)
+               return(KERN_INVALID_ARGUMENT);
+
+           basic = (vm_region_basic_info_64_t) info;
+           *count = VM_REGION_BASIC_INFO_COUNT_64;
+
+           vm_map_lock_read(map);
+
+           start = *address;
+           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
+               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
+                       vm_map_unlock_read(map);
+                       return(KERN_INVALID_ADDRESS);
+               }
+           } else {
+               entry = tmp_entry;
+           }
+
+           start = entry->vme_start;
+
+           basic->offset = entry->offset;
+           basic->protection = entry->protection;
+           basic->inheritance = entry->inheritance;
+           basic->max_protection = entry->max_protection;
+           basic->behavior = entry->behavior;
+           basic->user_wired_count = entry->user_wired_count;
+           basic->reserved = entry->is_sub_map;
+           *address = start;
+           *size = (entry->vme_end - start);
+
+           if (object_name) *object_name = IP_NULL;
+           if (entry->is_sub_map) {
+               basic->shared = FALSE;
+           } else {
+               basic->shared = entry->is_shared;
+           }
+
+           vm_map_unlock_read(map);
+           return(KERN_SUCCESS);
+       }
+       case VM_REGION_EXTENDED_INFO:
+       {
+           vm_region_extended_info_t   extended;
+
+           if (*count < VM_REGION_EXTENDED_INFO_COUNT)
                return(KERN_INVALID_ARGUMENT);
 
            extended = (vm_region_extended_info_t) info;
@@ -6824,7 +7988,7 @@ vm_region(
            extended->external_pager = 0;
            extended->shadow_depth = 0;
 
-           vm_region_walk(entry, extended, entry->offset, entry->vme_end - start, map, start);
+           vm_map_region_walk(map, start, entry, entry->offset, entry->vme_end - start, extended);
 
            if (extended->external_pager && extended->ref_count == 2 && extended->share_mode == SM_SHARED)
                    extended->share_mode = SM_PRIVATE;
@@ -6839,6 +8003,7 @@ vm_region(
        }
        case VM_REGION_TOP_INFO:
        {   
+           vm_region_top_info_t        top;
 
            if (*count < VM_REGION_TOP_INFO_COUNT)
                return(KERN_INVALID_ARGUMENT);
@@ -6863,7 +8028,7 @@ vm_region(
            top->private_pages_resident = 0;
            top->shared_pages_resident = 0;
 
-           vm_region_top_walk(entry, top);
+           vm_map_region_top_walk(entry, top);
 
            if (object_name)
                *object_name = IP_NULL;
@@ -6878,912 +8043,403 @@ vm_region(
        }
 }
 
-/*
- *     vm_region_recurse: A form of vm_region which follows the
- *     submaps in a target map
- *
- */
-
-kern_return_t
-vm_region_recurse(
-       vm_map_t                 map,
-       vm_offset_t             *address,               /* IN/OUT */
-       vm_size_t               *size,                  /* OUT */
-       natural_t               *nesting_depth,         /* IN/OUT */
-       vm_region_recurse_info_t info,                  /* IN/OUT */
-       mach_msg_type_number_t  *count)                 /* IN/OUT */
+void
+vm_map_region_top_walk(
+        vm_map_entry_t            entry,
+       vm_region_top_info_t       top)
 {
-       vm_map_entry_t          tmp_entry;
-       register
-       vm_map_entry_t          entry;
-       register
-       vm_offset_t             start;
-
-       unsigned int                    recurse_count;
-       vm_map_t                        submap;
-       vm_map_t                        base_map;
-       vm_map_entry_t                  base_entry;
-       vm_offset_t                     base_next;
-       vm_offset_t                     base_addr;
-       vm_offset_t                     baddr_start_delta;
-       vm_region_submap_info_t         submap_info;
-       vm_region_extended_info_data_t  extended;
-
-       if (map == VM_MAP_NULL) 
-               return(KERN_INVALID_ARGUMENT);
-
-       submap_info = (vm_region_submap_info_t) info;
-       *count = VM_REGION_SUBMAP_INFO_COUNT;
-
-       if (*count < VM_REGION_SUBMAP_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
-
-       start = *address;
-       base_map = map;
-       recurse_count = *nesting_depth;
+        register struct vm_object *obj, *tmp_obj;
+       register int    ref_count;
 
-LOOKUP_NEXT_BASE_ENTRY:
-       vm_map_lock_read(map);
-        if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
-               }
-       } else {
-               entry = tmp_entry;
+       if (entry->object.vm_object == 0 || entry->is_sub_map) {
+           top->share_mode = SM_EMPTY;
+           top->ref_count = 0;
+           top->obj_id = 0;
+           return;
        }
-       *size = entry->vme_end - entry->vme_start;
-       start = entry->vme_start;
-       base_addr = start;
-       baddr_start_delta = *address - start;
-       base_next = entry->vme_end;
-       base_entry = entry;
-
-       while(entry->is_sub_map && recurse_count) {
-               recurse_count--;
-               vm_map_lock_read(entry->object.sub_map);
+       {
+           obj = entry->object.vm_object;
 
+           vm_object_lock(obj);
 
-               if(entry == base_entry) {
-                       start = entry->offset;
-               start += *address - entry->vme_start;
-               }
+           if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
+               ref_count--;
 
-               submap = entry->object.sub_map;
-               vm_map_unlock_read(map);
-               map = submap;
+           if (obj->shadow) {
+               if (ref_count == 1)
+                   top->private_pages_resident = obj->resident_page_count;
+               else
+                   top->shared_pages_resident = obj->resident_page_count;
+               top->ref_count  = ref_count;
+               top->share_mode = SM_COW;
+           
+               while ((tmp_obj = obj->shadow)) {
+                   vm_object_lock(tmp_obj);
+                   vm_object_unlock(obj);
+                   obj = tmp_obj;
 
-               if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-                       if ((entry = tmp_entry->vme_next) 
-                                               == vm_map_to_entry(map)) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-               } else {
-                       entry = tmp_entry;
+                   if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
+                       ref_count--;
 
+                   top->shared_pages_resident += obj->resident_page_count;
+                   top->ref_count += ref_count - 1;
                }
-               if(start <= entry->vme_start) {
-                       vm_offset_t     old_start = start;
-                       if(baddr_start_delta) {
-                               base_addr += (baddr_start_delta);
-                               *size -= baddr_start_delta;
-                               baddr_start_delta = 0;
-                       }
-                       if(base_next <= 
-                               (base_addr += (entry->vme_start - start))) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-                       *size -= entry->vme_start - start;
-                       if (*size > (entry->vme_end - entry->vme_start)) {
-                               *size = entry->vme_end - entry->vme_start;
-                       }
-                       start = 0;
+           } else {
+               if (entry->needs_copy) {
+                   top->share_mode = SM_COW;
+                   top->shared_pages_resident = obj->resident_page_count;
                } else {
-                       if(baddr_start_delta) {
-                               if((start - entry->vme_start) 
-                                               < baddr_start_delta) {
-                                       base_addr += start - entry->vme_start;
-                                       *size -= start - entry->vme_start;
-                               } else {
-                                       base_addr += baddr_start_delta;
-                                       *size += baddr_start_delta;
-                               }
-                               baddr_start_delta = 0;
-                       }
-                       base_addr += entry->vme_start;
-                       if(base_addr >= base_next) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-                       if (*size > (entry->vme_end - start))
-                               *size = entry->vme_end - start;
-
-                       start = entry->vme_start - start;
+                   if (ref_count == 1 ||
+                      (ref_count == 2 && !(obj->pager_trusted) && !(obj->internal))) {
+                       top->share_mode = SM_PRIVATE;
+                       top->private_pages_resident = obj->resident_page_count;
+                   } else {
+                       top->share_mode = SM_SHARED;
+                       top->shared_pages_resident = obj->resident_page_count;
+                   }
                }
+               top->ref_count = ref_count;
+           }
+           top->obj_id = (int)obj;
 
-               start += entry->offset;
-
-       }
-       *nesting_depth -= recurse_count;
-       if(entry != base_entry) {
-               start = entry->vme_start + (start - entry->offset);
+           vm_object_unlock(obj);
        }
+}
 
+void
+vm_map_region_walk(
+       vm_map_t                        map,
+       vm_map_offset_t         va,
+       vm_map_entry_t          entry,
+       vm_object_offset_t              offset,
+       vm_object_size_t                range,
+       vm_region_extended_info_t       extended)
+{
+        register struct vm_object *obj, *tmp_obj;
+       register vm_map_offset_t       last_offset;
+       register int               i;
+       register int               ref_count;
+       struct vm_object        *shadow_object;
+       int                     shadow_depth;
 
-       submap_info->user_tag = entry->alias;
-       submap_info->offset = entry->offset;
-       submap_info->protection = entry->protection;
-       submap_info->inheritance = entry->inheritance;
-       submap_info->max_protection = entry->max_protection;
-       submap_info->behavior = entry->behavior;
-       submap_info->user_wired_count = entry->user_wired_count;
-       submap_info->is_submap = entry->is_sub_map;
-       submap_info->object_id = (vm_offset_t)entry->object.vm_object;
-       *address = base_addr;
+       if ((entry->object.vm_object == 0) ||
+               (entry->is_sub_map) ||
+               (entry->object.vm_object->phys_contiguous)) {
+           extended->share_mode = SM_EMPTY;
+           extended->ref_count = 0;
+           return;
+       }
+       {
+           obj = entry->object.vm_object;
 
+           vm_object_lock(obj);
 
-       extended.pages_resident = 0;
-       extended.pages_swapped_out = 0;
-       extended.pages_shared_now_private = 0;
-       extended.pages_dirtied = 0;
-       extended.external_pager = 0;
-       extended.shadow_depth = 0;
+           if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
+               ref_count--;
 
-       if(!entry->is_sub_map) {
-               vm_region_walk(entry, &extended, entry->offset, 
-                               entry->vme_end - start, map, start);
-               submap_info->share_mode = extended.share_mode;
-               if (extended.external_pager && extended.ref_count == 2 
-                                       && extended.share_mode == SM_SHARED)
-                       submap_info->share_mode = SM_PRIVATE;
-               submap_info->ref_count = extended.ref_count;
-       } else {
-               if(entry->use_pmap) 
-                       submap_info->share_mode =  SM_TRUESHARED;
-               else
-                       submap_info->share_mode = SM_PRIVATE;
-               submap_info->ref_count = entry->object.sub_map->ref_count;
-       }
+           for (last_offset = offset + range; offset < last_offset; offset += PAGE_SIZE_64, va += PAGE_SIZE)
+                   vm_map_region_look_for_page(map, va, obj, offset, ref_count, 0, extended);
+
+           shadow_object = obj->shadow;
+           shadow_depth = 0;
+           if (shadow_object != VM_OBJECT_NULL) {
+                   vm_object_lock(shadow_object);
+                   for (;
+                        shadow_object != VM_OBJECT_NULL;
+                        shadow_depth++) {
+                           vm_object_t next_shadow;
+
+                           next_shadow = shadow_object->shadow;
+                           if (next_shadow) {
+                                   vm_object_lock(next_shadow);
+                           }
+                           vm_object_unlock(shadow_object);
+                           shadow_object = next_shadow;
+                   }
+           }
+           extended->shadow_depth = shadow_depth;
 
-       submap_info->pages_resident = extended.pages_resident;
-       submap_info->pages_swapped_out = extended.pages_swapped_out;
-       submap_info->pages_shared_now_private = 
-                               extended.pages_shared_now_private;
-       submap_info->pages_dirtied = extended.pages_dirtied;
-       submap_info->external_pager = extended.external_pager;
-       submap_info->shadow_depth = extended.shadow_depth;
+           if (extended->shadow_depth || entry->needs_copy)
+               extended->share_mode = SM_COW;
+           else {
+               if (ref_count == 1)
+                   extended->share_mode = SM_PRIVATE;
+               else {
+                   if (obj->true_share)
+                       extended->share_mode = SM_TRUESHARED;
+                   else
+                       extended->share_mode = SM_SHARED;
+               }
+           }
+           extended->ref_count = ref_count - extended->shadow_depth;
+           
+           for (i = 0; i < extended->shadow_depth; i++) {
+               if ((tmp_obj = obj->shadow) == 0)
+                   break;
+               vm_object_lock(tmp_obj);
+               vm_object_unlock(obj);
 
-       vm_map_unlock_read(map);
-       return(KERN_SUCCESS);
+               if ((ref_count = tmp_obj->ref_count) > 1 && tmp_obj->paging_in_progress)
+                   ref_count--;
+
+               extended->ref_count += ref_count;
+               obj = tmp_obj;
+           }
+           vm_object_unlock(obj);
+
+           if (extended->share_mode == SM_SHARED) {
+               register vm_map_entry_t      cur;
+               register vm_map_entry_t      last;
+               int      my_refs;
+
+               obj = entry->object.vm_object;
+               last = vm_map_to_entry(map);
+               my_refs = 0;
+
+               if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
+                       ref_count--;
+               for (cur = vm_map_first_entry(map); cur != last; cur = cur->vme_next)
+                   my_refs += vm_map_region_count_obj_refs(cur, obj);
+
+               if (my_refs == ref_count)
+                   extended->share_mode = SM_PRIVATE_ALIASED;
+               else if (my_refs > 1)
+                   extended->share_mode = SM_SHARED_ALIASED;
+           }
+       }
 }
 
-/*
- *     TEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARY
- *     Goes away after regular vm_region_recurse function migrates to
- *     64 bits
- *     vm_region_recurse: A form of vm_region which follows the
- *     submaps in a target map
- *
- */
 
-kern_return_t
-vm_region_recurse_64(
-       vm_map_t                 map,
-       vm_offset_t             *address,               /* IN/OUT */
-       vm_size_t               *size,                  /* OUT */
-       natural_t               *nesting_depth,         /* IN/OUT */
-       vm_region_recurse_info_t info,                  /* IN/OUT */
-       mach_msg_type_number_t  *count)                 /* IN/OUT */
-{
-       vm_map_entry_t          tmp_entry;
-       register
-       vm_map_entry_t          entry;
-       register
-       vm_offset_t             start;
-
-       unsigned int                    recurse_count;
-       vm_map_t                        submap;
-       vm_map_t                        base_map;
-       vm_map_entry_t                  base_entry;
-       vm_offset_t                     base_next;
-       vm_offset_t                     base_addr;
-       vm_offset_t                     baddr_start_delta;
-       vm_region_submap_info_64_t      submap_info;
-       vm_region_extended_info_data_t  extended;
+/* object is locked on entry and locked on return */
 
-       if (map == VM_MAP_NULL) 
-               return(KERN_INVALID_ARGUMENT);
 
-       submap_info = (vm_region_submap_info_64_t) info;
-       *count = VM_REGION_SUBMAP_INFO_COUNT;
+static void
+vm_map_region_look_for_page(
+       __unused vm_map_t               map,
+       __unused vm_map_offset_t        va,
+       vm_object_t                     object,
+       vm_object_offset_t      offset,
+       int                             max_refcnt,
+       int                             depth,
+       vm_region_extended_info_t       extended)
+{
+        register vm_page_t        p;
+        register vm_object_t      shadow;
+       register int               ref_count;
+       vm_object_t                caller_object;
+        
+       shadow = object->shadow;
+       caller_object = object;
 
-       if (*count < VM_REGION_SUBMAP_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
+       
+       while (TRUE) {
 
-       start = *address;
-       base_map = map;
-       recurse_count = *nesting_depth;
+               if ( !(object->pager_trusted) && !(object->internal))
+                           extended->external_pager = 1;
 
-LOOKUP_NEXT_BASE_ENTRY:
-       vm_map_lock_read(map);
-        if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
-               }
-       } else {
-               entry = tmp_entry;
-       }
-       *size = entry->vme_end - entry->vme_start;
-       start = entry->vme_start;
-       base_addr = start;
-       baddr_start_delta = *address - start;
-       base_next = entry->vme_end;
-       base_entry = entry;
+               if ((p = vm_page_lookup(object, offset)) != VM_PAGE_NULL) {
+                       if (shadow && (max_refcnt == 1))
+                               extended->pages_shared_now_private++;
 
-       while(entry->is_sub_map && recurse_count) {
-               recurse_count--;
-               vm_map_lock_read(entry->object.sub_map);
+                       if (!p->fictitious && 
+                           (p->dirty || pmap_is_modified(p->phys_page)))
+                               extended->pages_dirtied++;
+
+                       extended->pages_resident++;
 
+                       if(object != caller_object)
+                            vm_object_unlock(object);
 
-               if(entry == base_entry) {
-                       start = entry->offset;
-               start += *address - entry->vme_start;
+                       return;
                }
+               if (object->existence_map) {
+                       if (vm_external_state_get(object->existence_map, offset) == VM_EXTERNAL_STATE_EXISTS) {
 
-               submap = entry->object.sub_map;
-               vm_map_unlock_read(map);
-               map = submap;
+                               extended->pages_swapped_out++;
 
-               if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-                       if ((entry = tmp_entry->vme_next) 
-                                               == vm_map_to_entry(map)) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-               } else {
-                       entry = tmp_entry;
+                               if(object != caller_object)
+                                    vm_object_unlock(object);
 
+                               return;
+                       }
                }
-               if(start <= entry->vme_start) {
-                       vm_offset_t     old_start = start;
-                       if(baddr_start_delta) {
-                               base_addr += (baddr_start_delta);
-                               *size -= baddr_start_delta;
-                               baddr_start_delta = 0;
-                       }
-                       if(base_next <= 
-                               (base_addr += (entry->vme_start - start))) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-                       *size -= entry->vme_start - start;
-                       if (*size > (entry->vme_end - entry->vme_start)) {
-                               *size = entry->vme_end - entry->vme_start;
-                       }
-                       start = 0;
-               } else {
-                       if(baddr_start_delta) {
-                               if((start - entry->vme_start) 
-                                               < baddr_start_delta) {
-                                       base_addr += start - entry->vme_start;
-                                       *size -= start - entry->vme_start;
-                               } else {
-                                       base_addr += baddr_start_delta;
-                                       *size += baddr_start_delta;
-                               }
-                               baddr_start_delta = 0;
-                       }
-                       base_addr += entry->vme_start;
-                       if(base_addr >= base_next) {
-                               vm_map_unlock_read(map);
-                               map = base_map;
-                               start = base_next;
-                               recurse_count = 0;
-                               *nesting_depth = 0;
-                               goto LOOKUP_NEXT_BASE_ENTRY;
-                       }
-                       if (*size > (entry->vme_end - start))
-                               *size = entry->vme_end - start;
+               if (shadow) {
+                   vm_object_lock(shadow);
 
-                       start = entry->vme_start - start;
-               }
+                       if ((ref_count = shadow->ref_count) > 1 && shadow->paging_in_progress)
+                               ref_count--;
 
-               start += entry->offset;
+                       if (++depth > extended->shadow_depth)
+                               extended->shadow_depth = depth;
 
-       }
-       *nesting_depth -= recurse_count;
-       if(entry != base_entry) {
-               start = entry->vme_start + (start - entry->offset);
-       }
+                       if (ref_count > max_refcnt)
+                               max_refcnt = ref_count;
+                       
+                       if(object != caller_object)
+                            vm_object_unlock(object);
 
+                       offset = offset + object->shadow_offset;
+                       object = shadow;
+                       shadow = object->shadow;
+                       continue;
+               }
+               if(object != caller_object)
+                    vm_object_unlock(object);
+               break;
+       }
+}
 
-       submap_info->user_tag = entry->alias;
-       submap_info->offset = entry->offset;
-       submap_info->protection = entry->protection;
-       submap_info->inheritance = entry->inheritance;
-       submap_info->max_protection = entry->max_protection;
-       submap_info->behavior = entry->behavior;
-       submap_info->user_wired_count = entry->user_wired_count;
-       submap_info->is_submap = entry->is_sub_map;
-       submap_info->object_id = (vm_offset_t)entry->object.vm_object;
-       *address = base_addr;
+static int
+vm_map_region_count_obj_refs(
+        vm_map_entry_t    entry,
+       vm_object_t       object)
+{
+        register int ref_count;
+       register vm_object_t chk_obj;
+       register vm_object_t tmp_obj;
 
+       if (entry->object.vm_object == 0)
+           return(0);
 
-       extended.pages_resident = 0;
-       extended.pages_swapped_out = 0;
-       extended.pages_shared_now_private = 0;
-       extended.pages_dirtied = 0;
-       extended.external_pager = 0;
-       extended.shadow_depth = 0;
+        if (entry->is_sub_map)
+           return(0);
+       else {
+           ref_count = 0;
 
-       if(!entry->is_sub_map) {
-               vm_region_walk(entry, &extended, entry->offset, 
-                               entry->vme_end - start, map, start);
-               submap_info->share_mode = extended.share_mode;
-               if (extended.external_pager && extended.ref_count == 2 
-                                       && extended.share_mode == SM_SHARED)
-                       submap_info->share_mode = SM_PRIVATE;
-               submap_info->ref_count = extended.ref_count;
-       } else {
-               if(entry->use_pmap) 
-                       submap_info->share_mode =  SM_TRUESHARED;
-               else
-                       submap_info->share_mode = SM_PRIVATE;
-               submap_info->ref_count = entry->object.sub_map->ref_count;
-       }
+           chk_obj = entry->object.vm_object;
+           vm_object_lock(chk_obj);
 
-       submap_info->pages_resident = extended.pages_resident;
-       submap_info->pages_swapped_out = extended.pages_swapped_out;
-       submap_info->pages_shared_now_private = 
-                               extended.pages_shared_now_private;
-       submap_info->pages_dirtied = extended.pages_dirtied;
-       submap_info->external_pager = extended.external_pager;
-       submap_info->shadow_depth = extended.shadow_depth;
+           while (chk_obj) {
+               if (chk_obj == object)
+                   ref_count++;
+               tmp_obj = chk_obj->shadow;
+               if (tmp_obj)
+                  vm_object_lock(tmp_obj);
+               vm_object_unlock(chk_obj);
 
-       vm_map_unlock_read(map);
-       return(KERN_SUCCESS);
+               chk_obj = tmp_obj;
+           }
+       }
+       return(ref_count);
 }
 
 
 /*
- *     TEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARYTEMPORARY
- *     Goes away after regular vm_region function migrates to
- *     64 bits
+ *     Routine:        vm_map_simplify
+ *
+ *     Description:
+ *             Attempt to simplify the map representation in
+ *             the vicinity of the given starting address.
+ *     Note:
+ *             This routine is intended primarily to keep the
+ *             kernel maps more compact -- they generally don't
+ *             benefit from the "expand a map entry" technology
+ *             at allocation time because the adjacent entry
+ *             is often wired down.
  */
+void
+vm_map_simplify_entry(
+       vm_map_t        map,
+       vm_map_entry_t  this_entry)
+{
+       vm_map_entry_t  prev_entry;
 
+       counter(c_vm_map_simplify_entry_called++);
+
+       prev_entry = this_entry->vme_prev;
+
+       if ((this_entry != vm_map_to_entry(map)) &&
+            (prev_entry != vm_map_to_entry(map)) &&
+
+           (prev_entry->vme_end == this_entry->vme_start) &&
+
+           (prev_entry->is_sub_map == FALSE) &&
+           (this_entry->is_sub_map == FALSE) &&
+
+           (prev_entry->object.vm_object == this_entry->object.vm_object) &&
+           ((prev_entry->offset + (prev_entry->vme_end -
+                                   prev_entry->vme_start))
+            == this_entry->offset) &&
+
+           (prev_entry->inheritance == this_entry->inheritance) &&
+           (prev_entry->protection == this_entry->protection) &&
+           (prev_entry->max_protection == this_entry->max_protection) &&
+           (prev_entry->behavior == this_entry->behavior) &&
+           (prev_entry->alias == this_entry->alias) &&
+           (prev_entry->wired_count == this_entry->wired_count) &&
+           (prev_entry->user_wired_count == this_entry->user_wired_count) &&
+
+           (prev_entry->needs_copy == this_entry->needs_copy) &&
+
+           (prev_entry->use_pmap == FALSE) &&
+           (this_entry->use_pmap == FALSE) &&
+           (prev_entry->in_transition == FALSE) &&
+           (this_entry->in_transition == FALSE) &&
+           (prev_entry->needs_wakeup == FALSE) &&
+           (this_entry->needs_wakeup == FALSE) &&
+           (prev_entry->is_shared == FALSE) &&
+           (this_entry->is_shared == FALSE)
+                   ) {
+               _vm_map_entry_unlink(&map->hdr, prev_entry);
+               this_entry->vme_start = prev_entry->vme_start;
+               this_entry->offset = prev_entry->offset;
+               vm_object_deallocate(prev_entry->object.vm_object);
+               vm_map_entry_dispose(map, prev_entry);
+               SAVE_HINT_MAP_WRITE(map, this_entry);
+               counter(c_vm_map_simplified++);
+       }
+}
 
-kern_return_t
-vm_region_64(
-       vm_map_t                 map,
-       vm_offset_t             *address,               /* IN/OUT */
-       vm_size_t               *size,                  /* OUT */
-       vm_region_flavor_t       flavor,                /* IN */
-       vm_region_info_t         info,                  /* OUT */
-       mach_msg_type_number_t  *count,                 /* IN/OUT */
-       ipc_port_t              *object_name)           /* OUT */
+void
+vm_map_simplify(
+       vm_map_t        map,
+       vm_map_offset_t start)
 {
-       vm_map_entry_t          tmp_entry;
-       register
-       vm_map_entry_t          entry;
-       register
-       vm_offset_t             start;
-       vm_region_basic_info_64_t       basic;
-       vm_region_extended_info_t       extended;
-       vm_region_top_info_t    top;
+       vm_map_entry_t  this_entry;
 
-       if (map == VM_MAP_NULL) 
-               return(KERN_INVALID_ARGUMENT);
+       vm_map_lock(map);
+       if (vm_map_lookup_entry(map, start, &this_entry)) {
+               vm_map_simplify_entry(map, this_entry);
+               vm_map_simplify_entry(map, this_entry->vme_next);
+       }
+       counter(c_vm_map_simplify_called++);
+       vm_map_unlock(map);
+}
 
-       switch (flavor) {
-       
-       case VM_REGION_BASIC_INFO:
-       {
-           if (*count < VM_REGION_BASIC_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
+static void
+vm_map_simplify_range(
+       vm_map_t        map,
+       vm_map_offset_t start,
+       vm_map_offset_t end)
+{
+       vm_map_entry_t  entry;
 
-           basic = (vm_region_basic_info_64_t) info;
-           *count = VM_REGION_BASIC_INFO_COUNT;
+       /*
+        * The map should be locked (for "write") by the caller.
+        */
 
-           vm_map_lock_read(map);
+       if (start >= end) {
+               /* invalid address range */
+               return;
+       }
 
-           start = *address;
-           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
+       if (!vm_map_lookup_entry(map, start, &entry)) {
+               /* "start" is not mapped and "entry" ends before "start" */
+               if (entry == vm_map_to_entry(map)) {
+                       /* start with first entry in the map */
+                       entry = vm_map_first_entry(map);
+               } else {
+                       /* start with next entry */
+                       entry = entry->vme_next;
                }
-           } else {
-               entry = tmp_entry;
-           }
-
-           start = entry->vme_start;
-
-           basic->offset = entry->offset;
-           basic->protection = entry->protection;
-           basic->inheritance = entry->inheritance;
-           basic->max_protection = entry->max_protection;
-           basic->behavior = entry->behavior;
-           basic->user_wired_count = entry->user_wired_count;
-           basic->reserved = entry->is_sub_map;
-           *address = start;
-           *size = (entry->vme_end - start);
-
-           if (object_name) *object_name = IP_NULL;
-           if (entry->is_sub_map) {
-               basic->shared = FALSE;
-           } else {
-               basic->shared = entry->is_shared;
-           }
-
-           vm_map_unlock_read(map);
-           return(KERN_SUCCESS);
-       }
-       case VM_REGION_EXTENDED_INFO:
-       {
-
-           if (*count < VM_REGION_EXTENDED_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
-
-           extended = (vm_region_extended_info_t) info;
-           *count = VM_REGION_EXTENDED_INFO_COUNT;
-
-           vm_map_lock_read(map);
-
-           start = *address;
-           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
-               }
-           } else {
-               entry = tmp_entry;
-           }
-           start = entry->vme_start;
-
-           extended->protection = entry->protection;
-           extended->user_tag = entry->alias;
-           extended->pages_resident = 0;
-           extended->pages_swapped_out = 0;
-           extended->pages_shared_now_private = 0;
-           extended->pages_dirtied = 0;
-           extended->external_pager = 0;
-           extended->shadow_depth = 0;
-
-           vm_region_walk(entry, extended, entry->offset, entry->vme_end - start, map, start);
-
-           if (extended->external_pager && extended->ref_count == 2 && extended->share_mode == SM_SHARED)
-                   extended->share_mode = SM_PRIVATE;
-
-           if (object_name)
-               *object_name = IP_NULL;
-           *address = start;
-           *size = (entry->vme_end - start);
-
-           vm_map_unlock_read(map);
-           return(KERN_SUCCESS);
        }
-       case VM_REGION_TOP_INFO:
-       {   
-
-           if (*count < VM_REGION_TOP_INFO_COUNT)
-               return(KERN_INVALID_ARGUMENT);
-
-           top = (vm_region_top_info_t) info;
-           *count = VM_REGION_TOP_INFO_COUNT;
-
-           vm_map_lock_read(map);
-
-           start = *address;
-           if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               if ((entry = tmp_entry->vme_next) == vm_map_to_entry(map)) {
-                       vm_map_unlock_read(map);
-                       return(KERN_INVALID_ADDRESS);
-               }
-           } else {
-               entry = tmp_entry;
-
-           }
-           start = entry->vme_start;
-
-           top->private_pages_resident = 0;
-           top->shared_pages_resident = 0;
-
-           vm_region_top_walk(entry, top);
-
-           if (object_name)
-               *object_name = IP_NULL;
-           *address = start;
-           *size = (entry->vme_end - start);
-
-           vm_map_unlock_read(map);
-           return(KERN_SUCCESS);
-       }
-       default:
-           return(KERN_INVALID_ARGUMENT);
-       }
-}
-
-void
-vm_region_top_walk(
-        vm_map_entry_t            entry,
-       vm_region_top_info_t       top)
-{
-        register struct vm_object *obj, *tmp_obj;
-       register int    ref_count;
-
-       if (entry->object.vm_object == 0) {
-           top->share_mode = SM_EMPTY;
-           top->ref_count = 0;
-           top->obj_id = 0;
-           return;
-       }
-        if (entry->is_sub_map)
-           vm_region_top_walk((vm_map_entry_t)entry->object.sub_map, top);
-       else {
-           obj = entry->object.vm_object;
-
-           vm_object_lock(obj);
-
-           if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
-               ref_count--;
-
-           if (obj->shadow) {
-               if (ref_count == 1)
-                   top->private_pages_resident = obj->resident_page_count;
-               else
-                   top->shared_pages_resident = obj->resident_page_count;
-               top->ref_count  = ref_count;
-               top->share_mode = SM_COW;
-           
-               while (tmp_obj = obj->shadow) {
-                   vm_object_lock(tmp_obj);
-                   vm_object_unlock(obj);
-                   obj = tmp_obj;
-
-                   if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
-                       ref_count--;
-
-                   top->shared_pages_resident += obj->resident_page_count;
-                   top->ref_count += ref_count - 1;
-               }
-           } else {
-               if (entry->needs_copy) {
-                   top->share_mode = SM_COW;
-                   top->shared_pages_resident = obj->resident_page_count;
-               } else {
-                   if (ref_count == 1 ||
-                      (ref_count == 2 && !(obj->pager_trusted) && !(obj->internal))) {
-                       top->share_mode = SM_PRIVATE;
-                       top->private_pages_resident = obj->resident_page_count;
-                   } else {
-                       top->share_mode = SM_SHARED;
-                       top->shared_pages_resident = obj->resident_page_count;
-                   }
-               }
-               top->ref_count = ref_count;
-           }
-           top->obj_id = (int)obj;
-
-           vm_object_unlock(obj);
-       }
-}
-
-void
-vm_region_walk(
-        vm_map_entry_t            entry,
-       vm_region_extended_info_t  extended,
-       vm_object_offset_t         offset,
-       vm_offset_t                range,
-       vm_map_t                   map,
-       vm_offset_t                va)
-{
-        register struct vm_object *obj, *tmp_obj;
-       register vm_offset_t       last_offset;
-       register int               i;
-       register int               ref_count;
-       void vm_region_look_for_page();
-
-       if ((entry->object.vm_object == 0) || 
-               (entry->object.vm_object->phys_contiguous)) {
-           extended->share_mode = SM_EMPTY;
-           extended->ref_count = 0;
-           return;
-       }
-        if (entry->is_sub_map)
-           vm_region_walk((vm_map_entry_t)entry->object.sub_map, extended, offset + entry->offset,
-                          range, map, va);
-       else {
-           obj = entry->object.vm_object;
-
-           vm_object_lock(obj);
-
-           if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
-               ref_count--;
-
-           for (last_offset = offset + range; offset < last_offset; offset += PAGE_SIZE_64, va += PAGE_SIZE)
-               vm_region_look_for_page(obj, extended, offset, ref_count, 0, map, va);
-
-           if (extended->shadow_depth || entry->needs_copy)
-               extended->share_mode = SM_COW;
-           else {
-               if (ref_count == 1)
-                   extended->share_mode = SM_PRIVATE;
-               else {
-                   if (obj->true_share)
-                       extended->share_mode = SM_TRUESHARED;
-                   else
-                       extended->share_mode = SM_SHARED;
-               }
-           }
-           extended->ref_count = ref_count - extended->shadow_depth;
-           
-           for (i = 0; i < extended->shadow_depth; i++) {
-               if ((tmp_obj = obj->shadow) == 0)
-                   break;
-               vm_object_lock(tmp_obj);
-               vm_object_unlock(obj);
-
-               if ((ref_count = tmp_obj->ref_count) > 1 && tmp_obj->paging_in_progress)
-                   ref_count--;
-
-               extended->ref_count += ref_count;
-               obj = tmp_obj;
-           }
-           vm_object_unlock(obj);
-
-           if (extended->share_mode == SM_SHARED) {
-               register vm_map_entry_t      cur;
-               register vm_map_entry_t      last;
-               int      my_refs;
-
-               obj = entry->object.vm_object;
-               last = vm_map_to_entry(map);
-               my_refs = 0;
-
-               if ((ref_count = obj->ref_count) > 1 && obj->paging_in_progress)
-                       ref_count--;
-               for (cur = vm_map_first_entry(map); cur != last; cur = cur->vme_next)
-                   my_refs += vm_region_count_obj_refs(cur, obj);
-
-               if (my_refs == ref_count)
-                   extended->share_mode = SM_PRIVATE_ALIASED;
-               else if (my_refs > 1)
-                   extended->share_mode = SM_SHARED_ALIASED;
-           }
-       }
-}
-
-
-/* object is locked on entry and locked on return */
-
-
-void
-vm_region_look_for_page(
-        vm_object_t               object,
-       vm_region_extended_info_t  extended,
-       vm_object_offset_t         offset,
-       int                        max_refcnt,
-        int                        depth,
-       vm_map_t                   map,
-       vm_offset_t                va)
-{
-        register vm_page_t        p;
-        register vm_object_t      shadow;
-       register int               ref_count;
-       vm_object_t                caller_object;
-        
-       shadow = object->shadow;
-       caller_object = object;
-
-       
-       while (TRUE) {
-
-               if ( !(object->pager_trusted) && !(object->internal))
-                           extended->external_pager = 1;
-
-               if ((p = vm_page_lookup(object, offset)) != VM_PAGE_NULL) {
-                       if (shadow && (max_refcnt == 1))
-                               extended->pages_shared_now_private++;
-
-                       if (p->dirty || pmap_is_modified(p->phys_addr))
-                               extended->pages_dirtied++;
-                       extended->pages_resident++;
-
-                       if(object != caller_object)
-                               vm_object_unlock(object);
-
-                       return;
-               }
-               if (object->existence_map) {
-                       if (vm_external_state_get(object->existence_map, offset) == VM_EXTERNAL_STATE_EXISTS) {
-
-                               extended->pages_swapped_out++;
-
-                               if(object != caller_object)
-                                       vm_object_unlock(object);
-
-                               return;
-                       }
-               }
-               if (shadow) {
-                       vm_object_lock(shadow);
-
-                       if ((ref_count = shadow->ref_count) > 1 && shadow->paging_in_progress)
-                               ref_count--;
-
-                       if (++depth > extended->shadow_depth)
-                               extended->shadow_depth = depth;
-
-                       if (ref_count > max_refcnt)
-                               max_refcnt = ref_count;
-                       
-                       if(object != caller_object)
-                               vm_object_unlock(object);
-
-                       object = shadow;
-                       shadow = object->shadow;
-                       offset = offset + object->shadow_offset;
-                       continue;
-               }
-               if(object != caller_object)
-                       vm_object_unlock(object);
-               break;
-       }
-}
-
-
-vm_region_count_obj_refs(
-        vm_map_entry_t    entry,
-       vm_object_t       object)
-{
-        register int ref_count;
-       register vm_object_t chk_obj;
-       register vm_object_t tmp_obj;
-
-       if (entry->object.vm_object == 0)
-           return(0);
-
-        if (entry->is_sub_map)
-           ref_count = vm_region_count_obj_refs((vm_map_entry_t)entry->object.sub_map, object);
-       else {
-           ref_count = 0;
-
-           chk_obj = entry->object.vm_object;
-           vm_object_lock(chk_obj);
-
-           while (chk_obj) {
-               if (chk_obj == object)
-                   ref_count++;
-               if (tmp_obj = chk_obj->shadow)
-                   vm_object_lock(tmp_obj);
-               vm_object_unlock(chk_obj);
                
-               chk_obj = tmp_obj;
-           }
-       }
-       return(ref_count);
-}
-
-
-/*
- *     Routine:        vm_map_simplify
- *
- *     Description:
- *             Attempt to simplify the map representation in
- *             the vicinity of the given starting address.
- *     Note:
- *             This routine is intended primarily to keep the
- *             kernel maps more compact -- they generally don't
- *             benefit from the "expand a map entry" technology
- *             at allocation time because the adjacent entry
- *             is often wired down.
- */
-void
-vm_map_simplify(
-       vm_map_t        map,
-       vm_offset_t     start)
-{
-       vm_map_entry_t  this_entry;
-       vm_map_entry_t  prev_entry;
-       vm_map_entry_t  next_entry;
-
-       vm_map_lock(map);
-       if (
-               (vm_map_lookup_entry(map, start, &this_entry)) &&
-               ((prev_entry = this_entry->vme_prev) != vm_map_to_entry(map)) &&
-
-               (prev_entry->vme_end == this_entry->vme_start) &&
-
-               (prev_entry->is_shared == FALSE) &&
-               (prev_entry->is_sub_map == FALSE) &&
-
-               (this_entry->is_shared == FALSE) &&
-               (this_entry->is_sub_map == FALSE) &&
-
-               (prev_entry->inheritance == this_entry->inheritance) &&
-               (prev_entry->protection == this_entry->protection) &&
-               (prev_entry->max_protection == this_entry->max_protection) &&
-               (prev_entry->behavior == this_entry->behavior) &&
-               (prev_entry->wired_count == this_entry->wired_count) &&
-               (prev_entry->user_wired_count == this_entry->user_wired_count)&&
-               (prev_entry->in_transition == FALSE) &&
-               (this_entry->in_transition == FALSE) &&
-
-               (prev_entry->needs_copy == this_entry->needs_copy) &&
-
-               (prev_entry->object.vm_object == this_entry->object.vm_object)&&
-               ((prev_entry->offset +
-                (prev_entry->vme_end - prev_entry->vme_start))
-                    == this_entry->offset)
-       ) {
-               SAVE_HINT(map, prev_entry);
-               vm_map_entry_unlink(map, this_entry);
-               prev_entry->vme_end = this_entry->vme_end;
-               UPDATE_FIRST_FREE(map, map->first_free);
-               vm_object_deallocate(this_entry->object.vm_object);
-               vm_map_entry_dispose(map, this_entry);
-               counter(c_vm_map_simplified_lower++);
-       }
-       if (
-               (vm_map_lookup_entry(map, start, &this_entry)) &&
-               ((next_entry = this_entry->vme_next) != vm_map_to_entry(map)) &&
-
-               (next_entry->vme_start == this_entry->vme_end) &&
-
-               (next_entry->is_shared == FALSE) &&
-               (next_entry->is_sub_map == FALSE) &&
-
-               (next_entry->is_shared == FALSE) &&
-               (next_entry->is_sub_map == FALSE) &&
-
-               (next_entry->inheritance == this_entry->inheritance) &&
-               (next_entry->protection == this_entry->protection) &&
-               (next_entry->max_protection == this_entry->max_protection) &&
-               (next_entry->behavior == this_entry->behavior) &&
-               (next_entry->wired_count == this_entry->wired_count) &&
-               (next_entry->user_wired_count == this_entry->user_wired_count)&&
-               (this_entry->in_transition == FALSE) &&
-               (next_entry->in_transition == FALSE) &&
-
-               (next_entry->needs_copy == this_entry->needs_copy) &&
-
-               (next_entry->object.vm_object == this_entry->object.vm_object)&&
-               ((this_entry->offset +
-                (this_entry->vme_end - this_entry->vme_start))
-                    == next_entry->offset)
-       ) {
-               vm_map_entry_unlink(map, next_entry);
-               this_entry->vme_end = next_entry->vme_end;
-               UPDATE_FIRST_FREE(map, map->first_free);
-               vm_object_deallocate(next_entry->object.vm_object);
-               vm_map_entry_dispose(map, next_entry);
-               counter(c_vm_map_simplified_upper++);
+       while (entry != vm_map_to_entry(map) &&
+              entry->vme_start <= end) {
+               /* try and coalesce "entry" with its previous entry */
+               vm_map_simplify_entry(map, entry);
+               entry = entry->vme_next;
        }
-       counter(c_vm_map_simplify_called++);
-       vm_map_unlock(map);
 }
 
 
@@ -7803,21 +8459,116 @@ vm_map_simplify(
  */
 kern_return_t
 vm_map_machine_attribute(
-       vm_map_t        map,
-       vm_offset_t     address,
-       vm_size_t       size,
+       vm_map_t                        map,
+       vm_map_offset_t         start,
+       vm_map_offset_t         end,
        vm_machine_attribute_t  attribute,
        vm_machine_attribute_val_t* value)              /* IN/OUT */
 {
        kern_return_t   ret;
-
-       if (address < vm_map_min(map) ||
-           (address + size) > vm_map_max(map))
+       vm_map_size_t sync_size;
+       vm_map_entry_t entry;
+       
+       if (start < vm_map_min(map) || end > vm_map_max(map))
                return KERN_INVALID_ADDRESS;
 
+       /* Figure how much memory we need to flush (in page increments) */
+       sync_size = end - start;
+
        vm_map_lock(map);
+       
+       if (attribute != MATTR_CACHE) { 
+               /* If we don't have to find physical addresses, we */
+               /* don't have to do an explicit traversal here.    */
+               ret = pmap_attribute(map->pmap, start, end-start,
+                                    attribute, value);
+               vm_map_unlock(map);
+               return ret;
+       }
 
-       ret = pmap_attribute(map->pmap, address, size, attribute, value);
+       ret = KERN_SUCCESS;                                                                             /* Assume it all worked */
+
+       while(sync_size) {
+               if (vm_map_lookup_entry(map, start, &entry)) {
+                       vm_map_size_t   sub_size;
+                       if((entry->vme_end - start) > sync_size) {
+                               sub_size = sync_size;
+                               sync_size = 0;
+                       } else {
+                               sub_size = entry->vme_end - start;
+                                       sync_size -= sub_size;
+                       }
+                       if(entry->is_sub_map) {
+                               vm_map_offset_t sub_start;
+                               vm_map_offset_t sub_end;
+
+                               sub_start = (start - entry->vme_start) 
+                                           + entry->offset;
+                               sub_end = sub_start + sub_size;
+                               vm_map_machine_attribute(
+                                       entry->object.sub_map, 
+                                       sub_start,
+                                       sub_end,
+                                       attribute, value);
+                       } else {
+                               if(entry->object.vm_object) {
+                                       vm_page_t               m;
+                                       vm_object_t             object;
+                                       vm_object_t             base_object;
+                                       vm_object_t             last_object;
+                                       vm_object_offset_t      offset;
+                                       vm_object_offset_t      base_offset;
+                                       vm_map_size_t           range;
+                                       range = sub_size;
+                                       offset = (start - entry->vme_start)
+                                                       + entry->offset;
+                                       base_offset = offset;
+                                       object = entry->object.vm_object;
+                                       base_object = object;
+                                       last_object = NULL;
+
+                                       vm_object_lock(object);
+
+                                       while (range) {
+                                               m = vm_page_lookup(
+                                                       object, offset);
+
+                                               if (m && !m->fictitious) {
+                                                       ret = 
+                                                           pmap_attribute_cache_sync(
+                                                                                     m->phys_page,     
+                                                                                     PAGE_SIZE, 
+                                                                                     attribute, value);
+                                                       
+                                               } else if (object->shadow) {
+                                                       offset = offset + object->shadow_offset;
+                                                       last_object = object;
+                                                       object = object->shadow;
+                                                       vm_object_lock(last_object->shadow);
+                                                       vm_object_unlock(last_object);
+                                                       continue;
+                                               }
+                                               range -= PAGE_SIZE;
+
+                                               if (base_object != object) {
+                                                       vm_object_unlock(object);
+                                                       vm_object_lock(base_object);
+                                                       object = base_object;
+                                               }
+                                               /* Bump to the next page */
+                                               base_offset += PAGE_SIZE;
+                                               offset = base_offset;
+                                       }
+                                       vm_object_unlock(object);
+                               }
+                       }
+                       start += sub_size;
+               } else {
+                       vm_map_unlock(map);
+                       return KERN_FAILURE;
+               }
+               
+       }
 
        vm_map_unlock(map);
 
@@ -7835,8 +8586,8 @@ vm_map_machine_attribute(
 kern_return_t 
 vm_map_behavior_set(
        vm_map_t        map,
-       vm_offset_t     start,
-       vm_offset_t     end,
+       vm_map_offset_t start,
+       vm_map_offset_t end,
        vm_behavior_t   new_behavior)
 {
        register vm_map_entry_t entry;
@@ -7852,6 +8603,10 @@ vm_map_behavior_set(
        case VM_BEHAVIOR_SEQUENTIAL:
        case VM_BEHAVIOR_RSEQNTL:
                break;
+       case VM_BEHAVIOR_WILLNEED:
+       case VM_BEHAVIOR_DONTNEED:
+               new_behavior = VM_BEHAVIOR_DEFAULT;
+               break;
        default:
                return(KERN_INVALID_ARGUMENT);
        }
@@ -7919,11 +8674,11 @@ void
 vm_map_links_print(
        struct vm_map_links     *links)
 {
-       iprintf("prev=0x%x, next=0x%x, start=0x%x, end=0x%x\n",
+       iprintf("prev = %08X  next = %08X  start = %016llX  end = %016llX\n",
                links->prev,
                links->next,
-               links->start,
-               links->end);
+               (unsigned long long)links->start,
+               (unsigned long long)links->end);
 }
 
 /*
@@ -7934,7 +8689,7 @@ vm_map_header_print(
        struct vm_map_header    *header)
 {
        vm_map_links_print(&header->links);
-       iprintf("nentries=0x%x, %sentries_pageable\n",
+       iprintf("nentries = %08X, %sentries_pageable\n",
                header->nentries,
                (header->entries_pageable ? "" : "!"));
 }
@@ -7946,10 +8701,9 @@ void
 vm_follow_entry(
        vm_map_entry_t entry)
 {
-       extern int db_indent;
        int shadows;
 
-       iprintf("map entry 0x%x:\n", entry);
+       iprintf("map entry %08X\n", entry);
 
        db_indent += 2;
 
@@ -7966,24 +8720,25 @@ void
 vm_map_entry_print(
        register vm_map_entry_t entry)
 {
-       extern int db_indent;
-       static char *inheritance_name[4] = { "share", "copy", "none", "?"};
-       static char *behavior_name[4] = { "dflt", "rand", "seqtl", "rseqntl" };
+       static const char *inheritance_name[4] =
+               { "share", "copy", "none", "?"};
+       static const char *behavior_name[4] =
+               { "dflt", "rand", "seqtl", "rseqntl" };
        
-       iprintf("map entry 0x%x:\n", entry);
+       iprintf("map entry %08X - prev = %08X  next = %08X\n", entry, entry->vme_prev, entry->vme_next);
 
        db_indent += 2;
 
        vm_map_links_print(&entry->links);
 
-       iprintf("start=0x%x, end=0x%x, prot=%x/%x/%s\n",
-               entry->vme_start,
-               entry->vme_end,
+       iprintf("start = %016llX  end = %016llX - prot=%x/%x/%s\n",
+               (unsigned long long)entry->vme_start,
+               (unsigned long long)entry->vme_end,
                entry->protection,
                entry->max_protection,
                inheritance_name[(entry->inheritance & 0x3)]);
 
-       iprintf("behavior=%s, wired_count=%d, user_wired_count=%d\n",
+       iprintf("behavior = %s, wired_count = %d, user_wired_count = %d\n",
                behavior_name[(entry->behavior & 0x3)],
                entry->wired_count,
                entry->user_wired_count);
@@ -7992,13 +8747,13 @@ vm_map_entry_print(
                (entry->needs_wakeup ? "" : "!"));
 
        if (entry->is_sub_map) {
-               iprintf("submap=0x%x, offset=0x%x\n",
+               iprintf("submap = %08X - offset = %016llX\n",
                       entry->object.sub_map,
-                      entry->offset);
+                      (unsigned long long)entry->offset);
        } else {
-               iprintf("object=0x%x, offset=0x%x, ",
+               iprintf("object = %08X  offset = %016llX - ",
                        entry->object.vm_object,
-                       entry->offset);
+                       (unsigned long long)entry->offset);
                printf("%sis_shared, %sneeds_copy\n",
                       (entry->is_shared ? "" : "!"),
                       (entry->needs_copy ? "" : "!"));
@@ -8015,9 +8770,8 @@ vm_follow_map(
        vm_map_t map)
 {
        register vm_map_entry_t entry;
-       extern int db_indent;
 
-       iprintf("task map 0x%x:\n", map);
+       iprintf("task map %08X\n", map);
 
        db_indent += 2;
 
@@ -8035,26 +8789,31 @@ vm_follow_map(
  */
 void
 vm_map_print(
-       register vm_map_t       map)
+       db_addr_t inmap)
 {
        register vm_map_entry_t entry;
-       extern int db_indent;
+       vm_map_t map;
+#if TASK_SWAPPER
        char *swstate;
+#endif /* TASK_SWAPPER */
+
+       map = (vm_map_t)(long)
+               inmap;  /* Make sure we have the right type */
 
-       iprintf("task map 0x%x:\n", map);
+       iprintf("task map %08X\n", map);
 
        db_indent += 2;
 
        vm_map_header_print(&map->hdr);
 
-       iprintf("pmap=0x%x, size=%d, ref=%d, hint=0x%x, first_free=0x%x\n",
+       iprintf("pmap = %08X  size = %08X  ref = %d  hint = %08X  first_free = %08X\n",
                map->pmap,
                map->size,
                map->ref_count,
                map->hint,
                map->first_free);
 
-       iprintf("%swait_for_space, %swiring_required, timestamp=%d\n",
+       iprintf("%swait_for_space, %swiring_required, timestamp = %d\n",
                (map->wait_for_space ? "" : "!"),
                (map->wiring_required ? "" : "!"),
                map->timestamp);
@@ -8071,7 +8830,7 @@ vm_map_print(
                swstate = "????";
                break;
        }
-       iprintf("res=%d, sw_state=%s\n", map->res_count, swstate);
+       iprintf("res = %d, sw_state = %s\n", map->res_count, swstate);
 #endif /* TASK_SWAPPER */
 
        for (entry = vm_map_first_entry(map);
@@ -8091,12 +8850,14 @@ vm_map_print(
 
 void
 vm_map_copy_print(
-       vm_map_copy_t   copy)
+       db_addr_t       incopy)
 {
-       extern int db_indent;
-       int i, npages;
+       vm_map_copy_t copy;
        vm_map_entry_t entry;
 
+       copy = (vm_map_copy_t)(long)
+               incopy; /* Make sure we have the right type */
+
        printf("copy object 0x%x\n", copy);
 
        db_indent += 2;
@@ -8119,7 +8880,7 @@ vm_map_copy_print(
                printf("[bad type]");
                break;
        }
-       printf(", offset=0x%x", copy->offset);
+       printf(", offset=0x%llx", (unsigned long long)copy->offset);
        printf(", size=0x%x\n", copy->size);
 
        switch (copy->type) {
@@ -8151,12 +8912,16 @@ vm_map_copy_print(
  *
  *     return the total virtual size (in bytes) of the map
  */
-vm_size_t
+vm_map_size_t
 db_vm_map_total_size(
-       vm_map_t        map)
+       db_addr_t       inmap)
 {
        vm_map_entry_t  entry;
-       vm_size_t       total;
+       vm_map_size_t   total;
+       vm_map_t map;
+
+       map = (vm_map_t)(long)
+               inmap;  /* Make sure we have the right type */
 
        total = 0;
        for (entry = vm_map_first_entry(map);
@@ -8179,8 +8944,8 @@ vm_map_entry_t
 vm_map_entry_insert(
        vm_map_t                map,
        vm_map_entry_t          insp_entry,
-       vm_offset_t             start,
-       vm_offset_t             end,
+       vm_map_offset_t         start,
+       vm_map_offset_t         end,
        vm_object_t             object,
        vm_object_offset_t      offset,
        boolean_t               needs_copy,
@@ -8217,6 +8982,7 @@ vm_map_entry_insert(
        new_entry->wired_count = wired_count;
        new_entry->user_wired_count = 0;
        new_entry->use_pmap = FALSE;
+       new_entry->alias = 0;
 
        /*
         *      Insert the new entry into the list.
@@ -8229,20 +8995,20 @@ vm_map_entry_insert(
         *      Update the free space hint and the lookup hint.
         */
 
-       SAVE_HINT(map, new_entry);
+       SAVE_HINT_MAP_WRITE(map, new_entry);
        return new_entry;
 }
 
 /*
- *     Routine:        vm_remap_extract
+ *     Routine:        vm_map_remap_extract
  *
  *     Descritpion:    This routine returns a vm_entry list from a map.
  */
-kern_return_t
-vm_remap_extract(
+static kern_return_t
+vm_map_remap_extract(
        vm_map_t                map,
-       vm_offset_t             addr,
-       vm_size_t               size,
+       vm_map_offset_t         addr,
+       vm_map_size_t           size,
        boolean_t               copy,
        struct vm_map_header    *map_header,
        vm_prot_t               *cur_protection,
@@ -8252,21 +9018,21 @@ vm_remap_extract(
        boolean_t               pageable)
 {
        kern_return_t           result;
-       vm_size_t               mapped_size;
-       vm_size_t               tmp_size;
+       vm_map_size_t           mapped_size;
+       vm_map_size_t           tmp_size;
        vm_map_entry_t          src_entry;     /* result of last map lookup */
        vm_map_entry_t          new_entry;
        vm_object_offset_t      offset;
-       vm_offset_t             map_address;
-       vm_offset_t             src_start;     /* start of entry to map */
-       vm_offset_t             src_end;       /* end of region to be mapped */
+       vm_map_offset_t         map_address;
+       vm_map_offset_t         src_start;     /* start of entry to map */
+       vm_map_offset_t         src_end;       /* end of region to be mapped */
        vm_object_t             object;    
        vm_map_version_t        version;
        boolean_t               src_needs_copy;
        boolean_t               new_entry_needs_copy;
 
        assert(map != VM_MAP_NULL);
-       assert(size != 0 && size == round_page(size));
+       assert(size != 0 && size == vm_map_round_page(size));
        assert(inheritance == VM_INHERIT_NONE ||
               inheritance == VM_INHERIT_COPY ||
               inheritance == VM_INHERIT_SHARE);
@@ -8274,8 +9040,8 @@ vm_remap_extract(
        /*
         *      Compute start and end of region.
         */
-       src_start = trunc_page(addr);
-       src_end = round_page(src_start + size);
+       src_start = vm_map_trunc_page(addr);
+       src_end = vm_map_round_page(src_start + size);
 
        /*
         *      Initialize map_header.
@@ -8298,7 +9064,7 @@ vm_remap_extract(
         */
        vm_map_lock(map);
        while (mapped_size != size) {
-               vm_size_t       entry_size;
+               vm_map_size_t   entry_size;
 
                /*
                 *      Find the beginning of the region.
@@ -8323,11 +9089,12 @@ vm_remap_extract(
                if (src_end > src_entry->vme_end)
                        tmp_size -= (src_end - src_entry->vme_end);
 
-               entry_size = (vm_size_t)(src_entry->vme_end -
+               entry_size = (vm_map_size_t)(src_entry->vme_end -
                                         src_entry->vme_start);
 
                if(src_entry->is_sub_map) {
                        vm_map_reference(src_entry->object.sub_map);
+                       object = VM_OBJECT_NULL;
                } else {
                        object = src_entry->object.vm_object;
 
@@ -8354,11 +9121,27 @@ vm_remap_extract(
 
                                if (!src_entry->needs_copy &&
                                    (src_entry->protection & VM_PROT_WRITE)) {
-                                       pmap_protect(vm_map_pmap(map),
-                                            src_entry->vme_start,
-                                            src_entry->vme_end,
-                                            src_entry->protection &
-                                                    ~VM_PROT_WRITE);
+                                       vm_prot_t prot;
+
+                                       prot = src_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                                       if (src_entry->alias != VM_MEMORY_STACK && prot)
+                                               prot |= VM_PROT_EXECUTE;
+#endif
+                                       if(map->mapped) {
+                                          vm_object_pmap_protect(
+                                               src_entry->object.vm_object,
+                                               src_entry->offset,
+                                               entry_size,
+                                               PMAP_NULL,
+                                               src_entry->vme_start,
+                                               prot);
+                                       } else {
+                                          pmap_protect(vm_map_pmap(map),
+                                                       src_entry->vme_start,
+                                                       src_entry->vme_end,
+                                                       prot);
+                                       }
                                }
 
                                object = src_entry->object.vm_object;
@@ -8401,6 +9184,7 @@ vm_remap_extract(
                } else if (src_entry->is_sub_map) {
                        /* make this a COW sub_map if not already */
                        new_entry->needs_copy = TRUE;
+                       object = VM_OBJECT_NULL;
                } else if (src_entry->wired_count == 0 &&
                         vm_object_copy_quickly(&new_entry->object.vm_object,
                                                new_entry->offset,
@@ -8416,14 +9200,21 @@ vm_remap_extract(
                         * Handle copy_on_write semantics.
                         */
                        if (src_needs_copy && !src_entry->needs_copy) {
+                               vm_prot_t prot;
+
+                               prot = src_entry->protection & ~VM_PROT_WRITE;
+#ifdef STACK_ONLY_NX
+                               if (src_entry->alias != VM_MEMORY_STACK && prot)
+                                       prot |= VM_PROT_EXECUTE;
+#endif
                                vm_object_pmap_protect(object,
                                                       offset,
                                                       entry_size,
-                                                      (src_entry->is_shared ?
+                                                      ((src_entry->is_shared 
+                                                         || map->mapped) ?
                                                        PMAP_NULL : map->pmap),
                                                       src_entry->vme_start,
-                                                      src_entry->protection &
-                                                      ~VM_PROT_WRITE);
+                                                      prot);
 
                                src_entry->needs_copy = TRUE;
                        }
@@ -8443,7 +9234,7 @@ vm_remap_extract(
                         * verification, and unlock the map.
                         */
                        version.main_timestamp = map->timestamp;
-                       vm_map_unlock(map);
+                       vm_map_unlock(map);     /* Increments timestamp once! */
 
                        /*
                         * Perform the copy.
@@ -8487,7 +9278,7 @@ vm_remap_extract(
                         * changed while the copy was being made.
                         */
 
-                       vm_map_lock(map);       /* Increments timestamp once! */
+                       vm_map_lock(map);
                        if (version.main_timestamp + 1 != map->timestamp) {
                                /*
                                 * Simple version comparison failed.
@@ -8550,14 +9341,14 @@ vm_remap_extract(
  *                     Other attributes are identical as for vm_map()
  */
 kern_return_t
-vm_remap(
+vm_map_remap(
        vm_map_t                target_map,
-       vm_offset_t             *address,
-       vm_size_t               size,
-       vm_offset_t             mask,
+       vm_map_address_t        *address,
+       vm_map_size_t           size,
+       vm_map_offset_t         mask,
        boolean_t               anywhere,
        vm_map_t                src_map,
-       vm_offset_t             memory_address,
+       vm_map_offset_t         memory_address,
        boolean_t               copy,
        vm_prot_t               *cur_protection,
        vm_prot_t               *max_protection,
@@ -8565,7 +9356,7 @@ vm_remap(
 {
        kern_return_t           result;
        vm_map_entry_t          entry;
-       vm_map_entry_t          insp_entry;
+       vm_map_entry_t          insp_entry = VM_MAP_ENTRY_NULL;
        vm_map_entry_t          new_entry;
        struct vm_map_header    map_header;
 
@@ -8583,15 +9374,15 @@ vm_remap(
                return KERN_INVALID_ARGUMENT;
        }
 
-       size = round_page(size);
+       size = vm_map_round_page(size);
 
-       result = vm_remap_extract(src_map, memory_address,
-                                 size, copy, &map_header,
-                                 cur_protection,
-                                 max_protection,
-                                 inheritance,
-                                 target_map->hdr.
-                                 entries_pageable);
+       result = vm_map_remap_extract(src_map, memory_address,
+                               size, copy, &map_header,
+                               cur_protection,
+                               max_protection,
+                               inheritance,
+                               target_map->hdr.
+                               entries_pageable);
 
        if (result != KERN_SUCCESS) {
                return result;
@@ -8601,9 +9392,9 @@ vm_remap(
         * Allocate/check a range of free virtual address
         * space for the target
         */
-       *address = trunc_page(*address);
+       *address = vm_map_trunc_page(*address);
        vm_map_lock(target_map);
-       result = vm_remap_range_allocate(target_map, address, size,
+       result = vm_map_remap_range_allocate(target_map, address, size,
                                         mask, anywhere, &insp_entry);
 
        for (entry = map_header.links.next;
@@ -8628,7 +9419,7 @@ vm_remap(
 
        if (result == KERN_SUCCESS) {
                target_map->size += size;
-               SAVE_HINT(target_map, insp_entry);
+               SAVE_HINT_MAP_WRITE(target_map, insp_entry);
        }
        vm_map_unlock(target_map);
 
@@ -8639,7 +9430,7 @@ vm_remap(
 }
 
 /*
- *     Routine:        vm_remap_range_allocate
+ *     Routine:        vm_map_remap_range_allocate
  *
  *     Description:
  *             Allocate a range in the specified virtual address map.
@@ -8649,19 +9440,18 @@ vm_remap(
  *     Map must be locked.
  */
 
-kern_return_t
-vm_remap_range_allocate(
-       vm_map_t        map,
-       vm_offset_t     *address,       /* IN/OUT */
-       vm_size_t       size,
-       vm_offset_t     mask,
-       boolean_t       anywhere,
-       vm_map_entry_t  *map_entry)     /* OUT */
+static kern_return_t
+vm_map_remap_range_allocate(
+       vm_map_t                map,
+       vm_map_address_t        *address,       /* IN/OUT */
+       vm_map_size_t           size,
+       vm_map_offset_t         mask,
+       boolean_t               anywhere,
+       vm_map_entry_t          *map_entry)     /* OUT */
 {
        register vm_map_entry_t entry;
-       register vm_offset_t    start;
-       register vm_offset_t    end;
-       kern_return_t           result = KERN_SUCCESS;
+       register vm_map_offset_t        start;
+       register vm_map_offset_t        end;
 
  StartAgain: ;
 
@@ -8722,7 +9512,7 @@ vm_remap_range_allocate(
                                 map->min_offset)) {
                        assert_wait((event_t) map, THREAD_INTERRUPTIBLE);
                        vm_map_unlock(map);
-                       thread_block((void (*)(void))0);
+                       thread_block(THREAD_CONTINUE_NULL);
                        vm_map_lock(map);
                        goto StartAgain;
                    }
@@ -8735,189 +9525,809 @@ vm_remap_range_allocate(
             *  If there are no more entries, we must win.
             */
 
-           next = entry->vme_next;
-           if (next == vm_map_to_entry(map))
-               break;
+           next = entry->vme_next;
+           if (next == vm_map_to_entry(map))
+               break;
+
+           /*
+            *  If there is another entry, it must be
+            *  after the end of the potential new region.
+            */
+
+           if (next->vme_start >= end)
+               break;
+
+           /*
+            *  Didn't fit -- move to the next entry.
+            */
+
+           entry = next;
+           start = entry->vme_end;
+       }
+       *address = start;
+    } else {
+       vm_map_entry_t          temp_entry;
+       
+       /*
+        *      Verify that:
+        *              the address doesn't itself violate
+        *              the mask requirement.
+        */
+
+       if ((start & mask) != 0)
+           return(KERN_NO_SPACE);
+
+
+       /*
+        *      ...     the address is within bounds
+        */
+
+       end = start + size;
+
+       if ((start < map->min_offset) ||
+           (end > map->max_offset) ||
+           (start >= end)) {
+           return(KERN_INVALID_ADDRESS);
+       }
+
+       /*
+        *      ...     the starting address isn't allocated
+        */
+
+       if (vm_map_lookup_entry(map, start, &temp_entry))
+           return(KERN_NO_SPACE);
+
+       entry = temp_entry;
+
+       /*
+        *      ...     the next region doesn't overlap the
+        *              end point.
+        */
+
+       if ((entry->vme_next != vm_map_to_entry(map)) &&
+           (entry->vme_next->vme_start < end))
+           return(KERN_NO_SPACE);
+    }
+    *map_entry = entry;
+    return(KERN_SUCCESS);
+}
+
+/*
+ *     vm_map_switch:
+ *
+ *     Set the address map for the current thread to the specified map
+ */
+
+vm_map_t
+vm_map_switch(
+       vm_map_t        map)
+{
+       int             mycpu;
+       thread_t        thread = current_thread();
+       vm_map_t        oldmap = thread->map;
+
+       mp_disable_preemption();
+       mycpu = cpu_number();
+
+       /*
+        *      Deactivate the current map and activate the requested map
+        */
+       PMAP_SWITCH_USER(thread, map, mycpu);
+
+       mp_enable_preemption();
+       return(oldmap);
+}
+
+
+/*
+ *     Routine:        vm_map_write_user
+ *
+ *     Description:
+ *             Copy out data from a kernel space into space in the
+ *             destination map. The space must already exist in the
+ *             destination map.
+ *             NOTE:  This routine should only be called by threads
+ *             which can block on a page fault. i.e. kernel mode user
+ *             threads.
+ *
+ */
+kern_return_t
+vm_map_write_user(
+       vm_map_t                map,
+       void                    *src_p,
+       vm_map_address_t        dst_addr,
+       vm_size_t               size)
+{
+       kern_return_t   kr = KERN_SUCCESS;
+
+       if(current_map() == map) {
+               if (copyout(src_p, dst_addr, size)) {
+                       kr = KERN_INVALID_ADDRESS;
+               }
+       } else {
+               vm_map_t        oldmap;
+
+               /* take on the identity of the target map while doing */
+               /* the transfer */
+
+               vm_map_reference(map);
+               oldmap = vm_map_switch(map);
+               if (copyout(src_p, dst_addr, size)) {
+                       kr = KERN_INVALID_ADDRESS;
+               }
+               vm_map_switch(oldmap);
+               vm_map_deallocate(map);
+       }
+       return kr;
+}
+
+/*
+ *     Routine:        vm_map_read_user
+ *
+ *     Description:
+ *             Copy in data from a user space source map into the
+ *             kernel map. The space must already exist in the
+ *             kernel map.
+ *             NOTE:  This routine should only be called by threads
+ *             which can block on a page fault. i.e. kernel mode user
+ *             threads.
+ *
+ */
+kern_return_t
+vm_map_read_user(
+       vm_map_t                map,
+       vm_map_address_t        src_addr,
+       void                    *dst_p,
+       vm_size_t               size)
+{
+       kern_return_t   kr = KERN_SUCCESS;
+
+       if(current_map() == map) {
+               if (copyin(src_addr, dst_p, size)) {
+                       kr = KERN_INVALID_ADDRESS;
+               }
+       } else {
+               vm_map_t        oldmap;
+
+               /* take on the identity of the target map while doing */
+               /* the transfer */
+
+               vm_map_reference(map);
+               oldmap = vm_map_switch(map);
+               if (copyin(src_addr, dst_p, size)) {
+                       kr = KERN_INVALID_ADDRESS;
+               }
+               vm_map_switch(oldmap);
+               vm_map_deallocate(map);
+       }
+       return kr;
+}
+
+
+/*
+ *     vm_map_check_protection:
+ *
+ *     Assert that the target map allows the specified
+ *     privilege on the entire address region given.
+ *     The entire region must be allocated.
+ */
+boolean_t vm_map_check_protection(map, start, end, protection)
+       register vm_map_t       map;
+       register vm_map_offset_t        start;
+       register vm_map_offset_t        end;
+       register vm_prot_t      protection;
+{
+       register vm_map_entry_t entry;
+       vm_map_entry_t          tmp_entry;
+
+       vm_map_lock(map);
+
+    if (start < vm_map_min(map) || end > vm_map_max(map) || start > end)
+       {
+                       vm_map_unlock(map);
+                       return (FALSE);
+       }
+
+       if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
+               vm_map_unlock(map);
+               return(FALSE);
+       }
+
+       entry = tmp_entry;
+
+       while (start < end) {
+               if (entry == vm_map_to_entry(map)) {
+                       vm_map_unlock(map);
+                       return(FALSE);
+               }
+
+               /*
+                *      No holes allowed!
+                */
+
+               if (start < entry->vme_start) {
+                       vm_map_unlock(map);
+                       return(FALSE);
+               }
+
+               /*
+                * Check protection associated with entry.
+                */
+
+               if ((entry->protection & protection) != protection) {
+                       vm_map_unlock(map);
+                       return(FALSE);
+               }
+
+               /* go to next entry */
+
+               start = entry->vme_end;
+               entry = entry->vme_next;
+       }
+       vm_map_unlock(map);
+       return(TRUE);
+}
+
+kern_return_t
+vm_map_purgable_control(
+       vm_map_t                map,
+       vm_map_offset_t         address,
+       vm_purgable_t           control,
+       int                     *state)
+{
+       vm_map_entry_t          entry;
+       vm_object_t             object;
+       kern_return_t           kr;
+
+       /*
+        * Vet all the input parameters and current type and state of the
+        * underlaying object.  Return with an error if anything is amiss.
+        */
+       if (map == VM_MAP_NULL)
+               return(KERN_INVALID_ARGUMENT);
+
+       if (control != VM_PURGABLE_SET_STATE &&
+           control != VM_PURGABLE_GET_STATE)
+               return(KERN_INVALID_ARGUMENT);
+
+       if (control == VM_PURGABLE_SET_STATE &&
+           (*state < VM_PURGABLE_STATE_MIN ||
+            *state > VM_PURGABLE_STATE_MAX))
+               return(KERN_INVALID_ARGUMENT);
+
+       vm_map_lock(map);
 
-           /*
-            *  If there is another entry, it must be
-            *  after the end of the potential new region.
-            */
+       if (!vm_map_lookup_entry(map, address, &entry) || entry->is_sub_map) {
 
-           if (next->vme_start >= end)
-               break;
+               /*
+                * Must pass a valid non-submap address.
+                */
+               vm_map_unlock(map);
+               return(KERN_INVALID_ADDRESS);
+       }
 
-           /*
-            *  Didn't fit -- move to the next entry.
-            */
+       if ((entry->protection & VM_PROT_WRITE) == 0) {
+               /*
+                * Can't apply purgable controls to something you can't write.
+                */
+               vm_map_unlock(map);
+               return(KERN_PROTECTION_FAILURE);
+       }
 
-           entry = next;
-           start = entry->vme_end;
+       object = entry->object.vm_object;
+       if (object == VM_OBJECT_NULL) {
+               /*
+                * Object must already be present or it can't be purgable.
+                */
+               vm_map_unlock(map);
+               return KERN_INVALID_ARGUMENT;
        }
-       *address = start;
-    } else {
-       vm_map_entry_t          temp_entry;
-       
-       /*
-        *      Verify that:
-        *              the address doesn't itself violate
-        *              the mask requirement.
-        */
+                    
+       vm_object_lock(object);
 
-       if ((start & mask) != 0)
-           return(KERN_NO_SPACE);
+       if (entry->offset != 0 || 
+           entry->vme_end - entry->vme_start != object->size) {
+               /*
+                * Can only apply purgable controls to the whole (existing)
+                * object at once.
+                */
+               vm_map_unlock(map);
+               vm_object_unlock(object);
+               return KERN_INVALID_ARGUMENT;
+       }
+               
+       vm_map_unlock(map);
 
+       kr = vm_object_purgable_control(object, control, state);
 
-       /*
-        *      ...     the address is within bounds
-        */
+       vm_object_unlock(object);
 
-       end = start + size;
+       return kr;
+}
 
-       if ((start < map->min_offset) ||
-           (end > map->max_offset) ||
-           (start >= end)) {
-           return(KERN_INVALID_ADDRESS);
+kern_return_t
+vm_map_page_info(
+       vm_map_t                target_map,
+       vm_map_offset_t offset,
+       int                     *disposition,
+       int                     *ref_count)
+{
+       vm_map_entry_t  map_entry;
+       vm_object_t     object;
+       vm_page_t       m;
+
+restart_page_query:
+       *disposition = 0;
+       *ref_count = 0;
+       vm_map_lock(target_map);
+       if(!vm_map_lookup_entry(target_map, offset, &map_entry)) {
+               vm_map_unlock(target_map);
+               return KERN_FAILURE;
+       }
+       offset -= map_entry->vme_start;  /* adjust to offset within entry */
+       offset += map_entry->offset;     /* adjust to target object offset */
+       if(map_entry->object.vm_object != VM_OBJECT_NULL) {
+               if(!map_entry->is_sub_map) {
+                       object = map_entry->object.vm_object;
+               } else {
+                       vm_map_unlock(target_map);
+                       target_map = map_entry->object.sub_map;
+                       goto restart_page_query;
+               }
+       } else {
+               vm_map_unlock(target_map);
+               return KERN_FAILURE;
+       }
+       vm_object_lock(object);
+       vm_map_unlock(target_map);
+       while(TRUE) {
+               m = vm_page_lookup(object, offset);
+               if (m != VM_PAGE_NULL) {
+                       *disposition |= VM_PAGE_QUERY_PAGE_PRESENT;
+                       break;
+               } else {
+                       if(object->shadow) {
+                               offset += object->shadow_offset;
+                               vm_object_unlock(object);
+                               object = object->shadow;
+                               vm_object_lock(object);
+                               continue;
+                       }
+                       vm_object_unlock(object);
+                       return KERN_FAILURE;
+               }
        }
 
-       /*
-        *      ...     the starting address isn't allocated
-        */
+       /* The ref_count is not strictly accurate, it measures the number   */
+       /* of entities holding a ref on the object, they may not be mapping */
+       /* the object or may not be mapping the section holding the         */
+       /* target page but its still a ball park number and though an over- */
+       /* count, it picks up the copy-on-write cases                       */
 
-       if (vm_map_lookup_entry(map, start, &temp_entry))
-           return(KERN_NO_SPACE);
+       /* We could also get a picture of page sharing from pmap_attributes */
+       /* but this would under count as only faulted-in mappings would     */
+       /* show up.                                                         */
 
-       entry = temp_entry;
+       *ref_count = object->ref_count;
 
-       /*
-        *      ...     the next region doesn't overlap the
-        *              end point.
-        */
+       if (m->fictitious) {
+               *disposition |= VM_PAGE_QUERY_PAGE_FICTITIOUS;
+               vm_object_unlock(object);
+               return KERN_SUCCESS;
+       }
 
-       if ((entry->vme_next != vm_map_to_entry(map)) &&
-           (entry->vme_next->vme_start < end))
-           return(KERN_NO_SPACE);
-    }
-    *map_entry = entry;
-    return(KERN_SUCCESS);
+       if (m->dirty)
+               *disposition |= VM_PAGE_QUERY_PAGE_DIRTY;
+       else if(pmap_is_modified(m->phys_page))
+               *disposition |= VM_PAGE_QUERY_PAGE_DIRTY;
+
+       if (m->reference)
+               *disposition |= VM_PAGE_QUERY_PAGE_REF;
+       else if(pmap_is_referenced(m->phys_page))
+               *disposition |= VM_PAGE_QUERY_PAGE_REF;
+
+       vm_object_unlock(object);
+       return KERN_SUCCESS;
+       
 }
 
-/*
- *     vm_map_switch:
- *
- *     Set the address map for the current thr_act to the specified map
- */
 
-vm_map_t
-vm_map_switch(
-       vm_map_t        map)
+/* For a given range, check all map entries.  If the entry coresponds to */
+/* the old vm_region/map provided on the call, replace it with the      */
+/* corresponding range in the new vm_region/map */
+kern_return_t vm_map_region_replace(
+       vm_map_t        target_map,
+       ipc_port_t      old_region, 
+       ipc_port_t      new_region,
+       vm_map_offset_t start,
+       vm_map_offset_t end)
 {
-       int             mycpu;
-       thread_act_t    thr_act = current_act();
-       vm_map_t        oldmap = thr_act->map;
+       vm_named_entry_t        old_object;
+       vm_named_entry_t        new_object;
+       vm_map_t                old_submap;
+       vm_map_t                new_submap;
+       vm_map_offset_t         addr;
+       vm_map_entry_t          entry;
+       int                     nested_pmap = 0;
 
-       mp_disable_preemption();
-       mycpu = cpu_number();
+
+       vm_map_lock(target_map);
+       old_object = (vm_named_entry_t)old_region->ip_kobject;
+       new_object = (vm_named_entry_t)new_region->ip_kobject;
+       if((!old_object->is_sub_map) || (!new_object->is_sub_map)) {
+               vm_map_unlock(target_map);
+               return KERN_INVALID_ARGUMENT;
+       }
+       old_submap = (vm_map_t)old_object->backing.map;
+       new_submap = (vm_map_t)new_object->backing.map;
+       vm_map_lock(old_submap);
+       if((old_submap->min_offset != new_submap->min_offset) || 
+                       (old_submap->max_offset != new_submap->max_offset)) {
+               vm_map_unlock(old_submap);
+               vm_map_unlock(target_map);
+               return KERN_INVALID_ARGUMENT;
+       }
+       if(!vm_map_lookup_entry(target_map, start, &entry)) {
+               /* if the src is not contained, the entry preceeds */
+               /* our range */
+               addr = entry->vme_start;
+               if(entry == vm_map_to_entry(target_map)) {
+                       vm_map_unlock(old_submap);
+                       vm_map_unlock(target_map);
+                       return KERN_SUCCESS;
+               }
+       }
+       if ((entry->use_pmap) && 
+                       (new_submap->pmap == NULL)) {
+               new_submap->pmap = pmap_create((vm_map_size_t) 0, FALSE);
+               if(new_submap->pmap == PMAP_NULL) {
+                       vm_map_unlock(old_submap);
+                       vm_map_unlock(target_map);
+                       return(KERN_NO_SPACE);
+               }
+       }
 
        /*
-        *      Deactivate the current map and activate the requested map
+        * Mark the new submap as "mapped", so that we get proper
+        * cleanup of the sub-pmap when we unmap it.
         */
-       PMAP_SWITCH_USER(thr_act, map, mycpu);
-
-       mp_enable_preemption();
-       return(oldmap);
+       new_submap->mapped = TRUE;
+
+       addr = entry->vme_start;
+       vm_map_reference(old_submap);
+       while((entry != vm_map_to_entry(target_map)) && 
+                                       (entry->vme_start < end)) {
+               if((entry->is_sub_map) && 
+                       (entry->object.sub_map == old_submap)) {
+                       if(entry->use_pmap) {
+                               if((start & 0x0fffffff) || 
+                                       ((end - start) != 0x10000000)) {
+                                       vm_map_unlock(old_submap);
+                                       vm_map_deallocate(old_submap);
+                                       vm_map_unlock(target_map);
+                                       return  KERN_INVALID_ARGUMENT;
+                               }
+                               nested_pmap = 1;
+                       }
+                       entry->object.sub_map = new_submap;
+                       vm_map_reference(new_submap);
+                       vm_map_deallocate(old_submap);
+               }
+               entry = entry->vme_next;
+               addr = entry->vme_start;
+       }
+       if(nested_pmap) {
+#ifndef NO_NESTED_PMAP
+               pmap_unnest(target_map->pmap, (addr64_t)start);
+               if(target_map->mapped) {
+                       vm_map_submap_pmap_clean(target_map,
+                               start, end, old_submap, 0);
+               }
+               pmap_nest(target_map->pmap, new_submap->pmap, 
+                               (addr64_t)start, (addr64_t)start, 
+                               (uint64_t)(end - start));
+#endif /* NO_NESTED_PMAP */
+       } else {
+               vm_map_submap_pmap_clean(target_map,
+                               start, end, old_submap, 0);
+       }
+       vm_map_unlock(old_submap);
+       vm_map_deallocate(old_submap);
+       vm_map_unlock(target_map);
+       return KERN_SUCCESS;
 }
 
-
 /*
- *     Routine:        vm_map_write_user
+ *     vm_map_msync
  *
- *     Description:
- *             Copy out data from a kernel space into space in the
- *             destination map. The space must already exist in the
- *             destination map.
- *             NOTE:  This routine should only be called by threads
- *             which can block on a page fault. i.e. kernel mode user
- *             threads.
+ *     Synchronises the memory range specified with its backing store
+ *     image by either flushing or cleaning the contents to the appropriate
+ *     memory manager engaging in a memory object synchronize dialog with
+ *     the manager.  The client doesn't return until the manager issues
+ *     m_o_s_completed message.  MIG Magically converts user task parameter
+ *     to the task's address map.
+ *
+ *     interpretation of sync_flags
+ *     VM_SYNC_INVALIDATE      - discard pages, only return precious
+ *                               pages to manager.
+ *
+ *     VM_SYNC_INVALIDATE & (VM_SYNC_SYNCHRONOUS | VM_SYNC_ASYNCHRONOUS)
+ *                             - discard pages, write dirty or precious
+ *                               pages back to memory manager.
+ *
+ *     VM_SYNC_SYNCHRONOUS | VM_SYNC_ASYNCHRONOUS
+ *                             - write dirty or precious pages back to
+ *                               the memory manager.
  *
+ *     VM_SYNC_CONTIGUOUS      - does everything normally, but if there
+ *                               is a hole in the region, and we would
+ *                               have returned KERN_SUCCESS, return
+ *                               KERN_INVALID_ADDRESS instead.
+ *
+ *     NOTE
+ *     The memory object attributes have not yet been implemented, this
+ *     function will have to deal with the invalidate attribute
+ *
+ *     RETURNS
+ *     KERN_INVALID_TASK               Bad task parameter
+ *     KERN_INVALID_ARGUMENT           both sync and async were specified.
+ *     KERN_SUCCESS                    The usual.
+ *     KERN_INVALID_ADDRESS            There was a hole in the region.
  */
+
 kern_return_t
-vm_map_write_user(
-       vm_map_t        map,
-       vm_offset_t     src_addr,
-       vm_offset_t     dst_addr,
-       vm_size_t       size)
+vm_map_msync(
+       vm_map_t                map,
+       vm_map_address_t        address,
+       vm_map_size_t           size,
+       vm_sync_t               sync_flags)
 {
-       thread_act_t    thr_act = current_act();
-       kern_return_t   kr = KERN_SUCCESS;
+       msync_req_t             msr;
+       msync_req_t             new_msr;
+       queue_chain_t           req_q;  /* queue of requests for this msync */
+       vm_map_entry_t          entry;
+       vm_map_size_t           amount_left;
+       vm_object_offset_t      offset;
+       boolean_t               do_sync_req;
+       boolean_t               modifiable;
+       boolean_t               had_hole = FALSE;
+       
+       if ((sync_flags & VM_SYNC_ASYNCHRONOUS) &&
+           (sync_flags & VM_SYNC_SYNCHRONOUS))
+               return(KERN_INVALID_ARGUMENT);
 
-       if(thr_act->map == map) {
-               if (copyout((char *)src_addr, (char *)dst_addr, size)) {
-                       kr = KERN_INVALID_ADDRESS;
+       /*
+        * align address and size on page boundaries
+        */
+       size = vm_map_round_page(address + size) - vm_map_trunc_page(address);
+       address = vm_map_trunc_page(address);
+
+        if (map == VM_MAP_NULL)
+                return(KERN_INVALID_TASK);
+
+       if (size == 0)
+               return(KERN_SUCCESS);
+
+       queue_init(&req_q);
+       amount_left = size;
+
+       while (amount_left > 0) {
+               vm_object_size_t        flush_size;
+               vm_object_t             object;
+
+               vm_map_lock(map);
+               if (!vm_map_lookup_entry(map,
+                       vm_map_trunc_page(address), &entry)) {
+
+                       vm_size_t       skip;
+
+                       /*
+                        * hole in the address map.
+                        */
+                       had_hole = TRUE;
+
+                       /*
+                        * Check for empty map.
+                        */
+                       if (entry == vm_map_to_entry(map) &&
+                           entry->vme_next == entry) {
+                               vm_map_unlock(map);
+                               break;
+                       }
+                       /*
+                        * Check that we don't wrap and that
+                        * we have at least one real map entry.
+                        */
+                       if ((map->hdr.nentries == 0) ||
+                           (entry->vme_next->vme_start < address)) {
+                               vm_map_unlock(map);
+                               break;
+                       }
+                       /*
+                        * Move up to the next entry if needed
+                        */
+                       skip = (entry->vme_next->vme_start - address);
+                       if (skip >= amount_left)
+                               amount_left = 0;
+                       else
+                               amount_left -= skip;
+                       address = entry->vme_next->vme_start;
+                       vm_map_unlock(map);
+                       continue;
                }
-       } else {
-               vm_map_t        oldmap;
 
-               /* take on the identity of the target map while doing */
-               /* the transfer */
+               offset = address - entry->vme_start;
 
-               vm_map_reference(map);
-               oldmap = vm_map_switch(map);
-               if (copyout((char *)src_addr, (char *)dst_addr, size)) {
-                       kr = KERN_INVALID_ADDRESS;
+               /*
+                * do we have more to flush than is contained in this
+                * entry ?
+                */
+               if (amount_left + entry->vme_start + offset > entry->vme_end) {
+                       flush_size = entry->vme_end -
+                                                (entry->vme_start + offset);
+               } else {
+                       flush_size = amount_left;
                }
-               vm_map_switch(oldmap);
-               vm_map_deallocate(map);
-       }
-       return kr;
-}
+               amount_left -= flush_size;
+               address += flush_size;
 
-/*
- *     Routine:        vm_map_read_user
- *
- *     Description:
- *             Copy in data from a user space source map into the
- *             kernel map. The space must already exist in the
- *             kernel map.
- *             NOTE:  This routine should only be called by threads
- *             which can block on a page fault. i.e. kernel mode user
- *             threads.
- *
- */
-kern_return_t
-vm_map_read_user(
-       vm_map_t        map,
-       vm_offset_t     src_addr,
-       vm_offset_t     dst_addr,
-       vm_size_t       size)
-{
-       thread_act_t    thr_act = current_act();
-       kern_return_t   kr = KERN_SUCCESS;
+               if (entry->is_sub_map == TRUE) {
+                       vm_map_t        local_map;
+                       vm_map_offset_t local_offset;
+
+                       local_map = entry->object.sub_map;
+                       local_offset = entry->offset;
+                       vm_map_unlock(map);
+                       if (vm_map_msync(
+                               local_map,
+                               local_offset,
+                               flush_size,
+                               sync_flags) == KERN_INVALID_ADDRESS) {
+                               had_hole = TRUE;
+                       }
+                       continue;
+               }
+               object = entry->object.vm_object;
+
+               /*
+                * We can't sync this object if the object has not been
+                * created yet
+                */
+               if (object == VM_OBJECT_NULL) {
+                       vm_map_unlock(map);
+                       continue;
+               }
+               offset += entry->offset;
+               modifiable = (entry->protection & VM_PROT_WRITE)
+                               != VM_PROT_NONE;
+
+                vm_object_lock(object);
+
+               if (sync_flags & (VM_SYNC_KILLPAGES | VM_SYNC_DEACTIVATE)) {
+                       boolean_t kill_pages = 0;
+
+                       if (sync_flags & VM_SYNC_KILLPAGES) {
+                               if (object->ref_count == 1 && !entry->needs_copy && !object->shadow)
+                                       kill_pages = 1;
+                               else
+                                       kill_pages = -1;
+                       }
+                       if (kill_pages != -1)
+                               vm_object_deactivate_pages(object, offset, 
+                                                              (vm_object_size_t)flush_size, kill_pages);
+                       vm_object_unlock(object);
+                       vm_map_unlock(map);
+                       continue;
+               }
+               /*
+                * We can't sync this object if there isn't a pager.
+                * Don't bother to sync internal objects, since there can't
+                * be any "permanent" storage for these objects anyway.
+                */
+               if ((object->pager == MEMORY_OBJECT_NULL) ||
+                   (object->internal) || (object->private)) {
+                       vm_object_unlock(object);
+                       vm_map_unlock(map);
+                       continue;
+               }
+               /*
+                * keep reference on the object until syncing is done
+                */
+               assert(object->ref_count > 0);
+               object->ref_count++;
+               vm_object_res_reference(object);
+               vm_object_unlock(object);
 
-       if(thr_act->map == map) {
-               if (copyin((char *)src_addr, (char *)dst_addr, size)) {
-                       kr = KERN_INVALID_ADDRESS;
+               vm_map_unlock(map);
+
+               do_sync_req = vm_object_sync(object,
+                                       offset,
+                                       flush_size,
+                                       sync_flags & VM_SYNC_INVALIDATE,
+                                       (modifiable &&
+                                       (sync_flags & VM_SYNC_SYNCHRONOUS ||
+                                        sync_flags & VM_SYNC_ASYNCHRONOUS)),
+                                        sync_flags & VM_SYNC_SYNCHRONOUS);
+               /*
+                * only send a m_o_s if we returned pages or if the entry
+                * is writable (ie dirty pages may have already been sent back)
+                */
+               if (!do_sync_req && !modifiable) {
+                       vm_object_deallocate(object);
+                       continue;
                }
-       } else {
-               vm_map_t        oldmap;
+               msync_req_alloc(new_msr);
 
-               /* take on the identity of the target map while doing */
-               /* the transfer */
+                vm_object_lock(object);
+               offset += object->paging_offset;
 
-               vm_map_reference(map);
-               oldmap = vm_map_switch(map);
-               if (copyin((char *)src_addr, (char *)dst_addr, size)) {
-                       kr = KERN_INVALID_ADDRESS;
-               }
-               vm_map_switch(oldmap);
-               vm_map_deallocate(map);
-       }
-       return kr;
-}
+               new_msr->offset = offset;
+               new_msr->length = flush_size;
+               new_msr->object = object;
+               new_msr->flag = VM_MSYNC_SYNCHRONIZING;
+re_iterate:
+               queue_iterate(&object->msr_q, msr, msync_req_t, msr_q) {
+                       /*
+                        * need to check for overlapping entry, if found, wait
+                        * on overlapping msr to be done, then reiterate
+                        */
+                       msr_lock(msr);
+                       if (msr->flag == VM_MSYNC_SYNCHRONIZING &&
+                           ((offset >= msr->offset && 
+                             offset < (msr->offset + msr->length)) ||
+                            (msr->offset >= offset &&
+                             msr->offset < (offset + flush_size))))
+                       {
+                               assert_wait((event_t) msr,THREAD_INTERRUPTIBLE);
+                               msr_unlock(msr);
+                               vm_object_unlock(object);
+                               thread_block(THREAD_CONTINUE_NULL);
+                               vm_object_lock(object);
+                               goto re_iterate;
+                       }
+                       msr_unlock(msr);
+               }/* queue_iterate */
+
+               queue_enter(&object->msr_q, new_msr, msync_req_t, msr_q);
+               vm_object_unlock(object);
+
+               queue_enter(&req_q, new_msr, msync_req_t, req_q);
+
+               (void) memory_object_synchronize(
+                               object->pager,
+                               offset,
+                               flush_size,
+                               sync_flags & ~VM_SYNC_CONTIGUOUS);
+       }/* while */
+
+       /*
+        * wait for memory_object_sychronize_completed messages from pager(s)
+        */
+
+       while (!queue_empty(&req_q)) {
+               msr = (msync_req_t)queue_first(&req_q);
+               msr_lock(msr);
+               while(msr->flag != VM_MSYNC_DONE) {
+                       assert_wait((event_t) msr, THREAD_INTERRUPTIBLE);
+                       msr_unlock(msr);
+                       thread_block(THREAD_CONTINUE_NULL);
+                       msr_lock(msr);
+               }/* while */
+               queue_remove(&req_q, msr, msync_req_t, req_q);
+               msr_unlock(msr);
+               vm_object_deallocate(msr->object);
+               msync_req_free(msr);
+       }/* queue_iterate */
+
+       /* for proper msync() behaviour */
+       if (had_hole == TRUE && (sync_flags & VM_SYNC_CONTIGUOUS))
+               return(KERN_INVALID_ADDRESS);
+
+       return(KERN_SUCCESS);
+}/* vm_msync */
 
 /* Takes existing source and destination sub-maps and clones the contents of */
 /* the source map */
-
 kern_return_t
 vm_region_clone(
        ipc_port_t      src_region, 
@@ -8927,8 +10337,8 @@ vm_region_clone(
        vm_named_entry_t        dst_object;
        vm_map_t                src_map;
        vm_map_t                dst_map;
-       vm_offset_t             addr;
-       vm_offset_t             max_off;
+       vm_map_offset_t         addr;
+       vm_map_offset_t         max_off;
        vm_map_entry_t          entry;
        vm_map_entry_t          new_entry;
        vm_map_entry_t          insert_point;
@@ -8985,6 +10395,118 @@ vm_region_clone(
        return KERN_SUCCESS;
 }
 
+/*
+ *     Routine:        convert_port_entry_to_map
+ *     Purpose:
+ *             Convert from a port specifying an entry or a task
+ *             to a map. Doesn't consume the port ref; produces a map ref,
+ *             which may be null.  Unlike convert_port_to_map, the
+ *             port may be task or a named entry backed.
+ *     Conditions:
+ *             Nothing locked.
+ */
+
+
+vm_map_t
+convert_port_entry_to_map(
+       ipc_port_t      port)
+{
+       vm_map_t map;
+       vm_named_entry_t        named_entry;
+
+       if(IP_VALID(port) && (ip_kotype(port) == IKOT_NAMED_ENTRY)) {
+               while(TRUE) {
+                       ip_lock(port);
+                       if(ip_active(port) && (ip_kotype(port) 
+                                               == IKOT_NAMED_ENTRY)) {
+                               named_entry =
+                                        (vm_named_entry_t)port->ip_kobject;
+                               if (!(mutex_try(&(named_entry)->Lock))) {
+                                               ip_unlock(port);
+                                               mutex_pause();
+                                               continue;
+                               }
+                               named_entry->ref_count++;
+                               mutex_unlock(&(named_entry)->Lock);
+                               ip_unlock(port);
+                               if ((named_entry->is_sub_map) &&
+                                       (named_entry->protection 
+                                       & VM_PROT_WRITE)) {
+                                       map = named_entry->backing.map;
+                               } else {
+                                       mach_destroy_memory_entry(port);
+                                       return VM_MAP_NULL;
+                               }
+                               vm_map_reference_swap(map);
+                               mach_destroy_memory_entry(port);
+                               break;
+                       }
+                       else 
+                               return VM_MAP_NULL;
+               }
+       }
+       else
+               map = convert_port_to_map(port);
+
+       return map;
+}
+
+/*
+ *     Routine:        convert_port_entry_to_object
+ *     Purpose:
+ *             Convert from a port specifying a named entry to an
+ *             object. Doesn't consume the port ref; produces a map ref,
+ *             which may be null. 
+ *     Conditions:
+ *             Nothing locked.
+ */
+
+
+vm_object_t
+convert_port_entry_to_object(
+       ipc_port_t      port)
+{
+       vm_object_t object;
+       vm_named_entry_t        named_entry;
+
+       if(IP_VALID(port) && (ip_kotype(port) == IKOT_NAMED_ENTRY)) {
+               while(TRUE) {
+                       ip_lock(port);
+                       if(ip_active(port) && (ip_kotype(port) 
+                                               == IKOT_NAMED_ENTRY)) {
+                               named_entry =
+                                        (vm_named_entry_t)port->ip_kobject;
+                               if (!(mutex_try(&(named_entry)->Lock))) {
+                                               ip_unlock(port);
+                                               mutex_pause();
+                                               continue;
+                               }
+                               named_entry->ref_count++;
+                               mutex_unlock(&(named_entry)->Lock);
+                               ip_unlock(port);
+                               if ((!named_entry->is_sub_map) &&
+                                       (!named_entry->is_pager) &&
+                                       (named_entry->protection 
+                                       & VM_PROT_WRITE)) {
+                                       object = named_entry->backing.object;
+                               } else {
+                                       mach_destroy_memory_entry(port);
+                                       return (vm_object_t)NULL;
+                               }
+                               vm_object_reference(named_entry->backing.object);
+                               mach_destroy_memory_entry(port);
+                               break;
+                       }
+                       else 
+                               return (vm_object_t)NULL;
+               }
+       } else {
+               return (vm_object_t)NULL;
+       }
+
+       return object;
+}
+
 /*
  * Export routines to other components for the things we access locally through
  * macros.
@@ -8997,65 +10519,274 @@ current_map(void)
 }
 
 /*
- *     vm_map_check_protection:
+ *     vm_map_reference:
  *
- *     Assert that the target map allows the specified
- *     privilege on the entire address region given.
- *     The entire region must be allocated.
+ *     Most code internal to the osfmk will go through a
+ *     macro defining this.  This is always here for the
+ *     use of other kernel components.
  */
-boolean_t vm_map_check_protection(map, start, end, protection)
-       register vm_map_t       map;
-       register vm_offset_t    start;
-       register vm_offset_t    end;
-       register vm_prot_t      protection;
+#undef vm_map_reference
+void
+vm_map_reference(
+       register vm_map_t       map)
 {
-       register vm_map_entry_t entry;
-       vm_map_entry_t          tmp_entry;
+       if (map == VM_MAP_NULL)
+               return;
 
-       vm_map_lock(map);
+       mutex_lock(&map->s_lock);
+#if    TASK_SWAPPER
+       assert(map->res_count > 0);
+       assert(map->ref_count >= map->res_count);
+       map->res_count++;
+#endif
+       map->ref_count++;
+       mutex_unlock(&map->s_lock);
+}
 
-    if (start < vm_map_min(map) || end > vm_map_max(map) || start > end)
-       {
-                       vm_map_unlock(map);
-                       return (FALSE);
-       }
+/*
+ *     vm_map_deallocate:
+ *
+ *     Removes a reference from the specified map,
+ *     destroying it if no references remain.
+ *     The map should not be locked.
+ */
+void
+vm_map_deallocate(
+       register vm_map_t       map)
+{
+       unsigned int            ref;
 
-       if (!vm_map_lookup_entry(map, start, &tmp_entry)) {
-               vm_map_unlock(map);
-               return(FALSE);
+       if (map == VM_MAP_NULL)
+               return;
+
+       mutex_lock(&map->s_lock);
+       ref = --map->ref_count;
+       if (ref > 0) {
+               vm_map_res_deallocate(map);
+               mutex_unlock(&map->s_lock);
+               return;
        }
+       assert(map->ref_count == 0);
+       mutex_unlock(&map->s_lock);
 
-       entry = tmp_entry;
+#if    TASK_SWAPPER
+       /*
+        * The map residence count isn't decremented here because
+        * the vm_map_delete below will traverse the entire map, 
+        * deleting entries, and the residence counts on objects
+        * and sharing maps will go away then.
+        */
+#endif
 
-       while (start < end) {
-               if (entry == vm_map_to_entry(map)) {
-                       vm_map_unlock(map);
-                       return(FALSE);
-               }
+       vm_map_destroy(map);
+}
 
-               /*
-                *      No holes allowed!
-                */
 
-               if (start < entry->vme_start) {
-                       vm_map_unlock(map);
-                       return(FALSE);
+/* LP64todo - this whole mechanism is temporary.  It should be redone when
+ * the pmap layer can handle 64-bit address spaces.  Until then, we trump
+ * up a map entry for the 64-bit commpage above the map's max_offset.
+ */
+extern vm_map_t                com_region_map64;       /* the submap for 64-bit commpage */
+extern vm_map_t                com_region_map32;       /* the submap for 32-bit commpage */
+
+static void
+vm_map_commpage(
+        vm_map_t        user_map,
+       vm_map_t        com_region_map,         /* com_region_map32 or com_region_map64 */
+       vm_map_offset_t base_address,
+       vm_map_size_t   size)
+{
+        vm_map_entry_t  entry;
+       vm_object_t     object;
+        
+        vm_map_lock(user_map);
+        
+        /* The commpage is necessarily the last entry in the map.
+        * See if one is already there (not sure if this can happen???)
+        */
+       entry = vm_map_last_entry(user_map);
+       if (entry != vm_map_to_entry(user_map)) {
+               if (entry->vme_end >= base_address) {
+                       vm_map_unlock(user_map);
+                       return;
                }
+       }
+       
+       entry = vm_map_first_entry(com_region_map);
+       object = entry->object.vm_object;
+       vm_object_reference(object);
+
+       /* We bypass vm_map_enter() because we are adding the entry past the
+        * map's max_offset.
+        */
+        entry = vm_map_entry_insert(
+                        user_map,
+                        vm_map_last_entry(user_map),   /* insert after last entry */
+                        base_address,
+                        base_address + size,
+                        object,
+                        0,                             /* offset */
+                        FALSE,                         /* needs_copy */
+                       FALSE,                          /* is_shared */
+                        FALSE,                         /* in_transition */
+                       VM_PROT_READ|VM_PROT_EXECUTE,
+                       VM_PROT_READ|VM_PROT_EXECUTE,
+                       VM_BEHAVIOR_DEFAULT,
+                       VM_INHERIT_NONE,
+                       1 );                            /* wired_count */
+       
+       vm_map_unlock(user_map);
+}
+
+#ifdef __i386__
+void
+vm_map_commpage32(
+       vm_map_t        map)
+{
+       vm_map_commpage(map,
+                       com_region_map32,
+                       (vm_map_offset_t) (unsigned) _COMM_PAGE32_BASE_ADDRESS,
+                       (vm_map_size_t) (unsigned) _COMM_PAGE32_AREA_USED);
+}
+#endif /* __i386__ */
+
+
+
+void
+vm_map_commpage64(
+       vm_map_t        map)
+{
+
+       vm_map_commpage(map,
+                       com_region_map64,
+                       (vm_map_offset_t) _COMM_PAGE64_BASE_ADDRESS,
+                       (vm_map_size_t) _COMM_PAGE64_AREA_USED);
+}
+
+void
+vm_map_remove_commpage(
+        vm_map_t        map )
+{
+        vm_map_entry_t  entry;
+       
+       while( 1 ) {
+               vm_map_lock(map);
+       
+               entry = vm_map_last_entry(map);
+
+               if ((entry == vm_map_to_entry(map)) || 
+                       (entry->vme_start < map->max_offset))
+                               break;
+                               
+               /* clearing the wired count isn't strictly correct */
+               entry->wired_count = 0;
+               vm_map_entry_delete(map,entry);
+       }
+       
+       vm_map_unlock(map);
+}
+
+void
+vm_map_disable_NX(vm_map_t map)
+{
+        if (map == NULL)
+               return;
+        if (map->pmap == NULL)
+               return;
+
+        pmap_disable_NX(map->pmap);
+}
+
+/* XXX Consider making these constants (VM_MAX_ADDRESS and MACH_VM_MAX_ADDRESS)
+ * more descriptive.
+ */
+void
+vm_map_set_32bit(vm_map_t map)
+{
+       map->max_offset = (vm_map_offset_t)VM_MAX_ADDRESS;
+}
+
+
+void
+vm_map_set_64bit(vm_map_t map)
+{
+       map->max_offset = (vm_map_offset_t)MACH_VM_MAX_ADDRESS;
+}
+
+vm_map_offset_t
+vm_compute_max_offset(unsigned is64)
+{
+       return (is64 ? (vm_map_offset_t)MACH_VM_MAX_ADDRESS : (vm_map_offset_t)VM_MAX_ADDRESS);
+}
+
+boolean_t
+vm_map_has_4GB_pagezero(vm_map_t map)
+{
+       /*
+        * XXX FBDP
+        * We should lock the VM map (for read) here but we can get away
+        * with it for now because there can't really be any race condition:
+        * the VM map's min_offset is changed only when the VM map is created
+        * and when the zero page is established (when the binary gets loaded),
+        * and this routine gets called only when the task terminates and the
+        * VM map is being torn down, and when a new map is created via
+        * load_machfile()/execve().
+        */
+       return (map->min_offset >= 0x100000000ULL);
+}
+
+void
+vm_map_set_4GB_pagezero(vm_map_t map)
+{
+       pmap_set_4GB_pagezero(map->pmap);
+}
 
+void
+vm_map_clear_4GB_pagezero(vm_map_t map)
+{
+       pmap_clear_4GB_pagezero(map->pmap);
+}
+
+/*
+ * Raise a VM map's minimum offset.
+ * To strictly enforce "page zero" reservation.
+ */
+kern_return_t
+vm_map_raise_min_offset(
+       vm_map_t        map,
+       vm_map_offset_t new_min_offset)
+{
+       vm_map_entry_t  first_entry;
+
+       new_min_offset = vm_map_round_page(new_min_offset);
+
+       vm_map_lock(map);
+
+       if (new_min_offset < map->min_offset) {
                /*
-                * Check protection associated with entry.
+                * Can't move min_offset backwards, as that would expose
+                * a part of the address space that was previously, and for
+                * possibly good reasons, inaccessible.
                 */
+               vm_map_unlock(map);
+               return KERN_INVALID_ADDRESS;
+       }
 
-               if ((entry->protection & protection) != protection) {
-                       vm_map_unlock(map);
-                       return(FALSE);
-               }
+       first_entry = vm_map_first_entry(map);
+       if (first_entry != vm_map_to_entry(map) &&
+           first_entry->vme_start < new_min_offset) {
+               /*
+                * Some memory was already allocated below the new
+                * minimun offset.  It's too late to change it now...
+                */
+               vm_map_unlock(map);
+               return KERN_NO_SPACE;
+       }
 
-               /* go to next entry */
+       map->min_offset = new_min_offset;
 
-               start = entry->vme_end;
-               entry = entry->vme_next;
-       }
        vm_map_unlock(map);
-       return(TRUE);
+
+       return KERN_SUCCESS;
 }