/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 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<Square Delta>
- inline Bitboard move_pawns(Bitboard p) {
-
- return Delta == DELTA_N ? p << 8
- : Delta == DELTA_S ? p >> 8
- : Delta == DELTA_NE ? (p & ~FileHBB) << 9
- : Delta == DELTA_SE ? (p & ~FileHBB) >> 7
- : Delta == DELTA_NW ? (p & ~FileABB) << 7
- : Delta == DELTA_SW ? (p & ~FileABB) >> 9 : 0;
- }
-
-
template<GenType Type, Square Delta>
inline MoveStack* generate_promotions(MoveStack* mlist, Bitboard pawnsOn7,
Bitboard target, const CheckInfo* ci) {
- Bitboard b = move_pawns<Delta>(pawnsOn7) & target;
+ Bitboard b = shift_bb<Delta>(pawnsOn7) & target;
while (b)
{
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 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);
Bitboard b1, b2, dc1, dc2, emptySquares;
{
emptySquares = (Type == QUIETS || Type == QUIET_CHECKS ? target : ~pos.pieces());
- b1 = move_pawns<UP>(pawnsNotOn7) & emptySquares;
- b2 = move_pawns<UP>(b1 & TRank3BB) & emptySquares;
+ b1 = shift_bb<Up>(pawnsNotOn7) & emptySquares;
+ b2 = shift_bb<Up>(b1 & TRank3BB) & emptySquares;
if (Type == EVASIONS) // Consider only blocking squares
{
// promotion has been already generated among captures.
if (pawnsNotOn7 & ci->dcCandidates)
{
- dc1 = move_pawns<UP>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
- dc2 = move_pawns<UP>(dc1 & TRank3BB) & emptySquares;
+ dc1 = shift_bb<Up>(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq);
+ dc2 = shift_bb<Up>(dc1 & TRank3BB) & emptySquares;
b1 |= dc1;
b2 |= dc2;
}
}
- SERIALIZE_PAWNS(b1, UP);
- SERIALIZE_PAWNS(b2, UP + UP);
+ SERIALIZE_PAWNS(b1, Up);
+ SERIALIZE_PAWNS(b2, Up + Up);
}
// Promotions and underpromotions
if (Type == EVASIONS)
emptySquares &= target;
- mlist = generate_promotions<Type, RIGHT>(mlist, pawnsOn7, enemies, ci);
- mlist = generate_promotions<Type, LEFT>(mlist, pawnsOn7, enemies, ci);
- mlist = generate_promotions<Type, UP>(mlist, pawnsOn7, emptySquares, ci);
+ mlist = generate_promotions<Type, Right>(mlist, pawnsOn7, enemies, ci);
+ mlist = generate_promotions<Type, Left >(mlist, pawnsOn7, enemies, ci);
+ mlist = generate_promotions<Type, Up>(mlist, pawnsOn7, emptySquares, ci);
}
// Standard and en-passant captures
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
{
- b1 = move_pawns<RIGHT>(pawnsNotOn7) & enemies;
- b2 = move_pawns<LEFT >(pawnsNotOn7) & enemies;
+ b1 = shift_bb<Right>(pawnsNotOn7) & enemies;
+ b2 = shift_bb<Left >(pawnsNotOn7) & enemies;
- SERIALIZE_PAWNS(b1, RIGHT);
- SERIALIZE_PAWNS(b2, LEFT);
+ SERIALIZE_PAWNS(b1, Right);
+ SERIALIZE_PAWNS(b2, Left);
if (pos.ep_square() != SQ_NONE)
{
// An en passant capture can be an evasion only if the checking piece
// is the double pushed pawn and so is in the target. Otherwise this
// is a discovery check and we are forced to do otherwise.
- if (Type == EVASIONS && !(target & (pos.ep_square() - UP)))
+ if (Type == EVASIONS && !(target & (pos.ep_square() - Up)))
return mlist;
b1 = pawnsNotOn7 & pos.attacks_from<PAWN>(pos.ep_square(), Them);
assert(Pt != KING && Pt != PAWN);
- const Square* pl = pos.piece_list(us, Pt);
+ const Square* pl = pos.list<Pt>(us);
for (Square from = *pl; from != SQ_NONE; from = *++pl)
{
}
- FORCE_INLINE MoveStack* generate_king_moves(const Position& pos, MoveStack* mlist,
- Color us, Bitboard target) {
- Square from = pos.king_square(us);
- Bitboard b = pos.attacks_from<KING>(from) & target;
- SERIALIZE(b);
- return mlist;
- }
-
-
template<GenType Type> FORCE_INLINE
- MoveStack* generate_all_moves(const Position& pos, MoveStack* mlist, Color us,
- Bitboard target, const CheckInfo* ci = NULL) {
+ MoveStack* generate_all(const Position& pos, MoveStack* mlist, Color us,
+ Bitboard target, const CheckInfo* ci = NULL) {
+
+ const bool Checks = Type == QUIET_CHECKS;
mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target, ci)
: generate_pawn_moves<BLACK, Type>(pos, mlist, target, ci));
- mlist = generate_moves<KNIGHT, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<BISHOP, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<ROOK, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
- mlist = generate_moves<QUEEN, Type == QUIET_CHECKS>(pos, mlist, us, target, ci);
+ mlist = generate_moves<KNIGHT, Checks>(pos, mlist, us, target, ci);
+ mlist = generate_moves<BISHOP, Checks>(pos, mlist, us, target, ci);
+ mlist = generate_moves<ROOK, Checks>(pos, mlist, us, target, ci);
+ mlist = generate_moves<QUEEN, Checks>(pos, mlist, us, target, ci);
if (Type != QUIET_CHECKS && Type != EVASIONS)
- mlist = generate_king_moves(pos, mlist, us, target);
+ {
+ Square from = pos.king_square(us);
+ Bitboard b = pos.attacks_from<KING>(from) & target;
+ SERIALIZE(b);
+ }
if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(us))
{
if (pos.is_chess960())
{
- mlist = generate_castle<KING_SIDE, Type == QUIET_CHECKS, true>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Type == QUIET_CHECKS, true>(pos, mlist, us);
+ mlist = generate_castle<KING_SIDE, Checks, true>(pos, mlist, us);
+ mlist = generate_castle<QUEEN_SIDE, Checks, true>(pos, mlist, us);
}
else
{
- mlist = generate_castle<KING_SIDE, Type == QUIET_CHECKS, false>(pos, mlist, us);
- mlist = generate_castle<QUEEN_SIDE, Type == QUIET_CHECKS, false>(pos, mlist, us);
+ mlist = generate_castle<KING_SIDE, Checks, false>(pos, mlist, us);
+ mlist = generate_castle<QUEEN_SIDE, Checks, false>(pos, mlist, us);
}
}
assert(!pos.checkers());
Color us = pos.side_to_move();
- Bitboard target;
- if (Type == CAPTURES)
- target = pos.pieces(~us);
+ Bitboard target = Type == CAPTURES ? pos.pieces(~us)
+ : Type == QUIETS ? ~pos.pieces()
+ : Type == NON_EVASIONS ? ~pos.pieces(us) : 0;
- else if (Type == QUIETS)
- target = ~pos.pieces();
-
- else if (Type == NON_EVASIONS)
- target = ~pos.pieces(us);
-
- return generate_all_moves<Type>(pos, mlist, us, target);
+ return generate_all<Type>(pos, mlist, us, target);
}
// Explicit template instantiations
assert(!pos.checkers());
- Color us = pos.side_to_move();
CheckInfo ci(pos);
Bitboard dc = ci.dcCandidates;
SERIALIZE(b);
}
- return generate_all_moves<QUIET_CHECKS>(pos, mlist, us, ~pos.pieces(), &ci);
+ return generate_all<QUIET_CHECKS>(pos, mlist, pos.side_to_move(), ~pos.pieces(), &ci);
}
// Generate blocking evasions or captures of the checking piece
Bitboard target = between_bb(checksq, ksq) | pos.checkers();
- return generate_all_moves<EVASIONS>(pos, mlist, us, target);
+ return generate_all<EVASIONS>(pos, mlist, us, target);
}