commit 229feb7a09317919ee51c06d1c3e715cea25da75
author Elliott Hughes <enh@google.com> Thu Feb 23 13:33:29 2012 -0800
committer Elliott Hughes <enh@google.com> Thu Feb 23 13:33:29 2012 -0800
tree 2e09c9af03d0f505391f1803404c887873f1654f
parent 753d7ff905bd1d397ba6b8cb4336096535021e40

Consistently use hex for dex PC values in the debugger.

dexdump uses hex, so there's less need for translation if the runtime does too.

Change-Id: Ie44790d0b277a12d45ec6fdf11fcc20e75459b5a

src/jdwp/jdwp_event.cc

diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index 5827102..b92884f 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -573,13 +573,13 @@
    * go to sleep indefinitely.
    */
   while (eventThreadId != 0) {
-    VLOG(jdwp) << StringPrintf("event in progress (0x%llx), 0x%llx sleeping", eventThreadId, threadId);
+    VLOG(jdwp) << StringPrintf("event in progress (%#llx), %#llx sleeping", eventThreadId, threadId);
     waited = true;
     event_thread_cond_.Wait(event_thread_lock_);
   }
 
   if (waited || threadId != 0) {
-    VLOG(jdwp) << StringPrintf("event token grabbed (0x%llx)", threadId);
+    VLOG(jdwp) << StringPrintf("event token grabbed (%#llx)", threadId);
   }
   if (threadId != 0) {
     eventThreadId = threadId;
@@ -598,7 +598,7 @@
   MutexLock mu(event_thread_lock_);
 
   CHECK_NE(eventThreadId, 0U);
-  VLOG(jdwp) << StringPrintf("cleared event token (0x%llx)", eventThreadId);
+  VLOG(jdwp) << StringPrintf("cleared event token (%#llx)", eventThreadId);
 
   eventThreadId = 0;
 
@@ -766,7 +766,7 @@
     if (match_count != 0) {
       VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total) "
                  << basket.className << "." << Dbg::GetMethodName(pLoc->classId, pLoc->methodId)
-                 << " thread=" << (void*) basket.threadId << " code=" << (void*) pLoc->dex_pc << ")";
+                 << StringPrintf(" thread=%#llx dex_pc=%#llx)", basket.threadId, pLoc->dex_pc);
 
       suspendPolicy = scanSuspendPolicy(matchList, match_count);
       VLOG(jdwp) << "  suspendPolicy=" << suspendPolicy;