X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftt.h;h=ff3605daa306b121c56f9aa3cf7c38b400ebcf97;hb=3705559fdb1d5959ed6eba37f1b06e03a25be82d;hp=aee530b05485d6149ec3441e44db51cdcfbf88d7;hpb=203fdc9ac1b0ad5e5820b450a0cffdffb917e069;p=stockfish
diff --git a/src/tt.h b/src/tt.h
index aee530b0..ff3605da 100644
--- a/src/tt.h
+++ b/src/tt.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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(TT_H_INCLUDED)
+#ifndef TT_H_INCLUDED
#define TT_H_INCLUDED
#include "misc.h"
@@ -32,45 +32,42 @@
/// value: 16 bit
/// depth: 16 bit
/// static value: 16 bit
-/// static margin: 16 bit
struct TTEntry {
- void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev, Value em) {
+ void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev) {
- key32 = (uint32_t)k;
- move16 = (uint16_t)m;
- bound8 = (uint8_t)b;
- generation8 = (uint8_t)g;
- value16 = (int16_t)v;
- depth16 = (int16_t)d;
- evalValue = (int16_t)ev;
- evalMargin = (int16_t)em;
+ key32 = (uint32_t)k;
+ move16 = (uint16_t)m;
+ bound8 = (uint8_t)b;
+ generation8 = (uint8_t)g;
+ value16 = (int16_t)v;
+ depth16 = (int16_t)d;
+ evalValue = (int16_t)ev;
}
- void set_generation(uint8_t g) { generation8 = g; }
- uint32_t key() const { return key32; }
- Depth depth() const { return (Depth)depth16; }
- Move move() const { return (Move)move16; }
- Value value() const { return (Value)value16; }
- Bound bound() const { return (Bound)bound8; }
- int generation() const { return (int)generation8; }
- Value eval_value() const { return (Value)evalValue; }
- Value eval_margin() const { return (Value)evalMargin; }
+ uint32_t key() const { return key32; }
+ Move move() const { return (Move)move16; }
+ Bound bound() const { return (Bound)bound8; }
+ Value value() const { return (Value)value16; }
+ Depth depth() const { return (Depth)depth16; }
+ Value eval_value() const { return (Value)evalValue; }
private:
+ friend class TranspositionTable;
+
uint32_t key32;
uint16_t move16;
uint8_t bound8, generation8;
- int16_t value16, depth16, evalValue, evalMargin;
+ int16_t value16, depth16, evalValue;
};
/// A TranspositionTable consists of a power of 2 number of clusters and each
/// cluster consists of ClusterSize number of TTEntry. Each non-empty entry
-/// contains information of exactly one position. Size of a cluster shall not be
-/// bigger than a cache line size. In case it is less, it should be padded to
-/// guarantee always aligned accesses.
+/// contains information of exactly one position. The size of a cluster should
+/// not be bigger than a cache line size. In case it is less, it should be padded
+/// to guarantee always aligned accesses.
class TranspositionTable {
@@ -78,14 +75,13 @@ class TranspositionTable {
public:
~TranspositionTable() { free(mem); }
- void new_search() { generation++; }
+ void new_search() { ++generation; }
const TTEntry* probe(const Key key) const;
TTEntry* first_entry(const Key key) const;
- void refresh(const TTEntry* tte) const;
- void set_size(size_t mbSize);
+ void resize(uint64_t mbSize);
void clear();
- void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV, Value kingD);
+ void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV);
private:
uint32_t hashMask;
@@ -106,13 +102,4 @@ inline TTEntry* TranspositionTable::first_entry(const Key key) const {
return table + ((uint32_t)key & hashMask);
}
-
-/// TranspositionTable::refresh() updates the 'generation' value of the TTEntry
-/// to avoid aging. Normally called after a TT hit.
-
-inline void TranspositionTable::refresh(const TTEntry* tte) const {
-
- const_cast(tte)->set_generation(generation);
-}
-
-#endif // !defined(TT_H_INCLUDED)
+#endif // #ifndef TT_H_INCLUDED