Changeset 14704

Timestamp:

11/27/08 14:49:48 (1 month ago)

Author:

vboxsync

Message:

Some more switcher work

Files:

• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMSwitcher.cpp (modified) (4 diffs)

trunk/include/VBox/vmm.h

@@ -147 +147 @@
-VMMR3DECL(int)      VMMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue);
-VMMR3DECL(int)      VMMR3SelectSwitcher(PVM pVM, VMMSWITCHER enmSwitcher);
+VMMR3DECL(int)      VMMR3InitSwitcher3264(PVM pVM);
-VMMR3DECL(int)      VMMR3DisableSwitcher(PVM pVM);
-VMMR3DECL(int)      VMMR3RawRunGC(PVM pVM);

trunk/src/VBox/VMM/HWACCM.cpp

@@ -778 +778 @@
-        }
-    }
+
+#if (HC_ARCH_BITS == 32) && defined(VBOX_ENABLE_64_BITS_GUESTS)
+    if (    pVM->fHWACCMEnabled
+        &&  CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE))
+    {
+        rc  = VMMR3InitSwitcher3264(pVM);
+        if (VBOX_FAILURE(rc))
+        {
+            LogRel(("WARNING: Unable to map the VM structure into the intermediate page table; disabling long mode support\n"));
+            CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE);
+            CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LAHF);
+        }
+    }
+#endif
-    return VINF_SUCCESS;
-}

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

@@ -1501 +1501 @@
-        }
-
+        case CPUMCPUIDFEATURE_LONG_MODE:
+        {
+            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
+                return !!(pVM->cpum.s.aGuestCpuIdExt[1].edx & X86_CPUID_AMD_FEATURE_EDX_LONG_MODE);
+            break;
+        }
+        
-        default:
-            AssertMsgFailed(("enmFeature=%d\n", enmFeature));
@@ -1559 +1566 @@
-                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_AMD_FEATURE_EDX_PAT;
-            LogRel(("CPUMClearGuestCpuIdFeature: Disabled PAT!\n"));
+            break;
+        }
+
+        case CPUMCPUIDFEATURE_LONG_MODE:
+        {
+            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
+                pVM->cpum.s.aGuestCpuIdExt[1].edx &= ~X86_CPUID_AMD_FEATURE_EDX_LONG_MODE;
+            break;
+        }
+
+        case CPUMCPUIDFEATURE_LAHF:
+        {
+            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
+                pVM->cpum.s.aGuestCpuIdExt[1].ecx &= ~X86_CPUID_AMD_FEATURE_ECX_LAHF_SAHF;
-            break;
-        }

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -213 +213 @@
-}
-
-
-/**
- * Relocate the switchers, called by VMMR#Relocate.
@@ -635 +634 @@
-                break;
-            }
-
+
-            /*
-             * 64-bit HC pointer to the CPUM instance data (no argument).
@@ -645 +644 @@
-                break;
-            }
-#endif
-
-            /*
@@ -954 +952 @@
-}
-
+/**
+ * Setup the 32->64 world switcher
+ *
+ * @returns VBox status code.
+ * @param   pVM             VM handle.
+ */
+VMMR3DECL(int) VMMR3InitSwitcher3264(PVM pVM)
+{
+    int rc;
+
+    uint32_t cPages = RT_ALIGN_Z(pVM->cbSelf, PAGE_SIZE) >> PAGE_SHIFT;
+
+    /* Map the entire VM structure into the intermediate page tables as we need to have access
+     * to them in the 32->64 switcher.
+     */
+    for (unsigned i=0;i<cPages;i++)
+    {
+        rc = PGMR3MapIntermediate(pVM, pVM->pVMR0 + i*PAGE_SIZE, pVM->paVMPagesR3[i].Phys, PAGE_SIZE);
+        if (VBOX_FAILURE(rc))
+        {
+            Log(("PGMR3MapIntermediate %RHv %RHp failed with %Rrc\n", pVM->pVMR0 + i*PAGE_SIZE, pVM->paVMPagesR3[i].Phys, rc));
+            break;
+        }
+    }
+    return rc;
+}
+
-
-/**