Changeset 2181 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 18, 2007 2:27:49 PM (18 years ago)

Author:

vboxsync

Message:

SELMValidateAndConvertCSAddr correction

File:

• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (1 diff)

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

@@ -409 +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;
+
+            if (!CPUMAreHiddenSelRegsValid(pVM))
+                uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)SelCS << 4);
+            else
+                uFlat = pHiddenCSSel->u32Base;
+
+            *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);
-    }
 
     /*