===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpf/Attic/mul_2exp.c,v
retrieving revision 1.1
retrieving revision 1.1.1.3
diff -u -p -r1.1 -r1.1.1.3
--- OpenXM_contrib/gmp/mpf/Attic/mul_2exp.c	2000/01/10 15:35:22	1.1
+++ OpenXM_contrib/gmp/mpf/Attic/mul_2exp.c	2003/08/25 16:06:35	1.1.1.3
@@ -1,20 +1,20 @@
 /* mpf_mul_2exp -- Multiply a float by 2^n.
 
-Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright 1993, 1994, 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
 option) any later version.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
-You should have received a copy of the GNU Library General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
@@ -23,14 +23,7 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 
 void
-#if __STDC__
 mpf_mul_2exp (mpf_ptr r, mpf_srcptr u, unsigned long int exp)
-#else
-mpf_mul_2exp (r, u, exp)
-     mpf_ptr r;
-     mpf_srcptr u;
-     unsigned long int exp;
-#endif
 {
   mp_srcptr up;
   mp_ptr rp = r->_mp_d;
@@ -51,39 +44,44 @@ mpf_mul_2exp (r, u, exp)
   abs_usize = ABS (usize);
   up = u->_mp_d;
 
-  if (abs_usize > prec)
+  if (exp % GMP_NUMB_BITS == 0)
     {
-      up += abs_usize - prec;
-      abs_usize = prec;
-    }
-
-  if (exp % BITS_PER_MP_LIMB == 0)
-    {
+      prec++;			/* retain more precision here as we don't need
+				   to account for carry-out here */
+      if (abs_usize > prec)
+	{
+	  up += abs_usize - prec;
+	  abs_usize = prec;
+	}
       if (rp != up)
-	MPN_COPY (rp, up, abs_usize);
-      r->_mp_size = usize >= 0 ? abs_usize : -abs_usize;
-      r->_mp_exp = uexp + exp / BITS_PER_MP_LIMB;
+	MPN_COPY_INCR (rp, up, abs_usize);
+      r->_mp_exp = uexp + exp / GMP_NUMB_BITS;
     }
   else
     {
       mp_limb_t cy_limb;
-      if (r != u)
+      mp_size_t adj;
+      if (abs_usize > prec)
 	{
-	  cy_limb = mpn_lshift (rp, up, abs_usize, exp % BITS_PER_MP_LIMB);
-	  rp[abs_usize] = cy_limb;
-	  cy_limb = cy_limb != 0;
+	  up += abs_usize - prec;
+	  abs_usize = prec;
+	  /* Use mpn_rshift since mpn_lshift operates downwards, and we
+	     therefore would clobber part of U before using that part, in case
+	     R is the same variable as U.  */
+	  cy_limb = mpn_rshift (rp + 1, up, abs_usize,
+				GMP_NUMB_BITS - exp % GMP_NUMB_BITS);
+	  rp[0] = cy_limb;
+	  adj = rp[abs_usize] != 0;
 	}
       else
 	{
-	  /* Use mpn_rshift since mpn_lshift operates downwards, and we
-	     therefore would clobber part of U before using that part.  */
-	  cy_limb = mpn_rshift (rp + 1, up, abs_usize, -exp % BITS_PER_MP_LIMB);
-	  rp[0] = cy_limb;
-	  cy_limb = rp[abs_usize] != 0;
+	  cy_limb = mpn_lshift (rp, up, abs_usize, exp % GMP_NUMB_BITS);
+	  rp[abs_usize] = cy_limb;
+	  adj = cy_limb != 0;
 	}
 
-      abs_usize += cy_limb;
-      r->_mp_size = usize >= 0 ? abs_usize : -abs_usize;
-      r->_mp_exp = uexp + exp / BITS_PER_MP_LIMB + cy_limb;
+      abs_usize += adj;
+      r->_mp_exp = uexp + exp / GMP_NUMB_BITS + adj;
     }
+  r->_mp_size = usize >= 0 ? abs_usize : -abs_usize;
 }