*/
#include <cassert>
-#include <numeric>
#include <vector>
+#include <bitset>
#include "bitboard.h"
#include "types.h"
// Positions with the pawn on files E to H will be mirrored before probing.
constexpr unsigned MAX_INDEX = 2*24*64*64; // stm * psq * wksq * bksq = 196608
- // Each uint32_t stores results of 32 positions, one per bit
- uint32_t KPKBitbase[MAX_INDEX / 32];
+ std::bitset<MAX_INDEX> KPKBitbase;
// A KPK bitbase index is an integer in [0, IndexMax] range
//
assert(file_of(wpsq) <= FILE_D);
- unsigned idx = index(stm, bksq, wksq, wpsq);
- return KPKBitbase[idx / 32] & (1 << (idx & 0x1F));
+ return KPKBitbase[index(stm, bksq, wksq, wpsq)];
}
for (repeat = idx = 0; idx < MAX_INDEX; ++idx)
repeat |= (db[idx] == UNKNOWN && db[idx].classify(db) != UNKNOWN);
- // Map 32 results into one KPKBitbase[] entry
+ // Fill the bitbase with the decisive results
for (idx = 0; idx < MAX_INDEX; ++idx)
if (db[idx] == WIN)
- KPKBitbase[idx / 32] |= 1 << (idx & 0x1F);
+ KPKBitbase.set(idx);
}
if ( distance(ksq[WHITE], ksq[BLACK]) <= 1
|| ksq[WHITE] == psq
|| ksq[BLACK] == psq
- || (stm == WHITE && (PawnAttacks[WHITE][psq] & ksq[BLACK])))
+ || (stm == WHITE && (pawn_attacks_bb(WHITE, psq) & ksq[BLACK])))
result = INVALID;
// Immediate win if a pawn can be promoted without getting captured
&& rank_of(psq) == RANK_7
&& ksq[stm] != psq + NORTH
&& ( distance(ksq[~stm], psq + NORTH) > 1
- || (PseudoAttacks[KING][ksq[stm]] & (psq + NORTH))))
+ || (attacks_bb<KING>(ksq[stm]) & (psq + NORTH))))
result = WIN;
// Immediate draw if it is a stalemate or a king captures undefended pawn
else if ( stm == BLACK
- && ( !(PseudoAttacks[KING][ksq[stm]] & ~(PseudoAttacks[KING][ksq[~stm]] | PawnAttacks[~stm][psq]))
- || (PseudoAttacks[KING][ksq[stm]] & psq & ~PseudoAttacks[KING][ksq[~stm]])))
+ && ( !(attacks_bb<KING>(ksq[stm]) & ~(attacks_bb<KING>(ksq[~stm]) | pawn_attacks_bb(~stm, psq)))
+ || (attacks_bb<KING>(ksq[stm]) & psq & ~attacks_bb<KING>(ksq[~stm]))))
result = DRAW;
// Position will be classified later
const Result Bad = (stm == WHITE ? DRAW : WIN);
Result r = INVALID;
- Bitboard b = PseudoAttacks[KING][ksq[stm]];
+ Bitboard b = attacks_bb<KING>(ksq[stm]);
while (b)
r |= stm == WHITE ? db[index(BLACK, ksq[BLACK] , pop_lsb(&b), psq)]