mpz/?or.c: Use mpn_ logic everywhere.

1 files changed, 11 insertions, 14 deletions

diff --git a/mpz/xor.c b/mpz/xor.c
index affd27d2a..e3dc2352f 100644
--- a/mpz/xor.c
+++ b/mpz/xor.c
@@ -1,7 +1,7 @@
 /* mpz_xor -- Logical xor.
 
-Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2005 Free Software
-Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2005, 2012 Free
+Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
@@ -56,8 +56,8 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	      if (res_ptr != op1_ptr)
 		MPN_COPY (res_ptr + op2_size, op1_ptr + op2_size,
 			  op1_size - op2_size);
-	      for (i = op2_size - 1; i >= 0; i--)
-		res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	      if (LIKELY (op2_size != 0))
+		mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op2_size);
 	      res_size = op1_size;
 	    }
 	  else
@@ -73,8 +73,8 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	      if (res_ptr != op2_ptr)
 		MPN_COPY (res_ptr + op1_size, op2_ptr + op1_size,
 			  op2_size - op1_size);
-	      for (i = op1_size - 1; i >= 0; i--)
-		res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	      if (LIKELY (op1_size != 0))
+		mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op1_size);
 	      res_size = op2_size;
 	    }
 
@@ -123,16 +123,14 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    {
 	      MPN_COPY (res_ptr + op2_size, op1_ptr + op2_size,
 			op1_size - op2_size);
-	      for (i = op2_size - 1; i >= 0; i--)
-		res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	      mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op2_size);
 	      res_size = op1_size;
 	    }
 	  else
 	    {
 	      MPN_COPY (res_ptr + op1_size, op2_ptr + op1_size,
 			op2_size - op1_size);
-	      for (i = op1_size - 1; i >= 0; i--)
-		res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	      mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op1_size);
 	      res_size = op2_size;
 	    }
 
@@ -177,15 +175,14 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
     if (op1_size > op2_size)
       {
 	MPN_COPY (res_ptr + op2_size, op1_ptr + op2_size, op1_size - op2_size);
-	for (i = op2_size - 1; i >= 0; i--)
-	  res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op2_size);
 	res_size = op1_size;
       }
     else
       {
 	MPN_COPY (res_ptr + op1_size, op2_ptr + op1_size, op2_size - op1_size);
-	for (i = op1_size - 1; i >= 0; i--)
-	  res_ptr[i] = op1_ptr[i] ^ op2_ptr[i];
+	if (LIKELY (op1_size != 0))
+	  mpn_xor_n (res_ptr, op1_ptr, op2_ptr, op1_size);
 	res_size = op2_size;
       }