/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
template<GenType Type, Square Delta>
- inline ExtMove* generate_promotions(ExtMove* moveList, Bitboard pawnsOn7,
- Bitboard target, const CheckInfo* ci) {
+ inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
- Bitboard b = shift_bb<Delta>(pawnsOn7) & target;
+ if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
+ (moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
- while (b)
+ if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- Square to = pop_lsb(&b);
-
- if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- (moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN);
-
- if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
- {
- (moveList++)->move = make<PROMOTION>(to - Delta, to, ROOK);
- (moveList++)->move = make<PROMOTION>(to - Delta, to, BISHOP);
- (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
- }
-
- // Knight promotion is the only promotion that can give a direct check
- // that's not already included in the queen promotion.
- if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
- (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
- else
- (void)ci; // Silence a warning under MSVC
+ (moveList++)->move = make<PROMOTION>(to - Delta, to, ROOK);
+ (moveList++)->move = make<PROMOTION>(to - Delta, to, BISHOP);
+ (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
}
+ // Knight promotion is the only promotion that can give a direct check
+ // that's not already included in the queen promotion.
+ if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
+ (moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT);
+ else
+ (void)ci; // Silence a warning under MSVC
+
return moveList;
}
const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
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 pawnsNotOn7 = pos.pieces(Us, PAWN) & ~TRank7BB;
{
emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
- b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares;
- b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares;
+ Bitboard b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares;
+ Bitboard b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares;
if (Type == EVASIONS) // Consider only blocking squares
{
// promotion has been already generated amongst the captures.
if (pawnsNotOn7 & ci->dcCandidates)
{
- dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
- dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares;
+ Bitboard dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
+ Bitboard dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
if (Type == EVASIONS)
emptySquares &= target;
- moveList = generate_promotions<Type, Right>(moveList, pawnsOn7, enemies, ci);
- moveList = generate_promotions<Type, Left >(moveList, pawnsOn7, enemies, ci);
- moveList = generate_promotions<Type, Up>(moveList, pawnsOn7, emptySquares, ci);
+ Bitboard b1 = shift_bb<Right>(pawnsOn7) & enemies;
+ Bitboard b2 = shift_bb<Left >(pawnsOn7) & enemies;
+ 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
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
- b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
- b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
+ Bitboard b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
+ Bitboard b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
while (b1)
{
&& !(PseudoAttacks[Pt][from] & target & ci->checkSq[Pt]))
continue;
- if (unlikely(ci->dcCandidates) && (ci->dcCandidates & from))
+ if (ci->dcCandidates && (ci->dcCandidates & from))
continue;
}
return moveList;
}
-
} // namespace
Color us = pos.side_to_move();
- Bitboard target = Type == CAPTURES ? pos.pieces(~us)
- : Type == QUIETS ? ~pos.pieces()
- : Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
+ Bitboard target = Type == CAPTURES ? pos.pieces(~us)
+ : Type == QUIETS ? ~pos.pieces()
+ : Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
return us == WHITE ? generate_all<WHITE, Type>(pos, moveList, target)
: generate_all<BLACK, Type>(pos, moveList, target);
template<>
ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
- ExtMove *end, *cur = moveList;
Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
Square ksq = pos.king_square(pos.side_to_move());
+ ExtMove* cur = moveList;
- end = pos.checkers() ? generate<EVASIONS>(pos, moveList)
- : generate<NON_EVASIONS>(pos, moveList);
- while (cur != end)
+ moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
+ : generate<NON_EVASIONS>(pos, moveList);
+ while (cur != moveList)
if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT)
&& !pos.legal(cur->move, pinned))
- cur->move = (--end)->move;
+ cur->move = (--moveList)->move;
else
++cur;
- return end;
+ return moveList;
}
projects / stockfish / blobdiff