Changeset 9700 in vbox

Timestamp:

Jun 16, 2008 8:49:47 AM (17 years ago)

Author:

vboxsync

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

32050

Message:

Fixed several problems for 64 bits code disassembly

File:

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

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -102 +102 @@
     uint32_t cbInstr;
     int rc = DISCoreOneEx(GCPtr,
-                          pSelInfo->Raw.Gen.u1DefBig
-                          ? enmMode >= PGMMODE_AMD64 && pSelInfo->Raw.Gen.u1Long
+                          enmMode >= PGMMODE_AMD64 && pSelInfo->Raw.Gen.u1Long
                           ? CPUMODE_64BIT
-                          : CPUMODE_32BIT
+                          : pSelInfo->Raw.Gen.u1DefBig
+                          ? CPUMODE_32BIT
                           : CPUMODE_16BIT,
                           dbgfR3DisasInstrRead,
@@ -308 +308 @@
         Sel        = pCtxCore->cs;
         pHiddenSel = (CPUMSELREGHID *)&pCtxCore->csHid;
-        GCPtr      = pCtxCore->eip;
+        GCPtr      = pCtxCore->rip;
     }
 
@@ -334 +334 @@
         SelInfo.Raw.Gen.u1Granularity = pHiddenSel->Attr.n.u1Granularity;;
         SelInfo.Raw.Gen.u1DefBig    = pHiddenSel->Attr.n.u1DefBig;
+        SelInfo.Raw.Gen.u1Long      = pHiddenSel->Attr.n.u1Long;
         SelInfo.Raw.Gen.u1DescType  = pHiddenSel->Attr.n.u1DescType;
         SelInfo.Raw.Gen.u4Type      = pHiddenSel->Attr.n.u4Type;