6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Move Print*Pass to use raw_ostream.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57946 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2008-10-22 03:25:22 +00:00
parent 1dc9716121
commit 3b0da26e20
5 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/Assembly/PrintModulePass.h
View File

@ -18,21 +18,21 @@
#ifndef LLVM_ASSEMBLY_PRINTMODULEPASS_H #ifndef LLVM_ASSEMBLY_PRINTMODULEPASS_H
#define LLVM_ASSEMBLY_PRINTMODULEPASS_H #define LLVM_ASSEMBLY_PRINTMODULEPASS_H
#include "llvm/Support/Streams.h"
#include <string> #include <string>
namespace llvm { namespace llvm {
class FunctionPass; class FunctionPass;
class ModulePass; class ModulePass;
class raw_ostream;
/// createPrintModulePass - Create and return a pass that writes the /// createPrintModulePass - Create and return a pass that writes the
/// module to the specified OStream. /// module to the specified raw_ostream.
ModulePass *createPrintModulePass(llvm::OStream *OS, bool DeleteStream=false); ModulePass *createPrintModulePass(raw_ostream *OS, bool DeleteStream=false);
/// createPrintFunctionPass - Create and return a pass that prints /// createPrintFunctionPass - Create and return a pass that prints
/// functions to the specified OStream as they are processed. /// functions to the specified raw_ostream as they are processed.
FunctionPass *createPrintFunctionPass(const std::string &Banner, FunctionPass *createPrintFunctionPass(const std::string &Banner,
llvm::OStream *OS, raw_ostream *OS,
bool DeleteStream=false); bool DeleteStream=false);
} // End llvm namespace } // End llvm namespace

4
lib/CodeGen/LLVMTargetMachine.cpp
View File

@ -151,7 +151,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) {
if (!Fast) { if (!Fast) {
PM.add(createLoopStrengthReducePass(getTargetLowering())); PM.add(createLoopStrengthReducePass(getTargetLowering()));
if (PrintLSR) if (PrintLSR)
PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr)); PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &errs()));
} }
PM.add(createGCLoweringPass()); PM.add(createGCLoweringPass());
@ -168,7 +168,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) {
if (PrintISelInput) if (PrintISelInput)
PM.add(createPrintFunctionPass("\n\n" PM.add(createPrintFunctionPass("\n\n"
"*** Final LLVM Code input to ISel ***\n", "*** Final LLVM Code input to ISel ***\n",
&cerr)); &errs()));
// Standard Lower-Level Passes. // Standard Lower-Level Passes.

27
lib/VMCore/PrintModulePass.cpp
View File

@ -17,18 +17,19 @@
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "llvm/Support/Compiler.h" #include "llvm/Support/Compiler.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
namespace { namespace {
class VISIBILITY_HIDDEN PrintModulePass : public ModulePass { class VISIBILITY_HIDDEN PrintModulePass : public ModulePass {
OStream *Out; // ostream to print on raw_ostream *Out; // raw_ostream to print on
bool DeleteStream; // Delete the ostream in our dtor? bool DeleteStream; // Delete the ostream in our dtor?
public: public:
static char ID; static char ID;
PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr), PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&errs()),
DeleteStream(false) {} DeleteStream(false) {}
PrintModulePass(OStream *o, bool DS) PrintModulePass(raw_ostream *o, bool DS)
: ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {} : ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {}
~PrintModulePass() { ~PrintModulePass() {
@ -36,7 +37,8 @@ namespace {
} }
bool runOnModule(Module &M) { bool runOnModule(Module &M) {
(*Out) << M << std::flush; (*Out) << M;
Out->flush();
return false; return false;
} }
@ -47,13 +49,13 @@ namespace {
class PrintFunctionPass : public FunctionPass { class PrintFunctionPass : public FunctionPass {
std::string Banner; // String to print before each function std::string Banner; // String to print before each function
OStream *Out; // ostream to print on raw_ostream *Out; // raw_ostream to print on
bool DeleteStream; // Delete the ostream in our dtor? bool DeleteStream; // Delete the ostream in our dtor?
public: public:
static char ID; static char ID;
PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr), PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&errs()),
DeleteStream(false) {} DeleteStream(false) {}
PrintFunctionPass(const std::string &B, OStream *o, bool DS) PrintFunctionPass(const std::string &B, raw_ostream *o, bool DS)
: FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {} : FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {}
inline ~PrintFunctionPass() { inline ~PrintFunctionPass() {
@ -65,6 +67,7 @@ namespace {
// //
bool runOnFunction(Function &F) { bool runOnFunction(Function &F) {
(*Out) << Banner << static_cast<Value&>(F); (*Out) << Banner << static_cast<Value&>(F);
Out->flush();
return false; return false;
} }
@ -82,15 +85,17 @@ static RegisterPass<PrintFunctionPass>
Y("print-function","Print function to stderr"); Y("print-function","Print function to stderr");
/// createPrintModulePass - Create and return a pass that writes the /// createPrintModulePass - Create and return a pass that writes the
/// module to the specified OStream. /// module to the specified raw_ostream.
ModulePass *llvm::createPrintModulePass(llvm::OStream *OS, bool DeleteStream) { ModulePass *llvm::createPrintModulePass(llvm::raw_ostream *OS,
bool DeleteStream) {
return new PrintModulePass(OS, DeleteStream); return new PrintModulePass(OS, DeleteStream);
} }
/// createPrintFunctionPass - Create and return a pass that prints /// createPrintFunctionPass - Create and return a pass that prints
/// functions to the specified OStream as they are processed. /// functions to the specified raw_ostream as they are processed.
FunctionPass *llvm::createPrintFunctionPass(const std::string &Banner, FunctionPass *llvm::createPrintFunctionPass(const std::string &Banner,
OStream *OS, bool DeleteStream) { llvm::raw_ostream *OS,
bool DeleteStream) {
return new PrintFunctionPass(Banner, OS, DeleteStream); return new PrintFunctionPass(Banner, OS, DeleteStream);
} }

3
tools/llvm-dis/llvm-dis.cpp
View File

@ -24,6 +24,7 @@
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/System/Signals.h" #include "llvm/System/Signals.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -117,7 +118,7 @@ int main(int argc, char **argv) {
// All that llvm-dis does is write the assembly to a file. // All that llvm-dis does is write the assembly to a file.
if (!DontPrint) { if (!DontPrint) {
PassManager Passes; PassManager Passes;
OStream L(*Out); raw_os_ostream L(*Out);
Passes.add(createPrintModulePass(&L)); Passes.add(createPrintModulePass(&L));
Passes.run(*M.get()); Passes.run(*M.get());
} }

3
tools/opt/opt.cpp
View File

@ -30,6 +30,7 @@
#include "llvm/Support/PluginLoader.h" #include "llvm/Support/PluginLoader.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include "llvm/Support/SystemUtils.h" #include "llvm/Support/SystemUtils.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/LinkAllPasses.h" #include "llvm/LinkAllPasses.h"
#include "llvm/LinkAllVMCore.h" #include "llvm/LinkAllVMCore.h"
#include <iostream> #include <iostream>
@ -543,7 +544,7 @@ int main(int argc, char **argv) {
} }
if (PrintEachXForm) if (PrintEachXForm)
Passes.add(createPrintModulePass(&cerr)); Passes.add(createPrintModulePass(&errs()));
} }
// If -std-compile-opts was specified at the end of the pass list, add them. // If -std-compile-opts was specified at the end of the pass list, add them.