xnu-1456.1.26.tar.gz

[apple/xnu.git] / osfmk / i386 / machine_routines.c

diff --git a/osfmk/i386/machine_routines.c b/osfmk/i386/machine_routines.c
index 754f3b82fd6d4d65156c5e23b0e42aebbc5a2173..d0307ca7f33ef95f1062ae0b45686642cea7b9d5 100644 (file)
--- a/osfmk/i386/machine_routines.c
+++ b/osfmk/i386/machine_routines.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 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,21 +23,56 @@
  * 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@

  */
  */

+

 #include <i386/machine_routines.h>
 #include <i386/io_map_entries.h>
 #include <i386/cpuid.h>
 #include <i386/fpu.h>
 #include <i386/machine_routines.h>
 #include <i386/io_map_entries.h>
 #include <i386/cpuid.h>
 #include <i386/fpu.h>

+#include <mach/processor.h>

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

+#include <kern/machine.h>

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

-#include <kern/thread_act.h>
+#include <kern/cpu_number.h>
+#include <kern/thread.h>

 #include <i386/machine_cpu.h>
 #include <i386/machine_cpu.h>

-#include <i386/mp.h>
+#include <i386/lapic.h>

 #include <i386/mp_events.h>
 #include <i386/mp_events.h>

+#include <i386/pmCPU.h>
+#include <i386/tsc.h>
+#include <i386/cpu_threads.h>
+#include <i386/proc_reg.h>
+#include <mach/vm_param.h>
+#include <i386/pmap.h>
+#include <i386/misc_protos.h>
+#if MACH_KDB
+#include <machine/db_machdep.h>
+#include <ddb/db_aout.h>
+#include <ddb/db_access.h>
+#include <ddb/db_sym.h>
+#include <ddb/db_variables.h>
+#include <ddb/db_command.h>
+#include <ddb/db_output.h>
+#include <ddb/db_expr.h>
+#endif
+
+#if DEBUG
+#define DBG(x...)      kprintf("DBG: " x)
+#else
+#define DBG(x...)
+#endif
+
+
+extern void    wakeup(void *);

 
 static int max_cpus_initialized = 0;
 
 
 static int max_cpus_initialized = 0;
 

+unsigned int   LockTimeOut;
+unsigned int   LockTimeOutTSC;
+unsigned int   MutexSpin;
+uint64_t       LastDebuggerEntryAllowance;
+

 #define MAX_CPUS_SET    0x1
 #define MAX_CPUS_WAIT   0x2
 
 #define MAX_CPUS_SET    0x1
 #define MAX_CPUS_WAIT   0x2
 


@@ -45,36 +83,117 @@ vm_offset_t ml_io_map(
        vm_offset_t phys_addr, 
        vm_size_t size)
 {
        vm_offset_t phys_addr, 
        vm_size_t size)
 {

-       return(io_map(phys_addr,size));
+       return(io_map(phys_addr,size,VM_WIMG_IO));

 }
 
 /* boot memory allocation */
 vm_offset_t ml_static_malloc(
 }
 
 /* boot memory allocation */
 vm_offset_t ml_static_malloc(

-       vm_size_t size)
+                            __unused vm_size_t size)

 {
        return((vm_offset_t)NULL);
 }
 
 {
        return((vm_offset_t)NULL);
 }
 

+
+void ml_get_bouncepool_info(vm_offset_t *phys_addr, vm_size_t *size)
+{
+        *phys_addr = bounce_pool_base;
+       *size      = bounce_pool_size;
+}
+
+

 vm_offset_t
 ml_static_ptovirt(
        vm_offset_t paddr)
 {
 vm_offset_t
 ml_static_ptovirt(
        vm_offset_t paddr)
 {

-       return phystokv(paddr);
+#if defined(__x86_64__)
+       return (vm_offset_t)(((unsigned long) paddr) | VM_MIN_KERNEL_ADDRESS);
+#else
+       return (vm_offset_t)((paddr) | LINEAR_KERNEL_ADDRESS);
+#endif

 } 
 
 } 
 

