Changeset 101911 in vbox for trunk/src

Timestamp:

Nov 7, 2023 1:29:56 AM (16 months ago)

Author:

vboxsync

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

160007

Message:

VMM/IEM: Added IEM_MC_NO_NATIVE_RECOMPILE and cleaned up iemNativeFixupFixedJump. bugref:10371

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -3097 +3097 @@
     'IEM_MC_UPDATE_FSW_WITH_MEM_OP':                             (McBlock.parseMcGeneric,           True,  False, ),
     'IEM_MC_UPDATE_FSW_WITH_MEM_OP_THEN_POP':                    (McBlock.parseMcGeneric,           True,  False, ),
+    'IEM_MC_NO_NATIVE_RECOMPILE':                                (McBlock.parseMcGeneric,           False, False, ),
 };
 

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

@@ -55 +55 @@
     } while (0)
 
+
+/** Dummy MC that prevents native recompilation. */
+#define IEM_MC_NO_NATIVE_RECOMPILE()                    ((void)0)
 
 /** Advances RIP, finishes the instruction and returns.

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

@@ -3130 +3130 @@
 # elif defined(RT_ARCH_ARM64)
     uint32_t * const pu32CodeBuf = pReNative->pInstrBuf;
-    Assert((uint32_t)RT_ABS((int32_t)(offTarget - offFixup)) < RT_BIT_32(18)); /* off by one for negative jumps, but not relevant here */
-    pu32CodeBuf[offFixup] = (pu32CodeBuf[offFixup] & ~((RT_BIT_32(19) - 1U) << 5))
-                          | (((offTarget - offFixup) & (RT_BIT_32(19) - 1U)) << 5);
+
+    int32_t const offDisp = offTarget - offFixup;
+    Assert(offDisp >= -262144 && offDisp < 262144);
+    Assert((pu32CodeBuf[offFixup] & UINT32_C(0xff000000)) == UINT32_C(0x54000000)); /* B.COND + BC.COND */
+
+    pu32CodeBuf[offFixup] = (pu32CodeBuf[offFixup] & UINT32_C(0xff00001f))
+                          | (((uint32_t)offDisp    & UINT32_C(0x0007ffff)) << 5);
 
 # endif

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

@@ -567 +567 @@
 #define IEM_MC_END() \
     }
+#define IEM_MC_NO_NATIVE_RECOMPILE()                    ((void)0)
 
 #define IEM_MC_ADVANCE_RIP_AND_FINISH()                 do { (void)fMcBegin; return VINF_SUCCESS; } while (0)