/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 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<PieceType Pt>
inline MoveStack* generate_discovered_checks(const Position& pos, MoveStack* mlist, Square from) {
- assert(Pt != QUEEN);
- assert(Pt != PAWN);
+ assert(Pt != QUEEN && Pt != PAWN);
Bitboard b = pos.attacks_from<Pt>(from) & pos.empty_squares();
template<PieceType Pt>
inline MoveStack* generate_direct_checks(const Position& pos, MoveStack* mlist, Color us,
Bitboard dc, Square ksq) {
- assert(Pt != KING);
- assert(Pt != PAWN);
+ assert(Pt != KING && Pt != PAWN);
Bitboard checkSqs, b;
Square from;
FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
assert(Pt == PAWN);
- assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_EVASION);
-
return (us == WHITE ? generate_pawn_moves<WHITE, Type>(p, m, t, SQ_NONE)
: generate_pawn_moves<BLACK, Type>(p, m, t, SQ_NONE));
}
template<MoveType Type>
MoveStack* generate(const Position& pos, MoveStack* mlist) {
+ assert(Type == MV_CAPTURE || Type == MV_NON_CAPTURE || Type == MV_NON_EVASION);
assert(!pos.in_check());
Color us = pos.side_to_move();
Bitboard target;
- if (Type == MV_CAPTURE || Type == MV_NON_EVASION)
+ if (Type == MV_CAPTURE)
target = pos.pieces(flip(us));
+
else if (Type == MV_NON_CAPTURE)
target = pos.empty_squares();
- else
- assert(false);
- if (Type == MV_NON_EVASION)
- {
- mlist = generate_piece_moves<PAWN, MV_CAPTURE>(pos, mlist, us, target);
- mlist = generate_piece_moves<PAWN, MV_NON_CAPTURE>(pos, mlist, us, pos.empty_squares());
- target |= pos.empty_squares();
- }
- else
- mlist = generate_piece_moves<PAWN, Type>(pos, mlist, us, target);
+ else if (Type == MV_NON_EVASION)
+ target = pos.pieces(flip(us)) | pos.empty_squares();
+ mlist = generate_piece_moves<PAWN, Type>(pos, mlist, us, target);
mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, target);
mlist = generate_piece_moves<BISHOP>(pos, mlist, us, target);
mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
template MoveStack* generate<MV_NON_EVASION>(const Position& pos, MoveStack* mlist);
-/// generate_non_capture_checks() generates all pseudo-legal non-captures and knight
+/// generate<MV_NON_CAPTURE_CHECK> generates all pseudo-legal non-captures and knight
/// underpromotions that give check. Returns a pointer to the end of the move list.
template<>
MoveStack* generate<MV_NON_CAPTURE_CHECK>(const Position& pos, MoveStack* mlist) {
}
-/// generate_evasions() generates all pseudo-legal check evasions when
-/// the side to move is in check. Returns a pointer to the end of the move list.
+/// generate<MV_EVASION> generates all pseudo-legal check evasions when the side
+/// to move is in check. Returns a pointer to the end of the move list.
template<>
MoveStack* generate<MV_EVASION>(const Position& pos, MoveStack* mlist) {
Color us = pos.side_to_move();
Square ksq = pos.king_square(us);
Bitboard checkers = pos.checkers();
- Bitboard sliderAttacks = EmptyBoardBB;
+ Bitboard sliderAttacks = 0;
assert(pos.piece_on(ksq) == make_piece(us, KING));
assert(checkers);
Delta == DELTA_NW ? p << 7 : Delta == DELTA_SW ? p >> 9 : p;
}
- template<MoveType Type, Square Delta>
+ template<Square Delta>
inline MoveStack* generate_pawn_captures(MoveStack* mlist, Bitboard pawns, Bitboard target) {
const Bitboard TFileABB = (Delta == DELTA_NE || Delta == DELTA_SE ? FileABB : FileHBB);
{
to = pop_1st_bit(&b);
- if (Type == MV_CAPTURE || Type == MV_EVASION)
- (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN);
+ if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
+ (*mlist++).move = make_promotion(to - Delta, to, QUEEN);
- if (Type == MV_NON_CAPTURE || Type == MV_EVASION)
+ if (Type == MV_NON_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
{
- (*mlist++).move = make_promotion_move(to - Delta, to, ROOK);
- (*mlist++).move = make_promotion_move(to - Delta, to, BISHOP);
- (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
+ (*mlist++).move = make_promotion(to - Delta, to, ROOK);
+ (*mlist++).move = make_promotion(to - Delta, to, BISHOP);
+ (*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
}
// This is the only possible under promotion that can give a check
// not already included in the queen-promotion.
if ( Type == MV_CHECK
&& bit_is_set(pos.attacks_from<KNIGHT>(to), pos.king_square(Delta > 0 ? BLACK : WHITE)))
- (*mlist++).move = make_promotion_move(to - Delta, to, KNIGHT);
+ (*mlist++).move = make_promotion(to - Delta, to, KNIGHT);
else (void)pos; // Silence a warning under MSVC
}
return mlist;
}
// Standard captures
- if (Type == MV_CAPTURE || Type == MV_EVASION)
+ if (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
{
- mlist = generate_pawn_captures<Type, RIGHT_UP>(mlist, pawns, enemyPieces);
- mlist = generate_pawn_captures<Type, LEFT_UP>(mlist, pawns, enemyPieces);
+ mlist = generate_pawn_captures<RIGHT_UP>(mlist, pawns, enemyPieces);
+ mlist = generate_pawn_captures<LEFT_UP>(mlist, pawns, enemyPieces);
}
// Single and double pawn pushes
}
// En passant captures
- if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE)
+ if ( (Type == MV_CAPTURE || Type == MV_EVASION || Type == MV_NON_EVASION)
+ && pos.ep_square() != SQ_NONE)
{
assert(Us != WHITE || rank_of(pos.ep_square()) == RANK_6);
assert(Us != BLACK || rank_of(pos.ep_square()) == RANK_3);
b1 = pawns & pos.attacks_from<PAWN>(pos.ep_square(), Them);
- assert(b1 != EmptyBoardBB);
+ assert(b1);
while (b1)
{
to = pop_1st_bit(&b1);
- (*mlist++).move = make_enpassant_move(to, pos.ep_square());
+ (*mlist++).move = make_enpassant(to, pos.ep_square());
}
}
return mlist;
return mlist;
}
- (*mlist++).move = make_castle_move(kfrom, rfrom);
+ (*mlist++).move = make_castle(kfrom, rfrom);
return mlist;
}