儲存庫 vbox 的更動 51450

時間撮記:

2014-5-28 下午02:16:07 (10 年 以前)

作者:

vboxsync

訊息:

fixed some Log() statments where we didn't properly display uint64_t or RTUINTPTR variables

位置:

trunk/src/VBox

檔案:

• Additions/common/VBoxGuestLib/HGCMInternal.cpp (修改) (1 筆差異)
• Runtime/common/dbg/dbgmoddbghelp.cpp (修改) (4 筆差異)
• Runtime/common/dbg/dbgmoddwarf.cpp (修改) (1 筆差異)
• Runtime/common/dbg/dbgmodexports.cpp (修改) (1 筆差異)
• Runtime/tools/RTNtDbgHelp.cpp (修改) (3 筆差異)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -208 +208 @@
 
             case VMMDevHGCMParmType_64bit:
-                Log4(("GstHGCMCall: parm=%u type=64bit: %#018x\n", iParm, pSrcParm->u.value64));
+                Log4(("GstHGCMCall: parm=%u type=64bit: %#018RX64\n", iParm, pSrcParm->u.value64));
                 break;
 

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

@@ -216 +216 @@
     if (pLineInfo->Address < pArgs->uModAddr)
     {
-        Log((" %#018x %05u  %s  [SKIPPED - INVALID ADDRESS!]\n", pLineInfo->Address, pLineInfo->LineNumber));
+        Log((" %#018RX64 %05u  %s  [SKIPPED - INVALID ADDRESS!]\n", pLineInfo->Address, pLineInfo->LineNumber));
         return TRUE;
     }
@@ -256 +256 @@
     int rc = RTDbgModLineAdd(pArgs->hCnt, pArgs->pszPrev, pLineInfo->LineNumber,
                              RTDBGSEGIDX_RVA, pLineInfo->Address - pArgs->uModAddr, NULL);
-    Log((" %#018x %05u  %s  [%Rrc]\n", pLineInfo->Address, pLineInfo->LineNumber, rc));
+    Log((" %#018RX64 %05u  %s  [%Rrc]\n", pLineInfo->Address, pLineInfo->LineNumber, rc));
     NOREF(rc);
 
@@ -312 +312 @@
     if (pSymInfo->Address < pArgs->uModAddr) /* NT4 SP1 ntfs.dbg */
     {
-        Log(("  %#018x LB %#07x  %s  [SKIPPED - INVALID ADDRESS!]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name));
+        Log(("  %#018RX64 LB %#07x  %s  [SKIPPED - INVALID ADDRESS!]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name));
         return TRUE;
     }
     if (pSymInfo->NameLen >= RTDBG_SYMBOL_NAME_LENGTH)
     {
-        Log(("  %#018x LB %#07x  %s  [SKIPPED - TOO LONG (%u > %u)!]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name,
+        Log(("  %#018RX64 LB %#07x  %s  [SKIPPED - TOO LONG (%u > %u)!]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name,
              pSymInfo->NameLen, RTDBG_SYMBOL_NAME_LENGTH));
         return TRUE;
@@ -325 +325 @@
     int rc = RTDbgModSymbolAdd(pArgs->hCnt, pSymInfo->Name, RTDBGSEGIDX_RVA,
                                pSymInfo->Address - pArgs->uModAddr, cbSymbol, 0, NULL);
-    Log(("  %#018x LB %#07x  %s  [%Rrc]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name, rc));
+    Log(("  %#018RX64 LB %#07x  %s  [%Rrc]\n", pSymInfo->Address, cbSymbol, pSymInfo->Name, rc));
     NOREF(rc);
 

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

@@ -4435 +4435 @@
         {
             rc = RTDbgModSymbolAdd(pThis->hCnt, pszSymbol, RTDBGSEGIDX_RVA, uRva, 1, 0 /*fFlags*/, NULL /*piOrdinal*/);
-            Log6(("Dwarf: Symbol #%05u %#018x %s [%Rrc]\n", uSymbol, Value, pszSymbol, rc)); NOREF(rc);
+            Log(("Dwarf: Symbol #%05u %#018RTptr %s [%Rrc]\n", uSymbol, Value, pszSymbol, rc)); NOREF(rc);
         }
     }
     else
-        Log6(("Dwarf: Symbol #%05u %#018x %s [SKIPPED - INVALID ADDRESS]\n", uSymbol, Value, pszSymbol));
+        Log(("Dwarf: Symbol #%05u %#018RTptr '%s' [SKIPPED - INVALID ADDRESS]\n", uSymbol, Value, pszSymbol));
     return VINF_SUCCESS;
 }

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

@@ -67 +67 @@
         int rc = RTDbgModSymbolAdd(pArgs->pDbgMod, pszSymbol, RTDBGSEGIDX_RVA, Value - pArgs->uImageBase,
                                    0 /*cb*/, 0 /* fFlags */, NULL /*piOrdinal*/);
-        Log(("Symbol #%05u %#018x %s [%Rrc]\n", uSymbol, Value, pszSymbol, rc)); NOREF(rc);
+        Log(("Symbol #%05u %#018RTptr %s [%Rrc]\n", uSymbol, Value, pszSymbol, rc)); NOREF(rc);
     }
     else
-        Log(("Symbol #%05u %#018x %s [SKIPPED - INVALID ADDRESS]\n", uSymbol, Value, pszSymbol));
+        Log(("Symbol #%05u %#018RTptr %s [SKIPPED - INVALID ADDRESS]\n", uSymbol, Value, pszSymbol));
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/tools/RTNtDbgHelp.cpp

@@ -187 +187 @@
     pMod->uModAddr = uModAddrGot;
     RTListAppend(&g_ModuleList, &pMod->ListEntry);
-    infoPrintf(1, "%#018x %s\n", pMod->uModAddr, pMod->pszName);
+    infoPrintf(1, "%#018RX64 %s\n", pMod->uModAddr, pMod->pszName);
 
     return RTEXITCODE_SUCCESS;
@@ -229 +229 @@
 {
     NOREF(pvUser);
-    RTPrintf("  %#018x LB %#07x  %s\n", pSymInfo->Address, cbSymbol, pSymInfo->Name);
+    RTPrintf("  %#018RX64 LB %#07x  %s\n", pSymInfo->Address, cbSymbol, pSymInfo->Name);
     return TRUE;
 }
@@ -243 +243 @@
     RTListForEach(&g_ModuleList, pMod, RTNTDBGHELPMOD, ListEntry)
     {
-        RTPrintf("*** %#018x - %s ***\n", pMod->uModAddr, pMod->szFullName);
+        RTPrintf("*** %#018RX64 - %s ***\n", pMod->uModAddr, pMod->szFullName);
 
         static const int8_t s_acbVariations[]  = { 0, -4, -8, -12, -16, -20, -24, -28, -32, 4, 8, 12, 16, 20, 24, 28, 32 };