This reverts commit
800410eef1c0811 and instead increases
stack size.
I went through the old emails with Daylen that reported the
crash issue on Mac OS X and was fixed by
0049d3f337b6f3a66a0.
It was reported default stack size for a thread in Mac OS X is 8
megabytes while the patch that we are reverting allows to reduce
stack size at max of about 217KB, so the reason for the crash was
only marginal in MAX_MOVES value. On those emails Daylen also
hinted how to increase stack size for Mac OS X to 16MB.
So prefer to increase stack size to 16MB instad of re-inventing
the wheel and do our home grown stack as we did with the patch
that we are now reverting (it will remain anyhow in git history
for documentation purposes).
No functional change.
endif
ifeq ($(os),osx)
- LDFLAGS += -arch $(arch) -mmacosx-version-min=10.0
+ LDFLAGS += -arch $(arch) -mmacosx-version-min=10.0 -stack_size,0x4000
endif
### 3.4 Debugging
assert(d > DEPTH_ZERO);
- cur = end = moves = pos.this_thread()->get_moves_array();
+ cur = end = moves;
endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm;
ss = s;
}
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Square sq) : pos(p), history(h) {
+ Square sq) : pos(p), history(h), cur(moves), end(moves) {
assert(d <= DEPTH_ZERO);
- cur = end = moves = pos.this_thread()->get_moves_array();
if (p.checkers())
stage = EVASION;
}
MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
- : pos(p), history(h) {
+ : pos(p), history(h), cur(moves), end(moves) {
assert(!pos.checkers());
- cur = end = moves = pos.this_thread()->get_moves_array();
stage = PROBCUT;
// In ProbCut we generate only captures better than parent's captured piece
end += (ttMove != MOVE_NONE);
}
-MovePicker::~MovePicker() { pos.this_thread()->free_moves_array(); }
/// score() assign a numerical move ordering score to each move in a move list.
/// The moves with highest scores will be picked first.
MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
MovePicker(const Position&, Move, const HistoryStats&, PieceType);
MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
- ~MovePicker();
template<bool SpNode> Move next_move();
ExtMove killers[4];
Square recaptureSquare;
int captureThreshold, stage;
- ExtMove *moves, *cur, *end, *endQuiets, *endBadCaptures;
+ ExtMove *cur, *end, *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
#endif // #ifndef MOVEPICK_H_INCLUDED
Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC
searching = false;
- maxPly = splitPointsSize = curPage = 0;
+ maxPly = splitPointsSize = 0;
activeSplitPoint = NULL;
activePosition = NULL;
idx = Threads.size();
- movePages.resize(MAX_PLY_PLUS_6 * MAX_MOVES);
}
virtual void idle_loop();
bool cutoff_occurred() const;
bool is_available_to(const Thread* master) const;
- ExtMove* get_moves_array() { return &movePages[curPage += MAX_MOVES]; }
- void free_moves_array() { curPage -= MAX_MOVES; }
template <bool Fake>
void split(Position& pos, const Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
Endgames endgames;
Pawns::Table pawnsTable;
Position* activePosition;
- std::vector<ExtMove> movePages;
- int curPage;
size_t idx;
int maxPly;
SplitPoint* volatile activeSplitPoint;