[llvm-commits] [llvm] r91934 - in /llvm/trunk/tools/llvm-mc: CMakeLists.txt Disassembler.cpp Disassembler.h HexDisassembler.cpp HexDisassembler.h llvm-mc.cpp

Chris Lattner sabre at nondot.org
Tue Dec 22 14:50:30 PST 2009


Author: lattner
Date: Tue Dec 22 16:50:29 2009
New Revision: 91934

URL: http://llvm.org/viewvc/llvm-project?rev=91934&view=rev
Log:
rename HexDisassembler -> Disassembler, it works on any input
integer encoding (0123, 0b10101, 42, etc).

Added:
    llvm/trunk/tools/llvm-mc/Disassembler.cpp
      - copied, changed from r91933, llvm/trunk/tools/llvm-mc/HexDisassembler.cpp
    llvm/trunk/tools/llvm-mc/Disassembler.h
      - copied, changed from r91931, llvm/trunk/tools/llvm-mc/HexDisassembler.h
Removed:
    llvm/trunk/tools/llvm-mc/HexDisassembler.cpp
    llvm/trunk/tools/llvm-mc/HexDisassembler.h
Modified:
    llvm/trunk/tools/llvm-mc/CMakeLists.txt
    llvm/trunk/tools/llvm-mc/llvm-mc.cpp

Modified: llvm/trunk/tools/llvm-mc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/CMakeLists.txt?rev=91934&r1=91933&r2=91934&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-mc/CMakeLists.txt Tue Dec 22 16:50:29 2009
@@ -4,5 +4,5 @@
   llvm-mc.cpp
   AsmLexer.cpp
   AsmParser.cpp
-  HexDisassembler.cpp
+  Disassembler.cpp
   )

Copied: llvm/trunk/tools/llvm-mc/Disassembler.cpp (from r91933, llvm/trunk/tools/llvm-mc/HexDisassembler.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?p2=llvm/trunk/tools/llvm-mc/Disassembler.cpp&p1=llvm/trunk/tools/llvm-mc/HexDisassembler.cpp&r1=91933&r2=91934&rev=91934&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/HexDisassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Tue Dec 22 16:50:29 2009
@@ -1,4 +1,4 @@
-//===- HexDisassembler.cpp - Disassembler for hex strings -----------------===//
+//===- Disassembler.cpp - Disassembler for hex strings --------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HexDisassembler.h"
+#include "Disassembler.h"
 
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/MC/MCAsmInfo.h"
@@ -78,7 +78,7 @@
   return false;
 }
 
-int HexDisassembler::disassemble(const Target &T, const std::string &Triple,
+int Disassembler::disassemble(const Target &T, const std::string &Triple,
                                  MemoryBuffer &Buffer) {
   // Set up disassembler.
   llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));

