forked from StephanTLavavej/mingw-distro
-
Notifications
You must be signed in to change notification settings - Fork 0
/
mpfr-4.1.0-p13.patch
2976 lines (2812 loc) · 102 KB
/
mpfr-4.1.0-p13.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:40:40.079363480 +0000
+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:40:40.119363040 +0000
@@ -0,0 +1 @@
+decimal128-conv
diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
--- mpfr-4.1.0-a/VERSION 2020-07-10 11:52:33.000000000 +0000
+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:40:40.119363040 +0000
@@ -1 +1 @@
-4.1.0
+4.1.0-p1
diff -Naurd mpfr-4.1.0-a/src/get_d128.c mpfr-4.1.0-b/src/get_d128.c
--- mpfr-4.1.0-a/src/get_d128.c 2020-04-08 22:39:35.000000000 +0000
+++ mpfr-4.1.0-b/src/get_d128.c 2021-02-11 12:40:40.103363216 +0000
@@ -40,22 +40,21 @@
static _Decimal128
get_decimal128_nan (void)
{
- return (_Decimal128) MPFR_DBL_NAN;
+ return 0.0dl / 0.0dl;
}
/* construct the decimal128 Inf with given sign */
static _Decimal128
get_decimal128_inf (int negative)
{
- return (_Decimal128) (negative ? MPFR_DBL_INFM : MPFR_DBL_INFP);
+ return negative ? - 1.0dl / 0.0dl : 1.0dl / 0.0dl;
}
/* construct the decimal128 zero with given sign */
static _Decimal128
get_decimal128_zero (int negative)
{
- _Decimal128 zero = 0;
- return (_Decimal128) (negative ? -zero : zero);
+ return negative ? - 0.0dl : 0.0dl;
}
/* construct the decimal128 smallest non-zero with given sign:
diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
--- mpfr-4.1.0-a/src/mpfr.h 2020-07-10 11:52:33.000000000 +0000
+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000
@@ -27,7 +27,7 @@
#define MPFR_VERSION_MAJOR 4
#define MPFR_VERSION_MINOR 1
#define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "4.1.0"
+#define MPFR_VERSION_STRING "4.1.0-p1"
/* User macros:
MPFR_USE_FILE: Define it to make MPFR define functions dealing
diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
--- mpfr-4.1.0-a/src/version.c 2020-07-10 11:52:33.000000000 +0000
+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:40:40.119363040 +0000
@@ -25,5 +25,5 @@
const char *
mpfr_get_version (void)
{
- return "4.1.0";
+ return "4.1.0-p1";
}
diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:43:51.761257868 +0000
+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:43:51.801257430 +0000
@@ -0,0 +1 @@
+random_deviate
diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
--- mpfr-4.1.0-a/VERSION 2021-02-11 12:40:40.119363040 +0000
+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:43:51.801257430 +0000
@@ -1 +1 @@
-4.1.0-p1
+4.1.0-p2
diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000
+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000
@@ -27,7 +27,7 @@
#define MPFR_VERSION_MAJOR 4
#define MPFR_VERSION_MINOR 1
#define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "4.1.0-p1"
+#define MPFR_VERSION_STRING "4.1.0-p2"
/* User macros:
MPFR_USE_FILE: Define it to make MPFR define functions dealing
diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
--- mpfr-4.1.0-a/src/random_deviate.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000
@@ -289,6 +289,7 @@
mpfr_random_size_t p = mpfr_get_prec (z); /* Number of bits in result */
mpz_t t;
int inex;
+ mpfr_exp_t negxe;
if (n == 0)
{
@@ -370,14 +371,22 @@
mpz_setbit (t, 0); /* Set the trailing bit so result is always inexact */
if (neg)
mpz_neg (t, t);
- /* Is -x->e representable as a mpfr_exp_t? */
- MPFR_ASSERTN (x->e <= (mpfr_uexp_t)(-1) >> 1);
+ /* Portable version of the negation of x->e, with a check of overflow. */
+ if (MPFR_UNLIKELY (x->e > MPFR_EXP_MAX))
+ {
+ /* Overflow, except when x->e = MPFR_EXP_MAX + 1 = - MPFR_EXP_MIN. */
+ MPFR_ASSERTN (MPFR_EXP_MIN + MPFR_EXP_MAX == -1 &&
+ x->e == (mpfr_random_size_t) MPFR_EXP_MAX + 1);
+ negxe = MPFR_EXP_MIN;
+ }
+ else
+ negxe = - (mpfr_exp_t) x->e;
/*
* Let mpfr_set_z_2exp do all the work of rounding to the requested
* precision, setting overflow/underflow flags, and returning the right
* inexact value.
*/
- inex = mpfr_set_z_2exp (z, t, -x->e, rnd);
+ inex = mpfr_set_z_2exp (z, t, negxe, rnd);
mpz_clear (t);
return inex;
}
diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:40:40.119363040 +0000
+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:43:51.801257430 +0000
@@ -25,5 +25,5 @@
const char *
mpfr_get_version (void)
{
- return "4.1.0-p1";
+ return "4.1.0-p2";
}
diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:46:49.075316772 +0000
+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:46:49.115316335 +0000
@@ -0,0 +1 @@
+set_z_2exp-overflow
diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
--- mpfr-4.1.0-a/VERSION 2021-02-11 12:43:51.801257430 +0000
+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:46:49.115316335 +0000
@@ -1 +1 @@
-4.1.0-p2
+4.1.0-p3
diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000
+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000
@@ -27,7 +27,7 @@
#define MPFR_VERSION_MAJOR 4
#define MPFR_VERSION_MINOR 1
#define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "4.1.0-p2"
+#define MPFR_VERSION_STRING "4.1.0-p3"
/* User macros:
MPFR_USE_FILE: Define it to make MPFR define functions dealing
diff -Naurd mpfr-4.1.0-a/src/set_z_exp.c mpfr-4.1.0-b/src/set_z_exp.c
--- mpfr-4.1.0-a/src/set_z_exp.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/set_z_exp.c 2021-02-11 12:46:49.103316466 +0000
@@ -28,10 +28,11 @@
int
mpfr_set_z_2exp (mpfr_ptr f, mpz_srcptr z, mpfr_exp_t e, mpfr_rnd_t rnd_mode)
{
- mp_size_t fn, zn, dif, en;
+ mp_size_t fn, zn, dif;
int k, sign_z, inex;
mp_limb_t *fp, *zp;
- mpfr_exp_t exp;
+ mpfr_exp_t exp, nmax;
+ mpfr_uexp_t uexp;
sign_z = mpz_sgn (z);
if (MPFR_UNLIKELY (sign_z == 0)) /* ignore the exponent for 0 */
@@ -43,10 +44,15 @@
MPFR_ASSERTD (sign_z == MPFR_SIGN_POS || sign_z == MPFR_SIGN_NEG);
zn = ABSIZ(z); /* limb size of z */
- /* compute en = floor(e/GMP_NUMB_BITS) */
- en = (e >= 0) ? e / GMP_NUMB_BITS : (e + 1) / GMP_NUMB_BITS - 1;
MPFR_ASSERTD (zn >= 1);
- if (MPFR_UNLIKELY (zn + en > MPFR_EMAX_MAX / GMP_NUMB_BITS + 1))
+ nmax = MPFR_EMAX_MAX / GMP_NUMB_BITS + 1;
+ /* Detect early overflow with zn + en > nmax,
+ where en = floor(e / GMP_NUMB_BITS).
+ This is checked without an integer overflow (even assuming some
+ future version of GMP, where limitations may be removed). */
+ if (MPFR_UNLIKELY (e >= 0 ?
+ zn > nmax - e / GMP_NUMB_BITS :
+ zn + (e + 1) / GMP_NUMB_BITS - 1 > nmax))
return mpfr_overflow (f, rnd_mode, sign_z);
/* because zn + en >= MPFR_EMAX_MAX / GMP_NUMB_BITS + 2
implies (zn + en) * GMP_NUMB_BITS >= MPFR_EMAX_MAX + GMP_NUMB_BITS + 1
@@ -64,8 +70,21 @@
and exp = zn * GMP_NUMB_BITS + e - k
<= (zn + en) * GMP_NUMB_BITS - k + GMP_NUMB_BITS - 1
<= MPFR_EMAX_MAX + 2 * GMP_NUMB_BITS - 1 */
- exp = (mpfr_prec_t) zn * GMP_NUMB_BITS + e - k;
+ /* We need to compute exp = zn * GMP_NUMB_BITS + e - k with well-defined
+ operations (no integer overflows / no implementation-defined results).
+ The mathematical result of zn * GMP_NUMB_BITS may be larger than
+ the largest value of mpfr_exp_t while exp could still be less than
+ __gmpfr_emax. Thanks to early overflow detection, we can compute the
+ result in modular arithmetic, using mpfr_uexp_t, and convert it to
+ mpfr_exp_t. */
+ uexp = (mpfr_uexp_t) zn * GMP_NUMB_BITS + (mpfr_uexp_t) e - k;
+
+ /* Convert to signed in a portable way (see doc/README.dev).
+ On most platforms, this can be optimized to identity (no-op). */
+ exp = uexp > MPFR_EXP_MAX ? -1 - (mpfr_exp_t) ~uexp : (mpfr_exp_t) uexp;
+
/* The exponent will be exp or exp + 1 (due to rounding) */
+
if (MPFR_UNLIKELY (exp > __gmpfr_emax))
return mpfr_overflow (f, rnd_mode, sign_z);
if (MPFR_UNLIKELY (exp + 1 < __gmpfr_emin))
diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:43:51.801257430 +0000
+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:46:49.115316335 +0000
@@ -25,5 +25,5 @@
const char *
mpfr_get_version (void)
{
- return "4.1.0-p2";
+ return "4.1.0-p3";
}
diff -Naurd mpfr-4.1.0-a/tests/tset_z_exp.c mpfr-4.1.0-b/tests/tset_z_exp.c
--- mpfr-4.1.0-a/tests/tset_z_exp.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/tests/tset_z_exp.c 2021-02-11 12:46:49.103316466 +0000
@@ -97,49 +97,149 @@
mpfr_get_si is a rather indirect test of a low level routine. */
static void
-check (long i, mpfr_rnd_t rnd)
+check (long i, mpfr_rnd_t rnd, int reduced)
{
- mpfr_t f;
+ mpfr_t f1, f2, f3;
mpz_t z;
- mpfr_exp_t e;
+ mpfr_exp_t e, old_emin, old_emax;
int inex;
+ mpfr_flags_t flags;
+
+ old_emin = mpfr_get_emin ();
+ old_emax = mpfr_get_emax ();
/* using CHAR_BIT * sizeof(long) bits of precision ensures that
mpfr_set_z_2exp is exact below */
- mpfr_init2 (f, CHAR_BIT * sizeof(long));
+ mpfr_inits2 (CHAR_BIT * sizeof(long), f1, f2, f3, (mpfr_ptr) 0);
mpz_init (z);
mpz_set_ui (z, i);
/* the following loop ensures that no overflow occurs */
do
e = randexp ();
while (e > mpfr_get_emax () - CHAR_BIT * sizeof(long));
- inex = mpfr_set_z_2exp (f, z, e, rnd);
- if (inex != 0)
+
+ mpfr_clear_flags ();
+ inex = mpfr_set_z_2exp (f1, z, e, rnd);
+ flags = __gmpfr_flags;
+
+ if (inex != 0 || flags != 0 ||
+ (mpfr_div_2si (f2, f1, e, rnd), mpfr_get_si (f2, MPFR_RNDZ) != i))
{
- printf ("Error in mpfr_set_z_2exp for i=%ld, e=%ld,"
- " wrong ternary value\n", i, (long) e);
- printf ("expected 0, got %d\n", inex);
+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" MPFR_EXP_FSPEC
+ "d rnd_mode=%d\n", i, (mpfr_eexp_t) e, rnd);
+ mpfr_set_si_2exp (f2, i, e, MPFR_RNDN);
+ printf ("expected "); mpfr_dump (f2);
+ printf ("with inex = %d and flags =", 0);
+ flags_out (0);
+ printf ("got "); mpfr_dump (f1);
+ printf ("with inex = %d and flags =", inex);
+ flags_out (flags);
exit (1);
}
- mpfr_div_2si (f, f, e, rnd);
- if (mpfr_get_si (f, MPFR_RNDZ) != i)
+
+ if (reduced)
{
- printf ("Error in mpfr_set_z_2exp for i=%ld e=", i);
- if (e < LONG_MIN)
- printf ("(<LONG_MIN)");
- else if (e > LONG_MAX)
- printf ("(>LONG_MAX)");
- else
- printf ("%ld", (long) e);
- printf (" rnd_mode=%d\n", rnd);
- printf ("expected %ld\n", i);
- printf ("got "); mpfr_dump (f);
- exit (1);
+ mpfr_exp_t ef, emin, emax;
+ int inex2, inex3;
+ mpfr_flags_t flags2, flags3;
+
+ ef = i == 0 ? 0 : mpfr_get_exp (f1);
+ for (emin = ef - 2; emin <= ef + 2; emin++)
+ for (emax = emin; emax <= ef + 2; emax++)
+ {
+ inex3 = mpfr_set (f3, f1, rnd);
+ MPFR_ASSERTN (inex3 == 0);
+ mpfr_set_emin (emin);
+ mpfr_set_emax (emax);
+ mpfr_clear_flags ();
+ inex2 = mpfr_set_z_2exp (f2, z, e, rnd);
+ flags2 = __gmpfr_flags;
+ mpfr_clear_flags ();
+ inex3 = mpfr_check_range (f3, 0, rnd);
+ flags3 = __gmpfr_flags;
+ if (!(mpfr_equal_p (f2, f3) &&
+ SAME_SIGN (inex2, inex3) &&
+ flags2 == flags3))
+ {
+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%"
+ MPFR_EXP_FSPEC "d rnd_mode=%d\nand emin=%"
+ MPFR_EXP_FSPEC "d emax=%" MPFR_EXP_FSPEC
+ "d\n", i, (mpfr_eexp_t) e, rnd,
+ (mpfr_eexp_t) emin, (mpfr_eexp_t) emax);
+ printf ("expected "); mpfr_dump (f3);
+ printf ("with inex = %d and flags =", inex3);
+ flags_out (flags3);
+ printf ("got "); mpfr_dump (f2);
+ printf ("with inex = %d and flags =", inex2);
+ flags_out (flags2);
+ exit (1);
+ }
+ }
+ mpfr_set_emin (old_emin);
+ mpfr_set_emax (old_emax);
}
- mpfr_clear (f);
+
+ mpfr_clears (f1, f2, f3, (mpfr_ptr) 0);
mpz_clear (z);
}
+static void
+check_huge (void)
+{
+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
+ {
+ mpfr_t x;
+ mpz_t z;
+ long e;
+
+ /* Increase tests_memory_limit to the maximum in order to avoid
+ an obvious failure due to insufficient memory. */
+ tests_memory_limit = (size_t) -1; /* no memory limit */
+
+ mpfr_init2 (x, 32);
+
+ /* In r14140, with a 32-bit ABI (GCC's -m32):
+ - With UBsan (-fsanitize=undefined -fno-sanitize-recover),
+ this fails with:
+ set_z_2exp.c:71:26: runtime error: signed integer overflow:
+ 67108864 * 32 cannot be represented in type 'long int'
+ - With -D_MPFR_EXP_FORMAT=4, this fails with:
+ Expected 0.10001000000000000000000000000000E5
+ Got 0
+ */
+ mpz_init_set_ui (z, 17);
+ e = 0x7ffffff0;
+ mpz_mul_2exp (z, z, e);
+ mpz_add_ui (z, z, 1);
+ mpfr_set_z_2exp (x, z, -e, MPFR_RNDN);
+ if (mpfr_cmp_ui0 (x, 17) != 0)
+ {
+ printf ("Error 1 in check_huge\n");
+ printf ("Expected 0.10001000000000000000000000000000E5\n");
+ printf ("Got ");
+ mpfr_dump (x);
+ exit (1);
+ }
+ mpz_clear (z);
+
+ mpz_init_set_ui (z, 17);
+ mpz_mul_2exp (z, z, 0xffffffb0);
+ mpz_add_ui (z, z, 1);
+ mpfr_set_z_2exp (x, z, -1, MPFR_RNDN);
+ if (! MPFR_IS_INF (x) || MPFR_IS_NEG (x))
+ {
+ printf ("Error 2 in check_huge\n");
+ printf ("Expected @Inf@\n");
+ printf ("Got ");
+ mpfr_dump (x);
+ exit (1);
+ }
+ mpz_clear (z);
+
+ mpfr_clear (x);
+ }
+}
+
int
main (int argc, char *argv[])
{
@@ -147,11 +247,13 @@
tests_start_mpfr ();
- check (0, MPFR_RNDN);
+ check (0, MPFR_RNDN, 0);
for (j = 0; j < 200000; j++)
- check (randlimb () & LONG_MAX, RND_RAND ());
+ check (randlimb () & LONG_MAX, RND_RAND (), j < 200);
check0 ();
+ check_huge ();
+
tests_end_mpfr ();
return 0;
diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES
--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:48:27.322243271 +0000
+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:48:27.370242746 +0000
@@ -0,0 +1 @@
+prototypes
diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION
--- mpfr-4.1.0-a/VERSION 2021-02-11 12:46:49.115316335 +0000
+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:48:27.370242746 +0000
@@ -1 +1 @@
-4.1.0-p3
+4.1.0-p4
diff -Naurd mpfr-4.1.0-a/src/atan.c mpfr-4.1.0-b/src/atan.c
--- mpfr-4.1.0-a/src/atan.c 2020-04-22 15:27:07.000000000 +0000
+++ mpfr-4.1.0-b/src/atan.c 2021-02-11 12:48:27.354242922 +0000
@@ -56,7 +56,7 @@
};
static void
-set_table (mpfr_t y, const mp_limb_t x[3])
+set_table (mpfr_ptr y, const mp_limb_t x[3])
{
mpfr_prec_t p = MPFR_PREC(y);
mp_size_t n = MPFR_PREC2LIMBS(p);
diff -Naurd mpfr-4.1.0-a/src/const_euler.c mpfr-4.1.0-b/src/const_euler.c
--- mpfr-4.1.0-a/src/const_euler.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/const_euler.c 2021-02-11 12:48:27.354242922 +0000
@@ -181,7 +181,7 @@
}
int
-mpfr_const_euler_internal (mpfr_t x, mpfr_rnd_t rnd)
+mpfr_const_euler_internal (mpfr_ptr x, mpfr_rnd_t rnd)
{
mpfr_const_euler_bs_t sum;
mpz_t t, u, v;
diff -Naurd mpfr-4.1.0-a/src/eint.c mpfr-4.1.0-b/src/eint.c
--- mpfr-4.1.0-a/src/eint.c 2020-03-09 15:31:45.000000000 +0000
+++ mpfr-4.1.0-b/src/eint.c 2021-02-11 12:48:27.354242922 +0000
@@ -36,7 +36,7 @@
Return PREC(y) when the truncated series does not converge.
*/
static mpfr_exp_t
-mpfr_eint_aux (mpfr_t y, mpfr_srcptr x)
+mpfr_eint_aux (mpfr_ptr y, mpfr_srcptr x)
{
mpfr_t eps; /* dynamic (absolute) error bound on t */
mpfr_t erru, errs;
diff -Naurd mpfr-4.1.0-a/src/erandom.c mpfr-4.1.0-b/src/erandom.c
--- mpfr-4.1.0-a/src/erandom.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/erandom.c 2021-02-11 12:48:27.354242922 +0000
@@ -80,7 +80,7 @@
/* return an exponential random deviate with mean 1 as a MPFR */
int
-mpfr_erandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
+mpfr_erandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
{
mpfr_random_deviate_t x, p, q;
int inex;
diff -Naurd mpfr-4.1.0-a/src/fpif.c mpfr-4.1.0-b/src/fpif.c
--- mpfr-4.1.0-a/src/fpif.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/fpif.c 2021-02-11 12:48:27.354242922 +0000
@@ -291,7 +291,8 @@
* until one has integer types larger than 128 bits).
*/
static unsigned char*
-mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
+mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size,
+ mpfr_ptr x)
{
unsigned char *result;
mpfr_uexp_t uexp;
@@ -372,7 +373,7 @@
* than 128 bits).
*/
static int
-mpfr_fpif_read_exponent_from_file (mpfr_t x, FILE * fh)
+mpfr_fpif_read_exponent_from_file (mpfr_ptr x, FILE * fh)
{
mpfr_exp_t exponent;
mpfr_uexp_t uexp;
@@ -456,7 +457,7 @@
* format
*/
static unsigned char*
-mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_t x)
+mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_ptr x)
{
unsigned char *result;
mpfr_prec_t precision;
@@ -492,7 +493,7 @@
* Assume buffer is not NULL.
*/
static void
-mpfr_fpif_read_limbs (mpfr_t x, unsigned char *buffer, size_t nb_byte)
+mpfr_fpif_read_limbs (mpfr_ptr x, unsigned char *buffer, size_t nb_byte)
{
size_t mp_bytes_per_limb;
size_t nb_partial_byte;
@@ -522,7 +523,7 @@
* return 0 if successful
*/
int
-mpfr_fpif_export (FILE *fh, mpfr_t x)
+mpfr_fpif_export (FILE *fh, mpfr_ptr x)
{
int status;
unsigned char *buf;
@@ -582,7 +583,7 @@
* Return 0 if the import was successful.
*/
int
-mpfr_fpif_import (mpfr_t x, FILE *fh)
+mpfr_fpif_import (mpfr_ptr x, FILE *fh)
{
int status;
mpfr_prec_t precision;
diff -Naurd mpfr-4.1.0-a/src/li2.c mpfr-4.1.0-b/src/li2.c
--- mpfr-4.1.0-a/src/li2.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/li2.c 2021-02-11 12:48:27.354242922 +0000
@@ -31,7 +31,7 @@
for determinating the relative error.
*/
static int
-li2_series (mpfr_t sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
+li2_series (mpfr_ptr sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode)
{
int i;
mpfr_t s, u, v, w;
diff -Naurd mpfr-4.1.0-a/src/lngamma.c mpfr-4.1.0-b/src/lngamma.c
--- mpfr-4.1.0-a/src/lngamma.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/lngamma.c 2021-02-11 12:48:27.354242922 +0000
@@ -31,7 +31,7 @@
precision should be >= 4.
*/
static void
-mpfr_gamma_alpha (mpfr_t s, mpfr_prec_t p)
+mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p)
{
MPFR_LOG_FUNC
(("p=%Pu", p),
diff -Naurd mpfr-4.1.0-a/src/mpfr-impl.h mpfr-4.1.0-b/src/mpfr-impl.h
--- mpfr-4.1.0-a/src/mpfr-impl.h 2020-06-10 21:50:12.000000000 +0000
+++ mpfr-4.1.0-b/src/mpfr-impl.h 2021-02-11 12:48:27.354242922 +0000
@@ -2474,7 +2474,8 @@
__MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long);
__MPFR_DECLSPEC void mpfr_bernoulli_freecache (void);
-__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t);
+__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_ptr, mpfr_ptr, mpfr_srcptr,
+ mpfr_rnd_t);
__MPFR_DECLSPEC double mpfr_scale2 (double, int);
@@ -2485,7 +2486,7 @@
mpfr_prec_t);
__MPFR_DECLSPEC void mpfr_mpz_init (mpz_ptr);
-__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_t, mp_bitcnt_t);
+__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_ptr, mp_bitcnt_t);
__MPFR_DECLSPEC void mpfr_mpz_clear (mpz_ptr);
__MPFR_DECLSPEC int mpfr_odd_p (mpfr_srcptr);
diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h
--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000
+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000
@@ -27,7 +27,7 @@
#define MPFR_VERSION_MAJOR 4
#define MPFR_VERSION_MINOR 1
#define MPFR_VERSION_PATCHLEVEL 0
-#define MPFR_VERSION_STRING "4.1.0-p3"
+#define MPFR_VERSION_STRING "4.1.0-p4"
/* User macros:
MPFR_USE_FILE: Define it to make MPFR define functions dealing
@@ -781,8 +781,8 @@
__MPFR_DECLSPEC int mpfr_strtofr (mpfr_ptr, const char *, char **, int,
mpfr_rnd_t);
-__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_t);
-__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_t, int);
+__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_ptr);
+__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_ptr, int);
__MPFR_DECLSPEC size_t mpfr_custom_get_size (mpfr_prec_t);
__MPFR_DECLSPEC void mpfr_custom_init (void *, mpfr_prec_t);
@@ -1080,10 +1080,12 @@
#define mpfr_set_uj_2exp __gmpfr_set_uj_2exp
#define mpfr_get_sj __gmpfr_mpfr_get_sj
#define mpfr_get_uj __gmpfr_mpfr_get_uj
-__MPFR_DECLSPEC int mpfr_set_sj (mpfr_t, intmax_t, mpfr_rnd_t);
-__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_t, intmax_t, intmax_t, mpfr_rnd_t);
-__MPFR_DECLSPEC int mpfr_set_uj (mpfr_t, uintmax_t, mpfr_rnd_t);
-__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_t, uintmax_t, intmax_t, mpfr_rnd_t);
+__MPFR_DECLSPEC int mpfr_set_sj (mpfr_ptr, intmax_t, mpfr_rnd_t);
+__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_ptr, intmax_t, intmax_t,
+ mpfr_rnd_t);
+__MPFR_DECLSPEC int mpfr_set_uj (mpfr_ptr, uintmax_t, mpfr_rnd_t);
+__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_ptr, uintmax_t, intmax_t,
+ mpfr_rnd_t);
__MPFR_DECLSPEC intmax_t mpfr_get_sj (mpfr_srcptr, mpfr_rnd_t);
__MPFR_DECLSPEC uintmax_t mpfr_get_uj (mpfr_srcptr, mpfr_rnd_t);
diff -Naurd mpfr-4.1.0-a/src/nrandom.c mpfr-4.1.0-b/src/nrandom.c
--- mpfr-4.1.0-a/src/nrandom.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/nrandom.c 2021-02-11 12:48:27.354242922 +0000
@@ -155,7 +155,7 @@
/* return a normal random deviate with mean 0 and variance 1 as a MPFR */
int
-mpfr_nrandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd)
+mpfr_nrandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd)
{
mpfr_random_deviate_t x, p, q;
int inex;
diff -Naurd mpfr-4.1.0-a/src/pool.c mpfr-4.1.0-b/src/pool.c
--- mpfr-4.1.0-a/src/pool.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/pool.c 2021-02-11 12:48:27.354242922 +0000
@@ -35,7 +35,7 @@
static MPFR_THREAD_ATTR __mpz_struct mpz_tab[MPFR_POOL_NENTRIES];
MPFR_HOT_FUNCTION_ATTR void
-mpfr_mpz_init (mpz_t z)
+mpfr_mpz_init (mpz_ptr z)
{
if (MPFR_LIKELY (n_alloc > 0))
{
@@ -54,7 +54,7 @@
}
MPFR_HOT_FUNCTION_ATTR void
-mpfr_mpz_init2 (mpz_t z, mp_bitcnt_t n)
+mpfr_mpz_init2 (mpz_ptr z, mp_bitcnt_t n)
{
/* The condition on n is used below as the argument n will be ignored if
the mpz_t is obtained from the MPFR stack of previously used mpz_t.
@@ -82,7 +82,7 @@
MPFR_HOT_FUNCTION_ATTR void
-mpfr_mpz_clear (mpz_t z)
+mpfr_mpz_clear (mpz_ptr z)
{
/* We only put objects with at most MPFR_POOL_MAX_SIZE in the mpz_t pool,
to avoid it takes too much memory (and anyway the speedup is mainly
diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c
--- mpfr-4.1.0-a/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000
+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:48:27.354242922 +0000
@@ -64,7 +64,7 @@
/* allocate and set to (0,1) */
void
-mpfr_random_deviate_init (mpfr_random_deviate_t x)
+mpfr_random_deviate_init (mpfr_random_deviate_ptr x)
{
mpz_init (x->f);
x->e = 0;
@@ -72,21 +72,22 @@
/* reset to (0,1) */
void
-mpfr_random_deviate_reset (mpfr_random_deviate_t x)
+mpfr_random_deviate_reset (mpfr_random_deviate_ptr x)
{
x->e = 0;
}
/* deallocate */
void
-mpfr_random_deviate_clear (mpfr_random_deviate_t x)
+mpfr_random_deviate_clear (mpfr_random_deviate_ptr x)
{
mpz_clear (x->f);
}
/* swap two random deviates */
void
-mpfr_random_deviate_swap (mpfr_random_deviate_t x, mpfr_random_deviate_t y)
+mpfr_random_deviate_swap (mpfr_random_deviate_ptr x,
+ mpfr_random_deviate_ptr y)
{
mpfr_random_size_t s;
unsigned long t;
@@ -107,7 +108,7 @@
/* ensure x has at least k bits */
static void
-random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k,
+random_deviate_generate (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
gmp_randstate_t r, mpz_t t)
{
/* Various compile time checks on mpfr_random_deviate_t */
@@ -223,7 +224,7 @@
/* return position of leading bit, counting from 1 */
static mpfr_random_size_t
-random_deviate_leading_bit (mpfr_random_deviate_t x, gmp_randstate_t r)
+random_deviate_leading_bit (mpfr_random_deviate_ptr x, gmp_randstate_t r)
{
mpfr_random_size_t l;
random_deviate_generate (x, W, r, 0);
@@ -243,7 +244,7 @@
/* return kth bit of fraction, representing 2^-k */
int
-mpfr_random_deviate_tstbit (mpfr_random_deviate_t x, mpfr_random_size_t k,
+mpfr_random_deviate_tstbit (mpfr_random_deviate_ptr x, mpfr_random_size_t k,
gmp_randstate_t r)
{
if (k == 0)
@@ -256,7 +257,8 @@
/* compare two random deviates, x < y */
int
-mpfr_random_deviate_less (mpfr_random_deviate_t x, mpfr_random_deviate_t y,
+mpfr_random_deviate_less (mpfr_random_deviate_ptr x,
+ mpfr_random_deviate_ptr y,
gmp_randstate_t r)
{
mpfr_random_size_t k = 1;
@@ -280,7 +282,7 @@
/* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
int
mpfr_random_deviate_value (int neg, unsigned long n,
- mpfr_random_deviate_t x, mpfr_t z,
+ mpfr_random_deviate_ptr x, mpfr_ptr z,
gmp_randstate_t r, mpfr_rnd_t rnd)
{
/* r is used to add as many bits as necessary to match the precision of z */
diff -Naurd mpfr-4.1.0-a/src/random_deviate.h mpfr-4.1.0-b/src/random_deviate.h
--- mpfr-4.1.0-a/src/random_deviate.h 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/random_deviate.h 2021-02-11 12:48:27.354242922 +0000
@@ -76,7 +76,7 @@
/* set mpfr_t z = (neg ? -1 : 1) * (n + x) */
__MPFR_DECLSPEC int
mpfr_random_deviate_value (int, unsigned long,
- mpfr_random_deviate_ptr, mpfr_t,
+ mpfr_random_deviate_ptr, mpfr_ptr,
gmp_randstate_t, mpfr_rnd_t);
#if defined(__cplusplus)
diff -Naurd mpfr-4.1.0-a/src/rndna.c mpfr-4.1.0-b/src/rndna.c
--- mpfr-4.1.0-a/src/rndna.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/rndna.c 2021-02-11 12:48:27.354242922 +0000
@@ -61,7 +61,7 @@
and prepares rop to give it one more bit of precision
and to save its old value within it. */
void
-mpfr_round_nearest_away_begin (mpfr_t rop)
+mpfr_round_nearest_away_begin (mpfr_ptr rop)
{
mpfr_t tmp;
mp_size_t xsize;
@@ -129,7 +129,7 @@
copying it back the result of the applied function
and performing additional roundings. */
int
-mpfr_round_nearest_away_end (mpfr_t rop, int inex)
+mpfr_round_nearest_away_end (mpfr_ptr rop, int inex)
{
mpfr_t tmp;
mp_size_t xsize;
diff -Naurd mpfr-4.1.0-a/src/set_sj.c mpfr-4.1.0-b/src/set_sj.c
--- mpfr-4.1.0-a/src/set_sj.c 2020-06-01 10:39:52.000000000 +0000
+++ mpfr-4.1.0-b/src/set_sj.c 2021-02-11 12:48:27.354242922 +0000
@@ -26,13 +26,13 @@
#ifdef _MPFR_H_HAVE_INTMAX_T
int
-mpfr_set_sj (mpfr_t x, intmax_t j, mpfr_rnd_t rnd)
+mpfr_set_sj (mpfr_ptr x, intmax_t j, mpfr_rnd_t rnd)
{
return mpfr_set_sj_2exp (x, j, 0, rnd);
}
int
-mpfr_set_sj_2exp (mpfr_t x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
+mpfr_set_sj_2exp (mpfr_ptr x, intmax_t j, intmax_t e, mpfr_rnd_t rnd)
{
if (j >= 0)
return mpfr_set_uj_2exp (x, j, e, rnd);
diff -Naurd mpfr-4.1.0-a/src/set_str.c mpfr-4.1.0-b/src/set_str.c
--- mpfr-4.1.0-a/src/set_str.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/set_str.c 2021-02-11 12:48:27.354242922 +0000
@@ -23,7 +23,7 @@
#include "mpfr-impl.h"
int
-mpfr_set_str (mpfr_t x, const char *str, int base, mpfr_rnd_t rnd)
+mpfr_set_str (mpfr_ptr x, const char *str, int base, mpfr_rnd_t rnd)
{
char *p;
diff -Naurd mpfr-4.1.0-a/src/set_uj.c mpfr-4.1.0-b/src/set_uj.c
--- mpfr-4.1.0-a/src/set_uj.c 2020-06-01 10:39:52.000000000 +0000
+++ mpfr-4.1.0-b/src/set_uj.c 2021-02-11 12:48:27.354242922 +0000
@@ -29,13 +29,13 @@
#define uintmaxpml (sizeof(uintmax_t) / sizeof(mp_limb_t))
int
-mpfr_set_uj (mpfr_t x, uintmax_t j, mpfr_rnd_t rnd)
+mpfr_set_uj (mpfr_ptr x, uintmax_t j, mpfr_rnd_t rnd)
{
return mpfr_set_uj_2exp (x, j, 0, rnd);
}
int
-mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
+mpfr_set_uj_2exp (mpfr_ptr x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd)
{
int cnt, inex;
mp_size_t i, k;
diff -Naurd mpfr-4.1.0-a/src/sin_cos.c mpfr-4.1.0-b/src/sin_cos.c
--- mpfr-4.1.0-a/src/sin_cos.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/sin_cos.c 2021-02-11 12:48:27.354242922 +0000
@@ -463,7 +463,7 @@
Return err such that the relative error is bounded by 2^err ulps.
*/
static int
-sincos_aux (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
+sincos_aux (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd_mode)
{
mpfr_prec_t prec_s, sh;
mpz_t Q, S, C, Q2, S2, C2, y;
@@ -577,7 +577,7 @@
Assumes s differs from c.
*/
int
-mpfr_sincos_fast (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd)
+mpfr_sincos_fast (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd)
{
int inexs, inexc;
mpfr_t x_red, ts, tc;
diff -Naurd mpfr-4.1.0-a/src/strtofr.c mpfr-4.1.0-b/src/strtofr.c
--- mpfr-4.1.0-a/src/strtofr.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/strtofr.c 2021-02-11 12:48:27.354242922 +0000
@@ -226,7 +226,7 @@
BUT if it returns 0 (NAN or INF), the ternary value is also '0'
(ie NAN and INF are exact) */
static int
-parse_string (mpfr_t x, struct parsed_string *pstr,
+parse_string (mpfr_ptr x, struct parsed_string *pstr,
const char **string, int base)
{
const char *str = *string;
@@ -451,7 +451,7 @@
and the precision of x.
Returns the ternary value. */
static int
-parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd)
+parsed_string_to_mpfr (mpfr_ptr x, struct parsed_string *pstr, mpfr_rnd_t rnd)
{
mpfr_prec_t precx, prec, ysize_bits, pstr_size;
mpfr_exp_t exp;
@@ -934,7 +934,7 @@
}
int
-mpfr_strtofr (mpfr_t x, const char *string, char **end, int base,
+mpfr_strtofr (mpfr_ptr x, const char *string, char **end, int base,
mpfr_rnd_t rnd)
{
int res;
diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c
--- mpfr-4.1.0-a/src/vasprintf.c 2020-06-01 10:39:52.000000000 +0000
+++ mpfr-4.1.0-b/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000
@@ -963,7 +963,7 @@
#define NDIGITS 8
MPFR_RETURNS_NONNULL static char *
-mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, const mpfr_t op,
+mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, mpfr_srcptr op,
const struct printf_spec spec)
{
size_t ndigits;
diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c
--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:46:49.115316335 +0000
+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:48:27.370242746 +0000
@@ -25,5 +25,5 @@
const char *
mpfr_get_version (void)
{
- return "4.1.0-p3";
+ return "4.1.0-p4";
}
diff -Naurd mpfr-4.1.0-a/src/zeta.c mpfr-4.1.0-b/src/zeta.c
--- mpfr-4.1.0-a/src/zeta.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/src/zeta.c 2021-02-11 12:48:27.354242922 +0000
@@ -35,7 +35,7 @@
sum(tc[i]*product((s+2j)*(s+2j-1)/n^2,j=1..i-1), i=1..p)*s*n^(-s-1)
*/
static void
-mpfr_zeta_part_b (mpfr_t b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
+mpfr_zeta_part_b (mpfr_ptr b, mpfr_srcptr s, int n, int p, mpfr_t *tc)
{
mpfr_t s1, d, u;
unsigned long n2;
@@ -130,7 +130,7 @@
n - an integer
Output: sum - a floating-point number approximating sum(1/i^s, i=1..n-1) */
static void
-mpfr_zeta_part_a (mpfr_t sum, mpfr_srcptr s, int n)
+mpfr_zeta_part_a (mpfr_ptr sum, mpfr_srcptr s, int n)
{
mpfr_t u, s1;
int i;
@@ -158,7 +158,7 @@
Output: z - Zeta(s) rounded to the precision of z with direction rnd_mode
*/
static int
-mpfr_zeta_pos (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
+mpfr_zeta_pos (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
{
mpfr_t b, c, z_pre, f, s1;
double beta, sd, dnep;
@@ -356,8 +356,8 @@
At input, p is Pi rounded down.
The comments in the code are for rnd = RNDD. */
static void
-mpfr_reflection_overflow (mpfr_t z, mpfr_t s1, const mpfr_t s, mpfr_t y,
- mpfr_t p, mpfr_rnd_t rnd)
+mpfr_reflection_overflow (mpfr_ptr z, mpfr_ptr s1, mpfr_srcptr s, mpfr_ptr y,
+ mpfr_ptr p, mpfr_rnd_t rnd)
{
mpz_t sint;
@@ -432,7 +432,7 @@
}
int
-mpfr_zeta (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
+mpfr_zeta (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode)
{
mpfr_t z_pre, s1, y, p;
long add;
diff -Naurd mpfr-4.1.0-a/tests/tcmp2.c mpfr-4.1.0-b/tests/tcmp2.c
--- mpfr-4.1.0-a/tests/tcmp2.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/tests/tcmp2.c 2021-02-11 12:48:27.350242965 +0000
@@ -24,7 +24,7 @@
/* set bit n of x to b, where bit 0 is the most significant one */
static void
-set_bit (mpfr_t x, unsigned int n, int b)
+set_bit (mpfr_ptr x, unsigned int n, int b)
{
unsigned l;
mp_size_t xn;
diff -Naurd mpfr-4.1.0-a/tests/tdiv.c mpfr-4.1.0-b/tests/tdiv.c
--- mpfr-4.1.0-a/tests/tdiv.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/tests/tdiv.c 2021-02-11 12:48:27.350242965 +0000
@@ -369,7 +369,7 @@
/* given y = o(x/u), x, u, find the inexact flag by
multiplying y by u */
static int
-get_inexact (mpfr_t y, mpfr_t x, mpfr_t u)
+get_inexact (mpfr_ptr y, mpfr_ptr x, mpfr_ptr u)
{
mpfr_t xx;
int inex;
diff -Naurd mpfr-4.1.0-a/tests/teq.c mpfr-4.1.0-b/tests/teq.c
--- mpfr-4.1.0-a/tests/teq.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/tests/teq.c 2021-02-11 12:48:27.350242965 +0000
@@ -23,7 +23,7 @@
#include "mpfr-test.h"
static void
-teq (mpfr_t x)
+teq (mpfr_ptr x)
{
mpfr_t y;
unsigned long k, px, mx;
diff -Naurd mpfr-4.1.0-a/tests/terandom_chisq.c mpfr-4.1.0-b/tests/terandom_chisq.c
--- mpfr-4.1.0-a/tests/terandom_chisq.c 2020-01-08 18:11:13.000000000 +0000
+++ mpfr-4.1.0-b/tests/terandom_chisq.c 2021-02-11 12:48:27.350242965 +0000
@@ -26,7 +26,7 @@
* exponential distribution. We only take differences of this function so the
* offset doesn't matter; here Phi(0) = 0. */
static void
-exponential_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd)
+exponential_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd)
{
mpfr_neg (z, x, rnd);
mpfr_expm1 (z, z, rnd);
@@ -43,7 +43,7 @@