Changeset 102368 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Nov 28, 2023 2:24:49 PM (14 months ago)

Author:

vboxsync

Message:

VMM/IEM: IEM_MC_FETCH_MEM_U16_DISP and IEM_MC_FETCH_MEM_U32_DISP. bugref:10371

Location:

trunk/src/VBox/VMM/include

Files:

• IEMN8veRecompiler.h (modified) (1 diff)
• IEMN8veRecompilerEmit.h (modified) (1 diff)

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

@@ -254 +254 @@
 
 /** This is the maximum argument count we'll ever be needing. */
-#define IEMNATIVE_CALL_MAX_ARG_COUNT        7
+#if defined(RT_OS_WINDOWS) && defined(VBOXSTRICTRC_STRICT_ENABLED)
+# define IEMNATIVE_CALL_MAX_ARG_COUNT       8
+#else
+# define IEMNATIVE_CALL_MAX_ARG_COUNT       7
+#endif
 /** @} */
 

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

@@ -721 +721 @@
     uint32_t * const pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
     pu32CodeBuf[off++] = Armv8A64MkInstrBfi(iGprDst, iGprSrc, 8, 8, false /*f64Bit*/);
+
+#else
+# error "port me"
+#endif
+    IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+    return off;
+}
+
+
+/**
+ * Emits a gprdst = gprsrc + addend load.
+ */
+DECL_INLINE_THROW(uint32_t)
+iemNativeEmitLoadGprFromGprWithAddend(PIEMRECOMPILERSTATE pReNative, uint32_t off,
+                                      uint8_t iGprDst, uint8_t iGprSrc, int32_t iAddend)
+{
+    Assert(iAddend != 0);
+
+#ifdef RT_ARCH_AMD64
+    /* lea gprdst, [gprsrc + iAddend] */
+    uint8_t * const pbCodeBuf = iemNativeInstrBufEnsure(pReNative, off, 7);
+    if ((iGprDst | iGprSrc) >= 8)
+        pbCodeBuf[off++] = iGprDst < 8  ? X86_OP_REX_W | X86_OP_REX_B
+                         : iGprSrc >= 8 ? X86_OP_REX_W | X86_OP_REX_R | X86_OP_REX_B
+                         :                X86_OP_REX_W | X86_OP_REX_R;
+    else
+        pbCodeBuf[off++] = X86_OP_REX_W;
+    pbCodeBuf[off++] = 0x8d;
+    if (iAddend >= -128 && iAddend < 128)
+    {
+        pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_MEM1, iGprDst & 7, iGprSrc & 7);
+        pbCodeBuf[off++] = (int8_t)iAddend;
+    }
+    else
+    {
+        pbCodeBuf[off++] = X86_MODRM_MAKE(X86_MOD_MEM4, iGprDst & 7, iGprSrc & 7);
+        pbCodeBuf[off++] = RT_BYTE1((uint32_t)iAddend);
+        pbCodeBuf[off++] = RT_BYTE2((uint32_t)iAddend);
+        pbCodeBuf[off++] = RT_BYTE3((uint32_t)iAddend);
+        pbCodeBuf[off++] = RT_BYTE4((uint32_t)iAddend);
+    }
+
+#elif RT_ARCH_ARM64
+    if ((uint32_t)iAddend < 4096)
+    {
+        /* add dst, src, uimm12 */
+        uint32_t * const pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
+        pu32CodeBuf[off++] = Armv8A64MkInstrAddSubUImm12(false /*fSub*/, iGprDst, iGprSrc, (uint32_t)iAddend);
+    }
+    else if ((uint32_t)-iAddend < 4096)
+    {
+        /* sub dst, src, uimm12 */
+        uint32_t * const pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
+        pu32CodeBuf[off++] = Armv8A64MkInstrAddSubUImm12(true /*fSub*/, iGprDst, iGprSrc, (uint32_t)-iAddend);
+    }
+    else
+    {
+        off = iemNativeEmitLoadGprImm64(pReNative, off, iGrpDst, (int64)iAddend);
+        uint32_t * const pu32CodeBuf = iemNativeInstrBufEnsure(pReNative, off, 1);
+        pu32CodeBuf[off++] = Armv8A64MkInstrAddSubReg(false /*fSub*/, iGprDst, iGprSrc, iGprDst);
+    }
 
 #else