Changeset 3724 in vbox for trunk/src

Timestamp:

Jul 19, 2007 6:57:24 PM (18 years ago)

Author:

vboxsync

Message:

removed the obsolete x86context.h (all constants are in VBox/x86.h).

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (4 diffs)
• HWACCM.cpp (modified) (3 diffs)
• SELM.cpp (modified) (13 diffs)
• VMMInternal.h (modified) (1 diff)
• x86context.h (deleted)

trunk/src/VBox/VMM/CPUM.cpp

@@ -44 +44 @@
 #include <iprt/string.h>
 #include <iprt/system.h>
-#include "x86context.h"
+
 
 /*******************************************************************************
@@ -889 +889 @@
 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     if (!(pCtx->efer & MSR_K6_EFER_LMA))
-# endif 
+# endif
     {
         pHlp->pfnPrintf(pHlp,
@@ -909 +909 @@
 # ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     else
-# endif 
+# endif
 #endif
 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBIRD_32BIT_KERNEL)
@@ -1730 +1730 @@
 /**
  * API for controlling a few of the CPU features found in CR4.
- * 
+ *
  * Currently only X86_CR4_TSD is accepted as input.
- * 
+ *
  * @returns VBox status code.
- * 
+ *
  * @param   pVM     The VM handle.
  * @param   fOr     The CR4 OR mask.

trunk/src/VBox/VMM/HWACCM.cpp

@@ -46 +46 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
-#include "x86context.h"
 
 
@@ -285 +284 @@
         Log(("pVM->hwaccm.s.vmx.fSupported = %d\n", pVM->hwaccm.s.vmx.fSupported));
 
-        if (    pVM->hwaccm.s.fInitialized == false 
+        if (    pVM->hwaccm.s.fInitialized == false
             &&  pVM->hwaccm.s.vmx.msr.feature_ctrl != 0)
         {
@@ -394 +393 @@
             if (val & VMX_VMCS_CTRL_ENTRY_CONTROLS_DEACTIVATE_DUALMON)
                 LogRel(("HWACCM:    VMX_VMCS_CTRL_ENTRY_CONTROLS_DEACTIVATE_DUALMON *must* be set\n"));
-    
+
             LogRel(("HWACCM: MSR_IA32_VMX_EXIT_CTLS        = %VX64\n", pVM->hwaccm.s.vmx.msr.vmx_exit));
             val = pVM->hwaccm.s.vmx.msr.vmx_exit >> 32ULL;

trunk/src/VBox/VMM/SELM.cpp

@@ -43 +43 @@
 #include <iprt/thread.h>
 #include <iprt/string.h>
-#include "x86context.h"
 
 
@@ -103 +102 @@
     AssertCompileMemberAlignment(VM, selm.s, 32);                       AssertRelease(!(RT_OFFSETOF(VM, selm.s) & 31));
 #if 0 /* doesn't work */
-    AssertCompile((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));       
-    AssertCompile((RT_OFFSETOF(VM, selm.s.TssTrap08) & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.TssTrap08)); 
+    AssertCompile((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));
+    AssertCompile((RT_OFFSETOF(VM, selm.s.TssTrap08) & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.TssTrap08));
 #endif
     AssertRelease((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));
@@ -261 +260 @@
     pDesc->Gen.u8BaseHigh1      = 0;
     pDesc->Gen.u8BaseHigh2      = 0;
-    pDesc->Gen.u4Type           = X86_SELTYPE_MEM_EXECUTEREAD_ACC;
+    pDesc->Gen.u4Type           = X86_SEL_TYPE_ER_ACC;
     pDesc->Gen.u1DescType       = 1; /* not system, but code/data */
     pDesc->Gen.u2Dpl            = 0; /* supervisor */
@@ -277 +276 @@
     pDesc->Gen.u8BaseHigh1      = 0;
     pDesc->Gen.u8BaseHigh2      = 0;
-    pDesc->Gen.u4Type           = X86_SELTYPE_MEM_READWRITE_ACC;
+    pDesc->Gen.u4Type           = X86_SEL_TYPE_RW_ACC;
     pDesc->Gen.u1DescType       = 1; /* not system, but code/data */
     pDesc->Gen.u2Dpl            = 0; /* supervisor */
