X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpawns.h;h=bfd30898ea705c9400fe2ac0ea54ad5f72a87dfc;hb=f05d059b17c8c0614517608c1e1f585dc95597e9;hp=ba94a72319ef665728206d89aa68ac39e5785c0a;hpb=080a4995a3977a0fe7071e62151dc4d716a13302;p=stockfish diff --git a/src/pawns.h b/src/pawns.h index ba94a723..bfd30898 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -45,12 +45,13 @@ class PawnInfo { friend class PawnInfoTable; public: - PawnInfo() : key(0) { clear(); } + PawnInfo() { clear(); } Value mg_value() const; Value eg_value() const; Value kingside_storm_value(Color c) const; Value queenside_storm_value(Color c) const; + Bitboard pawn_attacks(Color c) const; Bitboard passed_pawns() const; int file_is_half_open(Color c, File f) const; int has_open_file_to_left(Color c, File f) const; @@ -58,16 +59,17 @@ public: int get_king_shelter(const Position& pos, Color c, Square ksq); private: - inline void clear(); + void clear(); int updateShelter(const Position& pos, Color c, Square ksq); Key key; Bitboard passedPawns; + Bitboard pawnAttacks[2]; int16_t mgValue, egValue; int16_t ksStormValue[2], qsStormValue[2]; uint8_t halfOpenFiles[2]; Square kingSquares[2]; - int16_t kingShelters[2]; + uint8_t kingShelters[2]; }; /// The PawnInfoTable class represents a pawn hash table. It is basically @@ -104,6 +106,10 @@ inline Bitboard PawnInfo::passed_pawns() const { return passedPawns; } +inline Bitboard PawnInfo::pawn_attacks(Color c) const { + return pawnAttacks[c]; +} + inline Value PawnInfo::kingside_storm_value(Color c) const { return Value(ksStormValue[c]); } @@ -128,15 +134,4 @@ inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq)); } -inline void PawnInfo::clear() { - - passedPawns = EmptyBoardBB; - mgValue = egValue = 0; - ksStormValue[WHITE] = ksStormValue[BLACK] = 0; - qsStormValue[WHITE] = qsStormValue[BLACK] = 0; - halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF; - kingSquares[WHITE] = kingSquares[BLACK] = SQ_NONE; -} - - #endif // !defined(PAWNS_H_INCLUDED)