Mercilessly rip the cbackend out of llvm-dis. Leave a helpful error message
for those who have not heard the news.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11412 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 225787b..21d5162 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -20,7 +20,6 @@
#include "llvm/Module.h"
#include "llvm/PassManager.h"
#include "llvm/Bytecode/Reader.h"
-#include "llvm/Assembly/CWriter.h"
#include "llvm/Assembly/PrintModulePass.h"
#include "Support/CommandLine.h"
#include "Support/Signals.h"
@@ -56,6 +55,11 @@
std::ostream *Out = &std::cout; // Default to printing to stdout...
std::string ErrorMessage;
+ if (WriteMode == c) {
+ std::cerr << "ERROR: llvm-dis no longer contains the C backend. Use 'llc -march=c' instead!\n";
+ exit(1);
+ }
+
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
if (M.get() == 0) {
std::cerr << argv[0] << ": ";
@@ -84,14 +88,10 @@
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";
}
- if (WriteMode == c)
- OutputFilename += ".c";
- else
- OutputFilename += ".ll";
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
@@ -116,16 +116,7 @@
// All that dis does is write the assembly or C out to a file...
//
PassManager Passes;
-
- switch (WriteMode) {
- case LLVM: // Output LLVM assembly
- Passes.add(new PrintModulePass(Out));
- break;
- case c: // Convert LLVM to C
- AddPassesToWriteC(Passes, *Out);
- break;
- }
-
+ Passes.add(new PrintModulePass(Out));
Passes.run(*M.get());
if (Out != &std::cout) {