diff options
| author | aiju <devnull@localhost> | 2018-03-28 20:14:29 +0000 |
|---|---|---|
| committer | aiju <devnull@localhost> | 2018-03-28 20:14:29 +0000 |
| commit | 2ca54f6a26ceda9cfe5012c641154e203ff9a83b (patch) | |
| tree | b16af659dbdd1f31dc3c85f6bd993e6e5bfa0bd2 /sys/src/cmd/forp | |
| parent | 382d37dbf0ee8bf5af9594e922db6094e30ace2a (diff) | |
forp: fix multiplication; change division to C semantics
Diffstat (limited to 'sys/src/cmd/forp')
| -rw-r--r-- | sys/src/cmd/forp/cvt.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/src/cmd/forp/cvt.c b/sys/src/cmd/forp/cvt.c index 7f146c5c0..de5dccba9 100644 --- a/sys/src/cmd/forp/cvt.c +++ b/sys/src/cmd/forp/cvt.c @@ -344,7 +344,7 @@ opmul(int *n1v, int s1, int *n2v, int s2) s1--; s2--; r = emalloc(sizeof(int) * (s1 + s2 + 2)); - nq = 2 * (min(s1, s2) + 1); + nq = 2 * (min(s1, s2) + 2); q0 = emalloc(nq * sizeof(int)); q1 = emalloc(nq * sizeof(int)); nq0 = nq1 = 0; @@ -402,7 +402,7 @@ static void opdiv(Node *q, Node *r, Node *n1, Node *n2) { Node *s; - int i; + int i, s1, sr,zr; if(q == nil) q = node(ASTTEMP); if(r == nil) r = node(ASTTEMP); @@ -413,8 +413,12 @@ opdiv(Node *q, Node *r, Node *n1, Node *n2) for(i = 0; i < n2->size; i++) r->vars[i] = satvar++; s = node(ASTBIN, OPEQ, node(ASTBIN, OPADD, node(ASTBIN, OPMUL, q, n2), r), n1); convert(s, -1); assume(s); - s = node(ASTBIN, OPGE, r, node(ASTNUM, mpnew(0))); convert(s, -1); assume(s); - s = node(ASTBIN, OPLT, r, node(ASTUN, OPABS, n2)); convert(s, -1); assume(s); + s = node(ASTBIN, OPLT, node(ASTUN, OPABS, r), node(ASTUN, OPABS, n2)); convert(s, -1); assume(s); + s1 = n1->vars[n1->size - 1]; + sr = r->vars[r->size - 1]; + zr = -sator1(sat, r->vars, r->size); + sataddv(sat, zr, sr, -s1, 0); + sataddv(sat, zr, -sr, s1, 0); } void |