Changeset 9840 in vbox

Timestamp:

Jun 20, 2008 9:27:40 AM (16 years ago)

Author:

vboxsync

Message:

Unassemble fix for 64 bits code

File:

• trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -909 +909 @@
         if (!DBGCVAR_ISPOINTER(pDbgc->DisasmPos.enmType))
         {
-            pDbgc->DisasmPos.enmType     = DBGCVAR_TYPE_GC_FAR;
-            pDbgc->SourcePos.u.GCFar.off = pDbgc->fRegCtxGuest ? CPUMGetGuestEIP(pVM) : CPUMGetHyperEIP(pVM);
-            pDbgc->SourcePos.u.GCFar.sel = pDbgc->fRegCtxGuest ? CPUMGetGuestCS(pVM)  : CPUMGetHyperCS(pVM);
+            PCPUMCTX pCtx;
+            int rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
+            AssertRC(rc);
+
+            if (    pDbgc->fRegCtxGuest
+                &&  CPUMIsGuestIn64BitCodeEx(pCtx))
+            {
+                pDbgc->DisasmPos.enmType    = DBGCVAR_TYPE_GC_FLAT;
+                pDbgc->SourcePos.u.GCFlat   = CPUMGetGuestRIP(pVM);
+            }
+            else
+            {
+                pDbgc->DisasmPos.enmType     = DBGCVAR_TYPE_GC_FAR;
+                pDbgc->SourcePos.u.GCFar.off = pDbgc->fRegCtxGuest ? CPUMGetGuestEIP(pVM) : CPUMGetHyperEIP(pVM);
+                pDbgc->SourcePos.u.GCFar.sel = pDbgc->fRegCtxGuest ? CPUMGetGuestCS(pVM)  : CPUMGetHyperCS(pVM);
+            }
+
             if (pDbgc->fRegCtxGuest)
                 fFlags |= DBGF_DISAS_FLAGS_CURRENT_GUEST;