RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-02 00:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29030 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-07-06 23:48:57 +00:00
parent 148f440635
commit 8eaafdedb2
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
#
@ -8,8 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
TOOLNAME = llvm2cpp
USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
LLVMSupport.a LLVMbzip2.a LLVMSystem.a
USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common

44
tools/llvm2cpp/llvm2cpp.cpp
View File

@ -17,8 +17,7 @@
//===------------------------------------------------------------------------===
#include "llvm/Module.h"
#include "llvm/Assembly/Parser.h"
#include "llvm/Bytecode/Writer.h"
#include "llvm/Bytecode/Reader.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/SystemUtils.h"
@ -31,7 +30,7 @@
using namespace llvm;
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("-"));
static cl::opt<std::string>
@ -41,36 +40,23 @@ OutputFilename("o", cl::desc("Override output filename"),
static cl::opt<bool>
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) {
cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .cpp assembler\n");
sys::PrintStackTraceOnErrorSignal();
int exitCode = 0;
std::ostream *Out = 0;
try {
// Parse the file now...
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
std::string ErrorMessage;
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
if (M.get() == 0) {
std::cerr << argv[0] << ": assembly didn't read correctly.\n";
std::cerr << argv[0] << ": ";
if (ErrorMessage.size())
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
// explicitly!
if (!DisableVerify) {
std::string Err;
if (verifyModule(*M.get(), ReturnStatusAction, &Err)) {
std::cerr << argv[0]
<< ": assembly parsed, but does not verify as correct!\n";
std::cerr << Err;
return 1;
}
}
if (OutputFilename != "") { // Specified an output filename?
if (OutputFilename != "-") { // Not stdout?
if (!Force && std::ifstream(OutputFilename.c_str())) {
@ -83,7 +69,6 @@ int main(int argc, char **argv) {
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 {
@ -124,17 +109,6 @@ int main(int argc, char **argv) {
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 != &std::cout) delete Out;
return exitCode;
}