Merge "AArch64: Add ARM64 Disassembler"

4 files changed, 101 insertions, 2 deletions

diff --git a/disassembler/Android.mk b/disassembler/Android.mk
index ca08b09..56929fc 100644
--- a/disassembler/Android.mk
+++ b/disassembler/Android.mk
@@ -21,6 +21,7 @@ include art/build/Android.common.mk
 LIBART_DISASSEMBLER_SRC_FILES := \
 	disassembler.cc \
 	disassembler_arm.cc \
+	disassembler_arm64.cc \
 	disassembler_mips.cc \
 	disassembler_x86.cc
 
@@ -89,10 +90,10 @@ define build-libart-disassembler
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
   ifeq ($$(art_target_or_host),target)
-    LOCAL_SHARED_LIBRARIES += libcutils
+    LOCAL_SHARED_LIBRARIES += libcutils libvixl
     include $(BUILD_SHARED_LIBRARY)
   else # host
-    LOCAL_STATIC_LIBRARIES += libcutils
+    LOCAL_STATIC_LIBRARIES += libcutils libvixl
     include $(BUILD_HOST_SHARED_LIBRARY)
   endif
 endef
diff --git a/disassembler/disassembler.cc b/disassembler/disassembler.cc
index 0670835..5c17a83 100644
--- a/disassembler/disassembler.cc
+++ b/disassembler/disassembler.cc
@@ -20,6 +20,7 @@
 
 #include "base/logging.h"
 #include "disassembler_arm.h"
+#include "disassembler_arm64.h"
 #include "disassembler_mips.h"
 #include "disassembler_x86.h"
 
@@ -28,6 +29,8 @@ namespace art {
 Disassembler* Disassembler::Create(InstructionSet instruction_set) {
   if (instruction_set == kArm || instruction_set == kThumb2) {
     return new arm::DisassemblerArm();
+  } else if (instruction_set == kArm64) {
+    return new arm64::DisassemblerArm64();
   } else if (instruction_set == kMips) {
     return new mips::DisassemblerMips();
   } else if (instruction_set == kX86) {
diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc
new file mode 100644
index 0000000..864d22d
--- /dev/null
+++ b/disassembler/disassembler_arm64.cc
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "disassembler_arm64.h"
+
+#include <inttypes.h>
+
+#include <iostream>
+
+#include "base/logging.h"
+#include "base/stringprintf.h"
+#include "thread.h"
+
+namespace art {
+namespace arm64 {
+
+static uint32_t ReadU32(const uint8_t* ptr) {
+  return *((const uint32_t*)ptr);
+}
+
+size_t DisassemblerArm64::Dump(std::ostream& os, const uint8_t* begin) {
+  uint32_t instruction = ReadU32(begin);
+  decoder.Decode(reinterpret_cast<vixl::Instruction*>(&instruction));
+  os << StringPrintf("%p: %08x\t%s\n", begin, instruction, disasm.GetOutput());
+  return vixl::kInstructionSize;
+}
+
+void DisassemblerArm64::Dump(std::ostream& os, const uint8_t* begin, const uint8_t* end) {
+  for (const uint8_t* cur = begin; cur < end; cur += vixl::kInstructionSize) {
+    Dump(os, cur);
+  }
+}
+
+}  // namespace arm64
+}  // namespace art
diff --git a/disassembler/disassembler_arm64.h b/disassembler/disassembler_arm64.h
new file mode 100644
index 0000000..d759df6
--- /dev/null
+++ b/disassembler/disassembler_arm64.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ART_DISASSEMBLER_DISASSEMBLER_ARM64_H_
+#define ART_DISASSEMBLER_DISASSEMBLER_ARM64_H_
+
+#include "disassembler.h"
+
+#include "a64/decoder-a64.h"
+#include "a64/disasm-a64.h"
+
+namespace art {
+namespace arm64 {
+
+class DisassemblerArm64 : public Disassembler {
+ public:
+  DisassemblerArm64() {
+    decoder.AppendVisitor(&disasm);
+  }
+
+  size_t Dump(std::ostream& os, const uint8_t* begin);
+  void Dump(std::ostream& os, const uint8_t* begin, const uint8_t* end);
+
+ private:
+  vixl::Decoder decoder;
+  vixl::Disassembler disasm;
+
+  DISALLOW_COPY_AND_ASSIGN(DisassemblerArm64);
+};
+
+}  // namespace arm64
+}  // namespace art
+
+#endif  // ART_DISASSEMBLER_DISASSEMBLER_ARM64_H_