Changeset 42705 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 9, 2012 8:04:22 AM (13 years ago)

Author:

vboxsync

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

79911

Message:

CPUM: Set FF when needed (VBOX_WITH_IEM only). Made CPUMRawSetEFlags generally accessible.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (7 diffs)

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

@@ -543 +543 @@
 VMMDECL(int) CPUMSetGuestGDTR(PVMCPU pVCpu, uint64_t GCPtrBase, uint16_t cbLimit)
 {
+#ifdef VBOX_WITH_IEM
+# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (!HWACCMIsEnabled(pVCpu->CTX_SUFF(pVM)))
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+# endif
+#endif
     pVCpu->cpum.s.Guest.gdtr.cbGdt = cbLimit;
     pVCpu->cpum.s.Guest.gdtr.pGdt  = GCPtrBase;
@@ -551 +557 @@
 VMMDECL(int) CPUMSetGuestIDTR(PVMCPU pVCpu, uint64_t GCPtrBase, uint16_t cbLimit)
 {
+#ifdef VBOX_WITH_IEM
+# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (!HWACCMIsEnabled(pVCpu->CTX_SUFF(pVM)))
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT);
+# endif
+#endif
     pVCpu->cpum.s.Guest.idtr.cbIdt = cbLimit;
     pVCpu->cpum.s.Guest.idtr.pIdt  = GCPtrBase;
@@ -559 +571 @@
 VMMDECL(int) CPUMSetGuestTR(PVMCPU pVCpu, uint16_t tr)
 {
+#ifdef VBOX_WITH_IEM
+# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (!HWACCMIsEnabled(pVCpu->CTX_SUFF(pVM)))
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+# endif
+#endif
     pVCpu->cpum.s.Guest.tr.Sel  = tr;
     pVCpu->cpum.s.fChanged |= CPUM_CHANGED_TR;
@@ -566 +584 @@
 VMMDECL(int) CPUMSetGuestLDTR(PVMCPU pVCpu, uint16_t ldtr)
 {
+#ifdef VBOX_WITH_IEM
+# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (   (   ldtr != 0
+            || pVCpu->cpum.s.Guest.ldtr.Sel != 0)
+        && !HWACCMIsEnabled(pVCpu->CTX_SUFF(pVM)))
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+# endif
+#endif
     pVCpu->cpum.s.Guest.ldtr.Sel      = ldtr;
     /* The caller will set more hidden bits if it has them. */
@@ -2419 +2445 @@
 #endif
 
-#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+
 /**
  * Updates the EFLAGS while we're in raw-mode.
@@ -2428 +2454 @@
 VMMDECL(void) CPUMRawSetEFlags(PVMCPU pVCpu, uint32_t fEfl)
 {
-    if (!pVCpu->cpum.s.fRawEntered)
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (pVCpu->cpum.s.fRawEntered)
+        PATMRawSetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest), fEfl);
+    else
+#endif
         pVCpu->cpum.s.Guest.eflags.u32 = fEfl;
-    else
-        PATMRawSetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest), fEfl);
-}
-#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
+}
 
 
@@ -2444 +2471 @@
 VMMDECL(uint32_t) CPUMRawGetEFlags(PVMCPU pVCpu)
 {
-#ifdef IN_RING0
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+    if (pVCpu->cpum.s.fRawEntered)
+        return PATMRawGetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest));
+#endif
     return pVCpu->cpum.s.Guest.eflags.u32;
-#else
-
-    if (!pVCpu->cpum.s.fRawEntered)
-        return pVCpu->cpum.s.Guest.eflags.u32;
-    return PATMRawGetEFlags(pVCpu->CTX_SUFF(pVM), CPUMCTX2CORE(&pVCpu->cpum.s.Guest));
-#endif
 }