Changeset 73360 in vbox for trunk/src/VBox/Debugger

Timestamp:

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

Author:

vboxsync

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

123975

Message:

VMM,REM,DBGC: Use RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED.

File:

• trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (4 diffs)

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)