From a73a6141cac0091a2121fcbf55b78d232680317c Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Sun, 19 May 2013 09:55:06 +0000 Subject: 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182209 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/lli/lli.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/lli') diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index ac7db20aed..031f945aba 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -254,7 +254,7 @@ void layoutRemoteTargetMemory(RemoteTarget *T, RecordingMemoryManager *JMM) { EE->mapSectionAddress(const_cast(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(RemoteTarget *T, RecordingMemoryManager *JMM) { 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 * const *envp) { // 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"; -- cgit v1.2.3