diff options
| -rw-r--r-- | alias.c | 3 | ||||
| -rw-r--r-- | mem.c | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/alias.c b/alias.c index 6f082bc..50e659a 100644 --- a/alias.c +++ b/alias.c @@ -192,6 +192,7 @@ fillalias(Fn *fn) } } } - esc(b->jmp.arg, fn); + if (b->jmp.type != Jretc) + esc(b->jmp.arg, fn); } } diff --git a/mem.c b/mem.c index fc3269c..a574e1f 100644 --- a/mem.c +++ b/mem.c @@ -302,6 +302,11 @@ coalesce(Fn *fn) assert(t->ndef == 1 && t->def); *t->def = (Ins){.op = Onop}; for (u=t->use; u<&t->use[t->nuse]; u++) { + if (u->type == UJmp) { + b = fn->rpo[u->bid]; + b->jmp.arg = CON_Z; + continue; + } assert(u->type == UIns); i = u->u.ins; /* make loads crash */ @@ -357,6 +362,11 @@ coalesce(Fn *fn) assert(t->ndef == 1 && t->def); *t->def = (Ins){.op = Onop}; for (u=t->use; u<&t->use[t->nuse]; u++) { + if (u->type == UJmp) { + b = fn->rpo[u->bid]; + b->jmp.arg = TMP(s->s->t); + continue; + } assert(u->type == UIns); arg = u->u.ins->arg; for (n=0; n<2; n++) |