Major memory management overhaul. Added arena support. Use the secure

[u/mdw/catacomb] / mp-arith.c

diff --git a/mp-arith.c b/mp-arith.c
index f0502e1..fe6a45d 100644 (file)
--- a/mp-arith.c
+++ b/mp-arith.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mp-arith.c,v 1.5 1999/12/22 15:54:41 mdw Exp $
+ * $Id: mp-arith.c,v 1.6 2000/06/17 11:45:09 mdw Exp $
  *
  * Basic arithmetic on multiprecision integers
  *
@@ -30,6 +30,11 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mp-arith.c,v $
+ * Revision 1.6  2000/06/17 11:45:09  mdw
+ * Major memory management overhaul.  Added arena support.  Use the secure
+ * arena for secret integers.  Replace and improve the MP management macros
+ * (e.g., replace MP_MODIFY by MP_DEST).
+ *
  * Revision 1.5  1999/12/22 15:54:41  mdw
  * Adjust Karatsuba parameters.  Calculate destination size better.
  *
@@ -69,7 +74,7 @@ mp *mp_2c(mp *d, mp *a)
   if (!(a->f & MP_NEG))
     return (MP_COPY(a));
 
-  MP_MODIFY(d, MP_LEN(a));
+  MP_DEST(d, MP_LEN(a), a->f);
   mpx_2c(d->v, d->vl, a->v, a->vl);
   d->f = a->f & MP_BURN;
   MP_SHRINK(d);
@@ -90,7 +95,7 @@ mp *mp_sm(mp *d, mp *a)
   if (!MP_LEN(a) || a->vl[-1] < MPW_MAX / 2)
     return (MP_COPY(a));
 
-  MP_MODIFY(d, MP_LEN(a));
+  MP_DEST(d, MP_LEN(a), a->f);
   mpx_2c(d->v, d->vl, a->v, a->vl);
   d->f = (a->f & (MP_BURN | MP_NEG)) ^ MP_NEG;
   MP_SHRINK(d);
