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

Mostly fix dag_create to work with flow_analyze_statement.

Browse source 
Label operands aren't handled properly, but dags are getting generated
again (better than before: return and goto are in).
This commit is contained in:
Bill Currie 2012-11-16 20:03:30 +09:00
parent 1100efba54
commit 4c6381d035
1 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,7 @@ operand_label (operand_t *op)
label->op = op; label->op = op;
val->daglabel = label; val->daglabel = label;
} else { } else {
internal_error (0, "unexpected operand type: %d", op->op_type); //internal_error (0, "unexpected operand type: %d", op->op_type);
} }
return label; return label;
} }
@ -286,25 +286,24 @@ dag_create (const flownode_t *flownode)
flush_daglabels (); flush_daglabels ();
for (s = block->statements; s; s = s->next) { for (s = block->statements; s; s = s->next) {
operand_t *x = 0, *y = 0, *z = 0, *w = 0; operand_t *operands[4];
dagnode_t *n = 0, *ny, *nz, *nw; dagnode_t *n = 0, *ny, *nz, *nw;
daglabel_t *op, *lx; daglabel_t *op, *lx;
int simp = 0;
//simp = find_operands (s, &x, &y, &z, &w); flow_analyze_statement (s, 0, 0, 0, operands);
if (!(ny = node (y))) { if (!(ny = node (operands[1]))) {
ny = leaf_node (y); ny = leaf_node (operands[1]);
if (simp) { if (s->type == st_assign) {
*dagtail = ny; *dagtail = ny;
dagtail = &ny->next; dagtail = &ny->next;
} }
} }
if (!(nz = node (z))) if (!(nz = node (operands[2])))
nz = leaf_node (z); nz = leaf_node (operands[2]);
if (!(nw = node (w))) if (!(nw = node (operands[3])))
nw = leaf_node (w); nw = leaf_node (operands[3]);
op = opcode_label (s->opcode); op = opcode_label (s->opcode);
if (simp) { if (s->type == st_assign) {
n = ny; n = ny;
} else { } else {
for (n = dagnodes; n; n = n->next) for (n = dagnodes; n; n = n->next)
@ -320,53 +319,25 @@ dag_create (const flownode_t *flownode)
n->c = nw; n->c = nw;
if (ny) { if (ny) {
ny->is_child = 1; ny->is_child = 1;
n->ta = y->type; n->ta = operands[1]->type;
} }
if (nz) { if (nz) {
nz->is_child = 1; nz->is_child = 1;
n->tb = z->type; n->tb = operands[2]->type;
} }
if (nw) { if (nw) {
nw->is_child = 1; nw->is_child = 1;
n->tc = w->type; n->tc = operands[3]->type;
} }
*dagtail = n; *dagtail = n;
dagtail = &n->next; dagtail = &n->next;
} }
lx = operand_label (x); lx = operand_label (operands[0]);
if (lx) { if (lx) {
if (lx->prev) if (lx->prev)
daglabel_detatch (lx); daglabel_detatch (lx);
dagnode_attach_label (n, lx); dagnode_attach_label (n, lx);
} }
// c = a * b
// c = ~a
// c = a / b
// c = a + b
// c = a - b
// c = a {==,!=,<=,>=,<,>} b
// c = a.b
// c = &a.b
// c = a (convert)
// b = a
// b .= a
// b.c = a
// c = !a
// cond a goto b
// callN a
// rcallN a, [b, [c]]
// state a, b
// state a, b, c
// goto a
// jump a
// jumpb a, b
// c = a &&/|| b
// c = a <</>> b
// c = a & b
// c = a | b
// c = a % b
// c = a ^ b
// c = a (move) b (count)
} }
for (d = dagnodes; d; d = d->next) { for (d = dagnodes; d; d = d->next) {
daglabel_t **l = &d->identifiers; daglabel_t **l = &d->identifiers;