From b515d75856f58a8b3b71d782eb00916d686329ad Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 23 Aug 2009 07:49:08 +0000 Subject: eliminate the std::ostream forms of the bitcode writing APIs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79840 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/BrainF/BrainFDriver.cpp | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'examples/BrainF') diff --git a/examples/BrainF/BrainFDriver.cpp b/examples/BrainF/BrainFDriver.cpp index f4f1e79..ad8a922 100644 --- a/examples/BrainF/BrainFDriver.cpp +++ b/examples/BrainF/BrainFDriver.cpp @@ -32,11 +32,12 @@ #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/ExecutionEngine/JIT.h" +#include "llvm/Target/TargetSelect.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ManagedStatic.h" -#include "llvm/Target/TargetSelect.h" -#include +#include "llvm/Support/raw_ostream.h" #include +#include using namespace llvm; //Command line options @@ -91,50 +92,49 @@ int main(int argc, char **argv) { LLVMContext &Context = getGlobalContext(); if (InputFilename == "") { - std::cerr<<"Error: You must specify the filename of the program to " + errs() << "Error: You must specify the filename of the program to " "be compiled. Use --help to see the options.\n"; abort(); } //Get the output stream - std::ostream *out = &std::cout; + raw_ostream *out = &outs(); if (!JIT) { if (OutputFilename == "") { std::string base = InputFilename; - if (InputFilename == "-") {base = "a";} + if (InputFilename == "-") { base = "a"; } - //Use default filename - const char *suffix = ".bc"; - OutputFilename = base+suffix; + // Use default filename. + OutputFilename = base+".bc"; } if (OutputFilename != "-") { - out = new std:: - ofstream(OutputFilename.c_str(), - std::ios::out | std::ios::trunc | std::ios::binary); + std::string ErrInfo; + out = new raw_fd_ostream(OutputFilename.c_str(), ErrInfo, + raw_fd_ostream::F_Force| + raw_fd_ostream::F_Binary); } } //Get the input stream std::istream *in = &std::cin; - if (InputFilename != "-") { + if (InputFilename != "-") in = new std::ifstream(InputFilename.c_str()); - } //Gather the compile flags BrainF::CompileFlags cf = BrainF::flag_off; - if (ArrayBoundsChecking) { + if (ArrayBoundsChecking) cf = BrainF::CompileFlags(cf | BrainF::flag_arraybounds); - } //Read the BrainF program BrainF bf; Module *mod = bf.parse(in, 65536, cf, Context); //64 KiB - if (in != &std::cin) {delete in;} + if (in != &std::cin) + delete in; addMainFunction(mod); //Verify generated code if (verifyModule(*mod)) { - std::cerr<<"Error: module failed verification. This shouldn't happen.\n"; + errs() << "Error: module failed verification. This shouldn't happen.\n"; abort(); } @@ -142,7 +142,7 @@ int main(int argc, char **argv) { if (JIT) { InitializeNativeTarget(); - std::cout << "------- Running JIT -------\n"; + outs() << "------- Running JIT -------\n"; ExecutionEngine *ee = EngineBuilder(mod).create(); std::vector args; Function *brainf_func = mod->getFunction("brainf"); @@ -152,7 +152,8 @@ int main(int argc, char **argv) { } //Clean up - if (out != &std::cout) {delete out;} + if (out != &outs()) + delete out; delete mod; llvm_shutdown(); -- cgit v1.1