Consolidated mlb and mpb into one movelist_buf.

dpldgr · Nov 20, 2024 · 1f770f1 · 1f770f1
1 parent 544773b
commit 1f770f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/src/movegen.cpp b/src/movegen.cpp
@@ -23,8 +23,7 @@
 
 namespace Stockfish {
 
-movelist_buf mlb(MAX_MOVES,8);
-movelist_buf mpb(MAX_MOVES,64);
+movelist_buf mlb(MAX_MOVES,64);
 
 namespace {
 

diff --git a/src/movegen.h b/src/movegen.h
@@ -126,7 +126,6 @@ ExtMove* generate(const Position& pos, ExtMove* moveList);
     };
 
 	extern movelist_buf mlb;
-	extern movelist_buf mpb;
 
 /// The MoveList struct is a simple wrapper around generate(). It sometimes comes
 /// in handy to use this class instead of the low level generate() function.

diff --git a/src/movepick.cpp b/src/movepick.cpp
@@ -69,7 +69,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist
              ttMove(ttm), refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, depth(d), ply(pl) {
 
   assert(d > 0);
-  this->moves = mpb.acquire();
+  this->moves = mlb.acquire();
 
   stage = (pos.checkers() ? EVASION_TT : MAIN_TT) +
           !(ttm && pos.pseudo_legal(ttm));
@@ -81,7 +81,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist
            : pos(p), mainHistory(mh), gateHistory(dh), captureHistory(cph), continuationHistory(ch), ttMove(ttm), recaptureSquare(rs), depth(d) {
 
   assert(d <= 0);
-  this->moves = mpb.acquire();
+  this->moves = mlb.acquire();
 
   stage = (pos.checkers() ? EVASION_TT : QSEARCH_TT) +
           !(   ttm
@@ -95,7 +95,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th, const GateHistory*
            : pos(p), gateHistory(dh), captureHistory(cph), ttMove(ttm), threshold(th) {
 
   assert(!pos.checkers());
-  this->moves = mpb.acquire();
+  this->moves = mlb.acquire();
 
   stage = PROBCUT_TT + !(ttm && pos.capture(ttm)
                              && pos.pseudo_legal(ttm)
@@ -104,7 +104,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th, const GateHistory*
 
 MovePicker::~MovePicker() {
 
-  mpb.release(this->moves);
+  mlb.release(this->moves);
 }
 
 

diff --git a/src/variant.cpp b/src/variant.cpp
@@ -522,7 +522,6 @@ namespace {
         return v;
     }
 
-#ifdef ALLVARS
     // Duck chess
     // https://duckchess.com/
     Variant* duck_variant() {
@@ -537,7 +536,6 @@ namespace {
         v->endgameEval = EG_EVAL_DUCK;
         return v;
     }
-#endif
 
     Variant* isolation_variant() { //https://boardgamegeek.com/boardgame/1875/isolation
         Variant* v = chess_variant_base()->init();
@@ -1681,7 +1679,6 @@ namespace {
         v->enclosingDropStart = make_bitboard(SQ_E5, SQ_F5, SQ_E6, SQ_F6);
         return v;
     }
-#ifdef ALLVARS
     // Game of the Amazons
     // https://en.wikipedia.org/wiki/Game_of_the_Amazons
     Variant* amazons_variant() {
@@ -1696,7 +1693,6 @@ namespace {
         v->wallingRule = ARROW;
         return v;
     }
-#endif
     // Xiangqi (Chinese chess)
     // https://en.wikipedia.org/wiki/Xiangqi
     // Xiangqi base variant for inheriting rules without chasing rules
@@ -1855,9 +1851,7 @@ void VariantMap::init() {
     add("isolation7x7", isolation7x7_variant());
     add("snailtrail", snailtrail_variant());
     add("fox-and-hounds", fox_and_hounds_variant());
-#ifdef ALLVARS
     add("duck", duck_variant());
-#endif
     add("joust", joust_variant());
     add("3check", threecheck_variant());
     add("5check", fivecheck_variant());
@@ -1924,9 +1918,7 @@ void VariantMap::init() {
     add("shako", shako_variant());
     add("clobber10", clobber10_variant());
     add("flipello10", flipello10_variant());
-#ifdef ALLVARS
     add("amazons", amazons_variant());
-#endif
     add("xiangqi", xiangqi_variant());
     add("manchu", manchu_variant());
     add("supply", supply_variant());