qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Clean up dag item counting and init

Browse source 
Not by much really, but using one "aux" count instead of different
types, and using functions to iterate through the statement's aux
operands makes the code easier to read.
This commit is contained in:
Bill Currie 2024-02-19 16:22:14 +09:00
parent 768113d37b
commit 9a38cdfd78
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
tools/qfcc/source/dags.c
View file

@ -927,6 +927,32 @@ dag_kill_nodes (dag_t *dag, dagnode_t *n)
n->killed = 0; n->killed = 0;
} }
static __attribute__((pure)) int
dag_count_ops (operand_t *op)
{
int count = 0;
for (; op; op = op->next) {
if (op->op_type == op_pseudo) {
continue;
}
count++;
}
return count;
}
static void
dag_make_op_leafs (operand_t *op, dag_t *dag, const expr_t *expr)
{
for (; op; op = op->next) {
if (op->op_type == op_pseudo) {
continue;
}
if (!dag_node (op)) {
leaf_node (dag, op, expr);
}
}
}
dag_t * dag_t *
dag_create (flownode_t *flownode) dag_create (flownode_t *flownode)
{ {
@ -936,8 +962,7 @@ dag_create (flownode_t *flownode)
dagnode_t **nodes; dagnode_t **nodes;
daglabel_t **labels; daglabel_t **labels;
int num_statements = 0; int num_statements = 0;
int num_use = 0; int num_aux = 0;
int num_alias = 0;
int num_nodes; int num_nodes;
int num_lables; int num_lables;
set_t *live_vars = set_new (); set_t *live_vars = set_new ();
@ -948,26 +973,21 @@ dag_create (flownode_t *flownode)
// guessed // guessed
for (s = block->statements; s; s = s->next) { for (s = block->statements; s; s = s->next) {
num_statements++; num_statements++;
for (operand_t *use = s->use; use; use = use->next) { num_aux += dag_count_ops (s->use);
if (use->op_type == op_pseudo) { num_aux += op_is_alias (s->opa);
continue; num_aux += op_is_alias (s->opb);
} num_aux += op_is_alias (s->opc);
num_use++;
}
num_alias += op_is_alias (s->opa);
num_alias += op_is_alias (s->opb);
num_alias += op_is_alias (s->opc);
} }
set_assign (live_vars, flownode->live_vars.out); set_assign (live_vars, flownode->live_vars.out);
dag = new_dag (); dag = new_dag ();
dag->flownode = flownode; dag->flownode = flownode;
// at most FLOW_OPERANDS per statement + use + alias // at most FLOW_OPERANDS per statement + aux
num_nodes = num_statements * FLOW_OPERANDS + num_use + num_alias; num_nodes = num_statements * FLOW_OPERANDS + num_aux;
dag->nodes = alloca (num_nodes * sizeof (dagnode_t)); dag->nodes = alloca (num_nodes * sizeof (dagnode_t));
// at most FLOW_OPERANDS per statement, + return + params + use + alias // at most FLOW_OPERANDS per statement, + return + params + aux
num_lables = num_statements * (FLOW_OPERANDS + 1 + 8) + num_use + num_alias; num_lables = num_statements * (FLOW_OPERANDS + 1 + 8) + num_aux;
dag->labels = alloca (num_lables * sizeof (daglabel_t)); dag->labels = alloca (num_lables * sizeof (daglabel_t));
dag->roots = set_new (); dag->roots = set_new ();
@ -977,14 +997,7 @@ dag_create (flownode_t *flownode)
operand_t *operands[FLOW_OPERANDS]; operand_t *operands[FLOW_OPERANDS];
dag_make_leafs (dag, s, operands); dag_make_leafs (dag, s, operands);
// make sure any auxiliary operands are given nodes, too // make sure any auxiliary operands are given nodes, too
for (operand_t *use = s->use; use; use = use->next) { dag_make_op_leafs (s->use, dag, s->expr);
if (use->op_type == op_pseudo) {
continue;
}
if (!dag_node (use)) {
leaf_node (dag, use, s->expr);
}
}
} }
// actual dag creation // actual dag creation
for (s = block->statements; s; s = s->next) { for (s = block->statements; s; s = s->next) {