Changeset 9800 in vbox

Timestamp:

Jun 18, 2008 3:50:14 PM (17 years ago)

Author:

vboxsync

Message:

Correction

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -568 +568 @@
 
 /**
+ * Tests if the guest is running in 64 bits mode or not.
+ *
+ * @returns true if in 64 bits protected mode, otherwise false.
+ * @param   pVM     The VM handle.
+ * @param   pCtx    Current CPU context
+ */
+DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PVM pVM, PCCPUMCTX pCtx)
+{
+    if ((pCtx->msrEFER & MSR_K6_EFER_LMA))
+        return false;
+
+    return pCtx->csHid.Attr.n.u1Long;
+}
+
+/**
  * Gets the CPU vendor 
  *

trunk/src/recompiler/VBoxRecompiler.c

@@ -1827 +1827 @@
 
         /* FS & GS base addresses need to be loaded from the MSRs if in 64 bits mode. */
-        if (CPUMIsGuestIn64BitCode(pVM, CPUMCTX2CORE(pCtx)))
+        if (CPUMIsGuestIn64BitCodeEx(pVM, 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. */