X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.h;h=021019be4c18ef71f2a04fe18c71ebfd51fa8bc9;hp=bff1749841b1ac1312a7a413d9c3619eb6e461c0;hb=06a350f1aee97f05c3416853fb54385b23030ebc;hpb=60bc30275decbb00aa26af8dc14ad6cb167eaa82 diff --git a/src/tt.h b/src/tt.h index bff17498..021019be 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-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 @@ -46,8 +46,8 @@ /// the 32 bits of the data field are so defined /// /// bit 0-16: move -/// bit 17-19: not used -/// bit 20-22: value type +/// bit 17-18: not used +/// bit 19-22: value type /// bit 23-31: generation class TTEntry { @@ -55,14 +55,14 @@ class TTEntry { public: TTEntry() {} TTEntry(uint32_t k, Value v, ValueType t, Depth d, Move m, int generation) - : key_ (k), data((m & 0x1FFFF) | (t << 20) | (generation << 23)), + : key_ (k), data((m & 0x1FFFF) | (t << 19) | (generation << 23)), value_(int16_t(v)), depth_(int16_t(d)) {} uint32_t key() const { return key_; } Depth depth() const { return Depth(depth_); } Move move() const { return Move(data & 0x1FFFF); } Value value() const { return Value(value_); } - ValueType type() const { return ValueType((data >> 20) & 7); } + ValueType type() const { return ValueType((data >> 19) & 0xF); } int generation() const { return (data >> 23); } private: @@ -95,14 +95,14 @@ class TranspositionTable { public: TranspositionTable(); ~TranspositionTable(); - void set_size(unsigned mbSize); + void set_size(size_t mbSize); void clear(); void store(const Key posKey, Value v, ValueType type, Depth d, Move m); TTEntry* retrieve(const Key posKey) const; void prefetch(const Key posKey) const; void new_search(); void insert_pv(const Position& pos, Move pv[]); - void extract_pv(const Position& pos, Move pv[], int pvSize); + void extract_pv(const Position& pos, Move pv[], const int PLY_MAX); int full() const; private: @@ -114,7 +114,7 @@ private: unsigned writes; // heavy SMP read/write access here unsigned char pad_after[64]; - unsigned size; + size_t size; TTCluster* entries; uint8_t generation; };