diff options
| author | Ian Rogers <irogers@google.com> | 2014-04-30 19:04:27 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-01 08:31:01 -0700 |
| commit | ff093b31d75658c3404f9b51ee45760f346f06d9 (patch) | |
| tree | 16a11ff5a78862defcc169b0af2901360a57ab6a /disassembler | |
| parent | b3016551e5f264264dbb633a1ddf03ac97f9c66c (diff) | |
| download | art-ff093b31d75658c3404f9b51ee45760f346f06d9.zip art-ff093b31d75658c3404f9b51ee45760f346f06d9.tar.gz art-ff093b31d75658c3404f9b51ee45760f346f06d9.tar.bz2 | |
Fix a few 64-bit compilation of 32-bit code issues.
Bug: 13423943
Change-Id: I939389413af0a68c0d95b23cd598b7c42afa4383
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index d6d2058..4e4a512 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<intptr_t>(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast<void*>(*reinterpret_cast<int32_t*>(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast<int32_t*>(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<intptr_t>(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast<void*>(*reinterpret_cast<int32_t*>(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast<int32_t*>(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<intptr_t>(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; - args << " ; " << reinterpret_cast<void*>(*reinterpret_cast<int32_t*>(lit_adr)); + args << StringPrintf(" ; 0x%08x", *reinterpret_cast<int32_t*>(lit_adr)); } } else if (op4 == 0) { // LDR.W Rt, [Rn, Rm{, LSL #imm2}] - 111 11 00 00 101 nnnn tttt 000000iimmmm |