From: Andrew Kaylor Date: Thu, 1 Nov 2012 19:49:21 +0000 (+0000) Subject: Fixed format string to avoid pointer truncation during 64-bit debugging. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5fc8c7cb8571f99b69264aeba48c45eed1c69f6a;p=oota-llvm.git Fixed format string to avoid pointer truncation during 64-bit debugging. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167247 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index fb07cb90218..141836fc417 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -203,7 +203,7 @@ void RuntimeDyldImpl::emitCommonSymbols(ObjectImage &Obj, Addr += AlignOffset; Offset += AlignOffset; DEBUG(dbgs() << "Allocating common symbol " << Name << " address " << - format("0x%x\n", Addr)); + format("%p\n", Addr)); } Obj.updateSymbolAddress(it->first, (uint64_t)Addr); SymbolTable[Name.data()] = SymbolLoc(SectionID, Offset); @@ -375,7 +375,7 @@ uint8_t *RuntimeDyldImpl::createStubFunction(uint8_t *Addr) { writeInt32BE(Addr+32, 0x7D6903A6); // mtctr r11 writeInt32BE(Addr+36, 0xE96C0010); // ld r11, 16(r2) writeInt32BE(Addr+40, 0x4E800420); // bctr - + return Addr; } return Addr;