+
+/*
+ *     Routine:        ml_static_mfree
+ *     Function:
+ */

 void
 ml_static_mfree(
 void
 ml_static_mfree(

-        vm_offset_t vaddr,
-        vm_size_t size)
+       vm_offset_t vaddr,
+       vm_size_t size)

 {
 {

-       return;
+       addr64_t vaddr_cur;
+       ppnum_t ppn;
+
+       assert(vaddr >= VM_MIN_KERNEL_ADDRESS);
+
+       assert((vaddr & (PAGE_SIZE-1)) == 0); /* must be page aligned */
+
+
+       for (vaddr_cur = vaddr;
+            vaddr_cur < round_page_64(vaddr+size);
+            vaddr_cur += PAGE_SIZE) {
+               ppn = pmap_find_phys(kernel_pmap, vaddr_cur);
+               if (ppn != (vm_offset_t)NULL) {
+                       kernel_pmap->stats.resident_count++;
+                       if (kernel_pmap->stats.resident_count >
+                           kernel_pmap->stats.resident_max) {
+                               kernel_pmap->stats.resident_max =
+                                       kernel_pmap->stats.resident_count;
+                       }
+                       pmap_remove(kernel_pmap, vaddr_cur, vaddr_cur+PAGE_SIZE);
+                       vm_page_create(ppn,(ppn+1));
+                       vm_page_wire_count--;
+               }
+       }

 }
 
 }
 

+

 /* virtual to physical on wired pages */
 vm_offset_t ml_vtophys(
        vm_offset_t vaddr)
 {
 /* virtual to physical on wired pages */
 vm_offset_t ml_vtophys(
        vm_offset_t vaddr)
 {

-       return  kvtophys(vaddr);
+       return  (vm_offset_t)kvtophys(vaddr);
+}
+
+/*
+ *     Routine:        ml_nofault_copy
+ *     Function:       Perform a physical mode copy if the source and
+ *                     destination have valid translations in the kernel pmap.
+ *                     If translations are present, they are assumed to
+ *                     be wired; i.e. no attempt is made to guarantee that the
+ *                     translations obtained remained valid for
+ *                     the duration of the copy process.
+ */
+
+vm_size_t ml_nofault_copy(
+       vm_offset_t virtsrc, vm_offset_t virtdst, vm_size_t size)
+{
+       addr64_t cur_phys_dst, cur_phys_src;
+       uint32_t count, nbytes = 0;
+
+       while (size > 0) {
+               if (!(cur_phys_src = kvtophys(virtsrc)))
+                       break;
+               if (!(cur_phys_dst = kvtophys(virtdst)))
+                       break;
+               if (!pmap_valid_page(i386_btop(cur_phys_dst)) || !pmap_valid_page(i386_btop(cur_phys_src)))
+                       break;
+               count = (uint32_t)(PAGE_SIZE - (cur_phys_src & PAGE_MASK));
+               if (count > (PAGE_SIZE - (cur_phys_dst & PAGE_MASK)))
+                       count = (uint32_t)(PAGE_SIZE - (cur_phys_dst & PAGE_MASK));
+               if (count > size)
+                       count = (uint32_t)size;
+
+               bcopy_phys(cur_phys_src, cur_phys_dst, count);
+
+               nbytes += count;
+               virtsrc += count;
+               virtdst += count;
+               size -= count;
+       }
+
+       return nbytes;

 }
 
 /* Interrupt handling */
 }
 
 /* Interrupt handling */


@@ -85,12 +204,14 @@ void ml_init_interrupt(void)
        (void) ml_set_interrupts_enabled(TRUE);
 }
 
        (void) ml_set_interrupts_enabled(TRUE);
 }
 

