Revert to byTypeBB[0] storing occupied squares

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 2bbd43fdac9016976e1ce5ef05117659022410ca..488ed09f0a649b5dd4f9ff7e16904eea3497697b 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -108,7 +108,7 @@ public:
   Color side_to_move() const;
 
   // Bitboard representation of the position
-  Bitboard occupied_squares() const;
+  Bitboard pieces() const;
   Bitboard pieces(Color c) const;
   Bitboard pieces(PieceType pt) const;
   Bitboard pieces(PieceType pt, Color c) const;
@@ -127,6 +127,7 @@ public:
   // Castling rights
   bool can_castle(CastleRight f) const;
   bool can_castle(Color c) const;
+  bool castle_impeded(CastleRight f) const;
   Square castle_rook_square(CastleRight f) const;
 
   // Bitboards for pinned pieces and discovered check candidates
@@ -207,7 +208,7 @@ private:
   // Initialization helper functions (used while setting up a position)
   void clear();
   void put_piece(Piece p, Square s);
-  void set_castle_right(Color c, Square rsq);
+  void set_castle_right(Color c, Square rfrom);
   bool move_is_legal(const Move m) const;
 
   // Helper template functions
@@ -230,7 +231,6 @@ private:
   // Bitboards
   Bitboard byTypeBB[8];        // [pieceType]
   Bitboard byColorBB[2];       // [color]
-  Bitboard occupied;
 
   // Piece counts
   int pieceCount[2][8];        // [color][pieceType]
@@ -242,6 +242,7 @@ private:
   // Other info
   int castleRightsMask[64];    // [square]
   Square castleRookSquare[16]; // [castleRight]
+  Bitboard castlePath[16];     // [castleRight]
   StateInfo startState;
   int64_t nodes;
   int startPosPly;
@@ -283,8 +284,8 @@ inline Color Position::side_to_move() const {
   return sideToMove;
 }
 
-inline Bitboard Position::occupied_squares() const {
-  return occupied;
+inline Bitboard Position::pieces() const {
+  return byTypeBB[ALL_PIECES];
 }
 
 inline Bitboard Position::pieces(Color c) const {
@@ -331,13 +332,17 @@ inline bool Position::can_castle(Color c) const {
   return st->castleRights & ((WHITE_OO | WHITE_OOO) << c);
 }
 
+inline bool Position::castle_impeded(CastleRight f) const {
+  return byTypeBB[ALL_PIECES] & castlePath[f];
+}
+
 inline Square Position::castle_rook_square(CastleRight f) const {
   return castleRookSquare[f];
 }
 
 template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
-  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, occupied_squares())
+  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, pieces())
         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
         : StepAttacksBB[Pt][s];
 }
@@ -348,11 +353,11 @@ inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
 }
 
 inline Bitboard Position::attacks_from(Piece p, Square s) const {
-  return attacks_from(p, s, occupied);
+  return attacks_from(p, s, byTypeBB[ALL_PIECES]);
 }
 
 inline Bitboard Position::attackers_to(Square s) const {
-  return attackers_to(s, occupied);
+  return attackers_to(s, byTypeBB[ALL_PIECES]);
 }
 
 inline Bitboard Position::checkers() const {