Changeset 9817 in vbox for trunk/src/recompiler

Timestamp:

Jun 19, 2008 11:47:38 AM (17 years ago)

Author:

vboxsync

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

32194

Message:

fs & gs base cleanup

File:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -1825 +1825 @@
         cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_DS, pCtx->ds, pCtx->dsHid.u64Base, pCtx->dsHid.u32Limit, (pCtx->dsHid.Attr.u << 8) & 0xFFFFFF);
         cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_ES, pCtx->es, pCtx->esHid.u64Base, pCtx->esHid.u32Limit, (pCtx->esHid.Attr.u << 8) & 0xFFFFFF);
-
-        /* FS & GS base addresses need to be loaded from the MSRs if in 64 bits mode. */
-        if (CPUMIsGuestIn64BitCodeEx(pCtx))
-        {
-            /* Note that the base values in the hidden fs & gs registers are cut to 32 bits and can't be used in this case. */
-            cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_FS, pCtx->fs, pCtx->msrFSBASE, pCtx->fsHid.u32Limit, (pCtx->fsHid.Attr.u << 8) & 0xFFFFFF);
-            cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_GS, pCtx->gs, pCtx->msrGSBASE, pCtx->gsHid.u32Limit, (pCtx->gsHid.Attr.u << 8) & 0xFFFFFF);
-        }
-        else
-        {
-            cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_FS, pCtx->fs, pCtx->fsHid.u64Base, pCtx->fsHid.u32Limit, (pCtx->fsHid.Attr.u << 8) & 0xFFFFFF);
-            cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_GS, pCtx->gs, pCtx->gsHid.u64Base, pCtx->gsHid.u32Limit, (pCtx->gsHid.Attr.u << 8) & 0xFFFFFF);
-        }
+        cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_FS, pCtx->fs, pCtx->fsHid.u64Base, pCtx->fsHid.u32Limit, (pCtx->fsHid.Attr.u << 8) & 0xFFFFFF);
+        cpu_x86_load_seg_cache(&pVM->rem.s.Env, R_GS, pCtx->gs, pCtx->gsHid.u64Base, pCtx->gsHid.u32Limit, (pCtx->gsHid.Attr.u << 8) & 0xFFFFFF);
     }
     else
@@ -2222 +2211 @@
     pCtx->msrCSTAR         = pVM->rem.s.Env.cstar;
     pCtx->msrSFMASK        = pVM->rem.s.Env.fmask;
-    pCtx->msrFSBASE        = pVM->rem.s.Env.segs[R_FS].base;
-    pCtx->msrGSBASE        = pVM->rem.s.Env.segs[R_GS].base;
     pCtx->msrKERNELGSBASE  = pVM->rem.s.Env.kernelgsbase;
 #endif
@@ -2424 +2411 @@
     pCtx->msrCSTAR         = pVM->rem.s.Env.cstar;
     pCtx->msrSFMASK        = pVM->rem.s.Env.fmask;
-    pCtx->msrFSBASE        = pVM->rem.s.Env.segs[R_FS].base;
-    pCtx->msrGSBASE        = pVM->rem.s.Env.segs[R_GS].base;
     pCtx->msrKERNELGSBASE  = pVM->rem.s.Env.kernelgsbase;
 #endif