From 107c31e598b649a8bb8d959d6a0377937e63e624 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 23 Jan 2014 20:55:29 -0800 Subject: 64bit friendly printf modifiers in LIR dumping. Also correct header file inclusion ordering. Change-Id: I8fb99e80cf1487e8b2278d4c1d110d14ed18c086 --- compiler/dex/quick/codegen_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/dex/quick/codegen_util.cc') diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 2ce7ecdecc..12ecfff935 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -34,7 +34,7 @@ template void DumpMappingTable(const char* table_name, const char* descriptor, const char* name, const Signature& signature, uint32_t size, It first) { if (size != 0) { - std::string line(StringPrintf("\n %s %s%s_%s_table[%zu] = {", table_name, + std::string line(StringPrintf("\n %s %s%s_%s_table[%u] = {", table_name, descriptor, name, signature.ToString().c_str(), size)); std::replace(line.begin(), line.end(), ';', '_'); LOG(INFO) << line; @@ -234,8 +234,8 @@ void Mir2Lir::DumpLIRInsn(LIR* lir, unsigned char* base_addr) { lir, base_addr)); std::string op_operands(BuildInsnString(GetTargetInstFmt(lir->opcode), lir, base_addr)); - LOG(INFO) << StringPrintf("%05x: %-9s%s%s", - reinterpret_cast(base_addr + offset), + LOG(INFO) << StringPrintf("%5p: %-9s%s%s", + base_addr + offset, op_name.c_str(), op_operands.c_str(), lir->flags.is_nop ? "(nop)" : ""); } -- cgit v1.2.3-59-g8ed1b