MPILIB: Provide count_leading/trailing_zeros() based on arch functions

Provide count_leading/trailing_zeros() macros based on extant arch bit scanning functions rather than reimplementing from scratch in MPILIB. Whilst we're at it, turn count_foo_zeros(n, x) into n = count_foo_zeros(x). Also move the definition to asm-generic as other people may be interested in using it. Signed-off-by: David Howells <dhowells@redhat.com> Cc: David S. Miller <davem@davemloft.net> Cc: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Cc: Arnd Bergmann <arnd@arndb.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

MPILIB: Provide count_leading/trailing_zeros() based on arch functions
Provide count_leading/trailing_zeros() macros based on extant arch bit scanning functions rather than reimplementing from scratch in MPILIB. Whilst we're at it, turn count_foo_zeros(n, x) into n = count_foo_zeros(x). Also move the definition to asm-generic as other people may be interested in using it. Signed-off-by: David Howells <dhowells@redhat.com> Cc: David S. Miller <davem@davemloft.net> Cc: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Cc: Arnd Bergmann <arnd@arndb.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
David Howells · Rusty Russell
1 parent cf7f601c06
Showing 4 changed files with 62 additions and 139 deletions Side-by-side Diff
include/asm-generic/bitops/count_zeros.h
lib/mpi/longlong.h
lib/mpi/mpi-bit.c
lib/mpi/mpi-pow.c
+/* Count leading and trailing zeros functions
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+#define _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
+
+#include <asm/bitops.h>
+
+/**
+ * count_leading_zeros - Count the number of zeros from the MSB back
+ * @x: The value
+ *
+ * Count the number of leading zeros from the MSB going towards the LSB in @x.
+ *
+ * If the MSB of @x is set, the result is 0.
+ * If only the LSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_LEADING_ZEROS_0.
+ */
+static inline int count_leading_zeros(unsigned long x)
+{
+	if (sizeof(x) == 4)
+		return BITS_PER_LONG - fls(x);
+	else
+		return BITS_PER_LONG - fls64(x);
+}
+
+#define COUNT_LEADING_ZEROS_0 BITS_PER_LONG
+
+/**
+ * count_trailing_zeros - Count the number of zeros from the LSB forwards
+ * @x: The value
+ *
+ * Count the number of trailing zeros from the LSB going towards the MSB in @x.
+ *
+ * If the LSB of @x is set, the result is 0.
+ * If only the MSB of @x is set, then the result is BITS_PER_LONG-1.
+ * If @x is 0 then the result is COUNT_TRAILING_ZEROS_0.
+ */
+static inline int count_trailing_zeros(unsigned long x)
+{
+#define COUNT_TRAILING_ZEROS_0 (-1)
+
+	if (sizeof(x) == 4)
+		return ffs(x);
+	else
+		return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0;
+}
+
+#endif /* _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_ */
@@ -19,6 +19,8 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA. */
  
+#include <asm-generic/bitops/count_zeros.h>
+
 /* You have to define the following before including this file:
  *
  * UWtype -- An unsigned type, default type for operations (typically a "word")
@@ -146,12 +148,6 @@
 	: "1" ((USItype)(n1)), \
 		"r" ((USItype)(n0)), \
 		"r" ((USItype)(d)))
-
-#define count_leading_zeros(count, x) \
-	__asm__ ("clz %0,%1" \
-	: "=r" ((USItype)(count)) \
-	: "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
 #endif /* __a29k__ */
  
 #if defined(__alpha) && W_TYPE_SIZE == 64
@@ -298,11 +294,6 @@
 	: "1" ((USItype)(nh)), \
 		"0" ((USItype)(nl)), \
 		"g" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-	__asm__ ("bsch/1 %1,%0" \
-	: "=g" (count) \
-	: "g" ((USItype)(x)), \
-	     "0" ((USItype)0))
 #endif
  
 /***************************************
@@ -354,27 +345,6 @@
 } while (0)
 extern USItype __udiv_qrnnd();
 #endif /* LONGLONG_STANDALONE */
