Changeset 101504 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 18, 2023 10:33:42 PM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed some confusion in the iemOpHlpCalcRmEffAddr* functions. bugref:10371

File:

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

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

@@ -8257 +8257 @@
 
             }
-            if (pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT)
-                *pGCPtrEff = u32EffAddr;
-            else
-            {
-                Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_16BIT);
-                *pGCPtrEff = u32EffAddr & UINT16_MAX;
-            }
+            Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT);
+            *pGCPtrEff = u32EffAddr;
         }
     }
@@ -8560 +8555 @@
         }
 
-        if (pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT)
-        {
-            Log5(("iemOpHlpCalcRmEffAddrJmp: EffAddr=%#010RX32\n", u32EffAddr));
-            return u32EffAddr;
-        }
-        Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_16BIT);
-        Log5(("iemOpHlpCalcRmEffAddrJmp: EffAddr=%#06RX32\n", u32EffAddr & UINT16_MAX));
-        return u32EffAddr & UINT16_MAX;
+        Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT);
+        Log5(("iemOpHlpCalcRmEffAddrJmp: EffAddr=%#010RX32\n", u32EffAddr));
+        return u32EffAddr;
     }
 
@@ -8874 +8864 @@
 
             }
-            if (pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT)
-                *pGCPtrEff = u32EffAddr;
-            else
-            {
-                Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_16BIT);
-                *pGCPtrEff = u32EffAddr & UINT16_MAX;
-            }
+            Assert(pVCpu->iem.s.enmEffAddrMode == IEMMODE_32BIT);
+            *pGCPtrEff = u32EffAddr;
         }
     }