儲存庫 vbox 的更動 100109

時間撮記:

2023-6-7 下午08:21:40 (21 月 以前)

作者:

vboxsync

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

157802

訊息:

VMM/IEM: Make it compile and link again with VBOX_WITH_IEM_RECOMPILER=1. bugref:10369

位置:

trunk/src/VBox/VMM

檔案:

• Config.kmk (修改) (1 筆差異)
• VMMAll/IEMAllCImplVmxInstr.cpp (修改) (2 筆差異)
• VMMAll/IEMAllInstructionsThreadedRecompiler.cpp (修改) (6 筆差異)

trunk/src/VBox/VMM/Config.kmk

@@ -68 +68 @@
  VMM_COMMON_DEFS += IEM_WITHOUT_VEX
 endif
-ifdef VBOX_WITH_IEM_TLB ## @todo VMX code doesn't compile with TLBs enabled.
+ifdef VBOX_WITH_IEM_RECOMPILER # Selectely removing hwvirt doesn't work yet with the recompiler. Python code doesn't check #ifdefs.
+ VMM_COMMON_DEFS += VBOX_WITH_IEM_RECOMPILER IEM_WITH_CODE_TLB IEM_WITH_DATA_TLB
+ VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX
+ #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT # Busted with TLB enabled.
+ # VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+ #endif
+ ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+ endif
+else ifdef VBOX_WITH_IEM_TLB ## @todo VMX code doesn't compile with TLBs enabled.
  VMM_COMMON_DEFS  += IEM_WITH_CODE_TLB IEM_WITH_DATA_TLB
 else

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

@@ -9841 +9841 @@
 
 
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+#if defined(VBOX_WITH_NESTED_HWVIRT_VMX_EPT) || defined(VBOX_WITH_IEM_RECOMPILER) /* HACK ALERT: Linking trick. */
 /**
  * Implements 'INVEPT'.
@@ -9847 +9847 @@
 IEM_CIMPL_DEF_3(iemCImpl_invept, uint8_t, iEffSeg, RTGCPTR, GCPtrInveptDesc, uint64_t, uInveptType)
 {
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
     return iemVmxInvept(pVCpu, cbInstr, iEffSeg, GCPtrInveptDesc, uInveptType, NULL /* pExitInfo */);
+# else
+    RT_NOREF(pVCpu, cbInstr, iEffSeg, GCPtrInveptDesc, uInveptType);
+    AssertFailedReturn(VERR_IEM_ASPECT_NOT_IMPLEMENTED);
+# endif
 }
 #endif

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

@@ -268 +268 @@
  */
 
-static VBOXSTRICTRC iemThreadedCompile(PVMCCV pVM, PVMCPUCC pVCpu)
-{
-    RT_NOREF(pVM, pVCpu, pTb);
+static VBOXSTRICTRC iemThreadedCompile(PVMCC pVM, PVMCPUCC pVCpu)
+{
+    RT_NOREF(pVM, pVCpu);
     return VERR_NOT_IMPLEMENTED;
 }
 
 
-static VBOXSTRICTRC iemThreadedCompileLongJumped(PVMCCV pVM, PVMCPUCC pVCpu, VBOXSTRICTRC rcStrict)
+static VBOXSTRICTRC iemThreadedCompileLongJumped(PVMCC pVM, PVMCPUCC pVCpu, VBOXSTRICTRC rcStrict)
 {
     RT_NOREF(pVM, pVCpu);
@@ -282 +282 @@
 
 
-static PIEMTB iemThreadedTbLookup(PVMCCV pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhysPC, uint64_t uPc)
+static PIEMTB iemThreadedTbLookup(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhysPC, uint64_t uPc)
 {
     RT_NOREF(pVM, pVCpu, GCPhysPC, uPc);
@@ -289 +289 @@
 
 
-static VBOXSTRICTRC iemThreadedTbExec(PVMCCV pVM, PVMCPUCC pVCpu, PIEMTB pTb)
+static VBOXSTRICTRC iemThreadedTbExec(PVMCC pVM, PVMCPUCC pVCpu, PIEMTB pTb)
 {
     RT_NOREF(pVM, pVCpu, pTb);
@@ -309 +309 @@
     pVCpu->iem.s.cbInstrBufTotal  = 0;
 
+    RT_NOREF(uPc, pPhys);
+    return 0;
 }
 
@@ -315 +317 @@
 DECL_INLINE_THROW(uint64_t) iemGetPcWithPhysAndCode(PVMCPUCC pVCpu, PRTGCPHYS pPhys)
 {
-    Assert(pVCpu->cpum.GstCtx.cs.u64Base == 0 || pVCpu->iem.s.enmCpuMode != IEMMODE_64BIT);
+    Assert(pVCpu->cpum.GstCtx.cs.u64Base == 0 || !IEM_IS_64BIT_CODE(pVCpu));
     uint64_t const uPc = pVCpu->cpum.GstCtx.rip + pVCpu->cpum.GstCtx.cs.u64Base;
     if (pVCpu->iem.s.pbInstrBuf)
@@ -361 +363 @@
             {
                 /* Translate PC to physical address, we'll need this for both lookup and compilation. */
-                RTGCPHYS       GCPhysPC;
-                uint64_t const uPC = iemGetPcWithPhysAndCode(pVCpu, &GCPhysPC);
-
-                pTb = iemThreadedTbLookup(pVM, pVCpu, GCPhysPC, uPc);
+                RTGCPHYS       GCPhysPc;
+                uint64_t const uPc = iemGetPcWithPhysAndCode(pVCpu, &GCPhysPc);
+
+                pTb = iemThreadedTbLookup(pVM, pVCpu, GCPhysPc, uPc);
                 if (pTb)
                     rcStrict = iemThreadedTbExec(pVM, pVCpu, pTb);
                 else
-                    rcStrict = iemThreadedCompile(pVM, pVCpu, GCPhysPC, uPc);
+                    rcStrict = iemThreadedCompile(pVM, pVCpu /*, GCPhysPc, uPc*/);
                 if (rcStrict == VINF_SUCCESS)
                 { /* likely */ }