Changeset 53182 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

Timestamp:

Nov 2, 2014 9:12:44 PM (10 years ago)

Author:

vboxsync

Message:

IEMAll: Added IEM_MC_FETCH_MEM_I64 and tweaked the VT-x verification code a little.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (4 diffs)

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

@@ -8567 +8567 @@
 #define IEM_MC_FETCH_MEM_U64_ALIGN_U128(a_u128Dst, a_iSeg, a_GCPtrMem) \
     IEM_MC_RETURN_ON_FAILURE(iemMemFetchDataU64AlignedU128(pIemCpu, &(a_u128Dst), (a_iSeg), (a_GCPtrMem)))
+#define IEM_MC_FETCH_MEM_I64(a_i64Dst, a_iSeg, a_GCPtrMem) \
+    IEM_MC_RETURN_ON_FAILURE(iemMemFetchDataU64(pIemCpu, (uint64_t *)&(a_i64Dst), (a_iSeg), (a_GCPtrMem)))
 
 #define IEM_MC_FETCH_MEM_R32(a_r32Dst, a_iSeg, a_GCPtrMem) \
@@ -10137 +10139 @@
         && !pIemCpu->fProblematicMemory)
     {
+        uint64_t uStartRip = pOrgCtx->rip;
         unsigned iLoops = 0;
         do
@@ -10149 +10152 @@
                      && pIemCpu->uInjectCpl != UINT8_MAX
                      && iLoops < 8) );
+        if (rc == VINF_EM_RESCHEDULE && pOrgCtx->rip != uStartRip)
+            rc = VINF_SUCCESS;
     }
 #endif
@@ -10157 +10162 @@
         || rc == VINF_IOM_R3_MMIO_READ_WRITE
         || rc == VINF_IOM_R3_MMIO_WRITE
+        || rc == VINF_EM_RESCHEDULE
         )
     {