mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
80d9be8122
This patch converts various miscellaneous functions definitions in glibc, found with grep and not covered by my previous scripted conversions, from old-style K&R to prototype-style. These changes were made manually. This is not necessarily exhaustive as formatting variants may have prevented my grep from finding some such definitions. Regarding the changes to files from GMP, they may originally have been omitted when removing __STDC__ conditionals because of the files coming from another package, but (a) GMP no longer has __STDC__ conditionals there anyway and (b) we don't try to keep these files verbatim in sync with GMP (and there are licensing differences), so making the change to them in glibc seems reasonable. Tested for x86_64 and x86 (testsuite - this patch affects files containing assertions). * debug/fortify_fail.c (__fortify_fail): Convert to prototype-style function definition. Use internal_function. * libio/genops.c (save_for_backup): Convert to prototype-style function definition. * libio/wgenops.c (save_for_wbackup): Likewise. * login/grantpt.c (grantpt): Likewise. * login/ptsname.c (ptsname): Likewise. (__ptsname_r): Likewise. * login/unlockpt.c (unlockpt): Likewise. * mach/msgserver.c (__mach_msg_server): Likewise. * misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise. (__APPEND (FUNC_PREFIX, ecvt)): Likewise. (__APPEND (FUNC_PREFIX, gcvt)): Likewise. * misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise. (__APPEND (FUNC_PREFIX, ecvt_r)): Likewise. * nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer): Likewise. * nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. Use internal_function. * nptl/pthread_atfork.c (__pthread_atfork): Convert to prototype-style function definition. * nptl/pthread_create.c (__pthread_create_2_1): Likewise. [SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)] (__pthread_create_2_0): Likewise. * nptl/pthread_key_create.c (__pthread_key_create): Likewise. * nptl/register-atfork.c (__register_atfork): Likewise. * posix/glob.c (glob): Likewise. * posix/regcomp.c (re_comp): Likewise. * posix/regexec.c (re_exec): Likewise. * stdlib/add_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/cmp.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/divmod_1.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/divrem.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/lshift.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mod_1.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mul.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mul_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/rshift.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style function definition. (STRTOF): Likewise. * stdlib/strtod_l.c (__STRTOF): Likewise. * stdlib/strtol.c (INTERNAL (strtol)): Likewise. * stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise. (__strtol_l): Likewise. * stdlib/sub_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * string/memrchr.c (MEMRCHR): Convert to prototype-style function definition. * string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__strcasecmp): Convert to prototype-style function definition. * string/strncase.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__strncasecmp): Convert to prototype-style function definition. * sunrpc/pm_getport.c (__libc_rpc_getport): Likewise. * sunrpc/xdr.c (xdr_union): Likewise. * sunrpc/xdr_array.c (xdr_array): Likewise. * sunrpc/xdr_ref.c (xdr_reference): Likewise. * sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise. * sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)): Likewise. * sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix): Likewise. * sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise. * sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64): Likewise. * time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro. (LOCALE_PARAM_PROTO): Likewise. [_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (ut_argument_spec): Remove macro. (ut_argument_spec_iso): Rename to ut_argument_spec. (memcpy_lowcase): Use LOCALE_PARAM in declaration. Convert to prototype-style function definition. (memcpy_uppcase): Likewise. (__strftime_internal): Likewise. (my_strftime): Likewise. * time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro. (LOCALE_PARAM_DECL): Likewise. [_LIBC] (LOCALE_PARAM): Include argument type. (__strptime_internal): Convert to prototype-style function definition. (strptime): Likewise. * wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__wcscasecmp): Convert to prototype-style function definition. * wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__wcsncasecmp): Convert to prototype-style function definition.
190 lines
5.2 KiB
C
190 lines
5.2 KiB
C
/* mpn_mod_1(dividend_ptr, dividend_size, divisor_limb) --
|
|
Divide (DIVIDEND_PTR,,DIVIDEND_SIZE) by DIVISOR_LIMB.
|
|
Return the single-limb remainder.
|
|
There are no constraints on the value of the divisor.
|
|
|
|
Copyright (C) 1991-2015 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 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 Lesser General Public
|
|
License for more details.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <gmp.h>
|
|
#include "gmp-impl.h"
|
|
#include "longlong.h"
|
|
|
|
#ifndef UMUL_TIME
|
|
#define UMUL_TIME 1
|
|
#endif
|
|
|
|
#ifndef UDIV_TIME
|
|
#define UDIV_TIME UMUL_TIME
|
|
#endif
|
|
|
|
/* FIXME: We should be using invert_limb (or invert_normalized_limb)
|
|
here (not udiv_qrnnd). */
|
|
|
|
mp_limb_t
|
|
mpn_mod_1 (mp_srcptr dividend_ptr, mp_size_t dividend_size,
|
|
mp_limb_t divisor_limb)
|
|
{
|
|
mp_size_t i;
|
|
mp_limb_t n1, n0, r;
|
|
mp_limb_t dummy __attribute__ ((unused));
|
|
|
|
/* Botch: Should this be handled at all? Rely on callers? */
|
|
if (dividend_size == 0)
|
|
return 0;
|
|
|
|
/* If multiplication is much faster than division, and the
|
|
dividend is large, pre-invert the divisor, and use
|
|
only multiplications in the inner loop. */
|
|
|
|
/* This test should be read:
|
|
Does it ever help to use udiv_qrnnd_preinv?
|
|
&& Does what we save compensate for the inversion overhead? */
|
|
if (UDIV_TIME > (2 * UMUL_TIME + 6)
|
|
&& (UDIV_TIME - (2 * UMUL_TIME + 6)) * dividend_size > UDIV_TIME)
|
|
{
|
|
int normalization_steps;
|
|
|
|
count_leading_zeros (normalization_steps, divisor_limb);
|
|
if (normalization_steps != 0)
|
|
{
|
|
mp_limb_t divisor_limb_inverted;
|
|
|
|
divisor_limb <<= normalization_steps;
|
|
|
|
/* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB. The
|
|
result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
|
|
most significant bit (with weight 2**N) implicit. */
|
|
|
|
/* Special case for DIVISOR_LIMB == 100...000. */
|
|
if (divisor_limb << 1 == 0)
|
|
divisor_limb_inverted = ~(mp_limb_t) 0;
|
|
else
|
|
udiv_qrnnd (divisor_limb_inverted, dummy,
|
|
-divisor_limb, 0, divisor_limb);
|
|
|
|
n1 = dividend_ptr[dividend_size - 1];
|
|
r = n1 >> (BITS_PER_MP_LIMB - normalization_steps);
|
|
|
|
/* Possible optimization:
|
|
if (r == 0
|
|
&& divisor_limb > ((n1 << normalization_steps)
|
|
| (dividend_ptr[dividend_size - 2] >> ...)))
|
|
...one division less... */
|
|
|
|
for (i = dividend_size - 2; i >= 0; i--)
|
|
{
|
|
n0 = dividend_ptr[i];
|
|
udiv_qrnnd_preinv (dummy, r, r,
|
|
((n1 << normalization_steps)
|
|
| (n0 >> (BITS_PER_MP_LIMB - normalization_steps))),
|
|
divisor_limb, divisor_limb_inverted);
|
|
n1 = n0;
|
|
}
|
|
udiv_qrnnd_preinv (dummy, r, r,
|
|
n1 << normalization_steps,
|
|
divisor_limb, divisor_limb_inverted);
|
|
return r >> normalization_steps;
|
|
}
|
|
else
|
|
{
|
|
mp_limb_t divisor_limb_inverted;
|
|
|
|
/* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB. The
|
|
result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
|
|
most significant bit (with weight 2**N) implicit. */
|
|
|
|
/* Special case for DIVISOR_LIMB == 100...000. */
|
|
if (divisor_limb << 1 == 0)
|
|
divisor_limb_inverted = ~(mp_limb_t) 0;
|
|
else
|
|
udiv_qrnnd (divisor_limb_inverted, dummy,
|
|
-divisor_limb, 0, divisor_limb);
|
|
|
|
i = dividend_size - 1;
|
|
r = dividend_ptr[i];
|
|
|
|
if (r >= divisor_limb)
|
|
r = 0;
|
|
else
|
|
i--;
|
|
|
|
for (; i >= 0; i--)
|
|
{
|
|
n0 = dividend_ptr[i];
|
|
udiv_qrnnd_preinv (dummy, r, r,
|
|
n0, divisor_limb, divisor_limb_inverted);
|
|
}
|
|
return r;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (UDIV_NEEDS_NORMALIZATION)
|
|
{
|
|
int normalization_steps;
|
|
|
|
count_leading_zeros (normalization_steps, divisor_limb);
|
|
if (normalization_steps != 0)
|
|
{
|
|
divisor_limb <<= normalization_steps;
|
|
|
|
n1 = dividend_ptr[dividend_size - 1];
|
|
r = n1 >> (BITS_PER_MP_LIMB - normalization_steps);
|
|
|
|
/* Possible optimization:
|
|
if (r == 0
|
|
&& divisor_limb > ((n1 << normalization_steps)
|
|
| (dividend_ptr[dividend_size - 2] >> ...)))
|
|
...one division less... */
|
|
|
|
for (i = dividend_size - 2; i >= 0; i--)
|
|
{
|
|
n0 = dividend_ptr[i];
|
|
udiv_qrnnd (dummy, r, r,
|
|
((n1 << normalization_steps)
|
|
| (n0 >> (BITS_PER_MP_LIMB - normalization_steps))),
|
|
divisor_limb);
|
|
n1 = n0;
|
|
}
|
|
udiv_qrnnd (dummy, r, r,
|
|
n1 << normalization_steps,
|
|
divisor_limb);
|
|
return r >> normalization_steps;
|
|
}
|
|
}
|
|
/* No normalization needed, either because udiv_qrnnd doesn't require
|
|
it, or because DIVISOR_LIMB is already normalized. */
|
|
|
|
i = dividend_size - 1;
|
|
r = dividend_ptr[i];
|
|
|
|
if (r >= divisor_limb)
|
|
r = 0;
|
|
else
|
|
i--;
|
|
|
|
for (; i >= 0; i--)
|
|
{
|
|
n0 = dividend_ptr[i];
|
|
udiv_qrnnd (dummy, r, r, n0, divisor_limb);
|
|
}
|
|
return r;
|
|
}
|
|
}
|