===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpz/Attic/tdiv_r_ui.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.2 -r1.1.1.3
--- OpenXM_contrib/gmp/mpz/Attic/tdiv_r_ui.c	2000/09/09 14:13:00	1.1.1.2
+++ OpenXM_contrib/gmp/mpz/Attic/tdiv_r_ui.c	2003/08/25 16:06:34	1.1.1.3
@@ -1,7 +1,8 @@
 /* mpz_tdiv_r_ui(rem, dividend, divisor_limb)
    -- Set REM to DIVDEND mod DIVISOR_LIMB.
 
-Copyright (C) 1991, 1993, 1994, 1996, 1998 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 1998, 2001, 2002 Free Software Foundation,
+Inc.
 
 This file is part of the GNU MP Library.
 
@@ -24,40 +25,67 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 
 unsigned long int
-#if __STDC__
 mpz_tdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
-#else
-mpz_tdiv_r_ui (rem, dividend, divisor)
-     mpz_ptr rem;
-     mpz_srcptr dividend;
-     unsigned long int divisor;
-#endif
 {
-  mp_size_t dividend_size;
-  mp_size_t size;
-  mp_limb_t remainder_limb;
+  mp_size_t ns, nn;
+  mp_ptr np;
+  mp_limb_t rl;
 
   if (divisor == 0)
     DIVIDE_BY_ZERO;
 
-  dividend_size = dividend->_mp_size;
-  size = ABS (dividend_size);
+  ns = SIZ(dividend);
+  if (ns == 0)
+    {
+      SIZ(rem) = 0;
+      return 0;
+    }
 
-  /* No need for temporary allocation and copying if QUOT == DIVIDEND as
-     the divisor is just one limb, and thus no intermediate remainders
-     need to be stored.  */
+  nn = ABS(ns);
+  np = PTR(dividend);
+#if GMP_NAIL_BITS != 0
+  if (divisor > GMP_NUMB_MAX)
+    {
+      mp_limb_t dp[2];
+      mp_ptr rp, qp;
+      mp_size_t rn;
+      TMP_DECL (mark);
 
-  remainder_limb = mpn_mod_1 (dividend->_mp_d, size, (mp_limb_t) divisor);
+      if (nn == 1)		/* tdiv_qr requirements; tested above for 0 */
+	{
+	  rl = np[0];
+	  SIZ(rem) = ns >= 0 ? 1 : -1;
+	  PTR(rem)[0] = rl;
+	  return rl;
+	}
 
-  if (remainder_limb == 0)
-    rem->_mp_size = 0;
+      MPZ_REALLOC (rem, 2);
+      rp = PTR(rem);
+
+      TMP_MARK (mark);
+      dp[0] = divisor & GMP_NUMB_MASK;
+      dp[1] = divisor >> GMP_NUMB_BITS;
+      qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
+      mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
+      TMP_FREE (mark);
+      rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
+      rn = 2 - (rp[1] == 0);  rn -= (rp[rn - 1] == 0);
+      SIZ(rem) = ns >= 0 ? rn : -rn;
+    }
   else
+#endif
     {
-      /* Store the single-limb remainder.  We don't check if there's space
-	 for just one limb, since no function ever makes zero space.  */
-      rem->_mp_size = dividend_size >= 0 ? 1 : -1;
-      rem->_mp_d[0] = remainder_limb;
+      rl = mpn_mod_1 (np, nn, (mp_limb_t) divisor);
+      if (rl == 0)
+	SIZ(rem) = 0;
+      else
+	{
+	  /* Store the single-limb remainder.  We don't check if there's space
+	     for just one limb, since no function ever makes zero space.  */
+	  SIZ(rem) = ns >= 0 ? 1 : -1;
+	  PTR(rem)[0] = rl;
+	}
     }
 
-  return remainder_limb;
+  return rl;
 }