Changeset 60087 in vbox for trunk/include

Timestamp:

Mar 18, 2016 12:06:19 AM (9 years ago)

Author:

vboxsync

Message:

iprt/x86.h: duh!

Location:

trunk/include/iprt

Files:

• x86.h (modified) (3 diffs)
• x86.mac (modified) (2 diffs)

trunk/include/iprt/x86.h

@@ -3087 +3087 @@
     /** 00 - Limit - Low word. */
     unsigned    u16LimitLow : 16;
-    /** 10 - Base address - lowe word.
+    /** 10 - Base address - low word.
      * Don't try set this to 24 because MSC is doing stupid things then. */
     unsigned    u16BaseLow : 16;
@@ -3146 +3146 @@
 #define X86LAR_F_DPL_SHIFT       13 /**< Shift count for the DPL value. */
 #define X86LAR_F_P               UINT16_C(    0x8000)
-#define X86LAR_F_AVL             UINT32_C(0x10000000)
-#define X86LAR_F_L               UINT32_C(0x20000000)
-#define X86LAR_F_D               UINT32_C(0x40000000)
-#define X86LAR_F_G               UINT32_C(0x80000000)
+#define X86LAR_F_AVL             UINT32_C(0x00100000)
+#define X86LAR_F_L               UINT32_C(0x00200000)
+#define X86LAR_F_D               UINT32_C(0x00400000)
+#define X86LAR_F_G               UINT32_C(0x00800000)
 /** @}  */
 
@@ -3313 +3313 @@
     /** Limit - Low word. */
     uint32_t    u16LimitLow     : 16;
-    /** Base address - lowe word.
+    /** Base address - low word.
      * Don't try set this to 24 because MSC is doing stupid things then. */
     uint32_t    u16BaseLow      : 16;

trunk/include/iprt/x86.mac

@@ -472 +472 @@
 %define MSR_IA32_X2APIC_TIMER_ICR           0x838
 %define MSR_IA32_X2APIC_TIMER_CCR           0x839
-%define MSR_IA32_X2APIC_TIMER_DFR           0x83E
+%define MSR_IA32_X2APIC_TIMER_DCR           0x83E
 %define MSR_IA32_X2APIC_SELF_IPI            0x83F
 %define MSR_IA32_X2APIC_END                 0xBFF
+%define MSR_IA32_X2APIC_LVT_START           MSR_IA32_X2APIC_LVT_TIMER
+%define MSR_IA32_X2APIC_LVT_END             MSR_IA32_X2APIC_LVT_ERROR
 %define MSR_K6_EFER                         0xc0000080
 %define  MSR_K6_EFER_SCE                     RT_BIT_32(0)
@@ -833 +835 @@
 %define X86LAR_F_DPL_SHIFT       13
 %define X86LAR_F_P               0x8000
-%define X86LAR_F_AVL             0x10000000
-%define X86LAR_F_L               0x20000000
-%define X86LAR_F_D               0x40000000
-%define X86LAR_F_G               0x80000000
+%define X86LAR_F_AVL             0x00100000
+%define X86LAR_F_L               0x00200000
+%define X86LAR_F_D               0x00400000
+%define X86LAR_F_G               0x00800000
 %endif
 %ifndef VBOX_FOR_DTRACE_LIB