xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / pcb.c

diff --git a/osfmk/ppc/pcb.c b/osfmk/ppc/pcb.c
index 8354f64191e3c7df9dc7cc67fb4e0274562b4a13..38569fc947db92cdb320671a5e6d1b8901629837 100644 (file)
--- a/osfmk/ppc/pcb.c
+++ b/osfmk/ppc/pcb.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -47,37 +50,44 @@
  *     Utah $Hdr: pcb.c 1.23 92/06/27$
  */
 
  *     Utah $Hdr: pcb.c 1.23 92/06/27$
  */
 

-#include <cpus.h>

 #include <debug.h>
 
 #include <types.h>
 #include <debug.h>
 
 #include <types.h>

+
+#include <mach/mach_types.h>
+#include <mach/thread_status.h>
+
+#include <kern/kern_types.h>

 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/thread.h>

-#include <kern/thread_act.h>
-#include <kern/thread_swap.h>
-#include <mach/thread_status.h>
-#include <vm/vm_kern.h>
+#include <kern/misc_protos.h>

 #include <kern/mach_param.h>
 #include <kern/mach_param.h>

+#include <kern/spl.h>
+#include <kern/machine.h>
+
+#include <vm/vm_map.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_protos.h>

 
 

-#include <kern/misc_protos.h>

 #include <ppc/misc_protos.h>
 #include <ppc/misc_protos.h>

+#include <ppc/cpu_internal.h>

 #include <ppc/exception.h>
 #include <ppc/proc_reg.h>
 #include <ppc/exception.h>
 #include <ppc/proc_reg.h>

-#include <kern/spl.h>

 #include <ppc/pmap.h>
 #include <ppc/trap.h>
 #include <ppc/mappings.h>
 #include <ppc/savearea.h>
 #include <ppc/Firmware.h>
 #include <ppc/asm.h>
 #include <ppc/pmap.h>
 #include <ppc/trap.h>
 #include <ppc/mappings.h>
 #include <ppc/savearea.h>
 #include <ppc/Firmware.h>
 #include <ppc/asm.h>

-#include <ppc/thread_act.h>
+#include <ppc/thread.h>

 #include <ppc/vmachmon.h>
 #include <ppc/low_trace.h>
 #include <ppc/vmachmon.h>
 #include <ppc/low_trace.h>

+#include <ppc/lowglobals.h>
+#include <ppc/fpu_protos.h>

 
 #include <sys/kdebug.h>
 
 
 #include <sys/kdebug.h>
 

-extern int             real_ncpus;                                             /* Number of actual CPUs */
-extern struct  Saveanchor saveanchor;                  /* Aliged savearea anchor */
+void   machine_act_terminate(thread_t);

 
 /*
  * These constants are dumb. They should not be in asm.h!
 
 /*
  * These constants are dumb. They should not be in asm.h!


@@ -92,101 +102,46 @@ int   vec_trap_count = 0;
 int   vec_switch_count = 0;
 #endif
 
 int   vec_switch_count = 0;
 #endif
 

-extern struct thread_shuttle   *Switch_context(
-                                       struct thread_shuttle   *old,
-                                       void                    (*cont)(void),
-                                       struct thread_shuttle   *new);
-
-
-#if    MACH_LDEBUG || MACH_KDB
-void           log_thread_action (char *, long, long, long);
-#endif
-
-

 /*
  * consider_machine_collect: try to collect machine-dependent pages
  */
 void
 /*
  * consider_machine_collect: try to collect machine-dependent pages
  */
 void

-consider_machine_collect()
+consider_machine_collect(void)

 {
     /*
 {
     /*

-     * none currently available
+     * XXX none currently available

      */
      */

-       return;

 }
 
 void
 }
 
 void

-consider_machine_adjust()
+consider_machine_adjust(void)

 {
         consider_mapping_adjust();
 }
 
 {
         consider_mapping_adjust();
 }
 

-
-/*
- * stack_attach: Attach a kernel stack to a thread.
- */
-void
-machine_kernel_stack_init(
-       struct thread_shuttle *thread,
-       void            (*start_pos)(thread_t))
-{
-    vm_offset_t        stack;
-    unsigned int                       *kss, *stck;
-       struct savearea                 *sv;
-
-    assert(thread->top_act->mact.pcb);
-    assert(thread->kernel_stack);
-    stack = thread->kernel_stack;
-
-       kss = (unsigned int *)STACK_IKS(stack);
-       sv = thread->top_act->mact.pcb;                                         /* This for the sake of C */
-
-       sv->save_lr = (uint64_t) start_pos;                                     /* Set up the execution address */
-       sv->save_srr0 = (uint64_t) start_pos;                           /* Here too */
-       sv->save_srr1  = MSR_SUPERVISOR_INT_OFF;                        /* Set the normal running MSR */
-       stck = (unsigned int *)((unsigned int)kss - KF_SIZE);   /* Point to the top frame */
-       sv->save_r1 = (uint64_t)stck;                                           /* Point to the top frame on the stack */
-       sv->save_fpscr = 0;                                                                     /* Clear all floating point exceptions */
-       sv->save_vrsave = 0;                                                            /* Set the vector save state */
-       sv->save_vscr[3] = 0x00010000;                                          /* Supress java mode */
-
-       *stck = 0;                                                                                      /* Zero the frame backpointer */
-       thread->top_act->mact.ksp = 0;                                          /* Show that the kernel stack is in use already */
-
-}
-

 /*
  * switch_context: Switch from one thread to another, needed for
  *                switching of space
  * 
  */
 /*
  * switch_context: Switch from one thread to another, needed for
  *                switching of space
  * 
  */

