mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
For PR798:
Add support for Graphviz. Patch contributed by Anton Korobeynikov. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28684 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
c21051ff96
commit
3e0c154240
@ -24,6 +24,8 @@
|
||||
#include "llvm/Assembly/Writer.h"
|
||||
#include "llvm/Support/CFG.h"
|
||||
#include "llvm/Support/GraphWriter.h"
|
||||
#include "llvm/System/Path.h"
|
||||
#include "llvm/System/Program.h"
|
||||
#include "llvm/Config/config.h"
|
||||
#include <sstream>
|
||||
#include <fstream>
|
||||
@ -139,7 +141,14 @@ namespace {
|
||||
///
|
||||
void Function::viewCFG() const {
|
||||
#ifndef NDEBUG
|
||||
std::string Filename = "/tmp/cfg." + getName() + ".dot";
|
||||
char pathsuff[9];
|
||||
|
||||
sprintf(pathsuff, "%06u", unsigned(rand()));
|
||||
|
||||
sys::Path TempDir = sys::Path::GetTemporaryDirectory();
|
||||
sys::Path Filename = TempDir;
|
||||
|
||||
Filename.appendComponent("cfg" + getName() + "." + pathsuff + ".dot");
|
||||
std::cerr << "Writing '" << Filename << "'... ";
|
||||
std::ofstream F(Filename.c_str());
|
||||
|
||||
@ -152,34 +161,77 @@ void Function::viewCFG() const {
|
||||
F.close();
|
||||
std::cerr << "\n";
|
||||
|
||||
#ifdef HAVE_GRAPHVIZ
|
||||
#if HAVE_GRAPHVIZ
|
||||
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(Graphviz.c_str());
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'Graphviz' program... " << std::flush;
|
||||
if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) {
|
||||
if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
|
||||
} else {
|
||||
system(("rm " + Filename).c_str());
|
||||
Filename.eraseFromDisk();
|
||||
return;
|
||||
}
|
||||
#endif // HAVE_GRAPHVIZ
|
||||
#elif (HAVE_GV && HAVE_DOT)
|
||||
sys::Path PSFilename = TempDir;
|
||||
PSFilename.appendComponent(std::string("cfg.tempgraph") + "." + pathsuff + ".ps");
|
||||
|
||||
sys::Path dot(LLVM_PATH_DOT);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(dot.c_str());
|
||||
args.push_back("-Tps");
|
||||
args.push_back("-Nfontname=Courier");
|
||||
args.push_back("-Gsize=7.5,10");
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back("-o");
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
#ifdef HAVE_GV
|
||||
std::cerr << "Running 'dot' program... " << std::flush;
|
||||
if (system(("dot -Tps -Nfontname=Courier -Gsize=7.5,10 " + Filename
|
||||
+ " > /tmp/cfg.tempgraph.ps").c_str())) {
|
||||
std::cerr << "Error running dot: 'dot' not in path?\n";
|
||||
if (sys::Program::ExecuteAndWait(dot, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dot' not in path?\n";
|
||||
} else {
|
||||
std::cerr << "\n";
|
||||
system("gv /tmp/cfg.tempgraph.ps");
|
||||
|
||||
sys::Path gv(LLVM_PATH_GV);
|
||||
args.clear();
|
||||
args.push_back(gv.c_str());
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
sys::Program::ExecuteAndWait(gv, &args[0]);
|
||||
}
|
||||
system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
|
||||
Filename.eraseFromDisk();
|
||||
PSFilename.eraseFromDisk();
|
||||
return;
|
||||
#endif // HAVE_GV
|
||||
#elif HAVE_DOTTY
|
||||
sys::Path dotty(LLVM_PATH_DOTTY);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(dotty.c_str());
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'dotty' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dotty' not in path?\n";
|
||||
} else {
|
||||
#ifndef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
|
||||
Filename.eraseFromDisk();
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // NDEBUG
|
||||
std::cerr << "Function::viewCFG is only available in debug builds on "
|
||||
<< "systems with Graphviz or gv!\n";
|
||||
<< "systems with Graphviz or gv or dotty!\n";
|
||||
|
||||
#ifndef NDEBUG
|
||||
system(("rm " + Filename).c_str());
|
||||
Filename.eraseFromDisk();
|
||||
TempDir.eraseFromDisk(true);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -19,7 +19,10 @@
|
||||
#include "llvm/Assembly/Writer.h"
|
||||
#include "llvm/Support/CommandLine.h"
|
||||
#include "llvm/Support/GraphWriter.h"
|
||||
#include "llvm/System/Path.h"
|
||||
#include "llvm/System/Program.h"
|
||||
#include "llvm/ADT/Statistic.h"
|
||||
#include "llvm/Config/config.h"
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
using namespace llvm;
|
||||
@ -256,17 +259,90 @@ void DSGraph::writeGraphToFile(std::ostream &O,
|
||||
/// then cleanup. For use from the debugger.
|
||||
///
|
||||
void DSGraph::viewGraph() const {
|
||||
std::ofstream F("/tmp/tempgraph.dot");
|
||||
char pathsuff[9];
|
||||
|
||||
sprintf(pathsuff, "%06u", unsigned(rand()));
|
||||
|
||||
sys::Path TempDir = sys::Path::GetTemporaryDirectory();
|
||||
sys::Path Filename = TempDir;
|
||||
Filename.appendComponent("ds.tempgraph." + std::string(pathsuff) + ".dot");
|
||||
std::cerr << "Writing '" << Filename << "'... ";
|
||||
std::ofstream F(Filename.c_str());
|
||||
|
||||
if (!F.good()) {
|
||||
std::cerr << "Error opening '/tmp/tempgraph.dot' for temporary graph!\n";
|
||||
std::cerr << " error opening file for writing!\n";
|
||||
return;
|
||||
}
|
||||
|
||||
print(F);
|
||||
F.close();
|
||||
if (system("dot -Tps -Gsize=10,7.5 -Grotate=90 /tmp/tempgraph.dot > /tmp/tempgraph.ps"))
|
||||
std::cerr << "Error running dot: 'dot' not in path?\n";
|
||||
system("gv /tmp/tempgraph.ps");
|
||||
system("rm /tmp/tempgraph.dot /tmp/tempgraph.ps");
|
||||
std::cerr << "\n";
|
||||
|
||||
#if HAVE_GRAPHVIZ
|
||||
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(Graphviz.c_str());
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'Graphviz' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
|
||||
} else {
|
||||
Filename.eraseFromDisk();
|
||||
return;
|
||||
}
|
||||
#elif (HAVE_GV && HAVE_DOT)
|
||||
sys::Path PSFilename = TempDir;
|
||||
PSFilename.appendComponent(std::string("ds.tempgraph") + "." + pathsuff + ".ps");
|
||||
|
||||
sys::Path dot(LLVM_PATH_DOT);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(dot.c_str());
|
||||
args.push_back("-Tps");
|
||||
args.push_back("-Nfontname=Courier");
|
||||
args.push_back("-Gsize=7.5,10");
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back("-o");
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'dot' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dot, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dot' not in path?\n";
|
||||
} else {
|
||||
std::cerr << "\n";
|
||||
|
||||
sys::Path gv(LLVM_PATH_GV);
|
||||
args.clear();
|
||||
args.push_back(gv.c_str());
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
sys::Program::ExecuteAndWait(gv, &args[0]);
|
||||
}
|
||||
Filename.eraseFromDisk();
|
||||
PSFilename.eraseFromDisk();
|
||||
return;
|
||||
#elif HAVE_DOTTY
|
||||
sys::Path dotty(LLVM_PATH_DOTTY);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'dotty' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dotty' not in path?\n";
|
||||
} else {
|
||||
#ifndef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
|
||||
Filename.eraseFromDisk();
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
Filename.eraseFromDisk();
|
||||
TempDir.eraseFromDisk(true);
|
||||
}
|
||||
|
||||
|
||||
|
@ -27,6 +27,8 @@
|
||||
#include "llvm/Instructions.h"
|
||||
#include "llvm/Support/LeakDetector.h"
|
||||
#include "llvm/Support/GraphWriter.h"
|
||||
#include "llvm/System/Path.h"
|
||||
#include "llvm/System/Program.h"
|
||||
#include "llvm/Config/config.h"
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
@ -218,7 +220,13 @@ namespace llvm {
|
||||
void MachineFunction::viewCFG() const
|
||||
{
|
||||
#ifndef NDEBUG
|
||||
std::string Filename = "/tmp/cfg." + getFunction()->getName() + ".dot";
|
||||
char pathsuff[9];
|
||||
|
||||
sprintf(pathsuff, "%06u", unsigned(rand()));
|
||||
|
||||
sys::Path TempDir = sys::Path::GetTemporaryDirectory();
|
||||
sys::Path Filename = TempDir;
|
||||
Filename.appendComponent("mf" + getFunction()->getName() + "." + pathsuff + ".dot");
|
||||
std::cerr << "Writing '" << Filename << "'... ";
|
||||
std::ofstream F(Filename.c_str());
|
||||
|
||||
@ -231,34 +239,77 @@ void MachineFunction::viewCFG() const
|
||||
F.close();
|
||||
std::cerr << "\n";
|
||||
|
||||
#ifdef HAVE_GRAPHVIZ
|
||||
#if HAVE_GRAPHVIZ
|
||||
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(Graphviz.c_str());
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'Graphviz' program... " << std::flush;
|
||||
if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) {
|
||||
if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
|
||||
} else {
|
||||
system(("rm " + Filename).c_str());
|
||||
Filename.eraseFromDisk();
|
||||
return;
|
||||
}
|
||||
#endif // HAVE_GRAPHVIZ
|
||||
#elif (HAVE_GV && HAVE_DOT)
|
||||
sys::Path PSFilename = TempDir;
|
||||
PSFilename.appendComponent(std::string("mf.tempgraph") + "." + pathsuff + ".ps");
|
||||
|
||||
sys::Path dot(LLVM_PATH_DOT);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(dot.c_str());
|
||||
args.push_back("-Tps");
|
||||
args.push_back("-Nfontname=Courier");
|
||||
args.push_back("-Gsize=7.5,10");
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back("-o");
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
#ifdef HAVE_GV
|
||||
std::cerr << "Running 'dot' program... " << std::flush;
|
||||
if (system(("dot -Tps -Nfontname=Courier -Gsize=7.5,10 " + Filename
|
||||
+ " > /tmp/cfg.tempgraph.ps").c_str())) {
|
||||
std::cerr << "Error running dot: 'dot' not in path?\n";
|
||||
if (sys::Program::ExecuteAndWait(dot, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dot' not in path?\n";
|
||||
} else {
|
||||
std::cerr << "\n";
|
||||
system("gv /tmp/cfg.tempgraph.ps");
|
||||
|
||||
sys::Path gv(LLVM_PATH_GV);
|
||||
args.clear();
|
||||
args.push_back(gv.c_str());
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
sys::Program::ExecuteAndWait(gv, &args[0]);
|
||||
}
|
||||
system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
|
||||
Filename.eraseFromDisk();
|
||||
PSFilename.eraseFromDisk();
|
||||
return;
|
||||
#endif // HAVE_GV
|
||||
#elif HAVE_DOTTY
|
||||
sys::Path dotty(LLVM_PATH_DOTTY);
|
||||
std::vector<const char*> args;
|
||||
args.push_back(dotty.c_str());
|
||||
args.push_back(Filename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
std::cerr << "Running 'dotty' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
|
||||
std::cerr << "Error viewing graph: 'dotty' not in path?\n";
|
||||
} else {
|
||||
#ifndef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
|
||||
Filename.eraseFromDisk();
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // NDEBUG
|
||||
std::cerr << "MachineFunction::viewCFG is only available in debug builds on "
|
||||
<< "systems with Graphviz or gv!\n";
|
||||
|
||||
#ifndef NDEBUG
|
||||
system(("rm " + Filename).c_str());
|
||||
Filename.eraseFromDisk();
|
||||
TempDir.eraseFromDisk(true);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -222,8 +222,9 @@ Path::isFile() const {
|
||||
BOOL rc = GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi);
|
||||
if (rc)
|
||||
return !(fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
|
||||
else if (GetLastError() != ERROR_NOT_FOUND)
|
||||
ThrowError(std::string(path) + ": Can't get status: ");
|
||||
else if (GetLastError() != ERROR_FILE_NOT_FOUND) {
|
||||
ThrowError("isFile(): " + std::string(path) + ": Can't get status: ");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -233,8 +234,8 @@ Path::isDirectory() const {
|
||||
BOOL rc = GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi);
|
||||
if (rc)
|
||||
return fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
|
||||
else if (GetLastError() != ERROR_NOT_FOUND)
|
||||
ThrowError(std::string(path) + ": Can't get status: ");
|
||||
else if (GetLastError() != ERROR_FILE_NOT_FOUND)
|
||||
ThrowError("isDirectory(): " + std::string(path) + ": Can't get status: ");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -244,8 +245,8 @@ Path::isHidden() const {
|
||||
BOOL rc = GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi);
|
||||
if (rc)
|
||||
return fi.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN;
|
||||
else if (GetLastError() != ERROR_NOT_FOUND)
|
||||
ThrowError(std::string(path) + ": Can't get status: ");
|
||||
else if (GetLastError() != ERROR_FILE_NOT_FOUND)
|
||||
ThrowError("isHidden(): " + std::string(path) + ": Can't get status: ");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -336,7 +337,7 @@ void
|
||||
Path::getStatusInfo(StatusInfo& info) const {
|
||||
WIN32_FILE_ATTRIBUTE_DATA fi;
|
||||
if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi))
|
||||
ThrowError(std::string(path) + ": Can't get status: ");
|
||||
ThrowError("getStatusInfo():" + std::string(path) + ": Can't get status: ");
|
||||
|
||||
info.fileSize = fi.nFileSizeHigh;
|
||||
info.fileSize <<= 32;
|
||||
|
Loading…
Reference in New Issue
Block a user