===================================================================
RCS file: /home/cvs/OpenXM_contrib/gmp/mpf/Attic/cmp_si.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.1 -r1.1.1.3
--- OpenXM_contrib/gmp/mpf/Attic/cmp_si.c	2000/01/10 15:35:22	1.1.1.1
+++ OpenXM_contrib/gmp/mpf/Attic/cmp_si.c	2003/08/25 16:06:35	1.1.1.3
@@ -1,20 +1,21 @@
 /* mpf_cmp_si -- Compare a float with a signed integer.
 
-Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+Copyright 1993, 1994, 1995, 1999, 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,30 +24,25 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 
 int
-#if __STDC__
-mpf_cmp_si (mpf_srcptr u, long int vslimb)
-#else
-mpf_cmp_si (u, vslimb)
-     mpf_srcptr u;
-     long int vslimb;
-#endif
+mpf_cmp_si (mpf_srcptr u, long int vval)
 {
   mp_srcptr up;
   mp_size_t usize;
   mp_exp_t uexp;
+  mp_limb_t ulimb;
   int usign;
 
   uexp = u->_mp_exp;
   usize = u->_mp_size;
 
   /* 1. Are the signs different?  */
-  if ((usize < 0) == (vslimb < 0)) /* don't use xor, type size may differ */
+  if ((usize < 0) == (vval < 0)) /* don't use xor, type size may differ */
     {
       /* U and V are both non-negative or both negative.  */
       if (usize == 0)
-	/* vslimb >= 0 */
-	return -(vslimb != 0);
-      if (vslimb == 0)
+	/* vval >= 0 */
+	return -(vval != 0);
+      if (vval == 0)
 	/* usize >= 0 */
 	return usize != 0;
       /* Fall out.  */
@@ -60,38 +56,53 @@ mpf_cmp_si (u, vslimb)
   /* U and V have the same sign and are both non-zero.  */
 
   usign = usize >= 0 ? 1 : -1;
+  usize = ABS (usize);
+  vval = ABS (vval);
 
   /* 2. Are the exponents different (V's exponent == 1)?  */
+#if GMP_NAIL_BITS != 0
+  if (uexp > 1 + (vval > GMP_NUMB_MAX))
+    return usign;
+  if (uexp < 1 + (vval > GMP_NUMB_MAX))
+    return -usign;
+#else
   if (uexp > 1)
     return usign;
   if (uexp < 1)
     return -usign;
+#endif
 
-  usize = ABS (usize);
-  vslimb = ABS (vslimb);
-
   up = u->_mp_d;
 
-#define STRICT_MPF_NORMALIZATION 0
-#if ! STRICT_MPF_NORMALIZATION
-  /* Ignore zeroes at the low end of U and V.  */
+  ulimb = up[usize - 1];
+#if GMP_NAIL_BITS != 0
+  if (usize >= 2 && uexp == 2)
+    {
+      if ((ulimb >> GMP_NAIL_BITS) != 0)
+	return 1;
+      ulimb = (ulimb << GMP_NUMB_BITS) | up[usize - 2];
+      usize--;
+    }
+#endif
+  usize--;
+
+  /* 3. Compare the most significant mantissa limb with V.  */
+  if (ulimb > (unsigned long) vval)
+    return usign;
+  else if (ulimb < (unsigned long) vval)
+    return -usign;
+
+  /* Ignore zeroes at the low end of U.  */
   while (*up == 0)
     {
       up++;
       usize--;
     }
-#endif
 
-  /* 3. Now, if the number of limbs are different, we have a difference
+  /* 4. Now, if the number of limbs are different, we have a difference
      since we have made sure the trailing limbs are not zero.  */
-  if (usize > 1)
+  if (usize > 0)
     return usign;
-
-  /* 4. Compare the mantissas.  */
-  if (*up > vslimb)
-    return usign;
-  else if (*up < vslimb)
-    return -usign;
 
   /* Wow, we got zero even if we tried hard to avoid it.  */
   return 0;