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

Add edges from call nodes to their param nodes.

Browse source 
Assinments to .param_N (0-7 for call, 2-7 for rcall) must occur before the
call, or weird things will happen.
This commit is contained in:
Bill Currie 2012-12-13 09:51:48 +09:00
parent c477191488
commit c295a0473e
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@
# include <strings.h>
#endif
#include <stdlib.h>
#include <ctype.h>
#include "QF/alloc.h"
#include "QF/dstring.h"
@ -47,6 +48,7 @@
#include "dags.h"
#include "diagnostic.h"
#include "flow.h"
#include "function.h"
#include "qfcc.h"
#include "statements.h"
#include "strpool.h"
@ -319,8 +321,16 @@ dagnode_set_edges_visit (def_t *def, void *_node)
return 0;
}
static int
dag_find_node (def_t *def, void *unused)
{
if (def->daglabel && def->daglabel->dagnode)
return def->daglabel->dagnode->number + 1; // ensure never 0
return 0;
}
static void
dagnode_set_edges (dagnode_t *n)
dagnode_set_edges (dag_t *dag, dagnode_t *n)
{
int i;
@ -352,6 +362,33 @@ dagnode_set_edges (dagnode_t *n)
set_add (n->edges, child->number);
}
}
if (n->type == st_func) {
const char *num_params = 0;
int first_param = 0;
flowvar_t **flowvars = dag->flownode->graph->func->vars;
if (!strncmp (n->label->opcode, "<RCALL", 6)) {
num_params = n->label->opcode + 6;
first_param = 2;
} else if (!strncmp (n->label->opcode, "<CALL", 5)) {
num_params = n->label->opcode + 5;
}
if (num_params && isdigit (*num_params)) {
for (i = first_param; i < *num_params - '0'; i++) {
flowvar_t *var = flowvars[i + 1];
def_t *param_def = var->op->o.def;
int param_node;
// FIXME hopefully only the one alias :P
param_node = def_visit_all (param_def, 0, dag_find_node, 0);
if (!param_node) {
bug (0, ".param_%d not set for %s", i, n->label->opcode);
continue;
}
set_add (n->edges, param_node - 1);
}
}
}
}
static int
@ -563,7 +600,7 @@ dag_create (flownode_t *flownode)
n->type = s->type;
n->label = op;
dagnode_add_children (dag, n, operands, children);
dagnode_set_edges (n);
dagnode_set_edges (dag, n);
}
lx = operand_label (dag, operands[0]);
if (lx && lx->dagnode != n) {