Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some more movegen cleanups #114

Merged
merged 2 commits into from
Jul 11, 2022
Merged

some more movegen cleanups #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01cc7b9
movegen cleanup
Disservin Jul 11, 2022
06539e2
rebase
Disservin Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 56 additions & 30 deletions src/board.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ void Board::init(Color c, Square sq) {
occBlack = Us(Black);
enemyEmptyBB = EnemyEmpty(c);
U64 newMask = DoCheckmask(c, sq);
checkMask = newMask ? newMask : 18446744073709551615ULL;
checkMask = newMask ? newMask : DEFAULT_CHECKMASK;
DoPinMask(c, sq);

}
Expand Down Expand Up @@ -552,7 +552,7 @@ U64 Board::LegalPawnMovesEP(Color c, Square sq, Square ep) {
// If we are pinned horizontally we can do no moves but if we are pinned vertically we can only do pawn pushs
if (pinHV & (1ULL << sq)) return PawnPushBoth(c, sq) & pinHV & checkMask;
U64 attacks = PawnAttacks(sq, c);
if (checkMask != 18446744073709551615ULL)
if (checkMask != DEFAULT_CHECKMASK)
{
// If we are in check and the en passant square lies on our attackmask and the en passant piece gives check
// return the ep mask as a move square
Expand Down Expand Up @@ -613,45 +613,68 @@ U64 Board::LegalQueenMoves(Color c, Square sq) {

U64 Board::LegalKingMoves(Color c, Square sq) {
U64 moves = KingAttacks(sq) & enemyEmptyBB;

// king is blocked by own pieces
if (moves == 0ULL) return 0ULL;

U64 final_moves = 0ULL;
Piece k = makePiece(KING, c);
removePieceSimple(k, sq);

while (moves) {
Square index = poplsb(moves);
if (isSquareAttacked(~c, index)) continue;
final_moves |= (1ULL << index);
}

placePieceSimple(k, sq);
return final_moves;
}

U64 Board::LegalKingMovesCastling(Color c, Square sq) {
U64 moves = KingAttacks(sq) & enemyEmptyBB;

// king is blocked by own pieces
if (moves == 0ULL) return 0ULL;

U64 final_moves = 0ULL;
Piece k = makePiece(KING, c);
removePieceSimple(k, sq);

while (moves) {
Square index = poplsb(moves);
if (isSquareAttacked(~c, index)) continue;
final_moves |= (1ULL << index);
}

placePieceSimple(k, sq);

if (checkMask == 18446744073709551615ULL) {
if (c == White) {
if (castlingRights & wk
&& !(WK_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_F1) //!isSquareAttacked(Black, SQ_F1)
&& !isSquareAttacked(Black, SQ_G1)) {
final_moves |= (1ULL << SQ_G1);
}
if (castlingRights & wq
&& !(WQ_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_D1) //!isSquareAttacked(Black, SQ_D1)
&& !isSquareAttacked(Black, SQ_C1)) {
final_moves |= (1ULL << SQ_C1);
}
if (c == White) {
if (castlingRights & wk
&& !(WK_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_F1) //!isSquareAttacked(Black, SQ_F1)
&& !isSquareAttacked(Black, SQ_G1)) {
final_moves |= (1ULL << SQ_G1);
}
else {
if (castlingRights & bk
&& !(BK_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_F8) //!isSquareAttacked(White, SQ_F8)
&& !isSquareAttacked(White, SQ_G8)) {
final_moves |= (1ULL << SQ_G8);
}
if (castlingRights & bq
&& !(BQ_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_D8) //!isSquareAttacked(White, SQ_D8)
&& !isSquareAttacked(White, SQ_C8)) {
final_moves |= (1ULL << SQ_C8);
}
if (castlingRights & wq
&& !(WQ_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_D1) //!isSquareAttacked(Black, SQ_D1)
&& !isSquareAttacked(Black, SQ_C1)) {
final_moves |= (1ULL << SQ_C1);
}
}
else {
if (castlingRights & bk
&& !(BK_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_F8) //!isSquareAttacked(White, SQ_F8)
&& !isSquareAttacked(White, SQ_G8)) {
final_moves |= (1ULL << SQ_G8);
}
if (castlingRights & bq
&& !(BQ_CASTLE_MASK & occAll)
&& final_moves & (1ULL << SQ_D8) //!isSquareAttacked(White, SQ_D8)
&& !isSquareAttacked(White, SQ_C8)) {
final_moves |= (1ULL << SQ_C8);
}
}
return final_moves;
Expand Down Expand Up @@ -724,8 +747,11 @@ Movelist Board::legalmoves() {
}

}

Square from = KingSQ(sideToMove);
U64 moves = LegalKingMoves(sideToMove, from);
U64 moves = !castlingRights || checkMask != DEFAULT_CHECKMASK
? LegalKingMoves(sideToMove, from)
: LegalKingMovesCastling(sideToMove, from);
while (moves) {
Square to = poplsb(moves);
movelist.Add(Move(KING, from, to, false));
Expand Down
3 changes: 2 additions & 1 deletion src/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class Board
U64 SQUARES_BETWEEN_BB[MAX_SQ][MAX_SQ]{};

// all bits set
U64 checkMask = 18446744073709551615ULL;
U64 checkMask = DEFAULT_CHECKMASK;

U64 pinHV{};
U64 pinD{};
Expand Down Expand Up @@ -202,6 +202,7 @@ class Board
U64 LegalRookMoves(Color c, Square sq);
U64 LegalQueenMoves(Color c, Square sq);
U64 LegalKingMoves(Color c, Square sq);
U64 LegalKingMovesCastling(Color c, Square sq);

// all legal moves for a position
Movelist legalmoves();
Expand Down
2 changes: 2 additions & 0 deletions src/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
static constexpr int MAX_PLY = 120;
static constexpr int MAX_MOVES = 256;

static constexpr U64 DEFAULT_CHECKMASK = 18446744073709551615ULL;

enum Color : uint8_t {
White, Black
};
Expand Down