]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/vm/vm_fault.c
xnu-344.21.74.tar.gz
[apple/xnu.git] / osfmk / vm / vm_fault.c
index 72d3061c97b1f725e30927576a175cec5d2aa7fd..0958f3cf09452218cca63a34b081252a536d9f07 100644 (file)
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -76,7 +79,6 @@ extern int    device_pager_workaround;
 #include <kern/host.h>
 #include <kern/xpr.h>
 #include <ppc/proc_reg.h>
-#include <ppc/pmap_internals.h>
 #include <vm/task_working_set.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
@@ -104,7 +106,6 @@ int         vm_object_absent_max = 50;
 int            vm_fault_debug = 0;
 boolean_t      vm_page_deactivate_behind = TRUE;
 
-vm_machine_attribute_val_t mv_cache_sync = MATTR_VAL_CACHE_SYNC;
 
 #if    !VM_FAULT_STATIC_CONFIG
 boolean_t      vm_fault_dirty_handling = FALSE;
@@ -121,7 +122,8 @@ extern kern_return_t vm_fault_wire_fast(
                                vm_map_t        map,
                                vm_offset_t     va,
                                vm_map_entry_t  entry,
-                               pmap_t          pmap);
+                               pmap_t          pmap,
+                               vm_offset_t     pmap_addr);
 
 extern void vm_fault_continue(void);
 
