Moved disassembler to libSystem

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33461 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/System/Disassembler.h

@@ -12,25 +12,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SUPPORT_DISASSEMBLER_H
+#ifndef LLVM_SYSTEM_DISASSEMBLER_H
-#define LLVM_SUPPORT_DISASSEMBLER_H
+#define LLVM_SYSTEM_DISASSEMBLER_H
 
 #include "llvm/Support/DataTypes.h"
 #include <string>
 
 namespace llvm {
+namespace sys {
+
+/// This function provides some "glue" code to call external disassembler
+/// libraries.
+std::string disassembleBuffer(uint8_t* start, size_t length, uint64_t pc = 0);
 
-namespace Disassembler {
-  enum Type {
-    X86_32,
-    X86_64,
-    Undefined
-  };
 }
-  
-
-std::string disassembleBuffer(uint8_t* start, size_t length,
-                              Disassembler::Type type, uint64_t pc);
 }
 
-#endif // LLVM_SUPPORT_DISASSEMBLER_H
+#endif // LLVM_SYSTEM_DISASSEMBLER_H

lib/ExecutionEngine/JIT/JITEmitter.cpp

@@ -27,8 +27,8 @@
 #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/System/Disassembler.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/System/Memory.h"
 #include <algorithm>
@@ -868,15 +868,7 @@ bool JITEmitter::finishFunction(MachineFunction &F) {
 
 #ifndef NDEBUG
   DOUT << "Disassembled code:\n"
-#if defined(__i386__)
+       << sys::disassembleBuffer(FnStart, FnEnd-FnStart, (uintptr_t)FnStart);
-       << disassembleBuffer(FnStart, FnEnd-FnStart,
-                            Disassembler::X86_32, (uint32_t)FnStart);
-#elif defined(__amd64__) || defined(__x86_64__)
-       << disassembleBuffer(FnStart, FnEnd-FnStart,
-                            Disassembler::X86_64, (uint64_t)FnStart);
-#else
-       << "N/A\n";
-#endif
 #endif
   
   return false;

lib/Support/Disassembler.cpp

@@ -1,53 +0,0 @@
-//===- 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();
-}

lib/System/Disassembler.cpp

@@ -0,0 +1,65 @@
+//===- lib/System/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/System/Disassembler.h"
+
+#include <cassert>
+#include <iomanip>
+#include <string>
+#include <sstream>
+
+#if USE_UDIS86
+#include <udis86.h>
+#endif
+
+using namespace llvm;
+
+std::string llvm::sys::disassembleBuffer(uint8_t* start, size_t length,
+                                         uint64_t pc) {
+  std::stringstream res;
+
+#if defined (__i386__) || defined (__amd64__) || defined (__x86_64__)
+  unsigned bits;
+# if defined(__i386__)
+  bits = 32;
+# else
+  bits = 64;
+# endif
+  
+# if USE_UDIS86
+  ud_t ud_obj;
+   
+  ud_init(&ud_obj);
+  ud_set_input_buffer(&ud_obj, start, length);
+  ud_set_mode(&ud_obj, bits);
+  ud_set_pc(&ud_obj, pc);
+  ud_set_syntax(&ud_obj, UD_SYN_ATT);
+  
+  res << std::setbase(16)
+      << std::setw(bits/4);
+  
+  while (ud_disassemble(&ud_obj)) {
+    res << ud_insn_off(&ud_obj) << ":\t" << ud_insn_asm(&ud_obj) << "\n";
+  }
+# else
+  res << "No disassembler available. See configure help for avaiable options.\n";
+# endif
+  
+#else
+  res << "No disassembler available. See configure help for avaiable options.\n";
+#endif
+
+  return res.str();
+}