Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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
assert(!pos.checkers());
- const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E
- : KingSide ? DELTA_W : DELTA_E;
+ const Square K = Chess960 ? kto > kfrom ? WEST : EAST
+ : KingSide ? WEST : EAST;
for (Square s = kto; s != kfrom; s += K)
if (pos.attackers_to(s) & enemies)
}
- template<GenType Type, Square Delta>
+ template<GenType Type, Square D>
ExtMove* make_promotions(ExtMove* moveList, Square to, Square ksq) {
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
- *moveList++ = make<PROMOTION>(to - Delta, to, QUEEN);
+ *moveList++ = make<PROMOTION>(to - D, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{
- *moveList++ = make<PROMOTION>(to - Delta, to, ROOK);
- *moveList++ = make<PROMOTION>(to - Delta, to, BISHOP);
- *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
+ *moveList++ = make<PROMOTION>(to - D, to, ROOK);
+ *moveList++ = make<PROMOTION>(to - D, to, BISHOP);
+ *moveList++ = make<PROMOTION>(to - D, 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] & ksq))
- *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
+ if (Type == QUIET_CHECKS && (PseudoAttacks[KNIGHT][to] & ksq))
+ *moveList++ = make<PROMOTION>(to - D, to, KNIGHT);
+ else
+ (void)ksq; // Silence a warning under MSVC
return moveList;
}
// Compute our parametrized parameters at compile time, named according to
// the point of view of white side.
- const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
- const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
- const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
- const Square Up = (Us == WHITE ? DELTA_N : DELTA_S);
- const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
- const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE);
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Bitboard TRank8BB = (Us == WHITE ? Rank8BB : Rank1BB);
+ const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB);
+ const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB);
+ const Square Up = (Us == WHITE ? NORTH : SOUTH);
+ const Square Right = (Us == WHITE ? NORTH_EAST : SOUTH_WEST);
+ const Square Left = (Us == WHITE ? NORTH_WEST : SOUTH_EAST);
Bitboard emptySquares;
{
emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
- Bitboard b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares;
- Bitboard b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares;
+ Bitboard b1 = shift<Up>(pawnsNotOn7) & emptySquares;
+ Bitboard b2 = shift<Up>(b1 & TRank3BB) & emptySquares;
if (Type == EVASIONS) // Consider only blocking squares
{
Bitboard dcCandidates = pos.discovered_check_candidates();
if (pawnsNotOn7 & dcCandidates)
{
- Bitboard dc1 = shift_bb<Up>(pawnsNotOn7 & dcCandidates) & emptySquares & ~file_bb(ksq);
- Bitboard dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares;
+ Bitboard dc1 = shift<Up>(pawnsNotOn7 & dcCandidates) & emptySquares & ~file_bb(ksq);
+ Bitboard dc2 = shift<Up>(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
if (Type == EVASIONS)
emptySquares &= target;
- Bitboard b1 = shift_bb<Right>(pawnsOn7) & enemies;
- Bitboard b2 = shift_bb<Left >(pawnsOn7) & enemies;
- Bitboard b3 = shift_bb<Up >(pawnsOn7) & emptySquares;
+ Bitboard b1 = shift<Right>(pawnsOn7) & enemies;
+ Bitboard b2 = shift<Left >(pawnsOn7) & enemies;
+ Bitboard b3 = shift<Up >(pawnsOn7) & emptySquares;
Square ksq = pos.square<KING>(Them);
// Standard and en-passant captures
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
- Bitboard b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
- Bitboard b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
+ Bitboard b1 = shift<Right>(pawnsNotOn7) & enemies;
+ Bitboard b2 = shift<Left >(pawnsNotOn7) & enemies;
while (b1)
{
if (Checks)
{
if ( (Pt == BISHOP || Pt == ROOK || Pt == QUEEN)
- && !(PseudoAttacks[Pt][from] & target & pos.check_info().checkSquares[Pt]))
+ && !(PseudoAttacks[Pt][from] & target & pos.check_squares(Pt)))
continue;
if (pos.discovered_check_candidates() & from)
Bitboard b = pos.attacks_from<Pt>(from) & target;
if (Checks)
- b &= pos.check_info().checkSquares[Pt];
+ b &= pos.check_squares(Pt);
while (b)
*moveList++ = make_move(from, pop_lsb(&b));
if (pt == PAWN)
continue; // Will be generated together with direct checks
- Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces();
+ Bitboard b = pos.attacks_from(pt, from) & ~pos.pieces();
if (pt == KING)
b &= ~PseudoAttacks[QUEEN][pos.square<KING>(~us)];