X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=afb456c9036bdd483181b2e3403ca423ce4eb056;hp=ba94a72319ef665728206d89aa68ac39e5785c0a;hb=ccdb634b7722a300707b9348ac30ae2c4152da8a;hpb=080a4995a3977a0fe7071e62151dc4d716a13302

diff --git a/src/pawns.h b/src/pawns.h
index ba94a723..afb456c9 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
@@ -83,6 +85,11 @@ public:
   PawnInfo* get_pawn_info(const Position& pos);
 
 private:
+  typedef std::pair<Value, Value> Values;
+
+  template<Color Us>
+  Values evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+
   unsigned size;
   PawnInfo* entries;
 };
@@ -104,6 +111,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 +139,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)