From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Fri, 31 May 2013 17:50:12 +0000 (+0200)
Subject: Leave move list of game position on stack permanently
X-Git-Tag: 0.18~49
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=73e38eee67d4adfe808694e23046c1a89c6d1a8f;p=hachu.git

Leave move list of game position on stack permanently

The move list that was temporarily created for ParseMove and Highlight
is now kept permanently on the stack (by setting msp to the end of it
after it is created). ParseMove and Highlight thus no longer have to
generate it, and generation is moved to the top of the main loop, and
only done when the list does not exist yet. The list is discarded as soon
as we execute a command that changes the game position.
---

diff --git a/hachu.c b/hachu.c
index a81f25f..2b89d21 100644
--- a/hachu.c
+++ b/hachu.c
@@ -2091,7 +2091,7 @@ MapFromScratch(attacks);
   postThinking--; repCnt = 0; tlim1 = tlim2 = 1e8; msp = 0;
   Search(-INF-1, INF+1, 0, 1, sup1 & ~PROMOTE, sup2);
   postThinking++;
-  listStart = retFirst; listEnd = retMSP;
+  listStart = retFirst; listEnd = msp = retMSP;
 }
 
 MOVE
@@ -2116,7 +2116,7 @@ ParseMove (char *moveText)
   ret = f<<SQLEN | t2;
   if(*moveText != '\n' && *moveText != '=') ret |= PROMOTE;
 printf("# suppress = %c%d\n", sup1%BW+'a', sup1/BW);
-  ListMoves();
+//  ListMoves();
   for(i=listStart; i<listEnd; i++) {
     if(moveStack[i] == INVALID) continue;
     if(c == '@' && (moveStack[i] & SQUARE) == (moveStack[i] >> SQLEN & SQUARE)) break; // any null move matches @@@@
@@ -2157,7 +2157,7 @@ Highlight(char *coords)
   char b[BSIZE], buf[2000], *q;
   for(i=0; i<bsize; i++) b[i] = 0;
   ReadSquare(coords, &sqr);
-  ListMoves();
+//  ListMoves();
   for(i=listStart; i<listEnd; i++) {
     if(sqr == (moveStack[i]>>SQLEN & SQUARE)) {
       int t = moveStack[i] & SQUARE;
@@ -2259,6 +2259,8 @@ printf("# setup done");fflush(stdout);
 
         fflush(stdout);                 // make sure everything is printed before we do something that might take time
 
+        if(listEnd == 0) ListMoves();   // always maintain a list of legal moves in root position
+
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move
      
 pboard(board);
@@ -2285,6 +2287,7 @@ pboard(board);
             stm = MakeMove2(stm, move);  // assumes MakeMove returns new side to move
             gameMove[moveNr++] = move;  // remember game
             printf("move %s\n", MoveToText(move, 1));
+            listEnd = 0;
           }
         }
 
@@ -2380,11 +2383,12 @@ pboard(board);
             if(comp) PrintResult(stm, -INF); // against computer: claim
           } else {
             stm = MakeMove2(stm, move);
-            ponderMove = INVALID;
+            ponderMove = INVALID; listEnd = 0;
             gameMove[moveNr++] = move;  // remember game
           }
           continue;
         }
+        listEnd = 0;
         if(!strcmp(command, "new"))     {
           engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; curVarNr = comp = 0;
           continue;