Changeset 46155 in vbox for trunk/src/VBox/VMM

Timestamp:

May 18, 2013 12:30:13 AM (12 years ago)

Author:

vboxsync

Message:

List near, unassemble, hyper register and more tiny debugger fixes.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGF.cpp (modified) (1 diff)
• DBGFAddr.cpp (modified) (3 diffs)
• DBGFAddrSpace.cpp (modified) (5 diffs)
• DBGFDisas.cpp (modified) (4 diffs)
• DBGFReg.cpp (modified) (2 diffs)
• DBGFStack.cpp (modified) (2 diffs)
• EM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -963 +963 @@
 
     /*
-     * Check if attached.
+     * Validate input. The UVM handle shall be valid, the VM handle might be
+     * in the processes of being destroyed already, so deal quietly with that.
      */
     UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    if (!VM_IS_VALID_EXT(pVM))
+        return VERR_INVALID_VM_HANDLE;
+
+    /*
+     * Check if attached.
+     */
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
 

trunk/src/VBox/VMM/VMMR3/DBGFAddr.cpp

@@ -116 +116 @@
         DBGFSELINFO SelInfo;
         int rc = DBGFR3SelQueryInfo(pUVM, idCpu, Sel, DBGFSELQI_FLAGS_DT_GUEST | DBGFSELQI_FLAGS_DT_ADJ_64BIT_MODE, &SelInfo);
+        if (RT_FAILURE(rc) && !HMIsEnabled(pUVM->pVM))
+            rc = DBGFR3SelQueryInfo(pUVM, idCpu, Sel, DBGFSELQI_FLAGS_DT_SHADOW, &SelInfo);
         if (RT_FAILURE(rc))
             return rc;
@@ -121 +123 @@
         if (RT_FAILURE(rc))
             return rc;
+        if (   (SelInfo.fFlags & DBGFSELINFO_FLAGS_HYPER)
+            || dbgfR3IsHMA(pUVM, pAddress->FlatPtr))
+            pAddress->fFlags |= DBGFADDRESS_FLAGS_HMA;
     }
     else
@@ -126 +131 @@
         pAddress->FlatPtr = off;
         pAddress->fFlags = DBGFADDRESS_FLAGS_FLAT;
+        if (dbgfR3IsHMA(pUVM, pAddress->FlatPtr))
+            pAddress->fFlags |= DBGFADDRESS_FLAGS_HMA;
     }
     pAddress->fFlags |= DBGFADDRESS_FLAGS_VALID;
-    if (dbgfR3IsHMA(pUVM, pAddress->FlatPtr))
-        pAddress->fFlags |= DBGFADDRESS_FLAGS_HMA;
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp

@@ -1088 +1088 @@
  * @param   hDbgAs          The address space handle.
  * @param   pAddress        The address to lookup.
+ * @param   fFlags          One of the RTDBGSYMADDR_FLAGS_XXX flags.
  * @param   poffDisp        Where to return the distance between the returned
  *                          symbol and pAddress. Optional.
@@ -1095 +1096 @@
  * @param   phMod           Where to return the module handle. Optional.
  */
-VMMR3DECL(int) DBGFR3AsSymbolByAddr(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress,
+VMMR3DECL(int) DBGFR3AsSymbolByAddr(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress, uint32_t fFlags,
                                     PRTGCINTPTR poffDisp, PRTDBGSYMBOL pSymbol, PRTDBGMOD phMod)
 {
@@ -1103 +1104 @@
     if (hDbgAs == DBGF_AS_RC_AND_GC_GLOBAL)
     {
-        int rc = DBGFR3AsSymbolByAddr(pUVM, DBGF_AS_RC, pAddress, poffDisp, pSymbol, phMod);
+        int rc = DBGFR3AsSymbolByAddr(pUVM, DBGF_AS_RC, pAddress, fFlags, poffDisp, pSymbol, phMod);
         if (RT_FAILURE(rc))
-            rc = DBGFR3AsSymbolByAddr(pUVM, DBGF_AS_GLOBAL, pAddress, poffDisp, pSymbol, phMod);
+            rc = DBGFR3AsSymbolByAddr(pUVM, DBGF_AS_GLOBAL, pAddress, fFlags, poffDisp, pSymbol, phMod);
         return rc;
     }
@@ -1129 +1130 @@
      */
     RTDBGMOD hMod;
-    int rc = RTDbgAsSymbolByAddr(hRealAS, pAddress->FlatPtr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, poffDisp, pSymbol, &hMod);
+    int rc = RTDbgAsSymbolByAddr(hRealAS, pAddress->FlatPtr, fFlags, poffDisp, pSymbol, &hMod);
     if (RT_SUCCESS(rc))
     {
@@ -1188 +1189 @@
  * @param   hDbgAs          See DBGFR3AsSymbolByAddr.
  * @param   pAddress        See DBGFR3AsSymbolByAddr.
+ * @param   fFlags          See DBGFR3AsSymbolByAddr.
  * @param   poffDisp        See DBGFR3AsSymbolByAddr.
  * @param   phMod           See DBGFR3AsSymbolByAddr.
  */
-VMMR3DECL(PRTDBGSYMBOL) DBGFR3AsSymbolByAddrA(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress, PRTGCINTPTR poffDisp, PRTDBGMOD phMod)
+VMMR3DECL(PRTDBGSYMBOL) DBGFR3AsSymbolByAddrA(PUVM pUVM, RTDBGAS hDbgAs, PCDBGFADDRESS pAddress, uint32_t fFlags,
+                                              PRTGCINTPTR poffDisp, PRTDBGMOD phMod)
 {
     RTDBGSYMBOL SymInfo;
-    int rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, poffDisp, &SymInfo, phMod);
+    int rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, fFlags, poffDisp, &SymInfo, phMod);
     if (RT_SUCCESS(rc))
         return RTDbgSymbolDup(&SymInfo);

trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

@@ -301 +301 @@
         rc = DBGFR3AddrFromSelInfoOff(pState->pVM->pUVM, &Addr, pSelInfo, uAddress);
         if (RT_SUCCESS(rc))
-            rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hAs, &Addr, &off, &Sym, NULL /*phMod*/);
+            rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hAs, &Addr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                      &off, &Sym, NULL /*phMod*/);
     }
     else
