Use a Thread instead of an array index

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2012-04-04 07:54:02 +01:00
parent 0439a79566
commit 673bc5526f
9 changed files with 76 additions and 82 deletions

View File

@@ -92,33 +92,27 @@ CheckInfo::CheckInfo(const Position& pos) {
}
/// Position c'tors. Here we always create a copy of the original position
/// or the FEN string, we want the new born Position object do not depend
/// on any external data so we detach state pointer from the source one.
/// Position::copy() creates a copy of 'pos'. We want the new born Position
/// object do not depend on any external data so we detach state pointer from
/// the source one.
void Position::copy(const Position& pos, int th) {
void Position::copy(const Position& pos, Thread* th) {
memcpy(this, &pos, sizeof(Position));
startState = *st;
st = &startState;
threadID = th;
thisThread = th;
nodes = 0;
assert(pos_is_ok());
}
Position::Position(const string& fen, bool isChess960, int th) {
from_fen(fen, isChess960);
threadID = th;
}
/// Position::from_fen() initializes the position object with the given FEN
/// string. This function is not very robust - make sure that input FENs are
/// correct (this is assumed to be the responsibility of the GUI).
void Position::from_fen(const string& fenStr, bool isChess960) {
void Position::from_fen(const string& fenStr, bool isChess960, Thread* th) {
/*
A FEN string defines a particular position using only the ASCII character set.
@@ -234,6 +228,7 @@ void Position::from_fen(const string& fenStr, bool isChess960) {
st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove);
chess960 = isChess960;
thisThread = th;
assert(pos_is_ok());
}
@@ -336,7 +331,7 @@ void Position::print(Move move) const {
if (move)
{
Position p(*this, this_thread());
Position p(*this, thisThread);
cout << "\nMove is: " << (sideToMove == BLACK ? ".." : "") << move_to_san(p, move);
}
@@ -903,8 +898,8 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
}
// Prefetch pawn and material hash tables
prefetch((char*)Threads[threadID].pawnTable.entries[st->pawnKey]);
prefetch((char*)Threads[threadID].materialTable.entries[st->materialKey]);
prefetch((char*)thisThread->pawnTable.entries[st->pawnKey]);
prefetch((char*)thisThread->materialTable.entries[st->materialKey]);
// Update incremental scores
st->psqScore += psq_delta(piece, from, to);
@@ -1546,10 +1541,10 @@ void Position::init() {
void Position::flip() {
// Make a copy of current position before to start changing
const Position pos(*this, threadID);
const Position pos(*this, thisThread);
clear();
threadID = pos.this_thread();
thisThread = &pos.this_thread();
// Board
for (Square s = SQ_A1; s <= SQ_H8; s++)