Changeset 2179 in vbox for trunk

Timestamp:

Apr 18, 2007 2:08:30 PM (18 years ago)

Author:

vboxsync

Message:

The values in the hidden selector registers have to be checked first in all cpu modes.

File:

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

trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

@@ -134 +134 @@
         ||  eflags.Bits.u1VM)
     {
+        if (ppvGC)
+        {
+            if (    pHiddenSel
+                &&  CPUMAreHiddenSelRegsValid(pVM))
+            {
+                *ppvGC = (RTGCPTR)pHiddenSel->u32Base;
+            }
+            else
+            {
+                RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)Sel << 4);
+                *ppvGC = (RTGCPTR)uFlat;
+            }
+        }
         if (pcb)
             *pcb = 0x10000 - ((RTGCUINTPTR)Addr & 0xffff);
-        if (ppvGC)
-        {
-            RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)Sel << 4);
-            *ppvGC = (RTGCPTR)uFlat;
-        }
         return VINF_SUCCESS;
     }
@@ -401 +409 @@
 SELMDECL(int) SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, CPUMSELREGHID *pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat)
 {
-    /*
-     * Deal with real & v86 mode first.
-     */
-    if (    CPUMIsGuestInRealMode(pVM)
-        ||  eflags.Bits.u1VM)
-    {
-        if (ppvFlat)
-        {
-            RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)SelCS << 4);
-            *ppvFlat = (RTGCPTR)uFlat;
-        }
-        return VINF_SUCCESS;
-    }
-
     if (!CPUMAreHiddenSelRegsValid(pVM))
+    {
+        /*
+         * Deal with real & v86 mode first.
+         */
+        if (    CPUMIsGuestInRealMode(pVM)
+            ||  eflags.Bits.u1VM)
+        {
+            if (ppvFlat)
+            {
+                RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)SelCS << 4);
+                *ppvFlat = (RTGCPTR)uFlat;
+            }
+            return VINF_SUCCESS;
+        }
         return selmValidateAndConvertCSAddr(pVM, SelCPL, SelCS, Addr, ppvFlat);
+    }
 
     /*
@@ -500 +509 @@
 SELMDECL(bool) SELMIsSelector32Bit(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
 {
-    /*
-     * Deal with real & v86 mode first.
-     */
-    if (    CPUMIsGuestInRealMode(pVM)
-        ||  eflags.Bits.u1VM)
-        return false;
-
     if (!CPUMAreHiddenSelRegsValid(pVM))
+    {
+        /*
+         * Deal with real & v86 mode first.
+         */
+        if (    CPUMIsGuestInRealMode(pVM)
+            ||  eflags.Bits.u1VM)
+            return false;
+
         return selmIsSelector32Bit(pVM, Sel);
-
+    }
     return pHiddenSel->Attr.n.u1DefBig;
 }