6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

convert LoopInfo.h and GraphWriter.h to use raw_ostream

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79836 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-08-23 07:19:13 +00:00
parent a36b81d64f
commit 103289e938
10 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/Support/GraphWriter.cpp
View File

@ -12,12 +12,45 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/GraphWriter.h"
#include "llvm/Support/Streams.h"
#include "llvm/System/Path.h"
#include "llvm/System/Program.h"
#include "llvm/Config/config.h"
using namespace llvm;
std::string llvm::DOT::EscapeString(const std::string &Label) {
std::string Str(Label);
for (unsigned i = 0; i != Str.length(); ++i)
switch (Str[i]) {
case '\n':
Str.insert(Str.begin()+i, '\\'); // Escape character...
++i;
Str[i] = 'n';
break;
case '\t':
Str.insert(Str.begin()+i, ' '); // Convert to two spaces
++i;
Str[i] = ' ';
break;
case '\\':
if (i+1 != Str.length())
switch (Str[i+1]) {
case 'l': continue; // don't disturb \l
case '|': case '{': case '}':
Str.erase(Str.begin()+i); continue;
default: break;
}
case '{': case '}':
case '<': case '>':
case '|': case '"':
Str.insert(Str.begin()+i, '\\'); // Escape character...
++i; // don't infinite loop
break;
}
return Str;
}
void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
GraphProgram::Name program) {
std::string ErrMsg;
@ -29,13 +62,11 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
args.push_back(Filename.c_str());
args.push_back(0);
cerr << "Running 'Graphviz' program... ";
if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) {
cerr << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
}
else {
errs() << "Running 'Graphviz' program... ";
if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg))
errs() << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
else
Filename.eraseFromDisk();
}
#elif (HAVE_GV && (HAVE_DOT || HAVE_FDP || HAVE_NEATO || \
HAVE_TWOPI || HAVE_CIRCO))
@ -98,12 +129,12 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
args.push_back(PSFilename.c_str());
args.push_back(0);
cerr << "Running '" << prog << "' program... ";
errs() << "Running '" << prog << "' program... ";
if (sys::Program::ExecuteAndWait(prog, &args[0],0,0,0,0,&ErrMsg)) {
cerr << "Error viewing graph " << Filename << ": '" << ErrMsg << "\n";
errs() << "Error viewing graph " << Filename << ": '" << ErrMsg << "\n";
} else {
cerr << " done. \n";
errs() << " done. \n";
sys::Path gv(LLVM_PATH_GV);
args.clear();
@ -114,15 +145,15 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
ErrMsg.clear();
if (wait) {
if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg)) {
cerr << "Error viewing graph: " << ErrMsg << "\n";
}
if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg))
errs() << "Error viewing graph: " << ErrMsg << "\n";
Filename.eraseFromDisk();
PSFilename.eraseFromDisk();
}
else {
sys::Program::ExecuteNoWait(gv, &args[0],0,0,0,&ErrMsg);
cerr << "Remember to erase graph files: " << Filename << " " << PSFilename << "\n";
errs() << "Remember to erase graph files: " << Filename << " "
<< PSFilename << "\n";
}
}
#elif HAVE_DOTTY
@ -133,9 +164,9 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
args.push_back(Filename.c_str());
args.push_back(0);
cerr << "Running 'dotty' program... ";
errs() << "Running 'dotty' program... ";
if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
cerr << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
errs() << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
} else {
#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
return;