Changeset 100844 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 9, 2023 8:17:43 PM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: More conversion from IEM_MC_MEM_MAP to IEM_MC_MEM_MAP_XXX. bugref:10369

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllInstTwoByte0f.cpp.h (modified) (14 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllInstTwoByte0f.cpp.h

@@ -11562 +11562 @@
          * We're accessing memory.
          */
-        IEM_MC_BEGIN(3, 3);
+        IEM_MC_BEGIN(3, 4);
         IEM_MC_ARG(uint8_t *,   pu8Dst,          0);
         IEM_MC_ARG(uint8_t *,   pu8Reg,          1);
@@ -11568 +11568 @@
         IEM_MC_LOCAL(uint8_t,  u8RegCopy);
         IEM_MC_LOCAL(RTGCPTR,  GCPtrEffDst);
+        IEM_MC_LOCAL(uint8_t,  bUnmapInfo);
 
         IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 0);
         IEMOP_HLP_DONE_DECODING();
-        IEM_MC_MEM_MAP(pu8Dst, IEM_ACCESS_DATA_RW, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+        IEM_MC_MEM_MAP_U8_RW(pu8Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
         IEM_MC_FETCH_GREG_U8(u8RegCopy, IEM_GET_MODRM_REG(pVCpu, bRm));
         IEM_MC_REF_LOCAL(pu8Reg, u8RegCopy);
@@ -11580 +11581 @@
             IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_xadd_u8_locked, pu8Dst, pu8Reg, pEFlags);
 
-        IEM_MC_MEM_COMMIT_AND_UNMAP(pu8Dst, IEM_ACCESS_DATA_RW);
+        IEM_MC_MEM_COMMIT_AND_UNMAP_RW(pu8Dst, bUnmapInfo);
         IEM_MC_COMMIT_EFLAGS(EFlags);
         IEM_MC_STORE_GREG_U8(IEM_GET_MODRM_REG(pVCpu, bRm), u8RegCopy);
@@ -11664 +11665 @@
         {
             case IEMMODE_16BIT:
-                IEM_MC_BEGIN(3, 3);
+                IEM_MC_BEGIN(3, 4);
                 IEM_MC_ARG(uint16_t *,  pu16Dst,         0);
                 IEM_MC_ARG(uint16_t *,  pu16Reg,         1);
                 IEM_MC_ARG_LOCAL_EFLAGS(pEFlags, EFlags, 2);
                 IEM_MC_LOCAL(uint16_t,  u16RegCopy);
-                IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+                IEM_MC_LOCAL(RTGCPTR,   GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t,   bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 0);
                 IEMOP_HLP_DONE_DECODING();
-                IEM_MC_MEM_MAP(pu16Dst, IEM_ACCESS_DATA_RW, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U16_RW(pu16Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_GREG_U16(u16RegCopy, IEM_GET_MODRM_REG(pVCpu, bRm));
                 IEM_MC_REF_LOCAL(pu16Reg, u16RegCopy);
@@ -11682 +11684 @@
                     IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_xadd_u16_locked, pu16Dst, pu16Reg, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu16Dst, IEM_ACCESS_DATA_RW);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RW(pu16Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_STORE_GREG_U16(IEM_GET_MODRM_REG(pVCpu, bRm), u16RegCopy);
@@ -11690 +11692 @@
 
             case IEMMODE_32BIT:
-                IEM_MC_BEGIN(3, 3);
+                IEM_MC_BEGIN(3, 4);
                 IEM_MC_ARG(uint32_t *,  pu32Dst,         0);
                 IEM_MC_ARG(uint32_t *,  pu32Reg,         1);
@@ -11696 +11698 @@
                 IEM_MC_LOCAL(uint32_t,  u32RegCopy);
                 IEM_MC_LOCAL(RTGCPTR,   GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t,   bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 0);
                 IEMOP_HLP_DONE_DECODING();
-                IEM_MC_MEM_MAP(pu32Dst, IEM_ACCESS_DATA_RW, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U32_RW(pu32Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_GREG_U32(u32RegCopy, IEM_GET_MODRM_REG(pVCpu, bRm));
                 IEM_MC_REF_LOCAL(pu32Reg, u32RegCopy);
@@ -11708 +11711 @@
                     IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_xadd_u32_locked, pu32Dst, pu32Reg, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu32Dst, IEM_ACCESS_DATA_RW);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RW(pu32Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_STORE_GREG_U32(IEM_GET_MODRM_REG(pVCpu, bRm), u32RegCopy);
@@ -11716 +11719 @@
 
             case IEMMODE_64BIT:
-                IEM_MC_BEGIN(3, 3);
+                IEM_MC_BEGIN(3, 4);
                 IEM_MC_ARG(uint64_t *,  pu64Dst,         0);
                 IEM_MC_ARG(uint64_t *,  pu64Reg,         1);
@@ -11722 +11725 @@
                 IEM_MC_LOCAL(uint64_t,  u64RegCopy);
                 IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t,   bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 0);
                 IEMOP_HLP_DONE_DECODING();
-                IEM_MC_MEM_MAP(pu64Dst, IEM_ACCESS_DATA_RW, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U64_RW(pu64Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_GREG_U64(u64RegCopy, IEM_GET_MODRM_REG(pVCpu, bRm));
                 IEM_MC_REF_LOCAL(pu64Reg, u64RegCopy);
@@ -11734 +11738 @@
                     IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_xadd_u64_locked, pu64Dst, pu64Reg, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu64Dst, IEM_ACCESS_DATA_RW);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RW(pu64Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_STORE_GREG_U64(IEM_GET_MODRM_REG(pVCpu, bRm), u64RegCopy);
@@ -12376 +12380 @@
     IEMOP_MNEMONIC(cmpxchg8b, "cmpxchg8b Mq");
 
-    IEM_MC_BEGIN(4, 3);
+    IEM_MC_BEGIN(4, 5);
     IEM_MC_ARG(uint64_t *, pu64MemDst,     0);
     IEM_MC_ARG(PRTUINT64U, pu64EaxEdx,     1);
@@ -12383 +12387 @@
     IEM_MC_LOCAL(RTUINT64U, u64EaxEdx);
     IEM_MC_LOCAL(RTUINT64U, u64EbxEcx);
-    IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+    IEM_MC_LOCAL(RTGCPTR,   GCPtrEffDst);
+    IEM_MC_LOCAL(uint8_t,   bUnmapInfo);
 
     IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 0);
     IEMOP_HLP_DONE_DECODING();
-    IEM_MC_MEM_MAP(pu64MemDst, IEM_ACCESS_DATA_RW, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+    IEM_MC_MEM_MAP_U64_RW(pu64MemDst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
 
     IEM_MC_FETCH_GREG_U32(u64EaxEdx.s.Lo, X86_GREG_xAX);
@@ -12404 +12409 @@
         IEM_MC_CALL_VOID_AIMPL_4(iemAImpl_cmpxchg8b, pu64MemDst, pu64EaxEdx, pu64EbxEcx, pEFlags);
 
-    IEM_MC_MEM_COMMIT_AND_UNMAP(pu64MemDst, IEM_ACCESS_DATA_RW);
+    IEM_MC_MEM_COMMIT_AND_UNMAP_RW(pu64MemDst, bUnmapInfo);
     IEM_MC_COMMIT_EFLAGS(EFlags);
     IEM_MC_IF_EFL_BIT_NOT_SET(X86_EFL_ZF) {