#include "llvm/Linker.h"
#include "llvm/Module.h"
#include "llvm/Analysis/Verifier.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Bytecode/Writer.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/Streams.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Signals.h"
#include "llvm/System/Path.h"
#include <fstream>
static cl::opt<bool>
DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden);
-static cl::opt<bool> NoCompress("disable-compression", cl::init(true),
- cl::desc("Don't compress the generated bytecode"));
-
// LoadFile - Read the specified bytecode file in and return it. This routine
// searches the link path for the specified file to try to find it...
//
std::string ErrorMessage;
if (Filename.exists()) {
if (Verbose) cerr << "Loading '" << Filename.c_str() << "'\n";
- Module* Result = ParseBytecodeFile(Filename.toString(),
- Compressor::decompressToNewBuffer,
- &ErrorMessage);
+ Module* Result = 0;
+
+ const std::string &FNStr = Filename.toString();
+ MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
+ FNStr.size());
+ if (Buffer == 0)
+ ErrorMessage = "Error reading file '" + FNStr + "'";
+ else
+ Result = ParseBitcodeFile(Buffer, &ErrorMessage);
+ delete Buffer;
if (Result) return std::auto_ptr<Module>(Result); // Load successful!
if (Verbose) {
int main(int argc, char **argv) {
llvm_shutdown_obj X; // Call llvm_shutdown() on exit.
- try {
- cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
- sys::PrintStackTraceOnErrorSignal();
- assert(InputFilenames.size() > 0 && "OneOrMore is not working");
-
- unsigned BaseArg = 0;
- std::string ErrorMessage;
-
- std::auto_ptr<Module> Composite(LoadFile(InputFilenames[BaseArg]));
- if (Composite.get() == 0) {
- cerr << argv[0] << ": error loading file '"
- << InputFilenames[BaseArg] << "'\n";
- return 1;
- }
+ cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
+ sys::PrintStackTraceOnErrorSignal();
+ assert(InputFilenames.size() > 0 && "OneOrMore is not working");
- for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) {
- std::auto_ptr<Module> M(LoadFile(InputFilenames[i]));
- if (M.get() == 0) {
- cerr << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
- return 1;
- }
+ unsigned BaseArg = 0;
+ std::string ErrorMessage;
- if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
+ std::auto_ptr<Module> Composite(LoadFile(InputFilenames[BaseArg]));
+ if (Composite.get() == 0) {
+ cerr << argv[0] << ": error loading file '"
+ << InputFilenames[BaseArg] << "'\n";
+ return 1;
+ }
- if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
- cerr << argv[0] << ": link error in '" << InputFilenames[i]
- << "': " << ErrorMessage << "\n";
- return 1;
- }
+ for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) {
+ std::auto_ptr<Module> M(LoadFile(InputFilenames[i]));
+ if (M.get() == 0) {
+ cerr << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
+ return 1;
}
- // TODO: Iterate over the -l list and link in any modules containing
- // global symbols that have not been resolved so far.
-
- if (DumpAsm) cerr << "Here's the assembly:\n" << *Composite.get();
-
- // FIXME: cout is not binary!
- std::ostream *Out = &std::cout; // Default to printing to stdout...
- if (OutputFilename != "-") {
- if (!Force && std::ifstream(OutputFilename.c_str())) {
- // If force is not specified, make sure not to overwrite a file!
- cerr << argv[0] << ": error opening '" << OutputFilename
- << "': file exists!\n"
- << "Use -f command line argument to force output\n";
- return 1;
- }
- std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
- std::ios::binary;
- Out = new std::ofstream(OutputFilename.c_str(), io_mode);
- if (!Out->good()) {
- cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n";
- return 1;
- }
-
- // Make sure that the Out file gets unlinked from the disk if we get a
- // SIGINT
- sys::RemoveFileOnSignal(sys::Path(OutputFilename));
+ if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
+
+ if (Linker::LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
+ cerr << argv[0] << ": link error in '" << InputFilenames[i]
+ << "': " << ErrorMessage << "\n";
+ return 1;
}
+ }
+
+ // TODO: Iterate over the -l list and link in any modules containing
+ // global symbols that have not been resolved so far.
- if (verifyModule(*Composite.get())) {
- cerr << argv[0] << ": linked module is broken!\n";
+ if (DumpAsm) cerr << "Here's the assembly:\n" << *Composite.get();
+
+ // FIXME: cout is not binary!
+ std::ostream *Out = &std::cout; // Default to printing to stdout...
+ if (OutputFilename != "-") {
+ if (!Force && std::ifstream(OutputFilename.c_str())) {
+ // If force is not specified, make sure not to overwrite a file!
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists!\n"
+ << "Use -f command line argument to force output\n";
+ return 1;
+ }
+ std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
+ std::ios::binary;
+ Out = new std::ofstream(OutputFilename.c_str(), io_mode);
+ if (!Out->good()) {
+ cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n";
return 1;
}
- if (Verbose) cerr << "Writing bytecode...\n";
- OStream L(*Out);
- WriteBytecodeToFile(Composite.get(), L, !NoCompress);
+ // Make sure that the Out file gets unlinked from the disk if we get a
+ // SIGINT
+ sys::RemoveFileOnSignal(sys::Path(OutputFilename));
+ }
- if (Out != &std::cout) delete Out;
- return 0;
- } catch (const std::string& msg) {
- cerr << argv[0] << ": " << msg << "\n";
- } catch (...) {
- cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
+ if (verifyModule(*Composite.get())) {
+ cerr << argv[0] << ": linked module is broken!\n";
+ return 1;
}
- return 1;
+
+ if (Verbose) cerr << "Writing bytecode...\n";
+ WriteBitcodeToFile(Composite.get(), *Out);
+
+ if (Out != &std::cout) delete Out;
+ return 0;
}
projects / oota-llvm.git / blobdiff