@@ -303,7 +305,6 @@ vm_fault_page(
        CLUSTER_STAT(int pages_at_higher_offsets;)
        CLUSTER_STAT(int pages_at_lower_offsets;)
        kern_return_t   wait_result;
-       thread_t                cur_thread;
        boolean_t               interruptible_state;
        boolean_t               bumped_pagein = FALSE;
 
@@ -431,11 +432,7 @@ vm_fault_page(
 #endif /* MACH_KDB */
 #endif /* STATIC_CONFIG */
 
-       cur_thread = current_thread();
-
-       interruptible_state = cur_thread->interruptible;
-       if (interruptible == THREAD_UNINT)
-               cur_thread->interruptible = FALSE;
+       interruptible_state = thread_interrupt_level(interruptible);
  
        /*
         *      INVARIANTS (through entire routine):
@@ -492,7 +489,7 @@ vm_fault_page(
 #endif
                if (!object->alive) {
                        vm_fault_cleanup(object, first_m);
-                       cur_thread->interruptible = interruptible_state;
+                       thread_interrupt_level(interruptible_state);
                        return(VM_FAULT_MEMORY_ERROR);
                }
                m = vm_page_lookup(object, offset);
@@ -523,19 +520,16 @@ vm_fault_page(
 #if TRACEFAULTPAGE
                                dbgTrace(0xBEEF0005, (unsigned int) m, (unsigned int) 0);       /* (TEST/DEBUG) */
 #endif
-                               PAGE_ASSERT_WAIT(m, interruptible);
-                               vm_object_unlock(object);
+                               wait_result = PAGE_SLEEP(object, m, interruptible);
                                XPR(XPR_VM_FAULT,
                                    "vm_f_page: block busy obj 0x%X, offset 0x%X, page 0x%X\n",
                                        (integer_t)object, offset,
                                        (integer_t)m, 0, 0);
                                counter(c_vm_fault_page_block_busy_kernel++);
-                               wait_result = thread_block((void (*)(void))0);
 
-                               vm_object_lock(object);
                                if (wait_result != THREAD_AWAKENED) {
                                        vm_fault_cleanup(object, first_m);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        if (wait_result == THREAD_RESTART)
                                          {
                                                return(VM_FAULT_RETRY);
@@ -560,7 +554,7 @@ vm_fault_page(
                                        *error_code = m->page_error;
                                VM_PAGE_FREE(m);
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_MEMORY_ERROR);
                        }
 
@@ -577,7 +571,7 @@ vm_fault_page(
 #endif
                                VM_PAGE_FREE(m);
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_RETRY);
                        }
 
@@ -605,7 +599,7 @@ vm_fault_page(
                                        if (object->shadow_severed) {
                                                vm_fault_cleanup(
                                                        object, first_m);
-                                               cur_thread->interruptible = interruptible_state;
+                                               thread_interrupt_level(interruptible_state);
                                                return VM_FAULT_MEMORY_ERROR;
                                        }
 
@@ -619,10 +613,11 @@ vm_fault_page(
                                        if (VM_PAGE_THROTTLED() ||
                                            (real_m = vm_page_grab()) == VM_PAGE_NULL) {
                                                vm_fault_cleanup(object, first_m);
-                                               cur_thread->interruptible = interruptible_state;
+                                               thread_interrupt_level(interruptible_state);
                                                return(VM_FAULT_MEMORY_SHORTAGE);
                                        }
 
+
                                        XPR(XPR_VM_FAULT,
              "vm_f_page: zero obj 0x%X, off 0x%X, page 0x%X, first_obj 0x%X\n",
                                                (integer_t)object, offset,
@@ -668,10 +663,21 @@ vm_fault_page(
                                                }
                                                vm_object_lock(object);
                                        }
-                                       pmap_clear_modify(m->phys_addr);
+                                       pmap_clear_modify(m->phys_page);
                                        vm_page_lock_queues();
                                        VM_PAGE_QUEUES_REMOVE(m);
                                        m->page_ticket = vm_page_ticket;
+                                       if(m->object->size > 0x80000) {
+                                               m->zero_fill = TRUE;
+                                               /* depends on the queues lock */
+                                               vm_zf_count += 1;
+                                               queue_enter(&vm_page_queue_zf, 
+                                                       m, vm_page_t, pageq);
+                                       } else {
+                                               queue_enter(
+                                                       &vm_page_queue_inactive, 
+                                                       m, vm_page_t, pageq);
+                                       }
                                        vm_page_ticket_roll++;
                                        if(vm_page_ticket_roll == 
                                                VM_PAGE_TICKETS_IN_ROLL) {
@@ -682,8 +688,6 @@ vm_fault_page(
                                                else
                                                        vm_page_ticket++;
                                        }
-                                       queue_enter(&vm_page_queue_inactive, 
-                                                       m, vm_page_t, pageq);
                                        m->inactive = TRUE;
                                        vm_page_inactive_count++;
                                        vm_page_unlock_queues();
@@ -755,13 +759,13 @@ vm_fault_page(
                                if (m != VM_PAGE_NULL && m->cleaning) {
                                        PAGE_ASSERT_WAIT(m, interruptible);
                                        vm_object_unlock(object);
-                                       wait_result = thread_block((void (*)(void)) 0);
+                                       wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        vm_object_deallocate(object);
                                        goto backoff;
                                } else {
                                        vm_object_unlock(object);
                                        vm_object_deallocate(object);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return VM_FAULT_RETRY;
                                }
                        }
@@ -795,18 +799,19 @@ vm_fault_page(
                                                vm_object_lock(object);
                                                assert(object->ref_count > 0);
                                                if (!object->pager_ready) {
-                                                       vm_object_assert_wait(
+                                                       wait_result = vm_object_assert_wait(
                                                                object,
                                                                VM_OBJECT_EVENT_PAGER_READY,
                                                                interruptible);
                                                        vm_object_unlock(object);
-                                                       wait_result = thread_block((void (*)(void))0);
+                                                       if (wait_result == THREAD_WAITING)
+                                                               wait_result = thread_block(THREAD_CONTINUE_NULL);
                                                        vm_object_deallocate(object);
                                                        goto backoff;
                                                } else {
                                                        vm_object_unlock(object);
                                                        vm_object_deallocate(object);
-                                                       cur_thread->interruptible = interruptible_state;
+                                                       thread_interrupt_level(interruptible_state);
                                                        return VM_FAULT_RETRY;
                                                }
                                        }
@@ -828,7 +833,7 @@ vm_fault_page(
                                                    printf("vm_fault: memory_object_data_unlock failed\n");
                                                vm_object_lock(object);
                                                vm_fault_cleanup(object, first_m);
-                                               cur_thread->interruptible = interruptible_state;
+                                               thread_interrupt_level(interruptible_state);
                                                return((rc == MACH_SEND_INTERRUPTED) ?
                                                        VM_FAULT_INTERRUPTED :
                                                        VM_FAULT_MEMORY_ERROR);
@@ -855,13 +860,13 @@ vm_fault_page(
                                    !((access_required & m->unlock_request) != access_required)) {
                                        PAGE_ASSERT_WAIT(m, interruptible);
                                        vm_object_unlock(object);
-                                       wait_result = thread_block((void (*)(void)) 0);
+                                       wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        vm_object_deallocate(object);
                                        goto backoff;
                                } else {
                                        vm_object_unlock(object);
                                        vm_object_deallocate(object);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return VM_FAULT_RETRY;
                                }
                        }
@@ -917,7 +922,7 @@ vm_fault_page(
 #endif
                        if (m == VM_PAGE_NULL) {
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_FICTITIOUS_SHORTAGE);
                        }
                        vm_page_insert(m, object, offset);
@@ -948,17 +953,18 @@ vm_fault_page(
                                vm_object_lock(object);
                                assert(object->ref_count > 0);
                                if (!object->pager_ready) {
-                                       vm_object_assert_wait(object,
+                                       wait_result = vm_object_assert_wait(object,
                                                              VM_OBJECT_EVENT_PAGER_READY,
                                                              interruptible);
                                        vm_object_unlock(object);
-                                       wait_result = thread_block((void (*)(void))0);
+                                       if (wait_result == THREAD_WAITING)
+                                               wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        vm_object_deallocate(object);
                                        goto backoff;
                                } else {
                                        vm_object_unlock(object);
                                        vm_object_deallocate(object);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return VM_FAULT_RETRY;
                                }
                        }
@@ -987,7 +993,7 @@ vm_fault_page(
                                if (m->fictitious && !vm_page_convert(m)) {
                                        VM_PAGE_FREE(m);
                                        vm_fault_cleanup(object, first_m);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return(VM_FAULT_MEMORY_SHORTAGE);
                                }
                        } else if (object->absent_count >
@@ -1015,13 +1021,13 @@ vm_fault_page(
                                        vm_object_absent_assert_wait(object,
                                                                     interruptible);
                                        vm_object_unlock(object);
-                                       wait_result = thread_block((void (*)(void))0);
+                                       wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        vm_object_deallocate(object);
                                        goto backoff;
                                } else {
                                        vm_object_unlock(object);
                                        vm_object_deallocate(object);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return VM_FAULT_RETRY;
                                }
                        }
@@ -1040,229 +1046,10 @@ vm_fault_page(
 
                        }
 
+no_clustering:
                        cluster_start = offset;
                        length = PAGE_SIZE;
-                       cluster_size = object->cluster_size;
-
-                       /*
-                        * Skip clustered pagein if it is globally disabled 
-                        * or random page reference behavior is expected
-                        * for the address range containing the faulting 
-                        * address or the object paging block size is
-                        * equal to the page size.
-                        */
-                       if (!vm_allow_clustered_pagein ||
-                            behavior == VM_BEHAVIOR_RANDOM ||
-                            m == VM_PAGE_NULL ||
-                            cluster_size == PAGE_SIZE) {
-                               cluster_start = trunc_page_64(cluster_start);
-                               goto no_clustering;
-                       }
-
-                       assert(offset >= lo_offset);
-                       assert(offset < hi_offset);
-                       assert(ALIGNED(object->paging_offset));
-                       assert(cluster_size >= PAGE_SIZE);
-
-#if TRACEFAULTPAGE
-                       dbgTrace(0xBEEF0011, (unsigned int) m, (unsigned int) 0);       /* (TEST/DEBUG) */
-#endif
-                       /*
-                        * Decide whether to scan ahead or behind for
-                        * additional pages contiguous to the faulted
-                        * page in the same paging block.  The decision
-                        * is based on system wide globals and the
-                        * expected page reference behavior of the
-                        * address range contained the faulting address.
-                        * First calculate some constants.
-                        */
-                       paging_offset = offset + object->paging_offset;
-                       cluster_offset = paging_offset & (cluster_size - 1);
-                       align_offset = paging_offset&(PAGE_SIZE_64-1);
-                       if (align_offset != 0) {
-                               cluster_offset = trunc_page_64(cluster_offset);
-                       }
-
-#define SPANS_CLUSTER(x) ((((x) - align_offset) & (vm_object_offset_t)(cluster_size - 1)) == 0)
-
-                       /*
-                        * Backward scan only if reverse sequential
-                        * behavior has been specified
-                        */
-                       CLUSTER_STAT(pages_at_lower_offsets = 0;)
-                       if (((vm_default_behind != 0 && 
-                            behavior == VM_BEHAVIOR_DEFAULT) ||
-                            behavior == VM_BEHAVIOR_RSEQNTL) && offset) {
-                           vm_object_offset_t cluster_bot;
-
-                           /*
-                            * Calculate lower search boundary.
-                            * Exclude pages that span a cluster boundary.
-                            * Clip to start of map entry.
-                            * For default page reference behavior, scan
-                            * default pages behind.
-                            */
-                           cluster_bot = (offset > cluster_offset) ?
-                                           offset - cluster_offset : offset;
-                           if (align_offset != 0) {
-                               if ((cluster_bot < offset) &&
-                                   SPANS_CLUSTER(cluster_bot)) {
-                                       cluster_bot += PAGE_SIZE_64;
-                               }
-                           }
-                           if (behavior == VM_BEHAVIOR_DEFAULT) {
-                               vm_object_offset_t 
-                                       bot = (vm_object_offset_t)
-                                               (vm_default_behind * PAGE_SIZE);
-
-                               if (cluster_bot < (offset - bot))
-                                       cluster_bot = offset - bot;
-                           }
-                           if (lo_offset > cluster_bot)
-                               cluster_bot = lo_offset;
-
-                           for ( cluster_start = offset - PAGE_SIZE_64;
-                                (cluster_start >= cluster_bot) &&
-                                (cluster_start != 
-                                       (align_offset - PAGE_SIZE_64));
-                                 cluster_start -= PAGE_SIZE_64) {
-                               assert(cluster_size > PAGE_SIZE_64);
-retry_cluster_backw:
-                               if (!LOOK_FOR(object, cluster_start) ||
-                                   vm_page_lookup(object, cluster_start)
-                                               != VM_PAGE_NULL) {
-                                       break;
-                               }
-                               if (object->internal) {
-                                       /*
-                                        * need to acquire a real page in
-                                        * advance because this acts as
-                                        * a throttling mechanism for
-                                        * data_requests to the default
-                                        * pager.  If this fails, give up
-                                        * trying to find any more pages
-                                        * in the cluster and send off the
-                                        * request for what we already have.
-                                        */
-                                       if ((m = vm_page_grab())
-                                                       == VM_PAGE_NULL) {
-                                           cluster_start += PAGE_SIZE_64;
-                                           cluster_end = offset + PAGE_SIZE_64;
-                                           goto give_up;
-                                       }
-                               } else if ((m = vm_page_grab_fictitious())
-                                               == VM_PAGE_NULL) {
-                                       vm_object_unlock(object);
-                                       vm_page_more_fictitious();
-                                       vm_object_lock(object);
-                                       goto retry_cluster_backw;
-                               }
-                               m->absent = TRUE;
-                               m->unusual = TRUE;
-                               m->clustered = TRUE;
-                               m->list_req_pending = TRUE;
-
-                               vm_page_insert(m, object, cluster_start);
-                               CLUSTER_STAT(pages_at_lower_offsets++;)
-                               object->absent_count++;
-                           }
-                           cluster_start += PAGE_SIZE_64;
-                           assert(cluster_start >= cluster_bot);
-                       }
-                       assert(cluster_start <= offset);
-
-                       /*
-                        * Forward scan if default or sequential behavior
-                        * specified
-                        */
-                       CLUSTER_STAT(pages_at_higher_offsets = 0;)
-                       if ((behavior == VM_BEHAVIOR_DEFAULT && 
-                            vm_default_ahead != 0) ||
-                            behavior == VM_BEHAVIOR_SEQUENTIAL) {
-                           vm_object_offset_t cluster_top;
-
-                           /*
-                            * Calculate upper search boundary.
-                            * Exclude pages that span a cluster boundary.
-                            * Clip to end of map entry.
-                            * For default page reference behavior, scan
-                            * default pages ahead.
-                            */
-                           cluster_top = (offset + cluster_size) - 
-                                         cluster_offset;
-                           if (align_offset != 0) {
-                               if ((cluster_top > (offset + PAGE_SIZE_64)) &&
-                                   SPANS_CLUSTER(cluster_top)) {
-                                       cluster_top -= PAGE_SIZE_64;
-                               }
-                           }
-                           if (behavior == VM_BEHAVIOR_DEFAULT) {
-                               vm_object_offset_t top = (vm_object_offset_t)
-                                    ((vm_default_ahead*PAGE_SIZE)+PAGE_SIZE);
-
-                               if (cluster_top > (offset + top))
-                                       cluster_top =  offset + top;
-                           }
-                           if (cluster_top > hi_offset)
-                                       cluster_top = hi_offset;
-
-                           for (cluster_end = offset + PAGE_SIZE_64;
-                                cluster_end < cluster_top;
-                                cluster_end += PAGE_SIZE_64) {
-                               assert(cluster_size > PAGE_SIZE);
-retry_cluster_forw:
-                               if (!LOOK_FOR(object, cluster_end) ||
-                                   vm_page_lookup(object, cluster_end)
-                                               != VM_PAGE_NULL) {
-                                       break;
-                               }
-                               if (object->internal) {
-                                       /*
-                                        * need to acquire a real page in
-                                        * advance because this acts as
-                                        * a throttling mechanism for
-                                        * data_requests to the default
-                                        * pager.  If this fails, give up
-                                        * trying to find any more pages
-                                        * in the cluster and send off the
-                                        * request for what we already have.
-                                        */
-                                       if ((m = vm_page_grab())
-                                                       == VM_PAGE_NULL) {
-                                           break;
-                                       }
-                               } else if ((m = vm_page_grab_fictitious())
-                                               == VM_PAGE_NULL) {
-                                   vm_object_unlock(object);
-                                   vm_page_more_fictitious();
-                                   vm_object_lock(object);
-                                   goto retry_cluster_forw;
-                               }
-                               m->absent = TRUE;
-                               m->unusual = TRUE;
-                               m->clustered = TRUE;
-                               m->list_req_pending = TRUE;
-
-                               vm_page_insert(m, object, cluster_end);
-                               CLUSTER_STAT(pages_at_higher_offsets++;)
-                               object->absent_count++;
-                           }
-                           assert(cluster_end <= cluster_top);
-                       }
-                       else {
-                               cluster_end = offset + PAGE_SIZE_64;
-                       }
-give_up:
-                       assert(cluster_end >= offset + PAGE_SIZE_64);
-                       length = cluster_end - cluster_start;
-
-#if    MACH_CLUSTER_STATS
-                       CLUSTER_STAT_HIGHER(pages_at_higher_offsets);
-                       CLUSTER_STAT_LOWER(pages_at_lower_offsets);
-                       CLUSTER_STAT_CLUSTER(length/PAGE_SIZE);
-#endif /* MACH_CLUSTER_STATS */
 
-no_clustering:
                        /* 
                         * lengthen the cluster by the pages in the working set
                         */
@@ -1276,10 +1063,11 @@ no_clustering:
                                 * could be affected by re-entrance we
                                 * do not need to take the map lock.
                                 */
+                               cluster_end = offset + PAGE_SIZE_64;
                                tws_build_cluster((tws_hash_t)
                                        current_task()->dynamic_working_set,
                                        object, &cluster_start,
-                                       &cluster_end, 0x16000);
+                                       &cluster_end, 0x40000);
                                length = cluster_end - cluster_start;
                        }
 #if TRACEFAULTPAGE
@@ -1296,7 +1084,7 @@ no_clustering:
                         */
 
                        if (type_of_fault)
-                               *type_of_fault = DBG_PAGEIN_FAULT;
+                               *type_of_fault = (length << 8) | DBG_PAGEIN_FAULT;
                        VM_STAT(pageins++);
                        current_task()->pageins++;
                        bumped_pagein = TRUE;
@@ -1361,7 +1149,7 @@ no_clustering:
                                   }
                                }
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return((rc == MACH_SEND_INTERRUPTED) ?
                                        VM_FAULT_INTERRUPTED :
                                        VM_FAULT_MEMORY_ERROR);
@@ -1373,11 +1161,22 @@ no_clustering:
                                task = current_task();
                                
                                if((map != NULL) && 
-                                       (task->dynamic_working_set != 0)) {
+                                       (task->dynamic_working_set != 0)) 
+                                               && !(object->private)) {
+                                       vm_object_t     base_object;
+                                       vm_object_offset_t base_offset;
+                                       base_object = object;
+                                       base_offset = offset;
+                                       while(base_object->shadow) {
+                                               base_offset +=
+                                                 base_object->shadow_offset;
+                                               base_object =
+                                                 base_object->shadow;
+                                       }
                                        if(tws_lookup
                                                ((tws_hash_t)
                                                task->dynamic_working_set,
-                                               offset, object,
+                                               base_offset, base_object,
                                                &line) == KERN_SUCCESS) {
                                                tws_line_signal((tws_hash_t)
                                                task->dynamic_working_set, 
@@ -1396,7 +1195,7 @@ no_clustering:
                        if ((interruptible != THREAD_UNINT) && 
                            (current_thread()->state & TH_ABORT)) {
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_INTERRUPTED);
                        }
                        if(m == VM_PAGE_NULL)
@@ -1451,7 +1250,7 @@ no_clustering:
                        if (object->shadow_severed) {
                                VM_PAGE_FREE(m);
                                vm_fault_cleanup(object, VM_PAGE_NULL);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return VM_FAULT_MEMORY_ERROR;
                        }
 
@@ -1459,7 +1258,7 @@ no_clustering:
                            (m->fictitious && !vm_page_convert(m))) {
                                VM_PAGE_FREE(m);
                                vm_fault_cleanup(object, VM_PAGE_NULL);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_MEMORY_SHORTAGE);
                        }
                        m->no_isync = FALSE;
@@ -1479,6 +1278,17 @@ no_clustering:
                        }
                        vm_page_lock_queues();
                        VM_PAGE_QUEUES_REMOVE(m);
+                       if(m->object->size > 0x80000) {
+                               m->zero_fill = TRUE;
+                               /* depends on the queues lock */
+                               vm_zf_count += 1;
+                               queue_enter(&vm_page_queue_zf, 
+                                       m, vm_page_t, pageq);
+                       } else {
+                               queue_enter(
+                                       &vm_page_queue_inactive, 
+                                       m, vm_page_t, pageq);
+                       }
                        m->page_ticket = vm_page_ticket;
                        vm_page_ticket_roll++;
                        if(vm_page_ticket_roll == VM_PAGE_TICKETS_IN_ROLL) {
@@ -1489,12 +1299,10 @@ no_clustering:
                                else
                                        vm_page_ticket++;
                        }
-                       queue_enter(&vm_page_queue_inactive, 
-                                               m, vm_page_t, pageq);
                        m->inactive = TRUE;
                        vm_page_inactive_count++;
                        vm_page_unlock_queues();
-                       pmap_clear_modify(m->phys_addr);
+                       pmap_clear_modify(m->phys_page);
                        break;
                }
                else {
@@ -1589,7 +1397,7 @@ no_clustering:
                        if (copy_m == VM_PAGE_NULL) {
                                RELEASE_PAGE(m);
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_MEMORY_SHORTAGE);
                        }
 
