perft: fix divide (untested for ages!). perft-test: SF uses divide

.dir-locals.el

@@ -1,3 +1,3 @@
 ((nil . ((compile-command . (concat "make -C "
                                        (vc-root-dir)
-                                       " -k -j4 testing")))))
+                                       " -k -j4 dev")))))

MEMO.org

@@ -1,2 +1,23 @@
 ** Some current ideas
-- helpers for square, pieces, etc: validity, conversions
+- Test popbit/square_of with intrinsincs, something like :
+  bitboard_t popbit64(bitboard_t *bb)
+  {
+    bitboard_t first = _blsi_u64(*bb);
+    *bb ^= lsb;
+    return first;
+  }
+
+  square_t square_of(bitboard_t bb) {
+    return _tzcnt_u64(bb);
+  }
+
+  loop:
+  while (bb) {
+	bitboard_t first = popbit(bb);
+    square_t sq = square_of(first);
+  }
+
+  Or maybe faster:
+  for (; bb; bb &= bb - 1) {
+    sq = _tzcnt_u64(bb);
+  }

Makefile

@@ -11,9 +11,17 @@
 #
 
 SHELL     := /bin/bash
-CC        := gcc
-#CC        := gcc-13
-#CC        := clang
+
+ifeq ($(CC),)
+        CC = gcc
+endif
+ifeq ($(CC),cc)
+        CC = gcc
+endif
+ifeq ($(BUILD),)
+        BUILD = dev
+endif
+
 BEAR      := bear
 TOUCH     := touch
 RM        := rm
