[Gmp-commit] /var/hg/gmp: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/1c1457fcb48c
changeset: 17511:1c1457fcb48c
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Wed Dec 27 18:00:13 2017 +0100
description:
Use 64-bit cmp for size comparisons.

details:   /var/hg/gmp/rev/eed4ec2fc8ea
changeset: 17512:eed4ec2fc8ea
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Wed Dec 27 18:02:01 2017 +0100
description:
Trivial merge.

diffstat:

 ChangeLog                         |  5 +++++
 longlong.h                        |  2 --
 mpn/powerpc64/mode64/bdiv_q_1.asm |  6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 19d4782aaaca -r eed4ec2fc8ea ChangeLog
--- a/ChangeLog	Wed Dec 27 00:27:52 2017 +0100
+++ b/ChangeLog	Wed Dec 27 18:02:01 2017 +0100
@@ -1,3 +1,8 @@
+2017-12-27  Niels Möller  <nisse at lysator.liu.se>
+
+	* longlong.h (arm32/arm64): Leave COUNT_LEADING_ZEROS_0 undefined,
+	since we use gcc's __builtin_clzl, which doesn't allow zero inputs.
+
 2017-08-28  Torbjörn Granlund  <tg at gmplib.org>
 
 	* mpn/sparc64: Revert 2017-07-23 PIC changes.
diff -r 19d4782aaaca -r eed4ec2fc8ea longlong.h
--- a/longlong.h	Wed Dec 27 00:27:52 2017 +0100
+++ b/longlong.h	Wed Dec 27 18:02:01 2017 +0100
@@ -535,7 +535,6 @@
 #endif /* defined(__ARM_ARCH_2__) ... */
 #define count_leading_zeros(count, x)  count_leading_zeros_gcc_clz(count, x)
 #define count_trailing_zeros(count, x)  count_trailing_zeros_gcc_ctz(count, x)
-#define COUNT_LEADING_ZEROS_0 32
 #endif /* __arm__ */
 
 #if defined (__aarch64__) && W_TYPE_SIZE == 64
@@ -586,7 +585,6 @@
 #endif
 #define count_leading_zeros(count, x)  count_leading_zeros_gcc_clz(count, x)
 #define count_trailing_zeros(count, x)  count_trailing_zeros_gcc_ctz(count, x)
-#define COUNT_LEADING_ZEROS_0 64
 #endif /* __aarch64__ */
 
 #if defined (__clipper__) && W_TYPE_SIZE == 32
diff -r 19d4782aaaca -r eed4ec2fc8ea mpn/powerpc64/mode64/bdiv_q_1.asm
--- a/mpn/powerpc64/mode64/bdiv_q_1.asm	Wed Dec 27 00:27:52 2017 +0100
+++ b/mpn/powerpc64/mode64/bdiv_q_1.asm	Wed Dec 27 18:02:01 2017 +0100
@@ -56,7 +56,7 @@
 
 PROLOGUE(mpn_bdiv_q_1,toc)
 	addi	r7, n, -1
-	cmpi	cr1, n, 1
+	cmpdi	cr1, n, 1
 	ld	r12, 0(up)
 	li	cnt, 0
 	neg	r0, d
@@ -92,10 +92,10 @@
 EPILOGUE()
 
 PROLOGUE(mpn_pi1_bdiv_q_1)
-	cmpi	cr0, cnt, 0
+	cmpdi	cr0, cnt, 0
 	ld	r12, 0(up)
 	addic	r0, n, -1		C set carry as side effect
-	cmpi	cr1, n, 1
+	cmpdi	cr1, n, 1
 	mtctr	r0
 	beq	cr0, L(norm)