Changeset 100623 in vbox for trunk

Timestamp:

Jul 18, 2023 9:58:30 AM (17 months ago)

Author:

vboxsync

Message:

VMM/IEM: pop [mem] correction, iEffSeg must be fetched after address decoding. Fixes regression from r157932. bugref:10369

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsOneByte.cpp.h (modified) (3 diffs)

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

@@ -5220 +5220 @@
         {
             IEM_MC_BEGIN(2, 0);
-            IEM_MC_ARG_CONST(uint8_t,       iEffSeg, /*=*/ pVCpu->iem.s.iEffSeg, 0);
-            IEM_MC_ARG(      RTGCPTR,       GCPtrEffDst,                         1);
+            IEM_MC_ARG(uint8_t, iEffSeg,     0);
+            IEM_MC_ARG(RTGCPTR, GCPtrEffDst, 1);
             IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 2 << 8);
             IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+            IEM_MC_ASSIGN(iEffSeg, pVCpu->iem.s.iEffSeg);
             IEM_MC_CALL_CIMPL_2(0, iemCImpl_pop_mem16, iEffSeg, GCPtrEffDst);
             IEM_MC_END();
@@ -5231 +5232 @@
         {
             IEM_MC_BEGIN(2, 0);
-            IEM_MC_ARG_CONST(uint8_t,       iEffSeg, /*=*/ pVCpu->iem.s.iEffSeg, 0);
-            IEM_MC_ARG(      RTGCPTR,       GCPtrEffDst,                         1);
+            IEM_MC_ARG(uint8_t, iEffSeg,     0);
+            IEM_MC_ARG(RTGCPTR, GCPtrEffDst, 1);
             IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 4 << 8);
             IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+            IEM_MC_ASSIGN(iEffSeg, pVCpu->iem.s.iEffSeg);
             IEM_MC_CALL_CIMPL_2(0, iemCImpl_pop_mem32, iEffSeg, GCPtrEffDst);
             IEM_MC_END();
@@ -5242 +5244 @@
         {
             IEM_MC_BEGIN(2, 0);
-            IEM_MC_ARG_CONST(uint8_t,       iEffSeg, /*=*/ pVCpu->iem.s.iEffSeg, 0);
-            IEM_MC_ARG(      RTGCPTR,       GCPtrEffDst,                         1);
+            IEM_MC_ARG(uint8_t, iEffSeg,     0);
+            IEM_MC_ARG(RTGCPTR, GCPtrEffDst, 1);
             IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffDst, bRm, 8 << 8);
             IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+            IEM_MC_ASSIGN(iEffSeg, pVCpu->iem.s.iEffSeg);
             IEM_MC_CALL_CIMPL_2(0, iemCImpl_pop_mem64, iEffSeg, GCPtrEffDst);
             IEM_MC_END();