patch-2.4.0-test8 linux/include/asm-alpha/bitops.h

• Lines: 28
• Date: Mon Aug 28 21:21:57 2000
• Orig file: v2.4.0-test7/linux/include/asm-alpha/bitops.h
• Orig date: Wed Aug 23 18:36:39 2000

diff -u --recursive --new-file v2.4.0-test7/linux/include/asm-alpha/bitops.h linux/include/asm-alpha/bitops.h
@@ -175,13 +175,10 @@
 
 extern inline unsigned long ffz(unsigned long word)
 {
-#if 0 && defined(__alpha_cix__)
-	/* Swine architects -- a year after they publish v3 of the
-	   handbook, in the 21264 data sheet they quietly change CIX
-	   to FIX and remove the spiffy counting instructions.  */
+#if defined(__alpha_cix__) && defined(__alpha_fix__)
 	/* Whee.  EV6 can calculate it directly.  */
 	unsigned long result;
-	__asm__("ctlz %1,%0" : "=r"(result) : "r"(~word));
+	__asm__("cttz %1,%0" : "=r"(result) : "r"(~word));
 	return result;
 #else
 	unsigned long bits, qofs, bofs;
@@ -214,10 +211,7 @@
  * of bits set) of a N-bit word
  */
 
-#if 0 && defined(__alpha_cix__)
-/* Swine architects -- a year after they publish v3 of the handbook, in
-   the 21264 data sheet they quietly change CIX to FIX and remove the
-   spiffy counting instructions.  */
+#if defined(__alpha_cix__) && defined(__alpha_fix__)
 /* Whee.  EV6 can calculate it directly.  */
 extern __inline__ unsigned long hweight64(unsigned long w)
 {