mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +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.
143 lines
3.9 KiB
C
143 lines
3.9 KiB
C
/* mpn_mul -- Multiply two natural numbers.
|
|
|
|
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"
|
|
|
|
/* Multiply the natural numbers u (pointed to by UP, with USIZE limbs)
|
|
and v (pointed to by VP, with VSIZE limbs), and store the result at
|
|
PRODP. USIZE + VSIZE limbs are always stored, but if the input
|
|
operands are normalized. Return the most significant limb of the
|
|
result.
|
|
|
|
NOTE: The space pointed to by PRODP is overwritten before finished
|
|
with U and V, so overlap is an error.
|
|
|
|
Argument constraints:
|
|
1. USIZE >= VSIZE.
|
|
2. PRODP != UP and PRODP != VP, i.e. the destination
|
|
must be distinct from the multiplier and the multiplicand. */
|
|
|
|
/* If KARATSUBA_THRESHOLD is not already defined, define it to a
|
|
value which is good on most machines. */
|
|
#ifndef KARATSUBA_THRESHOLD
|
|
#define KARATSUBA_THRESHOLD 32
|
|
#endif
|
|
|
|
mp_limb_t
|
|
mpn_mul (mp_ptr prodp,
|
|
mp_srcptr up, mp_size_t usize,
|
|
mp_srcptr vp, mp_size_t vsize)
|
|
{
|
|
mp_ptr prod_endp = prodp + usize + vsize - 1;
|
|
mp_limb_t cy;
|
|
mp_ptr tspace;
|
|
TMP_DECL (marker);
|
|
|
|
if (vsize < KARATSUBA_THRESHOLD)
|
|
{
|
|
/* Handle simple cases with traditional multiplication.
|
|
|
|
This is the most critical code of the entire function. All
|
|
multiplies rely on this, both small and huge. Small ones arrive
|
|
here immediately. Huge ones arrive here as this is the base case
|
|
for Karatsuba's recursive algorithm below. */
|
|
mp_size_t i;
|
|
mp_limb_t cy_limb;
|
|
mp_limb_t v_limb;
|
|
|
|
if (vsize == 0)
|
|
return 0;
|
|
|
|
/* Multiply by the first limb in V separately, as the result can be
|
|
stored (not added) to PROD. We also avoid a loop for zeroing. */
|
|
v_limb = vp[0];
|
|
if (v_limb <= 1)
|
|
{
|
|
if (v_limb == 1)
|
|
MPN_COPY (prodp, up, usize);
|
|
else
|
|
MPN_ZERO (prodp, usize);
|
|
cy_limb = 0;
|
|
}
|
|
else
|
|
cy_limb = mpn_mul_1 (prodp, up, usize, v_limb);
|
|
|
|
prodp[usize] = cy_limb;
|
|
prodp++;
|
|
|
|
/* For each iteration in the outer loop, multiply one limb from
|
|
U with one limb from V, and add it to PROD. */
|
|
for (i = 1; i < vsize; i++)
|
|
{
|
|
v_limb = vp[i];
|
|
if (v_limb <= 1)
|
|
{
|
|
cy_limb = 0;
|
|
if (v_limb == 1)
|
|
cy_limb = mpn_add_n (prodp, prodp, up, usize);
|
|
}
|
|
else
|
|
cy_limb = mpn_addmul_1 (prodp, up, usize, v_limb);
|
|
|
|
prodp[usize] = cy_limb;
|
|
prodp++;
|
|
}
|
|
return cy_limb;
|
|
}
|
|
|
|
TMP_MARK (marker);
|
|
|
|
tspace = (mp_ptr) TMP_ALLOC (2 * vsize * BYTES_PER_MP_LIMB);
|
|
MPN_MUL_N_RECURSE (prodp, up, vp, vsize, tspace);
|
|
|
|
prodp += vsize;
|
|
up += vsize;
|
|
usize -= vsize;
|
|
if (usize >= vsize)
|
|
{
|
|
mp_ptr tp = (mp_ptr) TMP_ALLOC (2 * vsize * BYTES_PER_MP_LIMB);
|
|
do
|
|
{
|
|
MPN_MUL_N_RECURSE (tp, up, vp, vsize, tspace);
|
|
cy = mpn_add_n (prodp, prodp, tp, vsize);
|
|
mpn_add_1 (prodp + vsize, tp + vsize, vsize, cy);
|
|
prodp += vsize;
|
|
up += vsize;
|
|
usize -= vsize;
|
|
}
|
|
while (usize >= vsize);
|
|
}
|
|
|
|
/* True: usize < vsize. */
|
|
|
|
/* Make life simple: Recurse. */
|
|
|
|
if (usize != 0)
|
|
{
|
|
mpn_mul (tspace, vp, vsize, up, usize);
|
|
cy = mpn_add_n (prodp, prodp, tspace, vsize);
|
|
mpn_add_1 (prodp + vsize, tspace + vsize, usize, cy);
|
|
}
|
|
|
|
TMP_FREE (marker);
|
|
return *prod_endp;
|
|
}
|