X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=900b0925451c545fe79e5668ede1638bcd43776f;hp=ba337a8d64a3726fbf91273e30800093d548839c;hb=c7a932bc744f899f53ce0013cbbbaa86915bb2e8;hpb=5c81602d14539f8259a715477315e28b5de7cb54

diff --git a/src/pawns.h b/src/pawns.h
index ba337a8d..900b0925 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -32,10 +32,12 @@
 //// Types
 ////
 
+const int PawnTableSize = 16384;
+
 /// PawnInfo is a class which contains various information about a pawn
-/// structure.  Currently, it only includes a middle game and an end game
-/// pawn structure evaluation, and a bitboard of passed pawns.  We may want
-/// to add further information in the future.  A lookup to the pawn hash table
+/// structure. Currently, it only includes a middle game and an end game
+/// pawn structure evaluation, and a bitboard of passed pawns. We may want
+/// to add further information in the future. A lookup to the pawn hash table
 /// (performed by calling the get_pawn_info method in a PawnInfoTable object)
 /// returns a pointer to a PawnInfo object.
 class Position;
@@ -45,26 +47,30 @@ class PawnInfo {
   friend class PawnInfoTable;
 
 public:
-  Value mg_value() const;
-  Value eg_value() const;
+  Score pawns_value() const;
   Value kingside_storm_value(Color c) const;
   Value queenside_storm_value(Color c) const;
-  Bitboard passed_pawns() const;
+  Bitboard pawn_attacks(Color c) const;
+  Bitboard passed_pawns(Color c) const;
   int file_is_half_open(Color c, File f) const;
   int has_open_file_to_left(Color c, File f) const;
   int has_open_file_to_right(Color c, File f) const;
+  Score king_shelter(const Position& pos, Color c, Square ksq);
 
 private:
-  void clear();
+  Score updateShelter(const Position& pos, Color c, Square ksq);
 
   Key key;
-  Bitboard passedPawns;
-  int16_t mgValue, egValue;
-  int16_t ksStormValue[2], qsStormValue[2];
-  uint8_t halfOpenFiles[2];
+  Bitboard passedPawns[2];
+  Bitboard pawnAttacks[2];
+  Square kingSquares[2];
+  Score value;
+  int ksStormValue[2];
+  int qsStormValue[2];
+  int halfOpenFiles[2];
+  Score kingShelters[2];
 };
 
-
 /// The PawnInfoTable class represents a pawn hash table.  It is basically
 /// just an array of PawnInfo objects and a few methods for accessing these
 /// objects.  The most important method is get_pawn_info, which looks up a
@@ -72,14 +78,21 @@ private:
 
 class PawnInfoTable {
 
+  enum SideType { KingSide, QueenSide };
+
 public:
-  PawnInfoTable(unsigned numOfEntries);
+  PawnInfoTable();
   ~PawnInfoTable();
-  void clear();
-  PawnInfo* get_pawn_info(const Position& pos);
+  PawnInfo* get_pawn_info(const Position& pos) const;
+  void prefetch(Key key) const;
 
 private:
-  unsigned size;
+  template<Color Us>
+  Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const;
+
+  template<Color Us, SideType Side>
+  int evaluate_pawn_storm(Square s, Rank r, File f, Bitboard theirPawns) const;
+
   PawnInfo* entries;
 };
 
@@ -88,16 +101,19 @@ private:
 //// Inline functions
 ////
 
-inline Value PawnInfo::mg_value() const {
-  return Value(mgValue);
+inline void PawnInfoTable::prefetch(Key key) const {
+
+    unsigned index = unsigned(key & (PawnTableSize - 1));
+    PawnInfo* pi = entries + index;
+    ::prefetch((char*) pi);
 }
 
-inline Value PawnInfo::eg_value() const {
-  return Value(egValue);
+inline Score PawnInfo::pawns_value() const {
+  return value;
 }
 
-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 {
@@ -108,6 +124,10 @@ inline Value PawnInfo::queenside_storm_value(Color c) const {
   return Value(qsStormValue[c]);
 }
 
+inline Bitboard PawnInfo::passed_pawns(Color c) const {
+  return passedPawns[c];
+}
+
 inline int PawnInfo::file_is_half_open(Color c, File f) const {
   return (halfOpenFiles[c] & (1 << int(f)));
 }
@@ -120,14 +140,8 @@ inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
   return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
 }
 
-inline void PawnInfo::clear() {
-
-  passedPawns = EmptyBoardBB;
-  mgValue = egValue = 0;
-  ksStormValue[WHITE] = ksStormValue[BLACK] = 0;
-  qsStormValue[WHITE] = qsStormValue[BLACK] = 0;
-  halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF;
+inline Score PawnInfo::king_shelter(const Position& pos, Color c, Square ksq) {
+  return kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq);
 }
 
-
 #endif // !defined(PAWNS_H_INCLUDED)