tiger-mktab.c: Don't have printf swallow a kludge64 whole.

[u/mdw/catacomb] / mpmul.c

diff --git a/mpmul.c b/mpmul.c
index 46f7b72..0b597f4 100644 (file)
--- a/mpmul.c
+++ b/mpmul.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mpmul.c,v 1.1 2000/07/01 11:21:39 mdw Exp $
+ * $Id: mpmul.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Multiply many small numbers together
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mpmul.c,v $
- * Revision 1.1  2000/07/01 11:21:39  mdw
- * New interface for computing products of many (small) integers.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mp.h"
@@ -86,14 +78,14 @@ void mpmul_add(mpmul *b, mp *x)
   }
 
   if (i > HWM) {
-    while (i > LWM) {
+    while (i > LWM || (i > 0 && MP_LEN(b->v[i - 1]) <= MP_LEN(x))) {
       i--;
       x = mp_mul(x, x, b->v[i]);
       MP_DROP(b->v[i]);
     }
   }
 
-  b->v[i] = x;
+  b->v[i++] = x;
   b->i = i;
 }
 
@@ -146,4 +138,41 @@ mp *mp_factorial(unsigned long i)
   return (mpmul_done(&b));
 }
 
+/*----- Test rig ----------------------------------------------------------*/
+
+#ifdef TEST_RIG
+
+#include <mLib/testrig.h>
+
+static int vfact(dstr *v)
+{
+  unsigned long x = *(unsigned long *)v[0].buf;
+  mp *fx = *(mp **)v[1].buf;
+  mp *y = mp_factorial(x);
+  int ok = 1;
+  if (!MP_EQ(fx, y)) {
+    fprintf(stderr, "factorial failed\n");
+    MP_FPRINTF(stderr, (stderr, "%lu! = ", x), fx);
+    MP_EPRINT("result", y);
+    ok = 0;
+  }
+  mp_drop(fx);
+  mp_drop(y);
+  assert(mparena_count(MPARENA_GLOBAL) == 0);
+  return (ok);
+}
+
+static test_chunk tests[] = {
+  { "factorial", vfact, { &type_ulong, &type_mp, 0 } },
+  { 0, 0, { 0 } }
+};
+
+int main(int argc, char *argv[])
+{
+  test_run(argc, argv, tests, SRCDIR "/tests/mp");
+  return (0);
+}
+
+#endif
+
 /*----- That's all, folks -------------------------------------------------*/