diff options
| author | 2016-08-02 03:47:35 +0000 | |
|---|---|---|
| committer | 2016-08-02 03:47:35 +0000 | |
| commit | ba65cc4a71273904294245cb37ce70e5bce797e3 (patch) | |
| tree | d53a7a816ec4c8e5bdbf80729ac945787b27bf2c /disassembler/disassembler_arm.cc | |
| parent | 1a827a05afbffd5bee241f245f9aa3c40b4dbae4 (diff) | |
| parent | 542451cc546779f5c67840e105c51205a1b0a8fd (diff) | |
Merge "ART: Convert pointer size to enum"
Diffstat (limited to 'disassembler/disassembler_arm.cc')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index c410cd9e2f..6c43e863e1 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -329,7 +329,7 @@ void DisassemblerArm::DumpArm(std::ostream& os, const uint8_t* instr_ptr) { } if (rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset<4>(args, offset); + Thread::DumpThreadOffset<kArmPointerSize>(args, offset); } } } @@ -1407,7 +1407,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) args << Rt << ", [" << Rn << ", #" << (U != 0u ? "" : "-") << imm12 << "]"; if (Rn.r == TR && is_load) { args << " ; "; - Thread::DumpThreadOffset<4>(args, imm12); + Thread::DumpThreadOffset<kArmPointerSize>(args, imm12); } else if (Rn.r == PC) { T2LitType lit_type[] = { kT2LitUByte, kT2LitUHalf, kT2LitHexWord, kT2LitInvalid, |