Changeset 73360 in vbox

Timestamp:

Jul 25, 2018 6:51:12 PM (6 years ago)

Author:

vboxsync

Message:

VMM,REM,DBGC: Use RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED.

Location:

trunk/src

Files:

• VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (4 diffs)
• VBox/VMM/VMMR3/DBGFDisas.cpp (modified) (1 diff)
• VBox/VMM/VMMR3/DBGFR3BugCheck.cpp (modified) (1 diff)
• VBox/VMM/VMMR3/DBGFStack.cpp (modified) (2 diffs)
• VBox/VMM/VMMR3/PATMR3Dbg.cpp (modified) (1 diff)
• VBox/VMM/VMMR3/VMMGuruMeditation.cpp (modified) (1 diff)
• recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1004 +1004 @@
         DBGFADDRESS Addr;
         int rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, pBp->u.GCPtr),
-                                      RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &off, &Sym, NULL);
+                                      RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                      &off, &Sym, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -1188 +1189 @@
     RTDBGSYMBOL Symbol;
     RTGCINTPTR  offDispSym;
-    int rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &offDispSym, &Symbol, NULL);
+    int rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress,
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                  &offDispSym, &Symbol, NULL);
     if (RT_FAILURE(rc) || offDispSym > _1G)
-        rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress, RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL, &offDispSym, &Symbol, NULL);
+        rc = DBGFR3AsSymbolByAddr(pUVM, hDbgAs, pAddress,
+                                  RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                  &offDispSym, &Symbol, NULL);
     if (RT_SUCCESS(rc) && offDispSym < _1G)
     {
@@ -3497 +3502 @@
                         RTINTPTR    offDisp;
                         RTDBGSYMBOL Symbol;
-                        rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, &Addr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                        rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, &Addr,
+                                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
                                                   &offDisp, &Symbol, NULL);
                         if (RT_SUCCESS(rc))
@@ -5902 +5908 @@
         DBGFADDRESS Addr;
         rc = DBGFR3AsSymbolByAddr(pUVM, pDbgc->hDbgAs, DBGFR3AddrFromFlat(pDbgc->pUVM, &Addr, AddrVar.u.GCFlat),
-                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &offDisp, &Symbol, NULL);
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                  &offDisp, &Symbol, NULL);
         if (RT_FAILURE(rc))
-            return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3ASymbolByAddr(,,%RGv,,)\n", AddrVar.u.GCFlat);
+            return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3AsSymbolByAddr(,,%RGv,,)\n", AddrVar.u.GCFlat);
 
         if (!offDisp)

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

@@ -377 +377 @@
         RTDBGSYMBOL     Sym;
         RTGCINTPTR      off;
-        rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hDbgAs, &Addr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+        rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hDbgAs, &Addr,
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
                                   &off, &Sym, NULL /*phMod*/);
         if (RT_SUCCESS(rc))

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

@@ -87 +87 @@
     RTGCINTPTR   offDisp = 0;
     PRTDBGSYMBOL pSym = DBGFR3AsSymbolByAddrA(pUVM, DBGF_AS_GLOBAL, DBGFR3AddrFromFlat(pUVM, &Addr, uFlatAddr),
-                                              0 /*fFlags*/, &offDisp, NULL /*phMod*/);
+                                              RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                              &offDisp, NULL /*phMod*/);
     if (pSym)
     {

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

@@ -158 +158 @@
         if (DBGFADDRESS_IS_VALID(&pFrame->AddrPC))
         {
-            pFrame->pSymPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrPC, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+            pFrame->pSymPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrPC,
+                                                    RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
                                                     NULL /*poffDisp*/, NULL /*phMod*/);
             pFrame->pLinePC = DBGFR3AsLineByAddrA(pUVM, hAs, &pFrame->AddrPC, NULL /*poffDisp*/, NULL /*phMod*/);
@@ -292 +293 @@
     }
 
-    pFrame->pSymReturnPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrReturnPC, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+    pFrame->pSymReturnPC  = DBGFR3AsSymbolByAddrA(pUVM, hAs, &pFrame->AddrReturnPC,
+                                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
                                                   NULL /*poffDisp*/, NULL /*phMod*/);
     pFrame->pLineReturnPC = DBGFR3AsLineByAddrA(pUVM, hAs, &pFrame->AddrReturnPC, NULL /*poffDisp*/, NULL /*phMod*/);

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

@@ -198 +198 @@
             int rc = DBGFR3AsSymbolByAddr(pVM->pUVM, DBGF_AS_GLOBAL,
                                           DBGFR3AddrFromFlat(pVM->pUVM, &Addr, pPatchRec->patch.pPrivInstrGC),
-                                          RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                          RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
                                           &offDisp, &Symbol, NULL /*phMod*/);
             if (RT_SUCCESS(rc))

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

@@ -553 +553 @@
                             RTGCINTPTR   offDisp = 0;
                             PRTDBGSYMBOL pSym  = DBGFR3AsSymbolByAddrA(pVM->pUVM, DBGF_AS_R0, &Addr,
-                                                                       RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &offDisp, NULL);
+                                                                       RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                                                       &offDisp, NULL);
                             RTGCINTPTR   offLineDisp;
                             PRTDBGLINE   pLine = DBGFR3AsLineByAddrA(pVM->pUVM, DBGF_AS_R0, &Addr, &offLineDisp, NULL);

trunk/src/recompiler/VBoxRecompiler.c

@@ -4228 +4228 @@
 
     int rc = DBGFR3AsSymbolByAddr(pVM->pUVM, DBGF_AS_GLOBAL, DBGFR3AddrFromFlat(pVM->pUVM, &Addr, orig_addr),
-                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL, &off, &Sym, NULL /*phMod*/);
+                                  RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL | RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED,
+                                  &off, &Sym, NULL /*phMod*/);
     if (RT_SUCCESS(rc))
     {