X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flibfirm%2Fadt%2Fbitset_ia32.h;h=529057de85a63d095faf1293c8cfc621e8e267a7;hb=f7a0dee11313faad6f2ff54edc8eaadabd03e433;hp=1136f0308f4ae977964689d9cdc2de3eb2a9df3d;hpb=435253f3a8766fec2ac2adf559bb10cfcb5d36f4;p=libfirm

diff --git a/include/libfirm/adt/bitset_ia32.h b/include/libfirm/adt/bitset_ia32.h
index 1136f0308..529057de8 100644
--- a/include/libfirm/adt/bitset_ia32.h
+++ b/include/libfirm/adt/bitset_ia32.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.
  *
@@ -25,138 +25,72 @@
 #ifndef _BITSET_IA32_H
 #define _BITSET_IA32_H
 
-typedef unsigned int bitset_unit_t;
-#define BITSET_UNIT_FMT "%0x"
-
 #undef _bitset_inside_clear
 #undef _bitset_inside_set
 #undef _bitset_inside_flip
-#undef _bitset_inside_is_set
 
-#undef _bitset_inside_nlz
-#undef _bitset_inside_ntz
-#undef _bitset_inside_ntz_value
+#define _bitset_inside_set(unit, bit) \
+	__asm__ __volatile__( "btsl %1,%0" :"=m" (*unit) : "Ir" (bit) : "cc")
 
-#define _bitset_inside_set(unit,bit) \
-	__asm__( "btsl %1,%0" :"=m" (unit) :"Ir" (bit))
+#define _bitset_inside_clear(unit, bit) \
+	__asm__ __volatile__( "btrl %1,%0" :"=m" (*unit) : "Ir" (bit) : "cc")
 
-#define _bitset_inside_clear(unit,bit) \
-	__asm__( "btrl %1,%0" :"=m" (unit) :"Ir" (bit))
+#define _bitset_inside_flip(unit, bit) \
+	__asm__ __volatile__( "btcl %1,%0" :"=m" (*unit) : "Ir" (bit) : "cc")
 
-#define _bitset_inside_flip(unit,bit) \
-	__asm__( "btcl %1,%0" :"=m" (unit) :"Ir" (bit))
+#undef _bitset_inside_is_set
+#undef _bitset_inside_nlz
+#undef _bitset_inside_ntz
+#undef _bitset_inside_ntz_value
 
