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/disassembler_x86.cc | |
| parent | 8464a64a50190c06e95015a932eda9511fa6473d (diff) | |
| download | android_art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.gz android_art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.bz2 android_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/disassembler_x86.cc')
| -rw-r--r-- | disassembler/disassembler_x86.cc | 8 |
1 files changed, 6 insertions, 2 deletions
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) { |