X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/106b481c4fb7790f93944c6f40ef39a1f1b3058e..95d9246390251adba7e6e9f0cc70bf0ebe0b2e60:/mpx.c

diff --git a/mpx.c b/mpx.c
index c6a23be..29e1ded 100644
--- a/mpx.c
+++ b/mpx.c
@@ -7,7 +7,7 @@
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -417,7 +417,7 @@ void mpx_lsl(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, size_t n)
   }
 
   /* --- Break out word and bit shifts for more sophisticated work --- */
-	
+
   nw = n / MPW_BITS;
   nb = n % MPW_BITS;
 
@@ -462,11 +462,11 @@ void mpx_lsl(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, size_t n)
 
     while (avl > av) {
       mpw t = *--avl;
-      *--dvl = (t >> nr) | w;
+      *--dvl = MPW((t >> nr) | w);
       w = t << nb;
     }
 
-    *--dvl = w;
+    *--dvl = MPW(w);
     MPX_ZERO(dv, dvl);
   }
 
@@ -515,7 +515,7 @@ void mpx_lslc(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, size_t n)
   }
 
   /* --- Break out word and bit shifts for more sophisticated work --- */
-	
+
   nw = n / MPW_BITS;
   nb = n % MPW_BITS;
 
@@ -560,11 +560,11 @@ void mpx_lslc(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, size_t n)
 
     while (avl > av) {
       mpw t = *--avl;
-      *--dvl = (t >> nr) | w;
+      *--dvl = MPW((t >> nr) | w);
       w = t << nb;
     }
 
-    *--dvl = (MPW_MAX >> nr) | w;
+    *--dvl = MPW((MPW_MAX >> nr) | w);
     MPX_ONE(dv, dvl);
   }
 
@@ -919,7 +919,7 @@ void mpx_usubnlsl(mpw *dv, mpw *dvl, mpw a, unsigned o)
   a <<= o;
 
   if (dv < dvl) {
-    mpd x = (mpd)*dv - (mpd)a;
+    mpd x = (mpd)*dv - MPW(a);
     *dv++ = MPW(x);
     if (x >> MPW_BITS)
       b++;
@@ -950,7 +950,7 @@ void mpx_umul(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl,
   MPX_SHRINK(bv, bvl);
 
   /* --- Deal with a multiply by zero --- */
-  
+
   if (bv == bvl) {
     MPX_ZERO(dv, dvl);
     return;
@@ -1116,7 +1116,7 @@ void mpx_udiv(mpw *qv, mpw *qvl, mpw *rv, mpw *rvl,
     unsigned b;
 
     d = dvl[-1];
-    for (b = MPW_BITS / 2; b; b >>= 1) {
+    for (b = MPW_P2; b; b >>= 1) {
       if (d <= (MPW_MAX >> b)) {
 	d <<= b;
 	norm += b;
@@ -1330,7 +1330,7 @@ mpw mpx_udivn(mpw *qv, mpw *qvl, const mpw *rv, const mpw *rvl, mpw d)
 } while (0)
 
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
-  
+
 static void dumpbits(const char *msg, const void *pp, size_t sz)
 {
   const octet *p = pp;
@@ -1515,7 +1515,7 @@ static int lsl(dstr *v)
   mpx_lsl(d, dl, a, al, n);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** lsl(%i) failed\n", n);
-    dumpmp("       a", a, al);
+    dumpmp("	   a", a, al);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1540,7 +1540,7 @@ static int lslc(dstr *v)
   mpx_lslc(d, dl, a, al, n);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** lslc(%i) failed\n", n);
-    dumpmp("       a", a, al);
+    dumpmp("	   a", a, al);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1565,7 +1565,7 @@ static int lsr(dstr *v)
   mpx_lsr(d, dl, a, al, n);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** lsr(%i) failed\n", n);
-    dumpmp("       a", a, al);
+    dumpmp("	   a", a, al);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1591,8 +1591,8 @@ static int uadd(dstr *v)
   mpx_uadd(d, dl, a, al, b, bl);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** uadd failed\n");
-    dumpmp("       a", a, al);
-    dumpmp("       b", b, bl);
+    dumpmp("	   a", a, al);
+    dumpmp("	   b", b, bl);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1618,8 +1618,8 @@ static int usub(dstr *v)
   mpx_usub(d, dl, a, al, b, bl);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** usub failed\n");
-    dumpmp("       a", a, al);
-    dumpmp("       b", b, bl);
+    dumpmp("	   a", a, al);
+    dumpmp("	   b", b, bl);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1645,8 +1645,8 @@ static int umul(dstr *v)
   mpx_umul(d, dl, a, al, b, bl);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** umul failed\n");
-    dumpmp("       a", a, al);
-    dumpmp("       b", b, bl);
+    dumpmp("	   a", a, al);
+    dumpmp("	   b", b, bl);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;
@@ -1670,7 +1670,7 @@ static int usqr(dstr *v)
   mpx_usqr(d, dl, a, al);
   if (!mpx_ueq(d, dl, c, cl)) {
     fprintf(stderr, "\n*** usqr failed\n");
-    dumpmp("       a", a, al);
+    dumpmp("	   a", a, al);
     dumpmp("expected", c, cl);
     dumpmp("  result", d, dl);
     ok = 0;