X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=f2f517e219445a601f4d90690572cb1a40e1b288;hp=8e6fa93876ff1573364f6008b485c45794963293;hb=b50921fd5c3e1753adecfea77557ad1afece7641;hpb=c5f44ef45bd9929f5e2f1f4c25c5edd11202546e diff --git a/src/position.h b/src/position.h index 8e6fa938..f2f517e2 100644 --- a/src/position.h +++ b/src/position.h @@ -88,8 +88,8 @@ enum Phase { struct StateInfo { Key key, pawnKey, materialKey; - int castleRights, rule50; - Square kingSquare[2], epSquare; + int castleRights, rule50, pliesFromNull; + Square epSquare; Value mgValue, egValue; Value npMaterial[2]; @@ -183,36 +183,23 @@ public: Square initial_kr_square(Color c) const; Square initial_qr_square(Color c) const; - // Attack bitboards - Bitboard sliding_attacks(Square s, Direction d) const; - Bitboard ray_attacks(Square s, SignedDirection d) const; - Bitboard pawn_attacks(Color c, Square s) const; - - template - Bitboard piece_attacks(Square s) const; - // 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 + // Checking pieces and under check information Bitboard checkers() const; + bool is_check() const; // Piece lists Square piece_list(Color c, PieceType pt, int index) const; + const Square* piece_list_begin(Color c, PieceType pt) const; - // Attack information for a given square - bool square_is_attacked(Square s, Color c) const; - Bitboard attacks_to(Square s) const; - Bitboard attacks_to(Square s, Color c) const; - bool is_check() const; - bool pawn_attacks_square(Color c, Square f, Square t) const; - - template - Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time - - bool piece_attacks_square(Piece p, Square f, Square t) const; // Dispatch at run-time + // Information about attacks to or from a given square + Bitboard attackers_to(Square s) const; + Bitboard attacks_from(Piece p, Square s) const; + template Bitboard attacks_from(Square s) const; + template Bitboard attacks_from(Square s, Color c) const; // Properties of moves bool pl_move_is_legal(Move m) const; @@ -220,6 +207,7 @@ public: 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_capture_or_promotion(Move m) const; bool move_is_passed_pawn_push(Move m) const; bool move_attacks_square(Move m, Square s) const; @@ -278,7 +266,7 @@ public: // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; - // Static member functions: + // Static member functions static void init_zobrist(); static void init_piece_square_tables(); @@ -312,12 +300,12 @@ private: template Value compute_value() const; Value compute_non_pawn_material(Color c) const; - // Bitboards - Bitboard byColorBB[2], byTypeBB[8]; - // Board Piece board[64]; + // Bitboards + Bitboard byTypeBB[8], byColorBB[2]; + // Piece counts int pieceCount[2][8]; // [color][pieceType] @@ -417,12 +405,16 @@ inline Square Position::piece_list(Color c, PieceType pt, int index) const { return pieceList[c][pt][index]; } +inline const Square* Position::piece_list_begin(Color c, PieceType pt) const { + return pieceList[c][pt]; +} + inline Square Position::ep_square() const { return st->epSquare; } inline Square Position::king_square(Color c) const { - return st->kingSquare[c]; + return pieceList[c][KING][0]; } inline bool Position::can_castle_kingside(Color side) const { @@ -445,33 +437,29 @@ inline Square Position::initial_qr_square(Color c) const { return relative_square(c, make_square(initialQRFile, RANK_1)); } -inline Bitboard Position::pawn_attacks(Color c, Square s) const { +template<> +inline Bitboard Position::attacks_from(Square s, Color c) const { return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; } -template // Knight and King -inline Bitboard Position::piece_attacks(Square s) const { +template // Knight and King and white pawns +inline Bitboard Position::attacks_from(Square s) const { return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[WP][s] | StepAttackBB[BP][s]; -} - -template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return bishop_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return rook_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return piece_attacks(s) | piece_attacks(s); +inline Bitboard Position::attacks_from(Square s) const { + return attacks_from(s) | attacks_from(s); } inline Bitboard Position::checkers() const { @@ -482,25 +470,6 @@ inline bool Position::is_check() const { return st->checkersBB != EmptyBoardBB; } -inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const { - return bit_is_set(pawn_attacks(c, f), t); -} - -template -inline Bitboard Position::piece_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); -} - -inline Bitboard Position::attacks_to(Square s, Color c) const { - - return attacks_to(s) & pieces_of_color(c); -} - -inline bool Position::square_is_attacked(Square s, Color c) const { - - return attacks_to(s, c) != EmptyBoardBB; -} - inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } @@ -600,8 +569,13 @@ inline bool Position::has_pawn_on_7th(Color c) const { inline bool Position::move_is_capture(Move m) const { // Move must not be MOVE_NONE ! + return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); +} + +inline bool Position::move_is_capture_or_promotion(Move m) const { - return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); + // Move must not be MOVE_NONE ! + return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } #endif // !defined(POSITION_H_INCLUDED)