-#define count_leading_zeros(count, x) \
-do { \
-	USItype __tmp; \
-	__asm__ ( \
-	"ldi             1,%0\n" \
-	"extru,=	%1,15,16,%%r0  ; Bits 31..16 zero?\n" \
-	"extru,tr	%1,15,16,%1    ; No.  Shift down, skip add.\n" \
-	"ldo		16(%0),%0      ; Yes.	Perform add.\n" \
-	"extru,=	%1,23,8,%%r0   ; Bits 15..8 zero?\n" \
-	"extru,tr	%1,23,8,%1     ; No.  Shift down, skip add.\n" \
-	"ldo		8(%0),%0       ; Yes.	Perform add.\n" \
-	"extru,=	%1,27,4,%%r0   ; Bits 7..4 zero?\n" \
-	"extru,tr	%1,27,4,%1     ; No.  Shift down, skip add.\n" \
-	"ldo		4(%0),%0       ; Yes.	Perform add.\n" \
-	"extru,=	%1,29,2,%%r0   ; Bits 3..2 zero?\n" \
-	"extru,tr	%1,29,2,%1     ; No.  Shift down, skip add.\n" \
-	"ldo		2(%0),%0       ; Yes.	Perform add.\n" \
-	"extru		%1,30,1,%1     ; Extract bit 1.\n" \
-	"sub		%0,%1,%0       ; Subtract it.              " \
-	: "=r" (count), "=r" (__tmp) : "1" (x)); \
-} while (0)
 #endif /* hppa */
  
 /***************************************
@@ -457,15 +427,6 @@
 	: "0" ((USItype)(n0)), \
 	     "1" ((USItype)(n1)), \
 	     "rm" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-do { \
-	USItype __cbtmp; \
-	__asm__ ("bsrl %1,%0" \
-	: "=r" (__cbtmp) : "rm" ((USItype)(x))); \
-	(count) = __cbtmp ^ 31; \
-} while (0)
-#define count_trailing_zeros(count, x) \
-	__asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x)))
 #ifndef UMUL_TIME
 #define UMUL_TIME 40
 #endif
@@ -536,15 +497,6 @@
 	     "dI" ((USItype)(d))); \
 	(r) = __rq.__i.__l; (q) = __rq.__i.__h; \
 } while (0)
-#define count_leading_zeros(count, x) \
-do { \
-	USItype __cbtmp; \
-	__asm__ ("scanbit %1,%0" \
-	: "=r" (__cbtmp) \
-	: "r" ((USItype)(x))); \
-	(count) = __cbtmp ^ 31; \
-} while (0)
-#define COUNT_LEADING_ZEROS_0 (-32)	/* sic */
 #if defined(__i960mx)		/* what is the proper symbol to test??? */
 #define rshift_rhlc(r, h, l, c) \
 do { \
@@ -603,11 +555,6 @@
 	: "0" ((USItype)(n0)), \
 	     "1" ((USItype)(n1)), \
 	     "dmi" ((USItype)(d)))
-#define count_leading_zeros(count, x) \
-	__asm__ ("bfffo %1{%b2:%b2},%0" \
-	: "=d" ((USItype)(count)) \
-	: "od" ((USItype)(x)), "n" (0))
-#define COUNT_LEADING_ZEROS_0 32
 #else /* not mc68020 */
 #define umul_ppmm(xh, xl, a, b) \
 do { USItype __umul_tmp1, __umul_tmp2; \
@@ -664,15 +611,6 @@
 	     "rJ" ((USItype)(bh)), \
 	     "rJ" ((USItype)(al)), \
 	     "rJ" ((USItype)(bl)))
-#define count_leading_zeros(count, x) \
-do { \
-	USItype __cbtmp; \
-	__asm__ ("ff1 %0,%1" \
-	: "=r" (__cbtmp) \
-	: "r" ((USItype)(x))); \
-	(count) = __cbtmp ^ 31; \
-} while (0)
-#define COUNT_LEADING_ZEROS_0 63	/* sic */
 #if defined(__m88110__)
 #define umul_ppmm(wh, wl, u, v) \
 do { \
@@ -779,12 +717,6 @@
 	: "0" (__xx.__ll), \
 	     "g" ((USItype)(d))); \
 	(r) = __xx.__i.__l; (q) = __xx.__i.__h; })
