X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fbitfiddle.h;h=ed92f0dcf1a41e7a91023feea30f339e7800e749;hb=40f56bdee6900292d63f0d3edd8ab020e99750d5;hp=ee851fa7053e0d64fcad1ed68127af1c21f83dbd;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm

diff --git a/ir/adt/bitfiddle.h b/ir/adt/bitfiddle.h
index ee851fa70..ed92f0dcf 100644
--- a/ir/adt/bitfiddle.h
+++ b/ir/adt/bitfiddle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,9 +27,10 @@
 #ifndef FIRM_ADT_BITFIDDLE_H
 #define FIRM_ADT_BITFIDDLE_H
 
+#include "compiler.h"
+
 #include <limits.h>
 #include <assert.h>
-#include "util.h"
 
 /* some functions here assume ints are 32 bit wide */
 #define HACKDEL_WORDSIZE 32
@@ -44,8 +45,7 @@ COMPILETIME_ASSERT(UINT_MAX == 4294967295U, uintmax)
  *
  * @note See hacker's delight, page 27.
  */
-static INLINE __attribute__((const))
-int add_saturated(int x, int y)
+static inline int add_saturated(int x, int y)
 {
 	int sum      = x + y;
 	/*
@@ -73,8 +73,8 @@ int add_saturated(int x, int y)
  * @param x A 32-bit word.
  * @return The number of bits set in x.
  */
-static INLINE __attribute__((const))
-unsigned popcnt(unsigned x) {
+static inline unsigned popcnt(unsigned x)
+{
 	x -= ((x >> 1) & 0x55555555);
 	x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
 	x = (x + (x >> 4)) & 0x0f0f0f0f;
@@ -88,8 +88,8 @@ unsigned popcnt(unsigned x) {
  * @param x The word.
  * @return The number of leading (from the most significant bit) zeros.
  */
-static INLINE __attribute__((const))
-unsigned nlz(unsigned x) {
+static inline unsigned nlz(unsigned x)
+{
 #ifdef USE_X86_ASSEMBLY
 	unsigned res;
 	if(x == 0)
@@ -100,12 +100,15 @@ unsigned nlz(unsigned x) {
 			: "r" (x));
 	return 31 - res;
 #else
-   	x |= x >> 1;
-	x |= x >> 2;
-	x |= x >> 4;
-	x |= x >> 8;
-	x |= x >> 16;
-	return popcnt(~x);
+   unsigned y;
+   int n = 32;
+
+   y = x >>16;  if (y != 0) { n -= 16;  x = y; }
+   y = x >> 8;  if (y != 0) { n -=  8;  x = y; }
+   y = x >> 4;  if (y != 0) { n -=  4;  x = y; }
+   y = x >> 2;  if (y != 0) { n -=  2;  x = y; }
+   y = x >> 1;  if (y != 0) return n - 2;
+   return n - x;
 #endif
 }
 
@@ -114,8 +117,8 @@ unsigned nlz(unsigned x) {
  * @param x The word.
  * @return The number of trailing zeros.
  */
-static INLINE __attribute__((const))
-unsigned ntz(unsigned x) {
+static inline unsigned ntz(unsigned x)
+{
 #ifdef USE_X86_ASSEMBLY
 	unsigned res;
 	if(x == 0)
@@ -158,8 +161,7 @@ unsigned ntz(unsigned x) {
  * Returns the biggest power of 2 that is equal or smaller than @p x
  * (see hackers delight power-of-2 boundaries, page 48)
  */
-static INLINE __attribute__((const))
-unsigned floor_po2(unsigned x)
+static inline unsigned floor_po2(unsigned x)
 {
 #ifdef USE_X86_ASSEMBLY // in this case nlz is fast
 	if(x == 0)
@@ -181,8 +183,7 @@ unsigned floor_po2(unsigned x)
  * @remark x has to be <= 0x8000000 of course
  * @note see hackers delight power-of-2 boundaries, page 48
  */
-static INLINE __attribute__((const))
-unsigned ceil_po2(unsigned x)
+static inline unsigned ceil_po2(unsigned x)
 {
 	if(x == 0)
 		return 0;
@@ -205,8 +206,7 @@ unsigned ceil_po2(unsigned x)
 /**
  * Tests whether @p x is a power of 2
  */
-static INLINE __attribute__((const))
-int is_po2(unsigned x)
+static inline int is_po2(unsigned x)
 {
 	return (x & (x-1)) == 0;
 }