Changeset 45485 in vbox for trunk/src/recompiler

Timestamp:

Apr 11, 2013 2:46:04 PM (12 years ago)

Author:

vboxsync

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

84947

Message:

• *: Where possible, drop the #ifdef VBOX_WITH_RAW_RING1 when EMIsRawRing1Enabled is used.
• SELM: Don't shadow TSS.esp1/ss1 unless ring-1 compression is enabled (also fixed a log statement there).
• SELM: selmGuestToShadowDesc should not push ring-1 selectors into ring-2 unless EMIsRawRing1Enabled() holds true.
• REM: Don't set CPU_INTERRUPT_EXTERNAL_EXIT in helper_ltr() for now.

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (2 diffs)
• target-i386/op_helper.c (modified) (4 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1633 +1633 @@
         }
 
-# ifdef VBOX_WITH_RAW_RING1
-        /* Only ring 0 and 1 supervisor code. */
         if (EMIsRawRing1Enabled(env->pVM))
         {
-            if (((fFlags >> HF_CPL_SHIFT) & 3) == 2)   /* ring 1 code is moved into ring 2, so we can't support ring-2 in that case. */
+            /* Only ring 0 and 1 supervisor code. */
+            if (((fFlags >> HF_CPL_SHIFT) & 3) == 2) /* ring 1 code is moved into ring 2, so we can't support ring-2 in that case. */
             {
                 Log2(("raw r0 mode refused: CPL %d\n", (fFlags >> HF_CPL_SHIFT) & 3));
@@ -1643 +1642 @@
             }
         }
-        else
-# endif
-        // Only R0
-        if (((fFlags >> HF_CPL_SHIFT) & 3) != 0)
+        /* Only R0. */
+        else if (((fFlags >> HF_CPL_SHIFT) & 3) != 0)
         {
             STAM_COUNTER_INC(&gStatRefuseRing1or2);

trunk/src/recompiler/target-i386/op_helper.c

@@ -232 +232 @@
 #ifdef VBOX
     /* Trying to load a selector with CPL=1? */
-    /* @todo this is a hack to correct the incorrect checking order for pending interrupts in the patm iret replacement code (corrected in the ring-1 version) */
-    /* @todo in theory the iret could fault and we'd still need this. */
+    /** @todo this is a hack to correct the incorrect checking order for pending interrupts in the patm iret replacement code (corrected in the ring-1 version) */
+    /** @todo in theory the iret could fault and we'd still need this. */
     if ((env->hflags & HF_CPL_MASK) == 0 && (selector & 3) == 1 && (env->state & CPU_RAW_RING0) && !EMIsRawRing1Enabled(env->pVM))
     {
@@ -2561 +2561 @@
          (RTGCPTR)env->eip, (RTSEL)env->tr.selector, (RTGCPTR)env->tr.base, (RTGCPTR)env->tr.limit,
          env->tr.flags, (RTSEL)(selector & 0xffff)));
+# if 0 /** @todo r=bird: This looks very fishy, need good reason to re-enable it. */
     ASMAtomicOrS32((int32_t volatile *)&env->interrupt_request,
                     CPU_INTERRUPT_EXTERNAL_EXIT);
+# endif
 #endif
     selector &= 0xffff;
@@ -3186 +3188 @@
         if ((new_cs & 0x3) == 1 && (env->state & CPU_RAW_RING0))
         {
-# ifdef VBOX_WITH_RAW_RING1
             if (   !EMIsRawRing1Enabled(env->pVM)
                 ||  env->segs[R_CS].selector == (new_cs & 0xfffc))
@@ -3198 +3199 @@
                 Log(("Genuine switch to ring-1 (iret)\n"));
             }
-# else
-            Log(("RPL 1 -> new_cs %04X -> %04X\n", new_cs, new_cs & 0xfffc));
-            new_cs = new_cs & 0xfffc;
-# endif
-        }
-# ifdef VBOX_WITH_RAW_RING1
-        else
-        if ((new_cs & 0x3) == 2 && (env->state & CPU_RAW_RING0) && EMIsRawRing1Enabled(env->pVM))
+        }
+        else if ((new_cs & 0x3) == 2 && (env->state & CPU_RAW_RING0) && EMIsRawRing1Enabled(env->pVM))
         {
             Log(("RPL 2 -> new_cs %04X -> %04X\n", new_cs, (new_cs & 0xfffc) | 1));
             new_cs = (new_cs & 0xfffc) | 1;
         }
-# endif
 #endif
     } else {