-#define count_trailing_zeros(count, x) \
-do { \
-	__asm__("ffsd      %2,%0" \
-	: "=r"((USItype) (count)) \
-	: "0"((USItype) 0), "r"((USItype) (x))); \
-	} while (0)
 #endif /* __ns32000__ */
  
 /***************************************
@@ -855,11 +787,6 @@
 		"rI" ((USItype)(al)), \
 		"r" ((USItype)(bl))); \
 } while (0)
-#define count_leading_zeros(count, x) \
-	__asm__ ("{cntlz|cntlzw} %0,%1" \
-	: "=r" ((USItype)(count)) \
-	: "r" ((USItype)(x)))
-#define COUNT_LEADING_ZEROS_0 32
 #if defined(_ARCH_PPC)
 #define umul_ppmm(ph, pl, m0, m1) \
 do { \
@@ -1001,19 +928,6 @@
 } while (0)
 #define UMUL_TIME 20
 #define UDIV_TIME 200
-#define count_leading_zeros(count, x) \
-do { \
-	if ((x) >= 0x10000) \
-		__asm__ ("clz     %0,%1" \
-		: "=r" ((USItype)(count)) \
-		: "r" ((USItype)(x) >> 16)); \
-	else { \
-		__asm__ ("clz   %0,%1" \
-		: "=r" ((USItype)(count)) \
-		: "r" ((USItype)(x))); \
-		(count) += 16; \
-	} \
-} while (0)
 #endif /* RT/ROMP */
  
 /***************************************
@@ -1142,13 +1056,6 @@
 	"rI" ((USItype)(d)) \
 	: "%g1" __AND_CLOBBER_CC)
 #define UDIV_TIME 37
-#define count_leading_zeros(count, x) \
-	__asm__ ("scan %1,0,%0" \
-	: "=r" ((USItype)(x)) \
-	: "r" ((USItype)(count)))
-/* Early sparclites return 63 for an argument of 0, but they warn that future
-	implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0
-	undefined.  */
 #endif /* __sparclite__ */
 #endif /* __sparc_v8__ */
 	/* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd.  */
@@ -1452,47 +1359,6 @@
 #if !defined(udiv_qrnnd)
 #define UDIV_NEEDS_NORMALIZATION 1
 #define udiv_qrnnd __udiv_qrnnd_c
-#endif
-
-#undef count_leading_zeros
-#if !defined(count_leading_zeros)
-	extern
-#ifdef __STDC__
-			const
-#endif
-			unsigned char __clz_tab[];
-#define count_leading_zeros(count, x) \
-do { \
-	UWtype __xr = (x); \
-	UWtype __a; \
-	\
-	if (W_TYPE_SIZE <= 32) { \
-		__a = __xr < ((UWtype) 1 << 2*__BITS4) \
-		? (__xr < ((UWtype) 1 << __BITS4) ? 0 : __BITS4) \
-		: (__xr < ((UWtype) 1 << 3*__BITS4) ?  2*__BITS4 : 3*__BITS4); \
-	} \
-	else { \
-		for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \
-			if (((__xr >> __a) & 0xff) != 0) \
-				break; \
-	} \
-	\
-	(count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a); \
-} while (0)
-	/* This version gives a well-defined value for zero. */
-#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
-#endif
-
-#if !defined(count_trailing_zeros)
-/* Define count_trailing_zeros using count_leading_zeros.  The latter might be
-	defined in asm, but if it is not, the C version above is good enough.  */
-#define count_trailing_zeros(count, x) \
-do { \
-	UWtype __ctz_x = (x); \
-	UWtype __ctz_c; \
-	count_leading_zeros(__ctz_c, __ctz_x & -__ctz_x); \
-	(count) = W_TYPE_SIZE - 1 - __ctz_c; \
-} while (0)
 #endif
  
 #ifndef UDIV_NEEDS_NORMALIZATION
