Changeset 105489 in vbox for trunk

Timestamp:

Jul 24, 2024 2:40:45 PM (6 months ago)

Author:

vboxsync

Message:

VMM/IEM: Introduce special IEM_MC_NATIVE_EMIT_2_EX() IEM microcode statement which also passes the instruction count through, bugref:10652

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstPython.py (modified) (1 diff)
• VMMAll/IEMAllN8veRecompFuncs.h (modified) (2 diffs)
• include/IEMMc.h (modified) (1 diff)
• testcase/tstIEMCheckMc.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py

@@ -3244 +3244 @@
     'IEM_MC_NATIVE_EMIT_1':                                      (McBlock.parseMcGeneric,           True,  True,  True,  ),
     'IEM_MC_NATIVE_EMIT_2':                                      (McBlock.parseMcGeneric,           True,  True,  True,  ),
+    'IEM_MC_NATIVE_EMIT_2_EX':                                   (McBlock.parseMcGeneric,           True,  True,  True,  ),
     'IEM_MC_NATIVE_EMIT_3':                                      (McBlock.parseMcGeneric,           True,  True,  True,  ),
     'IEM_MC_NATIVE_EMIT_4':                                      (McBlock.parseMcGeneric,           True,  True,  True,  ),

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompFuncs.h

@@ -187 +187 @@
 #define IEM_MC_NATIVE_EMIT_2(a_fnEmitter, a0, a1) \
     off = a_fnEmitter(pReNative, off, (a0), (a1))
+
+#define IEM_MC_NATIVE_EMIT_2_EX(a_fnEmitter, a0, a1) \
+    off = a_fnEmitter(pReNative, off, pCallEntry->idxInstr, (a0), (a1))
 
 #define IEM_MC_NATIVE_EMIT_3(a_fnEmitter, a0, a1, a2) \
@@ -3332 +3335 @@
 #ifdef IEMNATIVE_WITH_SIMD_REG_ALLOCATOR
     /* Clear the appropriate IEMNATIVE_SIMD_RAISE_XCPT_CHECKS_EMITTED_XXX flags
-       when a calls clobber any of the relevatn control registers. */
+       when a calls clobber any of the relevant control registers. */
 # if 1
     if (!(fGstShwFlush & (RT_BIT_64(kIemNativeGstReg_Cr0) | RT_BIT_64(kIemNativeGstReg_Cr4) | RT_BIT_64(kIemNativeGstReg_Xcr0))))

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

@@ -2681 +2681 @@
 #define IEM_MC_NATIVE_EMIT_1(a_fnEmitter, a0)                             (void)(a0)
 #define IEM_MC_NATIVE_EMIT_2(a_fnEmitter, a0, a1)                         (void)(a0), (void)(a1)
+#define IEM_MC_NATIVE_EMIT_2_EX(a_fnEmitter, a0, a1)                      (void)(a0), (void)(a1)
 #define IEM_MC_NATIVE_EMIT_3(a_fnEmitter, a0, a1, a2)                     (void)(a0), (void)(a1), (void)(a2)
 #define IEM_MC_NATIVE_EMIT_4(a_fnEmitter, a0, a1, a2, a3)                 (void)(a0), (void)(a1), (void)(a2), (void)(a3)

trunk/src/VBox/VMM/testcase/tstIEMCheckMc.cpp

@@ -592 +592 @@
 #define IEM_MC_NATIVE_EMIT_1(a_fnEmitter, a0)                             do { (void)fMcBegin; (void)(a0); } while (0)
 #define IEM_MC_NATIVE_EMIT_2(a_fnEmitter, a0, a1)                         do { (void)fMcBegin; (void)(a0), (void)(a1); } while (0)
+#define IEM_MC_NATIVE_EMIT_2_EX(a_fnEmitter, a0, a1)                      do { (void)fMcBegin; (void)(a0), (void)(a1); } while (0)
 #define IEM_MC_NATIVE_EMIT_3(a_fnEmitter, a0, a1, a2)                     do { (void)fMcBegin; (void)(a0), (void)(a1), (void)(a2); } while (0)
 #define IEM_MC_NATIVE_EMIT_4(a_fnEmitter, a0, a1, a2, a3)                 do { (void)fMcBegin; (void)(a0), (void)(a1), (void)(a2), (void)(a3); } while (0)