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

Timestamp:

Feb 21, 2022 8:49:18 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed EFlags for LOCK XADD, adding tests for it. bugref:9898

File:

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

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

@@ -1358 +1358 @@
 {
     uint64_t uOld = ASMAtomicUoReadU64(puDst);
-    uint64_t uTmpDst;
+    uint64_t uResult;
     uint32_t fEflTmp;
     do
     {
-        uTmpDst = uOld;
+        uResult = uOld;
         fEflTmp = *pfEFlags;
-        iemAImpl_add_u64(&uTmpDst, *puReg, pfEFlags);
-    } while (!ASMAtomicCmpXchgExU64(puDst, uTmpDst, uOld, &uOld));
+        iemAImpl_add_u64(&uResult, *puReg, &fEflTmp);
+    } while (!ASMAtomicCmpXchgExU64(puDst, uResult, uOld, &uOld));
     *puReg    = uOld;
     *pfEFlags = fEflTmp;
@@ -1385 +1385 @@
 {
     uint32_t uOld = ASMAtomicUoReadU32(puDst);
-    uint32_t uTmpDst;
+    uint32_t uResult;
     uint32_t fEflTmp;
     do
     {
-        uTmpDst = uOld;
+        uResult = uOld;
         fEflTmp = *pfEFlags;
-        iemAImpl_add_u32(&uTmpDst, *puReg, pfEFlags);
-    } while (!ASMAtomicCmpXchgExU32(puDst, uTmpDst, uOld, &uOld));
+        iemAImpl_add_u32(&uResult, *puReg, &fEflTmp);
+    } while (!ASMAtomicCmpXchgExU32(puDst, uResult, uOld, &uOld));
     *puReg    = uOld;
     *pfEFlags = fEflTmp;
@@ -1411 +1411 @@
 {
     uint16_t uOld = ASMAtomicUoReadU16(puDst);
-    uint16_t uTmpDst;
+    uint16_t uResult;
     uint32_t fEflTmp;
     do
     {
-        uTmpDst = uOld;
+        uResult = uOld;
         fEflTmp = *pfEFlags;
-        iemAImpl_add_u16(&uTmpDst, *puReg, pfEFlags);
-    } while (!ASMAtomicCmpXchgExU16(puDst, uTmpDst, uOld, &uOld));
+        iemAImpl_add_u16(&uResult, *puReg, &fEflTmp);
+    } while (!ASMAtomicCmpXchgExU16(puDst, uResult, uOld, &uOld));
     *puReg    = uOld;
     *pfEFlags = fEflTmp;
@@ -1437 +1437 @@
 {
     uint8_t uOld = ASMAtomicUoReadU8(puDst);
-    uint8_t uTmpDst;
+    uint8_t uResult;
     uint32_t fEflTmp;
     do
     {
-        uTmpDst = uOld;
+        uResult = uOld;
         fEflTmp = *pfEFlags;
-        iemAImpl_add_u8(&uTmpDst, *puReg, pfEFlags);
-    } while (!ASMAtomicCmpXchgExU8(puDst, uTmpDst, uOld, &uOld));
+        iemAImpl_add_u8(&uResult, *puReg, &fEflTmp);
+    } while (!ASMAtomicCmpXchgExU8(puDst, uResult, uOld, &uOld));
     *puReg    = uOld;
     *pfEFlags = fEflTmp;