@@ -1615,7 +1423,7 @@ no_clustering:
 
                        vm_page_lock_queues();
                        assert(!m->cleaning);
-                       pmap_page_protect(m->phys_addr, VM_PROT_NONE);
+                       pmap_page_protect(m->phys_page, VM_PROT_NONE);
                        vm_page_deactivate(m);
                        copy_m->dirty = TRUE;
                        /*
@@ -1673,8 +1481,7 @@ no_clustering:
         *      shadowed object, and one here to push it into the copy.
         */
 
-       while (first_object->copy_strategy == MEMORY_OBJECT_COPY_DELAY &&
-              (copy_object = first_object->copy) != VM_OBJECT_NULL &&
+       while ((copy_object = first_object->copy) != VM_OBJECT_NULL &&
                   (m!= VM_PAGE_NULL)) {
                vm_object_offset_t      copy_offset;
                vm_page_t               copy_m;
@@ -1755,13 +1562,13 @@ no_clustering:
                                if (copy_m != VM_PAGE_NULL && copy_m->busy) {
                                        PAGE_ASSERT_WAIT(copy_m, interruptible);
                                        vm_object_unlock(copy_object);
-                                       wait_result = thread_block((void (*)(void))0);
+                                       wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        vm_object_deallocate(copy_object);
                                        goto backoff;
                                } else {
                                        vm_object_unlock(copy_object);
                                        vm_object_deallocate(copy_object);
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
                                        return VM_FAULT_RETRY;
                                }
                        }
@@ -1788,7 +1595,7 @@ no_clustering:
                                assert(copy_object->ref_count > 0);
                                vm_object_unlock(copy_object);
                                vm_fault_cleanup(object, first_m);
-                               cur_thread->interruptible = interruptible_state;
+                               thread_interrupt_level(interruptible_state);
                                return(VM_FAULT_MEMORY_SHORTAGE);
                        }
 
