Changeset 100839 in vbox

Timestamp:

Aug 9, 2023 5:30:14 PM (18 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/IEMAllInstOneByte.cpp.h (modified) (6 diffs)

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

@@ -13037 +13037 @@
             case IEMMODE_16BIT:
             {
-                IEM_MC_BEGIN(3, 2);
-                IEM_MC_ARG(uint16_t *,      pu16Dst,            0);
-                IEM_MC_ARG(uint16_t,        u16Src,             1);
-                IEM_MC_ARG_LOCAL_EFLAGS(    pEFlags, EFlags,    2);
+                IEM_MC_BEGIN(3, 3);
+                IEM_MC_ARG(uint16_t const *, pu16Dst,           0);
+                IEM_MC_ARG(uint16_t,         u16Src,            1);
+                IEM_MC_ARG_LOCAL_EFLAGS(     pEFlags, EFlags,   2);
                 IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t, bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 2);
@@ -13047 +13048 @@
                 IEM_MC_ASSIGN(u16Src, u16Imm);
                 IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-                IEM_MC_MEM_MAP(pu16Dst, IEM_ACCESS_DATA_R, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U16_RO(pu16Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_EFLAGS(EFlags);
                 IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_test_u16, pu16Dst, u16Src, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu16Dst, IEM_ACCESS_DATA_R);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RO(pu16Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_ADVANCE_RIP_AND_FINISH();
@@ -13060 +13061 @@
             case IEMMODE_32BIT:
             {
-                IEM_MC_BEGIN(3, 2);
-                IEM_MC_ARG(uint32_t *,      pu32Dst,            0);
-                IEM_MC_ARG(uint32_t,        u32Src,             1);
-                IEM_MC_ARG_LOCAL_EFLAGS(    pEFlags, EFlags,    2);
+                IEM_MC_BEGIN(3, 3);
+                IEM_MC_ARG(uint32_t const *, pu32Dst,           0);
+                IEM_MC_ARG(uint32_t,         u32Src,            1);
+                IEM_MC_ARG_LOCAL_EFLAGS(     pEFlags, EFlags,   2);
                 IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t, bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 4);
@@ -13070 +13072 @@
                 IEM_MC_ASSIGN(u32Src, u32Imm);
                 IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-                IEM_MC_MEM_MAP(pu32Dst, IEM_ACCESS_DATA_R, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U32_RO(pu32Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_EFLAGS(EFlags);
                 IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_test_u32, pu32Dst, u32Src, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu32Dst, IEM_ACCESS_DATA_R);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RO(pu32Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_ADVANCE_RIP_AND_FINISH();
@@ -13083 +13085 @@
             case IEMMODE_64BIT:
             {
-                IEM_MC_BEGIN(3, 2);
-                IEM_MC_ARG(uint64_t *,      pu64Dst,            0);
-                IEM_MC_ARG(uint64_t,        u64Src,             1);
-                IEM_MC_ARG_LOCAL_EFLAGS(    pEFlags, EFlags,    2);
+                IEM_MC_BEGIN(3, 3);
+                IEM_MC_ARG(uint64_t const *, pu64Dst,           0);
+                IEM_MC_ARG(uint64_t,         u64Src,            1);
+                IEM_MC_ARG_LOCAL_EFLAGS(     pEFlags, EFlags,   2);
                 IEM_MC_LOCAL(RTGCPTR, GCPtrEffDst);
+                IEM_MC_LOCAL(uint8_t, bUnmapInfo);
 
                 IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 4);
@@ -13093 +13096 @@
                 IEM_MC_ASSIGN(u64Src, u64Imm);
                 IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-                IEM_MC_MEM_MAP(pu64Dst, IEM_ACCESS_DATA_R, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 0 /*arg*/);
+                IEM_MC_MEM_MAP_U64_RO(pu64Dst, bUnmapInfo, pVCpu->iem.s.iEffSeg, GCPtrEffDst);
                 IEM_MC_FETCH_EFLAGS(EFlags);
                 IEM_MC_CALL_VOID_AIMPL_3(iemAImpl_test_u64, pu64Dst, u64Src, pEFlags);
 
-                IEM_MC_MEM_COMMIT_AND_UNMAP(pu64Dst, IEM_ACCESS_DATA_R);
+                IEM_MC_MEM_COMMIT_AND_UNMAP_RO(pu64Dst, bUnmapInfo);
                 IEM_MC_COMMIT_EFLAGS(EFlags);
                 IEM_MC_ADVANCE_RIP_AND_FINISH();