Move CheckInfo under StateInfo

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index b2538e96b5cf9316dc2907bbfe43aec9d929dcc3..d6efe7114d444fd006de63f4204cdebdc4c66b4d 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -41,15 +41,12 @@ namespace PSQT {
   void init();
 }
 
   void init();
 }
 

-/// CheckInfo struct is initialized at constructor time and keeps info used to
-/// detect if a move gives check.

 
 

-struct CheckInfo {
+/// CheckInfo struct keeps info used to detect if a move gives check

 
 

-  explicit CheckInfo(const Position&);
+struct CheckInfo {

 
 

-  Bitboard dcCandidates;
-  Bitboard pinned;
+  Bitboard blockersForKing[COLOR_NB];

   Bitboard checkSquares[PIECE_TYPE_NB];
   Square   ksq;
 };
   Bitboard checkSquares[PIECE_TYPE_NB];
   Square   ksq;
 };


@@ -76,6 +73,7 @@ struct StateInfo {
   Bitboard   checkersBB;
   PieceType  capturedType;
   StateInfo* previous;
   Bitboard   checkersBB;
   PieceType  capturedType;
   StateInfo* previous;

+  CheckInfo  ci;

 };
 
 // In a std::deque references to elements are unaffected upon resizing
 };
 
 // In a std::deque references to elements are unaffected upon resizing


@@ -124,6 +122,7 @@ public:
   Bitboard checkers() const;
   Bitboard discovered_check_candidates() const;
   Bitboard pinned_pieces(Color c) const;
   Bitboard checkers() const;
   Bitboard discovered_check_candidates() const;
   Bitboard pinned_pieces(Color c) const;

+  const CheckInfo& check_info() const;

 
   // Attacks to/from a given square
   Bitboard attackers_to(Square s) const;
 
   // Attacks to/from a given square
   Bitboard attackers_to(Square s) const;


@@ -131,14 +130,14 @@ public:
   Bitboard attacks_from(Piece pc, Square s) const;
   template<PieceType> Bitboard attacks_from(Square s) const;
   template<PieceType> Bitboard attacks_from(Square s, Color c) const;
   Bitboard attacks_from(Piece pc, Square s) const;
   template<PieceType> Bitboard attacks_from(Square s) const;
   template<PieceType> Bitboard attacks_from(Square s, Color c) const;

-  Bitboard slider_blockers(Bitboard target, Bitboard sliders, Square s) const;
+  Bitboard slider_blockers(Bitboard sliders, Square s) const;

 
   // Properties of moves
 
   // Properties of moves

-  bool legal(Move m, Bitboard pinned) const;
+  bool legal(Move m) const;

   bool pseudo_legal(const Move m) const;
   bool capture(Move m) const;
   bool capture_or_promotion(Move m) const;
   bool pseudo_legal(const Move m) const;
   bool capture(Move m) const;
   bool capture_or_promotion(Move m) const;

-  bool gives_check(Move m, const CheckInfo& ci) const;
+  bool gives_check(Move m) const;

   bool advanced_pawn_push(Move m) const;
   Piece moved_piece(Move m) const;
   PieceType captured_piece_type() const;
   bool advanced_pawn_push(Move m) const;
   Piece moved_piece(Move m) const;
   PieceType captured_piece_type() const;


@@ -185,6 +184,7 @@ private:
   // Initialization helpers (used while setting up a position)
   void set_castling_right(Color c, Square rfrom);
   void set_state(StateInfo* si) const;
   // Initialization helpers (used while setting up a position)
   void set_castling_right(Color c, Square rfrom);
   void set_state(StateInfo* si) const;

+  void set_check_info(CheckInfo* ci) const;

 
   // Other helpers
   void put_piece(Color c, PieceType pt, Square s);
 
   // Other helpers
   void put_piece(Color c, PieceType pt, Square s);


@@ -311,11 +311,15 @@ inline Bitboard Position::checkers() const {
 }
 
 inline Bitboard Position::discovered_check_candidates() const {
 }
 
 inline Bitboard Position::discovered_check_candidates() const {

-  return slider_blockers(pieces(sideToMove), pieces(sideToMove), square<KING>(~sideToMove));
+  return st->ci.blockersForKing[~sideToMove] & pieces(sideToMove);

 }
 
 inline Bitboard Position::pinned_pieces(Color c) const {
 }
 
 inline Bitboard Position::pinned_pieces(Color c) const {

-  return slider_blockers(pieces(c), pieces(~c), square<KING>(c));
+  return st->ci.blockersForKing[c] & pieces(c);
+}
+
+inline const CheckInfo& Position::check_info() const {
+  return st->ci;

 }
 
 inline bool Position::pawn_passed(Color c, Square s) const {
 }
 
 inline bool Position::pawn_passed(Color c, Square s) const {