Reimplement cntlz{w,d} with builtins

Author: Extrems

include/ogc/machine/processor.h

@@ -104,9 +104,6 @@
 #define __stswx(base,bytes,value)	\
 	__asm__ __volatile__ ("mtxer %2; stswx %1,%y0" : "=Z"(*(u32*)(base)) : "r"(value), "r"(bytes) : "xer");
 
-#define cntlzw(_val) ({register u32 _rval; \
-					  __asm__ __volatile__("cntlzw %0, %1" : "=r"((_rval)) : "r"((_val))); _rval;})
-
 #define _CPU_MSR_GET( _msr_value ) \
   do { \
     _msr_value = 0; \
@@ -201,6 +198,16 @@ static inline u64 bswap64(u64 val)
 }
 #endif
 
+static inline u32 cntlzw(u32 val)
+{
+	return __builtin_clzg(val, 32);
+}
+
+static inline u32 cntlzd(u64 val)
+{
+	return __builtin_clzg(val, 64);
+}
+
 // Basic I/O
 
 static inline u32 read32(u32 addr)

libogc/pad.c

@@ -919,7 +919,7 @@ u32 PAD_ScanPads(void)
 				}
 			}
 
-			state |= (state & (PAD_TRIGGER_R | PAD_TRIGGER_L)) << (__builtin_clz(PAD_TRIGGER_R | PAD_TRIGGER_L) - __builtin_clz(PADEX_TRIGGER_R | PADEX_TRIGGER_L));
+			state |= (state & (PAD_TRIGGER_R | PAD_TRIGGER_L)) << (cntlzw(PAD_TRIGGER_R | PAD_TRIGGER_L) - cntlzw(PADEX_TRIGGER_R | PADEX_TRIGGER_L));
 
 			oldstate				= __pad_keys[i].state;
 			__pad_keys[i].up		= ~state & oldstate;
@@ -1011,7 +1011,7 @@ u32 PAD_ScanPads(void)
 					if(steering.gas>(UINT8_MAX/2))		state |= PADEX_PEDAL_GAS;
 					if(steering.brake>(UINT8_MAX/2))	state |= PADEX_PEDAL_BRAKE;
 
-					state |= (state & (PAD_TRIGGER_R | PAD_TRIGGER_L)) << (__builtin_clz(PAD_TRIGGER_R | PAD_TRIGGER_L) - __builtin_clz(PADEX_TRIGGER_R | PADEX_TRIGGER_L));
+					state |= (state & (PAD_TRIGGER_R | PAD_TRIGGER_L)) << (cntlzw(PAD_TRIGGER_R | PAD_TRIGGER_L) - cntlzw(PADEX_TRIGGER_R | PADEX_TRIGGER_L));
 
 					oldstate				= __pad_keys[i].state;
 					__pad_keys[i].up		= ~state & oldstate;

libogc/video.c

@@ -1780,19 +1780,6 @@ static void printDebugCalculations(void)
 }
 #endif
 
-static __inline__ u32 cntlzd(u64 bit)
-{
-	u32 hi,lo,value = 0;
-
-	hi = (u32)(bit>>32);
-	lo = (u32)(bit&-1);
-
-	value = cntlzw(hi);
-	if(value>=32) value += cntlzw(lo);
-
-	return value;
-}
-
 static const struct _timing* __gettiming(u32 vimode)
 {
 	switch(vimode) {