Changeset 102368 in vbox for trunk

Timestamp:

Nov 28, 2023 2:24:49 PM (15 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

Files:

• VMMAll/IEMAllInstPython.py (modified) (2 diffs)
• VMMAll/IEMAllN8veRecompiler.cpp (modified) (4 diffs)
• include/IEMN8veRecompiler.h (modified) (1 diff)
• include/IEMN8veRecompilerEmit.h (modified) (1 diff)

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

@@ -2907 +2907 @@
     'IEM_MC_FETCH_MEM_U128_AND_XREG_U128_AND_EAX_EDX_U32_SX_U64':(McBlock.parseMcGeneric,           True,  False, ),
     'IEM_MC_FETCH_MEM_U16':                                      (McBlock.parseMcGeneric,           True,  True,  ),
-    'IEM_MC_FETCH_MEM_U16_DISP':                                 (McBlock.parseMcGeneric,           True,  False, ),
+    'IEM_MC_FETCH_MEM_U16_DISP':                                 (McBlock.parseMcGeneric,           True,  True,  ),
     'IEM_MC_FETCH_MEM_U16_SX_U32':                               (McBlock.parseMcGeneric,           True,  False, ),
     'IEM_MC_FETCH_MEM_U16_SX_U64':                               (McBlock.parseMcGeneric,           True,  False, ),
@@ -2916 +2916 @@
     'IEM_MC_FETCH_MEM_U256_NO_AC':                               (McBlock.parseMcGeneric,           True,  False, ),
     'IEM_MC_FETCH_MEM_U32':                                      (McBlock.parseMcGeneric,           True,  True,  ),
-    'IEM_MC_FETCH_MEM_U32_DISP':                                 (McBlock.parseMcGeneric,           True,  False, ),
+    'IEM_MC_FETCH_MEM_U32_DISP':                                 (McBlock.parseMcGeneric,           True,  False, ), #bounds only
     'IEM_MC_FETCH_MEM_U32_SX_U64':                               (McBlock.parseMcGeneric,           True,  False, ),
     'IEM_MC_FETCH_MEM_U32_ZX_U64':                               (McBlock.parseMcGeneric,           True,  False, ),

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

@@ -7547 +7547 @@
 
 
+#define IEM_MC_FETCH_MEM_U16_DISP(a_u16Dst, a_iSeg, a_GCPtrMem, a_offDisp) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u16Dst, a_iSeg, a_GCPtrMem, sizeof(uint16_t), a_offDisp)
+
+#define IEM_MC_FETCH_MEM_U32_DISP(a_u32Dst, a_iSeg, a_GCPtrMem, a_offDisp) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u32Dst, a_iSeg, a_GCPtrMem, sizeof(uint32_t), a_offDisp)
+
+
 /** Emits code for IEM_MC_FETCH_MEM_U8/16/32/64 and
  *  IEM_MC_FETCH_MEM_FLAT_U8/16/32/64 (iSegReg = UINT8_MAX). */
 DECL_INLINE_THROW(uint32_t)
 iemNativeEmitMemFetchDataCommon(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint8_t idxInstr,
-                                uint8_t idxVarDst, uint8_t iSegReg, uint8_t idxVarGCPtrMem, uint8_t cbMem)
+                                uint8_t idxVarDst, uint8_t iSegReg, uint8_t idxVarGCPtrMem, uint8_t cbMem, uint8_t offDisp = 0)
 {
     IEMNATIVE_ASSERT_VAR_IDX(pReNative, idxVarDst);
@@ -7655 +7662 @@
 
     if (pReNative->Core.aVars[idxVarGCPtrMem].enmKind == kIemNativeVarKind_Immediate)
-        off = iemNativeEmitLoadGprImm64(pReNative, off, idxRegArgGCPtrMem, pReNative->Core.aVars[idxVarGCPtrMem].u.uValue);
+        off = iemNativeEmitLoadGprImm64(pReNative, off, idxRegArgGCPtrMem,
+                                        pReNative->Core.aVars[idxVarGCPtrMem].u.uValue + offDisp);
     else
     {
@@ -7662 +7670 @@
         {
             Assert(!(RT_BIT_32(idxRegVarGCPtrMem) & IEMNATIVE_CALL_VOLATILE_GREG_MASK));
-            off = iemNativeEmitLoadGprFromGpr(pReNative, off, idxRegArgGCPtrMem, idxRegVarGCPtrMem);
+            if (!offDisp)
+                off = iemNativeEmitLoadGprFromGpr(pReNative, off, idxRegArgGCPtrMem, idxRegVarGCPtrMem);
+            else
+                off = iemNativeEmitLoadGprFromGprWithAddend(pReNative, off, idxRegArgGCPtrMem, idxRegVarGCPtrMem, offDisp);
         }
         else
@@ -7668 +7679 @@
             AssertFailed(); /** @todo This was probably caused by iemNativeRegMoveAndFreeAndFlushAtCall above. Improve... */
             off = iemNativeEmitLoadGprByBp(pReNative, off, idxRegArgGCPtrMem, iemNativeVarCalcBpDisp(pReNative, idxVarGCPtrMem));
+            if (offDisp)
+                off = iemNativeEmitAddGprImm(pReNative, off, idxRegArgGCPtrMem, offDisp);
         }
     }

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