+
+

 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {
   unsigned long flags;
 
 /* Get Interrupts Enabled */
 boolean_t ml_get_interrupts_enabled(void)
 {
   unsigned long flags;
 

-  __asm__ volatile("pushf; popl        %0" :  "=r" (flags));
+  __asm__ volatile("pushf; pop %0" :  "=r" (flags));

   return (flags & EFL_IF) != 0;
 }
 
   return (flags & EFL_IF) != 0;
 }
 


@@ -99,12 +220,23 @@ boolean_t ml_set_interrupts_enabled(boolean_t enable)
 {
   unsigned long flags;
 
 {
   unsigned long flags;
 

-  __asm__ volatile("pushf; popl        %0" :  "=r" (flags));
+  __asm__ volatile("pushf; pop %0" :  "=r" (flags));
+
+  if (enable) {
+       ast_t           *myast;

 
 

- if (enable)
+       myast = ast_pending();
+
+       if ( (get_preemption_level() == 0) &&  (*myast & AST_URGENT) ) {

        __asm__ volatile("sti");
        __asm__ volatile("sti");

-  else
+          __asm__ volatile ("int $0xff");
+        } else {
+         __asm__ volatile ("sti");
+       }
+  }
+  else {

        __asm__ volatile("cli");
        __asm__ volatile("cli");

+  }

 
   return (flags & EFL_IF) != 0;
 }
 
   return (flags & EFL_IF) != 0;
 }


