From dd7624d2b9e599d57762d12031b10b89defc9807 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 14 Mar 2014 17:43:00 -0700 Subject: Allow mixing of thread offsets between 32 and 64bit architectures. Begin a more full implementation x86-64 REX prefixes. Doesn't implement 64bit thread offset support for the JNI compiler. Change-Id: If9af2f08a1833c21ddb4b4077f9b03add1a05147 --- disassembler/disassembler_arm.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'disassembler/disassembler_arm.cc') diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 55fd52f..899aa78 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -305,7 +305,7 @@ void DisassemblerArm::DumpArm(std::ostream& os, const uint8_t* instr_ptr) { } if (rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset(args, offset, 4); + Thread::DumpThreadOffset<4>(args, offset); } } } @@ -1291,7 +1291,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) args << Rt << ", [" << Rn << ", #" << imm12 << "]"; if (Rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset(args, imm12, 4); + Thread::DumpThreadOffset<4>(args, imm12); } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; @@ -1304,7 +1304,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) args << Rt << ", [" << Rn << ", #" << imm12 << "]"; if (Rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset(args, imm12, 4); + Thread::DumpThreadOffset<4>(args, imm12); } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; @@ -1361,7 +1361,7 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) args << Rt << ", [" << Rn << ", #" << imm12 << "]"; if (Rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset(args, imm12, 4); + Thread::DumpThreadOffset<4>(args, imm12); } else if (Rn.r == 15) { intptr_t lit_adr = reinterpret_cast(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; -- cgit v1.1