diff options
| author | Andreas Gampe <agampe@google.com> | 2016-08-29 17:43:45 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-09-08 10:13:47 -0700 |
| commit | bda1d606f2d31086874b68edd9254e3817d8049c (patch) | |
| tree | db07417935fe72e99c3da60152e13f0620c7d8d7 /runtime/arch/instruction_set.cc | |
| parent | d14d515df39cd963179088b8721768f9645243aa (diff) | |
ART: Detach libart-disassembler from libart
Some more intrusive changes than I would have liked, as long as
ART logging is different from libbase logging.
Fix up some includes.
Bug: 15436106
Bug: 31338270
Test: m test-art-host
Change-Id: I9fbe4b85b2d74e079a4981f3aec9af63b163a461
Diffstat (limited to 'runtime/arch/instruction_set.cc')
| -rw-r--r-- | runtime/arch/instruction_set.cc | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/runtime/arch/instruction_set.cc b/runtime/arch/instruction_set.cc index b35e0889e4..8f64dcd306 100644 --- a/runtime/arch/instruction_set.cc +++ b/runtime/arch/instruction_set.cc @@ -19,11 +19,31 @@ // Explicitly include our own elf.h to avoid Linux and other dependencies. #include "../elf.h" #include "base/bit_utils.h" +#include "base/logging.h" #include "globals.h" namespace art { -const char* GetInstructionSetString(const InstructionSet isa) { +void InstructionSetAbort(InstructionSet isa) { + switch (isa) { + case kArm: + case kThumb2: + case kArm64: + case kX86: + case kX86_64: + case kMips: + case kMips64: + case kNone: + LOG(FATAL) << "Unsupported instruction set " << isa; + UNREACHABLE(); + + default: + LOG(FATAL) << "Unknown ISA " << isa; + UNREACHABLE(); + } +} + +const char* GetInstructionSetString(InstructionSet isa) { switch (isa) { case kArm: case kThumb2: |