diff options
| author | Ian Rogers <irogers@google.com> | 2013-12-19 17:58:05 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-01-08 14:09:53 -0800 |
| commit | ef6a776af2b4b8607d5f91add0ed0e8497100e31 (patch) | |
| tree | dbff2e90823f07915efab7abc5a3e31182b2f2ae /disassembler | |
| parent | 8ec304764fdc97ee300175ebed16622eddfb6f1f (diff) | |
| download | art-ef6a776af2b4b8607d5f91add0ed0e8497100e31.tar.gz art-ef6a776af2b4b8607d5f91add0ed0e8497100e31.tar.bz2 art-ef6a776af2b4b8607d5f91add0ed0e8497100e31.zip | |
Inline codegen for long-to-double on ARM.
Change-Id: I4fc443c1b942a2231d680fc2c7a1530c86104584
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 71f70c4e5b..68626f6d5c 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -683,7 +683,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) uint32_t coproc = (instr >> 8) & 0xF; uint32_t op4 = (instr >> 4) & 0x1; - if (coproc == 10 || coproc == 11) { // 101x + if (coproc == 0xA || coproc == 0xB) { // 101x if (op3 < 0x20 && (op3 & ~5) != 0) { // 0xxxxx and not 000x0x // Extension register load/store instructions // |1111|110|00000|0000|1111|110|0|00000000| @@ -708,6 +708,11 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) opcode << (L == 1 ? "vldr" : "vstr"); args << d << ", [" << Rn << ", #" << ((U == 1) ? "" : "-") << (imm8 << 2) << "]"; + if (Rn.r == 15 && U == 1) { + intptr_t lit_adr = reinterpret_cast<intptr_t>(instr_ptr); + lit_adr = RoundDown(lit_adr, 4) + 4 + (imm8 << 2); + args << StringPrintf(" ; 0x%llx", *reinterpret_cast<int64_t*>(lit_adr)); + } } else if (Rn.r == 13 && W == 1 && U == L) { // VPUSH/VPOP opcode << (L == 1 ? "vpop" : "vpush"); args << FpRegisterRange(instr); |