=================================================================== RCS file: /home/cvs/OpenXM_contrib/gmp/mpf/Attic/cmp_si.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -p -r1.1.1.1 -r1.1.1.2 --- 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 2000/09/09 14:13:13 1.1.1.2 @@ -1,20 +1,20 @@ /* mpf_cmp_si -- Compare a float with a signed integer. -Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995, 1999, 2000 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. */ @@ -72,9 +72,15 @@ mpf_cmp_si (u, vslimb) up = u->_mp_d; + /* 3. Compare the most significant mantissa limb with V. */ + if (up[usize - 1] > (unsigned long) vslimb) + return usign; + else if (up[usize - 1] < (unsigned long) vslimb) + return -usign; + #define STRICT_MPF_NORMALIZATION 0 #if ! STRICT_MPF_NORMALIZATION - /* Ignore zeroes at the low end of U and V. */ + /* Ignore zeroes at the low end of U. */ while (*up == 0) { up++; @@ -82,16 +88,10 @@ mpf_cmp_si (u, vslimb) } #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) 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;