From ff093b31d75658c3404f9b51ee45760f346f06d9 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 30 Apr 2014 19:04:27 -0700 Subject: Fix a few 64-bit compilation of 32-bit code issues. Bug: 13423943 Change-Id: I939389413af0a68c0d95b23cd598b7c42afa4383 --- disassembler/disassembler_arm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disassembler/disassembler_arm.cc') diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index d6d20586b7..4e4a512713 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -1360,7 +1360,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast(*reinterpret_cast(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast(lit_adr)); } } else if (op3 == 3) { // LDRSH.W Rt, [Rn, #imm12] - 111 11 00 11 011 nnnn tttt iiiiiiiiiiii @@ -1373,7 +1373,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast(*reinterpret_cast(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast(lit_adr)); } } } @@ -1430,7 +1430,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast(*reinterpret_cast(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast(lit_adr)); } } else if (op4 == 0) { // LDR.W Rt, [Rn, Rm{, LSL #imm2}] - 111 11 00 00 101 nnnn tttt 000000iimmmm -- cgit v1.2.3-59-g8ed1b