JavaScriptCore-7600.1.4.17.5.tar.gz

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

diff --git a/disassembler/ARM64Disassembler.cpp b/disassembler/ARM64Disassembler.cpp
index f06bc22d025332ac620d34270a98648192157967..7b86bf0e8cb28d424e8522a0ef081b8cc373c95c 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
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -28,12 +28,12 @@
 
 #if USE(ARM64_DISASSEMBLER)
 
 
 #if USE(ARM64_DISASSEMBLER)
 

-#include "MacroAssemblerCodeRef.h"

 #include "ARM64/A64DOpcode.h"
 #include "ARM64/A64DOpcode.h"

+#include "MacroAssemblerCodeRef.h"

 
 namespace JSC {
 
 
 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;
 
 {
     A64DOpcode arm64Opcode;
 


@@ -55,3 +55,17 @@ bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const c
 
 #endif // USE(ARM64_DISASSEMBLER)
 
 
 #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)