@@ -123,12 +255,9 @@ void ml_cause_interrupt(void)
 
 void ml_thread_policy(
        thread_t thread,
 
 void ml_thread_policy(
        thread_t thread,

-       unsigned policy_id,
+__unused       unsigned policy_id,

        unsigned policy_info)
 {
        unsigned policy_info)
 {

-       if (policy_id == MACHINE_GROUP)
-               thread_bind(thread, master_processor);
-

        if (policy_info & MACHINE_NETWORK_WORKLOOP) {
                spl_t           s = splsched();
 
        if (policy_info & MACHINE_NETWORK_WORKLOOP) {
                spl_t           s = splsched();
 


@@ -158,87 +287,193 @@ void ml_install_interrupt_handler(
 
        (void) ml_set_interrupts_enabled(current_state);
 
 
        (void) ml_set_interrupts_enabled(current_state);
 

-       initialize_screen(0, kPEAcquireScreen);
+       initialize_screen(NULL, kPEAcquireScreen);

 }
 
 }
 

-void
-machine_idle(void)
-{
-       DBGLOG(cpu_handle, cpu_number(), MP_IDLE);
-       __asm__ volatile("sti; hlt": : :"memory");
-       __asm__ volatile("cli");
-       DBGLOG(cpu_handle, cpu_number(), MP_UNIDLE);
-}

 
 void
 machine_signal_idle(
         processor_t processor)
 {
 
 void
 machine_signal_idle(
         processor_t processor)
 {

-       cpu_interrupt(processor->slot_num);
+       cpu_interrupt(processor->cpu_id);

 }
 
 }
 

-kern_return_t
-ml_processor_register(
-       cpu_id_t        cpu_id,
-       uint32_t        lapic_id,
-       processor_t     *processor,
-       ipi_handler_t   *ipi_handler,
-       boolean_t       boot_cpu)
+static kern_return_t
+register_cpu(
+        uint32_t        lapic_id,
+       processor_t     *processor_out,
+       boolean_t       boot_cpu )

 {
 {

-       kern_return_t   ret;

        int             target_cpu;
        int             target_cpu;

+       cpu_data_t      *this_cpu_datap;

 
 

-       if (cpu_register(&target_cpu) != KERN_SUCCESS)
+       this_cpu_datap = cpu_data_alloc(boot_cpu);
+       if (this_cpu_datap == NULL) {

                return KERN_FAILURE;
                return KERN_FAILURE;

-
+       }
+       target_cpu = this_cpu_datap->cpu_number;

        assert((boot_cpu && (target_cpu == 0)) ||
              (!boot_cpu && (target_cpu != 0)));
 
        lapic_cpu_map(lapic_id, target_cpu);
        assert((boot_cpu && (target_cpu == 0)) ||
              (!boot_cpu && (target_cpu != 0)));
 
        lapic_cpu_map(lapic_id, target_cpu);

-       cpu_data[target_cpu].cpu_id = cpu_id;
-       cpu_data[target_cpu].cpu_phys_number = lapic_id;
-       *processor = cpu_to_processor(target_cpu);
-       *ipi_handler = NULL;
+
+       /* The cpu_id is not known at registration phase. Just do
+        * lapic_id for now 
+        */
+       this_cpu_datap->cpu_phys_number = lapic_id;
+
+       this_cpu_datap->cpu_console_buf = console_cpu_alloc(boot_cpu);
+       if (this_cpu_datap->cpu_console_buf == NULL)
+               goto failed;
+
+       this_cpu_datap->cpu_chud = chudxnu_cpu_alloc(boot_cpu);
+       if (this_cpu_datap->cpu_chud == NULL)
+               goto failed;
+
+       if (!boot_cpu) {
+               cpu_thread_alloc(this_cpu_datap->cpu_number);
+               if (this_cpu_datap->lcpu.core == NULL)
+                       goto failed;
+
+               pmCPUStateInit();
+
+#if NCOPY_WINDOWS > 0
+               this_cpu_datap->cpu_pmap = pmap_cpu_alloc(boot_cpu);
+               if (this_cpu_datap->cpu_pmap == NULL)
+                       goto failed;
+#endif
+
+               this_cpu_datap->cpu_processor = cpu_processor_alloc(boot_cpu);
+               if (this_cpu_datap->cpu_processor == NULL)
+                       goto failed;
+               /*
+                * processor_init() deferred to topology start
+                * because "slot numbers" a.k.a. logical processor numbers
+                * are not yet finalized.
+                */
+       }
+
+       *processor_out = this_cpu_datap->cpu_processor;

 
        return KERN_SUCCESS;
 
        return KERN_SUCCESS;

+
+failed:
+       cpu_processor_free(this_cpu_datap->cpu_processor);
+#if NCOPY_WINDOWS > 0
+       pmap_cpu_free(this_cpu_datap->cpu_pmap);
+#endif
+       chudxnu_cpu_free(this_cpu_datap->cpu_chud);
+       console_cpu_free(this_cpu_datap->cpu_console_buf);
+       return KERN_FAILURE;
+}
+
+
+kern_return_t
+ml_processor_register(
+        cpu_id_t        cpu_id,
+        uint32_t        lapic_id,
+        processor_t     *processor_out,
+        boolean_t       boot_cpu,
+       boolean_t       start )
+{
+    static boolean_t done_topo_sort = FALSE;
+    static uint32_t num_registered = 0;
+
+    /* Register all CPUs first, and track max */
+    if( start == FALSE )
+    {
+       num_registered++;
+
+       DBG( "registering CPU lapic id %d\n", lapic_id );
+
+       return register_cpu( lapic_id, processor_out, boot_cpu );
+    }
+
+    /* Sort by topology before we start anything */
+    if( !done_topo_sort )
+    {
+       DBG( "about to start CPUs. %d registered\n", num_registered );
+
+       cpu_topology_sort( num_registered );
+       done_topo_sort = TRUE;
+    }
+
+    /* Assign the cpu ID */
+    uint32_t cpunum = -1;
+    cpu_data_t *this_cpu_datap = NULL;
+
+    /* find cpu num and pointer */
+    cpunum = ml_get_cpuid( lapic_id );
+
+    if( cpunum == 0xFFFFFFFF ) /* never heard of it? */
+       panic( "trying to start invalid/unregistered CPU %d\n", lapic_id );
+
+    this_cpu_datap = cpu_datap(cpunum);
+
+    /* fix the CPU id */
+    this_cpu_datap->cpu_id = cpu_id;
+
+    /* output arg */
+    *processor_out = this_cpu_datap->cpu_processor;
+
+    /* OK, try and start this CPU */
+    return cpu_topology_start_cpu( cpunum );

 }
 
 }
 

+

 void
 void

-ml_cpu_get_info(ml_cpu_info_t *cpu_info)
+ml_cpu_get_info(ml_cpu_info_t *cpu_infop)

 {
        boolean_t       os_supports_sse;
        i386_cpu_info_t *cpuid_infop;
 
 {
        boolean_t       os_supports_sse;
        i386_cpu_info_t *cpuid_infop;
 

-       if (cpu_info == NULL)
+       if (cpu_infop == NULL)

                return;
  
        /*
                return;
  
        /*

-        * Are we supporting XMM/SSE/SSE2?
+        * Are we supporting MMX/SSE/SSE2/SSE3?

         * As distinct from whether the cpu has these capabilities.
         */
         * As distinct from whether the cpu has these capabilities.
         */

-       os_supports_sse = get_cr4() & CR4_XMM;
-       if ((cpuid_features() & CPUID_FEATURE_SSE2) && os_supports_sse)
-               cpu_info->vector_unit = 4;
+       os_supports_sse = !!(get_cr4() & CR4_XMM);
+       if ((cpuid_features() & CPUID_FEATURE_SSE4_2) && os_supports_sse)
+               cpu_infop->vector_unit = 8;
+       else if ((cpuid_features() & CPUID_FEATURE_SSE4_1) && os_supports_sse)
+               cpu_infop->vector_unit = 7;
+       else if ((cpuid_features() & CPUID_FEATURE_SSSE3) && os_supports_sse)
+               cpu_infop->vector_unit = 6;
+       else if ((cpuid_features() & CPUID_FEATURE_SSE3) && os_supports_sse)
+               cpu_infop->vector_unit = 5;
+       else if ((cpuid_features() & CPUID_FEATURE_SSE2) && os_supports_sse)
+               cpu_infop->vector_unit = 4;

        else if ((cpuid_features() & CPUID_FEATURE_SSE) && os_supports_sse)
        else if ((cpuid_features() & CPUID_FEATURE_SSE) && os_supports_sse)

-               cpu_info->vector_unit = 3;
+               cpu_infop->vector_unit = 3;

        else if (cpuid_features() & CPUID_FEATURE_MMX)
        else if (cpuid_features() & CPUID_FEATURE_MMX)

-               cpu_info->vector_unit = 2;
+               cpu_infop->vector_unit = 2;

        else
        else

-               cpu_info->vector_unit = 0;
+               cpu_infop->vector_unit = 0;

 
        cpuid_infop  = cpuid_info();
 
 
        cpuid_infop  = cpuid_info();
 

-       cpu_info->cache_line_size = cpuid_infop->cache_linesize; 
+       cpu_infop->cache_line_size = cpuid_infop->cache_linesize; 

 
 

-       cpu_info->l1_icache_size = cpuid_infop->cache_size[L1I];
-       cpu_info->l1_dcache_size = cpuid_infop->cache_size[L1D];
+       cpu_infop->l1_icache_size = cpuid_infop->cache_size[L1I];
+       cpu_infop->l1_dcache_size = cpuid_infop->cache_size[L1D];

   
   

-       cpu_info->l2_settings = 1;
-       cpu_info->l2_cache_size = cpuid_infop->cache_size[L2U];
+        if (cpuid_infop->cache_size[L2U] > 0) {
+            cpu_infop->l2_settings = 1;
+            cpu_infop->l2_cache_size = cpuid_infop->cache_size[L2U];
+        } else {
+            cpu_infop->l2_settings = 0;
+            cpu_infop->l2_cache_size = 0xFFFFFFFF;
+        }

 
 

-       /* XXX No L3 */
-       cpu_info->l3_settings = 0;
-       cpu_info->l3_cache_size = 0xFFFFFFFF;
+        if (cpuid_infop->cache_size[L3U] > 0) {
+            cpu_infop->l3_settings = 1;
+            cpu_infop->l3_cache_size = cpuid_infop->cache_size[L3U];
+        } else {
+            cpu_infop->l3_settings = 0;
+            cpu_infop->l3_cache_size = 0xFFFFFFFF;
+        }

 }
 
 void
 }
 
 void


@@ -248,8 +483,15 @@ ml_init_max_cpus(unsigned long max_cpus)
 
         current_state = ml_set_interrupts_enabled(FALSE);
         if (max_cpus_initialized != MAX_CPUS_SET) {
 
         current_state = ml_set_interrupts_enabled(FALSE);
         if (max_cpus_initialized != MAX_CPUS_SET) {

-                if (max_cpus > 0 && max_cpus < NCPUS)
-                        machine_info.max_cpus = max_cpus;
+                if (max_cpus > 0 && max_cpus <= MAX_CPUS) {
+                       /*
+                        * Note: max_cpus is the number of enabled processors
+                        * that ACPI found; max_ncpus is the maximum number
+                        * that the kernel supports or that the "cpus="
+                        * boot-arg has set. Here we take int minimum.
+                        */
+                        machine_info.max_cpus = (integer_t)MIN(max_cpus, max_ncpus);
+               }

                 if (max_cpus_initialized == MAX_CPUS_WAIT)
                         wakeup((event_t)&max_cpus_initialized);
                 max_cpus_initialized = MAX_CPUS_SET;
                 if (max_cpus_initialized == MAX_CPUS_WAIT)
                         wakeup((event_t)&max_cpus_initialized);
                 max_cpus_initialized = MAX_CPUS_SET;


@@ -272,39 +514,178 @@ ml_get_max_cpus(void)
         return(machine_info.max_cpus);
 }
 
         return(machine_info.max_cpus);
 }
 

-/* Stubs for pc tracing mechanism */
-
-int *pc_trace_buf;
-int pc_trace_cnt = 0;
-
-int
-set_be_bit()
+/*
+ *     Routine:        ml_init_lock_timeout
+ *     Function:
+ */
+void
+ml_init_lock_timeout(void)

 {
 {

-  return(0);
+       uint64_t        abstime;
+       uint32_t        mtxspin;
+       uint64_t        default_timeout_ns = NSEC_PER_SEC>>2;
+       uint32_t        slto;
+       
+       if (PE_parse_boot_argn("slto_us", &slto, sizeof (slto)))
+               default_timeout_ns = slto * NSEC_PER_USEC;
+
+       /* LockTimeOut is absolutetime, LockTimeOutTSC is in TSC ticks */
+       nanoseconds_to_absolutetime(default_timeout_ns, &abstime);
+       LockTimeOut = (uint32_t) abstime;
+       LockTimeOutTSC = (uint32_t) tmrCvt(abstime, tscFCvtn2t);
+
+       if (PE_parse_boot_argn("mtxspin", &mtxspin, sizeof (mtxspin))) {
+               if (mtxspin > USEC_PER_SEC>>4)
+                       mtxspin =  USEC_PER_SEC>>4;
+               nanoseconds_to_absolutetime(mtxspin*NSEC_PER_USEC, &abstime);
+       } else {
+               nanoseconds_to_absolutetime(10*NSEC_PER_USEC, &abstime);
+       }
+       MutexSpin = (unsigned int)abstime;
+
+       nanoseconds_to_absolutetime(2 * NSEC_PER_SEC, &LastDebuggerEntryAllowance);

 }
 
 }
 

-int
-clr_be_bit()
+/*
+ * This is called from the machine-independent routine cpu_up()
+ * to perform machine-dependent info updates. Defer to cpu_thread_init().
+ */
+void
+ml_cpu_up(void)

 {
 {

-  return(0);
+       return;

 }
 
 }
 

-int
-be_tracing()
+/*
+ * This is called from the machine-independent routine cpu_down()
+ * to perform machine-dependent info updates.
+ */
+void
+ml_cpu_down(void)

 {
 {

-  return(0);
+       return;

 }
 
 }
 

-#undef current_act
-thread_act_t
+/*
+ * The following are required for parts of the kernel
+ * that cannot resolve these functions as inlines:
+ */
+extern thread_t current_act(void);
+thread_t

 current_act(void)
 current_act(void)

-{               
-       return(current_act_fast());
-} 
+{
+  return(current_thread_fast());
+}

 
 #undef current_thread
 
 #undef current_thread

+extern thread_t current_thread(void);

 thread_t
 current_thread(void)
 {
 thread_t
 current_thread(void)
 {

-  return(current_act_fast());
+  return(current_thread_fast());
+}
+
+
+boolean_t ml_is64bit(void) {
+
+        return (cpu_mode_is64bit());
+}
+
+
+boolean_t ml_thread_is64bit(thread_t thread) {
+  
+        return (thread_is_64bit(thread));
+}
+
+
+boolean_t ml_state_is64bit(void *saved_state) {
+
+       return is_saved_state64(saved_state);
+}
+
+void ml_cpu_set_ldt(int selector)
+{
+       /*
+        * Avoid loading the LDT
+        * if we're setting the KERNEL LDT and it's already set.
+        */
+       if (selector == KERNEL_LDT &&
+           current_cpu_datap()->cpu_ldt == KERNEL_LDT)
+               return;
+
+#if defined(__i386__)
+       /*
+        * If 64bit this requires a mode switch (and back). 
+        */
+       if (cpu_mode_is64bit())
+               ml_64bit_lldt(selector);
+       else
+               lldt(selector);
+#else
+       lldt(selector);
+#endif
+       current_cpu_datap()->cpu_ldt = selector;
+}
+
+void ml_fp_setvalid(boolean_t value)
+{
+        fp_setvalid(value);
+}
+
+uint64_t ml_cpu_int_event_time(void)
+{
+       return current_cpu_datap()->cpu_int_event_time;
+}
+
+vm_offset_t ml_stack_remaining(void)
+{
+       uintptr_t local = (uintptr_t) &local;
+
+       if (ml_at_interrupt_context() != 0) {
+           return (local - (current_cpu_datap()->cpu_int_stack_top - INTSTACK_SIZE));
+       } else {
+           return (local - current_thread()->kernel_stack);
+       }

 }
 }

+
+#if MACH_KDB
+
+/*
+ *     Display the global msrs
+ * *           
+ *     ms
+ */
+void 
+db_msr(__unused db_expr_t addr,
+       __unused int have_addr,
+       __unused db_expr_t count,
+       __unused char *modif)
+{
+
+       uint32_t        i, msrlow, msrhigh;
+
+       /* Try all of the first 4096 msrs */
+       for (i = 0; i < 4096; i++) {
+               if (!rdmsr_carefully(i, &msrlow, &msrhigh)) {
+                       db_printf("%08X - %08X.%08X\n", i, msrhigh, msrlow);
+               }
+       }
+
+       /* Try all of the 4096 msrs at 0x0C000000 */
+       for (i = 0; i < 4096; i++) {
+               if (!rdmsr_carefully(0x0C000000 | i, &msrlow, &msrhigh)) {
+                       db_printf("%08X - %08X.%08X\n",
+                               0x0C000000 | i, msrhigh, msrlow);
+               }
+       }
+
+       /* Try all of the 4096 msrs at 0xC0000000 */
+       for (i = 0; i < 4096; i++) {
+               if (!rdmsr_carefully(0xC0000000 | i, &msrlow, &msrhigh)) {
+                       db_printf("%08X - %08X.%08X\n",
+                               0xC0000000 | i, msrhigh, msrlow);
+               }
+       }
+}
+
+#endif