X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/70b904c575877c683e6c79cac4fbf7c6d89d0bde..95ccefe3ce59a0773f915aca6948d5b6f1f7c882:/mpint.c

diff --git a/mpint.c b/mpint.c
index de3ed8b..7c1b8cc 100644
--- a/mpint.c
+++ b/mpint.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mpint.c,v 1.1 1999/11/25 11:38:31 mdw Exp $
+ * $Id: mpint.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * Conversion between MPs and standard C integers
  *
  * (c) 1999 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: mpint.c,v $
- * Revision 1.1  1999/11/25 11:38:31  mdw
- * Support for conversions between MPs and C integers.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mpint.h"
@@ -53,6 +45,7 @@ FROM(short, short)
 FROM(ushort, unsigned short)
 FROM(int, int)
 FROM(uint, unsigned)
+FROM(uint32, uint32)
 FROM(long, long)
 FROM(ulong, unsigned long)
 
@@ -72,6 +65,7 @@ TO(short, short, SHRT_MAX)
 TO(ushort, unsigned short, USHRT_MAX)
 TO(int, int, INT_MAX)
 TO(uint, unsigned, UINT_MAX)
+TO(uint32, uint32, 0xffffffff)
 TO(long, long, LONG_MAX)
 TO(ulong, unsigned long, ULONG_MAX)
 
@@ -85,14 +79,14 @@ TO(ulong, unsigned long, ULONG_MAX)
 
 static int fromuint(dstr *v)
 {
-  unsigned i = *(unsigned *)v[0].buf;
+  unsigned long i = *(unsigned long *)v[0].buf;
   mp *m = *(mp **)v[1].buf;
   mp *d = mp_fromuint(MP_NEW, i);
   int ok = 1;
 
-  if (MP_CMP(d, !=, m)) {
+  if (!MP_EQ(d, m)) {
     fputs("\n*** fromint failed.\n", stderr);
-    fprintf(stderr, "i = %u", i);
+    fprintf(stderr, "i = %lu", i);
     fputs("\nexpect = ", stderr); mp_writefile(m, stderr, 10);
     fputs("\nresult = ", stderr); mp_writefile(d, stderr, 10);
     fputc('\n', stderr);
@@ -101,19 +95,20 @@ static int fromuint(dstr *v)
 
   mp_drop(m);
   mp_drop(d);
+  assert(mparena_count(MPARENA_GLOBAL) == 0);
   return (ok);
 }
 
 static int fromint(dstr *v)
 {
-  int i = *(int *)v[0].buf;
+  long i = *(long *)v[0].buf;
   mp *m = *(mp **)v[1].buf;
   mp *d = mp_fromint(MP_NEW, i);
   int ok = 1;
 
-  if (MP_CMP(d, !=, m)) {
+  if (!MP_EQ(d, m)) {
     fputs("\n*** fromint failed.\n", stderr);
-    fprintf(stderr, "i = %i", i);
+    fprintf(stderr, "i = %li", i);
     fputs("\nexpect = ", stderr); mp_writefile(m, stderr, 10);
     fputs("\nresult = ", stderr); mp_writefile(d, stderr, 10);
     fputc('\n', stderr);
@@ -122,50 +117,53 @@ static int fromint(dstr *v)
 
   mp_drop(m);
   mp_drop(d);
+  assert(mparena_count(MPARENA_GLOBAL) == 0);
   return (ok);
 }
 
 static int touint(dstr *v)
 {
   mp *m = *(mp **)v[0].buf;
-  unsigned i = *(unsigned *)v[1].buf;
+  unsigned long i = *(unsigned long *)v[1].buf;
   unsigned j = mp_touint(m);
   int ok = 1;
 
-  if (i != j) {
+  if ((unsigned)i != j) {
     fputs("\n*** touint failed.\n", stderr);
     fputs("m = ", stderr); mp_writefile(m, stderr, 10);
-    fprintf(stderr, "\nexpect = %u; result = %u\n", i, j);
+    fprintf(stderr, "\nexpect = %lu; result = %u\n", i, j);
     ok = 0;
   }
 
   mp_drop(m);
+  assert(mparena_count(MPARENA_GLOBAL) == 0);
   return (ok);
 }
 
 static int toint(dstr *v)
 {
   mp *m = *(mp **)v[0].buf;
-  int i = *(int *)v[1].buf;
+  long i = *(long *)v[1].buf;
   int j = mp_toint(m);
   int ok = 1;
 
   if (i != j) {
     fputs("\n*** toint failed.\n", stderr);
     fputs("m = ", stderr); mp_writefile(m, stderr, 10);
-    fprintf(stderr, "\nexpect = %i; result = %i\n", i, j);
+    fprintf(stderr, "\nexpect = %li; result = %i\n", i, j);
     ok = 0;
   }
 
   mp_drop(m);
+  assert(mparena_count(MPARENA_GLOBAL) == 0);
   return (ok);
 }
 
 static test_chunk tests[] = {
-  { "fromuint", fromuint, { &type_int, &type_mp, 0 } },
-  { "fromint", fromint, { &type_int, &type_mp, 0 } },
-  { "touint", touint, { &type_mp, &type_int, 0 } },
-  { "toint", toint, { &type_mp, &type_int, 0 } },
+  { "fromuint", fromuint, { &type_ulong, &type_mp, 0 } },
+  { "fromint", fromint, { &type_long, &type_mp, 0 } },
+  { "touint", touint, { &type_mp, &type_ulong, 0 } },
+  { "toint", toint, { &type_mp, &type_long, 0 } },
   { 0, 0, { 0 } }
 };