Changeset 9760 in vbox

Timestamp:

Jun 17, 2008 12:09:03 PM (17 years ago)

Author:

vboxsync

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

32117

Message:

64 bits disassembly (CPUM this time).

File:

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

trunk/src/VBox/VMM/CPUM.cpp

@@ -1799 +1799 @@
     /** Whether the PageMapLock is valid or not. */
     bool            fLocked;
+    /** 64 bits mode or not. */
+    bool            f64Bits;
 } CPUMDISASSTATE, *PCPUMDISASSTATE;
 
@@ -1852 +1854 @@
 
         /* check the segemnt limit */
-        if (PtrSrc > pState->cbSegLimit)
+        if (!pState->f64Bits && PtrSrc > pState->cbSegLimit)
             return VERR_OUT_OF_SELECTOR_BOUNDS;
 
         /* calc how much we can read */
         uint32_t cb = PAGE_SIZE - (GCPtr & PAGE_OFFSET_MASK);
-        RTGCUINTPTR cbSeg = pState->GCPtrSegEnd - GCPtr;
-        if (cb > cbSeg && !cbSeg)
-            cb = cbSeg;
+        if (!pState->f64Bits)
+        {
+            RTGCUINTPTR cbSeg = pState->GCPtrSegEnd - GCPtr;
+            if (cb > cbSeg && cbSeg)
+                cb = cbSeg;
+        }
         if (cb > cbRead)
             cb = cbRead;
@@ -1890 +1895 @@
     int             rc;
 
+    const PGMMODE enmMode = PGMGetGuestMode(pVM);
     State.pCpu            = pCpu;
     State.pvPageGC        = 0;
@@ -1895 +1901 @@
     State.pVM             = pVM;
     State.fLocked         = false;
+    State.f64Bits         = false;
 
     /*
@@ -1904 +1911 @@
         if (CPUMAreHiddenSelRegsValid(pVM))
         {
+            State.f64Bits         = enmMode >= PGMMODE_AMD64 && pCtx->csHid.Attr.n.u1Long;
             State.GCPtrSegBase    = pCtx->csHid.u64Base;
             State.GCPtrSegEnd     = pCtx->csHid.u32Limit + 1 + (RTGCUINTPTR)pCtx->csHid.u64Base;
             State.cbSegLimit      = pCtx->csHid.u32Limit;
-            pCpu->mode            = pCtx->csHid.Attr.n.u1DefBig ? CPUMODE_32BIT : CPUMODE_16BIT;
+            pCpu->mode            = (State.f64Bits)
+                                    ? CPUMODE_64BIT
+                                    : pCtx->csHid.Attr.n.u1DefBig
+                                    ? CPUMODE_32BIT
+                                    : CPUMODE_16BIT;
         }
         else