+//===-- llvm-dis.cpp - The low-level LLVM disassembler --------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
//===----------------------------------------------------------------------===//
-// LLVM 'DIS' UTILITY
//
// This utility may be invoked in the following manner:
-// dis [options] - Read LLVM bytecode from stdin, write assembly to stdout
-// dis [options] x.bc - Read LLVM bytecode from the x.bc file, write assembly
-// to the x.ll file.
+// llvm-dis [options] - Read LLVM bytecode from stdin, write asm to stdout
+// llvm-dis [options] x.bc - Read LLVM bytecode from the x.bc file, write asm
+// to the x.ll file.
// Options:
// --help - Output information about command line switches
-// -dfo - Print basic blocks in depth first order
-// -rdfo - Print basic blocks in reverse depth first order
-// -po - Print basic blocks in post order
-// -rpo - Print basic blocks in reverse post order
-//
-// TODO: add -vcg which prints VCG compatible output.
//
//===----------------------------------------------------------------------===//
#include "llvm/Module.h"
+#include "llvm/PassManager.h"
#include "llvm/Bytecode/Reader.h"
-#include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/PostOrderIterator.h"
+#include "llvm/Assembly/PrintModulePass.h"
#include "Support/CommandLine.h"
-#include "Support/Signals.h"
+#include "llvm/System/Signals.h"
#include <fstream>
-#include <iostream>
-using std::cerr;
-
-// OutputMode - The different orderings to print basic blocks in...
-enum OutputMode {
- Default = 0, // Function Order (list order)
- dfo, // Depth First ordering
- rdfo, // Reverse Depth First ordering
- po, // Post Order
- rpo, // Reverse Post Order
-};
-
-cl::String InputFilename ("", "Load <arg> file, print as assembly", 0, "-");
-cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "");
-cl::Flag Force ("f", "Overwrite output files", cl::NoFlags, false);
-cl::EnumFlags<enum OutputMode> WriteMode(cl::NoFlags,
- clEnumVal(Default, "Write basic blocks in bytecode order"),
- clEnumVal(dfo , "Write basic blocks in depth first order"),
- clEnumVal(rdfo , "Write basic blocks in reverse DFO"),
- clEnumVal(po , "Write basic blocks in postorder"),
- clEnumVal(rpo , "Write basic blocks in reverse postorder"),
- 0);
+#include <memory>
+
+using namespace llvm;
+
+static cl::opt<std::string>
+InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-"));
+
+static cl::opt<std::string>
+OutputFilename("o", cl::desc("Override output filename"),
+ cl::value_desc("filename"));
+
+static cl::opt<bool>
+Force("f", cl::desc("Overwrite output files"));
+
+static cl::opt<bool>
+CWriteMode("c", cl::desc("Obsolete option, do not use"), cl::ReallyHidden);
int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n");
+ sys::PrintStackTraceOnErrorSignal();
+
std::ostream *Out = &std::cout; // Default to printing to stdout...
+ std::string ErrorMessage;
+
+ if (CWriteMode) {
+ std::cerr << "ERROR: llvm-dis no longer contains the C backend. "
+ << "Use 'llc -march=c' instead!\n";
+ exit(1);
+ }
- Module *M = ParseBytecodeFile(InputFilename);
- if (M == 0) {
- cerr << "bytecode didn't read correctly.\n";
+ std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
+ if (M.get() == 0) {
+ std::cerr << argv[0] << ": ";
+ if (ErrorMessage.size())
+ std::cerr << ErrorMessage << "\n";
+ else
+ std::cerr << "bytecode didn't read correctly.\n";
return 1;
}
if (OutputFilename != "") { // Specified an output filename?
- if (!Force && std::ifstream(OutputFilename.c_str())) {
- // If force is not specified, make sure not to overwrite a file!
- cerr << "Error opening '" << OutputFilename
- << "': File exists! Sending to standard output.\n";
- } else {
- Out = new std::ofstream(OutputFilename.c_str());
+ if (OutputFilename != "-") { // Not stdout?
+ if (!Force && std::ifstream(OutputFilename.c_str())) {
+ // If force is not specified, make sure not to overwrite a file!
+ std::cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists! Sending to standard output.\n";
+ } else {
+ Out = new std::ofstream(OutputFilename.c_str());
+ }
}
} else {
if (InputFilename == "-") {
int Len = IFN.length();
if (IFN[Len-3] == '.' && IFN[Len-2] == 'b' && IFN[Len-1] == 'c') {
// Source ends in .bc
- OutputFilename = std::string(IFN.begin(), IFN.end()-3);
+ OutputFilename = std::string(IFN.begin(), IFN.end()-3)+".ll";
} else {
- OutputFilename = IFN; // Append a .ll to it
+ OutputFilename = IFN+".ll";
}
- OutputFilename += ".ll";
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- cerr << "Error opening '" << OutputFilename
- << "': File exists! Sending to standard output.\n";
+ std::cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists! Sending to standard output.\n";
} else {
Out = new std::ofstream(OutputFilename.c_str());
- // Make sure that the Out file gets unlink'd from the disk if we get a
+ // Make sure that the Out file gets unlinked from the disk if we get a
// SIGINT
- RemoveFileOnSignal(OutputFilename);
+ sys::RemoveFileOnSignal(OutputFilename);
}
}
}
if (!Out->good()) {
- cerr << "Error opening " << OutputFilename
- << ": sending to stdout instead!\n";
+ std::cerr << argv[0] << ": error opening " << OutputFilename
+ << ": sending to stdout instead!\n";
Out = &std::cout;
}
- // All that dis does is write the assembly out to a file... which is exactly
- // what the writer library is supposed to do...
+ // All that dis does is write the assembly or C out to a file...
//
- if (WriteMode == Default) {
- (*Out) << M; // Print out in list order
- } else {
- // TODO: This does not print anything other than the basic blocks in the
- // functions... more should definately be printed. It should be valid
- // output consumable by the assembler.
- //
- for (Module::iterator I = M->begin(), End = M->end(); I != End; ++I) {
- Function *F = *I;
- (*Out) << "-------------- Method: " << F->getName() << " -------------\n";
-
- switch (WriteMode) {
- case dfo: // Depth First ordering
- copy(df_begin(F), df_end(F),
- std::ostream_iterator<BasicBlock*>(*Out, "\n"));
- break;
- case rdfo: // Reverse Depth First ordering
- copy(df_begin(F, true), df_end(F),
- std::ostream_iterator<BasicBlock*>(*Out, "\n"));
- break;
- case po: // Post Order
- copy(po_begin(F), po_end(F),
- std::ostream_iterator<BasicBlock*>(*Out, "\n"));
- break;
- case rpo: { // Reverse Post Order
-#if 0 // FIXME, GCC 3.0.4 bug
- ReversePostOrderTraversal<Function*> RPOT(F);
- copy(RPOT.begin(), RPOT.end(),
- std::ostream_iterator<BasicBlock*>(*Out, "\n"));
-#endif
- break;
- }
- default:
- abort();
- break;
- }
- }
- }
- delete M;
+ PassManager Passes;
+ Passes.add(new PrintModulePass(Out));
+ Passes.run(*M.get());
- if (Out != &std::cout) delete Out;
+ if (Out != &std::cout) {
+ ((std::ofstream*)Out)->close();
+ delete Out;
+ }
return 0;
}
+