xnu-792.12.6.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu_data.h

diff --git a/osfmk/i386/cpu_data.h b/osfmk/i386/cpu_data.h
index 8ad34142ad42131c002a899b033526e8dd47436e..76463b1b11757448ad6a2a679943e03cba853022 100644 (file)
--- a/osfmk/i386/cpu_data.h
+++ b/osfmk/i386/cpu_data.h
@@ -1,23 +1,31 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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.
- * 
- * This 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@

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


@@ -34,18 +42,15 @@
 #include <kern/assert.h>
 #include <kern/kern_types.h>
 #include <kern/processor.h>
 #include <kern/assert.h>
 #include <kern/kern_types.h>
 #include <kern/processor.h>

-#include <kern/pms.h>

 #include <pexpert/pexpert.h>
 #include <pexpert/pexpert.h>

-#include <mach/i386/thread_status.h>
-#include <i386/rtclock.h>
-#include <i386/pmCPU.h>
+

 
 /*
  * Data structures referenced (anonymously) from per-cpu data:
  */
 struct cpu_core;
 struct cpu_cons_buffer;
 
 /*
  * Data structures referenced (anonymously) from per-cpu data:
  */
 struct cpu_core;
 struct cpu_cons_buffer;

-struct cpu_desc_table;
+struct mp_desc_table;

 
 
 /*
 
 
 /*


@@ -58,10 +63,12 @@ typedef struct rtclock_timer {
 } rtclock_timer_t;
 
 typedef struct {
 } rtclock_timer_t;
 
 typedef struct {

-       uint64_t        tsc_base;               /* timestamp */
-       uint64_t        ns_base;                /* nanoseconds */
-       uint32_t        scale;                  /* tsc -> nanosec multiplier */
-       uint32_t        shift;                  /* tsc -> nanosec shift/div */
+       uint64_t        rnt_tsc;                /* timestamp */
+       uint64_t        rnt_nanos;              /* nanoseconds */
+       uint32_t        rnt_scale;              /* tsc -> nanosec multiplier */
+       uint32_t        rnt_shift;              /* tsc -> nanosec shift/div */
+       uint64_t        rnt_step_tsc;           /* tsc when scale applied */
+       uint64_t        rnt_step_nanos;         /* ns  when scale applied */

 } rtc_nanotime_t;
 
 typedef struct {
 } rtc_nanotime_t;
 
 typedef struct {


@@ -72,26 +79,8 @@ typedef struct {
        struct fake_descriptor  *cdi_gdt;
        struct fake_descriptor  *cdi_idt;
        struct fake_descriptor  *cdi_ldt;
        struct fake_descriptor  *cdi_gdt;
        struct fake_descriptor  *cdi_idt;
        struct fake_descriptor  *cdi_ldt;

-       vm_offset_t             cdi_sstk;

 } cpu_desc_index_t;
 
 } cpu_desc_index_t;
 

