RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix PR819, llvm2cpp should read .bc files, not .ll files.

Browse Source 
llvm-svn: 29030
This commit is contained in:
Chris Lattner 2006-07-06 23:48:57 +00:00
parent 24d2f48b07
commit c57664f49c
2 changed files with 65 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/llvm2cpp/Makefile
View File

@ -1,4 +1,4 @@
##===- tools/llvm-as/Makefile ------------------------------*- Makefile -*-===## ##===- tools/llvm2cpp/Makefile -----------------------------*- Makefile -*-===##
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
# #
@ -8,8 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm2cpp TOOLNAME = llvm2cpp
USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \ USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

136
tools/llvm2cpp/llvm2cpp.cpp
View File

@ -17,8 +17,7 @@
//===------------------------------------------------------------------------=== //===------------------------------------------------------------------------===
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Assembly/Parser.h" #include "llvm/Bytecode/Reader.h"
#include "llvm/Bytecode/Writer.h"
#include "llvm/Analysis/Verifier.h" #include "llvm/Analysis/Verifier.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/SystemUtils.h" #include "llvm/Support/SystemUtils.h"
@ -31,7 +30,7 @@
using namespace llvm; using namespace llvm;
static cl::opt<std::string> static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input LLVM assembly file>"), InputFilename(cl::Positional, cl::desc("<input LLVM bytecode file>"),
cl::init("-")); cl::init("-"));
static cl::opt<std::string> static cl::opt<std::string>
@ -41,100 +40,75 @@ OutputFilename("o", cl::desc("Override output filename"),
static cl::opt<bool> static cl::opt<bool>
Force("f", cl::desc("Overwrite output files")); Force("f", cl::desc("Overwrite output files"));
static cl::opt<bool>
DisableVerify("disable-verify", cl::Hidden,
cl::desc("Do not run verifier on input LLVM (dangerous!)"));
int main(int argc, char **argv) { int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .cpp assembler\n"); cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .cpp assembler\n");
sys::PrintStackTraceOnErrorSignal(); sys::PrintStackTraceOnErrorSignal();
int exitCode = 0; int exitCode = 0;
std::ostream *Out = 0; std::ostream *Out = 0;
try { std::string ErrorMessage;
// Parse the file now... std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename)); if (M.get() == 0) {
if (M.get() == 0) { std::cerr << argv[0] << ": ";
std::cerr << argv[0] << ": assembly didn't read correctly.\n"; if (ErrorMessage.size())
return 1; std::cerr << ErrorMessage << "\n";
} else
std::cerr << "bytecode didn't read correctly.\n";
return 1;
}
// FIXME: llvm2cpp should read .bc files and thus not run the verifier if (OutputFilename != "") { // Specified an output filename?
// explicitly! if (OutputFilename != "-") { // Not stdout?
if (!DisableVerify) { if (!Force && std::ifstream(OutputFilename.c_str())) {
std::string Err; // If force is not specified, make sure not to overwrite a file!
if (verifyModule(*M.get(), ReturnStatusAction, &Err)) { std::cerr << argv[0] << ": error opening '" << OutputFilename
std::cerr << argv[0] << "': file exists!\n"
<< ": assembly parsed, but does not verify as correct!\n"; << "Use -f command line argument to force output\n";
std::cerr << Err;
return 1; return 1;
} }
Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
std::ios::trunc | std::ios::binary);
} else { // Specified stdout
Out = &std::cout;
} }
} else {
if (OutputFilename != "") { // Specified an output filename? if (InputFilename == "-") {
if (OutputFilename != "-") { // Not stdout? OutputFilename = "-";
if (!Force && std::ifstream(OutputFilename.c_str())) { Out = &std::cout;
// If force is not specified, make sure not to overwrite a file!
std::cerr << argv[0] << ": error opening '" << OutputFilename
<< "': file exists!\n"
<< "Use -f command line argument to force output\n";
return 1;
}
Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
std::ios::trunc | std::ios::binary);
} else { // Specified stdout
// FIXME: cout is not binary!
Out = &std::cout;
}
} else { } else {
if (InputFilename == "-") { std::string IFN = InputFilename;
OutputFilename = "-"; int Len = IFN.length();
Out = &std::cout; if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') {
// Source ends in .ll
OutputFilename = std::string(IFN.begin(), IFN.end()-3);
} else { } else {
std::string IFN = InputFilename; OutputFilename = IFN; // Append a .cpp to it
int Len = IFN.length();
if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') {
// Source ends in .ll
OutputFilename = std::string(IFN.begin(), IFN.end()-3);
} else {
OutputFilename = IFN; // Append a .cpp to it
}
OutputFilename += ".cpp";
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!\n"
<< "Use -f command line argument to force output\n";
return 1;
}
Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
std::ios::trunc | std::ios::binary);
// Make sure that the Out file gets unlinked from the disk if we get a
// SIGINT
sys::RemoveFileOnSignal(sys::Path(OutputFilename));
} }
OutputFilename += ".cpp";
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!\n"
<< "Use -f command line argument to force output\n";
return 1;
}
Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
std::ios::trunc | std::ios::binary);
// Make sure that the Out file gets unlinked from the disk if we get a
// SIGINT
sys::RemoveFileOnSignal(sys::Path(OutputFilename));
} }
if (!Out->good()) {
std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
return 1;
}
WriteModuleToCppFile(M.get(), *Out);
} catch (const ParseException &E) {
std::cerr << argv[0] << ": " << E.getMessage() << "\n";
exitCode = 1;
} catch (const std::string& msg) {
std::cerr << argv[0] << ": " << msg << "\n";
exitCode = 1;
} catch (...) {
std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
exitCode = 1;
} }
if (!Out->good()) {
std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
return 1;
}
WriteModuleToCppFile(M.get(), *Out);
if (Out != &std::cout) delete Out; if (Out != &std::cout) delete Out;
return exitCode; return exitCode;
} }