-struct thread_shuttle*
-switch_context(
-       struct thread_shuttle *old,
-       void (*continuation)(void),
-       struct thread_shuttle *new)
+thread_t
+machine_switch_context(
+       thread_t                        old,
+       thread_continue_t       continuation,
+       thread_t                        new)

 {
 {

-       register thread_act_t old_act = old->top_act, new_act = new->top_act;
-       register struct thread_shuttle* retval;
+       register thread_t retval;

        pmap_t  new_pmap;
        facility_context *fowner;
        struct per_proc_info *ppinfo;
        pmap_t  new_pmap;
        facility_context *fowner;
        struct per_proc_info *ppinfo;

-       
-       
-#if    MACH_LDEBUG || MACH_KDB
-       log_thread_action("switch", 
-                         (long)old, 
-                         (long)new, 
-                         (long)__builtin_return_address(0));
-#endif
+
+       if (old == new)
+               panic("machine_switch_context");

 
        ppinfo = getPerProc();                                                          /* Get our processor block */
 
        ppinfo->old_thread = (unsigned int)old;
 
        ppinfo = getPerProc();                                                          /* Get our processor block */
 
        ppinfo->old_thread = (unsigned int)old;

-       ppinfo->cpu_flags &= ~traceBE;                                           /* disable branch tracing if on */

               
               

-       check_simple_locks();
-

        /* Our context might wake up on another processor, so we must
         * not keep hot state in our FPU, it must go back to the pcb
         * so that it can be found by the other if needed
        /* Our context might wake up on another processor, so we must
         * not keep hot state in our FPU, it must go back to the pcb
         * so that it can be found by the other if needed


@@ -194,13 +149,13 @@ switch_context(
        if(real_ncpus > 1) {                                                            /* This is potentially slow, so only do when actually SMP */
                fowner = ppinfo->FPU_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */
        if(real_ncpus > 1) {                                                            /* This is potentially slow, so only do when actually SMP */
                fowner = ppinfo->FPU_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */

-                       if(fowner->facAct == old->top_act) {            /* Is it for us? */
+                       if(fowner->facAct == old) {             /* Is it for us? */

                                fpu_save(fowner);                                               /* Yes, save it */
                        }
                }
                fowner = ppinfo->VMX_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */
                                fpu_save(fowner);                                               /* Yes, save it */
                        }
                }
                fowner = ppinfo->VMX_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */

-                       if(fowner->facAct == old->top_act) {            /* Is it for us? */
+                       if(fowner->facAct == old) {             /* Is it for us? */

                                vec_save(fowner);                                               /* Yes, save it */
                        }
                }
                                vec_save(fowner);                                               /* Yes, save it */
                        }
                }


@@ -210,50 +165,41 @@ switch_context(
         * If old thread is running VM, save per proc userProtKey and FamVMmode spcFlags bits in the thread spcFlags
         * This bits can be modified in the per proc without updating the thread spcFlags
         */
         * If old thread is running VM, save per proc userProtKey and FamVMmode spcFlags bits in the thread spcFlags
         * This bits can be modified in the per proc without updating the thread spcFlags
         */

-       if(old_act->mact.specFlags & runningVM) {
-               old_act->mact.specFlags &=  ~(userProtKey|FamVMmode);
-               old_act->mact.specFlags |= (ppinfo->spcFlags) & (userProtKey|FamVMmode);
+       if(old->machine.specFlags & runningVM) {
+               old->machine.specFlags &=  ~(userProtKey|FamVMmode);
+               old->machine.specFlags |= (ppinfo->spcFlags) & (userProtKey|FamVMmode);

        }
        }

+       old->machine.specFlags &= ~OnProc;
+       new->machine.specFlags |= OnProc;

 
        /*
         * We do not have to worry about the PMAP module, so switch.
         *
 
        /*
         * We do not have to worry about the PMAP module, so switch.
         *

-        * We must not use top_act->map since this may not be the actual
+        * We must not use thread->map since this may not be the actual

         * task map, but the map being used for a klcopyin/out.
         */
 
         * task map, but the map being used for a klcopyin/out.
         */
 

-       if(new_act->mact.specFlags & runningVM) {                       /* Is the new guy running a VM? */
-               pmap_switch(new_act->mact.vmmCEntry->vmmPmap);  /* Switch to the VM's pmap */
-               ppinfo->VMMareaPhys = new_act->mact.vmmCEntry->vmmContextPhys;
-               ppinfo->VMMXAFlgs = new_act->mact.vmmCEntry->vmmXAFlgs;
-               ppinfo->FAMintercept = new_act->mact.vmmCEntry->vmmFAMintercept;
+       if(new->machine.specFlags & runningVM) {                        /* Is the new guy running a VM? */
+               pmap_switch(new->machine.vmmCEntry->vmmPmap);   /* Switch to the VM's pmap */
+               ppinfo->VMMareaPhys = new->machine.vmmCEntry->vmmContextPhys;
+               ppinfo->VMMXAFlgs = new->machine.vmmCEntry->vmmXAFlgs;
+               ppinfo->FAMintercept = new->machine.vmmCEntry->vmmFAMintercept;

        }
        else {                                                                                          /* otherwise, we use the task's pmap */
        }
        else {                                                                                          /* otherwise, we use the task's pmap */

-               new_pmap = new_act->task->map->pmap;
-               if ((old_act->task->map->pmap != new_pmap) || (old_act->mact.specFlags & runningVM)) {
+               new_pmap = new->task->map->pmap;
+               if ((old->task->map->pmap != new_pmap) || (old->machine.specFlags & runningVM)) {

                        pmap_switch(new_pmap);                                          /* Switch if there is a change */
                }
        }
 
                        pmap_switch(new_pmap);                                          /* Switch if there is a change */
                }
        }
 

-       if(old_act->mact.cioSpace != invalSpace) {                      /* Does our old guy have an active copyin/out? */
-               old_act->mact.cioSpace |= cioSwitchAway;                /* Show we switched away from this guy */
-               hw_blow_seg(copyIOaddr);                                                /* Blow off the first segment */
-               hw_blow_seg(copyIOaddr + 0x10000000ULL);                /* Blow off the second segment */
+       if(old->machine.umwSpace != invalSpace) {                       /* Does our old guy have an active window? */
+               old->machine.umwSpace |= umwSwitchAway;                 /* Show we switched away from this guy */
+               hw_blow_seg(lowGlo.lgUMWvaddr);                                 /* Blow off the first segment */
+               hw_blow_seg(lowGlo.lgUMWvaddr + 0x10000000ULL); /* Blow off the second segment */

        }
 
        }
 

-       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED,MACH_SCHED) | DBG_FUNC_NONE,
-                    (int)old, (int)new, old->sched_pri, new->sched_pri, 0);
-
-/*     *********** SWITCH HERE **************/

        retval = Switch_context(old, continuation, new);
        retval = Switch_context(old, continuation, new);

-       assert(retval != (struct thread_shuttle*)NULL);
-/*     *********** SWITCH HERE **************/
-
-
-       if (branch_tracing_enabled()) {
-               ppinfo = getPerProc();                                                  /* Get our processor block */
-               ppinfo->cpu_flags |= traceBE;                                   /* restore branch tracing */
-       }
+       assert(retval != NULL);

 
        /* We've returned from having switched context, so we should be
         * back in the original context.
 
        /* We've returned from having switched context, so we should be
         * back in the original context.


@@ -262,49 +208,32 @@ switch_context(
        return retval;
 }
 
        return retval;
 }
 

-/*
- * Alter the thread's state so that a following thread_exception_return
- * will make the thread return 'retval' from a syscall.
- */
-void
-thread_set_syscall_return(
-       struct thread_shuttle *thread,
-       kern_return_t   retval)
-{
-
-        thread->top_act->mact.pcb->save_r3 = retval;
-}
-

 /*
  * Initialize the machine-dependent state for a new thread.
  */
 kern_return_t
 /*
  * Initialize the machine-dependent state for a new thread.
  */
 kern_return_t

