vbox的更動 39389 路徑 trunk/src/VBox/Runtime/common

時間撮記:

2011-11-21 下午04:59:27 (13 年 以前)

作者:

vboxsync

訊息:

dbgmodnm.cpp: Made it grok linux 2.4 /proc/ksyms (dsl).

檔案:

• trunk/src/VBox/Runtime/common/dbg/dbgmodnm.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/common/dbg/dbgmodnm.cpp

@@ -207 +207 @@
     RTUINTPTR   SegZeroRva = fAddSymbols ? RTDbgModSegmentRva(pThis->hCnt, 0/*iSeg*/) : 0;
     char        szSym[RTDBG_SYMBOL_NAME_LENGTH] = "";
-    size_t      cchMod  = 0;
-    size_t      offSym  = 0;
-    unsigned    cchAddr = 0;
-    uint64_t    u64Low  = UINT64_MAX;
-    uint64_t    u64High = 0;
+    size_t      cchMod    = 0;
+    size_t      offSym    = 0;
+    unsigned    cchAddr   = 0;
+    uint64_t    u64Low    = UINT64_MAX;
+    uint64_t    u64High   = 0;
+    int         fWithType = -1;
     char        szLine[512];
     int         rc;
@@ -236 +237 @@
 
             /* Get the type and check for single space before symbol. */
-            chType = szLine[cchAddr + 1];
-            if (    RT_C_IS_BLANK(chType)
-                ||  !RT_C_IS_BLANK(szLine[cchAddr + 2])
-                ||  RT_C_IS_BLANK(szLine[cchAddr + 3]))
-                return VERR_DBG_NOT_NM_MAP_FILE;
+            char *pszName;
+            if (fWithType < 0)
+                fWithType = RT_C_IS_BLANK(szLine[cchAddr + 2]) ? 1 : 0; /* have type? Linux 2.4 /proc/ksyms doesn't. */
+            if (fWithType)
+            {
+                chType  = szLine[cchAddr + 1];
+                pszName = &szLine[cchAddr + 3];
+                if (    RT_C_IS_BLANK(chType)
+                    ||  !RT_C_IS_BLANK(szLine[cchAddr + 2])
+                    ||  RT_C_IS_BLANK(szLine[cchAddr + 3]))
+                    return VERR_DBG_NOT_NM_MAP_FILE;
+            }
+            else
+            {
+                chType = 'T';
+                pszName = &szLine[cchAddr + 1];
+            }
 
             /* Find the end of the symbol name. */
-            char *pszName    = &szLine[cchAddr + 3];
             char *pszNameEnd = pszName;
             char ch;