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

Timestamp:

Apr 24, 2013 2:21:09 PM (12 years ago)

Author:

vboxsync

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

85247

Message:

VMM: SELM and VMM early HM init changes.

File:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -1797 +1797 @@
     pCtx->cr3 = env->cr[3];
 #ifdef VBOX_WITH_RAW_MODE
-    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+    if (((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME) && !HMIsEnabled(pVM))
         VMCPU_FF_SET(env->pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
@@ -1920 +1920 @@
     pCtx->cr3 = env->cr[3];
 #ifdef VBOX_WITH_RAW_MODE
-    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+    if (((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME) && !HMIsEnabled(pVM))
         VMCPU_FF_SET(env->pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
@@ -1962 +1962 @@
     pCtx->cr3 = env->cr[3];
 #ifdef VBOX_WITH_RAW_MODE
-    if ((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+    if (((env->cr[4] ^ pCtx->cr4) & X86_CR4_VME) && !HMIsEnabled(pVM))
         VMCPU_FF_SET(env->pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
@@ -2654 +2654 @@
     pCtx->cr3           = pVM->rem.s.Env.cr[3];
 #ifdef VBOX_WITH_RAW_MODE
-    if ((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+    if (((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME) && !HMIsEnabled(pVM))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
@@ -2668 +2668 @@
         STAM_COUNTER_INC(&gStatREMGDTChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
 #endif
     }
@@ -2698 +2699 @@
         STAM_COUNTER_INC(&gStatREMLDTRChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 #endif
     }
@@ -2727 +2729 @@
         STAM_COUNTER_INC(&gStatREMTRChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
     }
@@ -2886 +2889 @@
     pCtx->cr3           = pVM->rem.s.Env.cr[3];
 #ifdef VBOX_WITH_RAW_MODE
-    if ((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME)
+    if (((pVM->rem.s.Env.cr[4] ^ pCtx->cr4) & X86_CR4_VME) && !HMIsEnabled(pVM))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
@@ -2900 +2903 @@
         STAM_COUNTER_INC(&gStatREMGDTChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
 #endif
     }
@@ -2930 +2934 @@
         STAM_COUNTER_INC(&gStatREMLDTRChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
 #endif
     }
@@ -2959 +2964 @@
         STAM_COUNTER_INC(&gStatREMTRChange);
 #ifdef VBOX_WITH_RAW_MODE
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
+        if (!HMIsEnabled(pVM))
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
 #endif
     }