X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=1082ad016aab60bbe60c7a782113b38920e7efb5;hp=36ff3d81627bf88b74cf2958acb8996b9759b587;hb=67338e6f322b8f8ec0d897815e16a87937efc9b0;hpb=67686b7684e8cb2f195a648b1042e671e80bc9be diff --git a/src/movegen.cpp b/src/movegen.cpp index 36ff3d81..1082ad01 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -1,7 +1,7 @@ /* 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 @@ -18,9 +18,11 @@ */ #include +#include #include "bitcount.h" #include "movegen.h" +#include "position.h" // Simple macro to wrap a very common while loop, no facny, no flexibility, // hardcoded list name 'mlist' and from square 'from'. @@ -45,13 +47,12 @@ namespace { template 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(from) & pos.empty_squares(); if (Pt == KING) - b &= ~QueenPseudoAttacks[pos.king_square(opposite_color(pos.side_to_move()))]; + b &= ~QueenPseudoAttacks[pos.king_square(flip(pos.side_to_move()))]; SERIALIZE_MOVES(b); return mlist; @@ -60,8 +61,7 @@ namespace { template 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; @@ -157,7 +157,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { Bitboard target; if (Type == MV_CAPTURE || Type == MV_NON_EVASION) - target = pos.pieces(opposite_color(us)); + target = pos.pieces(flip(us)); else if (Type == MV_NON_CAPTURE) target = pos.empty_squares(); else @@ -196,7 +196,7 @@ template MoveStack* generate(const Position& pos, MoveStack* mli template MoveStack* generate(const Position& pos, MoveStack* mlist); -/// generate_non_capture_checks() generates all pseudo-legal non-captures and knight +/// generate 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(const Position& pos, MoveStack* mlist) { @@ -206,9 +206,9 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) Bitboard b, dc; Square from; Color us = pos.side_to_move(); - Square ksq = pos.king_square(opposite_color(us)); + Square ksq = pos.king_square(flip(us)); - assert(pos.piece_on(ksq) == make_piece(opposite_color(us), KING)); + assert(pos.piece_on(ksq) == make_piece(flip(us), KING)); // Discovered non-capture checks b = dc = pos.discovered_check_candidates(); @@ -216,7 +216,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) while (b) { from = pop_1st_bit(&b); - switch (piece_type(pos.piece_on(from))) + switch (type_of(pos.piece_on(from))) { case PAWN: /* Will be generated togheter with pawns direct checks */ break; case KNIGHT: mlist = generate_discovered_checks(pos, mlist, from); break; @@ -236,8 +236,8 @@ MoveStack* generate(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 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(const Position& pos, MoveStack* mlist) { @@ -249,7 +249,7 @@ MoveStack* generate(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); @@ -263,9 +263,9 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { checkersCnt++; checksq = pop_1st_bit(&b); - assert(piece_color(pos.piece_on(checksq)) == opposite_color(us)); + assert(color_of(pos.piece_on(checksq)) == flip(us)); - switch (piece_type(pos.piece_on(checksq))) + switch (type_of(pos.piece_on(checksq))) { case BISHOP: sliderAttacks |= BishopPseudoAttacks[checksq]; break; case ROOK: sliderAttacks |= RookPseudoAttacks[checksq]; break; @@ -372,20 +372,20 @@ namespace { to = pop_1st_bit(&b); if (Type == MV_CAPTURE || Type == MV_EVASION) - (*mlist++).move = make_promotion_move(to - Delta, to, QUEEN); + (*mlist++).move = make_promotion(to - Delta, to, QUEEN); if (Type == MV_NON_CAPTURE || Type == MV_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(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; @@ -472,8 +472,8 @@ namespace { // En passant captures if ((Type == MV_CAPTURE || Type == MV_EVASION) && pos.ep_square() != SQ_NONE) { - assert(Us != WHITE || square_rank(pos.ep_square()) == RANK_6); - assert(Us != BLACK || square_rank(pos.ep_square()) == RANK_3); + assert(Us != WHITE || rank_of(pos.ep_square()) == RANK_6); + assert(Us != BLACK || rank_of(pos.ep_square()) == RANK_3); // 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 @@ -483,12 +483,12 @@ namespace { b1 = pawns & pos.attacks_from(pos.ep_square(), Them); - assert(b1 != EmptyBoardBB); + assert(b1); while (b1) { to = pop_1st_bit(&b1); - (*mlist++).move = make_ep_move(to, pos.ep_square()); + (*mlist++).move = make_enpassant(to, pos.ep_square()); } } return mlist; @@ -498,7 +498,7 @@ namespace { MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist, Color us) { CastleRight f = CastleRight((Side == KING_SIDE ? WHITE_OO : WHITE_OOO) << us); - Color them = opposite_color(us); + Color them = flip(us); // After castling, the rook and king's final positions are exactly the same // in Chess960 as they would be in standard chess. @@ -515,12 +515,12 @@ namespace { // (including the final square), and all the squares between the rook's initial // and final squares (including the final square), must be vacant except for // the king and castling rook. - for (Square s = Min(kfrom, kto); s <= Max(kfrom, kto); s++) + for (Square s = std::min(kfrom, kto); s <= std::max(kfrom, kto); s++) if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s)) ||(pos.attackers_to(s) & pos.pieces(them))) return mlist; - for (Square s = Min(rfrom, rto); s <= Max(rfrom, rto); s++) + for (Square s = std::min(rfrom, rto); s <= std::max(rfrom, rto); s++) if (s != kfrom && s != rfrom && !pos.square_is_empty(s)) return mlist; @@ -535,7 +535,7 @@ namespace { return mlist; } - (*mlist++).move = make_castle_move(kfrom, rfrom); + (*mlist++).move = make_castle(kfrom, rfrom); return mlist; }