Changeset 45485 in vbox for trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

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.

File:

• trunk/src/VBox/VMM/VMMRC/SELMRC.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

@@ -35 +35 @@
 #include <iprt/asm.h>
 
+#include "SELMInline.h"
+
 
 /*******************************************************************************
@@ -43 +45 @@
 static char const g_aszSRegNms[X86_SREG_COUNT][4] = { "ES", "CS", "SS", "DS", "FS", "GS" };
 #endif
+
 
 #ifdef SELM_TRACK_GUEST_GDT_CHANGES
@@ -308 +311 @@
 #endif /* SELM_TRACK_GUEST_GDT_CHANGES */
 
+
 #ifdef SELM_TRACK_GUEST_LDT_CHANGES
 /**
@@ -332 +336 @@
 }
 #endif
+
 
 #ifdef SELM_TRACK_GUEST_TSS_CHANGES
@@ -407 +412 @@
         }
 #ifdef VBOX_WITH_RAW_RING1
-        else
-        if (    EMIsRawRing1Enabled(pVM)
-            &&  PAGE_ADDRESS(&pGuestTss->esp1) == PAGE_ADDRESS(&pGuestTss->padding_ss1)
-            &&  PAGE_ADDRESS(&pGuestTss->esp1) == PAGE_ADDRESS((uint8_t *)pGuestTss + offRange)
-            &&  (    pGuestTss->esp1 !=  pVM->selm.s.Tss.esp2
-                 ||  pGuestTss->ss1  != ((pVM->selm.s.Tss.ss2 & ~2) | 1)) /* undo raw-r1 */
-           )
+        else if (    EMIsRawRing1Enabled(pVM)
+                 &&  PAGE_ADDRESS(&pGuestTss->esp1) == PAGE_ADDRESS(&pGuestTss->padding_ss1)
+                 &&  PAGE_ADDRESS(&pGuestTss->esp1) == PAGE_ADDRESS((uint8_t *)pGuestTss + offRange)
+                 &&  (    pGuestTss->esp1 !=  pVM->selm.s.Tss.esp2
+                      ||  pGuestTss->ss1  != ((pVM->selm.s.Tss.ss2 & ~2) | 1)) /* undo raw-r1 */
+                )
         {
             Log(("selmRCGuestTSSWriteHandler: R1 stack: %RTsel:%RGv -> %RTsel:%RGv\n",
@@ -513 +517 @@
 #endif /* SELM_TRACK_GUEST_TSS_CHANGES */
 
+
 #ifdef SELM_TRACK_SHADOW_GDT_CHANGES
 /**
@@ -534 +539 @@
 #endif
 
+
 #ifdef SELM_TRACK_SHADOW_LDT_CHANGES
 /**
@@ -556 +562 @@
 #endif
 
+
 #ifdef SELM_TRACK_SHADOW_TSS_CHANGES
 /**