diff options
| author | Andreas Gampe <agampe@google.com> | 2016-08-19 10:49:06 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-08-19 16:46:56 -0700 |
| commit | 372f3a374681ef11f003460e14249adb7bc8313d (patch) | |
| tree | b6d2bd95975a0ce1096dc2aa761f8e6b30e42b18 /disassembler/disassembler_arm.cc | |
| parent | 9c07ab332b8ebbcb1586c311bfcb75e19b8a35b4 (diff) | |
ART: Add thread offset printing hook to disassembler
To prepare separation of disassembler from libart, add a function
hook to the disassembler options for thread offset name printing.
Bug: 15436106
Change-Id: I9e9b7e565ae923952c64026f675ac527b560f51b
Diffstat (limited to 'disassembler/disassembler_arm.cc')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 4f0e144aa8..a47b6adcc9 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -25,7 +25,6 @@ #include "base/bit_utils.h" #include "base/logging.h" #include "base/stringprintf.h" -#include "thread.h" namespace art { namespace arm { @@ -329,7 +328,7 @@ void DisassemblerArm::DumpArm(std::ostream& os, const uint8_t* instr_ptr) { } if (rn.r == 9) { args << " ; "; - Thread::DumpThreadOffset<kArmPointerSize>(args, offset); + GetDisassemblerOptions()->thread_offset_name_function_(args, offset); } } } @@ -1401,7 +1400,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<kArmPointerSize>(args, imm12); + GetDisassemblerOptions()->thread_offset_name_function_(args, imm12); } else if (Rn.r == PC) { T2LitType lit_type[] = { kT2LitUByte, kT2LitUHalf, kT2LitHexWord, kT2LitInvalid, |