MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update embedded mini-gmp to version 6.2.0

Browse Source
This commit is contained in:
MoNTE48 2020-02-07 12:40:55 +01:00
parent d19476376c
commit c6a5567c69
2 changed files with 126 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lib/gmp/mini-gmp.c
View File

@ -2,7 +2,7 @@
Contributed to the GNU project by Niels Möller Contributed to the GNU project by Niels Möller
Copyright 1991-1997, 1999-2018 Free Software Foundation, Inc. Copyright 1991-1997, 1999-2019 Free Software Foundation, Inc.
This file is part of the GNU MP Library. This file is part of the GNU MP Library.
@ -86,11 +86,13 @@ see https://www.gnu.org/licenses/. */
#define gmp_clz(count, x) do { \ #define gmp_clz(count, x) do { \
mp_limb_t __clz_x = (x); \ mp_limb_t __clz_x = (x); \
unsigned __clz_c; \ unsigned __clz_c = 0; \
for (__clz_c = 0; \ int LOCAL_SHIFT_BITS = 8; \
if (GMP_LIMB_BITS > LOCAL_SHIFT_BITS) \
for (; \
(__clz_x & ((mp_limb_t) 0xff << (GMP_LIMB_BITS - 8))) == 0; \ (__clz_x & ((mp_limb_t) 0xff << (GMP_LIMB_BITS - 8))) == 0; \
__clz_c += 8) \ __clz_c += 8) \
__clz_x <<= 8; \ { __clz_x <<= LOCAL_SHIFT_BITS; } \
for (; (__clz_x & GMP_LIMB_HIGHBIT) == 0; __clz_c++) \ for (; (__clz_x & GMP_LIMB_HIGHBIT) == 0; __clz_c++) \
__clz_x <<= 1; \ __clz_x <<= 1; \
(count) = __clz_c; \ (count) = __clz_c; \
@ -287,7 +289,7 @@ gmp_default_alloc (size_t size)
} }
static void * static void *
gmp_default_realloc (void *old, size_t old_size, size_t new_size) gmp_default_realloc (void *old, size_t unused_old_size, size_t new_size)
{ {
void * p; void * p;
@ -300,7 +302,7 @@ gmp_default_realloc (void *old, size_t old_size, size_t new_size)
} }
static void static void
gmp_default_free (void *p, size_t size) gmp_default_free (void *p, size_t unused_size)
{ {
free (p); free (p);
} }
@ -760,22 +762,11 @@ mpn_neg (mp_ptr rp, mp_srcptr up, mp_size_t n)
mp_limb_t mp_limb_t
mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0) mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
{ {
int GMP_LIMB_BITS_MUL_3 = GMP_LIMB_BITS * 3; mp_limb_t r, m;
if (sizeof (unsigned) * CHAR_BIT > GMP_LIMB_BITS * 3)
{
return (((unsigned) 1 << GMP_LIMB_BITS_MUL_3) - 1) /
(((unsigned) u1 << GMP_LIMB_BITS_MUL_3 / 3) + u0);
}
else if (GMP_ULONG_BITS > GMP_LIMB_BITS * 3)
{
return (((unsigned long) 1 << GMP_LIMB_BITS_MUL_3) - 1) /
(((unsigned long) u1 << GMP_LIMB_BITS_MUL_3 / 3) + u0);
}
else {
mp_limb_t r, p, m, ql;
unsigned ul, uh, qh;
assert (u1 >= GMP_LIMB_HIGHBIT); {
mp_limb_t p, ql;
unsigned ul, uh, qh;
/* For notation, let b denote the half-limb base, so that B = b^2. /* For notation, let b denote the half-limb base, so that B = b^2.
Split u1 = b uh + ul. */ Split u1 = b uh + ul. */
@ -785,7 +776,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
/* Approximation of the high half of quotient. Differs from the 2/1 /* Approximation of the high half of quotient. Differs from the 2/1
inverse of the half limb uh, since we have already subtracted inverse of the half limb uh, since we have already subtracted
u0. */ u0. */
qh = ~u1 / uh; qh = (u1 ^ GMP_LIMB_MAX) / uh;
/* Adjust to get a half-limb 3/2 inverse, i.e., we want /* Adjust to get a half-limb 3/2 inverse, i.e., we want
@ -834,7 +825,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
/* By the 3/2 trick, we don't need the high half limb. */ /* By the 3/2 trick, we don't need the high half limb. */
r = (r << (GMP_LIMB_BITS / 2)) + GMP_LLIMB_MASK - ql * u1; r = (r << (GMP_LIMB_BITS / 2)) + GMP_LLIMB_MASK - ql * u1;
if (r >= (p << (GMP_LIMB_BITS / 2))) if (r >= (GMP_LIMB_MAX & (p << (GMP_LIMB_BITS / 2))))
{ {
ql--; ql--;
r += u1; r += u1;
@ -845,6 +836,7 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
m++; m++;
r -= u1; r -= u1;
} }
}
/* Now m is the 2/1 inverse of u1. If u0 > 0, adjust it to become a /* Now m is the 2/1 inverse of u1. If u0 > 0, adjust it to become a
3/2 inverse. */ 3/2 inverse. */
@ -873,7 +865,6 @@ mpn_invert_3by2 (mp_limb_t u1, mp_limb_t u0)
} }
return m; return m;
}
} }
struct gmp_div_inverse struct gmp_div_inverse
@ -1587,7 +1578,7 @@ mpz_get_ui (const mpz_t u)
int LOCAL_GMP_LIMB_BITS = GMP_LIMB_BITS; int LOCAL_GMP_LIMB_BITS = GMP_LIMB_BITS;
unsigned long r = 0; unsigned long r = 0;
mp_size_t n = GMP_ABS (u->_mp_size); mp_size_t n = GMP_ABS (u->_mp_size);
n = GMP_MIN (n, 1 + (GMP_ULONG_BITS - 1) / GMP_LIMB_BITS); n = GMP_MIN (n, 1 + (mp_size_t) (GMP_ULONG_BITS - 1) / GMP_LIMB_BITS);
while (--n >= 0) while (--n >= 0)
r = (r << LOCAL_GMP_LIMB_BITS) + u->_mp_d[n]; r = (r << LOCAL_GMP_LIMB_BITS) + u->_mp_d[n];
return r; return r;
@ -3491,7 +3482,7 @@ gmp_stronglucas (const mpz_t x, mpz_t Qk)
b0 = mpz_scan0 (n, 0); b0 = mpz_scan0 (n, 0);
/* D= P^2 - 4Q; P = 1; Q = (1-D)/4 */ /* D= P^2 - 4Q; P = 1; Q = (1-D)/4 */
Q = (D & 2) ? (D >> 2) + 1 : -(long) (D >> 2); Q = (D & 2) ? (long) (D >> 2) + 1 : -(long) (D >> 2);
if (! gmp_lucas_mod (V, Qk, Q, b0, n)) /* If Ud != 0 */ if (! gmp_lucas_mod (V, Qk, Q, b0, n)) /* If Ud != 0 */
while (V->_mp_size != 0 && --b0 != 0) /* while Vk != 0 */ while (V->_mp_size != 0 && --b0 != 0) /* while Vk != 0 */
@ -3982,13 +3973,18 @@ gmp_popcount_limb (mp_limb_t x)
unsigned c; unsigned c;
/* Do 16 bits at a time, to avoid limb-sized constants. */ /* Do 16 bits at a time, to avoid limb-sized constants. */
for (c = 0; x > 0; x >>= 16) int LOCAL_SHIFT_BITS = 16;
for (c = 0; x > 0;)
{ {
unsigned w = x - ((x >> 1) & 0x5555); unsigned w = x - ((x >> 1) & 0x5555);
w = ((w >> 2) & 0x3333) + (w & 0x3333); w = ((w >> 2) & 0x3333) + (w & 0x3333);
w = (w >> 4) + w; w = (w >> 4) + w;
w = ((w >> 8) & 0x000f) + (w & 0x000f); w = ((w >> 8) & 0x000f) + (w & 0x000f);
c += w; c += w;
if (GMP_LIMB_BITS > LOCAL_SHIFT_BITS)
x >>= LOCAL_SHIFT_BITS;
else
x = 0;
} }
return c; return c;
} }
@ -4495,10 +4491,15 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
limb = u->_mp_d[un-1]; limb = u->_mp_d[un-1];
assert (limb != 0); assert (limb != 0);
k = 0; k = (GMP_LIMB_BITS <= CHAR_BIT);
if (!k)
{
do { do {
k++; limb >>= CHAR_BIT; int LOCAL_CHAR_BIT = CHAR_BIT;
k++; limb >>= LOCAL_CHAR_BIT;
} while (limb != 0); } while (limb != 0);
}
/* else limb = 0; */
count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size; count = (k + (un-1) * sizeof (mp_limb_t) + size - 1) / size;
@ -4527,8 +4528,18 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
for (bytes = 0, i = 0, k = 0; k < count; k++, p += word_step) for (bytes = 0, i = 0, k = 0; k < count; k++, p += word_step)
{ {
size_t j; size_t j;
for (j = 0; j < size; j++, p -= (ptrdiff_t) endian) for (j = 0; j < size; ++j, p -= (ptrdiff_t) endian)
{ {
if (sizeof (mp_limb_t) == 1)
{
if (i < un)
*p = u->_mp_d[i++];
else
*p = 0;
}
else
{
int LOCAL_CHAR_BIT = CHAR_BIT;
if (bytes == 0) if (bytes == 0)
{ {
if (i < un) if (i < un)
@ -4536,10 +4547,11 @@ mpz_export (void *r, size_t *countp, int order, size_t size, int endian,
bytes = sizeof (mp_limb_t); bytes = sizeof (mp_limb_t);
} }
*p = limb; *p = limb;
limb >>= CHAR_BIT; limb >>= LOCAL_CHAR_BIT;
bytes--; bytes--;
} }
} }
}
assert (i == un); assert (i == un);
assert (k == count); assert (k == count);
} }

8
lib/gmp/mini-gmp.h
View File

@ -1,6 +1,6 @@
/* mini-gmp, a minimalistic implementation of a GNU GMP subset. /* mini-gmp, a minimalistic implementation of a GNU GMP subset.
Copyright 2011-2015, 2017 Free Software Foundation, Inc. Copyright 2011-2015, 2017, 2019 Free Software Foundation, Inc.
This file is part of the GNU MP Library. This file is part of the GNU MP Library.
@ -45,7 +45,11 @@ void mp_get_memory_functions (void *(**) (size_t),
void *(**) (void *, size_t, size_t), void *(**) (void *, size_t, size_t),
void (**) (void *, size_t)); void (**) (void *, size_t));
typedef unsigned long mp_limb_t; #ifndef MINI_GMP_LIMB_TYPE
#define MINI_GMP_LIMB_TYPE long
#endif
typedef unsigned MINI_GMP_LIMB_TYPE mp_limb_t;
typedef long mp_size_t; typedef long mp_size_t;
typedef unsigned long mp_bitcnt_t; typedef unsigned long mp_bitcnt_t;