X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-dis%2Fdis.cpp;h=166a178d5745e480ab08cf2ce59e3d8bb20cf4a7;hb=fe4f677a9752f90d6bd3d17cd513220d7fa09ec3;hp=55e8d5d6690d8269f161e15221eb7e0fdaeb0d38;hpb=697954c15da58bd8b186dbafdedd8b06db770201;p=oota-llvm.git diff --git a/tools/llvm-dis/dis.cpp b/tools/llvm-dis/dis.cpp index 55e8d5d6690..166a178d574 100644 --- a/tools/llvm-dis/dis.cpp +++ b/tools/llvm-dis/dis.cpp @@ -7,61 +7,59 @@ // 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. +// -c - Print C code instead of LLVM assembly // //===----------------------------------------------------------------------===// #include "llvm/Module.h" -#include "llvm/Assembly/Writer.h" +#include "llvm/PassManager.h" #include "llvm/Bytecode/Reader.h" -#include "llvm/Method.h" -#include "Support/DepthFirstIterator.h" -#include "Support/PostOrderIterator.h" +#include "llvm/Assembly/CWriter.h" +#include "llvm/Assembly/PrintModulePass.h" #include "Support/CommandLine.h" +#include "Support/Signals.h" #include -#include +#include using std::cerr; // OutputMode - The different orderings to print basic blocks in... enum OutputMode { - Default = 0, // Method Order (list order) - dfo, // Depth First ordering - rdfo, // Reverse Depth First ordering - po, // Post Order - rpo, // Reverse Post Order + llvm = 0, // Generate LLVM assembly (the default) + c, // Generate C code }; -cl::String InputFilename ("", "Load 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 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); +static cl::opt +InputFilename(cl::Positional, cl::desc(""), cl::init("-")); + +static cl::opt +OutputFilename("o", cl::desc("Override output filename"), + cl::value_desc("filename")); + +static cl::opt +Force("f", cl::desc("Overwrite output files")); + +static cl::opt +WriteMode(cl::desc("Specify the output format:"), + cl::values( + clEnumVal(llvm, "Output LLVM assembly"), + clEnumVal(c , "Output C code for program"), + 0)); int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n"); std::ostream *Out = &std::cout; // Default to printing to stdout... - Module *C = ParseBytecodeFile(InputFilename); - if (C == 0) { - cerr << "bytecode didn't read correctly.\n"; + std::auto_ptr M(ParseBytecodeFile(InputFilename)); + if (M.get() == 0) { + cerr << argv[0] << ": bytecode didn't read correctly.\n"; return 1; } if (OutputFilename != "") { // Specified an output filename? - if (!Force && !std::ifstream(OutputFilename.c_str())) { + 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"; + cerr << argv[0] << ": error opening '" << OutputFilename + << "': file exists! Sending to standard output.\n"; } else { Out = new std::ofstream(OutputFilename.c_str()); } @@ -77,65 +75,50 @@ int main(int argc, char **argv) { } else { OutputFilename = IFN; // Append a .ll to it } - OutputFilename += ".ll"; + if (WriteMode == c) + OutputFilename += ".c"; + else + OutputFilename += ".ll"; - if (!Force && !std::ifstream(OutputFilename.c_str())) { + 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"; + 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 + // SIGINT + RemoveFileOnSignal(OutputFilename); } } } if (!Out->good()) { - cerr << "Error opening " << OutputFilename + 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) << C; // Print out in list order - } else { - // TODO: This does not print anything other than the basic blocks in the - // methods... more should definately be printed. It should be valid output - // consumable by the assembler. - // - for (Module::iterator I = C->begin(), End = C->end(); I != End; ++I) { - Method *M = *I; - (*Out) << "-------------- Method: " << M->getName() << " -------------\n"; - - switch (WriteMode) { - case dfo: // Depth First ordering - copy(df_begin(M), df_end(M), - std::ostream_iterator(*Out, "\n")); - break; - case rdfo: // Reverse Depth First ordering - copy(df_begin(M, true), df_end(M), - std::ostream_iterator(*Out, "\n")); - break; - case po: // Post Order - copy(po_begin(M), po_end(M), - std::ostream_iterator(*Out, "\n")); - break; - case rpo: { // Reverse Post Order - ReversePostOrderTraversal RPOT(M); - copy(RPOT.begin(), RPOT.end(), - std::ostream_iterator(*Out, "\n")); - break; - } - default: - abort(); - break; - } - } + PassManager Passes; + + switch (WriteMode) { + case llvm: // Output LLVM assembly + Passes.add(new PrintModulePass(Out)); + break; + case c: // Convert LLVM to C + Passes.add(createWriteToCPass(*Out)); + break; } - delete C; - if (Out != &std::cout) delete Out; + Passes.run(*M.get()); + + if (Out != &std::cout) { + ((std::ofstream*)Out)->close(); + delete Out; + } return 0; } +