Changeset 2260 in vbox

Timestamp:

Apr 20, 2007 9:18:48 AM (18 years ago)

Author:

vboxsync

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

20619

Message:

Corrections for real and v86 addresses + cleanup + notes.

File:

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

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

@@ -91 +91 @@
 SELMDECL(RTGCPTR) SELMToFlat(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTGCPTR Addr)
 {
+    Assert(pHiddenSel);
+
+   /*
+    * Deal with real & v86 mode first.
+    */
+    if (    CPUMIsGuestInRealMode(pVM)
+        ||  eflags.Bits.u1VM)
+    {
+        RTGCUINTPTR uFlat = (RTGCUINTPTR)Addr & 0xffff;
+
+        if (CPUMAreHiddenSelRegsValid(pVM))
+            uFlat += pHiddenSel->u32Base;
+        else
+            uFlat += ((RTGCUINTPTR)Sel << 4);
+        return (RTGCPTR)uFlat;
+    }
+
+    /** @todo when we're in 16 bits mode, we should cut off the address as well.. */
     if (!CPUMAreHiddenSelRegsValid(pVM))
-    {
-        /*
-        * Deal with real & v86 mode first.
-        */
-        if (    CPUMIsGuestInRealMode(pVM)
-            ||  eflags.Bits.u1VM)
-        {
-            RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)Sel << 4);
-            return (RTGCPTR)uFlat;
-        }
-
         return selmToFlat(pVM, Sel, Addr);
-    }
-    return (RTGCPTR)(pHiddenSel->u32Base + (RTGCUINTPTR)Addr);
+    else
+        return (RTGCPTR)(pHiddenSel->u32Base + (RTGCUINTPTR)Addr);
 }
 
@@ -134 +141 @@
         ||  eflags.Bits.u1VM)
     {
+        RTGCUINTPTR uFlat = (RTGCUINTPTR)Addr & 0xffff;
         if (ppvGC)
         {
             if (    pHiddenSel
                 &&  CPUMAreHiddenSelRegsValid(pVM))
-            {
-                *ppvGC = (RTGCPTR)(pHiddenSel->u32Base + (RTGCUINTPTR)Addr);
-            }
+                *ppvGC = (RTGCPTR)(pHiddenSel->u32Base + uFlat);
             else
-            {
-                RTGCUINTPTR uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)Sel << 4);
-                *ppvGC = (RTGCPTR)uFlat;
-            }
+                *ppvGC = (RTGCPTR)(((RTGCUINTPTR)Sel << 4) + uFlat);
         }
         if (pcb)
-            *pcb = 0x10000 - ((RTGCUINTPTR)Addr & 0xffff);
+            *pcb = 0x10000 - uFlat;
         return VINF_SUCCESS;
     }
@@ -157 +160 @@
     uint32_t    u1Present, u1DescType, u1Granularity, u4Type;
 
+    /** @todo when we're in 16 bits mode, we should cut off the address as well.. */
     if (    pHiddenSel 
         &&  CPUMAreHiddenSelRegsValid(pVM))
@@ -420 +424 @@
         if (ppvFlat)
         {
-            RTGCUINTPTR uFlat;
+            RTGCUINTPTR uFlat = (RTGCUINTPTR)Addr & 0xffff;
 
             if (!CPUMAreHiddenSelRegsValid(pVM))
-                uFlat = ((RTGCUINTPTR)Addr & 0xffff) + ((RTGCUINTPTR)SelCS << 4);
+                uFlat += ((RTGCUINTPTR)SelCS << 4);
             else
-                uFlat = pHiddenCSSel->u32Base + (RTGCUINTPTR)Addr;
+                uFlat += pHiddenCSSel->u32Base;
 
             *ppvFlat = (RTGCPTR)uFlat;
@@ -431 +435 @@
         return VINF_SUCCESS;
     }
+
+    /** @todo when we're in 16 bits mode, we should cut off the address as well.. */
 
     if (!CPUMAreHiddenSelRegsValid(pVM))