-thread_machine_create(
-                     struct thread_shuttle *thread,
-                     thread_act_t thr_act,
-                     void (*start_pos)(thread_t))
+machine_thread_create(
+       thread_t                thread,
+       task_t                  task)

 {
 {

+       struct savearea         *sv;                                                                    /* Pointer to newly allocated savearea */

 
 

-       savearea                *sv;                                                                    /* Pointer to newly allocated savearea */
-       unsigned int    *CIsTooLimited, i;
-
-
-       hw_atomic_add(&saveanchor.savetarget, 4);                               /* Account for the number of saveareas we think we "need"
+       (void)hw_atomic_add(&saveanchor.savetarget, 4); /* Account for the number of saveareas we think we "need"

                                                                                                                           for this activation */
                                                                                                                           for this activation */

-       assert(thr_act->mact.pcb == (savearea *)0);                             /* Make sure there was no previous savearea */
+       assert(thread->machine.pcb == (struct savearea *)0);                            /* Make sure there was no previous savearea */

        
        sv = save_alloc();                                                                              /* Go get us a savearea */
                
        
        sv = save_alloc();                                                                              /* Go get us a savearea */
                

-       bzero((char *)((unsigned int)sv + sizeof(savearea_comm)), (sizeof(savearea) - sizeof(savearea_comm)));  /* Clear it */
+       bzero((char *)((unsigned int)sv + sizeof(savearea_comm)), (sizeof(struct savearea) - sizeof(savearea_comm)));   /* Clear it */

                
        sv->save_hdr.save_prev = 0;                                                             /* Clear the back pointer */
        sv->save_hdr.save_flags = (sv->save_hdr.save_flags & ~SAVtype) | (SAVgeneral << SAVtypeshft);   /* Mark as in use */
                
        sv->save_hdr.save_prev = 0;                                                             /* Clear the back pointer */
        sv->save_hdr.save_flags = (sv->save_hdr.save_flags & ~SAVtype) | (SAVgeneral << SAVtypeshft);   /* Mark as in use */

-       sv->save_hdr.save_act = thr_act;                                                /* Set who owns it */
-       thr_act->mact.pcb = sv;                                                                 /* Point to the save area */
-       thr_act->mact.curctx = &thr_act->mact.facctx;                   /* Initialize facility context */
-       thr_act->mact.facctx.facAct = thr_act;                                  /* Initialize facility context pointer to activation */
-       thr_act->mact.cioSpace = invalSpace;                                    /* Initialize copyin/out space to invalid */
-       thr_act->mact.preemption_count = 0;                                             /* Initialize preemption counter */
+       sv->save_hdr.save_act = thread; /* Set who owns it */
+       thread->machine.pcb = sv;                                                                       /* Point to the save area */
+       thread->machine.curctx = &thread->machine.facctx;                       /* Initialize facility context */
+       thread->machine.facctx.facAct = thread;                                         /* Initialize facility context pointer to activation */
+       thread->machine.umwSpace = invalSpace;                                          /* Initialize user memory window space to invalid */
+       thread->machine.preemption_count = 0;                                           /* Initialize preemption counter */

 
        /*
         * User threads will pull their context from the pcb when first
 
        /*
         * User threads will pull their context from the pcb when first


@@ -313,7 +242,9 @@ thread_machine_create(
         * at the base of the kernel stack (see stack_attach()).
         */
 
         * at the base of the kernel stack (see stack_attach()).
         */
 

+       thread->machine.upcb = sv;                                                              /* Set user pcb */

        sv->save_srr1 = (uint64_t)MSR_EXPORT_MASK_SET;                  /* Set the default user MSR */
        sv->save_srr1 = (uint64_t)MSR_EXPORT_MASK_SET;                  /* Set the default user MSR */

+       if(task_has_64BitAddr(task)) sv->save_srr1 |= (uint64_t)MASK32(MSR_SF) << 32;   /* If 64-bit task, force 64-bit mode */

        sv->save_fpscr = 0;                                                                             /* Clear all floating point exceptions */
        sv->save_vrsave = 0;                                                                    /* Set the vector save state */
        sv->save_vscr[0] = 0x00000000;                                  
        sv->save_fpscr = 0;                                                                             /* Clear all floating point exceptions */
        sv->save_vrsave = 0;                                                                    /* Set the vector save state */
        sv->save_vscr[0] = 0x00000000;                                  


@@ -328,117 +259,90 @@ thread_machine_create(
  * Machine-dependent cleanup prior to destroying a thread
  */
 void
  * Machine-dependent cleanup prior to destroying a thread
  */
 void

-thread_machine_destroy( thread_t thread )
-{
-       spl_t s;
-
-       if (thread->kernel_stack) {
-               s = splsched();
-               stack_free(thread);
-               splx(s);
-       }
-}
-
-/*
- * flush out any lazily evaluated HW state in the
- * owning thread's context, before termination.
- */
-void
-thread_machine_flush( thread_act_t cur_act )
+machine_thread_destroy(
+       thread_t                thread)

 {
 {

-}
+       struct savearea *local_pcb, *ppsv;
+       savearea_vec *vsv, *vpsv;
+       savearea_fpu *fsv, *fpsv;
+       boolean_t intr;

 
 /*
 
 /*

- * Number of times we needed to swap an activation back in before
- * switching to it.
+ *     This function will release all context.

  */
  */

-int switch_act_swapins = 0;

 
 

+       machine_act_terminate(thread);                                                  /* Make sure all virtual machines are dead first */
+ 

 /*
 /*

- * machine_switch_act

  *
  *

- * Machine-dependent details of activation switching.  Called with
- * RPC locks held and preemption disabled.
+ *     Walk through and release all floating point and vector contexts. Also kill live context.
+ *

  */
  */

-void
-machine_switch_act( 
-       thread_t        thread,
-       thread_act_t    old,
-       thread_act_t    new,
-       int                             cpu)
-{
-       pmap_t          new_pmap;
-       facility_context *fowner;
-       struct per_proc_info *ppinfo;
-       
-       ppinfo = getPerProc();                                                          /* Get our processor block */
-
-       /* Our context might wake up on another processor, so we must
-        * not keep hot state in our FPU, it must go back to the pcb
-        * so that it can be found by the other if needed
-        */
-       if(real_ncpus > 1) {                                                            /* This is potentially slow, so only do when actually SMP */
-               fowner = ppinfo->FPU_owner;                                             /* Cache this because it may change */
-               if(fowner) {                                                                    /* Is there any live context? */
-                       if(fowner->facAct == old) {                                     /* Is it for us? */
-                               fpu_save(fowner);                                               /* Yes, save it */
-                       }
-               }
-               fowner = ppinfo->VMX_owner;                                             /* Cache this because it may change */
-               if(fowner) {                                                                    /* Is there any live context? */
-                       if(fowner->facAct == old) {                                     /* Is it for us? */
-                               vec_save(fowner);                                               /* Yes, save it */
-                       }
-               }
-       }
-
-       old->mact.cioSpace |= cioSwitchAway;                            /* Show we switched away from this guy */
-
-       active_stacks[cpu] = thread->kernel_stack;
-
-       ast_context(new, cpu);

 
 

-       /* Activations might have different pmaps 
-        * (process->kernel->server, for example).
-        * Change space if needed
-        */
+       intr = ml_set_interrupts_enabled(FALSE);                                /* Disable for interruptions */
+ 
+       toss_live_vec(thread->machine.curctx);                                  /* Dump live vectors */

 
 

-       if(new->mact.specFlags & runningVM) {                           /* Is the new guy running a VM? */
-               pmap_switch(new->mact.vmmCEntry->vmmPmap);              /* Switch to the VM's pmap */
+       vsv = thread->machine.curctx->VMXsave;                                  /* Get the top vector savearea */
+       
+       while(vsv) {                                                                                    /* Any VMX saved state? */
+               vpsv = vsv;                                                                                     /* Remember so we can toss this */
+               /* XXX save_prev should be a void * 4425537 */
+               vsv = CAST_DOWN(savearea_vec *, vsv->save_hdr.save_prev);  /* Get one underneath our's */
+               save_release((struct savearea *)vpsv);                                          /* Release it */

        }
        }

-       else {                                                                                          /* otherwise, we use the task's pmap */
-               new_pmap = new->task->map->pmap;
-               if ((old->task->map->pmap != new_pmap)  || (old->mact.specFlags & runningVM)) {
-                       pmap_switch(new_pmap);
-               }
+       
+       thread->machine.curctx->VMXsave = NULL;                                 /* Kill chain */
+ 
+       toss_live_fpu(thread->machine.curctx);                                  /* Dump live float */
+
+       fsv = thread->machine.curctx->FPUsave;                                  /* Get the top float savearea */
+       
+       while(fsv) {                                                                                    /* Any float saved state? */
+               fpsv = fsv;                                                                                     /* Remember so we can toss this */
+               /* XXX save_prev should be a void * 4425537 */
+               fsv = CAST_DOWN(savearea_fpu *, fsv->save_hdr.save_prev);   /* Get one underneath our's */
+               save_release((struct savearea *)fpsv);                                          /* Release it */

        }
        }

+       
+       thread->machine.curctx->FPUsave = NULL;                                 /* Kill chain */

 
 

+/*
+ * free all regular saveareas.
+ */

 
 

-}
+       local_pcb = thread->machine.pcb;                                                                /* Get the general savearea */
+       
+       while(local_pcb) {                                                                                      /* Any float saved state? */
+               ppsv = local_pcb;                                                                                       /* Remember so we can toss this */
+               /* XXX save_prev should be a void * 4425537 */
+               local_pcb = CAST_DOWN(struct savearea *, local_pcb->save_hdr.save_prev);  /* Get one underneath our's */ 
+               save_release(ppsv);                                                                     /* Release it */
+       }
+       
+       (void)hw_atomic_sub(&saveanchor.savetarget, 4); /* Unaccount for the number of saveareas we think we "need" */

 
 

-void
-pcb_user_to_kernel(thread_act_t act)
-{
+       (void) ml_set_interrupts_enabled(intr);                                 /* Restore interrupts if enabled */

 
 

-       return;                                                                                         /* Not needed, I hope... */

 }
 
 }
 

-

 /*
  * act_machine_sv_free
 /*
  * act_machine_sv_free

- * release saveareas associated with an act. if flag is true, release
+ * release saveareas associated with a thread. if flag is true, release

  * user level savearea(s) too, else don't
  *
  * user level savearea(s) too, else don't
  *

- * this code cannot block so we call the proper save area free routine
+ * This code must run with interruptions disabled because an interrupt handler
+ * could use floating point and/or vectors.  If this happens and the thread we
+ * are blowing off owns the facility, we can deadlock.

  */
 void
  */
 void

-act_machine_sv_free(thread_act_t act)
+act_machine_sv_free(thread_t act,  __unused int flag)

 {
 {

-       register savearea *pcb, *userpcb;
+       struct savearea *local_pcb, *userpcb;

        register savearea_vec *vsv, *vpst, *vsvt;
        register savearea_fpu *fsv, *fpst, *fsvt;
        register savearea_vec *vsv, *vpst, *vsvt;
        register savearea_fpu *fsv, *fpst, *fsvt;

-       register savearea *svp;
-       register int i;
+       struct savearea *svp;
+       boolean_t intr;

 
 /*
  *     This function will release all non-user state context.
 
 /*
  *     This function will release all non-user state context.


@@ -458,55 +362,62 @@ act_machine_sv_free(thread_act_t act)
  *     Then we unlock.  Next, all of the old kernel contexts are released.
  *
  */
  *     Then we unlock.  Next, all of the old kernel contexts are released.
  *
  */

- 
-       if(act->mact.curctx->VMXlevel) {                                                /* Is the current level user state? */
-               
-               toss_live_vec(act->mact.curctx);                                        /* Dump live vectors if is not user */

 
 

-               vsv = act->mact.curctx->VMXsave;                                        /* Get the top vector savearea */
+       intr = ml_set_interrupts_enabled(FALSE);                                /* Disable for interruptions */
+
+       if(act->machine.curctx->VMXlevel) {                                             /* Is the current level user state? */
+               
+               toss_live_vec(act->machine.curctx);                                     /* Dump live vectors if is not user */

                
                

-               while(vsv && vsv->save_hdr.save_level) vsv = (savearea_vec *)vsv->save_hdr.save_prev;   /* Find user context if any */
-       
-               if(!hw_lock_to((hw_lock_t)&act->mact.curctx->VMXsync, LockTimeOut)) {   /* Get the sync lock */ 
+               if(!hw_lock_to((hw_lock_t)&act->machine.curctx->VMXsync, LockTimeOut)) {        /* Get the sync lock */ 

                        panic("act_machine_sv_free - timeout getting VMX sync lock\n"); /* Tell all and die */
                }
                        panic("act_machine_sv_free - timeout getting VMX sync lock\n"); /* Tell all and die */
                }

+       
+               vsv = act->machine.curctx->VMXsave;                                     /* Get the top vector savearea */
+               while(vsv && vsv->save_hdr.save_level)  /* Find user context if any */
+                       /* XXX save_prev should be a void * 4425537 */
+                       vsv = CAST_DOWN(savearea_vec *,
+                                       vsv->save_hdr.save_prev);

                
                

-               vsvt = act->mact.curctx->VMXsave;                                       /* Get the top of the chain */
-               act->mact.curctx->VMXsave = vsv;                                        /* Point to the user context */
-               act->mact.curctx->VMXlevel = 0;                                         /* Set the level to user */
-               hw_lock_unlock((hw_lock_t)&act->mact.curctx->VMXsync);  /* Unlock */
+               vsvt = act->machine.curctx->VMXsave;                            /* Get the top of the chain */
+               act->machine.curctx->VMXsave = vsv;                                     /* Point to the user context */
+               act->machine.curctx->VMXlevel = NULL;                                   /* Set the level to user */
+               hw_lock_unlock((hw_lock_t)&act->machine.curctx->VMXsync);       /* Unlock */

                
                while(vsvt) {                                                                           /* Clear any VMX saved state */
                        if (vsvt == vsv) break;                                                 /* Done when hit user if any */
                        vpst = vsvt;                                                                    /* Remember so we can toss this */
                
                while(vsvt) {                                                                           /* Clear any VMX saved state */
                        if (vsvt == vsv) break;                                                 /* Done when hit user if any */
                        vpst = vsvt;                                                                    /* Remember so we can toss this */

-                       vsvt = (savearea_vec *)vsvt->save_hdr.save_prev;        /* Get one underneath our's */          
-                       save_ret((savearea *)vpst);                                             /* Release it */
+                       /* XXX save_prev should be a void * 4425537 */
+                       vsvt = CAST_DOWN(savearea_vec *, vsvt->save_hdr.save_prev);     /* Get one underneath our's */          
+                       save_ret((struct savearea *)vpst);                                              /* Release it */

                }
                
        }
  
                }
                
        }
  

-       if(act->mact.curctx->FPUlevel) {                                                /* Is the current level user state? */
+       if(act->machine.curctx->FPUlevel) {                                             /* Is the current level user state? */

                
                

-               toss_live_fpu(act->mact.curctx);                                        /* Dump live floats if is not user */
+               toss_live_fpu(act->machine.curctx);                                     /* Dump live floats if is not user */

 
 

-               fsv = act->mact.curctx->FPUsave;                                        /* Get the top floats savearea */
-               
-               while(fsv && fsv->save_hdr.save_level) fsv = (savearea_fpu *)fsv->save_hdr.save_prev;   /* Find user context if any */
-       
-               if(!hw_lock_to((hw_lock_t)&act->mact.curctx->FPUsync, LockTimeOut)) {   /* Get the sync lock */ 
+               if(!hw_lock_to((hw_lock_t)&act->machine.curctx->FPUsync, LockTimeOut)) {        /* Get the sync lock */ 

                        panic("act_machine_sv_free - timeout getting FPU sync lock\n"); /* Tell all and die */
                }
                
                        panic("act_machine_sv_free - timeout getting FPU sync lock\n"); /* Tell all and die */
                }
                

-               fsvt = act->mact.curctx->FPUsave;                                       /* Get the top of the chain */
-               act->mact.curctx->FPUsave = fsv;                                        /* Point to the user context */
-               act->mact.curctx->FPUlevel = 0;                                         /* Set the level to user */
-               hw_lock_unlock((hw_lock_t)&act->mact.curctx->FPUsync);  /* Unlock */
+               fsv = act->machine.curctx->FPUsave;                                     /* Get the top floats savearea */
+               while(fsv && fsv->save_hdr.save_level)  /* Find user context if any */
+                       /* XXX save_prev should be a void * */
+                       fsv = CAST_DOWN(savearea_fpu *, fsv->save_hdr.save_prev);
+               
+               fsvt = act->machine.curctx->FPUsave;                            /* Get the top of the chain */
+               act->machine.curctx->FPUsave = fsv;                                     /* Point to the user context */
+               act->machine.curctx->FPUlevel = NULL;                                   /* Set the level to user */
+               hw_lock_unlock((hw_lock_t)&act->machine.curctx->FPUsync);       /* Unlock */

                
                while(fsvt) {                                                                           /* Clear any VMX saved state */
                        if (fsvt == fsv) break;                                                 /* Done when hit user if any */
                        fpst = fsvt;                                                                    /* Remember so we can toss this */
                
                while(fsvt) {                                                                           /* Clear any VMX saved state */
                        if (fsvt == fsv) break;                                                 /* Done when hit user if any */
                        fpst = fsvt;                                                                    /* Remember so we can toss this */

-                       fsvt = (savearea_fpu *)fsvt->save_hdr.save_prev;        /* Get one underneath our's */          
-                       save_ret((savearea *)fpst);                                             /* Release it */
+                       /* XXX save_prev should be a void * 4425537 */
+                       fsvt = CAST_DOWN(savearea_fpu *, fsvt->save_hdr.save_prev);     /* Get one underneath our's */          
+                       save_ret((struct savearea *)fpst);                                              /* Release it */

                }
                
        }
                }
                
        }


@@ -515,173 +426,46 @@ act_machine_sv_free(thread_act_t act)
  * free all regular saveareas except a user savearea, if any
  */
 
  * free all regular saveareas except a user savearea, if any
  */
 

-       pcb = act->mact.pcb;                                                                    /* Get the general savearea */
-       userpcb = 0;                                                                                    /* Assume no user context for now */
+       local_pcb = act->machine.pcb;                                                                   /* Get the general savearea */
+       userpcb = NULL;                                                                                 /* Assume no user context for now */

        
        

-       while(pcb) {                                                                                    /* Any float saved state? */
-               if (pcb->save_srr1 & MASK(MSR_PR)) {                            /* Is this a user savearea? */
-                       userpcb = pcb;                                                                  /* Remember so we can toss this */
+       while(local_pcb) {                                                                                      /* Any float saved state? */
+               if (local_pcb->save_srr1 & MASK(MSR_PR)) {                              /* Is this a user savearea? */
+                       userpcb = local_pcb;                                                                    /* Remember so we can toss this */

                        break;
                }
                        break;
                }

-               svp = pcb;                                                                                      /* Remember this */
-               pcb = pcb->save_hdr.save_prev;                                          /* Get one underneath our's */          
+               svp = local_pcb;                                                                                        /* Remember this */
+               /* XXX save_prev should be a void * 4425537 */
+               local_pcb = CAST_DOWN(struct savearea *, local_pcb->save_hdr.save_prev);  /* Get one underneath our's */ 

                save_ret(svp);                                                                          /* Release it */
        }
        
                save_ret(svp);                                                                          /* Release it */
        }
        

-       act->mact.pcb = userpcb;                                                                /* Chain in the user if there is one, or 0 if not */
-       
-}
+       act->machine.pcb = userpcb;                                                             /* Chain in the user if there is one, or 0 if not */
+       (void) ml_set_interrupts_enabled(intr);                                 /* Restore interrupts if enabled */

 
 

+}

 
 

-/*
- * act_virtual_machine_destroy:
- * Shutdown any virtual machines associated with a thread
- */

 void
 void

-act_virtual_machine_destroy(thread_act_t act)
+machine_act_terminate(
+       thread_t        act)

 {
 {

-       if(act->mact.bbDescAddr) {                                                              /* Check if the Blue box assist is active */
+       if(act->machine.bbDescAddr) {                                                   /* Check if the Blue box assist is active */

                disable_bluebox_internal(act);                                          /* Kill off bluebox */
        }
        
                disable_bluebox_internal(act);                                          /* Kill off bluebox */
        }
        

-       if(act->mact.vmmControl) {                                                              /* Check if VMM is active */
+       if(act->machine.vmmControl) {                                                   /* Check if VMM is active */

                vmm_tear_down_all(act);                                                         /* Kill off all VMM contexts */
        }
 }
 
                vmm_tear_down_all(act);                                                         /* Kill off all VMM contexts */
        }
 }
 

-/*
- * act_machine_destroy: Shutdown any state associated with a thread pcb.
- */

 void
 void

-act_machine_destroy(thread_act_t act)
+machine_thread_terminate_self(void)

 {
 {

-
-       register savearea *pcb, *ppsv;
-       register savearea_vec *vsv, *vpsv;
-       register savearea_fpu *fsv, *fpsv;
-       register savearea *svp;
-       register int i;
-
-/*
- *     This function will release all context.
- */
-
-       act_virtual_machine_destroy(act);                                               /* Make sure all virtual machines are dead first */
- 
-/*
- *
- *     Walk through and release all floating point and vector contexts. Also kill live context.
- *
- */
- 
-       toss_live_vec(act->mact.curctx);                                                /* Dump live vectors */
-
-       vsv = act->mact.curctx->VMXsave;                                                /* Get the top vector savearea */
-       
-       while(vsv) {                                                                                    /* Any VMX saved state? */
-               vpsv = vsv;                                                                                     /* Remember so we can toss this */
-               vsv = (savearea_vec *)vsv->save_hdr.save_prev;          /* Get one underneath our's */          
-               save_release((savearea *)vpsv);                                         /* Release it */
-       }
-       
-       act->mact.curctx->VMXsave = 0;                                                  /* Kill chain */
- 
-       toss_live_fpu(act->mact.curctx);                                                /* Dump live float */
-
-       fsv = act->mact.curctx->FPUsave;                                                /* Get the top float savearea */
-       
-       while(fsv) {                                                                                    /* Any float saved state? */
-               fpsv = fsv;                                                                                     /* Remember so we can toss this */
-               fsv = (savearea_fpu *)fsv->save_hdr.save_prev;          /* Get one underneath our's */          
-               save_release((savearea *)fpsv);                                         /* Release it */
-       }
-       
-       act->mact.curctx->FPUsave = 0;                                                  /* Kill chain */
-
-/*
- * free all regular saveareas.
- */
-
-       pcb = act->mact.pcb;                                                                    /* Get the general savearea */
-       
-       while(pcb) {                                                                                    /* Any float saved state? */
-               ppsv = pcb;                                                                                     /* Remember so we can toss this */
-               pcb = pcb->save_hdr.save_prev;                                          /* Get one underneath our's */          
-               save_release(ppsv);                                                                     /* Release it */
-       }
-       
-       hw_atomic_sub(&saveanchor.savetarget, 4);                               /* Unaccount for the number of saveareas we think we "need" */
-
-}
-
-
-kern_return_t
-act_machine_create(task_t task, thread_act_t thr_act)
-{
-       /*
-        * Clear & Init the pcb  (sets up user-mode s regs)
-        * We don't use this anymore.
-        */
-
-       return KERN_SUCCESS;
-}
-
-void act_machine_init()
-{
-
-    /* Good to verify these once */
-    assert( THREAD_MACHINE_STATE_MAX <= THREAD_STATE_MAX );
-
-    assert( THREAD_STATE_MAX >= PPC_THREAD_STATE_COUNT );
-    assert( THREAD_STATE_MAX >= PPC_EXCEPTION_STATE_COUNT );
-    assert( THREAD_STATE_MAX >= PPC_FLOAT_STATE_COUNT );
-
-    /*
-     * If we start using kernel activations,
-     * would normally create kernel_thread_pool here,
-     * populating it from the act_zone
-     */
+       machine_act_terminate(current_thread());

 }
 
 void
 }
 
 void

-act_machine_return(int code)
-{
-    thread_act_t thr_act = current_act();
-
-       /*
-        * This code is called with nothing locked.
-        * It also returns with nothing locked, if it returns.
-        *
-        * This routine terminates the current thread activation.
-        * If this is the only activation associated with its
-        * thread shuttle, then the entire thread (shuttle plus
-        * activation) is terminated.
-        */
-       assert( code == KERN_TERMINATED );
-       assert( thr_act );
-       assert(thr_act->thread->top_act == thr_act);
-
-       /* This is the only activation attached to the shuttle... */
-
-       thread_terminate_self();
-
-       /*NOTREACHED*/
-       panic("act_machine_return: TALKING ZOMBIE! (1)");
-}
-
-void
-thread_machine_set_current(struct thread_shuttle *thread)
-{
-    register int       my_cpu = cpu_number();
-
-    set_machine_current_thread(thread);
-    set_machine_current_act(thread->top_act);
-       
-    active_kloaded[my_cpu] = thread->top_act->kernel_loaded ? thread->top_act : THR_ACT_NULL;
-}
-
-void
-thread_machine_init(void)
+machine_thread_init(void)

 {
 #ifdef MACHINE_STACK
 #if KERNEL_STACK_SIZE > PPC_PGBYTES
 {
 #ifdef MACHINE_STACK
 #if KERNEL_STACK_SIZE > PPC_PGBYTES


@@ -691,41 +475,17 @@ thread_machine_init(void)
 }
 
 #if MACH_ASSERT
 }
 
 #if MACH_ASSERT

-

 void
 dump_thread(thread_t th)
 {
 void
 dump_thread(thread_t th)
 {

-       printf(" thread @ 0x%x:\n", th);
-}
-
-int
-    dump_act(thread_act_t thr_act)
-{
-    if (!thr_act)
-       return(0);
-
-    printf("thr_act(0x%x)(%d): thread=%x(%d) task=%x(%d)\n",
-          thr_act, thr_act->ref_count,
-          thr_act->thread, thr_act->thread ? thr_act->thread->ref_count:0,
-          thr_act->task,   thr_act->task   ? thr_act->task->ref_count : 0);
-
-    printf("\talerts=%x mask=%x susp=%x active=%x hi=%x lo=%x\n",
-          thr_act->alerts, thr_act->alert_mask,
-          thr_act->suspend_count, thr_act->active,
-          thr_act->higher, thr_act->lower);
-
-    return((int)thr_act);
+       printf(" thread @ %p:\n", th);

 }
 }

+#endif /* MACH_ASSERT */

 
 

-#endif
-
-unsigned int 
-get_useraddr()
+user_addr_t 
+get_useraddr(void)

 {
 {

-
-       thread_act_t thr_act = current_act();
-
-       return(thr_act->mact.pcb->save_srr0);
+       return(current_thread()->machine.upcb->save_srr0);

 }
 
 /*
 }
 
 /*


@@ -733,7 +493,8 @@ get_useraddr()
  */
 
 vm_offset_t
  */
 
 vm_offset_t

-stack_detach(thread_t thread)
+machine_stack_detach(
+       thread_t                thread)

 {
   vm_offset_t stack;
 
 {
   vm_offset_t stack;
 


@@ -741,8 +502,7 @@ stack_detach(thread_t thread)
                                                                                        thread, thread->priority,
                                                                                        thread->sched_pri, 0, 0);
 
                                                                                        thread, thread->priority,
                                                                                        thread->sched_pri, 0, 0);
 

-  if (thread->top_act)
-         act_machine_sv_free(thread->top_act);
+  act_machine_sv_free(thread, 0);      /* XXX flag == 0 OK? */

 
   stack = thread->kernel_stack;
   thread->kernel_stack = 0;
 
   stack = thread->kernel_stack;
   thread->kernel_stack = 0;


@@ -762,18 +522,16 @@ stack_detach(thread_t thread)
  */
 
 void
  */
 
 void

-stack_attach(struct thread_shuttle *thread,
-            vm_offset_t stack,
-            void (*start_pos)(thread_t))
+machine_stack_attach(
+       thread_t                thread,
+       vm_offset_t             stack)

 {
 {

-  thread_act_t thr_act;

   unsigned int *kss;
   struct savearea *sv;
 
         KERNEL_DEBUG(MACHDBG_CODE(DBG_MACH_SCHED,MACH_STACK_ATTACH),
             thread, thread->priority,
   unsigned int *kss;
   struct savearea *sv;
 
         KERNEL_DEBUG(MACHDBG_CODE(DBG_MACH_SCHED,MACH_STACK_ATTACH),
             thread, thread->priority,

-            thread->sched_pri, start_pos,
-            0);
+            thread->sched_pri, 0, 0);

 
   assert(stack);
   kss = (unsigned int *)STACK_IKS(stack);
 
   assert(stack);
   kss = (unsigned int *)STACK_IKS(stack);


@@ -781,25 +539,22 @@ stack_attach(struct thread_shuttle *thread,
 
   /* during initialization we sometimes do not have an
      activation. in that case do not do anything */
 
   /* during initialization we sometimes do not have an
      activation. in that case do not do anything */

-  if ((thr_act = thread->top_act) != 0) {
-    sv = save_get();  /* cannot block */
-       sv->save_hdr.save_flags = (sv->save_hdr.save_flags & ~SAVtype) | (SAVgeneral << SAVtypeshft);   /* Mark as in use */
-    sv->save_hdr.save_act = thr_act;
-       sv->save_hdr.save_prev = thr_act->mact.pcb;
-    thr_act->mact.pcb = sv;
-
-    sv->save_srr0 = (unsigned int) start_pos;
-    /* sv->save_r3 = ARG ? */
-    sv->save_r1 = (vm_offset_t)((int)kss - KF_SIZE);
-       sv->save_srr1 = MSR_SUPERVISOR_INT_OFF;
-       sv->save_fpscr = 0;                                                                     /* Clear all floating point exceptions */
-       sv->save_vrsave = 0;                                                            /* Set the vector save state */
-       sv->save_vscr[3] = 0x00010000;                                          /* Supress java mode */
-    *((int *)sv->save_r1) = 0;
-    thr_act->mact.ksp = 0;                           
-  }
-
-  return;
+  sv = save_get();  /* cannot block */
+  sv->save_hdr.save_flags = (sv->save_hdr.save_flags & ~SAVtype) | (SAVgeneral << SAVtypeshft);        /* Mark as in use */
+  sv->save_hdr.save_act = thread;
+  sv->save_hdr.save_prev = (addr64_t)((uintptr_t)thread->machine.pcb);
+  thread->machine.pcb = sv;
+
+  sv->save_srr0 = (unsigned int)thread_continue;
+  /* sv->save_r3 = ARG ? */
+  sv->save_r1 = (vm_offset_t)((int)kss - KF_SIZE);
+  sv->save_srr1 = MSR_SUPERVISOR_INT_OFF;
+  sv->save_fpscr = 0;                                                                  /* Clear all floating point exceptions */
+  sv->save_vrsave = 0;                                                         /* Set the vector save state */
+  sv->save_vscr[3] = 0x00010000;                                               /* Supress java mode */
+  *(CAST_DOWN(int *, sv->save_r1)) = 0;
+
+  thread->machine.ksp = 0;                           

 }
 
 /*
 }
 
 /*


@@ -807,129 +562,111 @@ stack_attach(struct thread_shuttle *thread,
  */
 
 void
  */
 
 void

-stack_handoff(thread_t old,
-             thread_t new)
+machine_stack_handoff(
+       thread_t                old,
+       thread_t                new)

 {
 
        vm_offset_t stack;
        pmap_t new_pmap;
        facility_context *fowner;
 {
 
        vm_offset_t stack;
        pmap_t new_pmap;
        facility_context *fowner;

-       int     my_cpu;
-       mapping *mp;
+       mapping_t *mp;

        struct per_proc_info *ppinfo;
        
        struct per_proc_info *ppinfo;
        

-       assert(new->top_act);
-       assert(old->top_act);
+       assert(new);
+       assert(old);
+
+       if (old == new)
+               panic("machine_stack_handoff");

        
        

-       my_cpu = cpu_number();
-       stack = stack_detach(old);
+       stack = machine_stack_detach(old);

        new->kernel_stack = stack;
        new->kernel_stack = stack;

-       if (stack == old->stack_privilege) {
-               assert(new->stack_privilege);
-               old->stack_privilege = new->stack_privilege;
-               new->stack_privilege = stack;
+       if (stack == old->reserved_stack) {
+               assert(new->reserved_stack);
+               old->reserved_stack = new->reserved_stack;
+               new->reserved_stack = stack;

        }
 
        ppinfo = getPerProc();                                                          /* Get our processor block */
 
        }
 
        ppinfo = getPerProc();                                                          /* Get our processor block */
 

-       ppinfo->cpu_flags &= ~traceBE;                                          /* Turn off special branch trace */
-

        if(real_ncpus > 1) {                                                            /* This is potentially slow, so only do when actually SMP */
                fowner = ppinfo->FPU_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */
        if(real_ncpus > 1) {                                                            /* This is potentially slow, so only do when actually SMP */
                fowner = ppinfo->FPU_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */

-                       if(fowner->facAct == old->top_act) {            /* Is it for us? */
+                       if(fowner->facAct == old) {             /* Is it for us? */

                                fpu_save(fowner);                                               /* Yes, save it */
                        }
                }
                fowner = ppinfo->VMX_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */
                                fpu_save(fowner);                                               /* Yes, save it */
                        }
                }
                fowner = ppinfo->VMX_owner;                                             /* Cache this because it may change */
                if(fowner) {                                                                    /* Is there any live context? */

-                       if(fowner->facAct == old->top_act) {            /* Is it for us? */
+                       if(fowner->facAct == old) {             /* Is it for us? */

                                vec_save(fowner);                                               /* Yes, save it */
                        }
                }
        }
                                vec_save(fowner);                                               /* Yes, save it */
                        }
                }
        }

+

        /*
         * If old thread is running VM, save per proc userProtKey and FamVMmode spcFlags bits in the thread spcFlags
         * This bits can be modified in the per proc without updating the thread spcFlags
         */
        /*
         * If old thread is running VM, save per proc userProtKey and FamVMmode spcFlags bits in the thread spcFlags
         * This bits can be modified in the per proc without updating the thread spcFlags
         */

-       if(old->top_act->mact.specFlags & runningVM) {                  /* Is the current thread running a VM? */
-               old->top_act->mact.specFlags &= ~(userProtKey|FamVMmode);
-               old->top_act->mact.specFlags |= (ppinfo->spcFlags) & (userProtKey|FamVMmode);
+       if(old->machine.specFlags & runningVM) {                        /* Is the current thread running a VM? */
+               old->machine.specFlags &= ~(userProtKey|FamVMmode);
+               old->machine.specFlags |= (ppinfo->spcFlags) & (userProtKey|FamVMmode);

        }
        }

-
-       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED,MACH_STACK_HANDOFF) | DBG_FUNC_NONE,
-                    (int)old, (int)new, old->sched_pri, new->sched_pri, 0);
-
-
-       if(new->top_act->mact.specFlags & runningVM) {  /* Is the new guy running a VM? */
-               pmap_switch(new->top_act->mact.vmmCEntry->vmmPmap);     /* Switch to the VM's pmap */
-               ppinfo->VMMareaPhys = new->top_act->mact.vmmCEntry->vmmContextPhys;
-               ppinfo->VMMXAFlgs = new->top_act->mact.vmmCEntry->vmmXAFlgs;
-               ppinfo->FAMintercept = new->top_act->mact.vmmCEntry->vmmFAMintercept;
+       old->machine.specFlags &= ~OnProc;
+       new->machine.specFlags |= OnProc;
+
+       if(new->machine.specFlags & runningVM) {        /* Is the new guy running a VM? */
+               pmap_switch(new->machine.vmmCEntry->vmmPmap);   /* Switch to the VM's pmap */
+               ppinfo->VMMareaPhys = new->machine.vmmCEntry->vmmContextPhys;
+               ppinfo->VMMXAFlgs = new->machine.vmmCEntry->vmmXAFlgs;
+               ppinfo->FAMintercept = new->machine.vmmCEntry->vmmFAMintercept;

        }
        else {                                                                                  /* otherwise, we use the task's pmap */
        }
        else {                                                                                  /* otherwise, we use the task's pmap */

-               new_pmap = new->top_act->task->map->pmap;
-               if ((old->top_act->task->map->pmap != new_pmap) || (old->top_act->mact.specFlags & runningVM)) {
+               new_pmap = new->task->map->pmap;
+               if ((old->task->map->pmap != new_pmap) || (old->machine.specFlags & runningVM)) {

                        pmap_switch(new_pmap);
                }
        }
 
                        pmap_switch(new_pmap);
                }
        }
 

-       thread_machine_set_current(new);
-       active_stacks[my_cpu] = new->kernel_stack;
-       ppinfo->Uassist = new->top_act->mact.cthread_self;
+       machine_set_current_thread(new);
+       ppinfo->Uassist = new->machine.cthread_self;

 
 

-       ppinfo->ppbbTaskEnv = new->top_act->mact.bbTaskEnv;
-       ppinfo->spcFlags = new->top_act->mact.specFlags;
+       ppinfo->ppbbTaskEnv = new->machine.bbTaskEnv;
+       ppinfo->spcFlags = new->machine.specFlags;

        
        

-       old->top_act->mact.cioSpace |= cioSwitchAway;   /* Show we switched away from this guy */
-       mp = (mapping *)&ppinfo->ppCIOmp;
+       old->machine.umwSpace |= umwSwitchAway;                 /* Show we switched away from this guy */
+       mp = (mapping_t *)&ppinfo->ppUMWmp;

        mp->mpSpace = invalSpace;                                               /* Since we can't handoff in the middle of copy in/out, just invalidate */
 
        mp->mpSpace = invalSpace;                                               /* Since we can't handoff in the middle of copy in/out, just invalidate */
 

-       if (branch_tracing_enabled()) 
-               ppinfo->cpu_flags |= traceBE;
-    
-       if(trcWork.traceMask) dbgTrace(0x12345678, (unsigned int)old->top_act, (unsigned int)new->top_act, 0);  /* Cut trace entry if tracing */    
+       if(trcWork.traceMask) dbgTrace(0x9903, (unsigned int)old, (unsigned int)new, 0, 0);     /* Cut trace entry if tracing */    

     
   return;
 }
 
     
   return;
 }
 

+void Call_continuation(thread_continue_t, void *, wait_result_t, vm_offset_t);
+

 /*
  * clean and initialize the current kernel stack and go to
  * the given continuation routine
  */
 
 void
 /*
  * clean and initialize the current kernel stack and go to
  * the given continuation routine
  */
 
 void

-call_continuation(void (*continuation)(void) )
-{
-
-  unsigned int *kss;
-  vm_offset_t tsp;
-
-  assert(current_thread()->kernel_stack);
-  kss = (unsigned int *)STACK_IKS(current_thread()->kernel_stack);
-  assert(continuation);
-
-  tsp = (vm_offset_t)((int)kss - KF_SIZE);
-  assert(tsp);
-  *((int *)tsp) = 0;
-
-  Call_continuation(continuation, tsp);
-  
-  return;
-}
-
-void
-thread_swapin_mach_alloc(thread_t thread)
+call_continuation(
+       thread_continue_t       continuation,
+       void                            *parameter,
+       wait_result_t           wresult)

 {
 {

-    struct savearea *sv;
+       thread_t                self = current_thread();
+       unsigned int    *kss;
+       vm_offset_t             tsp;

 
 

-       assert(thread->top_act->mact.pcb == 0);
+       assert(self->kernel_stack);
+       kss = (unsigned int *)STACK_IKS(self->kernel_stack);
+       assert(continuation);

 
 

-    sv = save_alloc();
-       assert(sv);
-    sv->save_hdr.save_prev = 0;                                                /* Initialize back chain */
-       sv->save_hdr.save_flags = (sv->save_hdr.save_flags & ~SAVtype) | (SAVgeneral << SAVtypeshft);   /* Mark as in use */
-    sv->save_hdr.save_act = thread->top_act;           /* Initialize owner */
-    thread->top_act->mact.pcb = sv;
+       tsp = (vm_offset_t)((int)kss - KF_SIZE);
+       assert(tsp);
+       *((int *)tsp) = 0;

 
 

+       Call_continuation(continuation, parameter, wresult, tsp);

 }
 }