[llvm] r182209 - Print uint64_t -debug text correctly on 32-bit hosts

[Tim Northover]

Author: tnorthover
Date: Sun May 19 04:55:06 2013
New Revision: 182209

URL: http://llvm.org/viewvc/llvm-project?rev=182209&view=rev
Log:
Print uint64_t -debug text correctly on 32-bit hosts

On 32-bit hosts %p can print garbage when given a uint64_t, we should
use %llx instead. This only affects the output of the debugging text
produced by lli.

Modified:
    llvm/trunk/tools/lli/lli.cpp

Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=182209&r1=182208&r2=182209&view=diff
==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Sun May 19 04:55:06 2013
@@ -254,7 +254,7 @@ void layoutRemoteTargetMemory(RemoteTarg
     EE->mapSectionAddress(const_cast<void*>(Offsets[i].first), Addr);
 
     DEBUG(dbgs() << "  Mapping local: " << Offsets[i].first
-                 << " to remote: " << format("%p", Addr) << "\n");
+                 << " to remote: 0x" << format("%llx", Addr) << "\n");
 
   }
 
@@ -269,12 +269,12 @@ void layoutRemoteTargetMemory(RemoteTarg
       T->loadCode(Addr, Offsets[i].first, Sizes[i]);
 
       DEBUG(dbgs() << "  loading code: " << Offsets[i].first
-            << " to remote: " << format("%p", Addr) << "\n");
+            << " to remote: 0x" << format("%llx", Addr) << "\n");
     } else {
       T->loadData(Addr, Offsets[i].first, Sizes[i]);
 
       DEBUG(dbgs() << "  loading data: " << Offsets[i].first
-            << " to remote: " << format("%p", Addr) << "\n");
+            << " to remote: 0x" << format("%llx", Addr) << "\n");
     }
 
   }
@@ -483,8 +483,8 @@ int main(int argc, char **argv, char * c
     // FIXME: argv and envp handling.
     uint64_t Entry = (uint64_t)EE->getPointerToFunction(EntryFn);
 
-    DEBUG(dbgs() << "Executing '" << EntryFn->getName() << "' at "
-                 << format("%p", Entry) << "\n");
+    DEBUG(dbgs() << "Executing '" << EntryFn->getName() << "' at 0x"
+                 << format("%llx", Entry) << "\n");
 
     if (Target.executeCode(Entry, Result))
       errs() << "ERROR: " << Target.getErrorMsg() << "\n";