@@ -108,7 +113,7 @@ mp *mp_sm(mp *d, mp *a)
 
 mp *mp_lsl(mp *d, mp *a, size_t n)
 {
-  MP_MODIFY(d, MP_LEN(a) + (n + MPW_BITS - 1) / MPW_BITS);
+  MP_DEST(d, MP_LEN(a) + (n + MPW_BITS - 1) / MPW_BITS, a->f);
   mpx_lsl(d->v, d->vl, a->v, a->vl, n);
   d->f = a->f & (MP_NEG | MP_BURN);
   MP_SHRINK(d);
@@ -126,7 +131,7 @@ mp *mp_lsl(mp *d, mp *a, size_t n)
 
 mp *mp_lsr(mp *d, mp *a, size_t n)
 {
-  MP_MODIFY(d, MP_LEN(a));
+  MP_DEST(d, MP_LEN(a), a->f);
   mpx_lsr(d->v, d->vl, a->v, a->vl, n);
   d->f = a->f & (MP_NEG | MP_BURN);
   MP_SHRINK(d);
@@ -161,7 +166,7 @@ int mp_cmp(const mp *a, const mp *b)
 
 mp *mp_add(mp *d, mp *a, mp *b)
 {
-  MP_MODIFY(d, MAX(MP_LEN(a), MP_LEN(b)) + 1);
+  MP_DEST(d, MAX(MP_LEN(a), MP_LEN(b)) + 1, a->f | b->f);
   if (!((a->f ^ b->f) & MP_NEG))
     mpx_uadd(d->v, d->vl, a->v, a->vl, b->v, b->vl);
   else {
@@ -186,7 +191,7 @@ mp *mp_add(mp *d, mp *a, mp *b)
 mp *mp_sub(mp *d, mp *a, mp *b)
 {
   unsigned sgn = 0;
-  MP_MODIFY(d, MAX(MP_LEN(a), MP_LEN(b)) + 1);
+  MP_DEST(d, MAX(MP_LEN(a), MP_LEN(b)) + 1, a->f | b->f);
   if ((a->f ^ b->f) & MP_NEG)
     mpx_uadd(d->v, d->vl, a->v, a->vl, b->v, b->vl);
   else {
@@ -215,16 +220,16 @@ mp *mp_mul(mp *d, mp *a, mp *b)
   b = MP_COPY(b);
 
   if (MP_LEN(a) <= KARATSUBA_CUTOFF || MP_LEN(b) <= KARATSUBA_CUTOFF) {
-    MP_MODIFY(d, MP_LEN(a) + MP_LEN(b));
+    MP_DEST(d, MP_LEN(a) + MP_LEN(b), a->f | b->f | MP_UNDEF);
     mpx_umul(d->v, d->vl, a->v, a->vl, b->v, b->vl);
   } else {
     size_t m = 2 * MAX(MP_LEN(a), MP_LEN(b)) + 2;
     mpw *s;
-    MP_MODIFY(d, m);
+    MP_DEST(d, m, a->f | b->f | MP_UNDEF);
     m += KARATSUBA_SLOP;
-    s = MP_ALLOC(m);
+    s = mpalloc(d->a, m);
     mpx_kmul(d->v, d->vl, a->v, a->vl, b->v, b->vl, s, s + m);
-    MP_FREE(s);
+    mpfree(d->a, s);
   }
 
   d->f = ((a->f | b->f) & MP_BURN) | ((a->f ^ b->f) & MP_NEG);
@@ -247,13 +252,13 @@ mp *mp_sqr(mp *d, mp *a)
   size_t m = MP_LEN(a);
 
   a = MP_COPY(a);
-  MP_MODIFY(d, 2 * m + 2);
+  MP_DEST(d, 2 * m + 2, a->f | MP_UNDEF);
   if (m > KARATSUBA_CUTOFF) {
     mpw *s;
     m = 2 * (m + 1) + KARATSUBA_SLOP;
-    s = MP_ALLOC(m);
+    s = mpalloc(d->a, m);
     mpx_ksqr(d->v, d->vl, a->v, a->vl, s, s + m);
-    MP_FREE(s);
+    mpfree(d->a, s);
   } else 
     mpx_usqr(d->v, d->vl, a->v, a->vl);
   d->f = a->f & MP_BURN;
@@ -287,41 +292,32 @@ void mp_div(mp **qq, mp **rr, mp *a, mp *b)
   mp *q = qq ? *qq : MP_NEW;
   mpw *sv, *svl;
 
-  /* --- Set up some temporary workspace --- */
-
-  {
-    size_t rq = MP_LEN(b) + 1;
-    sv = MP_ALLOC(rq);
-    svl = sv + rq;
-  }
-
   /* --- Set the remainder up right --- *
    *
    * Just in case the divisor is larger, be able to cope with this.  It's not
    * important in @mpx_udiv@, but it is here because of the sign correction.
    */
 
-  {
-    size_t rq = MP_LEN(a) + 2;
-    if (MP_LEN(b) > rq)
-      rq = MP_LEN(b);
-
-    b = MP_COPY(b);
-    if (r == a) {
-      MP_SPLIT(a);
-      a = r = MP_COPY(a);
-      MP_ENSURE(r, MP_LEN(r) + 2);
-    } else {
-      a = MP_COPY(a);
-      MP_MODIFY(r, MP_LEN(a) + 2);
-      memcpy(r->v, a->v, MPWS(MP_LEN(a)));
-      memset(r->v + MP_LEN(a), 0, MPWS(2));
-    }
-  }
+  b = MP_COPY(b);
+  a = MP_COPY(a);
+  if (r)
+    MP_DROP(r);
+  r = a;
+  MP_DEST(r, MP_LEN(a) + 2, a->f | b->f);
 
   /* --- Fix up the quotient too --- */
 
-  MP_MODIFY(q, MP_LEN(a));
+  r = MP_COPY(r);
+  MP_DEST(q, MP_LEN(r), r->f | MP_UNDEF);
+  MP_DROP(r);
+
+  /* --- Set up some temporary workspace --- */
+
+  {
+    size_t rq = MP_LEN(b) + 1;
+    sv = mpalloc(r->a, rq);
+    svl = sv + rq;
+  }
 
   /* --- Perform the calculation --- */
 
@@ -334,7 +330,7 @@ void mp_div(mp **qq, mp **rr, mp *a, mp *b)
    * remainder from @b@.
    */
 
-  q->f = ((a->f | b->f) & MP_BURN) | ((a->f ^ b->f) & MP_NEG);
+  q->f = ((r->f | b->f) & MP_BURN) | ((r->f ^ b->f) & MP_NEG);
   if (q->f & MP_NEG) {
     mpw *v;
     for (v = r->v; v < r->vl; v++) {
@@ -346,10 +342,13 @@ void mp_div(mp **qq, mp **rr, mp *a, mp *b)
     }
   }
 
-  r->f = ((a->f | b->f) & MP_BURN) | (b->f & MP_NEG);
+  r->f = ((r->f | b->f) & MP_BURN) | (b->f & MP_NEG);
 
   /* --- Store the return values --- */
 
+  mpfree(r->a, sv);
+  MP_DROP(b);
+
   if (!qq)
     MP_DROP(q);
   else {
@@ -363,10 +362,6 @@ void mp_div(mp **qq, mp **rr, mp *a, mp *b)
     MP_SHRINK(r);
     *rr = r;
   }
-
-  MP_DROP(a);
-  MP_DROP(b);
-  MP_FREE(sv);
 }
 
 /*----- Test rig ----------------------------------------------------------*/