JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / disassembler / ARM64Disassembler.cpp

diff --git a/disassembler/ARM64Disassembler.cpp b/disassembler/ARM64Disassembler.cpp
index f06bc22d025332ac620d34270a98648192157967..900b87ef700aa8813b2a847d61719dd200d9e188 100644 (file)
--- a/disassembler/ARM64Disassembler.cpp
+++ b/disassembler/ARM64Disassembler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,17 +23,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define __STDC_FORMAT_MACROS
 #include "config.h"
 #include "Disassembler.h"
 
 #if USE(ARM64_DISASSEMBLER)
 
-#include "MacroAssemblerCodeRef.h"
 #include "ARM64/A64DOpcode.h"
+#include "MacroAssemblerCodeRef.h"
 
 namespace JSC {
 
-bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out)
+bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out, InstructionSubsetHint)
 {
     A64DOpcode arm64Opcode;
 
@@ -55,3 +56,17 @@ bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const c
 
 #endif // USE(ARM64_DISASSEMBLER)
 
+#if USE(LLVM_DISASSEMBLER) && CPU(ARM64)
+
+#include "LLVMDisassembler.h"
+
+namespace JSC {
+
+bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out, InstructionSubsetHint hint)
+{
+    return tryToDisassembleWithLLVM(codePtr, size, prefix, out, hint);
+}
+
+} // namespace JSC
+
+#endif // USE(LLVM_DISASSEMBLER) && CPU(ARM64)