=================================================================== RCS file: /home/cvs/OpenXM_contrib/gmp/mpn/generic/Attic/scan1.c,v retrieving revision 1.1 retrieving revision 1.1.1.3 diff -u -p -r1.1 -r1.1.1.3 --- OpenXM_contrib/gmp/mpn/generic/Attic/scan1.c 2000/01/10 15:35:23 1.1 +++ OpenXM_contrib/gmp/mpn/generic/Attic/scan1.c 2003/08/25 16:06:20 1.1.1.3 @@ -1,20 +1,20 @@ /* mpn_scan1 -- Scan from a given bit position for the next set bit. -Copyright (C) 1994, 1996 Free Software Foundation, Inc. +Copyright 1994, 1996, 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. */ @@ -28,18 +28,12 @@ MA 02111-1307, USA. */ 2. Bit index should be 'unsigned'? Argument constraints: - 1. U must sooner ot later have a limb != 0. + 1. U must sooner or later have a limb != 0. */ unsigned long int -#if __STDC__ mpn_scan1 (register mp_srcptr up, register unsigned long int starting_bit) -#else -mpn_scan1 (up, starting_bit) - register mp_srcptr up; - register unsigned long int starting_bit; -#endif { mp_size_t starting_word; mp_limb_t alimb; @@ -47,16 +41,16 @@ mpn_scan1 (up, starting_bit) mp_srcptr p; /* Start at the word implied by STARTING_BIT. */ - starting_word = starting_bit / BITS_PER_MP_LIMB; + starting_word = starting_bit / GMP_NUMB_BITS; p = up + starting_word; alimb = *p++; /* Mask off any bits before STARTING_BIT in the first limb. */ - alimb &= - (mp_limb_t) 1 << (starting_bit % BITS_PER_MP_LIMB); + alimb &= - (mp_limb_t) 1 << (starting_bit % GMP_NUMB_BITS); while (alimb == 0) alimb = *p++; - count_leading_zeros (cnt, alimb & -alimb); - return (p - up) * BITS_PER_MP_LIMB - 1 - cnt; + count_trailing_zeros (cnt, alimb); + return (p - up - 1) * GMP_NUMB_BITS + cnt; }