X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=11b9e2de13991e75fc2d94c28d5123dfded556dd;hp=4b524ec463e0b1be67a460dc9ee64cef04daf6da;hb=f30aa83f8ad46a794e83f030fdab576371c8c825;hpb=8365f8ac1ee7f62db18fca8498b3fdb1640674d9 diff --git a/src/position.h b/src/position.h index 4b524ec4..11b9e2de 100644 --- a/src/position.h +++ b/src/position.h @@ -74,20 +74,19 @@ enum CastleRights { /// The UndoInfo struct stores information we need to restore a Position -/// object to its previous state when we retract a move. Whenever a move +/// object to its previous state when we retract a move. Whenever a move /// is made on the board (by calling Position::do_move), an UndoInfo object -/// must be passed as a parameter. When the move is unmade (by calling +/// must be passed as a parameter. When the move is unmade (by calling /// Position::undo_move), the same UndoInfo object must be passed again. struct UndoInfo { - int castleRights; - Square epSquare; - Bitboard checkersBB; + Bitboard pinners[2], pinned[2], dcCandidates[2], checkersBB; Key key, pawnKey, materialKey; - int rule50; + int castleRights, rule50; + Square epSquare; Move lastMove; - PieceType capture; Value mgValue, egValue; + PieceType capture; }; @@ -197,6 +196,7 @@ public: // Bitboards for pinned pieces and discovered check candidates Bitboard discovered_check_candidates(Color c) const; + Bitboard pinned_pieces(Color c, Bitboard& p) const; Bitboard pinned_pieces(Color c) const; // Checking pieces @@ -215,13 +215,11 @@ public: template Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time - bool piece_attacks_square(Square f, Square t) const; // Dispatch at run-time + bool piece_attacks_square(Piece p, Square f, Square t) const; // Dispatch at run-time // Properties of moves bool pl_move_is_legal(Move m) const; - bool pl_move_is_legal(Move m, Bitboard pinned) const; bool move_is_check(Move m) const; - bool move_is_check(Move m, Bitboard dcCandidates) const; bool move_is_capture(Move m) const; bool move_is_deep_pawn_push(Move m) const; bool move_is_pawn_push_to_7th(Move m) const; @@ -242,10 +240,7 @@ public: bool square_is_weak(Square s, Color c) const; // Doing and undoing moves - void backup(UndoInfo &u) const; - void restore(const UndoInfo &u); void do_move(Move m, UndoInfo &u); - void do_move(Move m, UndoInfo &u, Bitboard dcCandidates); void undo_move(Move m, const UndoInfo &u); void do_null_move(UndoInfo &u); void undo_null_move(const UndoInfo &u); @@ -308,8 +303,11 @@ private: void undo_ep_move(Move m); void find_checkers(); + template + void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); + template - Bitboard hidden_checks(Color c, Square ksq) const; + Bitboard hidden_checks(Color c, Square ksq, Bitboard& pinners) const; // Computing hash keys from scratch (for initialization and debugging) Key compute_key() const; @@ -317,15 +315,17 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts + enum GamePhase { + MidGame, + EndGame + }; Value mg_pst(Color c, PieceType pt, Square s) const; Value eg_pst(Color c, PieceType pt, Square s) const; - Value compute_mg_value() const; - Value compute_eg_value() const; + Value compute_value(GamePhase p) const; Value compute_non_pawn_material(Color c) const; // Bitboards Bitboard byColorBB[2], byTypeBB[8]; - Bitboard checkersBB; // Board Piece board[64]; @@ -338,16 +338,27 @@ private: int index[64]; // Other info - Color sideToMove; - int castleRights; - File initialKFile, initialKRFile, initialQRFile; - Square epSquare; Square kingSquare[2]; - Move lastMove; - Key key, pawnKey, materialKey, history[MaxGameLength]; - int rule50, gamePly; - Value mgValue, egValue; + Color sideToMove; + int gamePly; + Key history[MaxGameLength]; Value npMaterial[2]; + File initialKFile, initialKRFile, initialQRFile; + + // Info backed up in do_move() + union { + UndoInfo undoInfoUnion; + struct { // Must have the same layout of UndoInfo + mutable Bitboard pinners[2], pinned[2], dcCandidates[2]; + Bitboard checkersBB; + Key key, pawnKey, materialKey; + int castleRights, rule50; + Square epSquare; + Move lastMove; + Value mgValue, egValue; + PieceType capture; + }; + }; // Static variables static int castleRightsMask[64]; @@ -526,7 +537,12 @@ inline Square Position::initial_qr_square(Color c) const { } inline Bitboard Position::pawn_attacks(Color c, Square s) const { - return StepAttackBB[pawn_of_color(c)][s]; + return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; +} + +template<> +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; } template<> @@ -667,28 +683,28 @@ inline Phase Position::game_phase() const { inline bool Position::move_is_deep_pawn_push(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && relative_rank(c, move_to(m)) > RANK_4; } inline bool Position::move_is_pawn_push_to_7th(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && relative_rank(c, move_to(m)) == RANK_7; } inline bool Position::move_is_passed_pawn_push(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && pawn_is_passed(c, move_to(m)); } inline bool Position::move_was_passed_pawn_push(Move m) const { Color c = opposite_color(side_to_move()); - return piece_on(move_to(m)) == pawn_of_color(c) + return piece_on(move_to(m)) == piece_of_color_and_type(c, PAWN) && pawn_is_passed(c, move_to(m)); }