@@ -1807,7 +1614,7 @@ no_clustering:
 
                        vm_page_lock_queues();
                        assert(!m->cleaning);
-                       pmap_page_protect(m->phys_addr, VM_PROT_NONE);
+                       pmap_page_protect(m->phys_page, VM_PROT_NONE);
                        copy_m->dirty = TRUE;
                        vm_page_unlock_queues();
 
@@ -1949,7 +1756,7 @@ no_clustering:
 #if TRACEFAULTPAGE
        dbgTrace(0xBEEF001A, (unsigned int) VM_FAULT_SUCCESS, 0);       /* (TEST/DEBUG) */
 #endif
-       cur_thread->interruptible = interruptible_state;
+       thread_interrupt_level(interruptible_state);
        if(*result_page == VM_PAGE_NULL) {
                vm_object_unlock(object);
        }
@@ -1960,11 +1767,11 @@ no_clustering:
        vm_fault_cleanup(object, first_m);
 
        counter(c_vm_fault_page_block_backoff_kernel++);
-       thread_block((void (*)(void))0);
+       thread_block(THREAD_CONTINUE_NULL);
 #endif
 
     backoff:
-       cur_thread->interruptible = interruptible_state;
+       thread_interrupt_level(interruptible_state);
        if (wait_result == THREAD_INTERRUPTED)
                return VM_FAULT_INTERRUPTED;
        return VM_FAULT_RETRY;
