Changeset 99988 in vbox

Timestamp:

May 26, 2023 10:43:27 AM (23 months ago)

Author:

vboxsync

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

157650

Message:

VMM/IEM: Externalized prefetch queue flushing from IEMAllCImpl.cpp so that the file can be compiled w/o access to the decoder IEMCPU members. Prevents writing non-recompiler friendly code. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/IEMAllCImpl.cpp (modified) (4 diffs)
• include/IEMInternal.h (modified) (1 diff)

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

@@ -764 +764 @@
 #endif
 }
+
+
+/**
+ * Flushes the prefetch buffer, light version.
+ */
+void iemOpcodeFlushLight(PVMCPUCC pVCpu, uint8_t cbInstr)
+{
+#ifndef IEM_WITH_CODE_TLB
+    pVCpu->iem.s.cbOpcode = cbInstr;
+#else
+    RT_NOREF(pVCpu, cbInstr);
+#endif
+}
+
+
+/**
+ * Flushes the prefetch buffer, heavy version.
+ */
+void iemOpcodeFlushHeavy(PVMCPUCC pVCpu, uint8_t cbInstr)
+{
+#ifndef IEM_WITH_CODE_TLB
+    pVCpu->iem.s.cbOpcode = cbInstr;
+#elif 1
+    pVCpu->iem.s.pbInstrBuf = NULL;
+    RT_NOREF(cbInstr);
+#else
+    RT_NOREF(pVCpu, cbInstr);
+#endif
+}
+
+
 
 #ifdef IEM_WITH_CODE_TLB

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

@@ -32 +32 @@
 #define LOG_GROUP   LOG_GROUP_IEM
 #define VMCPU_INCL_CPUM_GST_CTX
-/// @todo #define IEM_WITH_OPAQUE_DECODER_STATE
+#define IEM_WITH_OPAQUE_DECODER_STATE
 #include <VBox/vmm/iem.h>
 #include <VBox/vmm/cpum.h>
@@ -75 +75 @@
 /**
  * Flushes the prefetch buffer, light version.
+ * @todo The \#if conditions here must match the ones in iemOpcodeFlushLight().
  */
 #ifndef IEM_WITH_CODE_TLB
-# define IEM_FLUSH_PREFETCH_LIGHT(a_pVCpu, a_cbInstr) do { (a_pVCpu)->iem.s.cbOpcode   = (a_cbInstr); } while (0)
+# define IEM_FLUSH_PREFETCH_LIGHT(a_pVCpu, a_cbInstr) iemOpcodeFlushLight(a_pVCpu, a_cbInstr)
 #else
 # define IEM_FLUSH_PREFETCH_LIGHT(a_pVCpu, a_cbInstr) do { } while (0)
@@ -84 +85 @@
 /**
  * Flushes the prefetch buffer, heavy version.
- */
-#ifndef IEM_WITH_CODE_TLB
-# define IEM_FLUSH_PREFETCH_HEAVY(a_pVCpu, a_cbInstr) do { (a_pVCpu)->iem.s.cbOpcode   = (a_cbInstr); } while (0)
+ * @todo The \#if conditions here must match the ones in iemOpcodeFlushHeavy().
+ */
+#if !defined(IEM_WITH_CODE_TLB) || 1
+# define IEM_FLUSH_PREFETCH_HEAVY(a_pVCpu, a_cbInstr) iemOpcodeFlushHeavy(a_pVCpu, a_cbInstr)
 #else
-# if 1
-#  define IEM_FLUSH_PREFETCH_HEAVY(a_pVCpu, a_cbInstr) do { (a_pVCpu)->iem.s.pbInstrBuf = NULL; } while (0)
-# else
-#  define IEM_FLUSH_PREFETCH_HEAVY(a_pVCpu, a_cbInstr) do { } while (0)
-# endif
+# define IEM_FLUSH_PREFETCH_HEAVY(a_pVCpu, a_cbInstr) do { } while (0)
 #endif
 
@@ -2633 +2631 @@
 
     /* Flush the prefetch buffer. */
-    IEM_FLUSH_PREFETCH_HEAVY(pVCpu, cbInstr); /** @todo use light flush for same privlege? */
+    IEM_FLUSH_PREFETCH_HEAVY(pVCpu, cbInstr); /** @todo use light flush for same privilege? */
 
     return iemRegFinishClearingRF(pVCpu);

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -4041 +4041 @@
 VBOXSTRICTRC    iemMemPageTranslateAndCheckAccess(PVMCPUCC pVCpu, RTGCPTR GCPtrMem, uint32_t cbAccess, uint32_t fAccess, PRTGCPHYS pGCPhysMem) RT_NOEXCEPT;
 
+void            iemOpcodeFlushLight(PVMCPUCC pVCpu, uint8_t cbInstr);
+void            iemOpcodeFlushHeavy(PVMCPUCC pVCpu, uint8_t cbInstr);
 #ifdef IEM_WITH_CODE_TLB
 void            iemOpcodeFetchBytesJmp(PVMCPUCC pVCpu, size_t cbDst, void *pvDst) IEM_NOEXCEPT_MAY_LONGJMP;