2 files changed, 67 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 4fc454e2ba..a5b90c9663 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -27,6 +27,7 @@
 #include "llvm/Target/TargetJITInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/Disassembler.h"
 #include "llvm/Support/MutexGuard.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/System/Memory.h"
@@ -847,7 +848,7 @@ bool JITEmitter::finishFunction(MachineFunction &F) {
   }
 
   // Update the GOT entry for F to point to the new code.
-  if(MemMgr.isManagingGOT()) {
+  if (MemMgr.isManagingGOT()) {
     unsigned idx = getJITResolver(this).getGOTIndexForAddr((void*)BufferBegin);
     if (((void**)MemMgr.getGOTBase())[idx] != (void*)BufferBegin) {
       DOUT << "GOT was out of date for " << (void*)BufferBegin
@@ -864,6 +865,18 @@ bool JITEmitter::finishFunction(MachineFunction &F) {
        << ": " << (FnEnd-FnStart) << " bytes of text, "
        << Relocations.size() << " relocations\n";
   Relocations.clear();
+
+  DOUT << "Disassembled code:\n"
+#if defined(__i386__)
+       << disassembleBuffer(FnStart, FnEnd-FnStart,
+                            Disassembler::X86_32, (uint32_t)FnStart);
+#elif defined(__amd64__) || defined(__x86_64__)
+       << disassembleBuffer(FnStart, FnEnd-FnStart,
+                            Disassembler::X86_64, (uint32_t)FnStart);
+#else
+       << "N/A\n";
+#endif
+  
   return false;
 }
 
diff --git a/lib/Support/Disassembler.cpp b/lib/Support/Disassembler.cpp
new file mode 100644
index 0000000000..cc1f5e4390
--- /dev/null
+++ b/lib/Support/Disassembler.cpp
@@ -0,0 +1,53 @@
+//===- lib/Support/Disassembler.cpp -----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by Anton Korobeynikov and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the necessary glue to call external disassembler
+// libraries.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Config/config.h"
+#include "llvm/Support/Disassembler.h"
+
+#include <cassert>
+#include <iomanip>
+#include <string>
+#include <sstream>
+
+#if USE_UDIS86
+#include <udis86.h>
+#endif
+
+using namespace llvm;
+
+std::string llvm::disassembleBuffer(uint8_t* start, size_t length,
+                              Disassembler::Type type, uint64_t pc) {
+  std::stringstream res;
+  
+  if (type == Disassembler::X86_32 || type == Disassembler::X86_64) {
+#if USE_UDIS86
+    ud_t ud_obj;
+   
+    ud_init(&ud_obj);
+    ud_set_input_buffer(&ud_obj, start, length);
+    ud_set_mode(&ud_obj, (type == Disassembler::X86_32 ? 32 : 64));
+    ud_set_pc(&ud_obj, pc);
+    ud_set_syntax(&ud_obj, UD_SYN_ATT);
+
+    res << std::setbase(16)
+        << std::setw((type == Disassembler::X86_32 ? 8 : 16));
+
+    while (ud_disassemble(&ud_obj)) {
+      res << ud_insn_off(&ud_obj) << ":\t" << ud_insn_asm(&ud_obj) << "\n";
+    }
+#endif
+  }
+
+  return res.str();
+}