@@ -1992,7 +1799,9 @@ vm_fault(
        vm_offset_t     vaddr,
        vm_prot_t       fault_type,
        boolean_t       change_wiring,
-       int             interruptible)
+       int             interruptible,
+       pmap_t          caller_pmap,
+       vm_offset_t     caller_pmap_addr)
 {
        vm_map_version_t        version;        /* Map version for verificiation */
        boolean_t               wired;          /* Should mapping be wired down? */
@@ -2023,6 +1832,9 @@ vm_fault(
        funnel_t                *curflock;
        thread_t                cur_thread;
        boolean_t               interruptible_state;
+       unsigned int            cache_attr;
+       int                     write_startup_file = 0;
+       vm_prot_t               full_fault_type;
        
 
        KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_START,
@@ -2032,11 +1844,16 @@ vm_fault(
                              0,
                              0);
 
-       cur_thread = current_thread();
+       /* at present we do not fully check for execute permission */
+       /* we generally treat it is read except in certain device  */
+       /* memory settings */
+       full_fault_type = fault_type;
+       if(fault_type & VM_PROT_EXECUTE) {
+               fault_type &= ~VM_PROT_EXECUTE;
+               fault_type |= VM_PROT_READ;
+       }
 
-       interruptible_state = cur_thread->interruptible;
-       if (interruptible == THREAD_UNINT)
-               cur_thread->interruptible = FALSE;
+       interruptible_state = thread_interrupt_level(interruptible);
 
        /*
         * assume we will hit a page in the cache
@@ -2051,6 +1868,8 @@ vm_fault(
        /*
         * drop funnel if it is already held. Then restore while returning
         */
+       cur_thread = current_thread();
+
        if ((cur_thread->funnel_state & TH_FN_OWNED) == TH_FN_OWNED) {
                funnel_set = TRUE;
                curflock = cur_thread->funnel_lock;
@@ -2138,13 +1957,39 @@ vm_fault(
        while (TRUE) {
                m = vm_page_lookup(cur_object, cur_offset);
                if (m != VM_PAGE_NULL) {
-                       if (m->busy)
-                               break;
+                       if (m->busy) {
+                               wait_result_t   result;
+
+                               if (object != cur_object)
+                                       vm_object_unlock(object);
+
+                               vm_map_unlock_read(map);
+                               if (pmap_map != map)
+                                       vm_map_unlock(pmap_map);
+
+#if    !VM_FAULT_STATIC_CONFIG
+                               if (!vm_fault_interruptible)
+                                       interruptible = THREAD_UNINT;
+#endif
+                               result = PAGE_ASSERT_WAIT(m, interruptible);
+
+                               vm_object_unlock(cur_object);
+
+                               if (result == THREAD_WAITING) {
+                                       result = thread_block(THREAD_CONTINUE_NULL);
+
+                                       counter(c_vm_fault_page_block_busy_kernel++);
+                               }
+                               if (result == THREAD_AWAKENED || result == THREAD_RESTART)
+                                       goto RetryFault;
 
+                               kr = KERN_ABORTED;
+                               goto done;
+                       }
                        if (m->unusual && (m->error || m->restart || m->private
                            || m->absent || (fault_type & m->page_lock))) {
 
-                       /*
+                               /*
                                 *      Unusual case. Give up.
                                 */
                                break;
@@ -2180,7 +2025,6 @@ FastMapInFault:
                                m->busy = TRUE;
 
                                vm_object_paging_begin(object);
-                               vm_object_unlock(object);
 
 FastPmapEnter:
                                /*
@@ -2202,47 +2046,24 @@ FastPmapEnter:
                                        prot &= ~VM_PROT_WRITE;
 #endif /* MACH_KDB */
 #endif /* STATIC_CONFIG */
-                               PMAP_ENTER(pmap, vaddr, m, prot, wired);
-
-                               if (m->no_isync) {
-                                       pmap_attribute(pmap,
-                                                      vaddr,
-                                                      PAGE_SIZE,
-                                                      MATTR_CACHE,
-                                                      &mv_cache_sync);
-                                       
+                               cache_attr = ((unsigned int)m->object->wimg_bits) & VM_WIMG_MASK;
+                               if ((m->no_isync == TRUE) || 
+                                          (cache_attr != VM_WIMG_DEFAULT)) {
+                                       pmap_sync_caches_phys(m->phys_page);
+                                       m->no_isync = FALSE;
                                }
-                               {
-                                  tws_hash_line_t      line;
-                                  task_t               task;
 
-                                  task = current_task();
-                                  if((map != NULL) && 
-                                       (task->dynamic_working_set != 0)) {
-                                       if(tws_lookup
-                                               ((tws_hash_t)
-                                               task->dynamic_working_set,
-                                               cur_offset, object,
-                                               &line) != KERN_SUCCESS) {
-                                               if(tws_insert((tws_hash_t)
-                                                  task->dynamic_working_set,
-                                                  m->offset, m->object,
-                                                  vaddr, pmap_map) 
-                                                       == KERN_NO_SPACE) {
-                                                  tws_expand_working_set(
-                                                     task->dynamic_working_set,
-                                                     TWS_HASH_LINE_COUNT);
-                                               }
-                                       }
-                                  }
+                               if(caller_pmap) {
+                                       PMAP_ENTER(caller_pmap, 
+                                               caller_pmap_addr, m, 
+                                               prot, cache_attr, wired);
+                               } else {
+                                       PMAP_ENTER(pmap, vaddr, m, 
+                                               prot, cache_attr, wired);
                                }
 
-                               if (m->clustered) {
-                                       vm_pagein_cluster_used++;
-                                       m->clustered = FALSE;
-                               }
                                /*
-                                *      Grab the object lock to manipulate
+                                *      Grab the queues lock to manipulate
                                 *      the page queues.  Change wiring
                                 *      case is obvious.  In soft ref bits
                                 *      case activate page only if it fell
@@ -2253,16 +2074,12 @@ FastPmapEnter:
                                 *      move active page to back of active
                                 *      queue.  This code doesn't.
                                 */
-                               vm_object_lock(object);
                                vm_page_lock_queues();
-                               /* 
-                                * we did the isync above... we're clearing
-                                * the flag here to avoid holding a lock
-                                * while calling pmap functions, however
-                                * we need hold the object lock before
-                                * we can modify the flag
-                                */
-                               m->no_isync = FALSE;
+
+                               if (m->clustered) {
+                                       vm_pagein_cluster_used++;
+                                       m->clustered = FALSE;
+                               }
                                m->reference = TRUE;
 
                                if (change_wiring) {
@@ -2292,23 +2109,76 @@ FastPmapEnter:
                                 */
                                PAGE_WAKEUP_DONE(m);
                                vm_object_paging_end(object);
+
+                               {
+                                  tws_hash_line_t      line;
+                                  task_t               task;
+
+                                  task = current_task();
+                                  if((map != NULL) && 
+                                       (task->dynamic_working_set != 0) &&
+                                               !(object->private)) {
+                                       kern_return_t   kr;
+                                       vm_object_t     base_object;
+                                       vm_object_offset_t base_offset;
+                                       base_object = object;
+                                       base_offset = cur_offset;
+                                       while(base_object->shadow) {
+                                               base_offset +=
+                                                base_object->shadow_offset;
+                                               base_object = 
+                                                base_object->shadow;
+                                       }
+                                       kr = tws_lookup((tws_hash_t)
+                                               task->dynamic_working_set,
+                                               base_offset, base_object,
+                                               &line);
+                                       if(kr == KERN_OPERATION_TIMED_OUT){
+                                               write_startup_file = 1;
+                                       } else if (kr != KERN_SUCCESS) {
+                                               kr = tws_insert((tws_hash_t)
+                                                  task->dynamic_working_set,
+                                                  base_offset, base_object,
+                                                  vaddr, pmap_map);
+                                               if(kr == KERN_NO_SPACE) {
+                                                 vm_object_unlock(object);
+
+                                                  tws_expand_working_set(
+                                                     task->dynamic_working_set,
+                                                     TWS_HASH_LINE_COUNT,
+                                                     FALSE);
+
+                                                  vm_object_lock(object);
+                                               }
+                                               if(kr == 
+                                                  KERN_OPERATION_TIMED_OUT) {
+                                                       write_startup_file = 1;
+                                               }
+                                       }
+                                  }
+                               }
                                vm_object_unlock(object);
+
                                vm_map_unlock_read(map);
                                if(pmap_map != map)
                                        vm_map_unlock(pmap_map);
 
-                               if (funnel_set) {
+                               if(write_startup_file)
+                                       tws_send_startup_info(current_task());
+
+                               if (funnel_set)
                                        thread_funnel_set( curflock, TRUE);
-                                       funnel_set = FALSE;
-                               }
-                               cur_thread->interruptible = interruptible_state;
+
+                               thread_interrupt_level(interruptible_state);
+
 
                                KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_END,
                                                      vaddr,
-                                                     type_of_fault,
+                                                     type_of_fault & 0xff,
                                                      KERN_SUCCESS,
-                                                     0,
+                                                     type_of_fault >> 8,
                                                      0);
+
                                return KERN_SUCCESS;
                        }
 
@@ -2322,7 +2192,6 @@ FastPmapEnter:
 
                        if (cur_object == object)
                                break;
-
                        /*
                         *      This is now a shadow based copy on write
                         *      fault -- it requires a copy up the shadow
@@ -2338,7 +2207,6 @@ FastPmapEnter:
                        if (m == VM_PAGE_NULL) {
                                break;
                        }
-
                        /*
                         *      Now do the copy.  Mark the source busy
                         *      and take out paging references on both
@@ -2370,7 +2238,7 @@ FastPmapEnter:
                        vm_page_lock_queues();
                        vm_page_deactivate(cur_m);
                        m->dirty = TRUE;
-                       pmap_page_protect(cur_m->phys_addr,
+                       pmap_page_protect(cur_m->phys_page,
                                                  VM_PROT_NONE);
                        vm_page_unlock_queues();
 
@@ -2387,7 +2255,6 @@ FastPmapEnter:
                        vm_object_paging_end(object); 
                        vm_object_collapse(object);
                        vm_object_paging_begin(object);
-                       vm_object_unlock(object);
 
                        goto FastPmapEnter;
                }
@@ -2402,7 +2269,6 @@ FastPmapEnter:
                                /*
                                 *      Have to talk to the pager.  Give up.
                                 */
-
                                break;
                        }
 
@@ -2416,11 +2282,15 @@ FastPmapEnter:
                                        if(pmap_map != map)
                                                vm_map_unlock(pmap_map);
 
+                                       if(write_startup_file)
+                                               tws_send_startup_info(
+                                                               current_task());
+
                                        if (funnel_set) {
                                                thread_funnel_set( curflock, TRUE);
                                                funnel_set = FALSE;
                                        }
-                                       cur_thread->interruptible = interruptible_state;
+                                       thread_interrupt_level(interruptible_state);
 
                                        return VM_FAULT_MEMORY_ERROR;
                                }
@@ -2478,6 +2348,17 @@ FastPmapEnter:
                                VM_PAGE_QUEUES_REMOVE(m);
 
                                m->page_ticket = vm_page_ticket;
+                               if(m->object->size > 0x80000) {
+                                       m->zero_fill = TRUE;
+                                       /* depends on the queues lock */
+                                       vm_zf_count += 1;
+                                       queue_enter(&vm_page_queue_zf, 
+                                               m, vm_page_t, pageq);
+                               } else {
+                                       queue_enter(
+                                               &vm_page_queue_inactive, 
+                                               m, vm_page_t, pageq);
+                               }
                                vm_page_ticket_roll++;
                                if(vm_page_ticket_roll == 
                                                VM_PAGE_TICKETS_IN_ROLL) {
@@ -2489,11 +2370,11 @@ FastPmapEnter:
                                                vm_page_ticket++;
                                }
 
-                               queue_enter(&vm_page_queue_inactive, 
-                                                       m, vm_page_t, pageq);
                                m->inactive = TRUE;
                                vm_page_inactive_count++;
                                vm_page_unlock_queues();
+                               vm_object_lock(object);
+
                                goto FastPmapEnter;
                        }
 
@@ -2521,6 +2402,7 @@ FastPmapEnter:
                vm_object_unlock(cur_object);
        }
        vm_map_unlock_read(map);
+
        if(pmap_map != map)
                vm_map_unlock(pmap_map);
 
@@ -2538,6 +2420,54 @@ FastPmapEnter:
        vm_object_paging_begin(object);
 
        XPR(XPR_VM_FAULT,"vm_fault -> vm_fault_page\n",0,0,0,0,0);
+       {
+               tws_hash_line_t line;
+               task_t          task;
+               kern_return_t   kr;
+
+                  task = current_task();
+                  if((map != NULL) && 
+                       (task->dynamic_working_set != 0)
+                               && !(object->private)) {
+                       vm_object_t     base_object;
+                       vm_object_offset_t base_offset;
+                       base_object = object;
+                       base_offset = offset;
+                       while(base_object->shadow) {
+                               base_offset +=
+                                base_object->shadow_offset;
+                               base_object =
+                                base_object->shadow;
+                       }
+                       kr = tws_lookup((tws_hash_t)
+                               task->dynamic_working_set,
+                               base_offset, base_object, 
+                               &line);
+                       if(kr == KERN_OPERATION_TIMED_OUT){
+                               write_startup_file = 1;
+                       } else if (kr != KERN_SUCCESS) {
+                               tws_insert((tws_hash_t)
+                                  task->dynamic_working_set,
+                                  base_offset, base_object, 
+                                  vaddr, pmap_map);
+                               kr = tws_insert((tws_hash_t)
+                                          task->dynamic_working_set,
+                                          base_offset, base_object,
+                                          vaddr, pmap_map);
+                               if(kr == KERN_NO_SPACE) {
+                                       vm_object_unlock(object);
+                                       tws_expand_working_set(
+                                          task->dynamic_working_set, 
+                                          TWS_HASH_LINE_COUNT,
+                                          FALSE);
+                                       vm_object_lock(object);
+                               }
+                               if(kr == KERN_OPERATION_TIMED_OUT) {
+                                       write_startup_file = 1;
+                               }
+                       }
+               }
+       }
        kr = vm_fault_page(object, offset, fault_type,
                           (change_wiring && !wired),
                           interruptible,
@@ -2622,7 +2552,6 @@ FastPmapEnter:
 
        if(m != VM_PAGE_NULL) {
                old_copy_object = m->object->copy;
-
                vm_object_unlock(m->object);
        } else {
                old_copy_object = VM_OBJECT_NULL;
@@ -2735,85 +2664,178 @@ FastPmapEnter:
         *      the pageout queues.  If the pageout daemon comes
         *      across the page, it will remove it from the queues.
         */
-       if(m != VM_PAGE_NULL) {
-               if (m->no_isync) {
-               m->no_isync = FALSE;
+       if (m != VM_PAGE_NULL) {
+               if (m->no_isync == TRUE) {
+                       pmap_sync_caches_phys(m->phys_page);
 
-               vm_object_unlock(m->object);
+                       m->no_isync = FALSE;
+               }
 
-                       PMAP_ENTER(pmap, vaddr, m, prot, wired);
+               cache_attr = ((unsigned int)m->object->wimg_bits) & VM_WIMG_MASK;
 
-                       /*
-                        *      It's critically important that a wired-down page be faulted
-                        *      only once in each map for which it is wired.
-                       */
-                       /* Sync I & D caches for new mapping */
-                       pmap_attribute(pmap,
-                              vaddr,
-                              PAGE_SIZE,
-                              MATTR_CACHE,
-                              &mv_cache_sync);
+               if(caller_pmap) {
+                       PMAP_ENTER(caller_pmap, 
+                                       caller_pmap_addr, m, 
+                                       prot, cache_attr, wired);
                } else {
-               vm_object_unlock(m->object);
-
-                       PMAP_ENTER(pmap, vaddr, m, prot, wired);
+                       PMAP_ENTER(pmap, vaddr, m, 
+                                       prot, cache_attr, wired);
                }
                {
                        tws_hash_line_t line;
                        task_t          task;
+                       kern_return_t   kr;
 
                           task = current_task();
                           if((map != NULL) && 
-                               (task->dynamic_working_set != 0)) {
-                               if(tws_lookup
-                                       ((tws_hash_t)
+                               (task->dynamic_working_set != 0)
+                                       && (object->private)) {
+                               vm_object_t     base_object;
+                               vm_object_offset_t      base_offset;
+                               base_object = m->object;
+                               base_offset = m->offset;
+                               while(base_object->shadow) {
+                                  base_offset +=
+                                       base_object->shadow_offset;
+                                  base_object =
+                                       base_object->shadow;
+                               }
+                               kr = tws_lookup((tws_hash_t)
                                        task->dynamic_working_set,
-                                       m->offset, m->object,
-                                       &line) != KERN_SUCCESS) {
+                                       base_offset, base_object, &line);
+                               if(kr == KERN_OPERATION_TIMED_OUT){
+                                       write_startup_file = 1;
+                               } else if (kr != KERN_SUCCESS) {
                                        tws_insert((tws_hash_t)
                                           task->dynamic_working_set,
-                                          m->offset, m->object, 
+                                          base_offset, base_object, 
                                           vaddr, pmap_map);
-                                       if(tws_insert((tws_hash_t)
+                                       kr = tws_insert((tws_hash_t)
                                                   task->dynamic_working_set,
-                                                  m->offset, m->object,
-                                                  vaddr, pmap_map) 
-                                                               == KERN_NO_SPACE) {
+                                                  base_offset, base_object,
+                                                  vaddr, pmap_map);
+                                       if(kr == KERN_NO_SPACE) {
+                                               vm_object_unlock(m->object);
                                                tws_expand_working_set(
-                                                       task->dynamic_working_set, 
-                                                       TWS_HASH_LINE_COUNT);
+                                                  task->dynamic_working_set, 
+                                                  TWS_HASH_LINE_COUNT,
+                                                  FALSE);
+                                               vm_object_lock(m->object);
+                                       }
+                                       if(kr == KERN_OPERATION_TIMED_OUT) {
+                                               write_startup_file = 1;
                                        }
                                }
                        }
                }
        } else {
 
-/*  if __ppc__  not working until figure out phys copy on block maps */
-#ifdef notdefcdy
-               int     memattr;
-               struct  phys_entry      *pp;
+#ifndef i386
+               int                     memattr;
+               vm_map_entry_t          entry;
+               vm_offset_t             laddr;
+               vm_offset_t             ldelta, hdelta;
+
                /* 
                 * do a pmap block mapping from the physical address
                 * in the object 
                 */
-               if(pp = pmap_find_physentry(
-                       (vm_offset_t)object->shadow_offset)) {
-                       memattr = ((pp->pte1 & 0x00000078) >> 3); 
-               } else {
-                       memattr = PTE_WIMG_UNCACHED_COHERENT_GUARDED;
+
+               /* While we do not worry about execution protection in   */
+               /* general, certian pages may have instruction execution */
+               /* disallowed.  We will check here, and if not allowed   */
+               /* to execute, we return with a protection failure.      */
+
+               if((full_fault_type & VM_PROT_EXECUTE) &&
+                       (pmap_canExecute((ppnum_t)
+                               (object->shadow_offset >> 12)) < 1)) {
+
+                       vm_map_verify_done(map, &version);
+                       if(pmap_map != map)
+                               vm_map_unlock(pmap_map);
+                       vm_fault_cleanup(object, top_page);
+                       vm_object_deallocate(object);
+                       kr = KERN_PROTECTION_FAILURE;
+                       goto done;
+               }
+
+               if(pmap_map != map) {
+                       vm_map_unlock(pmap_map);
+               }
+               if (original_map != map) {
+                       vm_map_unlock_read(map);
+                       vm_map_lock_read(original_map);
+                       map = original_map;
+               }
+               pmap_map = map;
+
+               laddr = vaddr;
+               hdelta = 0xFFFFF000;
+               ldelta = 0xFFFFF000;
+
+
+               while(vm_map_lookup_entry(map, laddr, &entry)) {
+                       if(ldelta > (laddr - entry->vme_start))
+                               ldelta = laddr - entry->vme_start;
+                       if(hdelta > (entry->vme_end - laddr))
+                               hdelta = entry->vme_end - laddr;
+                       if(entry->is_sub_map) {
+                               
+                               laddr = (laddr - entry->vme_start) 
+                                                       + entry->offset;
+                               vm_map_lock_read(entry->object.sub_map);
+                               if(map != pmap_map)
+                                       vm_map_unlock_read(map);
+                               if(entry->use_pmap) {
+                                       vm_map_unlock_read(pmap_map);
+                                       pmap_map = entry->object.sub_map;
+                               }
+                               map = entry->object.sub_map;
+                               
+                       } else {
+                               break;
+                       }
                }
 
-               pmap_map_block(pmap, vaddr, 
-                       (vm_offset_t)object->shadow_offset, 
-                       object->size, prot, 
-                       memattr, 0); /* Set up a block mapped area */
-//#else
-               vm_offset_t     off;
-               for (off = 0; off < object->size; off += page_size) {   
-                       pmap_enter(pmap, vaddr + off, 
-                               object->shadow_offset + off, prot, TRUE);
+               if(vm_map_lookup_entry(map, laddr, &entry) && 
+                                       (entry->object.vm_object != NULL) &&
+                                       (entry->object.vm_object == object)) {
+
+
+                       if(caller_pmap) {
+                               /* Set up a block mapped area */
+                               pmap_map_block(caller_pmap, 
+                                       (addr64_t)(caller_pmap_addr - ldelta), 
+                                       (((vm_offset_t)
+                                   (entry->object.vm_object->shadow_offset)) 
+                                       + entry->offset + 
+                                       (laddr - entry->vme_start) 
+                                                       - ldelta)>>12,
+                               ldelta + hdelta, prot, 
+                               (VM_WIMG_MASK & (int)object->wimg_bits), 0);
+                       } else { 
+                               /* Set up a block mapped area */
+                               pmap_map_block(pmap_map->pmap, 
+                                  (addr64_t)(vaddr - ldelta), 
+                                  (((vm_offset_t)
+                                   (entry->object.vm_object->shadow_offset)) 
+                                      + entry->offset + 
+                                      (laddr - entry->vme_start) - ldelta)>>12,
+                                  ldelta + hdelta, prot, 
+                                  (VM_WIMG_MASK & (int)object->wimg_bits), 0);
+                       }
+               }
+#else
+#ifdef notyet
+               if(caller_pmap) {
+                               pmap_enter(caller_pmap, caller_pmap_addr, 
+                               object->shadow_offset>>12, prot, 0, TRUE);
+               } else {
+                               pmap_enter(pmap, vaddr, 
+                               object->shadow_offset>>12, prot, 0, TRUE);
+               }
                        /* Map it in */
-               }
+#endif
 #endif
 
        }
@@ -2824,7 +2846,6 @@ FastPmapEnter:
         *      pageout daemon can find it.
         */
        if(m != VM_PAGE_NULL) {
-               vm_object_lock(m->object);
                vm_page_lock_queues();
 
                if (change_wiring) {
@@ -2871,18 +2892,21 @@ FastPmapEnter:
 #undef RELEASE_PAGE
 
     done:
+       if(write_startup_file)
+               tws_send_startup_info(current_task());
        if (funnel_set) {
                thread_funnel_set( curflock, TRUE);
                funnel_set = FALSE;
        }
-       cur_thread->interruptible = interruptible_state;
+       thread_interrupt_level(interruptible_state);
 
        KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_END,
                              vaddr,
-                             type_of_fault,
+                             type_of_fault & 0xff,
                              kr,
-                             0,
+                             type_of_fault >> 8,
                              0);
+
        return(kr);
 }
 
@@ -2895,7 +2919,8 @@ kern_return_t
 vm_fault_wire(
        vm_map_t        map,
        vm_map_entry_t  entry,
-       pmap_t          pmap)
+       pmap_t          pmap,
+       vm_offset_t     pmap_addr)
 {
 
        register vm_offset_t    va;
@@ -2904,13 +2929,20 @@ vm_fault_wire(
 
        assert(entry->in_transition);
 
+       if ((entry->object.vm_object != NULL) && 
+                       !entry->is_sub_map && 
+                       entry->object.vm_object->phys_contiguous) {
+               return KERN_SUCCESS;
+       }
+
        /*
         *      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.
         */
 
-       pmap_pageable(pmap, entry->vme_start, end_addr, FALSE);
+       pmap_pageable(pmap, pmap_addr, 
+               pmap_addr + (end_addr - entry->vme_start), FALSE);
 
        /*
         *      We simulate a fault to get the page and enter it
@@ -2919,9 +2951,13 @@ vm_fault_wire(
 
        for (va = entry->vme_start; va < end_addr; va += PAGE_SIZE) {
                if ((rc = vm_fault_wire_fast(
-                               map, va, entry, pmap)) != KERN_SUCCESS) {
+                       map, va, entry, pmap, 
+                       pmap_addr + (va - entry->vme_start)
+                       )) != KERN_SUCCESS) {
                        rc = vm_fault(map, va, VM_PROT_NONE, TRUE, 
-                                     (pmap == kernel_pmap) ? THREAD_UNINT : THREAD_ABORTSAFE);
+                               (pmap == kernel_pmap) ? 
+                                       THREAD_UNINT : THREAD_ABORTSAFE, 
+                               pmap, pmap_addr + (va - entry->vme_start));
                }
 
                if (rc != KERN_SUCCESS) {
@@ -2929,7 +2965,8 @@ vm_fault_wire(
 
                        /* unwire wired pages */
                        tmp_entry.vme_end = va;
-                       vm_fault_unwire(map, &tmp_entry, FALSE, pmap);
+                       vm_fault_unwire(map, 
+                               &tmp_entry, FALSE, pmap, pmap_addr);
 
                        return rc;
                }
@@ -2947,7 +2984,8 @@ vm_fault_unwire(
        vm_map_t        map,
        vm_map_entry_t  entry,
        boolean_t       deallocate,
-       pmap_t          pmap)
+       pmap_t          pmap,
+       vm_offset_t     pmap_addr)
 {
        register vm_offset_t    va;
        register vm_offset_t    end_addr = entry->vme_end;
@@ -2962,10 +3000,14 @@ vm_fault_unwire(
         */
 
        for (va = entry->vme_start; va < end_addr; va += PAGE_SIZE) {
-               pmap_change_wiring(pmap, va, FALSE);
+               pmap_change_wiring(pmap, 
+                       pmap_addr + (va - entry->vme_start), FALSE);
 
                if (object == VM_OBJECT_NULL) {
-                       (void) vm_fault(map, va, VM_PROT_NONE, TRUE, THREAD_UNINT);
+                       (void) vm_fault(map, va, VM_PROT_NONE, 
+                                       TRUE, THREAD_UNINT, pmap, pmap_addr);
+               } else if (object->phys_contiguous) {
+                       continue;
                } else {
                        vm_prot_t       prot;
                        vm_page_t       result_page;
@@ -3005,7 +3047,7 @@ vm_fault_unwire(
                        result_object = result_page->object;
                        if (deallocate) {
                                assert(!result_page->fictitious);
-                               pmap_page_protect(result_page->phys_addr,
+                               pmap_page_protect(result_page->phys_page,
                                                VM_PROT_NONE);
                                VM_PAGE_FREE(result_page);
                        } else {
@@ -3025,7 +3067,8 @@ vm_fault_unwire(
         *      such may be unwired themselves.
         */
 
-       pmap_pageable(pmap, entry->vme_start, end_addr, TRUE);
+       pmap_pageable(pmap, pmap_addr, 
+               pmap_addr + (end_addr - entry->vme_start), TRUE);
 
 }
 
@@ -3054,13 +3097,15 @@ vm_fault_wire_fast(
        vm_map_t        map,
        vm_offset_t     va,
        vm_map_entry_t  entry,
-       pmap_t          pmap)
+       pmap_t          pmap,
+       vm_offset_t     pmap_addr)
 {
        vm_object_t             object;
        vm_object_offset_t      offset;
        register vm_page_t      m;
        vm_prot_t               prot;
        thread_act_t            thr_act;
+       unsigned int            cache_attr;
 
        VM_STAT(faults++);
 
@@ -3181,30 +3226,15 @@ vm_fault_wire_fast(
         *      We have to unlock the object because pmap_enter
         *      may cause other faults.   
         */
-       if (m->no_isync) {
-               m->no_isync = FALSE;
-
-               vm_object_unlock(object);
-
-               PMAP_ENTER(pmap, va, m, prot, TRUE);
-
-               /* Sync I & D caches for new mapping */
-               pmap_attribute(pmap,
-                              va,
-                              PAGE_SIZE,
-                              MATTR_CACHE,
-                              &mv_cache_sync);
-               
-       } else {
-               vm_object_unlock(object);
+       if (m->no_isync == TRUE) {
+               pmap_sync_caches_phys(m->phys_page);
 
-               PMAP_ENTER(pmap, va, m, prot, TRUE);
+               m->no_isync = FALSE;
        }
 
-       /*
-        *      Must relock object so that paging_in_progress can be cleared.
-        */
-       vm_object_lock(object);
+       cache_attr = ((unsigned int)m->object->wimg_bits) & VM_WIMG_MASK;
+
+       PMAP_ENTER(pmap, pmap_addr, m, prot, cache_attr, TRUE);
 
        /*
         *      Unlock everything, and return
@@ -3664,11 +3694,12 @@ vm_fault_page_overwrite(
                                 */
 
                                if (!dst_object->pager_ready) {
-                                       vm_object_assert_wait(dst_object,
-                                               VM_OBJECT_EVENT_PAGER_READY,
-                                               interruptible);
+                                       wait_result = vm_object_assert_wait(dst_object,
+                                                               VM_OBJECT_EVENT_PAGER_READY,
+                                                               interruptible);
                                        vm_object_unlock(dst_object);
-                                       wait_result = thread_block((void (*)(void))0);
+                                       if (wait_result == THREAD_WAITING)
+                                               wait_result = thread_block(THREAD_CONTINUE_NULL);
                                        if (wait_result != THREAD_AWAKENED) {
                                                DISCARD_PAGE;
                                                return(VM_FAULT_INTERRUPTED);
@@ -3706,9 +3737,10 @@ vm_fault_page_overwrite(
                                break;
                }
 
-               PAGE_ASSERT_WAIT(dst_page, interruptible);
+               wait_result = PAGE_ASSERT_WAIT(dst_page, interruptible);
                vm_object_unlock(dst_object);
-               wait_result = thread_block((void (*)(void))0);
+               if (wait_result == THREAD_WAITING)
+                       wait_result = thread_block(THREAD_CONTINUE_NULL);
                if (wait_result != THREAD_AWAKENED) {
                        DISCARD_PAGE;
                        return(VM_FAULT_INTERRUPTED);