mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50: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.
235 lines
5.1 KiB
C
235 lines
5.1 KiB
C
/* mpn_divrem -- Divide natural numbers, producing both remainder and
|
|
quotient.
|
|
|
|
Copyright (C) 1993-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"
|
|
|
|
/* Divide num (NP/NSIZE) by den (DP/DSIZE) and write
|
|
the NSIZE-DSIZE least significant quotient limbs at QP
|
|
and the DSIZE long remainder at NP. If QEXTRA_LIMBS is
|
|
non-zero, generate that many fraction bits and append them after the
|
|
other quotient limbs.
|
|
Return the most significant limb of the quotient, this is always 0 or 1.
|
|
|
|
Preconditions:
|
|
0. NSIZE >= DSIZE.
|
|
1. The most significant bit of the divisor must be set.
|
|
2. QP must either not overlap with the input operands at all, or
|
|
QP + DSIZE >= NP must hold true. (This means that it's
|
|
possible to put the quotient in the high part of NUM, right after the
|
|
remainder in NUM.
|
|
3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero. */
|
|
|
|
mp_limb_t
|
|
mpn_divrem (mp_ptr qp, mp_size_t qextra_limbs,
|
|
mp_ptr np, mp_size_t nsize,
|
|
mp_srcptr dp, mp_size_t dsize)
|
|
{
|
|
mp_limb_t most_significant_q_limb = 0;
|
|
|
|
switch (dsize)
|
|
{
|
|
case 0:
|
|
/* We are asked to divide by zero, so go ahead and do it! (To make
|
|
the compiler not remove this statement, return the value.) */
|
|
return 1 / dsize;
|
|
|
|
case 1:
|
|
{
|
|
mp_size_t i;
|
|
mp_limb_t n1;
|
|
mp_limb_t d;
|
|
|
|
d = dp[0];
|
|
n1 = np[nsize - 1];
|
|
|
|
if (n1 >= d)
|
|
{
|
|
n1 -= d;
|
|
most_significant_q_limb = 1;
|
|
}
|
|
|
|
qp += qextra_limbs;
|
|
for (i = nsize - 2; i >= 0; i--)
|
|
udiv_qrnnd (qp[i], n1, n1, np[i], d);
|
|
qp -= qextra_limbs;
|
|
|
|
for (i = qextra_limbs - 1; i >= 0; i--)
|
|
udiv_qrnnd (qp[i], n1, n1, 0, d);
|
|
|
|
np[0] = n1;
|
|
}
|
|
break;
|
|
|
|
case 2:
|
|
{
|
|
mp_size_t i;
|
|
mp_limb_t n1, n0, n2;
|
|
mp_limb_t d1, d0;
|
|
|
|
np += nsize - 2;
|
|
d1 = dp[1];
|
|
d0 = dp[0];
|
|
n1 = np[1];
|
|
n0 = np[0];
|
|
|
|
if (n1 >= d1 && (n1 > d1 || n0 >= d0))
|
|
{
|
|
sub_ddmmss (n1, n0, n1, n0, d1, d0);
|
|
most_significant_q_limb = 1;
|
|
}
|
|
|
|
for (i = qextra_limbs + nsize - 2 - 1; i >= 0; i--)
|
|
{
|
|
mp_limb_t q;
|
|
mp_limb_t r;
|
|
|
|
if (i >= qextra_limbs)
|
|
np--;
|
|
else
|
|
np[0] = 0;
|
|
|
|
if (n1 == d1)
|
|
{
|
|
/* Q should be either 111..111 or 111..110. Need special
|
|
treatment of this rare case as normal division would
|
|
give overflow. */
|
|
q = ~(mp_limb_t) 0;
|
|
|
|
r = n0 + d1;
|
|
if (r < d1) /* Carry in the addition? */
|
|
{
|
|
add_ssaaaa (n1, n0, r - d0, np[0], 0, d0);
|
|
qp[i] = q;
|
|
continue;
|
|
}
|
|
n1 = d0 - (d0 != 0);
|
|
n0 = -d0;
|
|
}
|
|
else
|
|
{
|
|
udiv_qrnnd (q, r, n1, n0, d1);
|
|
umul_ppmm (n1, n0, d0, q);
|
|
}
|
|
|
|
n2 = np[0];
|
|
q_test:
|
|
if (n1 > r || (n1 == r && n0 > n2))
|
|
{
|
|
/* The estimated Q was too large. */
|
|
q--;
|
|
|
|
sub_ddmmss (n1, n0, n1, n0, 0, d0);
|
|
r += d1;
|
|
if (r >= d1) /* If not carry, test Q again. */
|
|
goto q_test;
|
|
}
|
|
|
|
qp[i] = q;
|
|
sub_ddmmss (n1, n0, r, n2, n1, n0);
|
|
}
|
|
np[1] = n1;
|
|
np[0] = n0;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
{
|
|
mp_size_t i;
|
|
mp_limb_t dX, d1, n0;
|
|
|
|
np += nsize - dsize;
|
|
dX = dp[dsize - 1];
|
|
d1 = dp[dsize - 2];
|
|
n0 = np[dsize - 1];
|
|
|
|
if (n0 >= dX)
|
|
{
|
|
if (n0 > dX || mpn_cmp (np, dp, dsize - 1) >= 0)
|
|
{
|
|
mpn_sub_n (np, np, dp, dsize);
|
|
n0 = np[dsize - 1];
|
|
most_significant_q_limb = 1;
|
|
}
|
|
}
|
|
|
|
for (i = qextra_limbs + nsize - dsize - 1; i >= 0; i--)
|
|
{
|
|
mp_limb_t q;
|
|
mp_limb_t n1, n2;
|
|
mp_limb_t cy_limb;
|
|
|
|
if (i >= qextra_limbs)
|
|
{
|
|
np--;
|
|
n2 = np[dsize];
|
|
}
|
|
else
|
|
{
|
|
n2 = np[dsize - 1];
|
|
MPN_COPY_DECR (np + 1, np, dsize);
|
|
np[0] = 0;
|
|
}
|
|
|
|
if (n0 == dX)
|
|
/* This might over-estimate q, but it's probably not worth
|
|
the extra code here to find out. */
|
|
q = ~(mp_limb_t) 0;
|
|
else
|
|
{
|
|
mp_limb_t r;
|
|
|
|
udiv_qrnnd (q, r, n0, np[dsize - 1], dX);
|
|
umul_ppmm (n1, n0, d1, q);
|
|
|
|
while (n1 > r || (n1 == r && n0 > np[dsize - 2]))
|
|
{
|
|
q--;
|
|
r += dX;
|
|
if (r < dX) /* I.e. "carry in previous addition?" */
|
|
break;
|
|
n1 -= n0 < d1;
|
|
n0 -= d1;
|
|
}
|
|
}
|
|
|
|
/* Possible optimization: We already have (q * n0) and (1 * n1)
|
|
after the calculation of q. Taking advantage of that, we
|
|
could make this loop make two iterations less. */
|
|
|
|
cy_limb = mpn_submul_1 (np, dp, dsize, q);
|
|
|
|
if (n2 != cy_limb)
|
|
{
|
|
mpn_add_n (np, np, dp, dsize);
|
|
q--;
|
|
}
|
|
|
|
qp[i] = q;
|
|
n0 = np[dsize - 1];
|
|
}
|
|
}
|
|
}
|
|
|
|
return most_significant_q_limb;
|
|
}
|