-#define _bitset_inside_is_set(unit,bit) _bitset_ia32_inside_is_set(unit, bit)
-#define _bitset_inside_nlz(unit) _bitset_ia32_inside_nlz(unit)
-#define _bitset_inside_ntz(unit) _bitset_ia32_inside_ntz(unit)
-#define _bitset_inside_ntz_value(unit) _bitset_ia32_inside_ntz_value(unit)
+#define _bitset_inside_is_set(unit, bit) _bitset_ia32_inside_is_set(unit, bit)
+#define _bitset_inside_nlz(unit)         _bitset_ia32_inside_nlz(unit)
+#define _bitset_inside_ntz(unit)         _bitset_ia32_inside_ntz(unit)
+#define _bitset_inside_ntz_value(unit)   _bitset_ia32_inside_ntz_value(unit)
 
 static INLINE int _bitset_ia32_inside_is_set(bitset_unit_t *unit, unsigned bit)
 {
-	int res = 0;
-	__asm__("mov $0,%0\n\tbtl %1,%2\n\tadc $0,%0"
+	int res;
+	__asm__("bt    %2, %1\n\t"
+			"rcl   $1, %0\n\t"
+			"and   $1, %0"
 			: "=r" (res)
-			: "Ir" (bit), "m" (unit)
+			: "m" (*unit), "Ir" (bit)
 			: "cc");
 	return res;
 }
 
 static INLINE unsigned _bitset_ia32_inside_nlz(bitset_unit_t *unit)
 {
-	unsigned res = 0;
-	__asm__("bsrl %1,%0" :"=r" (res) :"m" (unit));
-	return *unit == 0 ? 32 : res;
+	unsigned res;
+	__asm__("bsr    %1, %0\n\t"
+			"cmovz  %2, %0\n\t"
+			"neg    %0\n\t"
+			"add   $31, %0"
+			: "=&r" (res)
+			: "m" (*unit), "r" (-1)
+			: "cc");
+	return res;
 }
 
 static INLINE unsigned _bitset_ia32_inside_ntz(bitset_unit_t *unit) {
-	unsigned res = 0;
-	__asm__("bsfl %1,%0" :"=r" (res) :"m" (unit));
-	return *unit == 0 ? 32 : res;
+	unsigned res;
+	__asm__("bsfl   %1, %0\n\t"
+			"cmovz  %2, %0\n\t"
+			: "=&r" (res)
+			: "m" (*unit), "r" (32)
+			: "cc");
+	return res;
 }
 
 static INLINE unsigned _bitset_ia32_inside_ntz_value(bitset_unit_t unit) {
-	unsigned res = 0;
-	__asm__("bsfl %1,%0" :"=r" (res) :"rm" (unit));
-	return unit == 0 ? 32 : res;
-}
-
-#if defined(__GNUC__) && defined(__SSE2__)
-
-#include <stddef.h>
-#include <xmmintrin.h>
-
-#undef _bitset_units
-#undef _bitset_overall_size
-#undef _bitset_data_ptr
-
-#undef _BITSET_BINOP_UNITS_INC
-
-#undef _bitset_inside_binop_and
-#undef _bitset_inside_binop_andnot
-#undef _bitset_inside_binop_or
-#undef _bitset_inside_binop_xor
-
-#undef _bitset_inside_binop_with_zero_and
-#undef _bitset_inside_binop_with_zero_andnot
-#undef _bitset_inside_binop_with_zero_or
-#undef _bitset_inside_binop_with_zero_xor
-
-#define _bitset_units(highest_bit) (round_up2(highest_bit, 128) / BS_UNIT_SIZE_BITS)
-
-#define _bitset_overall_size(bitset_base_size,highest_bit) \
-	((bitset_base_size) + 16 + _bitset_units(highest_bit) * BS_UNIT_SIZE)
-
-#define _bitset_data_ptr(data,bitset_base_size,highest_bit) \
-  _bitset_sse_data_ptr(data, bitset_base_size, highest_bit)
-
-static INLINE bitset_unit_t *_bitset_sse_data_ptr(void *data, size_t bitset_base_size,
-		bitset_pos_t highest_bit)
-{
-	ptrdiff_t diff;
-	char *units = data;
-
-	diff = (units - (char *) 0) + bitset_base_size;
-	diff = round_up2(diff, 16);
-	units = (char *) 0 + diff;
-	return (bitset_unit_t *) units;
-}
-
-#define _BITSET_BINOP_UNITS_INC 4
-#define _bitset_inside_binop_and(tgt,src) _bitset_sse_inside_binop_and(tgt,src)
-#define _bitset_inside_binop_andnot(tgt,src) _bitset_sse_inside_binop_andnot(tgt,src)
-#define _bitset_inside_binop_or(tgt,src) _bitset_sse_inside_binop_or(tgt,src)
-#define _bitset_inside_binop_xor(tgt,src) _bitset_sse_inside_binop_xor(tgt,src)
-
-#define _BITSET_SSE_BINOP(name) \
-static INLINE void _bitset_sse_inside_binop_ ## name(bitset_unit_t *tgt, bitset_unit_t *src) \
-{ \
-	__m128i src_op = _mm_load_si128((__m128i *) src); \
-	__m128i tgt_op = _mm_load_si128((__m128i *) tgt); \
-	__m128i res = _mm_ ## name ## _si128(tgt_op, src_op); \
-	_mm_store_si128((void *) tgt, res); \
-}
-
-
-static INLINE void _bitset_sse_inside_binop_with_zero_and(bitset_unit_t *tgt)
-{
-	tgt[0] = 0;
-	tgt[1] = 0;
-	tgt[2] = 0;
-	tgt[3] = 0;
-}
-
-static INLINE void _bitset_sse_inside_binop_andnot(bitset_unit_t *tgt, bitset_unit_t *src)
-{
-	__m128i src_op = _mm_load_si128((void *) src);
-	__m128i tgt_op = _mm_load_si128((void *) tgt);
-	__m128i res = _mm_andnot_si128(src_op, tgt_op);
-	_mm_store_si128((__m128i *) tgt, res);
+	unsigned res;
+	__asm__("bsfl   %1, %0\n\t"
+			"cmovz  %2, %0\n\t"
+			: "=&r" (res)
+			: "r" (unit), "r" (32)
+			: "cc");
+	return res;
 }
 
-_BITSET_SSE_BINOP(and)
-_BITSET_SSE_BINOP(or)
-_BITSET_SSE_BINOP(xor)
-
-
-#endif
 #endif