儲存庫 vbox 的更動 14899

時間撮記:

2008-12-2 下午12:39:34 (16 年 以前)

作者:

vboxsync

訊息:

Wrote testcase for the new switcher.

位置:

trunk

檔案:

• include/VBox/hwaccm.h (修改) (1 筆差異)
• include/VBox/vmm.h (修改) (1 筆差異)
• src/VBox/VMM/HWACCM.cpp (修改) (1 筆差異)
• src/VBox/VMM/HWACCMInternal.h (修改) (1 筆差異)
• src/VBox/VMM/VMMGC/HWACCMGCA.asm (修改) (1 筆差異)
• src/VBox/VMM/VMMGC/VMMGC.def (修改) (1 筆差異)
• src/VBox/VMM/VMMR0/HWACCMR0.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMR0/VMMR0.cpp (修改) (1 筆差異)

trunk/include/VBox/hwaccm.h

@@ -135 +135 @@
 VMMR0DECL(int)   HWACCMR0SaveFPUState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
 VMMR0DECL(int)   HWACCMR0SaveDebugState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+VMMR0DECL(int)   HWACCMR0TestSwitcher3264(PVM pVM);
 # endif
 

trunk/include/VBox/vmm.h

@@ -263 +263 @@
     /** Official call we use for testing Ring-0 APIs. */
     VMMR0_DO_TESTS,
+    /** Test the 32->64 bits switcher. */
+    VMMR0_DO_TEST_SWITCHER3264,
 
     /** The usual 32-bit type blow up. */

trunk/src/VBox/VMM/HWACCM.cpp

@@ -843 +843 @@
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "HWACCMSaveGuestDebug64",   &pVM->hwaccm.s.pfnSaveGuestDebug64);
         AssertMsgRCReturn(rc, ("HWACCMSetupDebug64 -> rc=%Rrc\n", rc), rc);
+
+#ifdef DEBUG
+        rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "HWACCMTestSwitcher64",   &pVM->hwaccm.s.pfnTest64);
+        AssertMsgRCReturn(rc, ("HWACCMTestSwitcher64 -> rc=%Rrc\n", rc), rc);
+#endif
     }
 #endif

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -225 +225 @@
     /* RC handler to setup the 64 bits debug state. */
     RTRCPTR                     pfnSaveGuestDebug64;
+
+# ifdef DEBUG
+    /* Test handler */
+    RTRCPTR                     pfnTest64;
+
+    RTRCPTR                     uAlignment[1];
+# endif
 #endif
 

trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm

@@ -550 +550 @@
 ENDPROC HWACCMSaveGuestDebug64
 
+BEGINPROC HWACCMTestSwitcher64
+    ret
+ENDPROC HWACCMTestSwitcher64

trunk/src/VBox/VMM/VMMGC/VMMGC.def

@@ -67 +67 @@
     HWACCMSaveGuestFPU64
     HWACCMSaveGuestDebug64
+    HWACCMTestSwitcher64
 
     ; runtime

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -1032 +1032 @@
     return SVMR0Execute64BitsHandler(pVM, pVCpu, pCtx, pVM->hwaccm.s.pfnSaveGuestDebug64);
 }
+
+#ifdef DEBUG
+/**
+ * Test the 32->64 bits switcher
+ *
+ * @returns VBox status code.
+ * @param   pVM         VM handle.
+ */
+VMMR0DECL(int)   HWACCMR0TestSwitcher3264(PVM pVM)
+{
+    PVMCPU   pVCpu = &pVM->aCpus[0];
+    CPUMCTX *pCtx;
+
+    pCtx = CPUMQueryGuestCtxPtrEx(pVM, pVCpu);
+
+    if (pVM->hwaccm.s.vmx.fSupported)
+        return VMXR0Execute64BitsHandler(pVM, pVCpu, pCtx, pVM->hwaccm.s.pfnTest64);
+
+    return SVMR0Execute64BitsHandler(pVM, pVCpu, pCtx, pVM->hwaccm.s.pfnTest64);
+}
+#endif
 
 #endif /* HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) */

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -925 +925 @@
 
 
+#if defined(DEBUG) && HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
+        case VMMR0_DO_TEST_SWITCHER3264:
+            return HWACCMR0TestSwitcher3264(pVM);
+#endif
         default:
             /*