qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the flow api a little.

Browse source
This commit is contained in:
Bill Currie 2012-12-09 20:50:53 +09:00
parent 054d902d3a
commit 1c99cf50da
3 changed files with 45 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/qfcc/include/flow.h
View file

@ -99,15 +99,12 @@ typedef struct flowgraph_s {
} flowgraph_t;
flowvar_t *flow_get_var (struct operand_s *op);
void flow_analyze_statement (struct statement_s *s, struct set_s *use,
struct set_s *def, struct set_s *kill,
struct operand_s *operands[4]);
void flow_build_vars (struct function_s *func);
flowgraph_t *flow_build_graph (struct sblock_s *sblock,
struct function_s *func);
void flow_del_graph (flowgraph_t *graph);
void flow_data_flow (flowgraph_t *graph);
struct sblock_s *flow_generate (flowgraph_t *graph);
void flow_data_flow (struct function_s *func);
void dump_dot_flow (void *g, const char *filename);
void dump_dot_flow_dags (void *g, const char *filename);

81
tools/qfcc/source/flow.c
View file

@ -133,7 +133,7 @@ new_graph (void)
return graph;
}
static void
static void __attribute__((unused))
delete_graph (flowgraph_t *graph)
{
int i;
@ -225,7 +225,6 @@ flow_get_var (operand_t *op)
op->o.def->flowvar = new_flowvar ();
return op->o.def->flowvar;
}
//FIXME functions? (some are variable) values?
return 0;
}
@ -287,7 +286,7 @@ param_symbol (const char *name)
return sym;
}
void
static void
flow_build_vars (function_t *func)
{
sblock_t *sblock;
@ -548,39 +547,7 @@ flow_build_dags (flowgraph_t *graph)
dump_dot ("dags", graph, dump_dot_flow_dags);
}
void
flow_data_flow (flowgraph_t *graph)
{
int i;
flownode_t *node;
statement_t *st;
flowvar_t *var;
set_t *stuse = set_new ();
set_t *stdef = set_new ();
set_iter_t *var_i;
for (i = 0; i < graph->num_nodes; i++) {
node = graph->nodes[i];
for (st = node->sblock->statements; st; st = st->next) {
flow_analyze_statement (st, stuse, stdef, 0, 0);
for (var_i = set_first (stdef); var_i; var_i = set_next (var_i)) {
var = graph->func->vars[var_i->value];
set_add (var->define, st->number);
}
for (var_i = set_first (stuse); var_i; var_i = set_next (var_i)) {
var = graph->func->vars[var_i->value];
set_add (var->use, st->number);
}
}
}
flow_live_vars (graph);
flow_uninitialized (graph);
flow_build_dags (graph);
if (options.block_dot.flow)
dump_dot ("flow", graph, dump_dot_flow);
}
sblock_t *
static sblock_t *
flow_generate (flowgraph_t *graph)
{
int i;
@ -904,9 +871,10 @@ flow_build_dfst (flowgraph_t *graph)
set_delete (visited);
}
flowgraph_t *
flow_build_graph (sblock_t *sblock, function_t *func)
static flowgraph_t *
flow_build_graph (function_t *func)
{
sblock_t *sblock = func->sblock;
flowgraph_t *graph;
flownode_t *node;
sblock_t *sb;
@ -916,6 +884,7 @@ flow_build_graph (sblock_t *sblock, function_t *func)
int i, j;
graph = new_graph ();
graph->func = func;
for (sb = sblock; sb; sb = sb->next)
sb->number = graph->num_nodes++;
graph->nodes = malloc (graph->num_nodes * sizeof (flownode_t *));
@ -981,7 +950,39 @@ flow_build_graph (sblock_t *sblock, function_t *func)
}
void
flow_del_graph (flowgraph_t *graph)
flow_data_flow (function_t *func)
{
delete_graph (graph);
int i;
flowgraph_t *graph;
flownode_t *node;
statement_t *st;
flowvar_t *var;
set_t *stuse = set_new ();
set_t *stdef = set_new ();
set_iter_t *var_i;
flow_build_vars (func);
graph = flow_build_graph (func);
func->graph = graph;
for (i = 0; i < graph->num_nodes; i++) {
node = graph->nodes[i];
for (st = node->sblock->statements; st; st = st->next) {
flow_analyze_statement (st, stuse, stdef, 0, 0);
for (var_i = set_first (stdef); var_i; var_i = set_next (var_i)) {
var = graph->func->vars[var_i->value];
set_add (var->define, st->number);
}
for (var_i = set_first (stuse); var_i; var_i = set_next (var_i)) {
var = graph->func->vars[var_i->value];
set_add (var->use, st->number);
}
}
}
flow_live_vars (graph);
flow_uninitialized (graph);
flow_build_dags (graph);
if (options.block_dot.flow)
dump_dot ("flow", graph, dump_dot_flow);
func->sblock = flow_generate (graph);
}

6
tools/qfcc/source/function.c
View file

@ -645,11 +645,7 @@ emit_function (function_t *f, expr_t *e)
lineno_base = f->def->line;
f->sblock = make_statements (e);
if (options.code.optimize) {
flow_build_vars (f);
f->graph = flow_build_graph (f->sblock, f);
f->graph->func = f;
flow_data_flow (f->graph);
f->sblock = flow_generate (f->graph);
flow_data_flow (f);
} else {
statements_count_temps (f->sblock);
}