bruno/brchess
1
0
Fork 0
Code Issues 9 Projects Releases Wiki Activity

simplify/improve pos_set_checkers_pinners_blockers()

Browse Source
This commit is contained in:
Bruno Raoult
2024-04-10 12:54:47 +02:00
parent 660722fadc
commit 711306c92a
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/position.c
View File

@@ -116,7 +116,7 @@ pos_t *pos_clear(pos_t *pos)
* *
* @return: true if equal, false otherwise. * @return: true if equal, false otherwise.
*/ */
bool pos_cmp(const pos_t *pos1, const pos_t *pos2) bool pos_cmp(__unused const pos_t *pos1, __unused const pos_t *pos2)
{ {
#define _cmpf(a) (pos1->a != pos2->a) #define _cmpf(a) (pos1->a != pos2->a)
bool ret = false; bool ret = false;
@@ -201,7 +201,7 @@ void pos_set_checkers_pinners_blockers(pos_t *pos)
bitboard_t occ = pos_occ(pos); bitboard_t occ = pos_occ(pos);
bitboard_t attackers; bitboard_t attackers;
bitboard_t checkers = 0, blockers = 0, pinners = 0; bitboard_t checkers = 0, blockers = 0, pinners = 0;
bitboard_t targets, tmpcheckers, tmpblockers, tmppinners, tmpbb; bitboard_t targets, tmpcheckers, maybeblockers, tmppinners, tmpbb;
square_t king = pos->king[us]; square_t king = pos->king[us];
bitboard_t king_bb = mask(king); bitboard_t king_bb = mask(king);
int pinner; int pinner;
@@ -217,55 +217,47 @@ void pos_set_checkers_pinners_blockers(pos_t *pos)
checkers |= tmpcheckers; checkers |= tmpcheckers;
/* maybe blockers = not checkers */ /* maybe blockers = not checkers */
tmpblockers = targets & ~tmpcheckers; maybeblockers = targets & ~tmpcheckers;
/* we find second targets, by removing only first ones (excl. checkers) */ /* we find second targets, by removing first ones (excl. checkers) */
targets = hyperbola_bishop_moves(occ ^ tmpblockers, king) ^ tmpcheckers; if (maybeblockers) {
targets = hyperbola_bishop_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
/* pinners = only B/Q */ /* pinners = only B/Q */
tmppinners = targets & attackers; tmppinners = targets & attackers;
pinners |= tmppinners;
//tmpblockers = 0;
/* blockers = we find occupied squares between pinner and king */ /* blockers = we find occupied squares between pinner and king */
bit_for_each64(pinner, tmpbb, tmppinners) while (tmppinners) {
blockers |= bb_between[pinner][king] & tmpblockers; pinner = bb_next(&tmppinners);
//blockers |= tmpblockers; pinners |= mask(pinner);
blockers |= bb_between[pinner][king] & maybeblockers;
}
}
/* same for rook type */ /* same for rook type */
attackers = pos->bb[them][ROOK] | pos->bb[them][QUEEN]; attackers = pos->bb[them][ROOK] | pos->bb[them][QUEEN];
/* targets is all "target" pieces if K was a bishop */
targets = hyperbola_rook_moves(occ, king) & occ; targets = hyperbola_rook_moves(occ, king) & occ;
/* checkers = only opponent B/Q */
tmpcheckers = targets & attackers; tmpcheckers = targets & attackers;
checkers |= tmpcheckers; checkers |= tmpcheckers;
/* maybe blockers = not checkers */ maybeblockers = targets & ~tmpcheckers;
tmpblockers = targets & ~tmpcheckers; if (maybeblockers) {
targets = hyperbola_rook_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
/* we find second targets, by removing only first ones (excl. checkers) */ tmppinners = targets & attackers;
targets = hyperbola_rook_moves(occ ^ tmpblockers, king) ^ tmpcheckers; while (tmppinners) {
pinner = bb_next(&tmppinners);
/* pinners = only B/Q */ pinners |= mask(pinner);
tmppinners = targets & attackers; blockers |= bb_between[pinner][king] & maybeblockers;
pinners |= tmppinners; }
//tmpblockers = 0; }
/* blockers = we find occupied squares between pinner and king */
bit_for_each64(pinner, tmpbb, tmppinners)
blockers |= bb_between[pinner][king] & tmpblockers;
//blockers |= tmpblockers;
/* pawns */ /* pawns */
attackers = pos->bb[them][PAWN]; checkers |= bb_pawn_attacks[us][king] & pos->bb[them][PAWN];
targets = pawn_shift_upleft(king_bb, us) | pawn_shift_upright(king_bb, us);
checkers |= targets & attackers;
/* knight */ /* knight */
attackers = pos->bb[them][KNIGHT]; attackers = pos->bb[them][KNIGHT];
targets = bb_knight_moves(attackers, king); targets = bb_knight[king] & attackers;
checkers |= targets; checkers |= targets;
pos->checkers = checkers; pos->checkers = checkers;
@@ -366,10 +358,10 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
* *
* @return: (if @strict is false) return true if check is ok, false otherwise. * @return: (if @strict is false) return true if check is ok, false otherwise.
*/ */
bool pos_ok(const pos_t *pos, const bool strict) bool pos_ok(__unused const pos_t *pos, __unused const bool strict)
{ {
int n, count = 0, bbcount = 0, error = 0; int n, count = 0, bbcount = 0, error = 0;
bitboard_t tmp; __unused bitboard_t tmp;
/* pawns on 1st ot 8th rank */ /* pawns on 1st ot 8th rank */
tmp = (pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) & (RANK_1bb | RANK_8bb); tmp = (pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) & (RANK_1bb | RANK_8bb);
@@ -391,7 +383,7 @@ bool pos_ok(const pos_t *pos, const bool strict)
} }
for (square_t sq = 0; sq < 64; ++sq) { for (square_t sq = 0; sq < 64; ++sq) {
piece_t piece = pos->board[sq]; piece_t piece = pos->board[sq];
bitboard_t match; __unused bitboard_t match;
if (piece == EMPTY) if (piece == EMPTY)
continue; continue;
color_t c = COLOR(piece); color_t c = COLOR(piece);