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
This commit is contained in:
Chris Lattner 2004-02-13 23:22:40 +00:00
parent 8e3eb5542b
commit 2f1f8e0c4e
2 changed files with 9 additions and 18 deletions

View File

@ -9,5 +9,5 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-dis TOOLNAME = llvm-dis
USEDLIBS = cwriter ipa.a scalaropts.a target.a transformutils analysis.a bcreader vmcore support.a USEDLIBS = bcreader vmcore support.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -20,7 +20,6 @@
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/PassManager.h" #include "llvm/PassManager.h"
#include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Reader.h"
#include "llvm/Assembly/CWriter.h"
#include "llvm/Assembly/PrintModulePass.h" #include "llvm/Assembly/PrintModulePass.h"
#include "Support/CommandLine.h" #include "Support/CommandLine.h"
#include "Support/Signals.h" #include "Support/Signals.h"
@ -56,6 +55,11 @@ int main(int argc, char **argv) {
std::ostream *Out = &std::cout; // Default to printing to stdout... std::ostream *Out = &std::cout; // Default to printing to stdout...
std::string ErrorMessage; 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)); std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
if (M.get() == 0) { if (M.get() == 0) {
std::cerr << argv[0] << ": "; std::cerr << argv[0] << ": ";
@ -84,14 +88,10 @@ int main(int argc, char **argv) {
int Len = IFN.length(); int Len = IFN.length();
if (IFN[Len-3] == '.' && IFN[Len-2] == 'b' && IFN[Len-1] == 'c') { if (IFN[Len-3] == '.' && IFN[Len-2] == 'b' && IFN[Len-1] == 'c') {
// Source ends in .bc // Source ends in .bc
OutputFilename = std::string(IFN.begin(), IFN.end()-3); OutputFilename = std::string(IFN.begin(), IFN.end()-3)+".ll";
} else { } 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 && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file! // If force is not specified, make sure not to overwrite a file!
@ -116,16 +116,7 @@ int main(int argc, char **argv) {
// All that dis does is write the assembly or C out to a file... // All that dis does is write the assembly or C out to a file...
// //
PassManager Passes; PassManager Passes;
Passes.add(new PrintModulePass(Out));
switch (WriteMode) {
case LLVM: // Output LLVM assembly
Passes.add(new PrintModulePass(Out));
break;
case c: // Convert LLVM to C
AddPassesToWriteC(Passes, *Out);
break;
}
Passes.run(*M.get()); Passes.run(*M.get());
if (Out != &std::cout) { if (Out != &std::cout) {