Changeset 1361 in vbox for trunk

Timestamp:

Mar 9, 2007 10:48:31 AM (18 years ago)

Author:

vboxsync

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

19352

Message:

Compile fix + updates

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IOMAll.cpp (modified) (1 diff)
• SELMAll.cpp (modified) (4 diffs)

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

@@ -1199 +1199 @@
      */
     uint32_t efl = CPUMRawGetEFlags(pVM, pCtxCore);
-
-    if (    (    (pCtxCore->ss & X86_SEL_RPL) > 1
+    uint32_t cpl = (pCtxCore->ss & X86_SEL_RPL);
+
+    if (    (    cpl > 1
              &&  X86_EFL_GET_IOPL(efl) < cpl)
         ||  pCtxCore->eflags.Bits.u1VM      /* IOPL is ignored in V86 mode; always check TSS bitmap */

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

@@ -91 +91 @@
 {
     /*
-     * Deal with real mode first.
+     * Deal with real & v86 mode first.
      */
     if (    CPUMIsGuestInRealMode(pVM)
@@ -126 +126 @@
 {
     /*
-     * Deal with real mode first.
+     * Deal with real & v86 mode first.
      */
     if (    CPUMIsGuestInRealMode(pVM)
@@ -375 +375 @@
 SELMDECL(int) SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, CPUMSELREGHID *pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat)
 {
-    /* Special handling for V86 mode */
-    if (eflags.Bits.u1VM)
+    /*
+     * Deal with real & v86 mode first.
+     */
+    if (    CPUMIsGuestInRealMode(pVM)
+        ||  eflags.Bits.u1VM)
     {
         if (ppvFlat)
@@ -471 +474 @@
 SELMDECL(bool) SELMIsSelector32Bit(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel)
 {
-    if (eflags.Bits.u1VM)
+    /*
+     * Deal with real & v86 mode first.
+     */
+    if (    CPUMIsGuestInRealMode(pVM)
+        ||  eflags.Bits.u1VM)
         return false;