deepcrayon
/
stockfish
1
0
Fork 0
Code Releases Activity

Revert "pseudo_legal() and MOVE_NONE" 

This reverts commit 33d9548218 ,
which crashed in DEBUG mode because of the following assert in position.h

````
Assertion failed: (is_ok(m)), function capture, file ./position.h, line 369.
````

No functional change
pull/1851/head
Stéphane Nicolet 2018-12-06 15:00:38 +01:00
parent 7b4f9c37cb
commit 5c2fbcd09b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/movepick.cpp
View File

@ -67,7 +67,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist
assert(d > DEPTH_ZERO);
stage = pos.checkers() ? EVASION_TT : MAIN_TT;
ttMove = pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
}
@ -79,8 +79,9 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist
assert(d <= DEPTH_ZERO);
stage = pos.checkers() ? EVASION_TT : QSEARCH_TT;
ttMove = pos.pseudo_legal(ttm)
&& (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare) ? ttm : MOVE_NONE;
ttMove = ttm
&& pos.pseudo_legal(ttm)
&& (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare) ? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
}
@ -92,7 +93,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePiece
assert(!pos.checkers());
stage = PROBCUT_TT;
ttMove = pos.pseudo_legal(ttm)
ttMove = ttm
&& pos.pseudo_legal(ttm)
&& pos.capture(ttm)
&& pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE;
stage += (ttMove == MOVE_NONE);
@ -192,7 +194,8 @@ top:
/* fallthrough */
case REFUTATION:
if (select<Next>([&](){ return !pos.capture(move)
if (select<Next>([&](){ return move != MOVE_NONE
&& !pos.capture(move)
&& pos.pseudo_legal(move); }))
return move;
++stage;

1
src/position.cpp
View File

@ -579,7 +579,6 @@ bool Position::legal(Move m) const {
/// Position::pseudo_legal() takes a random move and tests whether the move is
/// pseudo legal. It is used to validate moves from TT that can be corrupted
/// due to SMP concurrent access or hash position key aliasing.
/// MOVE_NONE is represented as SQ_A1 to SQ_A1 which is never pseudo_legal.
bool Position::pseudo_legal(const Move m) const {