Changeset 450 in vbox for trunk/src/VBox

Timestamp:

Jan 30, 2007 11:06:24 PM (18 years ago)

Author:

vboxsync

Message:

Don't use an offset based AVL tree for symbols.

Location:

trunk/src/VBox/VMM

Files:

• DBGFInternal.h (modified) (1 diff)
• DBGFSym.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/DBGFInternal.h

@@ -222 +222 @@
     RTCRITSECT              InfoCritSect;
 
-
+    /** Range tree containing the loaded symbols of the a VM.
+     * This tree will never have blind spots. */
+    HCPTRTYPE(AVLRGCPTRTREE) SymbolTree;
+    /** Symbol name space. */
+    HCPTRTYPE(PRTSTRSPACE)  pSymbolSpace;
     /** Indicates whether DBGFSym.cpp is initialized or not.
      * This part is initialized in a lazy manner for performance reasons. */
     bool                    fSymInited;
-    /** Range tree containing the loaded symbols of the a VM.
-     * This tree will never have blind spots. */
-    AVLROGCPTRTREE          SymbolTree;
-    /** Symbol name space. */
-    HCPTRTYPE(PRTSTRSPACE)  pSymbolSpace;
+    /** Alignment padding. */
+    RTUINT                  uAlignment0;
 
     /** The number of hardware breakpoints. */

trunk/src/VBox/VMM/DBGFSym.cpp

@@ -74 +74 @@
 {
     /** Node core with the symbol address range. */
-    AVLROGCPTRNODECORE      Core;
+    AVLRGCPTRNODECORE       Core;
     /** Pointer to the module this symbol is associated with. */
     PDBGFMOD                pModule;
@@ -116 +116 @@
         pSym->pModule = NULL;
         pSym->szName[0] = '\0';
-        if (RTAvlroGCPtrInsert(&pVM->dbgf.s.SymbolTree, &pSym->Core))
+        if (RTAvlrGCPtrInsert(&pVM->dbgf.s.SymbolTree, &pSym->Core))
             return VINF_SUCCESS;
         AssertReleaseMsgFailed(("Failed to insert %VGv-%VGv!\n", pSym->Core.Key, pSym->Core.KeyLast));
@@ -142 +142 @@
         memcpy(pSym->szName, pszName, cchName);
 
-        PDBGFSYM pOld = (PDBGFSYM)RTAvlroGCPtrRangeGet(&pVM->dbgf.s.SymbolTree, (RTGCPTR)Address);
+        PDBGFSYM pOld = (PDBGFSYM)RTAvlrGCPtrRangeGet(&pVM->dbgf.s.SymbolTree, (RTGCPTR)Address);
         if (pOld)
         {
@@ -148 +148 @@
             if (pOld->Core.Key == pSym->Core.Key)
             {
-                pOld = (PDBGFSYM)RTAvlroGCPtrRemove(&pVM->dbgf.s.SymbolTree, (RTGCPTR)Address);
+                pOld = (PDBGFSYM)RTAvlrGCPtrRemove(&pVM->dbgf.s.SymbolTree, (RTGCPTR)Address);
                 AssertRelease(pOld);
                 MMR3HeapFree(pOld);
@@ -154 +154 @@
             else
                 pOld->Core.KeyLast = Address - 1;
-            if (RTAvlroGCPtrInsert(&pVM->dbgf.s.SymbolTree, &pSym->Core))
+            if (RTAvlrGCPtrInsert(&pVM->dbgf.s.SymbolTree, &pSym->Core))
             {
                 /*
@@ -199 +199 @@
 static PDBGFSYM dbgfR3SymbolGetAddr(PVM pVM, RTGCPTR Address)
 {
-    PDBGFSYM pSym = (PDBGFSYM)RTAvlroGCPtrRangeGet(&pVM->dbgf.s.SymbolTree, Address);
+    PDBGFSYM pSym = (PDBGFSYM)RTAvlrGCPtrRangeGet(&pVM->dbgf.s.SymbolTree, Address);
     Assert(pSym);
     if (pSym && pSym->szName[0])