qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-05 08:51:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attach dags to statement blocks.

Browse source 
Now, if a dag is attached to a statement block, it will be included in the
flowgraph with that statement block.
This commit is contained in:
Bill Currie 2012-07-18 15:29:30 +09:00
parent 39506881c0
commit dbf1aa8f72
7 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/qfcc/include/dags.h
View file

@ -64,7 +64,8 @@ typedef struct dagnode_s {
} dagnode_t;
const char *daglabel_string (daglabel_t *label);
void print_dag (dagnode_t *node, const char *filename);
struct dstring_s;
void print_dag (struct dstring_s *dstr, dagnode_t *node);
struct sblock_s;
/** Make a dag for a single basic block.

1
tools/qfcc/include/options.h
View file

@ -72,6 +72,7 @@ typedef struct {
qboolean thread;
qboolean dead;
qboolean final;
qboolean dags;
} blockdot_options_t;
typedef struct {

1
tools/qfcc/include/statements.h
View file

@ -74,6 +74,7 @@ typedef struct sblock_s {
struct sblock_s *next;
struct reloc_s *relocs;
struct ex_label_s *labels;
struct dagnode_s *dag;
int offset; ///< offset of first statement of block
int reachable;
statement_t *statements;

18
tools/qfcc/source/dot_dag.c
View file

@ -96,24 +96,8 @@ print_node (dstring_t *dstr, dagnode_t *node)
}
void
print_dag (dagnode_t *dag, const char *filename)
print_dag (dstring_t *dstr, dagnode_t *dag)
{
dstring_t *dstr = dstring_newstr();
print_count++;
dasprintf (dstr, "digraph dag_%p {\n", dag);
dasprintf (dstr, " layout=dot; rankdir=TB;\n");
print_node (dstr, dag);
dasprintf (dstr, "}\n");
if (filename) {
QFile *file;
file = Qopen (filename, "wt");
Qwrite (file, dstr->str, dstr->size - 1);
Qclose (file);
} else {
fputs (dstr->str, stdout);
}
dstring_delete (dstr);
}

5
tools/qfcc/source/dot_flow.c
View file

@ -43,6 +43,7 @@
#include <QF/quakeio.h>
#include <QF/va.h>
#include "dags.h"
#include "expr.h"
#include "statements.h"
#include "strpool.h"
@ -95,6 +96,10 @@ flow_sblock (dstring_t *dstr, sblock_t *sblock, int blockno)
sblock_t *target;
ex_label_t *l;
if (sblock->dag) {
dasprintf (dstr, " sb_%p -> dag_%p;", sblock, sblock->dag);
print_dag (dstr, sblock->dag);
}
dasprintf (dstr, " sb_%p [shape=none,label=<\n", sblock);
dasprintf (dstr, " <table border=\"0\" cellborder=\"1\" "
"cellspacing=\"0\">\n");

3
tools/qfcc/source/options.c
View file

@ -389,6 +389,8 @@ DecodeArgs (int argc, char **argv)
options.block_dot.dead = flag;
} else if (!(strcasecmp (temp, "final"))) {
options.block_dot.final = flag;
} else if (!(strcasecmp (temp, "dags"))) {
options.block_dot.dags = flag;
}
temp = strtok (NULL, ",");
}
@ -398,6 +400,7 @@ DecodeArgs (int argc, char **argv)
options.block_dot.thread = true;
options.block_dot.dead = true;
options.block_dot.final = true;
options.block_dot.dags = true;
}
break;
case 'c':

8
tools/qfcc/source/statements.c
View file

@ -1411,9 +1411,9 @@ make_statements (expr_t *e)
if (options.block_dot.final)
dump_flow (sblock, "final");
for (s = sblock; s; s = s->next) {
dagnode_t *dag = make_dag (s);
print_dag (dag, 0);
}
for (s = sblock; s; s = s->next)
s->dag = make_dag (s);
if (options.block_dot.dags)
dump_flow (sblock, "dags");
return sblock;
}