@@ -41,7 +49,7 @@ OBJ       := $(addprefix $(OBJDIR)/,$(SRC_FN:.c=.o))
 TSTSRC    := $(wildcard $(TSTDIR)/*.c)
 
 LIB       := br_$(shell uname -m)                           # library name
-LIBS      := $(strip -l$(LIB) -lreadline)
+LIBS      := $(strip -l$(LIB))
 
 DEP_FN    := $(SRC_FN)
 DEP       := $(addprefix $(DEPDIR)/,$(DEP_FN:.c=.d))
@@ -52,34 +60,60 @@ TARGET    := $(addprefix $(BINDIR)/,$(TARGET_FN))
 ASMFILES  := $(SRC:.c=.s) $(TSTSRC:.c=.s)
 CPPFILES  := $(SRC:.c=.i) $(TSTSRC:.c=.i)
 
+##################################### set a version string
+# inspired from:
+#  https://eugene-babichenko.github.io/blog/2019/09/28/nightly-versions-makefiles/
+
+# last commit and date
+COMMIT    := $(shell git rev-parse --short HEAD)
+DATE      := $(shell git log -1 --format=%cd --date=format:"%Y%m%d")
+
+# get last commit w/ tag & associated tag, if any
+TAG_COMM  := $(shell git rev-list --abbrev-commit --tags --max-count=1)
+ifneq ($(TAG_COMMIT),)
+TAG       := $(shell git describe --abbrev=0 --tags ${TG_COMM} 2>/dev/null || true)
+VERSION   := $(TAG:v%=%)
+endif
+
+# if no version, use last commit and date.
+# else, if last commit != last tag commit, add commit and date to version number
+ifeq ($(VERSION),)
+  VERSION := build-$(COMMIT)-$(DATE)
+else ifneq ($(COMMIT), $(TAG_COMMIT))
+  VERSION := $(VERSION)-next-$(COMMIT)-$(DATE)
+endif
+# if uncommited changes, add "dirty" indicator
+ifneq ($(shell git status --porcelain),)
+  VERSION := $(VERSION)-dirty
+endif
+
 ##################################### pre-processor flags
-CPPFLAGS  := -I$(BRINCDIR) -I$(INCDIR)
+CPPFLAGS  := -I$(BRINCDIR) -I$(INCDIR) -DVERSION=\"$(VERSION)\"
 
-CPPFLAGS  += -DNDEBUG                                       # assert (unused)
-CPPFLAGS  += -DWARN_ON                                      # brlib bug.h
-CPPFLAGS  += -DBUG_ON                                       # brlib bug.h
+ifeq ($(BUILD),release)
+        CPPFLAGS  += -DNDEBUG                               # assert (unused)
+else # ifeq ($(BUILD),dev)
+        CPPFLAGS  += -DWARN_ON                              # brlib bug.h
+        CPPFLAGS  += -DBUG_ON                               # brlib bug.h
 
-#CPPFLAGS  += -DDEBUG                                        # global - unused
-#CPPFLAGS  += -DDEBUG_DEBUG                                  # enable log() functions
-#CPPFLAGS  += -DDEBUG_DEBUG_C                                # enable log() settings
-#CPPFLAGS  += -DDEBUG_POOL                                   # memory pools management
-#CPPFLAGS  += -DDEBUG_POS                                    # position.c
-#CPPFLAGS  += -DDEBUG_MOVE                                   # move generation
-
-# fen.c
-#CPPFLAGS  += -DDEBUG_FEN                                    # FEN decoding
-
-# hash / TT
-#CPPFLAGS  += -DZOBRIST_VERIFY                                # double chk zobrist
-#CPPFLAGS  += -DPERFT_MOVE_HISTORY			      # perft, keep prev moves
-
-# attack.c
-#CPPFLAGS  += -DDEBUG_ATTACK_ATTACKERS                       # sq_attackers
-#CPPFLAGS  += -DDEBUG_ATTACK_PINNERS                         # sq_pinners details
-
-#CPPFLAGS  += -DDEBUG_EVAL                                   # eval functions
-#CPPFLAGS  += -DDEBUG_PIECE                                  # piece list management
-#CPPFLAGS  += -DDEBUG_SEARCH                                 # move search
+        #CPPFLAGS  += -DDEBUG                               # global - unused
+        #CPPFLAGS  += -DDEBUG_DEBUG                         # enable log() functions
+        #CPPFLAGS  += -DDEBUG_DEBUG_C                       # enable log() settings
+        #CPPFLAGS  += -DDEBUG_POOL                          # memory pools management
+        #CPPFLAGS  += -DDEBUG_POS                           # position.c
+        #CPPFLAGS  += -DDEBUG_MOVE                          # move generation
+        #        fen.c
+        #CPPFLAGS  += -DDEBUG_FEN                           # FEN decoding
+        #        hash / TT
+        #CPPFLAGS  += -DZOBRIST_VERIFY                      # double chk zobrist
+        #CPPFLAGS  += -DPERFT_MOVE_HISTORY                  # perft, keep prev moves
+        #        attack.c
+        #CPPFLAGS  += -DDEBUG_ATTACK_ATTACKERS              # sq_attackers
+        #CPPFLAGS  += -DDEBUG_ATTACK_PINNERS                # sq_pinners details
+        #       CPPFLAGS  += -DDEBUG_EVAL                   # eval functions
+        #CPPFLAGS  += -DDEBUG_PIECE                         # piece list management
+        #CPPFLAGS  += -DDEBUG_SEARCH                        # move search
+endif
 
 CPPFLAGS  += -DDIAGRAM_SYM                                  # UTF8 symbols in diagrams
 
@@ -89,41 +123,49 @@ CPPFLAGS  := $(strip $(CPPFLAGS))
 ##################################### compiler flags
 CFLAGS    := -std=gnu11
 
-### dev OR release
-
-# dev
-CFLAGS    += -g                                             # symbols (gdb, perf, etc.)
-CFLAGS    += -ginline-points                                # inlined funcs debug info
-#CFLAGS    += -Og
-# for gprof
-#CFLAGS += -pg
-# Next one may be useful for valgrind (when invalid instructions)
-#CFLAGS += -mno-tbm
-
-# release
-CFLAGS    += -O3
-
-CFLAGS    += -march=native
-CFLAGS    += -flto
-CFLAGS    += -funroll-loops
 CFLAGS    += -Wall
 CFLAGS    += -Wextra
 CFLAGS    += -Wshadow
 CFLAGS    += -Wmissing-declarations
+CFLAGS    += -march=native
+
+### dev OR release
+ifeq ($(BUILD),release)
+        CFLAGS    += -O3
+        CFLAGS    += -g
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        CFLAGS    += -funroll-loops
+        CFLAGS    += -flto
+else ifeq ($(BUILD),dev)
+        CFLAGS    += -Og
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        #CFLAGS += -pg                                 # gprof
+        # Next one may be useful for valgrind (when invalid instructions)
+        #CFLAGS += -mno-tbm
+else ifeq ($(BUILD),perf)
+        CFLAGS    += -O3
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        CFLAGS    += -funroll-loops
+else ifeq ($(BUILD),debug)
+        CFLAGS    += -O0
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        # for gprof
+        #CFLAGS += -pg
+        # Next one may be useful for valgrind (when invalid instructions)
+        #CFLAGS += -mno-tbm
+endif
 
 CFLAGS    := $(strip $(CFLAGS))
 
-# development CFLAGS - unused - TODO
-#DEV_CFLAGS := -Og
-#DEV_CFLAGS += -g
-
-# release CFLAGS - unused - TODO
-#REL_CFLAGS := -Ofast
-
 ##################################### linker flags
 LDFLAGS   := --static
 LDFLAGS   += -L$(BRLIBDIR)
-LDFLAGS   += -flto
+
+ifeq ($(BUILD),release)
+        LDFLAGS   += -flto
+endif
 
 LDFLAGS   := $(strip $(LDFLAGS))
 
@@ -168,9 +210,21 @@ $(sort all $(MAKECMDGOALS)):
 else
 
 ##################################### General targets
-.PHONY: all compile clean cleanall
+.PHONY: all release dev perf debug compile clean cleanall
 
-all: $(TARGET)
+all: testing $(TARGET)
+
+release:
+	$(MAKE) BUILD=release clean all
+
+dev:
+	$(MAKE) BUILD=dev clean all
+
+perf:
+	$(MAKE) BUILD=perf clean all
+
+debug:
+	$(MAKE) BUILD=debug clean all
 
 compile: brlib objs
 
@@ -286,7 +340,7 @@ cleanbindir:
 	$(call rmdir,$(BINDIR),binaries)
 
 $(TARGET): libs $(OBJ) | $(BINDIR)
-	@echo generating $@.
+	@echo linking $@.
 	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o $@
 
 ##################################### pre-processed (.i) and assembler (.s) output
@@ -301,7 +355,7 @@ cleanasmcpp:
 
 %.s: %.c
 	@echo "generating $@ (asm)."
-	@$(CC) -S -fverbose-asm $(CPPFLAGS) $(CFLAGS) $< -o $@
+	$(CC) -S -fverbose-asm $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 ##################################### LSP (ccls)
 .PHONY: ccls
@@ -319,7 +373,7 @@ $(CCLSROOT):
 # maybe run cleanobj cleanlibobj in commands ?
 $(CCLSFILE): cleanobj cleanbrlib libs | $(CCLSROOT)
 	@echo "Generating ccls compile commands file ($@)."
-	@$(BEAR) -- $(MAKE) testing
+	@$(BEAR) -- $(MAKE)
 
 ##################################### valgrind (mem check)
 .PHONY: memcheck
@@ -344,11 +398,11 @@ TEST          += movedo-test perft-test tt-test
 
 PIECE_OBJS    := piece.o
 FEN_OBJS      := $(PIECE_OBJS) fen.o position.o bitboard.o board.o \
-	hyperbola-quintessence.o attack.o hash.o init.o
+	hyperbola-quintessence.o attack.o hash.o init.o misc.o move.o
 BB_OBJS       := $(FEN_OBJS)
-MOVEGEN_OBJS  := $(BB_OBJS) move.o move-gen.o
+MOVEGEN_OBJS  := $(BB_OBJS) move-gen.o
 ATTACK_OBJS   := $(MOVEGEN_OBJS)
-MOVEDO_OBJS   := $(ATTACK_OBJS) move-do.o misc.o
+MOVEDO_OBJS   := $(ATTACK_OBJS) move-do.o
 PERFT_OBJS    := $(MOVEDO_OBJS) search.o
 TT_OBJS       := $(MOVEDO_OBJS)
 
@@ -370,46 +424,47 @@ test:
 testing: $(TEST)
 
 bin/piece-test: test/piece-test.c $(FEN_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(FEN_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/fen-test: test/fen-test.c test/common-test.h $(FEN_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(FEN_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/bitboard-test: test/bitboard-test.c test/common-test.h $(BB_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(BB_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/movegen-test: test/movegen-test.c test/common-test.h $(MOVEGEN_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(MOVEGEN_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/attack-test: test/attack-test.c test/common-test.h $(ATTACK_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(ATTACK_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/movedo-test: test/movedo-test.c test/common-test.h $(MOVEDO_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(MOVEDO_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/perft-test: test/perft-test.c test/common-test.h $(PERFT_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(PERFT_OBJS) $(ALL_LDFLAGS) -o $@
 
 bin/tt-test: test/tt-test.c test/common-test.h $(TT_OBJS)
-	@echo compiling $@ test executable.
+	@echo linking $@ test executable.
 	@$(CC) $(ALL_CFLAGS) $< $(TT_OBJS) $(ALL_LDFLAGS) -o $@
 
 ##################################### Makefile debug
 .PHONY: showflags wft
 
-showflags:
-	@echo CFLAGS: "$(CFLAGS)"
-	@echo CPPFLAGS: $(CPPFLAGS)
-	@echo DEPFLAGS: $(DEPFLAGS)
-	@echo LDFLAGS: $(LDFLAGS)
-	@echo DEPFLAGS: $(DEPFLAGS)
+info:
+	@printf "CFLAGS:   +%s+\n" "$(CFLAGS)"
+	@printf "CPPFLAGS: +%s+\n" "$(CPPFLAGS)"
+	@printf "DEPFLAGS: +%s+\n" "$(DEPFLAGS)"
+	@printf "LDFLAGS:  +%s+\n" "$(LDFLAGS)"
+	@printf "DEPFLAGS: +%s+\n" "$(DEPFLAGS)"
+	@printf "VERSION:  +%s+\n" "$(VERSION)"
 
 wtf:
 	@printf "BRLIBDIR=%s\n" "$(BRLIBDIR)"
@@ -422,7 +477,7 @@ wtf:
 	@#echo LIBSRC=$(LIBSRC)
 
 zob:
-	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $< $(LIBS) src/util.c -o util
+	@#$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $< $(LIBS) src/util.c -o util
 
 ##################################### End of multi-targets
 endif

scripts/git-split.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Duplicate file, with history (well, sort of)
+#
+# Copy a git file, keeping history.
+# Sources:
+#   https://stackoverflow.com/a/53849613/3079831
+#   https://stackoverflow.com/a/75942970/3079831
+
+CMDNAME=${0##*/}                                  # script name
+
+if (( $# != 2 )); then
+   printf "Usage: %s original copy\n" "$CMDNAME"
+   exit 1
+fi
+
+from="$1"
+to="$2"
+branch="split-file"
+
+printf "Dup from=[%s] to=[%s] branch=[%s]\n" "$from" "$to" "$branch"
+
+git checkout -b "$branch"                         # create and switch to branch
+
+git mv "$from" "$to"                              # make the duplicate
+git commit -m "Duplicate $from to $to"
+
+git checkout HEAD~ "$from"                        # bring back the original
+git commit -m "Restore duplicated $from"
+
+git checkout -                                    # switch back to source branch
+git merge --no-ff "$branch" -m "Merge $branch"    # merge dup into source branch
+
+
+exit 0

src/bitboard.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "chessdefs.h"
 #include "piece.h"
@@ -217,7 +217,7 @@ void bb_print(const char *title, const bitboard_t bitboard)
     //char c = p? p: 'X';
     if (title)
         printf("%s\n", title);
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {  /* "downto"" op." */
         printf("%d ", r + 1);
         for (file_t f = FILE_A; f <= FILE_H; ++f) {
             printf(" %c", bitboard & bb_sq[sq_make(f, r)] ? 'X': '.');
@@ -252,7 +252,7 @@ void bb_print_multi(const char *title, int n, ...)
     if (title)
         printf("%s\n", title);
 
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {
         for (int i = 0; i < n; ++i) {
             printf("%d ", r + 1);
             for (file_t f = FILE_A; f <= FILE_H; ++f) {

src/board.c

@@ -115,7 +115,7 @@ void board_print_mask(const piece_t *board, const bitboard_t mask)
  */
 void board_print_raw(const piece_t *board, const int type)
 {
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {
         for (file_t f = FILE_A; f <= FILE_H; ++f) {
             piece_t p = board[sq_make(f, r)];
             if (type) {

src/board.h

@@ -14,7 +14,7 @@
 #ifndef _BOARD_H
 #define _BOARD_H
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "chessdefs.h"
 #include "piece.h"
@@ -56,8 +56,8 @@ static __always_inline rank_t sq_rank(square_t square)
     return square >> 3;
 }
 
-#define sq_ok(sq)       ((sq) >= A1 && (sq) <= H8)
-#define sq_coord_ok(c)  ((c) >= 0 && (c) < 8)
+#define sq_ok(sq)       ((sq) <= H8)
+#define sq_coord_ok(c)  ((c) < 8)
 
 /**
  * sq_dist() - Chebyshev (king) distance between two squares (macro).

src/brchess.c

@@ -1,6 +1,6 @@
 /* brchess.c - main loop.
  *
- * Copyright (C) 2021-2023 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
  * Some rights reserved. See COPYING.
  *
@@ -12,25 +12,23 @@
  */
 
 
-#include <err.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <readline/readline.h>
-#include <readline/history.h>
+#include <ctype.h>
+#include <unistd.h>
 
 #include <brlib.h>
-#include <list.h>
-#include <debug.h>
 
-#include "brchess.h"
 #include "chessdefs.h"
-#include "board.h"
-#include "piece.h"
-#include "move.h"
+#include "position.h"
+#include "brchess.h"
+#include "hash.h"
 #include "fen.h"
-#include "eval.h"
-#include "eval-simple.h"
 #include "search.h"
+#include "hist.h"
+#include "move-gen.h"
+#include "move-do.h"
 
 struct command {
     char *name;                                   /* User printable name */
@@ -38,289 +36,148 @@ struct command {
     char *doc;                                    /* function doc */
 };
 
-/* readline example inspired by :
- * - https://thoughtbot.com/blog/tab-completion-in-gnu-readline
- * - http://web.mit.edu/gnu/doc/html/rlman_2.html
- */
-char **commands_completion(const char *, int, int);
-char *commands_generator(const char *, int);
-char *escape(const char *);
-int quote_detector(char *, int);
-int execute_line (pos_t *, char *line);
+int execute_line (pos_t *, struct command *, char *);
+
 struct command *find_command (char *);
-char *stripwhite (char *string);
+int string_trim (char *str);
 
 /* The names of functions that actually do the manipulation. */
-int do_help(pos_t *, char*);
-int do_fen(pos_t *, char*);
-int do_init(pos_t *, char*);
-int do_pos(pos_t *, char*);
-int do_genmoves(pos_t *, char*);
-int do_prmoves(pos_t *, char*);
-//int do_prmovepos(pos_t *pos, char *arg);
-int do_prpieces(pos_t *pos, char *arg);
-int do_memstats(pos_t *, char*);
-int do_eval(pos_t *, char*);
-int do_simple_eval(pos_t *, char*);
-int do_move(pos_t *, char*);
-int do_quit(pos_t *, char*);
-int do_debug(pos_t *, char*);
-int do_depth(pos_t *, char*);
-int do_search(pos_t *, char*);
-int do_pvs(pos_t *, char*);
+
+/* standard UCI commands */
+int do_ucinewgame(pos_t *, char *);
+int do_uci(pos_t *, char *);
+int do_isready(pos_t *, char *);
+
+int do_position(pos_t *, char *);
+
+/* commands *NOT* in UCI standard */
+int do_moves(pos_t *, char *);
+int do_diagram(pos_t *, char *);
+int do_perft(pos_t *, char *);
+
+int do_hist(pos_t *, char *);
+int do_help(pos_t *, char *);
+int do_quit(pos_t *, char *);
 
 struct command commands[] = {
-    { "help", do_help, "Display this text" },
-    { "?", do_help, "Synonym for 'help'" },
-    { "fen", do_fen, "Set position to FEN" },
-    { "init", do_init, "Set position to normal start position" },
-    { "pos", do_pos, "Print current position" },
-    { "quit", do_quit, "Quit" },
-    { "genmove", do_genmoves, "Generate move list for " },
-    { "prmoves", do_prmoves, "Print position move list" },
-//    { "prmovepos", do_prmovepos, "Print Nth move resulting position" },
-    { "prpieces", do_prpieces, "Print Pieces (from pieces lists)" },
-    { "memstats", do_memstats, "Generate next move list" },
-    { "eval", do_eval, "Eval current position" },
-    { "simple-eval", do_simple_eval, "Simple eval current position" },
-    { "do_move", do_move, "execute nth move on current position" },
-    { "debug", do_debug, "Set log level to LEVEL" },
-    { "depth", do_depth, "Set search depth to N" },
-    { "search", do_search, "Search best move (negamax)" },
-    { "pvs", do_pvs, "Search best move (Principal Variation Search)" },
+    { "help",       do_help, "(not UCI) This help" },
+    { "?",          do_help, "(not UCI) This help" },
+    { "quit",       do_quit, "Quit" },
+
+    { "uci",        do_uci, "" },
+    { "ucinewgame", do_ucinewgame, "" },
+    { "isready",    do_isready, "" },
+
+    { "position",   do_position, "position startpos|fen [moves ...]" },
+
+    { "perft",      do_perft, "(not UCI) perft [divide] [alt] depth" },
+    { "moves",      do_moves, "(not UCI) moves ..." },
+    { "diagram",    do_diagram, "(not UCI) print current position diagram" },
+    { "hist",       do_hist, "(not UCI) print history states" },
+
     { NULL, (int(*)()) NULL, NULL }
 };
 
-static int done=0;
-static int depth=1;
+static int done = 0;
 
 int brchess(pos_t *pos)
 {
-    char *buffer, *s;
+    char *str = NULL, *saveptr, *token, *args;
+    int len;
+    size_t lenstr = 0;
+    struct command *command;
 
-    rl_attempted_completion_function = commands_completion;
-    rl_completer_quote_characters = "'\"";
-    rl_completer_word_break_characters = " ";
-    rl_char_is_quoted_p = &quote_detector;
-
-    while (!done) {
-        buffer = readline("chess> ");
-        if (!buffer)
-            break;
-        /* Remove leading and trailing whitespace from the line.
-         * Then, if there is anything left, add it to the history list
-         * and execute it.
-         */
-        s = stripwhite(buffer);
-
-        if (*s) {
-            add_history(s);
-            execute_line(pos, s);
+    while (!done && getline(&str, &lenstr, stdin) >= 0) {
+        if (!(len = string_trim(str)))
+            continue;
+        token = strtok_r(str, " ", &saveptr);
+        if (! (command= find_command(token))) {
+            fprintf(stderr, "Unknown [%s] command. Try 'help'.\n", token);
+            continue;
         }
-        free(buffer);
+        args = strtok_r(NULL, "", &saveptr);
+        execute_line(pos, command, args);
     }
 
+    if (str)
+        free(str);
+
     return 0;
 }
 
-//char **commands_completion(const char *text, int start, int end)
-char **commands_completion(const char *text, __unused int start, __unused int end)
-{
-    rl_attempted_completion_over = 1;
-    return rl_completion_matches(text, commands_generator);
-}
-
-char *commands_generator(const char *text, int state)
-{
-    static int list_index, len;
-    char *name;
-
-    if (!state) {
-        list_index = 0;
-        len = strlen(text);
-    }
-
-    while ((name = commands[list_index++].name)) {
-        if (rl_completion_quote_character) {
-            name = strdup(name);
-        } else {
-            name = escape(name);
-        }
-
-        if (strncmp(name, text, len) == 0) {
-            return name;
-        } else {
-            free(name);
-        }
-    }
-
-    return NULL;
-}
-
-char *escape(const char *original)
-{
-    size_t original_len;
-    size_t i, j;
-    char *escaped, *resized_escaped;
-
-    original_len = strlen(original);
-
-    if (original_len > SIZE_MAX / 2) {
-        errx(1, "string too long to escape");
-    }
-
-    if ((escaped = malloc(2 * original_len + 1)) == NULL) {
-        err(1, NULL);
-    }
-
-    for (i = 0, j = 0; i < original_len; ++i, ++j) {
-        if (original[i] == ' ') {
-            escaped[j++] = '\\';
-        }
-        escaped[j] = original[i];
-    }
-    escaped[j] = '\0';
-
-    if ((resized_escaped = realloc(escaped, j)) == NULL) {
-        free(escaped);
-        resized_escaped = NULL;
-        err(1, NULL);
-    }
-
-    return resized_escaped;
-}
-
-int quote_detector(char *line, int index)
-{
-    return index > 0
-            && line[index - 1] == '\\'
-            &&!quote_detector(line, index - 1);
-}
-
 /* Execute a command line. */
-int execute_line(pos_t *pos, char *line)
+int execute_line(pos_t *pos, struct command *command, char *args)
 {
-    register int i;
-    struct command *command;
-    char *word;
-
-    /* Isolate the command word. */
-    i = 0;
-    while (line[i] && whitespace(line[i]))
-        i++;
-    word = line + i;
-
-    while (line[i] && !whitespace(line[i]))
-        i++;
-
-    if (line[i])
-        line[i++] = '\0';
-
-    command = find_command(word);
-
-    if (!command) {
-        fprintf(stderr, "%s: Unknown command.\n", word);
-        return -1;
-    }
-
-    /* Get argument to command, if any. */
-    while (whitespace(line[i]))
-        i++;
-
-    word = line + i;
-
-    /* return command number */
-    return (*command->func)(pos, word);
+    return (*command->func)(pos, args);
 }
 
-/* Look up NAME as the name of a command, and return a pointer to that
-   command.  Return a NULL pointer if NAME isn't a command name. */
+/**
+ * find_command - lookup UCI command.
+ * @name: &command string
+ *
+ * Look up NAME as the name of a command, and return a pointer to that
+ *   command.  Return a NULL pointer if NAME isn't a command name.
+ */
 struct command *find_command(char *name)
 {
     register int i;
 
     for (i = 0; commands[i].name; i++)
-        if (strcmp(name, commands[i].name) == 0)
-            return &commands[i];
+        if (!strcmp(name, commands[i].name))
+            return commands + i;
 
-    return (struct command *)NULL;
+    return NULL;
 }
 
-/* Strip whitespace from the start and end of STRING.  Return a pointer
-   into STRING. */
-char *stripwhite(char *string)
-{
-    register char *s, *t;
+/*
+ * int do_eval(__unused pos_t *pos, __unused char *arg)
+ * {
+ *     eval_t material[2], control[2], mobility[2];
+ *     for (int color = WHITE; color <= BLACK; ++color) {
+ *         material[color] = eval_material(pos, color);
+ *         control[color] = eval_square_control(pos, color);
+ *         mobility[color] = eval_mobility(pos, color);
+ *         printf("%s: material=%d mobility=%d controlled=%d\n",
+ *                color? "Black": "White", material[color],
+ *                mobility[color], control[color]);
+ *     }
+ *     eval_t res = eval(pos);
+ *     printf("eval = %d centipawns\n", res);
+ *     return 1;
+ * }
+ *
+ * int do_simple_eval(__unused pos_t *pos, __unused char *arg)
+ * {
+ *     eval_t eval = eval_simple(pos);
+ *     printf("eval = %d centipawns\n", eval);
+ *     return 1;
+ * }
+ */
 
-    for (s = string; whitespace(*s); s++)
-        ;
+/*
+ * int do_init(pos_t *pos, __unused char *arg)
+ * {
+ *     startpos(pos);
+ *     return 1;
+ * }
+ */
 
-    if (*s == 0)
-        return s;
-
-    t = s + strlen(s) - 1;
-    while (t > s && whitespace(*t))
-        t--;
-    *++t = '\0';
-
-    return s;
-}
-
-int do_eval(__unused pos_t *pos, __unused char *arg)
-{
-    eval_t material[2], control[2], mobility[2];
-    for (int color = WHITE; color <= BLACK; ++color) {
-        material[color] = eval_material(pos, color);
-        control[color] = eval_square_control(pos, color);
-        mobility[color] = eval_mobility(pos, color);
-        printf("%s: material=%d mobility=%d controlled=%d\n",
-               color? "Black": "White", material[color],
-               mobility[color], control[color]);
-    }
-    eval_t res = eval(pos);
-    printf("eval = %d centipawns\n", res);
-    return 1;
-}
-
-int do_simple_eval(__unused pos_t *pos, __unused char *arg)
-{
-    eval_t eval = eval_simple(pos);
-    printf("eval = %d centipawns\n", eval);
-    return 1;
-}
-
-int do_fen(pos_t *pos, char *arg)
-{
-    fen2pos(pos, arg);
-    return 1;
-}
-
-int do_init(pos_t *pos, __unused char *arg)
-{
-    pos_startpos(pos);
-    return 1;
-}
-
-int do_pos(pos_t *pos, __unused char *arg)
-{
-    pos_print(pos);
-    return 1;
-}
-
-int do_genmoves(pos_t *pos, __unused char *arg)
-{
-    moves_gen_all(pos);
-    return 1;
-}
-
-int do_prmoves(pos_t *pos, __unused char *arg)
-{
-    uint debug_level = debug_level_get();
-    debug_level_set(1);
-    moves_print(pos, M_PR_SEPARATE | M_PR_NUM | M_PR_LONG);
-    debug_level_set(debug_level);
-    return 1;
-}
+/*
+ * int do_genmoves(pos_t *pos, __unused char *arg)
+ * {
+ *     moves_gen_all(pos);
+ *     return 1;
+ * }
+ *
+ * int do_prmoves(pos_t *pos, __unused char *arg)
+ * {
+ *     uint debug_level = debug_level_get();
+ *     debug_level_set(1);
+ *     moves_print(pos, M_PR_SEPARATE | M_PR_NUM | M_PR_LONG);
+ *     debug_level_set(debug_level);
+ *     return 1;
+ * }
+ */
 
 /*
  * int do_prmovepos(pos_t *pos, char *arg)
@@ -342,43 +199,193 @@ int do_prmoves(pos_t *pos, __unused char *arg)
  * }
  */
 
-int do_prpieces(pos_t *pos, __unused char *arg)
+/*
+ * int do_prpieces(pos_t *pos, __unused char *arg)
+ * {
+ *     log_f(1, "%s\n", arg);
+ *     pos_pieces_print(pos);
+ *     return 1;
+ * }
+ *
+ * int do_memstats(__unused pos_t *pos,__unused char *arg)
+ * {
+ *     moves_pool_stats();
+ *     piece_pool_stats();
+ *     pos_pool_stats();
+ *     return 1;
+ * }
+ */
+
+/*
+ * int do_move(__unused pos_t *pos, __unused char *arg)
+ * {
+ *     int i = 1, nmove = atoi(arg);
+ *     move_t *move;
+ *     pos_t *newpos;
+ *
+ *     if (list_empty(&pos->moves[pos->turn])) {
+ *         log_f(1, "No moves list.\n");
+ *         return 0;
+ *     }
+ *     list_for_each_entry(move, &pos->moves[pos->turn], list) {
+ *         if (i == nmove)
+ *             goto doit;
+ *         i++;
+ *     }
+ *     log_f(1, "Invalid <%d> move, should be <1-%d>.\n", nmove, i);
+ *     return 0;
+ * doit:
+ *     newpos = move_do(pos, move);
+ *     pos_print(newpos);
+ *
+ *     return 1;
+ * }
+ */
+
+int do_ucinewgame(__unused pos_t *pos, __unused char *arg)
 {
-    log_f(1, "%s\n", arg);
-    pos_pieces_print(pos);
+    pos_clear(pos);
+    tt_clear();
     return 1;
 }
 
-int do_memstats(__unused pos_t *pos,__unused char *arg)
+int do_uci(__unused pos_t *pos, __unused char *arg)
 {
-    moves_pool_stats();
-    piece_pool_stats();
-    pos_pool_stats();
+    printf("id name brchess " VERSION "\n");
+    printf("id author Bruno Raoult\n");
+    printf("option option name Hash type spin default %d min %d max %d\n",
+           hash_tt.mb, HASH_SIZE_MIN, HASH_SIZE_MAX);
+    printf("uciok\n");
     return 1;
 }
 
-int do_move(__unused pos_t *pos, __unused char *arg)
+int do_isready(__unused pos_t *pos, __unused char *arg)
 {
-    int i = 1, nmove = atoi(arg);
-    move_t *move;
-    pos_t *newpos;
+    printf("readyok\n");
+    return 1;
+}
 
-    if (list_empty(&pos->moves[pos->turn])) {
-        log_f(1, "No moves list.\n");
-        return 0;
+int do_position(pos_t *pos, char *arg)
+{
+    char *saveptr, *token, *fen, *moves;
+
+    hist_init();
+
+    /* separate "moves" section */
+    if ((moves = strstr(arg, "moves"))) {
+        *(moves - 1) = 0;
     }
-    list_for_each_entry(move, &pos->moves[pos->turn], list) {
-        if (i == nmove)
-            goto doit;
-        i++;
+    saveptr = NULL;
+    token = strtok_r(arg, " ", &saveptr);
+    if (!strcmp(token, "startpos")) {
+        startpos(pos);
+        do_diagram(pos, "");
+    } else if (!strcmp(token, "fen")) {
+        fen = strtok_r(NULL, "", &saveptr);       /* full fen (till '\0') */
+        //printf("fen=%s\n", fen);
+        if (!fen)
+            return 1;
+        if (!fen2pos(pos, fen))
+            return 1;
+        //do_diagram(pos, "");
+    } else {
+        return 1;
     }
-    log_f(1, "Invalid <%d> move, should be <1-%d>.\n", nmove, i);
+    //puts("zob");
+    //move_t move_none = MOVE_NONE;
+    //hist_push(&pos->state, &move_none);
+
+    if (moves) {
+        //puts("zobi");
+        saveptr = NULL;
+        moves = strtok_r(moves, " ", &saveptr);   /* skip "moves" */
+        moves = strtok_r(NULL, "", &saveptr);     /* all moves (till '\0') */
+        //printf("moves = %s\n", moves);
+        do_moves(pos, moves);
+    }
+    /* link last position t history */
+    //hist_pop();
+    hist_link(pos);
+    return 1;
+}
+
+int do_moves(__unused pos_t *pos, char *arg)
+{
+    char *saveptr = NULL, *token, check[8];
+    move_t move;
+    state_t state;
+    movelist_t movelist;
+    saveptr = NULL;
+    token = strtok_r(arg, " ", &saveptr);
+    while (token) {
+        move = move_from_str(token);
+        move_to_str(check, move, 0);
+
+        printf("move: [%s] %s\n", token, check);
+        pos_set_checkers_pinners_blockers(pos);
+        pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+        move = move_find_in_movelist(move, &movelist);
+        if (move == MOVE_NONE) {
+            /* should we reset here ? */
+            return 1;
+        }
+        //printf("move: %s\n", move_to_str(check, move, 0));
+        hist_push(&pos->state);                   /* push previous state */
+        move_do(pos, move, &state);
+        pos_print(pos);
+        hist_static_print();
+        token = strtok_r(NULL, " ", &saveptr);
+    }
+    //hist_static_print();
+    return 1;
+}
+
+int do_diagram(pos_t *pos, __unused char *arg)
+{
+    pos_print(pos);
+    return 1;
+}
+
+int do_perft(__unused pos_t *pos, __unused char *arg)
+{
+    char *saveptr, *token;
+    int divide = 0, depth = 6, alt = 0;
+
+    token = strtok_r(arg, " ", &saveptr);
+    if (!strcmp(token, "divide")) {
+        divide = 1;
+        token = strtok_r(NULL, " ", &saveptr);
+    }
+    if (!strcmp(token, "alt")) {
+        alt = 1;
+        token = strtok_r(NULL, " ", &saveptr);
+    }
+    depth = atoi(token);
+    printf("perft: divide=%d alt=%d depth=%d\n", divide, alt, depth);
+    if (depth > 0) {
+        if (!alt)
+            perft(pos, depth, 1, divide);
+        else
+            perft_alt(pos, depth, 1, divide);
+    }
+    return 1;
+}
+
+
+int do_hist(__unused pos_t *pos, __unused char *arg)
+{
+    hist_static_print();
     return 0;
-doit:
-    newpos = move_do(pos, move);
-    pos_print(newpos);
+}
 
-    return 1;
+int do_help(__unused pos_t *pos, __unused char *arg)
+{
+    for (struct command *cmd = commands; cmd->name; ++cmd) {
+        printf("%12s:\t%s\n", cmd->name, cmd->doc);
+        /* Print in six columns. */
+    }
+
+    return 0;
 }
 
 int do_quit(__unused pos_t *pos, __unused char *arg)
@@ -386,101 +393,108 @@ int do_quit(__unused pos_t *pos, __unused char *arg)
     return done = 1;
 }
 
-int do_debug(__unused pos_t *pos, __unused char *arg)
-{
-    debug_level_set(atoi(arg));
-    return 1;
-}
+/*
+ * int do_depth(__unused pos_t *pos, char *arg)
+ * {
+ *     depth = atoi(arg);
+ *     printf("depth = %d\n", depth);
+ *     return 1;
+ *
+ * }
+ *
+ * int do_search(pos_t *pos, __unused char *arg)
+ * {
+ *     int debug_level = debug_level_get();
+ *     float timer1, timer2, nodes_sec;
+ *
+ *     timer1 = debug_timer_elapsed();
+ *     negamax(pos, depth, pos->turn == WHITE ? 1 : -1);
+ *     timer2 = debug_timer_elapsed();
+ *     nodes_sec = (float) pos->node_count / ((float) (timer2 - timer1) / (float)NANOSEC);
+ *     log(1, "best=");
+ *     debug_level_set(1);
+ *     move_print(0, pos->bestmove, 0);
+ *     debug_level_set(debug_level);
+ *     log(1, " negamax=%d\n", pos->bestmove->negamax);
+ *     printf("Depth:%d Nodes:%luK time:%.02fs (%.0f kn/s)\n", depth,
+ *            pos->node_count / 1000, (timer2 - timer1)/NANOSEC, nodes_sec/1000);
+ *     return 1;
+ * }
+ */
 
-/* Print out help for ARG, or for all of the commands if ARG is
-   not present. */
-int do_help(__unused pos_t *pos, __unused char *arg)
-{
-    int i;
-    int printed = 0;
+/*
+ * int do_pvs(pos_t *pos, __unused char *arg)
+ * {
+ *     int debug_level = debug_level_get();
+ *     float timer1, timer2, nodes_sec;
+ *     eval_t _pvs;
+ *
+ *     timer1 = debug_timer_elapsed();
+ *     moves_gen_eval_sort(pos);
+ *     _pvs = pvs(pos, depth, EVAL_MIN, EVAL_MAX, pos->turn == WHITE ? 1 : -1);
+ *     timer2 = debug_timer_elapsed();
+ *     nodes_sec = (float) pos->node_count / ((float) (timer2 - timer1) / (float)NANOSEC);
+ *     log(1, "best=");
+ *     if (pos->bestmove) {
+ *         debug_level_set(1);
+ *         move_print(0, pos->bestmove, 0);
+ *         debug_level_set(debug_level);
+ *         log(1, " pvs=%d stored=%d\n", _pvs, pos->bestmove->negamax);
+ *     } else {
+ *         log(1, "<no-best-move>");
+ *     }
+ *     printf("Depth:%d Nodes:%luK time:%.02fs (%.0f kn/s)\n", depth,
+ *            pos->node_count / 1000, (timer2 - timer1)/NANOSEC, nodes_sec/1000);
+ *     return 1;
+ * }
+ */
 
-    for (i = 0; commands[i].name; i++) {
-        if (!*arg || (strcmp(arg, commands[i].name) == 0)) {
-            printf("%-11.11s%s.\n", commands[i].name, commands[i].doc);
-            printed++;
+/**
+ * string_trim - cleanup (trim) blank characters in string.
+ * @str: &string to clean
+ *
+ * str is cleaned and packed with the following rules:
+ * - Leading and trailing blank characters are removed.
+ * - consecutive blank characters are replaced by one space.
+ * - non printable characters are removed.
+ *
+ * "blank" means characters as understood by isspace(3): space, form-feed ('\f'),
+ * newline ('\n'), carriage return ('\r'), horizontal tab  ('\t'), and vertical
+ * tab ('\v').
+ *
+ * @return: new @str len.
+ */
+int string_trim(char *str)
+{
+    char *to = str, *from = str;
+    int state = 1;
+
+    while (*from) {
+        switch (state) {
+            case 1:                               /* blanks */
+                while (*from && isspace(*from))
+                    from++;
+                state = 0;
+                break;
+            case 0:                               /* token */
+                while (*from && !isspace(*from)) {
+                    if (isprint(*from))
+                        *to++ = *from;
+                    from++;
+                }
+                *to++ = ' ';
+                state = 1;
         }
     }
-
-    if (!printed) {
-        printf("No commands match `%s'.  Possibilties are:\n", arg);
-
-        for (i = 0; commands[i].name; i++) {
-            /* Print in six columns. */
-            if (printed == 6) {
-                printed = 0;
-                printf("\n");
-            }
-
-            printf("%s\t", commands[i].name);
-            printed++;
-        }
-
-        if (printed)
-            printf("\n");
-    }
-    return 0;
+    if (to > str)
+        to--;
+    *to = 0;
+    return to - str;
 }
 
-int do_depth(__unused pos_t *pos, char *arg)
-{
-    depth = atoi(arg);
-    printf("depth = %d\n", depth);
-    return 1;
 
-}
-
-int do_search(pos_t *pos, __unused char *arg)
-{
-    int debug_level = debug_level_get();
-    float timer1, timer2, nodes_sec;
-
-    timer1 = debug_timer_elapsed();
-    negamax(pos, depth, pos->turn == WHITE ? 1 : -1);
-    timer2 = debug_timer_elapsed();
-    nodes_sec = (float) pos->node_count / ((float) (timer2 - timer1) / (float)NANOSEC);
-    log(1, "best=");
-    debug_level_set(1);
-    move_print(0, pos->bestmove, 0);
-    debug_level_set(debug_level);
-    log(1, " negamax=%d\n", pos->bestmove->negamax);
-    printf("Depth:%d Nodes:%luK time:%.02fs (%.0f kn/s)\n", depth,
-           pos->node_count / 1000, (timer2 - timer1)/NANOSEC, nodes_sec/1000);
-    return 1;
-}
-
-int do_pvs(pos_t *pos, __unused char *arg)
-{
-    int debug_level = debug_level_get();
-    float timer1, timer2, nodes_sec;
-    eval_t _pvs;
-
-    timer1 = debug_timer_elapsed();
-    moves_gen_eval_sort(pos);
-    _pvs = pvs(pos, depth, EVAL_MIN, EVAL_MAX, pos->turn == WHITE ? 1 : -1);
-    timer2 = debug_timer_elapsed();
-    nodes_sec = (float) pos->node_count / ((float) (timer2 - timer1) / (float)NANOSEC);
-    log(1, "best=");
-    if (pos->bestmove) {
-        debug_level_set(1);
-        move_print(0, pos->bestmove, 0);
-        debug_level_set(debug_level);
-        log(1, " pvs=%d stored=%d\n", _pvs, pos->bestmove->negamax);
-    } else {
-        log(1, "<no-best-move>");
-    }
-    printf("Depth:%d Nodes:%luK time:%.02fs (%.0f kn/s)\n", depth,
-           pos->node_count / 1000, (timer2 - timer1)/NANOSEC, nodes_sec/1000);
-    return 1;
-}
-
-/** main()
- * options:
- int brchess(pos_t *pos)
+/**
+ * usage - brchess usage function.
  *
  */
 static int usage(char *prg)
@@ -489,24 +503,28 @@ static int usage(char *prg)
     return 1;
 }
 
-#include <unistd.h>
-
 int main(int ac, char **av)
 {
     pos_t *pos;
     int opt;
 
-    piece_pool_init();
-    moves_pool_init();
-    pos_pool_init();
-    pos = pos_get();
-    debug_init(1, stderr, true);
-    eval_simple_init();
+    init_all();
+    pos = pos_new();
+    hist_link(pos);
+    printf("\nWelcome to brchess " VERSION "\nEngine ready.\n");
 
+    // size_t len = 0;
+    // char *str = NULL;
+    //while (getline(&str, &len, stdin) >= 0) {
+    //    printf("[%s] -> ", str);
+    //    int newlen = string_trim(str);
+    //    printf("%d [%s]\n", newlen, str);
+    //}
+    //exit(0);
     while ((opt = getopt(ac, av, "d:f:")) != -1) {
         switch (opt) {
             case 'd':
-                debug_level_set(atoi(optarg));
+                //debug_level_set(atoi(optarg));
                 break;
             case 'f':
                 fen2pos(pos, optarg);

src/chessdefs.h

@@ -14,7 +14,7 @@
 #ifndef _CHESSDEFS_H
 #define _CHESSDEFS_H
 
-#include "brlib.h"                                /* brlib types */
+#include <brlib.h>                                /* brlib types */
 
 #define ONE                1ul
 #define U64(const_u64)     const_u64##UL
@@ -91,17 +91,16 @@ typedef struct __movelist_s movelist_t;
 
 /* basic types
  */
+
 typedef u64 bitboard_t;
+typedef s16 eval_t;
 
-/* eval type
+/* forward enum definition is impossible in C11.
+ * To simplify cross-dependancies, all important enum are moved here.
  */
-//typedef s32 eval_t;
 
-/* forward enum definition is impossible in C11, to simplify
- * cross-dependancies, all important enum are moved here.
- */
-typedef enum {
-    _SSQUARE_ = -1,                               /* force signed enum */
+enum {
+    //_SSQUARE_ = -1,                               /* force signed enum */
     A1 = 0, B1, C1, D1, E1, F1, G1, H1,
     A2,     B2, C2, D2, E2, F2, G2, H2,
     A3,     B3, C3, D3, E3, F3, G3, H3,
@@ -112,21 +111,24 @@ typedef enum {
     A8,     B8, C8, D8, E8, F8, G8, H8,
     SQUARE_MAX = 64,
     SQUARE_NONE = 64
-} square_t;
+};
+typedef u8 square_t;
 
-typedef enum {
-    _SFILE_ = -1,                                 /* force signed enum */
+enum {
+    //_SFILE_ = -1,                                 /* force signed enum */
     FILE_A = 0, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H,
     FILE_MAX,
-} file_t;
+};
+typedef u8 file_t;
 
-typedef enum {
-    _SRANK_ = -1,                                 /* force signed enum */
+enum {
+    //_SRANK_ = -1,                                 /* force signed enum */
     RANK_1 = 0, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8,
     RANK_MAX,
-} rank_t;
+};
+typedef u8 rank_t;
 
-typedef enum {
+enum {
     NORTH = 8,
     EAST =  1,
     SOUTH = -NORTH,
@@ -136,7 +138,8 @@ typedef enum {
     SOUTH_EAST = (SOUTH + EAST),
     SOUTH_WEST = (SOUTH + WEST),
     NORTH_WEST = (NORTH + WEST),
-} dir_t;
+};
+typedef u8 dir_t;
 
 /* define diff for relative squares */
 #define sq_up(c)          ((c) == WHITE ? NORTH: SOUTH)

src/eval-simple.c

@@ -11,12 +11,12 @@
  *
  */
 
-#include "br.h"
-#include "debug.h"
+#include <brlib.h>
 
+#include "chessdefs.h"
 #include "piece.h"
-#include "eval-simple.h"
 #include "position.h"
+#include "eval-simple.h"
 
 /*
  * Tables are from https://www.chessprogramming.org/Simplified_Evaluation_Function
@@ -101,11 +101,7 @@ static int eg_king[] = {
     -50, -30, -30, -30, -30, -30, -30, -50
 };
 
-/* as pieces bitboard tables start at position 2; we make these tables
- * bigger.
- */
 static int *mg_tables[] = {
-    NULL,
     NULL,
     mg_pawn,
     mg_knight,
@@ -116,7 +112,6 @@ static int *mg_tables[] = {
 };
 
 static int *eg_tables[] = {
-    NULL,
     NULL,
     mg_pawn,
     mg_knight,
@@ -136,7 +131,7 @@ void eval_simple_init(void)
 #   ifdef DEBUG_EVAL
     log_f(1, "initializing piece tables\n");
 #   endif
-    for (int piece = BB_PAWN; piece <= BB_KING; ++piece) {
+    for (int piece = PAWN; piece <= KING; ++piece) {
         for (int square = 0; square < 64; ++square) {
             mg_table[WHITE][piece][square] = mg_tables[piece][FLIP_V(square)];
             eg_table[WHITE][piece][square] = eg_tables[piece][FLIP_V(square)];
@@ -152,7 +147,7 @@ void eval_simple_init(void)
  *
  * This function is normally used only during initialization,
  * or when changing phase (middlegame <--> endgame), as the eval
- * will be done increntally when doing moves.
+ * will be done incrementally when doing moves.
  *
  * @return: the @pos evaluation in centipawns
  */
@@ -162,15 +157,16 @@ eval_t eval_simple(pos_t *pos)
     int eg = simple_is_endgame(pos);
     int (*gg)[6 + 2][64]= eg? eg_table: mg_table;
 
-    pos->eval_simple_phase = ENDGAME;
+    //pos->eval_simple_phase = ENDGAME;
 #   ifdef DEBUG_EVAL
     log_f(5, "phase = %s.\n", eg? "endgame": "midgame");
 #   endif
 
-    for (int color = WHITE; color <= BLACK; ++color) {
-        for (uint piece = PAWN; piece <= KING; piece <<= 1) {
-            int bb = PIECETOBB(piece), cur;
+    for (color_t color = WHITE; color <= BLACK; ++color) {
+        for (piece_type_t pt = PAWN; pt <= KING; pt++) {
+            //int bb = PIECETOBB(piece), cur;
             u64 _t;
+            int cur;
 
 #           ifdef DEBUG_EVAL
             log_f(5, "p=%u bb=%d %s %s: count=%d val=%ld ", piece, bb, color? "black": "white",
@@ -178,12 +174,12 @@ eval_t eval_simple(pos_t *pos)
                   popcount64(pos->bb[color][bb]) * P_VALUE(piece));
 #           endif
 
-            eval[color] += popcount64(pos->bb[color][bb]) * P_LETTER(piece);
-            bit_for_each64(cur, _t, pos->bb[color][bb]) {
+            eval[color] += popcount64(pos->bb[color][pt]) * piece_val(pt);
+            bit_for_each64(cur, _t, pos->bb[color][pt]) {
 #               ifdef DEBUG_EVAL
                 log(5, "sq=%d:%d ", cur, gg[color][bb][cur]);
 #               endif
-                eval[color] += gg[color][bb][cur];
+                eval[color] += gg[color][pt][cur];
             }
 #           ifdef DEBUG_EVAL
             log(5, "\n");

src/eval-simple.h

@@ -1,6 +1,6 @@
 /* eval-simple.h - simple position evaluation.
  *
- * Copyright (C) 2021 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
  * Some rights reserved. See COPYING.
  *
@@ -19,16 +19,16 @@
 
 /* no queen on board */
 #define simple_no_queen(p, c)              \
-    ( !(p)->bb[c][BB_QUEEN] )
+    ( !(p)->bb[c][QUEEN] )
 
 #define simple_one_queen(p, c)             \
-    ( popcount64((p)->bb[c][BB_QUEEN]) == 1 )
+    ( popcount64((p)->bb[c][QUEEN]) == 1 )
 
 #define simple_no_rook(p, c)               \
-    (!(p)->bb[c][BB_ROOK])
+    (!(p)->bb[c][ROOK])
 
 #define simple_one_minor_piece(p, c)       \
-    (popcount64((p)->bb[c][BB_KNIGHT] | (p)->bb[c][BB_BISHOP]) == 1)
+    (popcount64((p)->bb[c][KNIGHT] | (p)->bb[c][BISHOP]) == 1)
 
 #define simple_is_endgame(p)                  \
     ( (simple_no_queen(p, WHITE)   ||         \

src/eval.c

@@ -1,6 +1,6 @@
 /* eval.c - static position evaluation.
  *
- * Copyright (C) 2021-2023 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
  * Some rights reserved. See COPYING.
  *
@@ -13,9 +13,9 @@
 
 #include <stdio.h>
 
-#include <list.h>
-#include <debug.h>
+#include <brlib.h>
 
+#include "chessdefs.h"
 #include "position.h"
 #include "eval.h"
 #include "eval-simple.h"
@@ -27,35 +27,39 @@ inline eval_t eval_material(pos_t *pos, bool color)
     /* I need to do something about the king, if it can be potentially taken
      * if pseudo-moves include a pinned piece on King.
      */
-    for (uint piece = PAWN; piece < KING; piece <<= 1) {
-        uint bb = PIECETOBB(piece);
+    for (piece_type_t pt = PAWN; pt < KING; ++pt) {
 #       ifdef DEBUG_EVAL
         log_f(2, "color=%u piece=%u bb=%u=%c count=%ul val=%ld\n",
               color, piece, bb, P_LETTER(piece), popcount64(pos->bb[color][bb]),
               P_VALUE(piece));
 #       endif
-        /* attention here */
-        res += popcount64(pos->bb[color][bb]) * P_VALUE(piece);
+        res += popcount64(pos->bb[color][pt]) * piece_val(pt);
     }
     return res;
 }
 
-inline eval_t eval_mobility(pos_t *pos, bool color)
-{
-    return pos->mobility[color];
-}
 
-inline eval_t eval_square_control(pos_t *pos, bool color)
-{
-    return popcount64(pos->controlled[color]);
-}
+
+/*
+ * inline eval_t eval_mobility(pos_t *pos, bool color)
+ * {
+ *     return pos->mobility[color];
+ * }
+ *
+ *
+ * inline eval_t eval_square_control(pos_t *pos, bool color)
+ * {
+ *     return popcount64(pos->controlled[color]);
+ * }
+ */
 
 eval_t eval(pos_t *pos)
 {
-    eval_t simple = 0, control[2] = {0};
+    //eval_t simple = 0, control[2] = {0};
+    eval_t simple = 0;
 
-    if (pos->eval != EVAL_INVALID)
-        return pos->eval;
+    //if (pos->eval != EVAL_INVALID)
+    //    return pos->eval;
 
     /* 1) pieces value */
     //material[WHITE] = eval_material(pos, WHITE);
@@ -67,8 +71,8 @@ eval_t eval(pos_t *pos)
 #   endif
 
     /* 2) square control: 10 square controls diff = 1 pawn */
-    control[WHITE] = eval_square_control(pos, WHITE);
-    control[BLACK] = eval_square_control(pos, BLACK);
+    //control[WHITE] = eval_square_control(pos, WHITE);
+    //control[BLACK] = eval_square_control(pos, BLACK);
 
 #   ifdef DEBUG_EVAL
     log_f(2, "square control: W:%d B:%d diff=%d\n",
@@ -84,12 +88,12 @@ eval_t eval(pos_t *pos)
           (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10);
 #   endif
 
-    eval_t res = simple +
-        (control[WHITE] - control[BLACK]) * 10 +
-        (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10;
+    //eval_t res = simple +
+    //    (control[WHITE] - control[BLACK]) * 10 +
+    //    (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10;
 #   ifdef DEBUG_EVAL
     log_f(2, "eval: %d\n", res);
 #   endif
-    pos->eval = res;
-    return res;
+    pos->eval = simple;
+    return simple;
 }

src/eval.h

@@ -17,16 +17,16 @@
 #include <limits.h>
 
 #include "chessdefs.h"
-#include "piece.h"
 
-/* max pieces eval is KING_VALUE + 9*QUEEN_VALUE + 2*ROOK_VALUE + 2*BISHOP_VALUE
- *  + 2*KNIGHT_VALUE which around 30000.
- * We are on secure side with -50000/+50000
+/* max pieces eval is 9*QUEEN_VALUE + 2*ROOK_VALUE + 2*BISHOP_VALUE
+ * + 2*KNIGHT_VALUE which is (for a pawn valued at 100) well less than 10,000.
  */
-#define EVAL_MAX     (50000)
+#define EVAL_MAX     (SHRT_MAX)                   /* 32767 */
 #define EVAL_MIN     (-EVAL_MAX)
-#define EVAL_INVALID INT_MIN
-#define EVAL_MATE    EVAL_MAX
+
+#define EVAL_INVALID EVAL_MIN
+
+#define EVAL_MATE    30000
 
 eval_t eval_material(pos_t *pos, bool color);
 eval_t eval_mobility(pos_t *pos, bool color);

src/fen.c

@@ -21,9 +21,7 @@
 #include <bug.h>
 
 #include "chessdefs.h"
-#include "util.h"
-//#include "piece.h"
-//#include "bitboard.h"
+#include "misc.h"
 #include "position.h"
 #include "fen.h"
 
@@ -294,7 +292,7 @@ char *pos2fen(const pos_t *pos, char *fen)
 
     /*  1) position
      */
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {
         for (file_t f = FILE_A; f <= FILE_H;) {
             square_t sq = sq_make(f, r);
             piece_t piece = pos->board[sq];

src/hash.c

@@ -18,7 +18,7 @@
 #include <bitops.h>
 
 #include "chessdefs.h"
-#include "util.h"
+#include "misc.h"
 #include "position.h"
 #include "piece.h"
 #include "hash.h"
@@ -191,7 +191,6 @@ int tt_create(s32 sizemb)
     if (sizemb <= 0)
         sizemb = HASH_SIZE_DEFAULT;
     sizemb = clamp(sizemb, HASH_SIZE_MIN, HASH_SIZE_MAX);
-    //printf("-> %'6d ", sizemb);
 
     bytes = sizemb * 1024ull * 1024ull;           /* bytes wanted */
     target_nbuckets = bytes / sizeof(bucket_t);   /* target buckets */
@@ -199,7 +198,7 @@ int tt_create(s32 sizemb)
     nbits = msb64(target_nbuckets);               /* adjust to power of 2 */
 
     if (hash_tt.nbits != nbits) {
-        if (hash_tt.nbits)
+        if (hash_tt.keys)
             tt_delete();
 
         hash_tt.nbits    = nbits;

src/hash.h

@@ -14,14 +14,16 @@
 #ifndef HASH_H
 #define HASH_H
 
+#include <brlib.h>
 #include <bug.h>
 
 #include "chessdefs.h"
+#include "move.h"
 
 #define ENTRIES_PER_BUCKET   4                    /* buckets per hash table entry */
 
 #define HASH_SIZE_DEFAULT   32                    /* default: 32Mb */
-#define HASH_SIZE_MIN        4
+#define HASH_SIZE_MIN        1
 #define HASH_SIZE_MAX    32768                    /* 32Gb */
 
 #define TT_MISS   NULL
@@ -30,6 +32,11 @@
 
 typedef u64 hkey_t;                               /* cannot use typedef for key_t */
 
+/**
+ * hash_short: get the most significant 7 nibble of a 64 bits value.
+ */
+#define hash_short(hash)  ((hash) >> (64 - 4 * 7))
+
 /**
  * hentry_t: hashtable bucket.
  *
@@ -43,9 +50,9 @@ typedef struct {
         struct {
             u16 depth;                            /* ply in search */
             s16 eval;
-            u16 move;
-            u8 flags;                             /* maybe for locking, etc... */
-            u8 filler;
+            move_t move;
+            //u8 flags;                             /* maybe for locking, etc... */
+            //u8 filler;
         };
     };
 } hentry_t;

src/hist.c

@@ -0,0 +1,165 @@
+/* hist.c - history management.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#include <brlib.h>
+#include <bug.h>
+
+#include "position.h"
+#include "hash.h"
+#include "move.h"
+#include "hist.h"
+
+hist_t hist = {
+    .nstates = 1,
+    { { .move = MOVE_NONE, .key = U64(0), .prev = &hist.state[0] } },
+};
+
+/**
+ * hist_init() - initialize history states data.
+ *
+ * This should be done every time a new position must be handled.
+ */
+void hist_init(void)
+{
+    hist.nstates       = 1;
+    hist.state[0].key  = U64(0);
+    hist.state[0].move = MOVE_NONE;
+    hist.state[0].prev = &hist.state[0];
+}
+
+/**
+ * hist_push() - add a state to hist list
+ * @st:   &state_t to add
+ *
+ * Used to add moves when the UCI "position" command includes moves.
+ * These moves, but last one, should be pushed. Last move should be
+ * linked to hist with @hist_link().
+ */
+void hist_push(state_t *st) //, move_t *move)
+{
+    int last = hist.nstates++;
+
+    bug_on(last >= HIST_SIZE);
+    hist.state[last] = *st;
+    hist.state[last].prev = &hist.state[last - 1];
+    // hist.state[last].move = *move;
+}
+
+/**
+ * hist_link() - link a position to last hist element.
+ * @pos:   &pos_t to link
+ *
+ * Used to add position resulting from last "move" in UCI "position" command.
+ * All other moves in UCI "position" command should be pushed instead, with
+ * hist_push().
+ */
+void hist_link(pos_t *pos)
+{
+    pos->prev = hist_last();
+}
+
+/**
+ * hist_pop() - return last state from hist entry, and remove it from list
+ *
+ * Not used, only for debug.
+ */
+state_t *hist_pop(void)
+{
+    if (hist.nstates > 1)
+        hist.nstates--;
+    return hist_last();
+}
+
+/**
+ * hist_last() - return last state from hist.
+ */
+state_t *hist_last(void)
+{
+    return hist.state + hist.nstates - 1;
+}
+
+/**
+ * hist_prev() - return a state's ancestor.
+ * @st: &state_t state
+ *
+ * No test is done on ancestor. Caller should check it is different
+ * from HIST_START.
+ */
+state_t *hist_prev(state_t *st)
+{
+    return st->prev;
+}
+
+/**
+ * hist_prev2() - return a state's second ancestor.
+ * @st: &state_t state
+ *
+ * No test is done on ancestors. Caller should check it is different
+ * from HIST_START.
+ */
+state_t *hist_prev2(state_t *st)
+{
+    return st->prev->prev;
+}
+
+/**
+ * hist_prev4() - return a state's 4th ancestor.
+ * @st: &state_t state
+ *
+ * No test is done on ancestors. Caller should check it is different
+ * from HIST_START.
+ */
+state_t *hist_prev4(state_t *st)
+{
+    return st->prev->prev->prev->prev;
+}
+
+/**
+ * hist_static_print() - print hist entries
+ */
+void hist_static_print(void)
+{
+    char movestr[8];
+    state_t *st =  hist_last();
+
+    printf("UCI state history: ");
+    while (true) {
+        printf("%s(#%lx) ",
+               move_to_str(movestr, st->move, 0),
+               hash_short(st->key));
+        if (st == HIST_START)
+            break;
+        st = hist_prev(st);
+    }
+    printf("\n");
+}
+
+/**
+ * hist_print() - print position history
+ * @pos: &pos to start from
+ */
+void hist_print(pos_t *pos)
+{
+    char movestr[8];
+    state_t *st = &pos->state;
+    printf("position states history: ");
+    while (true) {
+        printf("%s(#%lx) ",
+               move_to_str(movestr, st->move, 0),
+               hash_short(st->key));
+        if (st == HIST_START)
+            break;
+        st = hist_prev(st);
+    }
+    printf("\n");
+}

src/hist.h

@@ -0,0 +1,61 @@
+/* hist.h - history management.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#ifndef HIST_H
+#define HIST_H
+
+#include <brlib.h>
+#include <bug.h>
+
+#include "position.h"
+#include "hash.h"
+
+#define HIST_SIZE 4096                            /* I know, I know... */
+
+/**
+ * hist - history states data.
+ *
+ * This variable is of type hist_t, which contains:
+ * @state:    state_t array, size HIST_SIZE
+ * @nstates:  current number of @state
+ *
+ * hist contains moves already played.
+ *
+ * Only HIST_SIZE - 1 hist elements are available, as the first element is
+ * used as a sentinel value (hist[0].state.prev = &hist[0].state).
+ * This first element allows multiple backards searches (p->prev->prev).
+ *
+ * hist is only written by main thread, and read by other threads/processes,
+ * therefore is never duplicated (even after a fork(), due to COW).
+ */
+typedef struct {
+    int nstates;
+    state_t state[HIST_SIZE];
+} hist_t;
+
+extern hist_t hist;
+
+#define HIST_START  (hist.state)
+
+void hist_init(void);
+void hist_push(state_t *st); //, move_t *move);
+void hist_link(pos_t *pos);
+state_t *hist_pop(void);
+state_t *hist_last(void);
+state_t *hist_prev(state_t *st);
+state_t *hist_prev2(state_t *st);
+state_t *hist_prev4(state_t *st);
+void hist_static_print(void);
+void hist_print(pos_t *pos);
+
+#endif  /* HIST_H */

src/hyperbola-quintessence.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "chessdefs.h"
 #include "board.h"

src/init.c

@@ -12,6 +12,7 @@
  */
 
 #include <stdio.h>
+#include <unistd.h>
 #include <locale.h>
 
 #include "chessdefs.h"
@@ -20,23 +21,36 @@
 #include "hyperbola-quintessence.h"
 
 #include "hash.h"
+#include "hist.h"
 
+#define printff(x) ({ printf(x); fflush(stdout); })
 void init_all(void)
 {
-    /* for printf() numeric thousands separator */
-    setlocale(LC_NUMERIC, "");
     /* line-buffered stdout */
+    printff("initiazing stdout buffering... ");
     setlinebuf(stdout);
 
+    /* for printf() numeric thousands separator */
+    printff("locale... ");
+    setlocale(LC_NUMERIC, "");
+
     /* pseudo random generator seed */
+    printff("random generator... ");
     rand_init(RAND_SEED_DEFAULT);
 
     /* bitboards & hq */
+    printff("bitboards... ");
     bitboard_init();
+
+    printff("hq bitboards... ");
     hyperbola_init();
 
     /* zobrist tables & default tt hashtable */
+    printff("zobrist tables... ");
     zobrist_init();
+
+    printff("transposition tables... ");
     tt_create(HASH_SIZE_DEFAULT);
 
+    printf("done.\n");
 }

src/misc.h

@@ -17,8 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <bug.h>
-
 #include "chessdefs.h"
 
 #undef safe_malloc
@@ -29,6 +27,7 @@
 #pragma push_macro("BUG_ON")
 #undef BUG_ON
 #define BUG_ON
+#include <bug.h>
 
 #define safe_malloc(size) ({                   \
             void *_ret = malloc(size);         \

src/move-do.c

@@ -15,9 +15,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "brlib.h"
-#include "likely.h"
-#include "bug.h"
+#include <brlib.h>
+#include <likely.h>
+#include <bug.h>
 
 #include "chessdefs.h"
 #include "move.h"
@@ -70,6 +70,7 @@ pos_t *move_do(pos_t *pos, const move_t move, state_t *state)
     pos->en_passant = SQUARE_NONE;
     pos->turn = them;
     pos->captured = captured;
+    pos->move = move;
 
     bug_on(COLOR(piece) != us);
 
@@ -80,13 +81,12 @@ pos_t *move_do(pos_t *pos, const move_t move, state_t *state)
 
     if (captured != EMPTY) {
         pos->clock_50 = 0;
-        //pos->captured = pos->board[to];           /* save capture info */
         bug_on(pos->board[to] == EMPTY || COLOR(pos->captured) != them);
         key ^= zobrist_pieces[captured][to];
         pos_clr_sq(pos, to);                      /* clear square */
     } else if (is_castle(move)) {                 /* handle rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(H1, us);
             rookto = sq_rel(F1, us);
         } else {
@@ -193,7 +193,7 @@ pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state)
         pos_set_sq(pos, to, pos->captured);       /* restore captured piece */
     } else if (is_castle(move)) {                 /* make reverse rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(F1, us);
             rookto = sq_rel(H1, us);
         } else {
@@ -238,6 +238,7 @@ pos_t *move_do_alt(pos_t *pos, const move_t move, state_t *state)
     pos->en_passant = SQUARE_NONE;
     pos->turn = them;
     pos->captured = captured;
+    pos->move = move;
 
     bug_on(COLOR(piece) != us);
 
@@ -254,7 +255,7 @@ pos_t *move_do_alt(pos_t *pos, const move_t move, state_t *state)
         pos_clr_sq(pos, to);                      /* clear square */
     } else if (is_castle(move)) {                 /* handle rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(H1, us);
             rookto = sq_rel(F1, us);
         } else {
@@ -344,7 +345,7 @@ pos_t *move_undo_alt(pos_t *pos, const move_t move, const state_t *state)
         pos_set_sq(pos, to, pos->captured);       /* restore captured piece */
     } else if (is_castle(move)) {                 /* make reverse rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(F1, us);
             rookto = sq_rel(H1, us);
         } else {

src/move-gen.c

@@ -26,7 +26,6 @@
 #include "attack.h"
 #include "move-gen.h"
 
-
 /**
  * pseudo_is_legal() - check if a move is legal.
  * @pos:  position
@@ -36,13 +35,18 @@
  */
 bool pseudo_is_legal(const pos_t *pos, const move_t move)
 {
-    color_t  us = pos->turn, them = OPPONENT(us);
-    square_t from = move_from(move), to = move_to(move);
-    square_t king = pos->king[us];
+    color_t  us       = pos->turn;
+    color_t them      = OPPONENT(us);
+    square_t from     = move_from(move);
+    square_t to       = move_to(move);
+    square_t kingsq   = pos->king[us];
+    square_t ep       = pos->en_passant;
     bitboard_t kingbb = pos->bb[us][KING];
-    bitboard_t occ = pos_occ(pos);
-    u64 pinned = BIT(from) & pos->blockers;
-    u64 checkers = pos->checkers;
+    bitboard_t occ    = pos_occ(pos);
+    u64 pinned        = BIT(from) & pos->blockers;
+    u64 checkers      = pos->checkers;
+
+    bug_on(pos->board[from] == NO_PIECE || COLOR(pos->board[from]) != us);
 
     /* (1) - Castling & King
      * For castling, we need to check intermediate squares attacks only.
@@ -50,60 +54,52 @@ bool pseudo_is_legal(const pos_t *pos, const move_t move)
      * king from occupation bitboard (to catch king moving away from checker
      * on same line) !
      */
-    if (unlikely(from == king)) {
-        if (unlikely(is_castle(move))) {
-            square_t dir = to > from? 1: -1;
-            if (sq_is_attacked(pos, occ, from + dir, them))
-                return false;
-        }
+    if (is_castle(move)) {
+        int dir = to > from? 1: -1;
+        if (sq_is_attacked(pos, occ, from + dir, them))
+            return false;
+    }
+    if (from == kingsq) {
         return !sq_is_attacked(pos, occ ^ kingbb, to, them);
     }
 
     /* (2) - King is in check
      * Double-check is already handled in (1), as only K moves were generated
      * by pseudo legal move generator.
-     * Here, allowed dest squares are only on King-checker line, or on checker
-     * square.
-     * attacker.
-     * Special cases:
-     *   e.p., legal if the grabbed pawn is giving check
-     *   pinned piece: always illegal
+     * Special cases (illegal):
+     *   - e.p., if the grabbed pawn is *not* giving check
+     *   - piece is pinned
      */
     if (checkers) {
         if (pinned)
             return false;
-        if (bb_multiple(checkers))
-            return false;
-        square_t checker = ctz64(checkers);
         if (is_enpassant(move)) {
-            return pos->en_passant + sq_up(them) == checker;
+            return ep + sq_up(them) == ctz64(checkers);
         }
         return true;
-        //bitboard_t between = bb_between[king][checker] | pos->checkers;
-        //return mask(to) & between;
     }
 
     /* (3) - pinned pieces
-     * We verify here that pinned piece P stays on line King-P.
+     * We verify here that pinned piece P stays on line between K & dest square.
      */
-    if (BIT(from) & pos->blockers) {
-        return bb_line[from][king] & BIT(to);    /* is to on pinner line ? */
+    if (pinned) {
+        return bb_line[from][kingsq] & BIT(to);   /* is to on pinner line ? */
     }
 
     /* (4) - En-passant
-     * pinned pieces are handled in pinned section.
+     * pinned piece is already handled in (3).
      * One case not handled anywhere else: when the two "disappearing" pawns
      * would discover a R/Q horizontal check.
+     * Note: grabbed pawn *cannot* discover a check (impossible position).
      */
-    if (unlikely(is_enpassant(move))) {
+    if (is_enpassant(move)) {
         bitboard_t rank5 = bb_rel_rank(RANK_5, us);
 
-        if (unlikely((pos->bb[us][KING] & rank5))) {
-            bitboard_t exclude = BIT(pos->en_passant - sq_up(us)) | BIT(from);
+        if (kingbb & rank5) {
+            bitboard_t exclude = BIT(ep + sq_up(them)) | BIT(from);
             bitboard_t rooks = (pos->bb[them][ROOK] | pos->bb[them][QUEEN]) & rank5;
 
-            if (hyperbola_rank_moves(occ ^ exclude, king) & rooks)
-                return false;
+            return !(hyperbola_rank_moves(occ ^ exclude, kingsq) & rooks);
         }
     }
     return true;
@@ -216,12 +212,9 @@ static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
  *  - castling, if king is in check
  *  - castling, if king passes an enemy-controlled square (not final square).
  * When immediately known, a few move flags are also applied in these cases:
- *  - castling: M_CASTLE_{K,Q}
- *  - capture (excl. en-passant): M_CAPTURE
+ *  - castling: M_CASTLE
  *  - en-passant: M_EN_PASSANT
- *  - pawn double push: M_DPUSH
  *  - promotion: M_PROMOTION
- *  - promotion and capture
  *
  * TODO: move code to specific functions (especially castling, pawn push/capture)
  *
@@ -266,8 +259,9 @@ static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
  *
  * @Return: New @moves.
  */
-static inline __unused move_t *moves_gen_flags(move_t *moves, square_t from, bitboard_t to_bb,
-    __unused move_flags_t flags)
+static inline __unused move_t *moves_gen_flags(move_t *moves, square_t from,
+                                               bitboard_t to_bb,
+                                               __unused move_flags_t flags)
 {
     square_t to;
     while(to_bb) {
@@ -285,12 +279,15 @@ static inline __unused move_t *moves_gen_flags(move_t *moves, square_t from, bit
  *
  * Generate  (at address @moves) all promotion (Q/R/B/N) moves on @to for
  * pawn @from.
+ * Actual promoted piece type is encoded as piece - 2, i.e. N = 0, B = 1,
+ * R = 2, Q = 3.
  *
  * @Return: New @moves.
  */
 static inline move_t *move_gen_promotions(move_t *moves, square_t from, square_t to)
 {
-    for (piece_type_t pt = QUEEN; pt >= KNIGHT; --pt)
+    /* your attention: "downto operator" */
+    for (piece_type_t pt = QUEEN - 1; pt --> KNIGHT - 2;)
         *moves++ = move_make_promote(from, to, pt);
     return moves;
 }
@@ -331,7 +328,6 @@ static inline move_t *moves_gen(move_t *moves, square_t from, bitboard_t to_bb)
  *  - castling: M_CASTLE_{K,Q}
  *  - capture (excl. en-passant): M_CAPTURE
  *  - en-passant: M_EN_PASSANT
- *  - pawn double push: M_DPUSH
  *  - promotion: M_PROMOTION
  *  - promotion and capture
  *
@@ -349,12 +345,12 @@ movelist_t *pos_gen_pseudo(pos_t *pos, movelist_t *movelist)
     bitboard_t dest_squares  = ~my_pieces;
     bitboard_t occ           = my_pieces | enemy_pieces;
     bitboard_t empty         = ~occ;
+    move_t *moves            = movelist->move;
+    square_t king = pos->king[us];
 
     bitboard_t from_bb, to_bb;
     bitboard_t tmp_bb;
-    move_t *moves            = movelist->move;
     square_t from, to;
-    square_t king = pos->king[us];
 
     /* king - MUST BE FIRST */
     to_bb = bb_king_moves(dest_squares, king);
@@ -379,15 +375,17 @@ movelist_t *pos_gen_pseudo(pos_t *pos, movelist_t *movelist)
          * To square attack check will be done in gen_is_legal.
          */
         if (can_oo(pos->castle, us)) {
+
+            /* CHANGE HERE, either with bitmask >> or direct sq check */
             bitboard_t occmask = rel_rank1 & (FILE_Fbb | FILE_Gbb);
             if (!(occ & occmask)) {
-                *moves++ = move_make_flags(king, king + 2, M_CASTLE_K);
+                *moves++ = move_make_flags(king, king + 2, M_CASTLE);
             }
         }
         if (can_ooo(pos->castle, us)) {
             bitboard_t occmask = rel_rank1 & (FILE_Bbb | FILE_Cbb | FILE_Dbb);
             if (!(occ & occmask)) { // &&
-                *moves++ = move_make_flags(king, king - 2, M_CASTLE_Q);
+                *moves++ = move_make_flags(king, king - 2, M_CASTLE);
             }
         }
     }

src/move.c

@@ -94,6 +94,8 @@
  * @move: move
  * @flags: moves selection and display options.
  *
+ * @dst should be large enough to contain move string + '\0' terminator.
+ *
  * Possible flags are:
  * M_PR_CAPT:  print move if capture
  * M_PR_NCAPT: print move if non capture
@@ -104,18 +106,75 @@
  */
 char *move_to_str(char *dst, const move_t move, __unused const int flags)
 {
-    square_t from = move_from(move);
-    square_t to   = move_to(move);
-    int len;
-    sprintf(dst, "%s%s%n", sq_to_string(from), sq_to_string(to), &len);
+    if (move == MOVE_NONE) {
+        strcpy(dst, "none");
+    } else if (move == MOVE_NULL) {
+        strcpy(dst, "null");
+    } else {
+        square_t from = move_from(move);
+        square_t to   = move_to(move);
+        int len;
 
-    if (is_promotion(move)) {
-        piece_t promoted = (piece_t) move_promoted(move);
-        sprintf(dst + len, "%s", piece_to_low(promoted));
+        sprintf(dst, "%s%s%n", sq_to_string(from), sq_to_string(to), &len);
+
+        if (is_promotion(move)) {
+            piece_t promoted = (piece_t) move_promoted(move);
+            sprintf(dst + len, "%s", piece_to_low(promoted));
+        }
     }
     return dst;
 }
 
+/**
+ * move_from_str() - create a move from an UCI move string
+ * @str:  uci move string
+ *
+ * Only from/to squares and promotion information are filled.
+ * To get a full move, @move_find_in_movelist() can be called,
+ * with a list of moves to choose from.
+ *
+ * @return: partial move.
+ */
+move_t move_from_str(const char *str)
+{
+    move_t move;
+    square_t from = sq_from_string(str);
+    square_t to   = sq_from_string(str + 2);
+    piece_type_t promoted = piece_t_from_char(*(str+4));
+
+    if (promoted != NO_PIECE_TYPE) {              /* promotion */
+        move = move_make_promote(from, to, promoted - 2);
+    } else {
+        move = move_make(from, to);
+    }
+    return move;
+}
+
+/**
+ * move_find_in_movelist() - find a partial move in movelist.
+ * @target:  partial move
+ * @list:    &movelist_t to search
+ *
+ * Look for @target into @list. @target must at least contain from and
+ * to square, as well as promotion information - see move_from_str().
+ * If these three pieces of information match, the corresponding move in
+ * @list is returned.
+ *
+ * @return: move, or MOVE_NONE if error.
+ */
+move_t move_find_in_movelist(move_t target, movelist_t *list)
+{
+    move_t *move = list->move, *last = move + list->nmoves;
+
+    for (; move < last; ++move) {
+        if (move_from(target) == move_from(*move) &&
+            move_to(target)   == move_to(*move) &&
+            move_promoted(target)   == move_promoted(*move))
+            return *move;
+    }
+    return MOVE_NONE;
+}
+
 /**
  * moves_print() - print movelist moves.
  * @moves: &movelist_t moves list

src/move.h

@@ -19,53 +19,45 @@
 #include "board.h"
 
 /* move structure:
- * 3 3     2 2    1 1 1 1 1 1
- * 1 0     4 3    8 7 5 4 2 1    6 5    0
- * S UUUUUUU FFFFFF ccc ppp tttttt ffffff
+ * 11 11 1
+ * 54 32 1    6 5    0
+ * FF pp tttttt ffffff
  *
- * bits    len off range         type         mask        get  desc
- * ffffff    6   0   0-5     square_t          077        &077 from
- * tttttt    6   6  6-11     square_t        07700 (>>6)  &077 to
- * ppp       3  12 12-14 piece_type_t       070000 (>>12) &07  promoted
- * ccc       3  15 15-17 piece_type_t      0700000 (>>15) &07  captured
- * FFFFFF    6  18 18-23 move_flags_t    077000000 (>>18) &077 N/A  flags
- * UUUUUUU   7  24 24-30       unused 017700000000             future usage
- * S         1  31 31-31            - 020000000000             sign
+ * bits    len off range         type      mask        get  desc
+ * ffffff    6   0   0-5     square_t       077        &077 from
+ * tttttt    6   6  6-11     square_t     07700 (>>6)  &077 to
+ * pp        2  12 12-13 piece_type_t    030000 (>>12) &03  promoted
+ * FF        2  14 14-15 move_flags_t   0140000 (>>14) &03  flags
  */
-typedef s32 move_t;
-
-/* special move_t values */
-#define MOVE_NONE ((move_t) -1)
-#define MOVE_NULL ((move_t) 0)                    /* hack: from = to = A1 */
+typedef u16 move_t;
 
 enum {
     M_OFF_FROM     = 0,
     M_OFF_TO       = 6,
     M_OFF_PROMOTED = 12,
-//    M_OFF_CAPTURED = 15,
-    M_OFF_FLAGS    = 15
+    M_OFF_FLAGS    = 14
 };
 
 typedef enum {
-    M_PROMOTION = 070000,
-//    M_CAPTURE   = BIT(M_OFF_FLAGS + 0),
-    M_ENPASSANT = BIT(M_OFF_FLAGS + 0),
-    M_CASTLE_K  = BIT(M_OFF_FLAGS + 1),           /* maybe only one ? */
-    M_CASTLE_Q  = BIT(M_OFF_FLAGS + 2),           /* maybe only one ? */
-    M_CHECK     = BIT(M_OFF_FLAGS + 3),           /* maybe unknown/useless ? */
-//    M_DPUSH     = BIT(M_OFF_FLAGS + 7)            /* pawn double push */
+    M_PROMOTED_MASK = 0030000,
+    M_FLAGS_MASK    = 0140000,
+
+    M_ENPASSANT     =  040000,                       /* 1 << M_OFF_FLAGS */
+    M_CASTLE        = 0100000,                       /* 2 << M_OFF_FLAGS */
+    M_PROMOTION     = 0140000,                       /* 3 << M_OFF_FLAGS */
 } move_flags_t;
 
-#define move_set_flags(move, flags) ((move) | (flags))
+/* special move_t values */
+#define MOVE_NULL    0                            /* hack: from = to = A1 */
+#define MOVE_NONE    07777                        /* hack: from = to = H8 */
 
-//#define is_capture(m)   ((m) & M_CAPTURE)
-#define is_enpassant(m) ((m) & M_ENPASSANT)
-#define is_promotion(m) ((m) & M_PROMOTION)
-#define is_castle(m)    ((m) & (M_CASTLE_K | M_CASTLE_Q))
-#define is_castle_K(m)  ((m) & M_CASTLE_K)
-#define is_castle_Q(m)  ((m) & M_CASTLE_Q)
-#define is_check(m)     ((m) & M_CHECK)
-//#define is_dpush(m)     ((m) & M_DPUSH)
+#define move_set_flags(move, flags) ((move) | (flags))
+#define move_flags(move)            ((move) & M_FLAGS_MASK)
+
+#define is_promotion(m)             (move_flags(m) == M_PROMOTION)
+#define is_enpassant(m)             (move_flags(m) == M_ENPASSANT)
+#define is_castle(m)                (move_flags(m) == M_CASTLE)
+// #define is_check(m)                 (move_flags(m) == M_CHECK)
 
 #define MOVES_MAX   256
 
@@ -84,9 +76,14 @@ static inline square_t move_to(move_t move)
     return (move >> M_OFF_TO) & 077;
 }
 
+static inline square_t move_fromto(move_t move)
+{
+    return move & 07777;
+}
+
 static inline piece_type_t move_promoted(move_t move)
 {
-    return (move >> M_OFF_PROMOTED) & 07;
+    return ((move >> M_OFF_PROMOTED) & 03) + KNIGHT;
 }
 
 /*
@@ -122,7 +119,7 @@ static inline move_t move_make_enpassant(square_t from, square_t to)
 static inline move_t move_make_promote(square_t from, square_t to,
                                        piece_type_t promoted)
 {
-    return move_make(from, to) | (promoted << M_OFF_PROMOTED);
+    return move_make_flags(from, to, M_PROMOTION) | (promoted << M_OFF_PROMOTED);
 }
 
 /*
@@ -151,8 +148,9 @@ static inline move_t move_make_promote(square_t from, square_t to,
 #define M_PR_SEPARATE  0x40                       /* separate captures */
 #define M_PR_LONG      0x80
 
-//int move_print(int movenum, move_t *move, move_flags_t flags);
 char *move_to_str(char *dst, const move_t move, __unused const int flags);
+move_t move_from_str(const char *str);
+move_t move_find_in_movelist(move_t target, movelist_t *list);
 void moves_print(movelist_t *moves, int flags);
 void move_sort_by_sq(movelist_t *moves);
 

src/piece.c

@@ -25,22 +25,22 @@
  * piece_details
  */
 const struct piece_details piece_details[PIECE_MAX] = {
-    /*             cap  low  fen  sym  name      values */
-    [EMPTY]    = { "",  "",  "",  "",  "",       0, 0, 0 },
-    [W_PAWN]   = { "",  "",  "P", "♙", "Pawn",   P_VAL_OPN, P_VAL_MID, P_VAL_END },
-    [W_KNIGHT] = { "N", "n", "N", "♘", "Knight", N_VAL_OPN, N_VAL_MID, N_VAL_END },
-    [W_BISHOP] = { "B", "b", "B", "♗", "Bishop", B_VAL_OPN, B_VAL_MID, B_VAL_END },
-    [W_ROOK]   = { "R", "r", "R", "♖", "Rook",   R_VAL_OPN, R_VAL_MID, R_VAL_END },
-    [W_QUEEN]  = { "Q", "q", "Q", "♕", "Queen",  Q_VAL_OPN, Q_VAL_MID, Q_VAL_END },
-    [W_KING]   = { "K", "k", "K", "♔", "King",   K_VAL_OPN, K_VAL_MID, K_VAL_END },
-    [7]        = { "",  "",  "",  "",  "",       0, 0, 0 },
-    [8]        = { "",  "",  "",  "",  "",       0, 0, 0 },
-    [B_PAWN]   = { "",  "",  "p", "♟", "Pawn",   P_VAL_OPN, P_VAL_MID, P_VAL_END },
-    [B_KNIGHT] = { "N", "n", "n", "♞", "Knight", P_VAL_OPN, N_VAL_MID, N_VAL_END },
-    [B_BISHOP] = { "B", "b", "b", "♝", "Bishop", P_VAL_OPN, B_VAL_MID, B_VAL_END },
-    [B_ROOK]   = { "R", "r", "r", "♜", "Rook",   P_VAL_OPN, R_VAL_MID, R_VAL_END },
-    [B_QUEEN]  = { "Q", "q", "q", "♛", "Queen",  P_VAL_OPN, Q_VAL_MID, Q_VAL_END },
-    [B_KING]   = { "K", "k", "k", "♚", "King",   P_VAL_OPN, K_VAL_MID, K_VAL_END },
+    /*             cap  low  fen  sym  name      midgame val endgame val */
+    [EMPTY]    = { "",  "",  "",  "",  "",       0,          0 },
+    [W_PAWN]   = { "",  "",  "P", "♙", "Pawn",   P_VAL_MID,  P_VAL_END },
+    [W_KNIGHT] = { "N", "n", "N", "♘", "Knight", N_VAL_MID,  N_VAL_END },
+    [W_BISHOP] = { "B", "b", "B", "♗", "Bishop", B_VAL_MID,  B_VAL_END },
+    [W_ROOK]   = { "R", "r", "R", "♖", "Rook",   R_VAL_MID,  R_VAL_END },
+    [W_QUEEN]  = { "Q", "q", "Q", "♕", "Queen",  Q_VAL_MID,  Q_VAL_END },
+    [W_KING]   = { "K", "k", "K", "♔", "King",   K_VAL_MID,  K_VAL_END },
+    [7]        = { "",  "",  "",  "",  "",       0,          0         },
+    [8]        = { "",  "",  "",  "",  "",       0,          0         },
+    [B_PAWN]   = { "",  "",  "p", "♟", "Pawn",   P_VAL_MID,  P_VAL_END },
+    [B_KNIGHT] = { "N", "n", "n", "♞", "Knight", N_VAL_MID,  N_VAL_END },
+    [B_BISHOP] = { "B", "b", "b", "♝", "Bishop", B_VAL_MID,  B_VAL_END },
+    [B_ROOK]   = { "R", "r", "r", "♜", "Rook",   R_VAL_MID,  R_VAL_END },
+    [B_QUEEN]  = { "Q", "q", "q", "♛", "Queen",  Q_VAL_MID,  Q_VAL_END },
+    [B_KING]   = { "K", "k", "k", "♚", "King",   K_VAL_MID,  K_VAL_END },
 };
 
 const char pieces_str[6+6+1] = "PNBRQKpnbrqk";

src/piece.h

@@ -24,43 +24,37 @@
  * C: 0 for white, 1: black
  * PPP: pawn (1), knight, bishop, rook, queen, king (6)
  */
-typedef enum {
+enum {
     WHITE, BLACK,
     COLOR_MAX
-} color_t;
+};
+typedef u8 color_t;
 
-typedef enum {
+enum {
     ALL_PIECES = 0,                               /* 'all pieces' bitboard */
     NO_PIECE_TYPE = 0,
     PAWN = 1, KNIGHT, BISHOP, ROOK, QUEEN, KING,
     PIECE_TYPE_MAX = 7                            /* bit 4 */
-} piece_type_t;
+};
+typedef u8 piece_type_t;
 
-typedef enum __piece_e {
+enum __piece_e {
     EMPTY = 0,
     NO_PIECE = 0,
     W_PAWN = PAWN, W_KNIGHT, W_BISHOP, W_ROOK, W_QUEEN, W_KING,
     B_PAWN = PAWN | 8, B_KNIGHT, B_BISHOP, B_ROOK, B_QUEEN, B_KING,
     PIECE_MAX
-} piece_t;
-
-/* default values for opening, midgame, endgame
+};
+typedef u8  piece_t;
+/* default values for midgame, endgame
  */
-#define E_VAL_OPN    0                            /* empty */
-#define P_VAL_OPN    100
-#define N_VAL_OPN    300
-#define B_VAL_OPN    300
-#define R_VAL_OPN    500
-#define Q_VAL_OPN    900
-#define K_VAL_OPN    20000
-
 #define E_VAL_MID    0
 #define P_VAL_MID    100
 #define N_VAL_MID    300
 #define B_VAL_MID    300
 #define R_VAL_MID    500
 #define Q_VAL_MID    900
-#define K_VAL_MID    20000
+#define K_VAL_MID    10000
 
 #define E_VAL_END    0
 #define P_VAL_END    100
@@ -68,7 +62,7 @@ typedef enum __piece_e {
 #define B_VAL_END    300
 #define R_VAL_END    500
 #define Q_VAL_END    900
-#define K_VAL_END    20000
+#define K_VAL_END    10000
 
 /* some default values for pieces
  * @abbr:   char, piece capital letter (used for game notation)
@@ -86,9 +80,8 @@ extern const struct piece_details {
     char *fen;                                    /* cap=white, low=black */
     char *sym;                                    /* UTF-8 symbol */
     char *name;                                   /* piece name */
-    s64  opn_value;                               /* value opening */
-    s64  mid_value;                               /* value midgame */
-    s64  end_value;                               /* value endgame */
+    s16  mid_value;                               /* value midgame */
+    s16  end_value;                               /* value endgame */
 } piece_details[PIECE_MAX];
 
 extern const char pieces_str[6+6+1];              /* to search from fen/user input */
@@ -102,13 +95,18 @@ extern const char pieces_str[6+6+1];              /* to search from fen/user inp
 #define PIECE(p)          ((p) & MASK_PIECE)
 #define MAKE_PIECE(p, c)  ((p) | (c) << 3)
 
-#define IS_WHITE(p)       (!COLOR(p))
-#define IS_BLACK(p)       (COLOR(p))
+#define IS_BLACK(p)       ((p) & MASK_COLOR)
+#define IS_WHITE(p)       (! IS_BLACK(p))
 
 #define SET_WHITE(p)      (piece_t)((p) &= ~MASK_COLOR)
 #define SET_BLACK(p)      (piece_t)((p) |= MASK_COLOR)
 #define SET_COLOR(p, c)   (piece_t)(!(c)? SET_WHITE(p): SET_BLACK(p))
 
+static __inline s16 piece_val(piece_type_t pt)
+{
+    return piece_details[pt].mid_value;
+}
+
 bool piece_ok(piece_t p);
 
 char *piece_to_cap(piece_t p);
@@ -118,18 +116,13 @@ char *piece_to_sym(piece_t p);
 char *piece_to_name(piece_t p);
 
 #define piece_to_char(c) piece_to_fen(c)
-//#define piece_to_char_t(p) piece_to_uci(p)
+#define piece_to_uci(p)  piece_to_low(p)
 
-//piece_type_t char_to_piece(char c);
 piece_type_t piece_t_from_char(char c);
 piece_t piece_from_fen(char c);
 
 #define piece_from_char(c) piece_from_fen(c)
 
-/* use short name or symbol - no effect
- */
-#define P_USE_UTF      1
-
 //void piece_list_print(struct list_head *list);
 //pool_t *piece_pool_init();
 //void piece_pool_stats();

src/position.c

@@ -27,9 +27,10 @@
 #include "hyperbola-quintessence.h"
 #include "fen.h"
 #include "piece.h"
-#include "util.h"
+#include "misc.h"
 #include "board.h"
 #include "attack.h"
+#include "hist.h"
 
 /**
  * pos_new() - allocate a new position
@@ -107,6 +108,7 @@ pos_t *pos_clear(pos_t *pos)
     pos->castle = 0;
     pos->clock_50 = 0;
     pos->plycount = 0;
+    pos->move = MOVE_NONE;
     pos->captured = NO_PIECE;
 
     for (square_t sq = A1; sq <= H8; ++sq)
@@ -123,8 +125,6 @@ pos_t *pos_clear(pos_t *pos)
     pos->pinners = 0;
     pos->blockers = 0;
 
-    pos->repeat.moves = 0;
-
     return pos;
 }
 
@@ -167,10 +167,12 @@ bool pos_cmp(const pos_t *pos1, const pos_t *pos2)
     if (_cmpf(checkers) ||_cmpf(pinners) || _cmpf(blockers))
         goto end;
 
-    if (_cmpf(repeat.moves) ||
-        memcmp(pos1->repeat.key, pos2->repeat.key,
-               pos1->repeat.moves * sizeof pos1->repeat.key))
-        goto end;
+    /*
+     * if (_cmpf(repeat.moves) ||
+     *     memcmp(pos1->repeat.key, pos2->repeat.key,
+     *            pos1->repeat.moves * sizeof pos1->repeat.key))
+     *     goto end;
+     */
 
     ret = true;
 end:
@@ -360,7 +362,7 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
 bool pos_ok(pos_t *pos, const bool strict)
 {
     int n, count = 0, bbcount = 0, error = 0;
-    color_t us = pos->turn, them = OPPONENT(us);
+    color_t __unused us = pos->turn, __unused them = OPPONENT(us);
 
     /* force BUG_ON and WARN_ON */
 #   pragma push_macro("BUG_ON")
@@ -391,7 +393,7 @@ bool pos_ok(pos_t *pos, const bool strict)
     }
     for (square_t sq = 0; sq < 64; ++sq) {
         piece_t piece = pos->board[sq];
-        bitboard_t match;
+        __unused bitboard_t match;
         if (piece == EMPTY)
             continue;
         color_t c = COLOR(piece);
@@ -429,8 +431,9 @@ void pos_print(const pos_t *pos)
     char str[128];
 
     board_print(pos->board);
-    printf("key:%lx ", pos->key);
     printf("fen: %s\n", pos2fen(pos, str));
+    printf("last move:%s ", move_to_str(str, pos->move, 0));
+    printf("key:%lx\n", pos->key);
     printf("checkers:%s ", pos_checkers2str(pos, str, sizeof(str)));
     printf("pinners: %s ", pos_pinners2str(pos, str, sizeof(str)));
     printf("blockers: %s\n", pos_blockers2str(pos, str, sizeof(str)));

src/position.h

@@ -28,13 +28,6 @@
 #include "move.h"
 #include "board.h"
 
-#define REPEAT_SIZE 1024
-
-typedef struct {
-    hkey_t key[REPEAT_SIZE];
-    int moves;
-} repeat_t;
-
 typedef struct __pos_s {
     u64 node_count;                               /* evaluated nodes */
     int turn;                                     /* WHITE or BLACK */
@@ -50,21 +43,28 @@ typedef struct __pos_s {
      * This allows a memcpy on this data (to save/restore position state).
      */
     struct_group_tagged(state_s, state,
+
+                        /* 64 bits */
+                        struct state_s *prev;
                         hkey_t key;
+
+                        /* 16 bits */
+                        u16 plycount;             /* plies so far, start from 1 */
+                        move_t move;
+
+                        /* 8 bits */
                         square_t en_passant;
                         castle_rights_t castle;
-                        int clock_50;
-                        int plycount;             /* plies so far, start from 1 */
                         piece_t captured;         /* only used in move_undo */
+                        u8 clock_50;
         );
+    eval_t eval;
     bitboard_t checkers;                          /* opponent checkers */
     bitboard_t pinners;                           /* opponent pinners */
     bitboard_t blockers;                          /* pieces blocking pin */
-
     piece_t board[BOARDSIZE];
     bitboard_t bb[2][PIECE_TYPE_MAX];             /* bb[0][PAWN], bb[1][ALL_PIECES] */
     square_t king[2];                             /* dup with bb, faster retrieval */
-    repeat_t repeat;                              /* for repetition detection */
 } pos_t;
 
 typedef struct state_s state_t;

src/search.c

@@ -26,7 +26,7 @@
  * @pos:    &position to search
  * @depth:  Wanted depth.
  * @ply:    current perft depth level (root = 1)
- * @output: output total for 1st level moves.
+ * @divide: output total for 1st level moves.
  *
  * Run perft on a position. This function displays the available moves at @depth
  * level for each possible first move, and the total of moves.
@@ -42,17 +42,12 @@
  *
  * @return: total moves found at @depth level.
  */
-u64 perft(pos_t *pos, int depth, int ply, bool output)
+u64 perft(pos_t *pos, int depth, int ply, bool divide)
 {
-    u64 subnodes, nodes = 0;
+    u64 subnodes = 0, nodes = 0;
     movelist_t movelist;
     move_t *move, *last;
     state_t state;
-#   ifdef PERFT_MOVE_HISTORY
-    static movelist_t stack;
-    if (ply == 1)
-        stack.nmoves = 0;
-#   endif
 
     pos_set_checkers_pinners_blockers(pos);
 
@@ -60,41 +55,33 @@ u64 perft(pos_t *pos, int depth, int ply, bool output)
     last = movelist.move + movelist.nmoves;
     for (move = movelist.move; move < last; ++move) {
         if (depth == 1) {
-            nodes++;
+            subnodes = 1;
         } else {
             move_do(pos, *move, &state);
-#           ifdef PERFT_MOVE_HISTORY
-            stack.move[stack.nmoves++] = *move;
-#           endif
             if (depth == 2) {
                 movelist_t movelist2;
                 pos_set_checkers_pinners_blockers(pos);
                 subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
-            } else if (ply >= 4) {
+            } else if (ply >= 3) {
                 hentry_t *entry = tt_probe_perft(pos->key, depth);
                 if (entry != TT_MISS) {
                     subnodes = HASH_PERFT_VAL(entry->data);
                 } else {
-                    subnodes = perft(pos, depth - 1, ply + 1, output);
+                    subnodes = perft(pos, depth - 1, ply + 1, divide);
                     tt_store_perft(pos->key, depth, subnodes);
                 }
             } else {
-                subnodes = perft(pos, depth - 1, ply + 1, output);
+                subnodes = perft(pos, depth - 1, ply + 1, divide);
             }
-            if (output && ply == 1) {
-                char movestr[8];
-                printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
-            }
-            nodes += subnodes;
             move_undo(pos, *move, &state);
-#           ifdef PERFT_MOVE_HISTORY
-            stack.nmoves--;
-#           endif
+        }
+        nodes += subnodes;
+        if (ply == 1 && divide) {
+            char movestr[8];
+            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
         }
     }
 
-    if (output && ply == 1)
-        printf("Total: %lu\n", nodes);
     return nodes;
 }
 
@@ -103,16 +90,16 @@ u64 perft(pos_t *pos, int depth, int ply, bool output)
  * @pos:    &position to search
  * @depth:  Wanted depth.
  * @ply:    current perft depth level (root = 1)
- * @output: output total for 1st level moves.
+ * @divide: output total for 1st level moves.
  *
  * Run perft on a position. This function displays the available moves at @depth
  * level for each possible first move, and the total of moves.
  *
  * @return: total moves found at @depth level.
  */
-u64 perft_alt(pos_t *pos, int depth, int ply, bool output)
+u64 perft_alt(pos_t *pos, int depth, int ply, bool divide)
 {
-    u64 subnodes, nodes = 0;
+    u64 subnodes = 0, nodes = 0;
     movelist_t movelist;
     move_t *move, *last;
     state_t state;
@@ -123,7 +110,7 @@ u64 perft_alt(pos_t *pos, int depth, int ply, bool output)
     last = movelist.move + movelist.nmoves;
     for (move = movelist.move; move < last; ++move) {
         if (depth == 1) {
-            nodes++;
+            subnodes = 1;
         } else {
             move_do_alt(pos, *move, &state);
             if (depth == 2) {
@@ -131,19 +118,17 @@ u64 perft_alt(pos_t *pos, int depth, int ply, bool output)
                 pos_set_checkers_pinners_blockers(pos);
                 subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
             } else {
-                subnodes = perft_alt(pos, depth - 1, ply + 1, output);
+                subnodes = perft_alt(pos, depth - 1, ply + 1, divide);
             }
-            if (output && ply == 1) {
-                char movestr[8];
-                printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
-            }
-            nodes += subnodes;
             move_undo_alt(pos, *move, &state);
         }
+        nodes += subnodes;
+        if (ply == 1 && divide) {
+            char movestr[8];
+            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+        }
     }
 
-    if (output && ply == 1)
-        printf("Total: %lu\n", nodes);
     return nodes;
 }
 

src/util.c

@@ -1,18 +0,0 @@
-/* util.c - various util functions.
- *
- * Copyright (C) 2024 Bruno Raoult ("br")
- * Licensed under the GNU General Public License v3.0 or later.
- * Some rights reserved. See COPYING.
- *
- * You should have received a copy of the GNU General Public License along with this
- * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "util.h"
-#include "bitboard.h"

test/attack-test.c

@@ -53,7 +53,7 @@ int main(int __unused ac, __unused char**av)
 
         pos_set_checkers_pinners_blockers(pos);
 
-        printf("******* %s\n", cur_comment());
+        printf("******* line %d: %s\n", cur_line(), cur_comment());
         bb_print_multi("checkers", 2, checkers, pos->checkers);
         bb_print_multi("pinners", 2, pinners, pos->pinners);
         bb_print_multi("blockers", 2, blockers, pos->blockers);

test/common-test.h

@@ -28,20 +28,9 @@ struct fentest {
     char *comment;
     char *fen;
 } fentest[] = {
-    /************************************************************
-     * TEMP TESTS BELOW - only run them (till sentinel below)   *
-     ************************************************************/
-
-    /*
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-     *   "startpos + 1.e4 e5 2.Nf3 Nc6 3.Bb5 a6 4.Ba4",
-     *   "r1bqkbnr/1ppp1ppp/p1n5/4p3/B3P3/5N2/PPPP1PPP/RNBQK2R b KQkq - 1 4"
-     * },
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-     *   "",
-     *   "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 1"
-     * },
-     */
+    /******************************************************************
+     * TEMP TESTS BELOW - only run them (till sentinel below)         *
+     ******************************************************************/
 
     /******************************************************************
      * DO NOT DELETE NEXT LINE - sentinel entry for temp tests above. *
@@ -87,20 +76,6 @@ struct fentest {
       "illegal e.p. bug perft at depth 4",
       "1nbqkbn1/ppp2ppp/4p3/r1rpP3/6K1/P7/1PPP1PPP/RNBQ1BNR b - - 1 2"
     },
-    /*
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT,
-     *   "illegal e.p. bug perft depth 3",
-     *   "1nbqkbn1/ppp2ppp/4p3/2rpP3/r5K1/P7/1PPP1PPP/RNBQ1BNR w - - 2 3"
-     * },
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT,
-     *   "illegal e.p. bug perft depth 2",
-     *   "1nbqkbn1/ppp2ppp/4p3/2rpP3/r4PK1/P7/1PPP2PP/RNBQ1BNR b - - 0 3"
-     * },
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT | PERFT,
-     *   "illegal e.p. bug perft depth 1 - fixed",
-     *   "1nb1kbn1/ppp2ppp/4p3/2rpP1q1/r4PK1/P7/1PPP2PP/RNBQ1BNR w - - 1 4"
-     * },
-     */
     { __LINE__, ATTACK,
       "only 3 K moves (but impossible situation)",
       "1k6/8/8/8/8/8/8/r2K3r w - - 0 1"
@@ -151,24 +126,8 @@ struct fentest {
       "4k3/8/8/8/7b/8/8/4K3 w - - 0 1"
     },
     /*
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-     *   "1.e3 - perft bug",
-     *   "rnbqkbnr/pppppppp/8/8/8/4P3/PPPP1PPP/RNBQKBNR b KQkq - 0 1"
-     * },
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT | PERFT,
-     *   "1.e3 Nc6 - perft bug",
-     *   "r1bqkbnr/pppppppp/2n5/8/8/4P3/PPPP1PPP/RNBQKBNR w KQkq - 1 2"
-     * },
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT | PERFT,
-     *   "1.e3 Nc6 2.Ke2 - perft bug",
-     *   "r1bqkbnr/pppppppp/2n5/8/8/4P3/PPPPKPPP/RNBQ1BNR b kq - 2 2"
-     * },
-     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-     *   "1.e3 Nc6 2.Ke2 Nd4+ - perft bug",
-     *   "r1bqkbnr/pppppppp/8/8/3n4/4P3/PPPPKPPP/RNBQ1BNR w kq - 3 3"
-     * },
+     * First game moves
      */
-    // First game moves
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "startpos",
       "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"
@@ -189,10 +148,11 @@ struct fentest {
       "startpos + 1.e4 e5 2.Nf3 Nc6 3.Bb5 a6 4.Ba4",
       "r1bqkbnr/1ppp1ppp/p1n5/4p3/B3P3/5N2/PPPP1PPP/RNBQK2R b KQkq - 1 4"
     },
-    // castling test
-    // both can castle queen only
+    /******************
+     * Castling tests *
+     ******************/
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "no Q castling",
+      "both can castle K-side",
       "r3k2r/8/3B4/8/8/3b4/8/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
@@ -200,30 +160,27 @@ struct fentest {
       "r3k2r/8/3BB3/8/8/3bb3/8/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
+      "No castling for white",
       "r2bkb1r/8/8/8/8/3bb3/8/R2BKB1R w KQkq - 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "4 castle possible, only K+R",
+      "4 castling possible, only K+R",
       "r3k2r/8/8/8/8/8/8/R3K2R w KQkq - 0 1"
     },
-    //
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "only kings on A1/A8, white to play",
-      "k7/8/8/8/8/8/8/K7 w - - 0 1"
-    },
-    //
+    /*
+     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+     *   "only kings on A1/A8, white to play",
+     *   "k7/8/8/8/8/8/8/K7 w - - 0 1"
+     * },
+     */
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "only one move possible (Pf2xBg3)",
       "k7/8/8/1p1p4/pPpPp3/P1PpPpb1/NBNP1P2/KBB1B3 w - - 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "only 2 moves possible (Ph5xg6 e.p., Ph5-h6)",
       "k7/8/8/1p1p2pP/pPpPp3/P1PpPp2/NBNP1P2/KBB1B3 w - g6 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "2 Kings, W/B/ pawns on 7th for promotion",
       "k4n2/4P3/8/8/8/8/4p3/K4N2 w - - 0 1"
@@ -249,12 +206,41 @@ struct fentest {
       "",
       "6k1/6pp/R2p4/p1p5/8/1P1r3P/6P1/6K1 b - - 3 3"
     },
-
-    // some of tests below are from:
-    // - Rodent IV
-    // - https://www.chessprogramming.net/perfect-perft/
+    /*************************************
+     * Some FEN found on talkchess forum *
+     *************************************/
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
+      "from https://www.talkchess.com/forum/viewtopic.php?t=42463",
+      "rnbqkb1r/pp1p1ppp/2p5/4P3/2B5/8/PPP1NnPP/RNBQK2R w KQkq - 0 6"
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "8/p7/8/1P6/K1k3p1/6P1/7P/8 w - - 0 1", // Perft(8) == 8,103,790
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "8/5p2/8/2k3P1/p3K3/8/1P6/8 b - - 0 1"  // Perft(8) == 64,451,405
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "n1n5/PPPk4/8/8/8/8/4Kppp/5N1N b - - 0 1" // Perft(6) == 71,179,139
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "r3k2r/p6p/8/B7/1pp1p3/3b4/P6P/R3K2R w KQkq - 0 1" // Perft(6) == 77,054,993
+    },
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "r3k2r/pb3p2/5npp/n2p4/1p1PPB2/6P1/P2N1PBP/R3K2R w KQkq - 0 1" // Perft(5) == 29,179,893
+    },
+
+    /*****************************************************
+     * some of tests below are from:                     *
+     * - Rodent IV                                       *
+     * - https://www.chessprogramming.net/perfect-perft/ *
+     *****************************************************/
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "\"kiwipete\"",
       "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,

test/move-test.c

@@ -1,31 +0,0 @@
-#include <stdio.h>
-#include "debug.h"
-
-#include "../src/fen.h"
-#include "../src/move.h"
-
-int main(int ac, char**av)
-{
-    pos_t *pos;
-
-    debug_init(5, stderr, true);
-    piece_pool_init();
-    moves_pool_init();
-    pos_pool_init();
-    pos = pos_get();
-
-    if (ac == 1) {
-        fen2pos(pos, "rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq - 0 2");
-        //pos_startpos(pos);
-    } else {
-        fen2pos(pos, av[1]);
-    }
-    //printf("turn = %d opponent = %d\n", pos->turn, OPPONENT(pos->turn));
-    moves_gen_all(pos);
-    pos_print(pos);
-    pos_pieces_print(pos);
-    moves_print(pos, M_PR_SEPARATE);
-
-    //bitboard_print2(castle_squares[0].controlled, castle_squares[1].controlled);
-    //bitboard_print2(castle_squares[0].occupied, castle_squares[1].occupied);
-}

test/perft-test.c

@@ -116,9 +116,9 @@ static void stockfish_fen(FILE *desc, char *fen)
 }
 
 static u64 stockfish_perft(FILE *desc, pos_t *pos, movelist_t *movelist,
-                               int depth)
+                           int depth, int divide)
 {
-    char *buf = NULL;
+    char *buf = NULL, movestr[8];
     u64 count, mycount = 0, fishcount;
     size_t alloc = 0;
     ssize_t buflen;
@@ -144,27 +144,37 @@ static u64 stockfish_perft(FILE *desc, pos_t *pos, movelist_t *movelist,
             break;
         }
         //printf("%d: %s\n", line++, buf);
-        if (sscanf(buf, "%*4s: %lu", &count) == 1) {
-            square_t from = sq_from_string(buf);
-            square_t to   = sq_from_string(buf + 2);
+        if (sscanf(buf, "%6[a-z1-8]: %lu", movestr, &count) == 2) {
+            //printf("read:%s movestr:%s count:%lu\n", buf, movestr, count);
+            moves[(*nmoves)++] = move_from_str(movestr);
             mycount += count;
-            //printf("move found: %c%c->%c%c %s->%s count=%d\n",
-            //       buf[0], buf[1], buf[2], buf[3],
-            //       sq_to_string(from), sq_to_string(to),
-            //       count);
-            moves[(*nmoves)++] = move_make(from, to);
-
-        } else if (sscanf(buf, "%*5s: %lu", &count) == 1) {
-            square_t from = sq_from_string(buf);
-            square_t to   = sq_from_string(buf + 2);
-            piece_type_t promoted = piece_t_from_char(*(buf + 4));
-            mycount += count;
-            //printf("move found: %c%c->%c%c %s->%s count=%d\n",
-            //       buf[0], buf[1], buf[2], buf[3],
-            //       sq_to_string(from), sq_to_string(to),
-            //       count);
-            moves[(*nmoves)++] = move_make_promote(from, to, promoted);
+            if (divide) {
+                printf("%s: %lu\n", movestr, count);
+            }
         }
+        /*
+         * if (sscanf(buf, "%*4s: %lu", &count) == 1) {
+         *     square_t from = sq_from_string(buf);
+         *     square_t to   = sq_from_string(buf + 2);
+         *     mycount += count;
+         *     //printf("move found: %c%c->%c%c %s->%s count=%d\n",
+         *     //       buf[0], buf[1], buf[2], buf[3],
+         *     //       sq_to_string(from), sq_to_string(to),
+         *     //       count);
+         *     moves[(*nmoves)++] = move_make(from, to);
+         *
+         * } else if (sscanf(buf, "%*5s: %lu", &count) == 1) {
+         *     square_t from = sq_from_string(buf);
+         *     square_t to   = sq_from_string(buf + 2);
+         *     piece_type_t promoted = piece_t_from_char(*(buf + 4));
+         *     mycount += count;
+         *     //printf("move found: %c%c->%c%c %s->%s count=%d\n",
+         *     //       buf[0], buf[1], buf[2], buf[3],
+         *     //       sq_to_string(from), sq_to_string(to),
+         *     //       count);
+         *     moves[(*nmoves)++] = move_make_promote(from, to, promoted);
+         * }
+         */
     }
     //pos->moves.nmoves = nmoves;
     // printf("fishcount=%d mycount=%d\n", fishcount, mycount);
@@ -257,7 +267,7 @@ static int usage(char *prg)
 {
     fprintf(stderr, "Usage: %s [-cms][-d depth] [-p version] [-t size:\n", prg);
     fprintf(stderr, "\t-c:         do *not* print FEN comments\n");
-    fprintf(stderr, "\t-d depth:   perft depth (default: 6)");
+    fprintf(stderr, "\t-d depth:   perft depth (default: 6)\n");
     fprintf(stderr, "\t-m:         print moves details\n");
     fprintf(stderr, "\t-s:         use Stockfish to validate perft result\n");
     fprintf(stderr, "\t-t size:    Transposition Table size (Mb). Default: 32\n");
@@ -270,22 +280,23 @@ int main(int ac, char**av)
 {
     int curtest = 0;
     u64 sf_count = 0, my_count;
-    bool comment = true, sf_run = false, moves_output = false;
+    bool comment = true, sf_run = false, divide = false;
     char *fen;
     pos_t *pos = NULL, *fenpos;
     pos_t *fishpos = pos_new();
     movelist_t fishmoves;
     FILE *outfd = NULL;
     s64 ms, lps;
-    int opt, depth = 6, run = 3, tt = 32, newtt = 32;
+    int opt, depth = 6, run = 3, tt, newtt = HASH_SIZE_DEFAULT;
     struct {
-        s64 count, ms;
+        s64 count, countskipped, ms;
         s64 minlps, maxlps;
         int skipped;
+        int err;
     } res[3] = {
-        { .minlps=LONG_MAX },
-        { .minlps=LONG_MAX },
-        { .minlps=LONG_MAX },
+        { .minlps = LONG_MAX },
+        { .minlps = LONG_MAX },
+        { .minlps = LONG_MAX },
     };
 
     while ((opt = getopt(ac, av, "cd:mp:st:")) != -1) {
@@ -299,7 +310,7 @@ int main(int ac, char**av)
                     depth = 6;
                 break;
             case 'm':
-                moves_output = false;
+                divide = true;
                 break;
             case 'p':
                 run = atoi(optarg);
@@ -321,9 +332,12 @@ int main(int ac, char**av)
     }
 
     init_all();
-    if (newtt != 32 && newtt > 1) {
-        printf("changing TT size from %d to %d\n", tt, newtt);
+    tt = hash_tt.mb;
+
+    if (run & 1 && newtt != tt) {
         tt_create(newtt);
+
+        printf("changing TT size from %d to %d\n", tt, newtt);
         tt = newtt;
     }
     printf("%s: depth:%d tt_size:%d run:%x SF:%s\n",
@@ -334,8 +348,6 @@ int main(int ac, char**av)
     tt_info();
     printf("\n");
 
-    printf("move_t size:%lu\n", sizeof(move_t));
-
     if (sf_run)
         outfd = open_stockfish();
 
@@ -346,11 +358,10 @@ int main(int ac, char**av)
             continue;
         }
         curtest++;
-        printf("test:%d line:%d", curtest, cur_line());
+        printf("test:%d line:%d fen:%s\n", curtest, cur_line(), fen);
         if (comment)
-            printf(" comment:%s\n",
+            printf("\t\"%s\"\n",
                    *cur_comment()? cur_comment(): "no test desc");
-        printf("\t%s\n", fen);
 
         tt_clear();
 
@@ -358,10 +369,11 @@ int main(int ac, char**av)
         if (sf_run) {
             stockfish_fen(outfd, fen);
             clock_start(&clock);
-            sf_count = stockfish_perft(outfd, fishpos, &fishmoves, depth);
+            sf_count = stockfish_perft(outfd, fishpos, &fishmoves, depth, divide);
             ms = clock_elapsed_ms(&clock);
             if (!ms) {
                 res[2].skipped++;
+                res[2].countskipped += sf_count;
                 lps = 0;
             } else {
                 lps = sf_count * 1000l / ms;
@@ -378,10 +390,11 @@ int main(int ac, char**av)
 
         if (run & 1) {
             clock_start(&clock);
-            my_count = perft(pos, depth, 1, moves_output);
+            my_count = perft(pos, depth, 1, divide);
             ms = clock_elapsed_ms(&clock);
             if (!ms) {
                 res[0].skipped++;
+                res[0].countskipped += my_count;
                 lps = 0;
             } else {
                 lps = my_count * 1000l / ms;
@@ -399,15 +412,17 @@ int main(int ac, char**av)
                 tt_stats();
             } else  {
                 printf("perft     : perft:%'lu ***ERROR***\n", my_count);
+                res[0].err++;
             }
         }
 
         if (run & 2) {
             clock_start(&clock);
-            my_count = perft_alt(pos, depth, 1, moves_output);
+            my_count = perft_alt(pos, depth, 1, divide);
             ms = clock_elapsed_ms(&clock);
             if (!ms) {
                 res[1].skipped++;
+                res[1].countskipped += my_count;
                 lps = 0;
             } else {
                 lps = my_count * 1000l / ms;
@@ -424,6 +439,7 @@ int main(int ac, char**av)
                        my_count, ms, lps);
             } else  {
                 printf("perft_alt : perft:%'lu ***ERROR***\n", my_count);
+                res[1].err++;
             }
         }
         printf("\n");
@@ -432,32 +448,32 @@ int main(int ac, char**av)
     if (sf_run) {
         if (!res[2].ms)
             res[2].ms = 1;
-        printf("total Stockfish : perft:%'lums ms:%'lums lps:%'lu min:%'lu max:%'lu "
+        printf("total Stockfish : perft:%'lu ms:%'lu lps:%'lu min:%'lu max:%'lu "
                "(skipped %d/%d)\n",
-               res[2].count, res[2].ms,
+               res[2].count + res[2].countskipped, res[2].ms,
                res[2].count * 1000l / res[2].ms,
                res[2].minlps, res[2].maxlps,
-               res[0].skipped, curtest);
+               res[2].skipped, curtest);
     }
     if (run & 1) {
         if (!res[0].ms)
             res[0].ms = 1;
-        printf("total perft     : perft:%'lums ms:%'lums lps:%'lu min:%'lu max:%'lu "
-               "(skipped %d/%d)\n",
-               res[0].count, res[0].ms,
+        printf("total perft     : perft:%'lu ms:%'lu lps:%'lu min:%'lu max:%'lu "
+               "(pos:%d skipped:%d err:%d)\n",
+               res[0].count + res[0].countskipped, res[0].ms,
                res[0].count * 1000l / res[0].ms,
                res[0].minlps, res[0].maxlps,
-               res[0].skipped, curtest);
+               curtest, res[0].skipped, res[0].err);
     }
     if (run & 2) {
         if (!res[1].ms)
             res[1].ms = 1;
-        printf("total perft_alt : perft:%'lums ms:%'lums lps:%'lu min:%'lu max:%'lu "
-               "(skipped %d/%d)\n",
-               res[1].count, res[1].ms,
+        printf("total perft_alt : perft:%'lu ms:%'lu lps:%'lu min:%'lu max:%'lu "
+               "(pos:%d skipped:%d err:%d)\n",
+               res[1].count + res[1].countskipped, res[1].ms,
                res[1].count * 1000l / res[1].ms,
                res[1].minlps, res[1].maxlps,
-               res[0].skipped, curtest);
+               curtest, res[1].skipped, res[1].err);
     }
     return 0;
 }

test/tt-test.c

@@ -29,50 +29,6 @@
 #include "move-gen.h"
 #include "search.h"
 
-// #include "common-test.h"
-
-static move_t move_in_movelist(movelist_t *ml, square_t from, square_t to, piece_type_t pt)
-{
-    const int nmoves = ml->nmoves;
-    const move_t *moves = ml->move;
-    int movenum = 0;
-    move_t move;
-    for (movenum = 0; movenum < nmoves; ++movenum) {
-        move = moves[movenum];
-        printf("compare %s%s to %s%s pt=%d ",
-               sq_to_string(from), sq_to_string(to),
-               sq_to_string(move_from(move)),
-               sq_to_string(move_to(move)),
-               pt
-            );
-        if (move_from(move) == from && move_to(move) == to) {
-            printf("HIT!\n");
-            if (pt != NO_PIECE_TYPE && move_promoted(move) != pt)
-                continue;
-            printf("move_in_movelist(%s%s) found from=%s to=%s\n",
-                   sq_to_string(from), sq_to_string(to),
-                   sq_to_string(move_from(move)),
-                   sq_to_string(move_to(move)));
-            return move;
-        } else
-            puts("");
-    }
-    return MOVE_NONE;
-}
-
-static move_t move_from_str(pos_t *pos, const char *move)
-{
-    movelist_t movelist;
-    square_t from = sq_from_string(move);
-    square_t to = sq_from_string(move + 2);
-    piece_type_t promoted = piece_t_from_char(*(move + 4));
-    printf("from=%o to=%o promoted=%d\n", from, to, promoted);
-
-    pos_set_checkers_pinners_blockers(pos);
-    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
-    return  move_in_movelist(&movelist, from, to, promoted);
-}
-
 static void pr_entry(hentry_t *entry)
 {
     if (!entry)
@@ -91,7 +47,7 @@ int main()
     hentry_t *entry;
     move_t move;
     state_t state;
-    //movelist_t movelist;
+    movelist_t movelist;
 
     const char *moves_array[] = {
         "e2e4 e7e5 g1f3 b8c6",
@@ -113,19 +69,22 @@ int main()
             depth++;
             printf("%s ", token);
 
-            //pos_set_checkers_pinners_blockers(pos);
-            //pos_legal(pos, pos_gen_pseudo(pos, &movelist));
-            move = move_from_str(pos, token);
+            move = move_from_str(token);
+            pos_set_checkers_pinners_blockers(pos);
+            pos_legal(pos, pos_gen_pseudo(pos, &movelist));
             printf("move: %s\n", move_to_str(buf, move, 0));
-            move_do(pos, move, &state);
-            if ((entry = tt_probe_perft(pos->key, depth))) {
-                printf("tt hit: depth=%d val=%lu",
-                       HASH_PERFT_DEPTH(entry->data),
-                       HASH_PERFT_VAL(entry->data));
-            } else {
-                tt_store_perft(pos->key, i + 1, depth);
-                printf("tt store: depth=%d val=%lu", depth, (u64)i * 123);
-            };
+            move =  move_find_in_movelist(move, &movelist);
+            if (move != MOVE_NONE) {
+                move_do(pos, move, &state);
+                if ((entry = tt_probe_perft(pos->key, depth))) {
+                    printf("tt hit: depth=%d val=%lu",
+                           HASH_PERFT_DEPTH(entry->data),
+                           HASH_PERFT_VAL(entry->data));
+                } else {
+                    tt_store_perft(pos->key, i + 1, depth);
+                    printf("tt store: depth=%d val=%lu", depth, (u64)i * 123);
+                };
+            }
 
             token = strtok(NULL, " \t");
         }