X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=063204c5020f7ec2f54a5104ee705a618068fc4b;hp=cae7e0cae32e2fedf633af09730b631661517252;hb=eb48c54687e8a378d1180daa54fb6252a707fa20;hpb=1f1ef0897c986ad5e761dd04a223ae9af6048b09 diff --git a/src/bitboard.cpp b/src/bitboard.cpp index cae7e0ca..063204c5 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -228,7 +228,7 @@ Bitboard BetweenBB[64][64]; Bitboard SquaresInFrontMask[2][64]; Bitboard PassedPawnMask[2][64]; -Bitboard OutpostMask[2][64]; +Bitboard AttackSpanMask[2][64]; Bitboard BishopPseudoAttacks[64]; Bitboard RookPseudoAttacks[64]; @@ -373,39 +373,6 @@ Square pop_1st_bit(Bitboard* bb) { #endif -// Optimized bitScanReverse32() implementation by Pascal Georges. Note -// that first bit is 1, this allow to differentiate between 0 and 1. -static CACHE_LINE_ALIGNMENT -const char MsbTable[256] = { - 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 -}; - -int bitScanReverse32(uint32_t b) -{ - int result = 0; - - if (b > 0xFFFF) - { - b >>= 16; - result += 16; - } - if (b > 0xFF) - { - b >>= 8; - result += 8; - } - return result + MsbTable[b]; -} namespace { @@ -430,7 +397,7 @@ namespace { { SquaresInFrontMask[c][s] = in_front_bb(c, s) & file_bb(s); PassedPawnMask[c][s] = in_front_bb(c, s) & this_and_neighboring_files_bb(s); - OutpostMask[c][s] = in_front_bb(c, s) & neighboring_files_bb(s); + AttackSpanMask[c][s] = in_front_bb(c, s) & neighboring_files_bb(s); } for (Bitboard b = 0ULL; b < 256ULL; b++)