Changeset 74152 in vbox

Timestamp:

Sep 8, 2018 10:49:05 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124924

Message:

VMM/IEM: Nested VMX: bugref:9180 vmlaunch/vmresume bits. Granularity bit checks consistency.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2540 +2540 @@
 
             /* Granularity. */
-            if (   (   (SelReg.u32Limit & 0xfff) != 0xfff
-                    && uGranularity == 0)
-                || (   (SelReg.u32Limit & 0xfff00000)
-                    && uGranularity == 1))
+            if (   ((SelReg.u32Limit & 0x00000fff) == 0x00000fff || !uGranularity)
+                && ((SelReg.u32Limit & 0xfff00000) == 0x00000000 ||  uGranularity))
             { /* likely */ }
             else
@@ -2707 +2705 @@
                 IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestSegAttrLdtrPresent);
 
-            if (   (   (Ldtr.u32Limit & 0xfff) != 0xfff
-                    && Ldtr.Attr.n.u1Granularity == 0)
-                || (   (Ldtr.u32Limit & 0xfff00000)
-                    && Ldtr.Attr.n.u1Granularity == 1))
+            if (   ((Ldtr.u32Limit & 0x00000fff) == 0x00000fff || !Ldtr.Attr.n.u1Granularity)
+                && ((Ldtr.u32Limit & 0xfff00000) == 0x00000000 ||  Ldtr.Attr.n.u1Granularity))
             { /* likely */ }
             else
@@ -2771 +2767 @@
             IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestSegAttrTrPresent);
 
-        if (   (   (Tr.u32Limit & 0xfff) != 0xfff
-                && Tr.Attr.n.u1Granularity == 0)
-            || (   (Tr.u32Limit & 0xfff00000)
-                && Tr.Attr.n.u1Granularity == 1))
+        if (   ((Tr.u32Limit & 0x00000fff) == 0x00000fff || !Tr.Attr.n.u1Granularity)
+            && ((Tr.u32Limit & 0xfff00000) == 0x00000000 ||  Tr.Attr.n.u1Granularity))
         { /* likely */ }
         else