add-mp-set-intptr patch

* mpi/mpi.c (mp_set_intptr, mp_get_intptr): New functions.

* mpi/mpi.h (mp_set_intptr, mp_get_intptr): Declared.

2 files changed, 55 insertions, 0 deletions

diff --git a/mpi/mpi.c b/mpi/mpi.c
index daee4dbb..c36ef8ba 100644
--- a/mpi/mpi.c
+++ b/mpi/mpi.c
@@ -526,6 +526,59 @@ mp_err mp_set_int(mp_int *mp, long z)
 
 /* }}} */
 
+mp_err mp_set_intptr(mp_int *mp, int_ptr_t z)
+{
+  int_ptr_t v = z > 0 ? z : -z;
+
+  if (sizeof z > sizeof (mp_digit)) {
+    int            ix, shift;
+    const int      nd = (sizeof v + sizeof (mp_digit) - 1) / sizeof (mp_digit);
+
+    ARGCHK(mp != NULL, MP_BADARG);
+
+    mp_zero(mp);
+
+    if(z == 0)
+      return MP_OKAY;  /* shortcut for zero */
+
+    s_mp_grow(mp, nd);
+
+    USED(mp) = nd;
+
+    for (ix = 0, shift = 0; ix < nd; ix++, shift += MP_DIGIT_BIT)
+    {
+	DIGIT(mp, ix) = (v >> shift) & MP_DIGIT_MAX;
+    }
+  } else {
+    mp_set(mp, v);
+  }
+
+  if(z < 0)
+    SIGN(mp) = MP_NEG;
+
+  return MP_OKAY;
+}
+
+/*
+ * No checks here: assumes that the mp is in range!
+ */
+mp_err mp_get_intptr(mp_int *mp, int_ptr_t *z)
+{
+  int_ptr_t out = 0;
+
+#if MP_DIGIT_SIZE < SIZEOF_PTR
+  int ix;
+  int nd = USED(mp);
+  for (ix = 0; ix < nd; ix++, out <<= MP_DIGIT_BIT)
+    out = DIGIT(mp, ix);
+#else
+  out = DIGIT(mp, 0);
+#endif
+
+  *z = (SIGN(mp) == MP_NEG) ? -out : out;
+  return MP_OKAY;
+}
+
 /*------------------------------------------------------------------------*/
 /* {{{ Digit arithmetic */
 
diff --git a/mpi/mpi.h b/mpi/mpi.h
index c87df54b..c653672e 100644
--- a/mpi/mpi.h
+++ b/mpi/mpi.h
@@ -94,6 +94,8 @@ void   mp_clear_array(mp_int mp[], int count);
 void   mp_zero(mp_int *mp);
 void   mp_set(mp_int *mp, mp_digit d);
 mp_err mp_set_int(mp_int *mp, long z);
+mp_err mp_set_intptr(mp_int *mp, int_ptr_t z);
+mp_err mp_get_intptr(mp_int *mp, int_ptr_t *z);
 
 /*------------------------------------------------------------------------*/
 /* Single digit arithmetic                                                */