kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Reformat promotion generation

Browse source 
Use the same template of other pawns moves generation,
make the code more uniform, simplify generate_promotions
that has now been renamed.

No functional change (verified also with perft).
This commit is contained in:
Marco Costalba 2014-12-24 11:36:04 +01:00
parent 296534f234
commit 2bfacf136c
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/movegen.cpp
View file

@ -66,14 +66,7 @@ namespace {
template<GenType Type, Square Delta> template<GenType Type, Square Delta>
inline ExtMove* generate_promotions(ExtMove* moveList, Bitboard pawnsOn7, inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
Bitboard target, const CheckInfo* ci) {
Bitboard b = shift_bb<Delta>(pawnsOn7) & target;
while (b)
{
Square to = pop_lsb(&b);
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
(moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN); (moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
@ -91,7 +84,6 @@ namespace {
(moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT); (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
else else
(void)ci; // Silence a warning under MSVC (void)ci; // Silence a warning under MSVC
}
return moveList; return moveList;
} }
@ -111,7 +103,7 @@ namespace {
const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW); const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE); const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE);
Bitboard b1, b2, dc1, dc2, emptySquares; Bitboard emptySquares;
Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB; Bitboard pawnsOn7 = pos.pieces(Us, PAWN) & TRank7BB;
Bitboard pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB; Bitboard pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB;
@ -124,8 +116,8 @@ namespace {
{ {
emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces()); emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares; Bitboard b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares;
b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares; Bitboard b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares;
if (Type == EVASIONS) // Consider only blocking squares if (Type == EVASIONS) // Consider only blocking squares
{ {
@ -144,8 +136,8 @@ namespace {
// promotion has been already generated amongst the captures. // promotion has been already generated amongst the captures.
if (pawnsNotOn7 & ci->dcCandidates) if (pawnsNotOn7 & ci->dcCandidates)
{ {
dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); Bitboard dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares; Bitboard dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares;
b1 |= dc1; b1 |= dc1;
b2 |= dc2; b2 |= dc2;
@ -174,16 +166,25 @@ namespace {
if (Type == EVASIONS) if (Type == EVASIONS)
emptySquares &= target; emptySquares &= target;
moveList = generate_promotions<Type, Right>(moveList, pawnsOn7, enemies, ci); Bitboard b1 = shift_bb<Right>(pawnsOn7) & enemies;
moveList = generate_promotions<Type, Left >(moveList, pawnsOn7, enemies, ci); Bitboard b2 = shift_bb<Left >(pawnsOn7) & enemies;
moveList = generate_promotions<Type, Up>(moveList, pawnsOn7, emptySquares, ci); Bitboard b3 = shift_bb<Up >(pawnsOn7) & emptySquares;
while (b1)
moveList = make_promotions<Type, Right>(moveList, pop_lsb(&b1), ci);
while (b2)
moveList = make_promotions<Type, Left >(moveList, pop_lsb(&b2), ci);
while (b3)
moveList = make_promotions<Type, Up >(moveList, pop_lsb(&b3), ci);
} }
// Standard and en-passant captures // Standard and en-passant captures
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{ {
b1 = shift_bb<Right>(pawnsNotOn7) & enemies; Bitboard b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
b2 = shift_bb<Left >(pawnsNotOn7) & enemies; Bitboard b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
while (b1) while (b1)
{ {
@ -290,7 +291,6 @@ namespace {
return moveList; return moveList;
} }
} // namespace } // namespace
@ -401,18 +401,18 @@ ExtMove* generate<EVASIONS>(const Position& pos, ExtMove* moveList) {
template<> template<>
ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) { ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
ExtMove *end, *cur = moveList;
Bitboard pinned = pos.pinned_pieces(pos.side_to_move()); Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
Square ksq = pos.king_square(pos.side_to_move()); Square ksq = pos.king_square(pos.side_to_move());
ExtMove* cur = moveList;
end = pos.checkers() ? generate<EVASIONS>(pos, moveList) moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
: generate<NON_EVASIONS>(pos, moveList); : generate<NON_EVASIONS>(pos, moveList);
while (cur != end) while (cur != moveList)
if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT) if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
&& !pos.legal(cur->move, pinned)) && !pos.legal(cur->move, pinned))
cur->move = (--end)->move; cur->move = (--moveList)->move;
else else
++cur; ++cur;
return end; return moveList;
} }