};
-/// The UndoInfo struct stores information we need to restore a Position
-/// 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
-/// Position::undo_move), the same UndoInfo object must be passed again.
-
-struct UndoInfo {
- int castleRights;
- Square epSquare;
- Bitboard checkersBB, pinners[2], pinned[2], dcCandidates[2];
+/// The StateInfo struct stores information we need to restore a Position
+/// object to its previous state when we retract a move. Whenever a move
+/// is made on the board (by calling Position::do_move), an StateInfo object
+/// must be passed as a parameter.
+
+struct StateInfo {
+ Bitboard pinners[2], pinned[2], dcCandidates[2], checkersBB;
Key key, pawnKey, materialKey;
- int rule50;
+ int castleRights, rule50;
+ Square epSquare;
Move lastMove;
Value mgValue, egValue;
PieceType capture;
+ StateInfo* previous;
};
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);
+ void do_move(Move m, StateInfo& st);
+ void undo_move(Move m);
+ void do_null_move(StateInfo& st);
+ void undo_null_move();
// Static exchange evaluation
int see(Square from, Square to) const;
// Helper functions for doing and undoing moves
void do_capture_move(Move m, PieceType capture, Color them, Square to);
void do_castle_move(Move m);
- void do_promotion_move(Move m, UndoInfo &u);
+ void do_promotion_move(Move m);
void do_ep_move(Move m);
void undo_castle_move(Move m);
- void undo_promotion_move(Move m, const UndoInfo &u);
+ void undo_promotion_move(Move m);
void undo_ep_move(Move m);
void find_checkers();
+ void find_pinned();
template<PieceType Piece>
void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates);
Key compute_material_key() const;
// Computing incremental evaluation scores and material counts
- 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;
+ enum GamePhase {
+ MidGame,
+ EndGame
+ };
+ template<GamePhase> Value pst(Color c, PieceType pt, Square s) const;
+ template<GamePhase> Value compute_value() const;
Value compute_non_pawn_material(Color c) const;
// Bitboards
Bitboard byColorBB[2], byTypeBB[8];
- Bitboard checkersBB;
- mutable Bitboard pinners[2], pinned[2], dcCandidates[2];
// Board
Piece board[64];
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;
+ StateInfo startState;
+ StateInfo* st;
// Static variables
static int castleRightsMask[64];
}
inline Square Position::ep_square() const {
- return epSquare;
+ return st->epSquare;
}
inline Square Position::king_square(Color c) const {
}
inline bool Position::can_castle_kingside(Color side) const {
- return castleRights & (1+int(side));
+ return st->castleRights & (1+int(side));
}
inline bool Position::can_castle_queenside(Color side) const {
- return castleRights & (4+4*int(side));
+ return st->castleRights & (4+4*int(side));
}
inline bool Position::can_castle(Color side) const {
return StepAttackBB[KING][s];
}
+inline Bitboard Position::pinned_pieces(Color c) const {
+ return st->pinned[c];
+}
+
+inline Bitboard Position::pinned_pieces(Color c, Bitboard& p) const {
+ p = st->pinners[c];
+ return st->pinned[c];
+}
+
+inline Bitboard Position::discovered_check_candidates(Color c) const {
+ return st->dcCandidates[c];
+}
+
inline Bitboard Position::checkers() const {
- return checkersBB;
+ return st->checkersBB;
}
inline bool Position::is_check() const {
- return checkersBB != EmptyBoardBB;
+ return st->checkersBB != EmptyBoardBB;
}
inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const {
}
inline Key Position::get_key() const {
- return key;
+ return st->key;
}
inline Key Position::get_pawn_key() const {
- return pawnKey;
+ return st->pawnKey;
}
inline Key Position::get_material_key() const {
- return materialKey;
+ return st->materialKey;
}
-inline Value Position::mg_pst(Color c, PieceType pt, Square s) const {
- return MgPieceSquareTable[piece_of_color_and_type(c, pt)][s];
+template<Position::GamePhase Phase>
+inline Value Position::pst(Color c, PieceType pt, Square s) const {
+ return (Phase == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]
+ : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]);
}
inline Value Position::mg_pst_delta(Move m) const {
-MgPieceSquareTable[piece_on(move_from(m))][move_from(m)];
}
-inline Value Position::eg_pst(Color c, PieceType pt, Square s) const {
- return EgPieceSquareTable[piece_of_color_and_type(c, pt)][s];
-}
-
inline Value Position::mg_value() const {
- return mgValue;
+ return st->mgValue;
}
inline Value Position::eg_value() const {
- return egValue;
+ return st->egValue;
}
inline Value Position::non_pawn_material(Color c) const {
inline int Position::rule_50_counter() const {
- return rule50;
+ return st->rule50;
}
inline bool Position::opposite_colored_bishops() const {