diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-14 17:43:00 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-01 08:24:16 -0700 |
| commit | dd7624d2b9e599d57762d12031b10b89defc9807 (patch) | |
| tree | c972296737f992a84b1552561f823991d28403f0 /disassembler | |
| parent | 8464a64a50190c06e95015a932eda9511fa6473d (diff) | |
| download | art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.gz art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.bz2 art-dd7624d2b9e599d57762d12031b10b89defc9807.zip | |
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
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 8 | ||||
| -rw-r--r-- | disassembler/disassembler_mips.cc | 2 | ||||
| -rw-r--r-- | disassembler/disassembler_x86.cc | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 55fd52f080..899aa78f6d 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<intptr_t>(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<intptr_t>(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<intptr_t>(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + imm12; diff --git a/disassembler/disassembler_mips.cc b/disassembler/disassembler_mips.cc index 72ff761426..5e89f6f56c 100644 --- a/disassembler/disassembler_mips.cc +++ b/disassembler/disassembler_mips.cc @@ -237,7 +237,7 @@ static void DumpMips(std::ostream& os, const uint8_t* instr_ptr) { args << StringPrintf("%+d(r%d)", offset, rs); if (rs == 17) { args << " ; "; - Thread::DumpThreadOffset(args, offset, 4); + Thread::DumpThreadOffset<4>(args, offset); } } break; diff --git a/disassembler/disassembler_x86.cc b/disassembler/disassembler_x86.cc index 4a03ebea0c..68e77d44e4 100644 --- a/disassembler/disassembler_x86.cc +++ b/disassembler/disassembler_x86.cc @@ -849,9 +849,13 @@ DISASSEMBLER_ENTRY(cmp, } args << StringPrintf("%+d (%p)", displacement, instr + displacement); } - if (prefix[1] == kFs) { + if (prefix[1] == kFs && !supports_rex_) { args << " ; "; - Thread::DumpThreadOffset(args, address_bits, 4); + Thread::DumpThreadOffset<4>(args, address_bits); + } + if (prefix[1] == kGs && supports_rex_) { + args << " ; "; + Thread::DumpThreadOffset<8>(args, address_bits); } std::stringstream hex; for (size_t i = 0; begin_instr + i < instr; ++i) { |