Changeset 101535 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp

Timestamp:

Oct 20, 2023 9:53:15 PM (15 months ago)

Author:

vboxsync

Message:

VMM/IEM: Assert that we don't overshoot iemNativeInstrBufEnsure space reservations (mainly an x86 host issue). bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (8 diffs)

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

@@ -2960 +2960 @@
 #  error "Port me!"
 # endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
     return off;
 }
@@ -2989 +2990 @@
     pbCodeBuf[off++] = 0x0b;                    /* or edx, eax */
     pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, X86_GREG_xDX, X86_GREG_xAX);
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
 
     /* Jump to non-zero status return path. */
@@ -3015 +3017 @@
 # error "port me"
 #endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
     return off;
 }
@@ -3201 +3204 @@
      * Make the call.
      */
-#ifdef RT_ARCH_AMD64
-    off = iemNativeEmitLoadGprImm64(pReNative, off, X86_GREG_xAX, pfnCImpl);
-
-    uint8_t *pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 2);
-    AssertReturn(pbCodeBuf, UINT32_MAX);
-    pbCodeBuf[off++] = 0xff;                    /* call rax */
-    pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_REG, 2, X86_GREG_xAX);
-
-# if defined(VBOXSTRICTRC_STRICT_ENABLED) && defined(RT_OS_WINDOWS)
+    off = iemNativeEmitCallImm(pReNative, off, pfnCImpl);
+
+#if defined(RT_ARCH_AMD64) && defined(VBOXSTRICTRC_STRICT_ENABLED) && defined(RT_OS_WINDOWS)
     off = iemNativeEmitLoadGprByBpU32(pReNative, off, X86_GREG_xAX, IEMNATIVE_FP_OFF_IN_SHADOW_ARG0); /* rcStrict (see above) */
-# endif
-
-#elif defined(RT_ARCH_ARM64)
-    off = iemNativeEmitLoadGprImm64(pReNative, off, IEMNATIVE_REG_FIXED_TMP0, pfnCImpl);
-
-    uint32_t *pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
-    AssertReturn(pu32CodeBuf, UINT32_MAX);
-    pu32CodeBuf[off++] = Armv8A64MkInstrBlr(IEMNATIVE_REG_FIXED_TMP0);
-
-#else
-# error "Port me!"
 #endif
 
@@ -3347 +3333 @@
         /* iemNativeHlpExecStatusCodeFiddling(PVMCPUCC pVCpu, int rc, uint8_t idxInstr) */
 #ifdef RT_ARCH_AMD64
-        /*
-         * AMD64:
-         */
-        uint8_t *pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 20);
-        AssertReturn(pbCodeBuf, UINT32_MAX);
-
-        /* Call helper and jump to return point. */
 # ifdef RT_OS_WINDOWS
 #  ifdef IEMNATIVE_WITH_INSTRUCTION_COUNTING
@@ -3371 +3350 @@
 # endif
 
-#elif defined(RT_ARCH_ARM64)
-        /*
-         * ARM64:
-         */
+#else
         off = iemNativeEmitLoadGprFromGpr(pReNative, off, IEMNATIVE_CALL_ARG1_GREG, IEMNATIVE_CALL_RET_GREG);
         off = iemNativeEmitLoadGprFromGpr(pReNative, off, IEMNATIVE_CALL_ARG0_GREG, IEMNATIVE_REG_FIXED_PVMCPU);
         /* IEMNATIVE_CALL_ARG2_GREG is already set. */
-        off = iemNativeEmitLoadGprImm64(pReNative, off, IEMNATIVE_REG_FIXED_TMP0, (uintptr_t)iemNativeHlpExecStatusCodeFiddling);
-        AssertReturn(off != UINT32_MAX, UINT32_MAX);
-#else
-# error "port me"
 #endif
 
@@ -3477 +3449 @@
 # error "port me"
 #endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
 
     return iemNativeEmitRcFiddling(pReNative, off, idxReturn);
@@ -3583 +3556 @@
 # error "port me"
 #endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
     return off;
 }