[Guile-commits] 24/69: Implement scm_logxor with new integer library

[Andy Wingo]

wingo pushed a commit to branch wip-inline-digits
in repository guile.

commit 84a400635ae2518d3f82035dfec23d8aae5d6a5d
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Sun Dec 19 10:45:12 2021 +0100

    Implement scm_logxor with new integer library
    
    * libguile/integers.c (scm_integer_logxor_ii, scm_integer_logxor_zi)
    (scm_integer_logxor_zz): New internal functions.
    * libguile/integers.h: Declare the new internal functions.
    * libguile/numbers.c (scm_logxor): Use new internal functions.
---
 libguile/integers.c | 31 +++++++++++++++++++++++++++++++
 libguile/integers.h |  4 ++++
 libguile/numbers.c  | 36 ++++--------------------------------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/libguile/integers.c b/libguile/integers.c
index 816a49d93..174e42e18 100644
--- a/libguile/integers.c
+++ b/libguile/integers.c
@@ -1958,3 +1958,34 @@ scm_integer_logior_zz (SCM x, SCM y)
   scm_remember_upto_here_2 (x, y);
   return take_mpz (result);
 }
+
+SCM
+scm_integer_logxor_ii (scm_t_inum x, scm_t_inum y)
+{
+  return SCM_I_MAKINUM (x ^ y);
+}
+
+SCM
+scm_integer_logxor_zi (SCM x, scm_t_inum y)
+{
+  mpz_t result, zx, zy;
+  mpz_init (result);
+  alias_bignum_to_mpz (scm_bignum (x), zx);
+  mpz_init_set_si (zy, y);
+  mpz_xor (result, zy, zx);
+  scm_remember_upto_here_1 (x);
+  mpz_clear (zy);
+  return take_mpz (result);
+}
+
+SCM
+scm_integer_logxor_zz (SCM x, SCM y)
+{
+  mpz_t result, zx, zy;
+  mpz_init (result);
+  alias_bignum_to_mpz (scm_bignum (x), zx);
+  alias_bignum_to_mpz (scm_bignum (y), zy);
+  mpz_xor (result, zy, zx);
+  scm_remember_upto_here_2 (x, y);
+  return take_mpz (result);
+}
diff --git a/libguile/integers.h b/libguile/integers.h
index d4f977c4e..9fa41d914 100644
--- a/libguile/integers.h
+++ b/libguile/integers.h
@@ -140,6 +140,10 @@ SCM_INTERNAL SCM scm_integer_logior_ii (scm_t_inum x, 
scm_t_inum y);
 SCM_INTERNAL SCM scm_integer_logior_zi (SCM x, scm_t_inum y);
 SCM_INTERNAL SCM scm_integer_logior_zz (SCM x, SCM y);
 
+SCM_INTERNAL SCM scm_integer_logxor_ii (scm_t_inum x, scm_t_inum y);
+SCM_INTERNAL SCM scm_integer_logxor_zi (SCM x, scm_t_inum y);
+SCM_INTERNAL SCM scm_integer_logxor_zz (SCM x, SCM y);
+
 
 
 #endif  /* SCM_INTEGERS_H */
diff --git a/libguile/numbers.c b/libguile/numbers.c
index ae904647c..77b2e0753 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -3065,8 +3065,6 @@ SCM_DEFINE (scm_i_logxor, "logxor", 0, 2, 1,
 SCM scm_logxor (SCM n1, SCM n2)
 #define FUNC_NAME s_scm_logxor
 {
-  scm_t_inum nn1;
-
   if (SCM_UNBNDP (n2))
     {
       if (SCM_UNBNDP (n1))
@@ -3079,45 +3077,19 @@ SCM scm_logxor (SCM n1, SCM n2)
 
   if (SCM_I_INUMP (n1))
     {
-      nn1 = SCM_I_INUM (n1);
       if (SCM_I_INUMP (n2))
-       {
-         scm_t_inum nn2 = SCM_I_INUM (n2);
-         return SCM_I_MAKINUM (nn1 ^ nn2);
-       }
+        return scm_integer_logxor_ii (SCM_I_INUM (n1), SCM_I_INUM (n2));
       else if (SCM_BIGP (n2))
-       {
-       intbig:
-         {
-           SCM result_z = scm_i_mkbig ();
-           mpz_t nn1_z;
-           mpz_init_set_si (nn1_z, nn1);
-           mpz_xor (SCM_I_BIG_MPZ (result_z), nn1_z, SCM_I_BIG_MPZ (n2));
-           scm_remember_upto_here_1 (n2);
-           mpz_clear (nn1_z);
-           return scm_i_normbig (result_z);
-         }
-       }
+        return scm_integer_logxor_zi (n2, SCM_I_INUM (n1));
       else
        SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
     }
   else if (SCM_BIGP (n1))
     {
       if (SCM_I_INUMP (n2))
-       {
-         SCM_SWAP (n1, n2);
-         nn1 = SCM_I_INUM (n1);
-         goto intbig;
-       }
+        return scm_integer_logxor_zi (n1, SCM_I_INUM (n2));
       else if (SCM_BIGP (n2))
-       {
-         SCM result_z = scm_i_mkbig ();
-         mpz_xor (SCM_I_BIG_MPZ (result_z),
-                  SCM_I_BIG_MPZ (n1),
-                  SCM_I_BIG_MPZ (n2));
-         scm_remember_upto_here_2 (n1, n2);
-         return scm_i_normbig (result_z);
-       }
+        return scm_integer_logxor_zz (n1, n2);
       else
        SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
     }