/*
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
#include <iostream>
-#include "move.h"
+#include "misc.h"
#include "types.h"
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;
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; }
private:
uint32_t key32;
uint16_t move16;
- uint8_t valueType, generation8;
+ uint8_t bound, generation8;
int16_t value16, depth16, staticValue, staticMargin;
};
~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);
- TTEntry* retrieve(const Key posKey) const;
+ 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;
void refresh(const TTEntry* tte) const;
/// Without cluster concept or overwrite policy.
template<class Entry, int HashSize>
-class SimpleHash {
+struct SimpleHash {
- SimpleHash(const SimpleHash&);
- SimpleHash& operator=(const SimpleHash&);
+ typedef SimpleHash<Entry, HashSize> Base;
-public:
- SimpleHash() {
+ void init() {
+
+ if (entries)
+ return;
entries = new (std::nothrow) Entry[HashSize];
if (!entries)
{
std::cerr << "Failed to allocate " << HashSize * sizeof(Entry)
- << " bytes for material hash table." << std::endl;
+ << " bytes for hash table." << std::endl;
exit(EXIT_FAILURE);
}
memset(entries, 0, HashSize * sizeof(Entry));
virtual ~SimpleHash() { delete [] entries; }
- Entry* find(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
- void prefetch(Key key) const { ::prefetch((char*)find(key)); }
+ Entry* probe(Key key) const { return entries + ((uint32_t)key & (HashSize - 1)); }
+ void prefetch(Key key) const { ::prefetch((char*)probe(key)); }
protected:
Entry* entries;