X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=2cc1a3c5d3bfa8a394045e9df9db5d6b854b0bff;hp=03147bf1a8f5aadb8deb0162902b023d0c574c32;hb=553655eb073cdd59c726dd77fcf368d499029467;hpb=1d0159075e916c738760b788d605b71b3736cb7c diff --git a/src/tt.h b/src/tt.h index 03147bf1..2cc1a3c5 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 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 @@ -22,7 +22,7 @@ #include -#include "move.h" +#include "misc.h" #include "types.h" @@ -47,11 +47,11 @@ class TTEntry { public: - void save(uint32_t k, Value v, ValueType t, Depth d, Move m, int g, Value statV, Value statM) { + void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value statV, Value statM) { key32 = (uint32_t)k; move16 = (uint16_t)m; - valueType = (uint8_t)t; + bound = (uint8_t)b; generation8 = (uint8_t)g; value16 = (int16_t)v; depth16 = (int16_t)d; @@ -64,7 +64,7 @@ public: Depth depth() const { return (Depth)depth16; } Move move() const { return (Move)move16; } Value value() const { return (Value)value16; } - ValueType type() const { return (ValueType)valueType; } + Bound type() const { return (Bound)bound; } int generation() const { return (int)generation8; } Value static_value() const { return (Value)staticValue; } Value static_value_margin() const { return (Value)staticMargin; } @@ -72,7 +72,7 @@ public: private: uint32_t key32; uint16_t move16; - uint8_t valueType, generation8; + uint8_t bound, generation8; int16_t value16, depth16, staticValue, staticMargin; }; @@ -103,7 +103,7 @@ public: ~TranspositionTable(); void set_size(size_t mbSize); void clear(); - void store(const Key posKey, Value v, ValueType type, Depth d, Move m, Value statV, Value kingD); + void store(const Key posKey, Value v, Bound type, Depth d, Move m, Value statV, Value kingD); TTEntry* probe(const Key posKey) const; void new_search(); TTEntry* first_entry(const Key posKey) const; @@ -146,10 +146,7 @@ struct SimpleHash { typedef SimpleHash Base; - void init() { - - if (entries) - return; + SimpleHash() { entries = new (std::nothrow) Entry[HashSize]; if (!entries)