Changeset 1847


Ignore:
Timestamp:
Jan 14, 2012, 12:29:17 PM (8 years ago)
Author:
ksherdy
Message:

Remove cfzll reference. A temporary fix to allow the build to succeed on
Windows 32.

Location:
trunk/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/bitblock.hpp

    r1815 r1847  
    3939template<class block_t> IDISA_ALWAYS_INLINE uint32_t count_reverse_zeroes(block_t s);
    4040template<> IDISA_ALWAYS_INLINE uint32_t count_forward_zeroes<unsigned long>(unsigned long s) {return cfzl(s);}
    41 template<> IDISA_ALWAYS_INLINE uint32_t count_forward_zeroes<unsigned long long>(unsigned long long s) {return cfzll(s);}
     41//template<> IDISA_ALWAYS_INLINE uint32_t count_forward_zeroes<unsigned long long>(unsigned long long s) {return cfzll(s);}
    4242template<> IDISA_ALWAYS_INLINE uint32_t count_reverse_zeroes<unsigned long>(unsigned long s) {return cbzl(s);}
    43 template<> IDISA_ALWAYS_INLINE uint32_t count_reverse_zeroes<unsigned long long>(unsigned long long s) {return cbzll(s);}
     43//template<> IDISA_ALWAYS_INLINE uint32_t count_reverse_zeroes<unsigned long long>(unsigned long long s) {return cbzll(s);}
    4444
    4545IDISA_ALWAYS_INLINE bool all_true(uint64_t r);
  • trunk/lib/builtins.hpp

    r1550 r1847  
    1818static IDISA_ALWAYS_INLINE unsigned long cfzl(unsigned long x);
    1919static IDISA_ALWAYS_INLINE unsigned long cbzl(unsigned long x);
    20 static IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x);
    21 static IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x);
     20//static IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x);
     21//static IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x);
    2222
    2323#if defined (_MSC_VER)
     
    4343        }
    4444
    45         IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x) { // TODO - test
    46                 unsigned __int64 zeroes;
    47                 _BitScanForward(&zeroes, x);
    48                 return zeroes;
    49         }
     45//      IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x) { // TODO - test
     46//              unsigned __int64 zeroes;
     47//              _BitScanForward(&zeroes, x);
     48//              return zeroes;
     49//      }
    5050
    51         IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x) { // TODO - test
    52                 unsigned __int64 zeroes;
    53                 _BitScanReverse(&zeroes, x);
    54                 return zeroes;
    55         }
     51//      IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x) { // TODO - test
     52//              unsigned __int64 zeroes;
     53//              _BitScanReverse(&zeroes, x);
     54//              return zeroes;
     55//      }
    5656
    5757#elif defined (__GNUC__)
     
    7373        }
    7474
    75         IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x) {
    76                 return __builtin_ctzll(x);
    77         }
     75//      IDISA_ALWAYS_INLINE unsigned long cfzll(unsigned long long x) {
     76//              return __builtin_ctzll(x);
     77//      }
    7878
    79         IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x) {
    80                 return __builtin_clzll(x);
    81         }
     79//      IDISA_ALWAYS_INLINE unsigned long cbzll(unsigned long long x) {
     80//              return __builtin_clzll(x);
     81//      }
    8282
    8383#endif
Note: See TracChangeset for help on using the changeset viewer.