@@ -293 +292 @@
     pDesc->Gen.u8BaseHigh1      = 0;
     pDesc->Gen.u8BaseHigh2      = 0;
-    pDesc->Gen.u4Type           = X86_SELTYPE_MEM_EXECUTEREAD_ACC;
+    pDesc->Gen.u4Type           = X86_SEL_TYPE_ER_ACC;
     pDesc->Gen.u1DescType       = 1; /* not system, but code/data */
     pDesc->Gen.u2Dpl            = 0; /* supervisor */
@@ -312 +311 @@
     pDesc->Gen.u16LimitLow      = sizeof(VBOXTSS) - 1;
     pDesc->Gen.u4LimitHigh      = 0;
-    pDesc->Gen.u4Type           = X86_SELTYPE_SYS_386_TSS_AVAIL;
+    pDesc->Gen.u4Type           = X86_SEL_TYPE_SYS_386_TSS_AVAIL;
     pDesc->Gen.u1DescType       = 0; /* system */
     pDesc->Gen.u2Dpl            = 0; /* supervisor */
@@ -331 +330 @@
     pDesc->Gen.u8BaseHigh1      = RT_BYTE3(pGCTSS);
     pDesc->Gen.u8BaseHigh2      = RT_BYTE4(pGCTSS);
-    pDesc->Gen.u4Type           = X86_SELTYPE_SYS_386_TSS_AVAIL;
+    pDesc->Gen.u4Type           = X86_SEL_TYPE_SYS_386_TSS_AVAIL;
     pDesc->Gen.u1DescType       = 0; /* system */
     pDesc->Gen.u2Dpl            = 0; /* supervisor */
@@ -710 +709 @@
 /**
  * Sync the GDT, LDT and TSS after loading the state.
- * 
- * Just to play save, we set the FFs to force syncing before 
+ *
+ * Just to play save, we set the FFs to force syncing before
  * executing GC code.
- * 
+ *
  * @returns VBox status code.
  * @param   pVM             VM Handle.
@@ -722 +721 @@
     LogFlow(("selmR3LoadDone:\n"));
 
-    /* 
+    /*
      * Don't do anything if it's a load failure.
      */
@@ -977 +976 @@
             STAM_COUNTER_INC(&pVM->selm.s.StatHyperSelsChanged);
 
-            /* 
+            /*
              * Do the relocation callbacks to let everyone update their hyper selector dependencies.
              * (SELMR3Relocate will call selmR3SetupHyperGDTSelectors() for us.)
@@ -1435 +1434 @@
          */
 #if 1
-        /* Don't bother with anything but the core structure. (Actually all we care for is the r0 ss.) */ 
-        if (cbTss > sizeof(VBOXTSS)) 
-            cbTss = sizeof(VBOXTSS); 
+        /* Don't bother with anything but the core structure. (Actually all we care for is the r0 ss.) */
+        if (cbTss > sizeof(VBOXTSS))
+            cbTss = sizeof(VBOXTSS);
 #endif
         /* The guest's TSS can span multiple pages now. We will monitor the whole thing. */
@@ -1518 +1517 @@
                 {
                     uint32_t offRedirBitmap = tss.offIoBitmap - sizeof(tss.IntRedirBitmap);
-                    
+
                     /** @todo not sure how the partial case is handled; probably not allowed */
                     if (offRedirBitmap + sizeof(tss.IntRedirBitmap) <= pVM->selm.s.cbGuestTss)
@@ -1711 +1710 @@
         cbTss++;
 #if 1
-        /* Don't bother with anything but the core structure. (Actually all we care for is the r0 ss.) */ 
-        if (cbTss > sizeof(VBOXTSS)) 
-            cbTss = sizeof(VBOXTSS); 
+        /* Don't bother with anything but the core structure. (Actually all we care for is the r0 ss.) */
+        if (cbTss > sizeof(VBOXTSS))
+            cbTss = sizeof(VBOXTSS);
 #endif
         AssertMsg((GCPtrTss >> PAGE_SHIFT) == ((GCPtrTss + sizeof(VBOXTSS) - 1) >> PAGE_SHIFT),

trunk/src/VBox/VMM/VMMInternal.h

@@ -24 +24 @@
 
 #include <VBox/cdefs.h>
-#include <x86context.h>
 #include <VBox/stam.h>
 #include <VBox/log.h>