Changeset 47569 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2013 3:13:21 AM (11 years ago)

Author:

vboxsync

Message:

DBGC: v86 disassembly fixes and tweaks.

Location:

trunk/src/VBox/Debugger

Files:

• DBGCEmulateCodeView.cpp (modified) (6 diffs)
• DBGCInternal.h (modified) (1 diff)
• testcase/tstDBGCStubs.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -939 +939 @@
         if (!DBGCVAR_ISPOINTER(pDbgc->DisasmPos.enmType))
         {
-            /** @todo Batch query CS, RIP & CPU mode. */
+            /** @todo Batch query CS, RIP, CPU mode and flags. */
             PVMCPU pVCpu = VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu);
             if (    pDbgc->fRegCtxGuest
@@ -952 +952 @@
                 pDbgc->SourcePos.u.GCFar.off = pDbgc->fRegCtxGuest ? CPUMGetGuestEIP(pVCpu) : CPUMGetHyperEIP(pVCpu);
                 pDbgc->SourcePos.u.GCFar.sel = pDbgc->fRegCtxGuest ? CPUMGetGuestCS(pVCpu)  : CPUMGetHyperCS(pVCpu);
+                if (   (fFlags & DBGF_DISAS_FLAGS_MODE_MASK) == DBGF_DISAS_FLAGS_DEFAULT_MODE
+                    && pDbgc->fRegCtxGuest
+                    && (CPUMGetGuestEFlags(pVCpu) & X86_EFL_VM))
+                {
+                    fFlags &= ~DBGF_DISAS_FLAGS_MODE_MASK;
+                    fFlags |= DBGF_DISAS_FLAGS_16BIT_REAL_MODE;
+                }
             }
 
@@ -958 +965 @@
             else
                 fFlags |= DBGF_DISAS_FLAGS_CURRENT_HYPER | DBGF_DISAS_FLAGS_HYPER;
+        }
+        else if ((fFlags & DBGF_DISAS_FLAGS_MODE_MASK) == DBGF_DISAS_FLAGS_DEFAULT_MODE && pDbgc->fDisasm)
+        {
+            fFlags &= ~DBGF_DISAS_FLAGS_MODE_MASK;
+            fFlags |= pDbgc->fDisasm & (DBGF_DISAS_FLAGS_MODE_MASK | DBGF_DISAS_FLAGS_HYPER);
         }
         pDbgc->DisasmPos.enmRangeType = DBGCVAR_RANGE_NONE;
@@ -1015 +1027 @@
 
     DBGFADDRESS CurAddr;
-    rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
-    if (RT_FAILURE(rc))
-        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr failed on '%Dv'", &pDbgc->DisasmPos);
+    if (   (fFlags & DBGF_DISAS_FLAGS_MODE_MASK) == DBGF_DISAS_FLAGS_16BIT_REAL_MODE
+        && pDbgc->DisasmPos.enmType == DBGCVAR_TYPE_GC_FAR)
+        DBGFR3AddrFromFlat(pUVM, &CurAddr, ((uint32_t)pDbgc->DisasmPos.u.GCFar.sel << 4) + pDbgc->DisasmPos.u.GCFar.off);
+    else
+    {
+        rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
+        if (RT_FAILURE(rc))
+            return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr failed on '%Dv'", &pDbgc->DisasmPos);
+    }
 
     if (CurAddr.fFlags & DBGFADDRESS_FLAGS_HMA)
         fFlags |= DBGF_DISAS_FLAGS_HYPER; /* This crap is due to not using DBGFADDRESS as DBGFR3Disas* input. */
+    pDbgc->fDisasm = fFlags;
 
     /*
@@ -1084 +1103 @@
         if (cbCheckSymbol <= cbInstr)
         {
-            rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
+            if (   (fFlags & DBGF_DISAS_FLAGS_MODE_MASK) == DBGF_DISAS_FLAGS_16BIT_REAL_MODE
+                && pDbgc->DisasmPos.enmType == DBGCVAR_TYPE_GC_FAR)
+                DBGFR3AddrFromFlat(pUVM, &CurAddr, ((uint32_t)pDbgc->DisasmPos.u.GCFar.sel << 4) + pDbgc->DisasmPos.u.GCFar.off);
+            else
+                rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &pDbgc->DisasmPos, &CurAddr);
             if (RT_SUCCESS(rc))
                 dbgcCmdUnassambleHelpListNear(pUVM, pCmdHlp, hDbgAs, &CurAddr, &cbCheckSymbol);
@@ -1486 +1509 @@
          * Disassemble one instruction at cs:[r|e]ip.
          */
+        if (!f64BitMode && strstr(pszRegs, " vm ")) /* a big ugly... */
+            return pCmdHlp->pfnExec(pCmdHlp, "uv86 %s", szDisAndRegs + 2);
         return pCmdHlp->pfnExec(pCmdHlp, "%s", szDisAndRegs);
     }

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -140 +140 @@
     /** Current disassembler position. */
     DBGCVAR             DisasmPos;
+    /** The flags that goes with DisasmPos. */
+    uint32_t            fDisasm;
     /** Current source position. (flat GC) */
     DBGCVAR             SourcePos;

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -380 +380 @@
 }
 
+VMMDECL(uint32_t) CPUMGetGuestEFlags(PVMCPU pVCpu)
+{
+    return 2;
+}
 
 #include <VBox/vmm/hm.h>