@@ -45,7 +45,7 @@
 	if (a->nlimbs) {
 		mpi_limb_t alimb = a->d[a->nlimbs - 1];
 		if (alimb)
-			count_leading_zeros(n, alimb);
+			n = count_leading_zeros(alimb);
 		else
 			n = BITS_PER_MPI_LIMB;
 		n = BITS_PER_MPI_LIMB - n + (a->nlimbs - 1) * BITS_PER_MPI_LIMB;
@@ -77,7 +77,7 @@
 	mp = mp_marker = mpi_alloc_limb_space(msize);
 	if (!mp)
 		goto enomem;
-	count_leading_zeros(mod_shift_cnt, mod->d[msize - 1]);
+	mod_shift_cnt = count_leading_zeros(mod->d[msize - 1]);
 	if (mod_shift_cnt)
 		mpihelp_lshift(mp, mod->d, msize, mod_shift_cnt);
 	else
@@ -169,7 +169,7 @@
  
 		i = esize - 1;
 		e = ep[i];
-		count_leading_zeros(c, e);
+		c = count_leading_zeros(e);
 		e = (e << c) << 1;	/* shift the exp bits to the left, lose msb */
 		c = BITS_PER_MPI_LIMB - 1 - c;
	1	+/* Count leading and trailing zeros functions
	2	+ *
	3	+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
	4	+ * Written by David Howells (dhowells@redhat.com)
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or
	7	+ * modify it under the terms of the GNU General Public Licence
	8	+ * as published by the Free Software Foundation; either version
	9	+ * 2 of the Licence, or (at your option) any later version.
	10	+ */
	11	+
	12	+#ifndef _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
	13	+#define _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_
	14	+
	15	+#include <asm/bitops.h>
	16	+
	17	+/**
	18	+ * count_leading_zeros - Count the number of zeros from the MSB back
	19	+ * @x: The value
	20	+ *
	21	+ * Count the number of leading zeros from the MSB going towards the LSB in @x.
	22	+ *
	23	+ * If the MSB of @x is set, the result is 0.
	24	+ * If only the LSB of @x is set, then the result is BITS_PER_LONG-1.
	25	+ * If @x is 0 then the result is COUNT_LEADING_ZEROS_0.
	26	+ */
	27	+static inline int count_leading_zeros(unsigned long x)
	28	+{
	29	+ if (sizeof(x) == 4)
	30	+ return BITS_PER_LONG - fls(x);
	31	+ else
	32	+ return BITS_PER_LONG - fls64(x);
	33	+}
	34	+
	35	+#define COUNT_LEADING_ZEROS_0 BITS_PER_LONG
	36	+
	37	+/**
	38	+ * count_trailing_zeros - Count the number of zeros from the LSB forwards
	39	+ * @x: The value
	40	+ *
	41	+ * Count the number of trailing zeros from the LSB going towards the MSB in @x.
	42	+ *
	43	+ * If the LSB of @x is set, the result is 0.
	44	+ * If only the MSB of @x is set, then the result is BITS_PER_LONG-1.
	45	+ * If @x is 0 then the result is COUNT_TRAILING_ZEROS_0.
	46	+ */
	47	+static inline int count_trailing_zeros(unsigned long x)
	48	+{
	49	+#define COUNT_TRAILING_ZEROS_0 (-1)
	50	+
	51	+ if (sizeof(x) == 4)
	52	+ return ffs(x);
	53	+ else
	54	+ return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0;
	55	+}
	56	+
	57	+#endif /* _ASM_GENERIC_BITOPS_COUNT_ZEROS_H_ */
...	...	@@ -19,6 +19,8 @@
19	19	* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
20	20	* MA 02111-1307, USA. */
21	21
	22	+#include <asm-generic/bitops/count_zeros.h>
	23	+
22	24	/* You have to define the following before including this file:
23	25	*
24	26	* UWtype -- An unsigned type, default type for operations (typically a "word")
...	...	@@ -146,12 +148,6 @@
146	148	: "1" ((USItype)(n1)), \
147	149	"r" ((USItype)(n0)), \
148	150	"r" ((USItype)(d)))
149		-
150		-#define count_leading_zeros(count, x) \
151		- __asm__ ("clz %0,%1" \
152		- : "=r" ((USItype)(count)) \
153		- : "r" ((USItype)(x)))
154		-#define COUNT_LEADING_ZEROS_0 32
155	151	#endif /* __a29k__ */
156	152
157	153	#if defined(__alpha) && W_TYPE_SIZE == 64
...	...	@@ -298,11 +294,6 @@
298	294	: "1" ((USItype)(nh)), \
299	295	"0" ((USItype)(nl)), \
300	296	"g" ((USItype)(d)))
301		-#define count_leading_zeros(count, x) \
302		- __asm__ ("bsch/1 %1,%0" \
303		- : "=g" (count) \
304		- : "g" ((USItype)(x)), \
305		- "0" ((USItype)0))
306	297	#endif
307	298
308	299	/***************************************
...	...	@@ -354,27 +345,6 @@
354	345	} while (0)
355	346	extern USItype __udiv_qrnnd();
356	347	#endif /* LONGLONG_STANDALONE */
357		-#define count_leading_zeros(count, x) \
358		-do { \
359		- USItype __tmp; \
360		- __asm__ ( \
361		- "ldi 1,%0\n" \
362		- "extru,= %1,15,16,%%r0 ; Bits 31..16 zero?\n" \
363		- "extru,tr %1,15,16,%1 ; No. Shift down, skip add.\n" \
364		- "ldo 16(%0),%0 ; Yes. Perform add.\n" \
365		- "extru,= %1,23,8,%%r0 ; Bits 15..8 zero?\n" \
366		- "extru,tr %1,23,8,%1 ; No. Shift down, skip add.\n" \
367		- "ldo 8(%0),%0 ; Yes. Perform add.\n" \
368		- "extru,= %1,27,4,%%r0 ; Bits 7..4 zero?\n" \
369		- "extru,tr %1,27,4,%1 ; No. Shift down, skip add.\n" \
370		- "ldo 4(%0),%0 ; Yes. Perform add.\n" \
371		- "extru,= %1,29,2,%%r0 ; Bits 3..2 zero?\n" \
372		- "extru,tr %1,29,2,%1 ; No. Shift down, skip add.\n" \
373		- "ldo 2(%0),%0 ; Yes. Perform add.\n" \
374		- "extru %1,30,1,%1 ; Extract bit 1.\n" \
375		- "sub %0,%1,%0 ; Subtract it. " \
376		- : "=r" (count), "=r" (__tmp) : "1" (x)); \
377		-} while (0)
378	348	#endif /* hppa */
379	349
380	350	/***************************************
...	...	@@ -457,15 +427,6 @@
457	427	: "0" ((USItype)(n0)), \
458	428	"1" ((USItype)(n1)), \
459	429	"rm" ((USItype)(d)))
460		-#define count_leading_zeros(count, x) \
461		-do { \
462		- USItype __cbtmp; \
463		- __asm__ ("bsrl %1,%0" \
464		- : "=r" (__cbtmp) : "rm" ((USItype)(x))); \
465		- (count) = __cbtmp ^ 31; \
466		-} while (0)
467		-#define count_trailing_zeros(count, x) \
468		- __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x)))
469	430	#ifndef UMUL_TIME
470	431	#define UMUL_TIME 40
471	432	#endif
...	...	@@ -536,15 +497,6 @@
536	497	"dI" ((USItype)(d))); \
537	498	(r) = __rq.__i.__l; (q) = __rq.__i.__h; \
538	499	} while (0)
539		-#define count_leading_zeros(count, x) \
540		-do { \
541		- USItype __cbtmp; \
542		- __asm__ ("scanbit %1,%0" \
543		- : "=r" (__cbtmp) \
544		- : "r" ((USItype)(x))); \
545		- (count) = __cbtmp ^ 31; \
546		-} while (0)
547		-#define COUNT_LEADING_ZEROS_0 (-32) /* sic */
548	500	#if defined(__i960mx) /* what is the proper symbol to test??? */
549	501	#define rshift_rhlc(r, h, l, c) \
550	502	do { \
...	...	@@ -603,11 +555,6 @@
603	555	: "0" ((USItype)(n0)), \
604	556	"1" ((USItype)(n1)), \
605	557	"dmi" ((USItype)(d)))
606		-#define count_leading_zeros(count, x) \
607		- __asm__ ("bfffo %1{%b2:%b2},%0" \
608		- : "=d" ((USItype)(count)) \
609		- : "od" ((USItype)(x)), "n" (0))
610		-#define COUNT_LEADING_ZEROS_0 32
611	558	#else /* not mc68020 */
612	559	#define umul_ppmm(xh, xl, a, b) \
613	560	do { USItype __umul_tmp1, __umul_tmp2; \
...	...	@@ -664,15 +611,6 @@
664	611	"rJ" ((USItype)(bh)), \
665	612	"rJ" ((USItype)(al)), \
666	613	"rJ" ((USItype)(bl)))
667		-#define count_leading_zeros(count, x) \
668		-do { \
669		- USItype __cbtmp; \
670		- __asm__ ("ff1 %0,%1" \
671		- : "=r" (__cbtmp) \
672		- : "r" ((USItype)(x))); \
673		- (count) = __cbtmp ^ 31; \
674		-} while (0)
675		-#define COUNT_LEADING_ZEROS_0 63 /* sic */
676	614	#if defined(__m88110__)
677	615	#define umul_ppmm(wh, wl, u, v) \
678	616	do { \
...	...	@@ -779,12 +717,6 @@
779	717	: "0" (__xx.__ll), \
780	718	"g" ((USItype)(d))); \
781	719	(r) = __xx.__i.__l; (q) = __xx.__i.__h; })
782		-#define count_trailing_zeros(count, x) \
783		-do { \
784		- __asm__("ffsd %2,%0" \
785		- : "=r"((USItype) (count)) \
786		- : "0"((USItype) 0), "r"((USItype) (x))); \
787		- } while (0)
788	720	#endif /* __ns32000__ */
789	721
790	722	/***************************************
...	...	@@ -855,11 +787,6 @@
855	787	"rI" ((USItype)(al)), \
856	788	"r" ((USItype)(bl))); \
857	789	} while (0)
858		-#define count_leading_zeros(count, x) \
859		- __asm__ ("{cntlz\|cntlzw} %0,%1" \
860		- : "=r" ((USItype)(count)) \
861		- : "r" ((USItype)(x)))
862		-#define COUNT_LEADING_ZEROS_0 32
863	790	#if defined(_ARCH_PPC)
864	791	#define umul_ppmm(ph, pl, m0, m1) \
865	792	do { \
...	...	@@ -1001,19 +928,6 @@
1001	928	} while (0)
1002	929	#define UMUL_TIME 20
1003	930	#define UDIV_TIME 200
1004		-#define count_leading_zeros(count, x) \
1005		-do { \
1006		- if ((x) >= 0x10000) \
1007		- __asm__ ("clz %0,%1" \
1008		- : "=r" ((USItype)(count)) \
1009		- : "r" ((USItype)(x) >> 16)); \
1010		- else { \
1011		- __asm__ ("clz %0,%1" \
1012		- : "=r" ((USItype)(count)) \
1013		- : "r" ((USItype)(x))); \
1014		- (count) += 16; \
1015		- } \
1016		-} while (0)
1017	931	#endif /* RT/ROMP */
1018	932
1019	933	/***************************************
...	...	@@ -1142,13 +1056,6 @@
1142	1056	"rI" ((USItype)(d)) \
1143	1057	: "%g1" __AND_CLOBBER_CC)
1144	1058	#define UDIV_TIME 37
1145		-#define count_leading_zeros(count, x) \
1146		- __asm__ ("scan %1,0,%0" \
1147		- : "=r" ((USItype)(x)) \
1148		- : "r" ((USItype)(count)))
1149		-/* Early sparclites return 63 for an argument of 0, but they warn that future
1150		- implementations might change this. Therefore, leave COUNT_LEADING_ZEROS_0
1151		- undefined. */
1152	1059	#endif /* __sparclite__ */
1153	1060	#endif /* __sparc_v8__ */
1154	1061	/* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd. */
...	...	@@ -1452,47 +1359,6 @@
1452	1359	#if !defined(udiv_qrnnd)
1453	1360	#define UDIV_NEEDS_NORMALIZATION 1
1454	1361	#define udiv_qrnnd __udiv_qrnnd_c
1455		-#endif
1456		-
1457		-#undef count_leading_zeros
1458		-#if !defined(count_leading_zeros)
1459		- extern
1460		-#ifdef __STDC__
1461		- const
1462		-#endif
1463		- unsigned char __clz_tab[];
1464		-#define count_leading_zeros(count, x) \
1465		-do { \
1466		- UWtype __xr = (x); \
1467		- UWtype __a; \
1468		- \
1469		- if (W_TYPE_SIZE <= 32) { \
1470		- __a = __xr < ((UWtype) 1 << 2*__BITS4) \
1471		- ? (__xr < ((UWtype) 1 << __BITS4) ? 0 : __BITS4) \
1472		- : (__xr < ((UWtype) 1 << 3__BITS4) ? 2__BITS4 : 3*__BITS4); \
1473		- } \
1474		- else { \
1475		- for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \
1476		- if (((__xr >> __a) & 0xff) != 0) \
1477		- break; \
1478		- } \
1479		- \
1480		- (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a); \
1481		-} while (0)
1482		- /* This version gives a well-defined value for zero. */
1483		-#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE
1484		-#endif
1485		-
1486		-#if !defined(count_trailing_zeros)
1487		-/* Define count_trailing_zeros using count_leading_zeros. The latter might be
1488		- defined in asm, but if it is not, the C version above is good enough. */
1489		-#define count_trailing_zeros(count, x) \
1490		-do { \
1491		- UWtype __ctz_x = (x); \
1492		- UWtype __ctz_c; \
1493		- count_leading_zeros(__ctz_c, __ctz_x & -__ctz_x); \
1494		- (count) = W_TYPE_SIZE - 1 - __ctz_c; \
1495		-} while (0)
1496	1362	#endif
1497	1363
1498	1364	#ifndef UDIV_NEEDS_NORMALIZATION
...	...	@@ -45,7 +45,7 @@
45	45	if (a->nlimbs) {
46	46	mpi_limb_t alimb = a->d[a->nlimbs - 1];
47	47	if (alimb)
48		- count_leading_zeros(n, alimb);
	48	+ n = count_leading_zeros(alimb);
49	49	else
50	50	n = BITS_PER_MPI_LIMB;
51	51	n = BITS_PER_MPI_LIMB - n + (a->nlimbs - 1) * BITS_PER_MPI_LIMB;
...	...	@@ -77,7 +77,7 @@
77	77	mp = mp_marker = mpi_alloc_limb_space(msize);
78	78	if (!mp)
79	79	goto enomem;
80		- count_leading_zeros(mod_shift_cnt, mod->d[msize - 1]);
	80	+ mod_shift_cnt = count_leading_zeros(mod->d[msize - 1]);
81	81	if (mod_shift_cnt)
82	82	mpihelp_lshift(mp, mod->d, msize, mod_shift_cnt);
83	83	else
...	...	@@ -169,7 +169,7 @@
169	169
170	170	i = esize - 1;
171	171	e = ep[i];
172		- count_leading_zeros(c, e);
	172	+ c = count_leading_zeros(e);
173	173	e = (e << c) << 1; /* shift the exp bits to the left, lose msb */
174	174	c = BITS_PER_MPI_LIMB - 1 - c;
175	175