-typedef enum {
-       TASK_MAP_32BIT,                 /* 32-bit, compatibility mode */ 
-       TASK_MAP_64BIT,                 /* 64-bit, separate address space */ 
-       TASK_MAP_64BIT_SHARED           /* 64-bit, kernel-shared addr space */
-} task_map_t;
-
-/*
- * This structure is used on entry into the (uber-)kernel on syscall from
- * a 64-bit user. It contains the address of the machine state save area
- * for the current thread and a temporary place to save the user's rsp
- * before loading this address into rsp.
- */
-typedef struct {
-       addr64_t        cu_isf;         /* thread->pcb->iss.isf */
-       uint64_t        cu_tmp;         /* temporary scratch */ 
-        addr64_t       cu_user_gs_base;
-} cpu_uber_t;

 
 /*
  * Per-cpu data.
 
 /*
  * Per-cpu data.


@@ -110,9 +99,9 @@ typedef struct cpu_data
 {
        struct cpu_data         *cpu_this;              /* pointer to myself */
        thread_t                cpu_active_thread;
 {
        struct cpu_data         *cpu_this;              /* pointer to myself */
        thread_t                cpu_active_thread;

-       void                    *cpu_int_state;         /* interrupt state */
-       vm_offset_t             cpu_active_stack;       /* kernel stack base */
-       vm_offset_t             cpu_kernel_stack;       /* kernel stack top */
+       thread_t                cpu_active_kloaded;
+       vm_offset_t             cpu_active_stack;
+       vm_offset_t             cpu_kernel_stack;

        vm_offset_t             cpu_int_stack_top;
        int                     cpu_preemption_level;
        int                     cpu_simple_lock_count;
        vm_offset_t             cpu_int_stack_top;
        int                     cpu_preemption_level;
        int                     cpu_simple_lock_count;


@@ -127,53 +116,27 @@ typedef struct cpu_data
        int                     cpu_subtype;
        int                     cpu_threadtype;
        int                     cpu_running;
        int                     cpu_subtype;
        int                     cpu_threadtype;
        int                     cpu_running;

-       uint64_t                rtclock_intr_deadline;
-       rtclock_timer_t         rtclock_timer;
-        boolean_t              cpu_is64bit;
-        task_map_t             cpu_task_map;
-        addr64_t               cpu_task_cr3;
-        addr64_t               cpu_active_cr3;
-        addr64_t               cpu_kernel_cr3;
-       cpu_uber_t              cpu_uber;
-       void                    *cpu_chud;
-       void                    *cpu_console_buf;

        struct cpu_core         *cpu_core;              /* cpu's parent core */
        struct cpu_core         *cpu_core;              /* cpu's parent core */

+       uint64_t                cpu_rtc_tick_deadline;
+       uint64_t                cpu_rtc_intr_deadline;
+       rtclock_timer_t         cpu_rtc_timer;
+       rtc_nanotime_t          cpu_rtc_nanotime;
+       void                    *cpu_console_buf;

        struct processor        *cpu_processor;
        struct cpu_pmap         *cpu_pmap;
        struct processor        *cpu_processor;
        struct cpu_pmap         *cpu_pmap;

-       struct cpu_desc_table   *cpu_desc_tablep;
-       struct fake_descriptor  *cpu_ldtp;
+       struct mp_desc_table    *cpu_desc_tablep;

        cpu_desc_index_t        cpu_desc_index;
        cpu_desc_index_t        cpu_desc_index;

-       int                     cpu_ldt;
+       boolean_t               cpu_iflag;

 #ifdef MACH_KDB
        /* XXX Untested: */
        int                     cpu_db_pass_thru;
 #ifdef MACH_KDB
        /* XXX Untested: */
        int                     cpu_db_pass_thru;

-       vm_offset_t     cpu_db_stacks;
-       void            *cpu_kdb_saved_state;
-       spl_t           cpu_kdb_saved_ipl;
+       vm_offset_t             cpu_db_stacks;
+       struct i386_saved_state *cpu_kdb_saved_state;
+       spl_t                   cpu_kdb_saved_ipl;

        int                     cpu_kdb_is_slave;
        int                     cpu_kdb_active;
 #endif /* MACH_KDB */
        int                     cpu_kdb_is_slave;
        int                     cpu_kdb_active;
 #endif /* MACH_KDB */

-       boolean_t               cpu_iflag;
-       boolean_t               cpu_boot_complete;
-       int                     cpu_hibernate;
-       pmsd                    pms;                                    /* Power Management Stepper control */
-       uint64_t                rtcPop;                 /* when the etimer wants a timer pop */
-       
-       vm_offset_t     cpu_copywindow_base;
-       uint64_t        *cpu_copywindow_pdp;
-       
-       vm_offset_t     cpu_physwindow_base;
-       uint64_t        *cpu_physwindow_ptep;
-       void            *cpu_hi_iss;
-       boolean_t       cpu_tlb_invalid;
-       
-       uint64_t        *cpu_pmHpet;            /* Address of the HPET for this processor */
-       uint32_t        cpu_pmHpetVec;          /* Interrupt vector for HPET for this processor */
-/*     Statistics */
-       pmStats_t       cpu_pmStats;            /* Power management data */
-       uint32_t        cpu_hwIntCnt[256];              /* Interrupt counts */
-       
-       uint64_t                cpu_dr7; /* debug control register */
+        int                     cpu_hibernate;

 } cpu_data_t;
 
 extern cpu_data_t      *cpu_data_ptr[];  
 } cpu_data_t;
 
 extern cpu_data_t      *cpu_data_ptr[];  


@@ -201,13 +164,6 @@ get_active_thread(void)
 #define current_thread_fast()          get_active_thread()
 #define current_thread()               current_thread_fast()
 
 #define current_thread_fast()          get_active_thread()
 #define current_thread()               current_thread_fast()
 

-static inline boolean_t
-get_is64bit(void)
-{
-       CPU_DATA_GET(cpu_is64bit, boolean_t)
-}
-#define cpu_mode_is64bit()             get_is64bit()
-

 static inline int
 get_preemption_level(void)
 {
 static inline int
 get_preemption_level(void)
 {