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

Timestamp:

Aug 12, 2014 8:03:48 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95495

Message:

SELM: More effective address calculation width fixes.

File:

• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (6 diffs)

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

@@ -108 +108 @@
         ||  CPUMIsGuestInRealMode(pVCpu))
     {
-        RTGCUINTPTR uFlat = (RTGCUINTPTR)Addr & 0xffff;
+        uint32_t uFlat = (uint32_t)Addr & 0xffff;
         if (CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, pSReg))
-            uFlat += pSReg->u64Base;
+            uFlat += (uint32_t)pSReg->u64Base;
         else
-            uFlat += (RTGCUINTPTR)pSReg->Sel << 4;
+            uFlat += (uint32_t)pSReg->Sel << 4;
         return (RTGCPTR)uFlat;
     }
@@ -145 +145 @@
     /* AMD64 manual: compatibility mode ignores the high 32 bits when calculating an effective address. */
     Assert(pSReg->u64Base <= 0xffffffff);
-    return ((pSReg->u64Base + (RTGCUINTPTR)Addr) & 0xffffffff);
+    return (uint32_t)pSReg->u64Base + (uint32_t)Addr;
 }
 
@@ -178 +178 @@
         ||  CPUMIsGuestInRealMode(pVCpu))
     {
-        RTGCUINTPTR uFlat = (RTGCUINTPTR)Addr & 0xffff;
         if (ppvGC)
         {
+            uint32_t uFlat = (uint32_t)Addr & 0xffff;
             if (CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, pSReg))
-                *ppvGC = pSReg->u64Base + uFlat;
+                *ppvGC = (uint32_t)pSReg->u64Base + uFlat;
             else
-                *ppvGC = ((RTGCUINTPTR)pSReg->Sel << 4) + uFlat;
+                *ppvGC = ((uint32_t)pSReg->Sel << 4) + uFlat;
         }
         return VINF_SUCCESS;
@@ -223 +223 @@
         /* AMD64 manual: compatibility mode ignores the high 32 bits when calculating an effective address. */
         Assert(pSReg->u64Base <= UINT32_C(0xffffffff));
-        pvFlat  = pSReg->u64Base + Addr;
-        pvFlat &= UINT32_C(0xffffffff);
+        pvFlat  = (uint32_t)pSReg->u64Base + (uint32_t)Addr;
+        Assert(pvFlat <= UINT32_MAX);
     }
 
@@ -610 +610 @@
 {
     NOREF(pVCpu);
-    RTGCUINTPTR uFlat = Addr & 0xffff;
+    uint32_t uFlat = Addr & 0xffff;
     if (!pSReg || !CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, pSReg))
-        uFlat += (RTGCUINTPTR)SelCS << 4;
+        uFlat += (uint32_t)SelCS << 4;
     else
-        uFlat += pSReg->u64Base;
+        uFlat += (uint32_t)pSReg->u64Base;
     *ppvFlat = uFlat;
     return VINF_SUCCESS;
@@ -740 +740 @@
              */
             uint32_t u32Limit = pSRegCS->u32Limit;
-            if ((RTGCUINTPTR)Addr <= u32Limit)
+            if ((uint32_t)Addr <= u32Limit)
             {
-                *ppvFlat = Addr + pSRegCS->u64Base;
+                *ppvFlat = (uint32_t)Addr + (uint32_t)pSRegCS->u64Base;
                 return VINF_SUCCESS;
             }