@@ -359 +360 @@
     else if (fFlags & DBGF_DISAS_FLAGS_CURRENT_HYPER)
     {
+        fFlags    |= DBGF_DISAS_FLAGS_HYPER;
         pCtxCore   = CPUMGetHyperCtxCore(pVCpu);
         Sel        = pCtxCore->cs.Sel;
@@ -449 +451 @@
         }
     }
-    else if (   !(fFlags & DBGF_DISAS_FLAGS_CURRENT_HYPER)
+    else if (   !(fFlags & DBGF_DISAS_FLAGS_HYPER)
              && (   (pCtxCore && pCtxCore->eflags.Bits.u1VM)
                  || enmMode == PGMMODE_REAL
@@ -474 +476 @@
     else
     {
-        rc = SELMR3GetSelectorInfo(pVM, pVCpu, Sel, &SelInfo);
+        if (!(fFlags & DBGF_DISAS_FLAGS_HYPER))
+            rc = SELMR3GetSelectorInfo(pVM, pVCpu, Sel, &SelInfo);
+        else
+            rc = SELMR3GetShadowSelectorInfo(pVM, Sel, &SelInfo);
         if (RT_FAILURE(rc))
         {

trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp

@@ -1293 +1293 @@
      * Resolve the register.
      */
-    bool const fGuestRegs = !(idDefCpu & DBGFREG_HYPER_VMCPUID) && idDefCpu != VMCPUID_ANY;
+    bool fGuestRegs = true;
+    if ((idDefCpu & DBGFREG_HYPER_VMCPUID) && idDefCpu != VMCPUID_ANY)
+    {
+        fGuestRegs = false;
+        idDefCpu &= ~DBGFREG_HYPER_VMCPUID;
+    }
+
     PCDBGFREGLOOKUP pLookupRec = dbgfR3RegResolve(pUVM, idDefCpu, pszReg, fGuestRegs);
     if (!pLookupRec)
@@ -1448 +1454 @@
      * Resolve the register and call the getter on the relevant CPU.
      */
-    bool const fGuestRegs = !(idDefCpu & DBGFREG_HYPER_VMCPUID) && idDefCpu != VMCPUID_ANY;
+    bool fGuestRegs = true;
+    if ((idDefCpu & DBGFREG_HYPER_VMCPUID) && idDefCpu != VMCPUID_ANY)
+    {
+        fGuestRegs = false;
+        idDefCpu &= ~DBGFREG_HYPER_VMCPUID;
+    }
     PCDBGFREGLOOKUP pLookupRec = dbgfR3RegResolve(pUVM, idDefCpu, pszReg, fGuestRegs);
     if (pLookupRec)

trunk/src/VBox/VMM/VMMR3/DBGFStack.cpp

@@ -157 +157 @@
         if (DBGFADDRESS_IS_VALID(&pFrame->AddrPC))
         {
-            pFrame->pSymPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrPC, NULL /*offDisp*/, NULL /*phMod*/);
+            pFrame->pSymPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrPC, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                                    NULL /*offDisp*/, NULL /*phMod*/);
             pFrame->pLinePC = DBGFR3LineByAddrAlloc(pUVM, pFrame->AddrPC.FlatPtr, NULL);
         }
@@ -253 +254 @@
     }
 
-    pFrame->pSymReturnPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrReturnPC, NULL /*offDisp*/, NULL /*phMod*/);
+    pFrame->pSymReturnPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrReturnPC, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                                  NULL /*offDisp*/, NULL /*phMod*/);
     pFrame->pLineReturnPC = DBGFR3LineByAddrAlloc(pUVM, pFrame->AddrReturnPC.FlatPtr, NULL);
 

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2404 +2404 @@
                     if (rc != VINF_SUCCESS)
                     {
-                        /* switch to guru meditation mode */
-                        pVCpu->em.s.enmState = EMSTATE_GURU_MEDITATION;
-                        VMMR3FatalDump(pVM, pVCpu, rc);
+                        if (rc == VINF_EM_OFF || rc == VINF_EM_TERMINATE)
+                            pVCpu->em.s.enmState = EMSTATE_TERMINATING;
+                        else
+                        {
+                            /* switch to guru meditation mode */
+                            pVCpu->em.s.enmState = EMSTATE_GURU_MEDITATION;
+                            VMMR3FatalDump(pVM, pVCpu, rc);
+                        }
                         Log(("EMR3ExecuteVM: actually returns %Rrc (state %s / %s)\n", rc, emR3GetStateName(pVCpu->em.s.enmState), emR3GetStateName(enmOldState)));
                         return rc;