diff options
Diffstat (limited to 'disassembler/disassembler.cc')
| -rw-r--r-- | disassembler/disassembler.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/disassembler/disassembler.cc b/disassembler/disassembler.cc index bcd0d1630a..8eecc62cd5 100644 --- a/disassembler/disassembler.cc +++ b/disassembler/disassembler.cc @@ -18,15 +18,23 @@ #include <ostream> -#include "base/logging.h" -#include "base/stringprintf.h" +#include "android-base/logging.h" +#include "android-base/stringprintf.h" + #include "disassembler_arm.h" #include "disassembler_arm64.h" #include "disassembler_mips.h" #include "disassembler_x86.h" +using android::base::StringPrintf; + namespace art { +Disassembler::Disassembler(DisassemblerOptions* disassembler_options) + : disassembler_options_(disassembler_options) { + CHECK(disassembler_options_ != nullptr); +} + Disassembler* Disassembler::Create(InstructionSet instruction_set, DisassemblerOptions* options) { if (instruction_set == kArm || instruction_set == kThumb2) { return new arm::DisassemblerArm(options); @@ -39,7 +47,7 @@ Disassembler* Disassembler::Create(InstructionSet instruction_set, DisassemblerO } else if (instruction_set == kX86_64) { return new x86::DisassemblerX86(options, true); } else { - UNIMPLEMENTED(FATAL) << "no disassembler for " << instruction_set; + UNIMPLEMENTED(FATAL) << static_cast<uint32_t>(instruction_set); return nullptr; } } |