Re-read only necessary source pointers after reallocation. Misc cleanup.

1 files changed, 26 insertions, 29 deletions

diff --git a/mpz/xor.c b/mpz/xor.c
index f828bf671..18edd8129 100644
--- a/mpz/xor.c
+++ b/mpz/xor.c
@@ -32,12 +32,12 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
   TMP_DECL;
 
   TMP_MARK;
-  op1_size = op1->_mp_size;
-  op2_size = op2->_mp_size;
+  op1_size = SIZ(op1);
+  op2_size = SIZ(op2);
 
-  op1_ptr = op1->_mp_d;
-  op2_ptr = op2->_mp_d;
-  res_ptr = res->_mp_d;
+  op1_ptr = PTR(op1);
+  op2_ptr = PTR(op2);
+  res_ptr = PTR(res);
 
   if (op1_size >= 0)
     {
@@ -45,12 +45,12 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	{
 	  if (op1_size >= op2_size)
 	    {
-	      if (res->_mp_alloc < op1_size)
+	      if (ALLOC(res) < op1_size)
 		{
 		  _mpz_realloc (res, op1_size);
-		  op1_ptr = op1->_mp_d;
-		  op2_ptr = op2->_mp_d;
-		  res_ptr = res->_mp_d;
+		  /* No overlapping possible: op1_ptr = PTR(op1); */
+		  op2_ptr = PTR(op2);
+		  res_ptr = PTR(res);
 		}
 
 	      if (res_ptr != op1_ptr)
@@ -62,12 +62,12 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    }
 	  else
 	    {
-	      if (res->_mp_alloc < op2_size)
+	      if (ALLOC(res) < op2_size)
 		{
 		  _mpz_realloc (res, op2_size);
-		  op1_ptr = op1->_mp_d;
-		  op2_ptr = op2->_mp_d;
-		  res_ptr = res->_mp_d;
+		  op1_ptr = PTR(op1);
+		  /* No overlapping possible: op2_ptr = PTR(op2); */
+		  res_ptr = PTR(res);
 		}
 
 	      if (res_ptr != op2_ptr)
@@ -79,7 +79,7 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    }
 
 	  MPN_NORMALIZE (res_ptr, res_size);
-	  res->_mp_size = res_size;
+	  SIZ(res) = res_size;
 	  return;
 	}
       else /* op2_size < 0 */
@@ -103,22 +103,20 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 
 	  /* Possible optimization: Decrease mpn_sub precision,
 	     as we won't use the entire res of both.  */
-	  opx = (mp_ptr) TMP_ALLOC (op1_size * BYTES_PER_MP_LIMB);
+	  opx = TMP_ALLOC_LIMBS (op1_size);
 	  mpn_sub_1 (opx, op1_ptr, op1_size, (mp_limb_t) 1);
 	  op1_ptr = opx;
 
-	  opx = (mp_ptr) TMP_ALLOC (op2_size * BYTES_PER_MP_LIMB);
+	  opx = TMP_ALLOC_LIMBS (op2_size);
 	  mpn_sub_1 (opx, op2_ptr, op2_size, (mp_limb_t) 1);
 	  op2_ptr = opx;
 
 	  res_alloc = MAX (op1_size, op2_size);
-	  if (res->_mp_alloc < res_alloc)
+	  if (ALLOC(res) < res_alloc)
 	    {
 	      _mpz_realloc (res, res_alloc);
-	      res_ptr = res->_mp_d;
-	      /* Don't re-read OP1_PTR and OP2_PTR.  They point to
-		 temporary space--never to the space RES->_mp_d used
-		 to point to before reallocation.  */
+	      res_ptr = PTR(res);
+	      /* op1_ptr and op2_ptr point to temporary space.  */
 	    }
 
 	  if (op1_size > op2_size)
@@ -139,7 +137,7 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    }
 
 	  MPN_NORMALIZE (res_ptr, res_size);
-	  res->_mp_size = res_size;
+	  SIZ(res) = res_size;
 	  TMP_FREE;
 	  return;
 	}
@@ -163,18 +161,17 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 
     op2_size = -op2_size;
 
-    opx = (mp_ptr) TMP_ALLOC (op2_size * BYTES_PER_MP_LIMB);
+    opx = TMP_ALLOC_LIMBS (op2_size);
     mpn_sub_1 (opx, op2_ptr, op2_size, (mp_limb_t) 1);
     op2_ptr = opx;
 
     res_alloc = MAX (op1_size, op2_size) + 1;
-    if (res->_mp_alloc < res_alloc)
+    if (ALLOC(res) < res_alloc)
       {
 	_mpz_realloc (res, res_alloc);
-	op1_ptr = op1->_mp_d;
-	res_ptr = res->_mp_d;
-	/* Don't re-read OP2_PTR.  It points to temporary space--never
-	   to the space RES->_mp_d used to point to before reallocation.  */
+	op1_ptr = PTR(op1);
+	/* op2_ptr points to temporary space.  */
+	res_ptr = PTR(res);
       }
 
     if (op1_size > op2_size)
@@ -200,7 +197,7 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
       }
 
     MPN_NORMALIZE (res_ptr, res_size);
-    res->_mp_size = -res_size;
+    SIZ(res) = -res_size;
     TMP_FREE;
   }
 }