Changeset 45276 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Apr 2, 2013 8:17:11 AM (12 years ago)

Author:

vboxsync

Message:

Ring-1 compression patches, courtesy of trivirt AG:

• main: diff to remove the hwvirt requirement for QNX
• rem: diff for dealing with raw ring 0/1 selectors and general changes to allowed guest execution states
• vmm: changes for using the guest's TSS selector index as our hypervisor TSS selector (makes str safe) (VBOX_WITH_SAFE_STR )
• vmm: changes for dealing with guest ring 1 code (VBOX_WITH_RAW_RING1)
• vmm: change to emulate smsw in RC/R0 (QNX uses this old style instruction a lot so going to qemu for emulation is very expensive)
• vmm: change (hack) to kick out patm virtual handlers in case they conflict with guest GDT/TSS write monitors; we should allow multiple handlers per page, but that change would be rather invasive

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (4 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1371 +1371 @@
          */
         case EXCP_EXECUTE_RAW:
-            Log2(("REMR3Run: cpu_exec -> EXCP_EXECUTE_RAW\n"));
+            Log2(("REMR3Run: cpu_exec -> EXCP_EXECUTE_RAW pc=%RGv\n", pVM->rem.s.Env.eip));
             rc = VINF_EM_RESCHEDULE_RAW;
             break;
@@ -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. */
+            {
+                Log2(("raw r0 mode refused: CPL %d\n", (fFlags >> HF_CPL_SHIFT) & 3));
+                return false;
+            }
+        }
+        else
+# endif
         // Only R0
         if (((fFlags >> HF_CPL_SHIFT) & 3) != 0)
@@ -1665 +1677 @@
 #endif
 
+#ifndef VBOX_WITH_RAW_RING1
+        if (((env->eflags >> IOPL_SHIFT) & 3) != 0)
+        {
+            Log2(("raw r0 mode refused: IOPL %d\n", ((env->eflags >> IOPL_SHIFT) & 3)));
+            return false;
+        }
+#endif
         env->state |= CPU_RAW_RING0;
     }
@@ -1764 +1783 @@
     if (pVM->rem.s.fIgnoreInvlPg || pVM->rem.s.cIgnoreAll)
         return;
-    Log(("remR3FlushPage: GCPtr=%RGv\n", GCPtr));
+    LogFlow(("remR3FlushPage: GCPtr=%RGv\n", GCPtr));
     Assert(pVM->rem.s.fInREM || pVM->rem.s.fInStateSync);