Copied: llvm/trunk/tools/llvm-mc/Disassembler.h (from r91931, llvm/trunk/tools/llvm-mc/HexDisassembler.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.h?p2=llvm/trunk/tools/llvm-mc/Disassembler.h&p1=llvm/trunk/tools/llvm-mc/HexDisassembler.h&r1=91931&r2=91934&rev=91934&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/HexDisassembler.h (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.h Tue Dec 22 16:50:29 2009
@@ -1,4 +1,4 @@
-//===- HexDisassembler.h - Disassembler for hex strings -------------------===//
+//===- Disassembler.h - Text File Disassembler ----------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef HEXDISASSEMBLER_H
-#define HEXDISASSEMBLER_H
+#ifndef DISASSEMBLER_H
+#define DISASSEMBLER_H
 
 #include <string>
 
@@ -22,7 +22,7 @@
 class Target;
 class MemoryBuffer;
 
-class HexDisassembler {
+class Disassembler {
 public:
   static int disassemble(const Target &target, 
                          const std::string &tripleString,

Removed: llvm/trunk/tools/llvm-mc/HexDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/HexDisassembler.cpp?rev=91933&view=auto

==============================================================================
--- llvm/trunk/tools/llvm-mc/HexDisassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/HexDisassembler.cpp (removed)
@@ -1,165 +0,0 @@
-//===- HexDisassembler.cpp - Disassembler for hex strings -----------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This class implements the disassembler of strings of bytes written in
-// hexadecimal, from standard input or from a file.
-//
-//===----------------------------------------------------------------------===//
-
-#include "HexDisassembler.h"
-
-#include "llvm/ADT/OwningPtr.h"
-#include "llvm/MC/MCAsmInfo.h"
-#include "llvm/MC/MCDisassembler.h"
-#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCInstPrinter.h"
-#include "llvm/Target/TargetRegistry.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/MemoryObject.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/SourceMgr.h"
-using namespace llvm;
-
-typedef std::vector<std::pair<unsigned char, const char*> > ByteArrayTy;
-
-namespace {
-class VectorMemoryObject : public MemoryObject {
-private:
-  const ByteArrayTy &Bytes;
-public:
-  VectorMemoryObject(const ByteArrayTy &bytes) : Bytes(bytes) {}
-  
-  uint64_t getBase() const { return 0; }
-  uint64_t getExtent() const { return Bytes.size(); }
-
-  int readByte(uint64_t Addr, uint8_t *Byte) const {
-    if (Addr > getExtent())
-      return -1;
-    *Byte = Bytes[Addr].first;
-    return 0;
-  }
-};
-}
-
-static bool PrintInst(const llvm::MCDisassembler &DisAsm,
-                      llvm::MCInstPrinter &Printer, const ByteArrayTy &Bytes,
-                      SourceMgr &SM) {
-  // Wrap the vector in a MemoryObject.
-  VectorMemoryObject memoryObject(Bytes);
-  
-  // Disassemble it to a string and get the size of the instruction.
-  MCInst Inst;
-  uint64_t Size;
-  
-  if (!DisAsm.getInstruction(Inst, Size, memoryObject, 0, 
-                             /*REMOVE*/ nulls())) {
-    SM.PrintMessage(SMLoc::getFromPointer(Bytes[0].second),
-                    "invalid instruction encoding", "error");
-    return true;
-  }
-  
-  Printer.printInst(&Inst);
-  outs() << "\n";
-  
-  // If the disassembled instruction was smaller than the number of bytes we
-  // read, reject the excess bytes.
-  if (Bytes.size() != Size) {
-    SM.PrintMessage(SMLoc::getFromPointer(Bytes[Size].second),
-                    "excess data detected in input", "error");
-    return true;
-  }
-  
-  return false;
-}
-
-int HexDisassembler::disassemble(const Target &T, const std::string &Triple,
-                                 MemoryBuffer &Buffer) {
-  // Set up disassembler.
-  llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));
-  
-  if (!AsmInfo) {
-    errs() << "error: no assembly info for target " << Triple << "\n";
-    return -1;
-  }
-  
-  llvm::OwningPtr<const llvm::MCDisassembler> DisAsm(T.createMCDisassembler());
-  if (!DisAsm) {
-    errs() << "error: no disassembler for target " << Triple << "\n";
-    return -1;
-  }
-  
-  llvm::MCInstPrinter *InstPrinter = T.createMCInstPrinter(0, *AsmInfo, outs());
-  
-  if (!InstPrinter) {
-    errs() << "error: no instruction printer for target " << Triple << '\n';
-    return -1;
-  }
-  
-  bool ErrorOccurred = false;
-  
-  SourceMgr SM;
-  SM.AddNewSourceBuffer(&Buffer, SMLoc());
-  
-  // Convert the input to a vector for disassembly.
-  ByteArrayTy ByteArray;
-  
-  StringRef Str = Buffer.getBuffer();
-  while (!Str.empty()) {
-    // Strip horizontal whitespace.
-    if (size_t Pos = Str.find_first_not_of(" \t\r")) {
-      Str = Str.substr(Pos);
-      continue;
-    }
-    
-    // If this is the end of a line or start of a comment, process the
-    // instruction we have so far.
-    if (Str[0] == '\n' || Str[0] == '#') {
-      // If we have bytes to process, do so.
-      if (!ByteArray.empty()) {
-        ErrorOccurred |= PrintInst(*DisAsm, *InstPrinter, ByteArray, SM);
-        ByteArray.clear();
-      }
-      
-      // Strip to the end of line if we already processed any bytes on this
-      // line.  This strips the comment and/or the \n.
-      if (Str[0] == '\n')
-        Str = Str.substr(1);
-      else {
-        Str = Str.substr(Str.find_first_of('\n'));
-        if (!Str.empty())
-          Str = Str.substr(1);
-      }
-      continue;
-    }
-    
-    // Get the current token.
-    size_t Next = Str.find_first_of(" \t\n\r#");
-    StringRef Value = Str.substr(0, Next);
-    
-    // Convert to a byte and add to the byte vector.
-    unsigned ByteVal;
-    if (Value.getAsInteger(0, ByteVal) || ByteVal > 255) {
-      // If we have an error, print it and skip to the end of line.
-      SM.PrintMessage(SMLoc::getFromPointer(Value.data()),
-                                 "invalid input token", "error");
-      ErrorOccurred = true;
-      Str = Str.substr(Str.find('\n'));
-      ByteArray.clear();
-      continue;
-    }
-    
-    ByteArray.push_back(std::make_pair((unsigned char)ByteVal, Value.data()));
-    Str = Str.substr(Next);
-  }
-  
-  if (!ByteArray.empty())
-    ErrorOccurred |= PrintInst(*DisAsm, *InstPrinter, ByteArray, SM);
-    
-  return ErrorOccurred;
-}

Removed: llvm/trunk/tools/llvm-mc/HexDisassembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/HexDisassembler.h?rev=91933&view=auto

==============================================================================
--- llvm/trunk/tools/llvm-mc/HexDisassembler.h (original)
+++ llvm/trunk/tools/llvm-mc/HexDisassembler.h (removed)
@@ -1,34 +0,0 @@
-//===- HexDisassembler.h - Disassembler for hex strings -------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This class implements the disassembler of strings of bytes written in
-// hexadecimal, from standard input or from a file.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef HEXDISASSEMBLER_H
-#define HEXDISASSEMBLER_H
-
-#include <string>
-
-namespace llvm {
-
-class Target;
-class MemoryBuffer;
-
-class HexDisassembler {
-public:
-  static int disassemble(const Target &target, 
-                         const std::string &tripleString,
-                         MemoryBuffer &buffer);
-};
-  
-} // namespace llvm
-
-#endif

Modified: llvm/trunk/tools/llvm-mc/llvm-mc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/llvm-mc.cpp?rev=91934&r1=91933&r2=91934&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-mc/llvm-mc.cpp (original)
+++ llvm/trunk/tools/llvm-mc/llvm-mc.cpp Tue Dec 22 16:50:29 2009
@@ -32,7 +32,7 @@
 #include "llvm/Target/TargetMachine.h"  // FIXME.
 #include "llvm/Target/TargetSelect.h"
 #include "AsmParser.h"
-#include "HexDisassembler.h"
+#include "Disassembler.h"
 using namespace llvm;
 
 static cl::opt<std::string>
@@ -310,7 +310,7 @@
     return 1;
   }
   
-  return HexDisassembler::disassemble(*TheTarget, TripleName, *Buffer);
+  return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
 }
 
 





More information about the llvm-commits mailing list