//// 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
friend class PawnInfoTable;
public:
- PawnInfo() { clear(); }
-
Score pawns_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;
+ 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;
- int get_king_shelter(const Position& pos, Color c, Square ksq);
+ Score king_shelter(const Position& pos, Color c, Square ksq);
private:
- void clear();
- int updateShelter(const Position& pos, Color c, Square ksq);
+ Score updateShelter(const Position& pos, Color c, Square ksq);
Key key;
- Bitboard passedPawns;
+ Bitboard passedPawns[2];
Bitboard pawnAttacks[2];
Square kingSquares[2];
Score value;
- int16_t ksStormValue[2], qsStormValue[2];
- uint8_t halfOpenFiles[2];
- uint8_t kingShelters[2];
+ int ksStormValue[2];
+ int qsStormValue[2];
+ int halfOpenFiles[2];
+ Score kingShelters[2];
};
/// The PawnInfoTable class represents a pawn hash table. It is basically
class PawnInfoTable {
+ enum SideType { KingSide, QueenSide };
+
public:
- PawnInfoTable(unsigned numOfEntries);
+ PawnInfoTable();
~PawnInfoTable();
- PawnInfo* get_pawn_info(const Position& pos);
+ PawnInfo* get_pawn_info(const Position& pos) const;
+ void prefetch(Key key) const;
private:
template<Color Us>
- Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+ 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;
- unsigned size;
PawnInfo* entries;
};
//// Inline functions
////
-inline Score PawnInfo::pawns_value() const {
- return value;
+inline void PawnInfoTable::prefetch(Key key) const {
+
+ unsigned index = unsigned(key & (PawnTableSize - 1));
+ PawnInfo* pi = entries + index;
+ ::prefetch((char*) pi);
}
-inline Bitboard PawnInfo::passed_pawns() const {
- return passedPawns;
+inline Score PawnInfo::pawns_value() const {
+ return value;
}
inline Bitboard PawnInfo::pawn_attacks(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)));
}
return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
}
-inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) {
- return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
+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)