Changeset 23300 in vbox for trunk/src/VBox

Timestamp:

Sep 24, 2009 4:47:59 PM (15 years ago)

Author:

vboxsync

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

52793

Message:

Cut addresses according to the cpu mode.

File:

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

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

@@ -69 +69 @@
     }
 
-    return (RTGCPTR)((RTGCUINTPTR)Addr + X86DESC_BASE(Desc));
+    return (RTGCPTR)(((RTGCUINTPTR)Addr + X86DESC_BASE(Desc)) & 0xffffffff);
 }
 #endif /* !IN_RING0 */
@@ -331 +331 @@
         /* calc address assuming straight stuff. */
         pvFlat = (RTGCPTR)((RTGCUINTPTR)Addr + X86DESC_BASE(Desc));
+
+        /* Cut the address to 32 bits. */
+        Assert(!CPUMIsGuestInLongMode(pVCpu))
+        pvFlat &= 0xffffffff;
 
         u1Present     = Desc.Gen.u1Present;
@@ -538 +542 @@
         /* calc address assuming straight stuff. */
         pvFlat = (RTGCPTR)((RTGCUINTPTR)Addr + X86DESC_BASE(Desc));
+
+        /* Cut the address to 32 bits. */
+        Assert(!CPUMIsGuestInLongMode(pVCpu))
+        pvFlat &= 0xffffffff;
 
         u1Present     = Desc.Gen.u1Present;
@@ -737 +745 @@
                 {
                     *ppvFlat = (RTGCPTR)((RTGCUINTPTR)Addr + X86DESC_BASE(Desc));
+                    /* Cut the address to 32 bits. */
+                    Assert(!CPUMIsGuestInLongMode(pVCpu))
+                    *ppvFlat &= 0xffffffff;
+
                     if (pcBits)
                         *pcBits = Desc.Gen.u1DefBig ? 32 : 16; /** @todo GUEST64 */