Changeset 14581

Timestamp:

11/25/08 17:14:14 (1 month ago)

Author:

vboxsync

Message:

Explicit VMCS field width.

Files:

• trunk/include/VBox/hwacc_vmx.h (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (24 diffs)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (modified) (3 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -644 +644 @@
- * @{
- */
-
-
-
-
-
-
-
-
-
+16
+16
+16
+16
+16
+16
+16
+16
+16
-/** @} */
-
@@ -658 +658 @@
- * @{
- */
-
-
-
-
-
-
-
+16
+16
+16
+16
+16
+16
+16
-/** @}          */
-
@@ -925 +925 @@
- * @{
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
+32
-/** @} */
-
@@ -977 +977 @@
- * @{
- */
-_HOST_SYSENTER_CS  
+32_HOST_SYSENTER_CS
-/** @} */
-

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -816 +816 @@
-
-        /* Selector registers. */
-
+16
-        /* Note: VMX is (again) very picky about the RPL of the selectors here; we'll restore them manually. */
-
-
+16
+16
-#if HC_ARCH_BITS == 32
-
-
-
-
+16
+16
+
+16
-        SelTR = ASMGetTR();
-
+16
-        AssertRC(rc);
-        Log2(("VMX_VMCS_HOST_FIELD_CS %08x\n", ASMGetCS()));
@@ -873 +873 @@
-        /* Sysenter MSRs. */
-        /** @todo expensive!! */
-
+32
-        Log2(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_CS)));
-#if HC_ARCH_BITS == 32
@@ -1057 +1057 @@
-        if (pCtx->ldtr == 0)
-        {
-
-
-
+16
+32
+  
-            /* Note: vmlaunch will fail with 0 or just 0x02. No idea why. */
-
+32
-        }
-        else
-        {
-
-
-
-
+16
+32
+  
+32
-        }
-        AssertRC(rc);
@@ -1085 +1085 @@
-            AssertRC(rc);
-
-
-
-
+16
+32
+  
-
-            X86DESCATTR attr;
@@ -1099 +1099 @@
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
-        {
-
-
-
+16
+32
+  
-
-            val = pCtx->trHid.Attr.u;
@@ -1113 +1113 @@
-
-        }
-
+32
-        AssertRC(rc);
-    }
@@ -1119 +1119 @@
-    if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_GDTR)
-    {
-
-
+32
+  
-        AssertRC(rc);
-    }
@@ -1126 +1126 @@
-    if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_IDTR)
-    {
-
-
+32
+  
-        AssertRC(rc);
-    }
@@ -1134 +1134 @@
-     * Sysenter MSRs (unconditional)
-     */
-_GUEST_SYSENTER_CS,  
+32_GUEST_SYSENTER_CS,
-    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     pCtx->SysEnter.eip);
-    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_SYSENTER_ESP,     pCtx->SysEnter.esp);
@@ -1486 +1486 @@
-
-    /* Take care of instruction fusing (sti, mov ss) */
-
+32
-    uInterruptState = val;
-    if (uInterruptState != 0)
@@ -1542 +1542 @@
-     * System MSRs
-     */
-_GUEST_SYSENTER_CS,  
+32_GUEST_SYSENTER_CS,
-    pCtx->SysEnter.cs       = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     &val);
@@ -1552 +1552 @@
-    VMX_READ_SELREG(LDTR, ldtr);
-
-_GUEST_GDTR_LIMIT,  
+32_GUEST_GDTR_LIMIT,
-    pCtx->gdtr.cbGdt        = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_GDTR_BASE,        &val);
-    pCtx->gdtr.pGdt         = val;
-
-_GUEST_IDTR_LIMIT,  
+32_GUEST_IDTR_LIMIT,
-    pCtx->idtr.cbIdt        = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_IDTR_BASE,        &val);
@@ -1698 +1698 @@
-    AssertMsg(pVCpu->hwaccm.s.uCurrentASID >= 1 && pVCpu->hwaccm.s.uCurrentASID < pVM->hwaccm.s.uMaxASID, ("cpu%d VM uCurrentASID = %x\n", pCpu->idCpu, pVCpu->hwaccm.s.uCurrentASID));
-
-
+16
-    AssertRC(rc);
-
@@ -1825 +1825 @@
-            VM_FF_CLEAR(pVM, VM_FF_INHIBIT_INTERRUPTS);
-            /* Irq inhibition is no longer active; clear the corresponding VMX state. */
-
+32
-            AssertRC(rc);
-        }
@@ -1832 +1832 @@
-    {
-        /* Irq inhibition is no longer active; clear the corresponding VMX state. */
-
+32
-        AssertRC(rc);
-    }
@@ -1946 +1946 @@
-    /* Non-register state Guest Context */
-    /** @todo change me according to cpu state */
-
+32
-    AssertRC(rc);
-
@@ -3252 +3252 @@
-            Log(("VMX_VMCS_HOST_CR4 %08x\n", val));
-
-
+16
-            Log(("VMX_VMCS_HOST_FIELD_CS %08x\n", val));
-
@@ -3264 +3264 @@
-            }
-
-
+16
-            Log(("VMX_VMCS_HOST_FIELD_DS %08x\n", val));
-            if (val < gdtr.cbGdt)
@@ -3272 +3272 @@
-            }
-
-
+16
-            Log(("VMX_VMCS_HOST_FIELD_ES %08x\n", val));
-            if (val < gdtr.cbGdt)
@@ -3280 +3280 @@
-            }
-
-
-
+16
+16
-            if (val < gdtr.cbGdt)
-            {
@@ -3288 +3288 @@
-            }
-
-
-
+16
+16
-            if (val < gdtr.cbGdt)
-            {
@@ -3296 +3296 @@
-            }
-
-
-
+16
+16
-            if (val < gdtr.cbGdt)
-            {
@@ -3304 +3304 @@
-            }
-
-
-
+16
+16
-            if (val < gdtr.cbGdt)
-            {
@@ -3320 +3320 @@
-            Log(("VMX_VMCS_HOST_IDTR_BASE %RHv\n", val));
-
-
+32
-            Log(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", val));
-

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -142 +142 @@
-#define VMX_WRITE_SELREG(REG, reg) \
-{                                                                                               \
-
-
+16
+32
-        rc |= VMXWriteVMCS(VMX_VMCS_GUEST_##REG##_BASE,     pCtx->reg##Hid.u64Base);            \
-        if ((pCtx->eflags.u32 & X86_EFL_VM))                                                    \
@@ -161 +161 @@
-            val = 0x10000;  /* Invalid guest state error otherwise. (BIT(16) = Unusable) */     \
-                                                                                                \
-
+32
-}
-
-#define VMX_READ_SELREG(REG, reg) \
-{                                                                    \
-_GUEST_FIELD_##REG,           &val);  
+16_GUEST_FIELD_##REG,           &val);
-        pCtx->reg                = val;                              \
-_GUEST_##REG##_LIMIT,         &val);  
+32_GUEST_##REG##_LIMIT,         &val);
-        pCtx->reg##Hid.u32Limit    = val;                            \
-        VMXReadVMCS(VMX_VMCS_GUEST_##REG##_BASE,          &val);     \
-        pCtx->reg##Hid.u64Base     = val;                            \
-_GUEST_##REG##_ACCESS_RIGHTS, &val);  
+32_GUEST_##REG##_ACCESS_RIGHTS, &val);
-        pCtx->reg##Hid.Attr.u    = val;                              \
-}
@@ -178 +178 @@
-#define VMX_LOG_SELREG(REG, szSelReg) \
-{                                                                    \
-_GUEST_FIELD_##REG,           &val);  
+16_GUEST_FIELD_##REG,           &val);
-        Log(("%s Selector     %x\n", szSelReg, val));                \
-_GUEST_##REG##_LIMIT,         &val);  
+32_GUEST_##REG##_LIMIT,         &val);
-        Log(("%s Limit        %x\n", szSelReg, val));                \
-        VMXReadVMCS(VMX_VMCS_GUEST_##REG##_BASE,          &val);     \
-        Log(("%s Base         %RX64\n", szSelReg, val));             \
-_GUEST_##REG##_ACCESS_RIGHTS, &val);  
+32_GUEST_##REG##_ACCESS_RIGHTS, &val);
-        Log(("%s Attributes   %x\n", szSelReg, val));                \
-}