Extend infrastructure for double_intptr_t.

We support an unsigned version of the type, and add functions
for converting between Lisp values and both types.

* arith.c (bignum_dbl_uipt): New function, unsigned companion
to existing bignum_dbl_ipt.
(c_dbl_num, c_dbl_unum): New functions.

* arith.h (bignum_dbl_uipt, c_dbl_num, c_dbl_unum): Declared.

* configure (superulong_t, SIZEOF_DOUBLE_INTPTR,
DOUBLE_INTPTR_MAX, DOUBLE_INTPTR_MIN, DOUBLE_UINTPTR_MAX,
double_uintptr_t): New definitions going into config.h.

* lib.h (dbl_cnum, dbl_ucnum): New typedefs: double-sized
analogs of cnum and ucnum.

* mpi/mpi.c (mp_set_double_uintptr, mp_get_double_uintptr,
mp_get_double_intptr): New functions.
(s_mp_in_big_range): New static function.
(mp_in_double_intptr_range, mp_in_double_uintptr_range): New
functions.

* mpi/mpi.h (mp_set_double_uintptr,
mp_get_double_intptr, mp_get_double_uintptr,
mp_in_double_intptr_range, mp_in_double_uintptr_range):
Declared.

1 files changed, 47 insertions, 0 deletions

diff --git a/arith.c b/arith.c
index f349b57a..7289836e 100644
--- a/arith.c
+++ b/arith.c
@@ -158,6 +158,13 @@ val bignum_dbl_ipt(double_intptr_t di)
   return n;
 }
 
+val bignum_dbl_uipt(double_uintptr_t dui)
+{
+  val n = make_bignum();
+  mp_set_double_uintptr(mp(n), dui);
+  return n;
+}
+
 #endif
 
 val normalize(val bignum)
@@ -207,6 +214,46 @@ val unum(ucnum u)
   }
 }
 
+#if HAVE_DOUBLE_INTPTR_T
+
+dbl_cnum c_dbl_num(val n)
+{
+  switch (type(n)) {
+  case CHR: case NUM:
+    return coerce(cnum, n) >> TAG_SHIFT;
+  case BGNUM:
+    if (mp_in_double_intptr_range(mp(n))) {
+      double_intptr_t out;
+      mp_get_double_intptr(mp(n), &out);
+      return out;
+    }
+    uw_throwf(error_s, lit("~s is out of signed ~a bit range"),
+              n, num_fast(SIZEOF_DOUBLE_INTPTR * CHAR_BIT), nao);
+  default:
+    type_mismatch(lit("~s is not an integer"), n, nao);
+  }
+}
+
+dbl_ucnum c_dbl_unum(val n)
+{
+  switch (type(n)) {
+  case CHR: case NUM:
+    return coerce(cnum, n) >> TAG_SHIFT;
+  case BGNUM:
+    if (mp_in_double_uintptr_range(mp(n))) {
+      double_uintptr_t out;
+      mp_get_double_uintptr(mp(n), &out);
+      return out;
+    }
+    uw_throwf(error_s, lit("~s is out of unsigned ~a bit range"),
+              n, num_fast(SIZEOF_DOUBLE_INTPTR * CHAR_BIT), nao);
+  default:
+    type_mismatch(lit("~s is not an integer"), n, nao);
+  }
+}
+
+#endif
+
 val bignum_len(val num)
 {
   switch (type(num)) {