Changeset 9769

Timestamp:

06/17/08 15:53:12 (6 months ago)

Author:

vboxsync

Message:

Sync MSRs before the CRx registers.

Files:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -1687 +1687 @@
-    }
-
+    /* Update MSRs; before CRx registers! */
+    pVM->rem.s.Env.efer         = pCtx->msrEFER;
+    pVM->rem.s.Env.star         = pCtx->msrSTAR;
+    pVM->rem.s.Env.pat          = pCtx->msrPAT;
+#ifdef TARGET_X86_64
+    pVM->rem.s.Env.lstar        = pCtx->msrLSTAR;
+    pVM->rem.s.Env.cstar        = pCtx->msrCSTAR;
+    pVM->rem.s.Env.fmask        = pCtx->msrSFMASK;
+    pVM->rem.s.Env.kernelgsbase = pCtx->msrKERNELGSBASE;
+#endif
+    /* Note that FS_BASE & GS_BASE are already synced; QEmu keeps them in the hidden selector registers.
+     * So we basically assume the hidden registers are in sync with these MSRs (vt-x & amd-v). Correct??
+     */
+
+
-    /*
-     * Registers which are rarely changed and require special handling / order when changed.
@@ -1907 +1922 @@
-            pVM->rem.s.Env.segs[R_GS].newselector = 0;
-    }
-
-    /* Update MSRs. */
-    pVM->rem.s.Env.efer         = pCtx->msrEFER;
-    pVM->rem.s.Env.star         = pCtx->msrSTAR;
-    pVM->rem.s.Env.pat          = pCtx->msrPAT;
-#ifdef TARGET_X86_64
-    pVM->rem.s.Env.lstar        = pCtx->msrLSTAR;
-    pVM->rem.s.Env.cstar        = pCtx->msrCSTAR;
-    pVM->rem.s.Env.fmask        = pCtx->msrSFMASK;
-    pVM->rem.s.Env.kernelgsbase = pCtx->msrKERNELGSBASE;
-#endif
-    /* Note that FS_BASE & GS_BASE are already synced; QEmu keeps them in the hidden selector registers.
-     * So we basically assume the hidden registers are in sync with these MSRs (vt-x & amd-v). Correct??
-     */
-
-    /*