merge perft split

- hist.c: add hist_next() - get next entry in history
- state_t: remove plycount, clock_50 -> ply50, add phase, repcount
- pos_t: add plycount, plyroot
- state_t moved to chessdefs.h
- perft-test: split perft from do_perft (todo for perft_alt)
- position.c: add pos_repcount()
- search.c: add is_draw()
- uci: set root position (after moves), adjust history moves repcount

.dir-locals.el

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

.gitignore

@@ -4,6 +4,7 @@ vgcore.*
 *.i
 *.old
 *.save
+perf.data
 /GPATH
 /GRTAGS
 /GTAGS
@@ -19,3 +20,4 @@ vgcore.*
 valgrind.out
 gmon.out
 compile_commands.json
+.lastbuild

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,7 @@
 #
 
 SHELL     := /bin/bash
-CC        := gcc
-#CC        := clang
-LD        := ld
+
 BEAR      := bear
 TOUCH     := touch
 RM        := rm
@@ -21,7 +19,7 @@ RMDIR     := rmdir
 MAKE      := make
 
 SRCDIR    := ./src
-INCDIR    := ./src					    # used by ./test sources
+INCDIR    := ./src                                          # used by ./test sources
 OBJDIR    := ./obj
 BINDIR    := ./bin
 DEPDIR    := ./dep
@@ -34,14 +32,14 @@ BRLIBDIR  := $(BRLIB)/lib
 CCLSROOT  := .ccls-root
 CCLSFILE  := compile_commands.json
 
-SRC       := $(wildcard $(SRCDIR)/*.c)			    # project sources
-SRC_FN    := $(notdir $(SRC))				    # source basename
+SRC       := $(wildcard $(SRCDIR)/*.c)                      # project sources
+SRC_FN    := $(notdir $(SRC))                               # source basename
 OBJ       := $(addprefix $(OBJDIR)/,$(SRC_FN:.c=.o))
 
 TSTSRC    := $(wildcard $(TSTDIR)/*.c)
 
-LIB       := br_$(shell uname -m)			    # library name
-LIBS      := $(strip -l$(LIB) -lreadline)
+LIB       := br_$(shell uname -m)                           # library name
+LIBS      := $(strip -l$(LIB))
 
 DEP_FN    := $(SRC_FN)
 DEP       := $(addprefix $(DEPDIR)/,$(DEP_FN:.c=.d))
@@ -52,85 +50,193 @@ TARGET    := $(addprefix $(BINDIR)/,$(TARGET_FN))
 ASMFILES  := $(SRC:.c=.s) $(TSTSRC:.c=.s)
 CPPFILES  := $(SRC:.c=.i) $(TSTSRC:.c=.i)
 
+##################################### Check for compiler and requested build
+BUILDS    := release dev perf debug
+# last compilation build
+BUILDFILE := .lastbuild
+lastbuild := $(file < $(BUILDFILE))
+
+# default to gcc
+CC        ?= cc
+ifeq ($(CC),cc)
+        CC = gcc
+endif
+
+# if no build specified, use last one
+ifeq ($(build),)
+        build := $(lastbuild)
+endif
+# if build is still undefined, set a default
+ifeq ($(build),)
+        build := release
+endif
+
+# check for valid build
+ifeq ($(filter $(build),$(BUILDS)),)
+        $(error Error: Unknown build=`$(build)`. Possible builds are: $(BUILDS))
+endif
+
+# if new build, rewrite BUILDFILE
+ifeq ($(build),$(lastbuild))
+        $(info Using last used build:`$(build)`.)
+else
+        $(info Using new build:`$(build)` (previous:$(lastbuild)))
+        $(file >$(BUILDFILE),$(build))
+endif
+
+##################################### 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-$(build)-$(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
+CPPFLAGS  += -DDIAGRAM_SYM                                  # UTF8 symbols in diagrams
 
-CPPFLAGS  += -DBUG_ON                                       # brlib bug.h
-CPPFLAGS  += -DWARN_ON                                      # brlib bug.h
+ifeq ($(build),release)
+        CPPFLAGS  += -DNDEBUG                               # assert (unused)
+else # ifeq ($(build),dev)
+        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
+        #        eval.c eval-simple.c
+        CPPFLAGS  += -DDEBUG_EVAL                           # eval
 
-# fen.c
-#CPPFLAGS  += -DDEBUG_FEN                                    # FEN decoding
-
-# attack.c
-#CPPFLAGS  += -DDEBUG_ATTACK_ATTACKERS1			     # sq_attackers details
-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  += -DDIAGRAM_SYM                                  # diagram with symbols
+        #        old unused flags
+        #CPPFLAGS  += -DDEBUG_POS                           # position.c
+        #CPPFLAGS  += -DDEBUG_MOVE                          # move generation
+endif
 
 # remove extraneous spaces (due to spaces before comments)
 CPPFLAGS  := $(strip $(CPPFLAGS))
 
-##################################### compiler flags
+##################################### compiler / linker flags
 CFLAGS    := -std=gnu11
 
-### dev OR release
-# dev
-CFLAGS    += -O1
-#CFLAGS    += -g
-# release
-#CFLAGS    += -Ofast
-
+CFLAGS    += -Wall -Wextra -Wshadow -Wmissing-declarations
 CFLAGS    += -march=native
-CFLAGS    += -flto
-CFLAGS    += -Wall
-CFLAGS    += -Wextra
-CFLAGS    += -Wmissing-declarations
-# for gprof
-CFLAGS += -pg
-# Next one may be useful for valgrind (when invalid instructions)
-# CFLAGS += -mno-tbm
+
+LDFLAGS   := --static
+LDFLAGS   += -L$(BRLIBDIR)
+
+### dev OR release
+ifeq ($(build),release)
+        CFLAGS    += -O3
+        CFLAGS    += -funroll-loops
+        CFLAGS    += -flto
+        #CFLAGS    += -g
+        #CFLAGS    += -ginline-points                   # inlined funcs debug info
+        LDFLAGS   += -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    += -Og
+        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        # 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 := -O1
-#DEV_CFLAGS += -g
-
-# release CFLAGS - unused - TODO
-#REL_CFLAGS := -Ofast
-
-##################################### linker flags
-LDFLAGS   := -L$(BRLIBDIR)
-LDFLAGS   += -flto
-
 LDFLAGS   := $(strip $(LDFLAGS))
 
-##################################### archiver/dependency flags
-ARFLAGS   := rcs
+##################################### dependency flags
 DEPFLAGS   = -MMD -MP -MF $(DEPDIR)/$*.d
 
 ##################################### archiver/dependency flags
 ALL_CFLAGS  = $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS) $(LIBS)
 
-##################################### General targets
-.PHONY: all compile clean cleanall
+##################################### Multi-targets
+# We can have an issue with Make's "-j" option, in some situations,
+# for example "make -j2 clean testing".
+# See https://stackoverflow.com/a/8496333/3079831
 
-all: $(TARGET)
+# Check if job server supported:
+ifeq ($(filter jobserver, $(.FEATURES)),)
+# Job server not supported: sub-makes will only start one job unless
+# you specify a higher number here.  Here we use a MS Windows environment
+# variable specifying number of processors.
+JOBSARG := -j $(NUMBER_OF_PROCESSORS)
+else
+# Job server is supported; let GNU Make work as normal.
+JOBSARG :=
+endif
+
+# .FEATURES only works in GNU Make 3.81+.
+# If GNU make is older, assume job server support.
+ifneq ($(firstword $(sort 3.81 $(MAKE_VERSION))),3.81)
+# If you are using GNU Make < 3.81 that does not support job servers, you
+# might want to specify -jN parameter here instead.
+JOBSARG :=
+endif
+
+ifneq ($(words $(MAKECMDGOALS)),1)
+.NOTPARALLEL:
+# The "all" target is required in the list,
+# in case user invokes make with no targets.
+$(sort all $(MAKECMDGOALS)):
+	@$(MAKE) $(JOBSARG) -f $(firstword $(MAKEFILE_LIST)) $@
+else
+
+##################################### General targets
+.PHONY: all release dev perf debug compile libs clean cleanall
+
+all: libs 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
 
@@ -194,7 +300,8 @@ $(ALLDIRS): $@
 
 -include $(wildcard $(DEP))
 
-# Don't use $(DEPDIR)/*.d, to control mismatches between dep and src files.
+# Don't use "rm $(DEPDIR)/*.d", to understand mismatches between dep/ and src/
+# files.
 # See second rule below.
 cleandep:
 	$(call rmfiles,$(DEP),depend)
@@ -218,9 +325,10 @@ cleanobjdir: cleanobj
 
 # The part right of '|' are "order-only prerequisites": They are build as
 # "normal" ones, but do not imply to rebuild target.
-$(OBJDIR)/%.o: $(SRCDIR)/%.c | $(OBJDIR) $(DEPDIR)
+$(OBJDIR)/%.o: $(BUILDFILE)
+$(OBJDIR)/%.o: $(SRCDIR)/%.c $(BUILDFILE) | $(OBJDIR) $(DEPDIR)
 	@echo compiling brchess module: $< "->" $@.
-	@$(CC) -c $(ALL_CFLAGS) $< -o $@
+	$(CC) -c $(ALL_CFLAGS) $< -o $@
 
 ##################################### brlib libraries
 .PHONY: cleanbrlib cleanallbrlib brlib
@@ -231,9 +339,11 @@ cleanbrlib:
 cleanallbrlib:
 	$(MAKE) -C $(BRLIB) cleanall
 
+export build
 brlib:
-	$(MAKE) -C $(BRLIB) libs
-
+	$(info calling with build=$(build))
+	$(MAKE) -e -C $(BRLIB) lib-static
+unexport build
 ##################################### brchess binaries
 .PHONY: targets cleanbin cleanbindir
 
@@ -246,7 +356,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
@@ -256,12 +366,12 @@ cleanasmcpp:
 	@$(call rmfiles,$(ASMFILES) $(CPPFILES),asm and pre-processed)
 
 %.i: %.c
-	@echo generating $@ (cpp processed).
+	@echo "generating $@ (cpp processed)."
 	@$(CC) -E $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 %.s: %.c
-	@echo generating $@ (asm).
-	@$(CC) -S -fverbose-asm $(CPPFLAGS) $(CFLAGS) $< -o $@
+	@echo "generating $@ (asm)."
+	$(CC) -S -fverbose-asm $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 ##################################### LSP (ccls)
 .PHONY: ccls
@@ -279,7 +389,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
@@ -297,19 +407,21 @@ memcheck: targets
 	@$(VALGRIND) $(VALGRINDFLAGS) $(BINDIR)/brchess
 
 ##################################### test binaries
-.PHONY: testing test
+.PHONY: testing
 
 TEST          := piece-test fen-test bitboard-test movegen-test attack-test
-TEST          += movedo-test perft-test
+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
+	hq.o attack.o hash.o init.o util.o alloc.o move.o \
+	eval.o eval-defs.o eval-simple.o hist.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
-PERFT_OBJS    := $(MOVEDO_OBJS) search.o
+PERFT_OBJS    := $(MOVEDO_OBJS) perft.o
+TT_OBJS       := $(MOVEDO_OBJS)
 
 TEST          := $(addprefix $(BINDIR)/,$(TEST))
 
@@ -320,50 +432,52 @@ MOVEGEN_OBJS  := $(addprefix $(OBJDIR)/,$(MOVEGEN_OBJS))
 ATTACK_OBJS   := $(addprefix $(OBJDIR)/,$(ATTACK_OBJS))
 MOVEDO_OBJS   := $(addprefix $(OBJDIR)/,$(MOVEDO_OBJS))
 PERFT_OBJS    := $(addprefix $(OBJDIR)/,$(PERFT_OBJS))
-
-test:
-	echo TEST=$(TEST)
-	echo FEN_OBJS=$(FEN_OBJS)
+TT_OBJS       := $(addprefix $(OBJDIR)/,$(TT_OBJS))
 
 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 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)"
@@ -376,4 +490,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

resources/engine-interface.txt

@@ -0,0 +1,543 @@
+
+
+Description of the universal chess interface (UCI)    April  2006
+=================================================================
+
+* The specification is independent of the operating system. For Windows,
+  the engine is a normal exe file, either a console or "real" windows application.
+
+* all communication is done via standard input and output with text commands,
+
+* The engine should boot and wait for input from the GUI,
+  the engine should wait for the "isready" or "setoption" command to set up its internal parameters
+  as the boot process should be as quick as possible.
+
+* the engine must always be able to process input from stdin, even while thinking.
+
+* all command strings the engine receives will end with '\n',
+  also all commands the GUI receives should end with '\n',
+  Note: '\n' can be 0x0d or 0x0a0d or any combination depending on your OS.
+  If you use Engine and GUI in the same OS this should be no problem if you communicate in text mode,
+  but be aware of this when for example running a Linux engine in a Windows GUI.
+
+* arbitrary white space between tokens is allowed
+  Example: "debug on\n" and  "   debug     on  \n" and "\t  debug \t  \t\ton\t  \n"
+  all set the debug mode of the engine on.
+
+* The engine will always be in forced mode which means it should never start calculating
+  or pondering without receiving a "go" command first.
+
+* Before the engine is asked to search on a position, there will always be a position command
+  to tell the engine about the current position.
+
+* by default all the opening book handling is done by the GUI,
+  but there is an option for the engine to use its own book ("OwnBook" option, see below)
+
+* if the engine or the GUI receives an unknown command or token it should just ignore it and try to
+  parse the rest of the string in this line.
+  Examples: "joho debug on\n" should switch the debug mode on given that joho is not defined,
+            "debug joho on\n" will be undefined however.
+
+* if the engine receives a command which is not supposed to come, for example "stop" when the engine is
+  not calculating, it should also just ignore it.
+
+
+Move format:
+------------
+
+The move format is in long algebraic notation.
+A nullmove from the Engine to the GUI should be sent as 0000.
+Examples:  e2e4, e7e5, e1g1 (white short castling), e7e8q (for promotion)
+
+
+
+GUI to engine:
+--------------
+
+These are all the command the engine gets from the interface.
+
+* uci
+	tell engine to use the uci (universal chess interface),
+	this will be sent once as a first command after program boot
+	to tell the engine to switch to uci mode.
+	After receiving the uci command the engine must identify itself with the "id" command
+	and send the "option" commands to tell the GUI which engine settings the engine supports if any.
+	After that the engine should send "uciok" to acknowledge the uci mode.
+	If no uciok is sent within a certain time period, the engine task will be killed by the GUI.
+
+* debug [ on | off ]
+	switch the debug mode of the engine on and off.
+	In debug mode the engine should send additional infos to the GUI, e.g. with the "info string" command,
+	to help debugging, e.g. the commands that the engine has received etc.
+	This mode should be switched off by default and this command can be sent
+	any time, also when the engine is thinking.
+
+* isready
+	this is used to synchronize the engine with the GUI. When the GUI has sent a command or
+	multiple commands that can take some time to complete,
+	this command can be used to wait for the engine to be ready again or
+	to ping the engine to find out if it is still alive.
+	E.g. this should be sent after setting the path to the tablebases as this can take some time.
+	This command is also required once before the engine is asked to do any search
+	to wait for the engine to finish initializing.
+	This command must always be answered with "readyok" and can be sent also when the engine is calculating
+	in which case the engine should also immediately answer with "readyok" without stopping the search.
+
+* setoption name <id> [value <x>]
+	this is sent to the engine when the user wants to change the internal parameters
+	of the engine. For the "button" type no value is needed.
+	One string will be sent for each parameter and this will only be sent when the engine is waiting.
+	The name and value of the option in <id> should not be case sensitive and can inlude spaces.
+	The substrings "value" and "name" should be avoided in <id> and <x> to allow unambiguous parsing,
+	for example do not use <name> = "draw value".
+	Here are some strings for the example below:
+	   "setoption name Nullmove value true\n"
+      "setoption name Selectivity value 3\n"
+	   "setoption name Style value Risky\n"
+	   "setoption name Clear Hash\n"
+	   "setoption name NalimovPath value c:\chess\tb\4;c:\chess\tb\5\n"
+
+* register
+	this is the command to try to register an engine or to tell the engine that registration
+	will be done later. This command should always be sent if the engine	has sent "registration error"
+	at program startup.
+	The following tokens are allowed:
+	* later
+	   the user doesn't want to register the engine now.
+	* name <x>
+	   the engine should be registered with the name <x>
+	* code <y>
+	   the engine should be registered with the code <y>
+	Example:
+	   "register later"
+	   "register name Stefan MK code 4359874324"
+
+* ucinewgame
+   this is sent to the engine when the next search (started with "position" and "go") will be from
+   a different game. This can be a new game the engine should play or a new game it should analyse but
+   also the next position from a testsuite with positions only.
+   If the GUI hasn't sent a "ucinewgame" before the first "position" command, the engine shouldn't
+   expect any further ucinewgame commands as the GUI is probably not supporting the ucinewgame command.
+   So the engine should not rely on this command even though all new GUIs should support it.
+   As the engine's reaction to "ucinewgame" can take some time the GUI should always send "isready"
+   after "ucinewgame" to wait for the engine to finish its operation.
+
+* position [fen <fenstring> | startpos ]  moves <move1> .... <movei>
+	set up the position described in fenstring on the internal board and
+	play the moves on the internal chess board.
+	if the game was played  from the start position the string "startpos" will be sent
+	Note: no "new" command is needed. However, if this position is from a different game than
+	the last position sent to the engine, the GUI should have sent a "ucinewgame" inbetween.
+
+* go
+	start calculating on the current position set up with the "position" command.
+	There are a number of commands that can follow this command, all will be sent in the same string.
+	If one command is not sent its value should be interpreted as it would not influence the search.
+	* searchmoves <move1> .... <movei>
+		restrict search to this moves only
+		Example: After "position startpos" and "go infinite searchmoves e2e4 d2d4"
+		the engine should only search the two moves e2e4 and d2d4 in the initial position.
+	* ponder
+		start searching in pondering mode.
+		Do not exit the search in ponder mode, even if it's mate!
+		This means that the last move sent in in the position string is the ponder move.
+		The engine can do what it wants to do, but after a "ponderhit" command
+		it should execute the suggested move to ponder on. This means that the ponder move sent by
+		the GUI can be interpreted as a recommendation about which move to ponder. However, if the
+		engine decides to ponder on a different move, it should not display any mainlines as they are
+		likely to be misinterpreted by the GUI because the GUI expects the engine to ponder
+	   on the suggested move.
+	* wtime <x>
+		white has x msec left on the clock
+	* btime <x>
+		black has x msec left on the clock
+	* winc <x>
+		white increment per move in mseconds if x > 0
+	* binc <x>
+		black increment per move in mseconds if x > 0
+	* movestogo <x>
+      there are x moves to the next time control,
+		this will only be sent if x > 0,
+		if you don't get this and get the wtime and btime it's sudden death
+	* depth <x>
+		search x plies only.
+	* nodes <x>
+	   search x nodes only,
+	* mate <x>
+		search for a mate in x moves
+	* movetime <x>
+		search exactly x mseconds
+	* infinite
+		search until the "stop" command. Do not exit the search without being told so in this mode!
+
+* stop
+	stop calculating as soon as possible,
+	don't forget the "bestmove" and possibly the "ponder" token when finishing the search
+
+* ponderhit
+	the user has played the expected move. This will be sent if the engine was told to ponder on the same move
+	the user has played. The engine should continue searching but switch from pondering to normal search.
+
+* quit
+	quit the program as soon as possible
+
+
+Engine to GUI:
+--------------
+
+* id
+	* name <x>
+		this must be sent after receiving the "uci" command to identify the engine,
+		e.g. "id name Shredder X.Y\n"
+	* author <x>
+		this must be sent after receiving the "uci" command to identify the engine,
+		e.g. "id author Stefan MK\n"
+
+* uciok
+	Must be sent after the id and optional options to tell the GUI that the engine
+	has sent all infos and is ready in uci mode.
+
+* readyok
+	This must be sent when the engine has received an "isready" command and has
+	processed all input and is ready to accept new commands now.
+	It is usually sent after a command that can take some time to be able to wait for the engine,
+	but it can be used anytime, even when the engine is searching,
+	and must always be answered with "isready".
+
+* bestmove <move1> [ ponder <move2> ]
+	the engine has stopped searching and found the move <move> best in this position.
+	the engine can send the move it likes to ponder on. The engine must not start pondering automatically.
+	this command must always be sent if the engine stops searching, also in pondering mode if there is a
+	"stop" command, so for every "go" command a "bestmove" command is needed!
+	Directly before that the engine should send a final "info" command with the final search information,
+	the the GUI has the complete statistics about the last search.
+
+* copyprotection
+	this is needed for copyprotected engines. After the uciok command the engine can tell the GUI,
+	that it will check the copy protection now. This is done by "copyprotection checking".
+	If the check is ok the engine should send "copyprotection ok", otherwise "copyprotection error".
+	If there is an error the engine should not function properly but should not quit alone.
+	If the engine reports "copyprotection error" the GUI should not use this engine
+	and display an error message instead!
+	The code in the engine can look like this
+      TellGUI("copyprotection checking\n");
+	   // ... check the copy protection here ...
+	   if(ok)
+	      TellGUI("copyprotection ok\n");
+      else
+         TellGUI("copyprotection error\n");
+
+* registration
+	this is needed for engines that need a username and/or a code to function with all features.
+	Analog to the "copyprotection" command the engine can send "registration checking"
+	after the uciok command followed by either "registration ok" or "registration error".
+	Also after every attempt to register the engine it should answer with "registration checking"
+	and then either "registration ok" or "registration error".
+	In contrast to the "copyprotection" command, the GUI can use the engine after the engine has
+	reported an error, but should inform the user that the engine is not properly registered
+	and might not use all its features.
+	In addition the GUI should offer to open a dialog to
+	enable registration of the engine. To try to register an engine the GUI can send
+	the "register" command.
+	The GUI has to always answer with the "register" command	if the engine sends "registration error"
+	at engine startup (this can also be done with "register later")
+	and tell the user somehow that the engine is not registered.
+	This way the engine knows that the GUI can deal with the registration procedure and the user
+	will be informed that the engine is not properly registered.
+
+* info
+	the engine wants to send information to the GUI. This should be done whenever one of the info has changed.
+	The engine can send only selected infos or multiple infos with one info command,
+	e.g. "info currmove e2e4 currmovenumber 1" or
+	     "info depth 12 nodes 123456 nps 100000".
+	Also all infos belonging to the pv should be sent together
+	e.g. "info depth 2 score cp 214 time 1242 nodes 2124 nps 34928 pv e2e4 e7e5 g1f3"
+	I suggest to start sending "currmove", "currmovenumber", "currline" and "refutation" only after one second
+	to avoid too much traffic.
+	Additional info:
+	* depth <x>
+		search depth in plies
+	* seldepth <x>
+		selective search depth in plies,
+		if the engine sends seldepth there must also be a "depth" present in the same string.
+	* time <x>
+		the time searched in ms, this should be sent together with the pv.
+	* nodes <x>
+		x nodes searched, the engine should send this info regularly
+	* pv <move1> ... <movei>
+		the best line found
+	* multipv <num>
+		this for the multi pv mode.
+		for the best move/pv add "multipv 1" in the string when you send the pv.
+		in k-best mode always send all k variants in k strings together.
+	* score
+		* cp <x>
+			the score from the engine's point of view in centipawns.
+		* mate <y>
+			mate in y moves, not plies.
+			If the engine is getting mated use negative values for y.
+		* lowerbound
+	      the score is just a lower bound.
+		* upperbound
+		   the score is just an upper bound.
+	* currmove <move>
+		currently searching this move
+	* currmovenumber <x>
+		currently searching move number x, for the first move x should be 1 not 0.
+	* hashfull <x>
+		the hash is x permill full, the engine should send this info regularly
+	* nps <x>
+		x nodes per second searched, the engine should send this info regularly
+	* tbhits <x>
+		x positions where found in the endgame table bases
+	* sbhits <x>
+		x positions where found in the shredder endgame databases
+	* cpuload <x>
+		the cpu usage of the engine is x permill.
+	* string <str>
+		any string str which will be displayed be the engine,
+		if there is a string command the rest of the line will be interpreted as <str>.
+	* refutation <move1> <move2> ... <movei>
+	   move <move1> is refuted by the line <move2> ... <movei>, i can be any number >= 1.
+	   Example: after move d1h5 is searched, the engine can send
+	   "info refutation d1h5 g6h5"
+	   if g6h5 is the best answer after d1h5 or if g6h5 refutes the move d1h5.
+	   if there is no refutation for d1h5 found, the engine should just send
+	   "info refutation d1h5"
+		The engine should only send this if the option "UCI_ShowRefutations" is set to true.
+	* currline <cpunr> <move1> ... <movei>
+	   this is the current line the engine is calculating. <cpunr> is the number of the cpu if
+	   the engine is running on more than one cpu. <cpunr> = 1,2,3....
+	   if the engine is just using one cpu, <cpunr> can be omitted.
+	   If <cpunr> is greater than 1, always send all k lines in k strings together.
+		The engine should only send this if the option "UCI_ShowCurrLine" is set to true.
+
+
+* option
+	This command tells the GUI which parameters can be changed in the engine.
+	This should be sent once at engine startup after the "uci" and the "id" commands
+	if any parameter can be changed in the engine.
+	The GUI should parse this and build a dialog for the user to change the settings.
+	Note that not every option needs to appear in this dialog as some options like
+	"Ponder", "UCI_AnalyseMode", etc. are better handled elsewhere or are set automatically.
+	If the user wants to change some settings, the GUI will send a "setoption" command to the engine.
+	Note that the GUI need not send the setoption command when starting the engine for every option if
+	it doesn't want to change the default value.
+	For all allowed combinations see the examples below,
+	as some combinations of this tokens don't make sense.
+	One string will be sent for each parameter.
+	* name <id>
+		The option has the name id.
+		Certain options have a fixed value for <id>, which means that the semantics of this option is fixed.
+		Usually those options should not be displayed in the normal engine options window of the GUI but
+		get a special treatment. "Pondering" for example should be set automatically when pondering is
+		enabled or disabled in the GUI options. The same for "UCI_AnalyseMode" which should also be set
+		automatically by the GUI. All those certain options have the prefix "UCI_" except for the
+		first 6 options below. If the GUI gets an unknown Option with the prefix "UCI_", it should just
+		ignore it and not display it in the engine's options dialog.
+		* <id> = Hash, type is spin
+			the value in MB for memory for hash tables can be changed,
+			this should be answered with the first "setoptions" command at program boot
+			if the engine has sent the appropriate "option name Hash" command,
+			which should be supported by all engines!
+			So the engine should use a very small hash first as default.
+		* <id> = NalimovPath, type string
+			this is the path on the hard disk to the Nalimov compressed format.
+			Multiple directories can be concatenated with ";"
+		* <id> = NalimovCache, type spin
+			this is the size in MB for the cache for the nalimov table bases
+			These last two options should also be present in the initial options exchange dialog
+			when the engine is booted if the engine supports it
+		* <id> = Ponder, type check
+			this means that the engine is able to ponder.
+			The GUI will send this whenever pondering is possible or not.
+			Note: The engine should not start pondering on its own if this is enabled, this option is only
+			needed because the engine might change its time management algorithm when pondering is allowed.
+		* <id> = OwnBook, type check
+			this means that the engine has its own book which is accessed by the engine itself.
+			if this is set, the engine takes care of the opening book and the GUI will never
+			execute a move out of its book for the engine. If this is set to false by the GUI,
+			the engine should not access its own book.
+		* <id> = MultiPV, type spin
+			the engine supports multi best line or k-best mode. the default value is 1
+		* <id> = UCI_ShowCurrLine, type check, should be false by default,
+			the engine can show the current line it is calculating. see "info currline" above.
+		* <id> = UCI_ShowRefutations, type check, should be false by default,
+			the engine can show a move and its refutation in a line. see "info refutations" above.
+		* <id> = UCI_LimitStrength, type check, should be false by default,
+			The engine is able to limit its strength to a specific Elo number,
+		   This should always be implemented together with "UCI_Elo".
+		* <id> = UCI_Elo, type spin
+			The engine can limit its strength in Elo within this interval.
+			If UCI_LimitStrength is set to false, this value should be ignored.
+			If UCI_LimitStrength is set to true, the engine should play with this specific strength.
+		   This should always be implemented together with "UCI_LimitStrength".
+		* <id> = UCI_AnalyseMode, type check
+		   The engine wants to behave differently when analysing or playing a game.
+		   For example when playing it can use some kind of learning.
+		   This is set to false if the engine is playing a game, otherwise it is true.
+		 * <id> = UCI_Opponent, type string
+		   With this command the GUI can send the name, title, elo and if the engine is playing a human
+		   or computer to the engine.
+		   The format of the string has to be [GM|IM|FM|WGM|WIM|none] [<elo>|none] [computer|human] <name>
+		   Examples:
+		   "setoption name UCI_Opponent value GM 2800 human Gary Kasparov"
+		   "setoption name UCI_Opponent value none none computer Shredder"
+		 * <id> = UCI_EngineAbout, type string
+		   With this command, the engine tells the GUI information about itself, for example a license text,
+		   usually it doesn't make sense that the GUI changes this text with the setoption command.
+		   Example:
+			"option name UCI_EngineAbout type string default Shredder by Stefan Meyer-Kahlen, see www.shredderchess.com"
+		* <id> = UCI_ShredderbasesPath, type string
+			this is either the path to the folder on the hard disk containing the Shredder endgame databases or
+			the path and filename of one Shredder endgame datbase.
+	   * <id> = UCI_SetPositionValue, type string
+	      the GUI can send this to the engine to tell the engine to use a certain value in centipawns from white's
+	      point of view if evaluating this specifix position.
+	      The string can have the formats:
+	      <value> + <fen> | clear + <fen> | clearall
+
+	* type <t>
+		The option has type t.
+		There are 5 different types of options the engine can send
+		* check
+			a checkbox that can either be true or false
+		* spin
+			a spin wheel that can be an integer in a certain range
+		* combo
+			a combo box that can have different predefined strings as a value
+		* button
+			a button that can be pressed to send a command to the engine
+		* string
+			a text field that has a string as a value,
+			an empty string has the value "<empty>"
+	* default <x>
+		the default value of this parameter is x
+	* min <x>
+		the minimum value of this parameter is x
+	* max <x>
+		the maximum value of this parameter is x
+	* var <x>
+		a predefined value of this parameter is x
+	Examples:
+    Here are 5 strings for each of the 5 possible types of options
+	   "option name Nullmove type check default true\n"
+      "option name Selectivity type spin default 2 min 0 max 4\n"
+	   "option name Style type combo default Normal var Solid var Normal var Risky\n"
+	   "option name NalimovPath type string default c:\\n"
+	   "option name Clear Hash type button\n"
+
+
+
+Examples:
+---------
+
+This is how the communication when the engine boots can look like:
+
+GUI     engine
+
+// tell the engine to switch to UCI mode
+uci
+
+// engine identify
+      id name Shredder
+		id author Stefan MK
+
+// engine sends the options it can change
+// the engine can change the hash size from 1 to 128 MB
+		option name Hash type spin default 1 min 1 max 128
+
+// the engine supports Nalimov endgame tablebases
+		option name NalimovPath type string default <empty>
+		option name NalimovCache type spin default 1 min 1 max 32
+
+// the engine can switch off Nullmove and set the playing style
+	   option name Nullmove type check default true
+  		option name Style type combo default Normal var Solid var Normal var Risky
+
+// the engine has sent all parameters and is ready
+		uciok
+
+// Note: here the GUI can already send a "quit" command if it just wants to find out
+//       details about the engine, so the engine should not initialize its internal
+//       parameters before here.
+// now the GUI sets some values in the engine
+// set hash to 32 MB
+setoption name Hash value 32
+
+// init tbs
+setoption name NalimovCache value 1
+setoption name NalimovPath value d:\tb;c\tb
+
+// waiting for the engine to finish initializing
+// this command and the answer is required here!
+isready
+
+// engine has finished setting up the internal values
+		readyok
+
+// now we are ready to go
+
+// if the GUI is supporting it, tell the engine that is is
+// searching on a game that it hasn't searched on before
+ucinewgame
+
+// if the engine supports the "UCI_AnalyseMode" option and the next search is supposed to
+// be an analysis, the GUI should set "UCI_AnalyseMode" to true if it is currently
+// set to false with this engine
+setoption name UCI_AnalyseMode value true
+
+// tell the engine to search infinite from the start position after 1.e4 e5
+position startpos moves e2e4 e7e5
+go infinite
+
+// the engine starts sending infos about the search to the GUI
+// (only some examples are given)
+
+
+		info depth 1 seldepth 0
+		info score cp 13  depth 1 nodes 13 time 15 pv f1b5
+		info depth 2 seldepth 2
+		info nps 15937
+		info score cp 14  depth 2 nodes 255 time 15 pv f1c4 f8c5
+		info depth 2 seldepth 7 nodes 255
+		info depth 3 seldepth 7
+		info nps 26437
+		info score cp 20  depth 3 nodes 423 time 15 pv f1c4 g8f6 b1c3
+		info nps 41562
+		....
+
+
+// here the user has seen enough and asks to stop the searching
+stop
+
+// the engine has finished searching and is sending the bestmove command
+// which is needed for every "go" command sent to tell the GUI
+// that the engine is ready again
+		bestmove g1f3 ponder d8f6
+
+
+
+Chess960
+========
+
+UCI could easily be extended to support Chess960 (also known as Fischer Random Chess).
+
+The engine has to tell the GUI that it is capable of playing Chess960 and the GUI has to tell
+the engine that is should play according to the Chess960 rules.
+This is done by the special engine option UCI_Chess960. If the engine knows about Chess960
+it should send the command 'option name UCI_Chess960 type check default false'
+to the GUI at program startup.
+Whenever a Chess960 game is played, the GUI should set this engine option to 'true'.
+
+Castling is different in Chess960 and the white king move when castling short is not always e1g1.
+A king move could both be the castling king move or just a normal king move.
+This is why castling moves are sent in the form king "takes" his own rook.
+Example: e1h1 for the white short castle move in the normal chess start position.
+
+In EPD and FEN position strings specifying the castle rights with w and q is not enough as
+there could be more than one rook on the right or left side of the king.
+This is why the castle rights are specified with the letter of the castle rook's line.
+Upper case letters for white's and lower case letters for black's castling rights.
+Example: The normal chess position would be:
+rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w AHah -

scripts/fetch-all.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+#
+# Fetch all branches from remotes, and track missing ones.
+#
+# The value of variable ORIGIN is used for repository origin. If
+# not set, the default is "origin".
+
+default_origin=origin
+
+origin=${ORIGIN:-$default_origin}
+
+declare -a local_b
+declare -A alocal_b
+
+# fetch all remotes
+git fetch --all --tags
+
+# get local branches, and build reverse associative array
+readarray -t local_b < <(git for-each-ref --format='%(refname:short)' refs/heads/)
+for ref in "${local_b[@]}"; do
+    alocal_b[$ref]=1
+done
+
+# get "origin" branches
+readarray -t orig_b  < <(git for-each-ref --format='%(refname:short)' \
+                             refs/remotes/"$origin"/)
+
+# find-out missing local branches and track them.
+# bugs:
+#  - We only check local branch existence, not tracking information correctness.
+#  - What about sub-branches ? Like remote/a and remote/a/b not being tracked ?
+for remote_b in "${orig_b[@]}"; do
+    short=${remote_b#"$origin"/};
+    # OR (??): short=${remote_b##*/}
+
+    if ! [[ -v alocal_b[$short] ]]; then
+        printf "local branch %s set to track %s.\n" "$short" "$remote_b"
+        git branch --track "$short" "$remote_b"
+    else
+        printf "skipping %s.\n" "$remote_b"
+    fi
+done
+
+git pull -a

scripts/git-split.sh

@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+#
+# git-split.sh - duplicate GIT file, with history (well, sort of)
+# Sources:
+#   https://stackoverflow.com/a/53849613/3079831
+#   https://stackoverflow.com/a/75942970/3079831
+#
+# (C) Bruno Raoult ("br"), 2024
+# 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>
+
+CMDNAME=${0##*/}                                  # script name
+
+if (( $# == 0 || $# % 2 )); then
+   printf "Usage: %s orig1 copy [orig2 copy2 ...]\n" "$CMDNAME"
+   exit 1
+fi
+
+yes_or_no() {
+    while true; do
+        read -rp "$* [y/N]: " yn
+        case $yn in
+            [Yy])
+                return 0
+                ;;
+            [Nn]|"")
+                printf "Aborted.\n"
+                return  1
+                ;;
+        esac
+    done
+    # not reached
+}
+
+# prints out and run a command.
+echorun () {
+    printf ">>> %s\n" "$*"
+    "$@"
+    return $?
+}
+
+declare -A files
+declare -a from                                   # to keep order
+
+while (($#)); do
+    if [[ ! -f "$1" ]]; then
+        printf "Missing '%s'. Aborting.\n" "$1"
+        exit 1
+    elif [[ -f "$2" ]]; then
+        printf "'%s' already exists. Aborting.\n" "$2"
+        exit 1
+    fi
+    files["$1"]="$2"
+    from+=("$1")
+    shift 2
+done
+
+printf "The following files will be split :\n"
+
+for file in "${from[@]}"; do
+    printf "%s -> %s\n" "$file" "${files[$file]}"
+done
+
+yes_or_no "Proceed (y/N)? " || exit 1
+
+branch="split-file"
+
+printf -v msg1 "Splitting '%s'" "${from[0]}"
+printf -v msg2 "Restore duplicated %s" "${from[0]}"
+if (( ${#from[@]} > 1 )); then
+    msg1+=" and $(( ${#from[@]} - 1 )) others"
+    msg2+=" and $(( ${#from[@]} - 1 )) others"
+
+fi
+printf "%s using  branch '$branch'.\n" "$msg1"
+
+if git show-ref --verify --quiet "refs/heads/$branch"; then
+    echorun git switch "$branch"
+    echorun git merge master
+else
+    echorun git switch -c "$branch"
+fi
+
+for file in "${from[@]}"; do                      # make the duplicates
+    echorun git mv "$file" "${files[$file]}"
+done
+echorun git commit -m "$msg1"                     # ... and commit
+
+for file in "${from[@]}"; do                      # bring back the original
+    echorun git checkout HEAD~ "$file"
+done
+echorun git commit -m "$msg2"                     # ... and commit
+
+echorun git checkout -                                 # switch back to source branch
+echorun git merge --no-ff "$branch" -m "Merge $branch" # merge dup into source branch
+
+exit 0

src/alloc.c

@@ -0,0 +1,174 @@
+/* alloc.c - various memory allocation helpers
+ *
+ * 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 <sys/mman.h>
+
+#include <brlib.h>
+#include <bitops.h>
+#include <bug.h>
+
+#include "chessdefs.h"
+#include "alloc.h"
+
+/* values for linux
+ * PAGE_SIZE can be obtained with getpagesize(2), but unfortunately nothing for
+ * HUGE_PAGE_SIZE (except looking in /proc/meminfo or such).
+ */
+#define PAGE_SIZE       (4 * 1024)                /* 4 Kb */
+#define HUGE_PAGE_SIZE  (2 * 1024 * 1024)         /* 2 Mb */
+
+/**
+ * alloc() - allocate memory.
+ * @size:  size to allocate
+ *
+ * Allocate memory on the heap.
+ *
+ * @return: memory address if success, NULL otherwise.
+ */
+void *alloc(size_t size)
+{
+    return malloc(size);
+}
+
+/**
+ * alloc_aligned() - allocate aligned memory.
+ * @align: alignment, in bytes
+ * @size:  size to allocate
+ *
+ * Allocate aligned memory on the heap. @align must be a power of 2 and
+ * a multiple of sizeof(void *). See aligned_alloc(3) for details.
+ *
+ * @return: memory address if success, NULL otherwise.
+ */
+void *alloc_aligned(size_t align, size_t size)
+{
+    bug_on(!size || !align ||
+           align & (align - 1) || align % sizeof (void *));
+    return aligned_alloc(align, size);
+}
+
+/**
+ * alloc_page_aligned() - allocate page-aligned memory.
+ * @size:  size to allocate
+ *
+ * Allocate page-aligned memory on the heap.
+ *
+ * @return: memory address if success, NULL otherwise.
+ */
+void *alloc_aligned_page(size_t size)
+{
+    /* round size (up) to alignment */
+    //size_t rounded = (size + PAGE_SIZE - 1) & -PAGE_SIZE;
+    void *mem = alloc_aligned(PAGE_SIZE, size);
+    return mem;
+}
+
+/**
+ * alloc_huge_page_aligned() - allocate huge-page-aligned memory.
+ * @size:  size to allocate
+ *
+ * Allocate page-aligned memory on the heap.
+ *
+ * @return: memory address if success, NULL otherwise.
+ */
+void *alloc_aligned_hugepage(size_t size)
+{
+    /* round size (up) to alignment */
+    size_t rounded = (size + PAGE_SIZE - 1) & -PAGE_SIZE;
+    void *mem = alloc_aligned(PAGE_SIZE, rounded);
+    //printf("size=%zu rounded=%zu\n", size, rounded);
+    //void *mem = aligned_alloc(HUGE_PAGE_SIZE, size);
+    if (mem) {
+        if (madvise(mem, rounded, MADV_HUGEPAGE | MADV_RANDOM))
+            perror("madvise");
+    }
+
+    return mem;
+}
+
+/**
+ * safe_alloc() - allocate memory or fail.
+ * @size:  size to allocate
+ *
+ * Allocate memory on the heap. This function does not return if allocation
+ * fails.
+ *
+ * @return: memory address (if success only).
+ */
+void *safe_alloc(size_t size)
+{
+    void *mem = malloc(size);
+    bug_on_always(mem == NULL);
+    return mem;
+}
+
+/**
+ * safe_alloc_aligned() - allocate aligned memory or fail.
+ * @align: alignment.
+ * @size:  size to allocate
+ *
+ * Allocate aligned memory on the heap.
+ * This function does not return if allocation fails. See alloc_aligned()
+ * for more details.
+ *
+ * @return: memory address (if success only).
+ */
+void *safe_alloc_aligned(size_t align, size_t size)
+{
+    void *mem = alloc_aligned(align, size);
+    bug_on_always(mem == NULL);
+    return mem;
+}
+
+/**
+ * safe_alloc_aligned_page() - allocate page-aligned memory or fail.
+ * @size:  size to allocate
+ *
+ * Allocate memory on the heap. This function does not return if allocation
+ * fails. See alloc_aligned() for more details.
+ *
+ * @return: memory address (if success only).
+ */
+void *safe_alloc_aligned_page(size_t size)
+{
+    void *mem = alloc_aligned_page(size);
+    bug_on_always(mem == NULL);
+    return mem;
+}
+
+/**
+ * safe_alloc_aligned_hugepage() - allocate huge page aligned memory or fail.
+ * @size:  size to allocate
+ *
+ * Allocate memory on the heap. This function does not return if allocation
+ * fails. See alloc_aligned() for more details.
+ *
+ * @return: memory address (if success only).
+ */
+void *safe_alloc_aligned_hugepage(size_t size)
+{
+    /* round size (up) to alignment */
+    //size_t rounded = (size + HUGE_PAGE_SIZE - 1) & -HUGE_PAGE_SIZE;
+    //void *mem = aligned_alloc(rounded, HUGE_PAGE_SIZE);
+    void *mem = alloc_aligned_hugepage(size);
+    bug_on_always(mem == NULL);
+    return mem;
+}
+
+void safe_free(void *ptr)
+{
+    bug_on_always(ptr == NULL);
+    free(ptr);
+}

src/alloc.h

@@ -0,0 +1,30 @@
+/* alloc.h - various memory allocation helpers
+ *
+ * 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 _ALLOC_H
+#define _ALLOC_H
+
+#include "chessdefs.h"
+
+void *alloc(size_t size);
+void *alloc_aligned(size_t align, size_t size);
+void *alloc_aligned_page(size_t size);
+void *alloc_aligned_hugepage(size_t size);
+
+void *safe_alloc(size_t size);
+void *safe_alloc_aligned(size_t align, size_t size);
+void *safe_alloc_aligned_page(size_t size);
+void *safe_alloc_aligned_hugepage(size_t size);
+void safe_free(void *ptr);
+
+#endif /* _ALLOC_H */

src/attack.c

@@ -17,7 +17,7 @@
 #include "chessdefs.h"
 #include "bitboard.h"
 #include "position.h"
-#include "hyperbola-quintessence.h"
+#include "hq.h"
 #include "attack.h"
 
 
@@ -40,28 +40,33 @@
  */
 bool sq_is_attacked(const pos_t *pos, const bitboard_t occ, const square_t sq, const color_t c)
 {
-    bitboard_t sqbb = mask(sq);
     color_t opp = OPPONENT(c);
 
-
-    //pos_print_raw(pos, 1);
+    /*
+     * return (hyperbola_bishop_moves(occ, sq) & (pos->bb[c][BISHOP] | pos->bb[c][QUEEN])
+     *      || hyperbola_rook_moves(occ, sq) & (pos->bb[c][ROOK] | pos->bb[c][QUEEN])
+     *      || bb_pawn_attacks[opp][sq] & pos->bb[c][PAWN]
+     *      || bb_knight_moves(pos->bb[c][KNIGHT], sq)
+     *      || bb_king_moves(pos->bb[c][KING], sq)
+     *  )
+     */
 
     /* bishop / queen */
-    if (hyperbola_bishop_moves(occ, sq) & (pos->bb[c][BISHOP] | pos->bb[c][QUEEN]))
+    if (hq_bishop_moves(occ, sq) & (pos->bb[c][BISHOP] | pos->bb[c][QUEEN]))
         return true;
 
     /* rook / queen */
-    if (hyperbola_rook_moves(occ, sq) & (pos->bb[c][ROOK] | pos->bb[c][QUEEN]))
-        return true;
-
-    /* pawn */
-    if ((pawn_shift_upleft(sqbb, opp) | pawn_shift_upright(sqbb, opp)) & pos->bb[c][PAWN])
+    if (hq_rook_moves(occ, sq) & (pos->bb[c][ROOK] | pos->bb[c][QUEEN]))
         return true;
 
     /* knight */
     if (bb_knight_moves(pos->bb[c][KNIGHT], sq))
         return true;
 
+    /* pawn */
+    if (bb_pawn_attacks[opp][sq] & pos->bb[c][PAWN])
+        return true;
+
     /* king */
     if (bb_king_moves(pos->bb[c][KING], sq))
         return true;
@@ -104,54 +109,47 @@ bool is_in_check(const pos_t *pos, const color_t color)
 bitboard_t sq_attackers(const pos_t *pos, const bitboard_t occ, const square_t sq, const color_t c)
 {
     bitboard_t attackers = 0, tmp;
-    bitboard_t sqbb = mask(sq);
-    //bitboard_t occ = pos_occ(pos);
+    bitboard_t sqbb = BIT(sq);
     bitboard_t to;
     color_t opp = OPPONENT(c);
 
     /* pawn */
     to =  pos->bb[c][PAWN];
-    tmp = pawn_shift_upleft(sqbb, opp) & to;
+    tmp = bb_pawns_attacks(sqbb, sq_up(opp)) & to;
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
-    bb_print("att pawn upleft", tmp);
-#   endif
-    tmp = pawn_shift_upright(sqbb, opp) & to;
-    attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
-    bb_print("att pawn upright", tmp);
+#   ifdef DEBUG_ATTACK_ATTACKERS
+    bb_print("att pawn", tmp);
 #   endif
 
     /* knight & king */
     to = pos->bb[c][KNIGHT];
     tmp = bb_knight_moves(to, sq);
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
+#   ifdef DEBUG_ATTACK_ATTACKERS
     bb_print("att knight", tmp);
 #   endif
     to = pos->bb[c][KING];
     tmp = bb_king_moves(to, sq);
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
+#   ifdef DEBUG_ATTACK_ATTACKERS
     bb_print("att king", tmp);
 #   endif
 
     /* bishop / queen */
     to = pos->bb[c][BISHOP] | pos->bb[c][QUEEN];
-    tmp = hyperbola_bishop_moves(occ, sq) & to;
+    tmp = hq_bishop_moves(occ, sq) & to;
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
+#   ifdef DEBUG_ATTACK_ATTACKERS
     bb_print("att bishop/queen", tmp);
 #   endif
 
     /* rook / queen */
     to = pos->bb[c][ROOK] | pos->bb[c][QUEEN];
-    tmp = hyperbola_rook_moves(occ, sq) & to;
+    tmp = hq_rook_moves(occ, sq) & to;
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
+#   ifdef DEBUG_ATTACK_ATTACKERS
     bb_print("att rook/queen", tmp);
     bb_print("ATTACKERS", attackers);
-    printf("attackers=%lx\n", attackers);
 #   endif
 
     return attackers;
@@ -182,7 +180,7 @@ bitboard_t sq_pinners(const pos_t *pos, const square_t sq, const color_t color)
         bitboard_t between = bb_between_excl[maybe_pinner][sq];
         /* keep only squares between AND on sq diag/anti */
         if (popcount64(between & lines) == 1)
-            pinners |= mask(maybe_pinner);
+            pinners |= BIT(maybe_pinner);
     }
 
     /* same for rook type */
@@ -191,7 +189,7 @@ bitboard_t sq_pinners(const pos_t *pos, const square_t sq, const color_t color)
     bit_for_each64(maybe_pinner, tmp, attackers) {
         bitboard_t between = bb_between_excl[maybe_pinner][sq];
         if (popcount64(between & lines) == 1)
-            pinners |= mask(maybe_pinner);
+            pinners |= BIT(maybe_pinner);
     }
 #   ifdef DEBUG_ATTACK_ATTACKERS1
     char str[32];

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"
@@ -27,10 +27,10 @@ bitboard_t bb_between_excl[64][64];
 bitboard_t bb_between[64][64];
 bitboard_t bb_line[64][64];
 
-bitboard_t bb_knight[64], bb_king[64];
+bitboard_t bb_knight[64], bb_king[64], bb_pawn_attacks[2][64];
 
 /*  vectors are clockwise from N */
-static int knight_vector[] = {
+static int knight_vector[8] = {
     NORTH_EAST + NORTH, NORTH_EAST + EAST,
     SOUTH_EAST + EAST,  SOUTH_EAST + SOUTH,
     SOUTH_WEST + SOUTH, SOUTH_WEST + WEST,
@@ -53,8 +53,8 @@ static int king_vector[8] = {
 bitboard_t bitboard_between_excl(square_t sq1, square_t sq2)
 {
     const bitboard_t m1 = -1;
-    const bitboard_t a2a7 = C64(0x0001010101010100);
-    const bitboard_t b7h1 = C64(0x0002040810204080);
+    const bitboard_t a2a7 = U64(0x0001010101010100);
+    const bitboard_t b7h1 = U64(0x0002040810204080);
     bitboard_t btwn_bits, ray_bits;
     u32 rank_diff, file_diff, anti_diff, diag_diff;
 
@@ -105,9 +105,11 @@ void bitboard_init(void)
     } ;
     bitboard_t tmpbb[64][4] = { 0 };
 
-    /* 1) square to bitboard, and in-between-sq2-excluded */
+    /* 1) square to bitboard
+     *    in-between, sq2 excluded
+     */
     for (square_t sq1 = A1; sq1 <= H8; ++sq1) {
-        bb_sq[sq1] = mask(sq1);
+        bb_sq[sq1] = BIT(sq1);
         for (square_t sq2 = A1; sq2 <= H8; ++sq2)
             bb_between_excl[sq1][sq2] = bitboard_between_excl(sq1, sq2);
     }
@@ -119,15 +121,15 @@ void bitboard_init(void)
         file_t f = sq_file(sq);
         rank_t r = sq_rank(sq);
         for (int vec = 0; vec < 4; ++vec) {
-            tmpbb[sq][vec] |= mask(sq_make(f, r));
+            tmpbb[sq][vec] |= BIT(sq_make(f, r));
             for (int dir = -1; dir <= 1; dir += 2) {
                 file_t df = dir * vecs[vec].df, f2 = f + df;
                 rank_t dr = dir * vecs[vec].dr, r2 = r + dr;
                 bitboard_t mask_between = 0;
                 while (sq_coord_ok(f2) && sq_coord_ok(r2)) {
                     square_t dest = sq_make(f2, r2);
-                    tmpbb[sq][vec] |= mask(dest);
-                    mask_between |= mask(dest);
+                    tmpbb[sq][vec] |= BIT(dest);
+                    mask_between |= BIT(dest);
                     bb_between[sq][dest] = mask_between;
                     f2 += df, r2 += dr;
                 }
@@ -151,18 +153,18 @@ void bitboard_init(void)
                     bb_line[sq1][sq2] = bb_sqdiag[sq1];
                 else if (bb_sqanti[sq1] == bb_sqanti[sq2])
                     bb_line[sq1][sq2] = bb_sqanti[sq1];
-
-                //if (bb_line[sq1][sq2]) {
-                //    printf("bb_line[%d][%d] = %16lx\n", sq1, sq2, bb_line[sq1][sq2]);
-                //}
             }
         }
     }
 
-    /* 3) knight and king moves */
+    /* 3) pawn, knight and king attacks
+     */
     for (square_t sq = A1; sq <= H8; ++sq) {
-        //rank_t r1 = sq_rank(sq);
-        //file_t f1 = sq_file(sq);
+         if (sq <= H7)
+             bb_pawn_attacks[WHITE][sq] = bb_pawns_attacks(BIT(sq), sq_up(WHITE));
+         if (sq >= A2)
+             bb_pawn_attacks[BLACK][sq] = bb_pawns_attacks(BIT(sq), sq_up(BLACK));
+
         for (int vec = 0; vec < 8; ++vec) {
             int dst = sq + knight_vector[vec];
             if (sq_ok(dst)) {
@@ -215,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': '.');
@@ -250,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) {
@@ -279,7 +281,7 @@ char *bb_rank_sprint(char *str, const uchar bb8)
 {
     file_t f;
     for (f = FILE_A; f <= FILE_H; ++f) {
-        *(str + f) = bb8 & mask(f) ? '1': '.';
+        *(str + f) = bb8 & BIT(f) ? '1': '.';
     }
     *(str + f) = 0;
     //printf(" 0 1 2 3 4 5 6 7\n");

src/bitboard.h

@@ -14,8 +14,8 @@
 #ifndef _BITBOARD_H
 #define _BITBOARD_H
 
-#include "brlib.h"
-#include "bitops.h"
+#include <brlib.h>
+#include <bitops.h>
 
 #include "chessdefs.h"
 #include "board.h"
@@ -39,9 +39,8 @@ extern bitboard_t bb_sqrank[64], bb_sqfile[64], bb_sqdiag[64], bb_sqanti[64];
 /* line (rank, file, diagonal or anti-diagonal) between two squares */
 extern bitboard_t bb_line[64][64];
 
-/* knight and king moves */
-extern bitboard_t bb_knight[64], bb_king[64];
-
+/* pawn, knight and king attacks */
+extern bitboard_t bb_knight[64], bb_king[64], bb_pawn_attacks[2][64];
 
 /* TODO (maybe C23?) when we can ensure an enum can be u64
  *
@@ -183,13 +182,77 @@ static __always_inline bitboard_t bb_file(int file)
 }
 */
 
+/**
+ * bb_first_bb() - return bitboard of first square of a bitboard.
+ * @bb: bitboard
+ *
+ * bb must be non-zero.
+ *
+ * @return: bitboard of first square (lsb) of @bb.
+ */
+static __always_inline square_t bb_first_bb(bitboard_t bb)
+{
+    return bb & -bb;
+}
+
+/**
+ * bb_next() - clear and return next (lsb) square of a bitboard.
+ * @bb: &bitboard
+ *
+ * The bitboard addressed by @bb must be non-zero.
+ *
+ * @return: first bit (lsb) of @bb.
+ */
+static __always_inline square_t bb_next(bitboard_t *bb)
+{
+    square_t sq = ctz64(*bb);
+    *bb &= *bb - 1;
+    return sq;
+}
+
+/**
+ * bb_multiple() - test if a bitboard has multiple bits.
+ * @bb: bitboard
+ *
+ * @return: true if @bb has more than 1 bit, false otherwise.
+ */
+static __always_inline bool bb_multiple(bitboard_t bb)
+{
+    return !!(bb & (bb - 1));
+}
+
+/**
+ * bb_shift() - shift bitboard
+ * @bb: bitboard
+ *
+ * No control is done on off-board shifting (i.e. shifting -1 from A2 gives H3).
+ *
+ * @return: true if @bb has more than 1 bit, false otherwise.
+ */
+static __always_inline bitboard_t bb_shift(bitboard_t bb, int shift)
+{
+   return shift >= 0 ? bb << shift : bb >> -shift;
+}
+
+/**
+ * bb_pawns_attacks() - shift up pawns on both diagonals (attacks)
+ * @bb:      pawns bitboard
+ * @push:    shift value for pawn up
+ *
+ * Get the possible attacks for all @bb pawns.
+ *
+ * @return: squares attacked by @bbpawns
+ */
+static __always_inline bitboard_t bb_pawns_attacks(const bitboard_t bb, int push)
+{
+    return bb_shift(bb & ~FILE_Abb, push - 1) | bb_shift(bb & ~FILE_Hbb, push + 1);
+}
+
 #define bb_rank(r)        ((u64) RANK_1bb << ((r) * 8))
-#define BB_FILE(f)        ((u64) FILE_Abb << (f))
+#define bb_file(f)        ((u64) FILE_Abb << (f))
 
 #define bb_rel_rank(r, c) bb_rank(sq_rel_rank(r, c))
-
-//#define BB_REL_RANK(r, c) (RANK_1bb << (SQ_REL_RANK(r, c) * 8))
-//#define BB_REL_FILE(f, c) (FILE_Abb << (SQ_REL_RANK((f), (c))))
+#define bb_rel_file(f, c) bb_file(sq_rel_rank(f, c)) /* likely useless */
 
 /**
  * bb_sq_aligned() - check if two squares are aligned (same file or rank).
@@ -210,7 +273,7 @@ static __always_inline bool bb_sq_aligned(square_t sq1, square_t sq2)
  */
 static __always_inline bool bb_sq_aligned3(square_t sq1, square_t sq2, square_t sq3)
 {
-    return bb_line[sq1][sq2] & mask(sq3);
+    return bb_line[sq1][sq2] & BIT(sq3);
 }
 
 /**
@@ -219,59 +282,13 @@ static __always_inline bool bb_sq_aligned3(square_t sq1, square_t sq2, square_t
  * @sq1: square 1
  * @sq2: square 2
  *
- * @return: bitboard of @betw if between @sq1 and @sq2.
+ * @return: bitboard of @sq if between @sq1 and @sq2.
  */
 static __always_inline bitboard_t bb_sq_between(square_t sq, square_t sq1, square_t sq2)
 {
-    return bb_between_excl[sq1][sq2] & mask(sq);
+    return bb_between_excl[sq1][sq2] & BIT(sq);
 }
 
-/* TODO: when OK, replace with macros */
-static __always_inline bitboard_t shift_n(const bitboard_t bb)
-{
-    return bb << NORTH;
-}
-static __always_inline bitboard_t shift_ne(const bitboard_t bb)
-{
-    return (bb & ~FILE_Hbb) << NORTH_EAST;
-}
-static __always_inline bitboard_t shift_e(const bitboard_t bb)
-{
-    return (bb & ~FILE_Hbb) << EAST;
-}
-static __always_inline bitboard_t shift_se(const bitboard_t bb)
-{
-    return (bb & ~FILE_Hbb) >> -SOUTH_EAST;
-}
-static __always_inline bitboard_t shift_s(const bitboard_t bb)
-{
-    return bb >> -SOUTH;
-}
-static __always_inline bitboard_t shift_sw(const bitboard_t bb)
-{
-    return (bb & ~FILE_Abb) >> -SOUTH_WEST;
-}
-static __always_inline bitboard_t shift_w(const bitboard_t bb)
-{
-    return (bb & ~FILE_Abb) >> -WEST;
-}
-static __always_inline bitboard_t shift_nw(const bitboard_t bb)
-{
-    return (bb & ~FILE_Abb) << NORTH_WEST;
-}
-
-#define pawn_up_value(c)          ((c) == WHITE ? 8: -8)
-/* pawn moves/attacks (for bitboards) */
-#define pawn_shift_up(bb, c)      ((c) == WHITE ? shift_n(bb): shift_s(bb))
-#define pawn_shift_upleft(bb, c)  ((c) == WHITE ? shift_nw(bb): shift_se(bb))
-#define pawn_shift_upright(bb, c) ((c) == WHITE ? shift_ne(bb): shift_sw(bb))
-/* pawn move (for single pawn) - NO SQUARE CONTROL HERE !
- * Need to make functions with control instead.
- */
-#define pawn_push_up(sq, c)       ((sq) + ((c) == WHITE ? NORTH:      SOUTH))
-#define pawn_push_upleft(sq, c)   ((sq) + ((c) == WHITE ? NORTH_WEST: SOUTH_EAST))
-#define pawn_push_upright(sq, c)  ((sq) + ((c) == WHITE ? NORTH_EAST: SOUTH_WEST))
-
 bitboard_t bitboard_between_excl(square_t sq1, square_t sq2);
 void bitboard_init(void);
 

src/board.c

@@ -14,7 +14,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "brlib.h"
+#include <brlib.h>
+
 #include "board.h"
 #include "bitboard.h"
 
@@ -93,7 +94,7 @@ void board_print_mask(const piece_t *board, const bitboard_t mask)
         for (int file = 0; file < 8; ++file) {
             square_t sq = sq_make(file, rank);
             piece_t pc = board[sq];
-            bitboard_t set = mask(sq) & mask;
+            bitboard_t set = BIT(sq) & mask;
             printf("%s", set? REVERSE : " ");
 #           ifdef DIAGRAM_SYM
             printf("%s", pc? piece_to_sym(pc): " ");
@@ -114,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,475 +12,18 @@
  */
 
 
-#include <err.h>
-#include <stdlib.h>
-#include <string.h>
-#include <readline/readline.h>
-#include <readline/history.h>
+#include <stdio.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 "fen.h"
-#include "eval.h"
-#include "eval-simple.h"
-#include "search.h"
+#include "hist.h"
+#include "uci.h"
 
-struct command {
-    char *name;                                   /* User printable name */
-    int (*func)(pos_t *, char *);                 /* function doing the job */
-    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);
-struct command *find_command (char *);
-char *stripwhite (char *string);
-
-/* 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*);
-
-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)" },
-    { NULL, (int(*)()) NULL, NULL }
-};
-
-static int done=0;
-static int depth=1;
-
-int brchess(pos_t *pos)
-{
-    char *buffer, *s;
-
-    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);
-        }
-        free(buffer);
-    }
-
-    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)
-{
-    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);
-}
-
-/* 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];
-
-    return (struct command *)NULL;
-}
-
-/* Strip whitespace from the start and end of STRING.  Return a pointer
-   into STRING. */
-char *stripwhite(char *string)
-{
-    register char *s, *t;
-
-    for (s = string; whitespace(*s); s++)
-        ;
-
-    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_prmovepos(pos_t *pos, char *arg)
- * {
- *     struct list_head *p_cur, *tmp;
- *     int movenum = atoi(arg), cur = 0;             /\* starts with 0 *\/
- *     move_t *move;
- *
- *     log_f(1, "%s\n", arg);
- *     list_for_each_safe(p_cur, tmp, &pos->moves[pos->turn]) {
- *         move = list_entry(p_cur, move_t, list);
- *         if (cur++ == movenum) {
- *             pos_print(move->newpos);
- *             break;
- *         }
- *     }
- *
- *     return 1;
- * }
- */
-
-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_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;
-}
-
-/* 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;
-
-    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++;
-        }
-    }
-
-    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;
-}
-
-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 +32,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();
+    printf("brchess " VERSION "\n");
+    init_all();
+    pos = pos_new();
+    printf("Engine 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);
@@ -518,5 +65,5 @@ int main(int ac, char **av)
     if (optind < ac)
         return usage(*av);
 
-    return brchess(pos);
+    return uci(pos);
 }

src/brchess.h

@@ -14,8 +14,4 @@
 #ifndef BRCHESS_H
 #define BRCHESS_H
 
-#include "position.h"
-
-int brchess(pos_t *pos);
-
 #endif  /* BRCHESS_H */

src/chessdefs.h

@@ -14,13 +14,14 @@
 #ifndef _CHESSDEFS_H
 #define _CHESSDEFS_H
 
-#include "brlib.h"                                /* brlib types */
+#include <brlib.h>                                /* brlib types */
 
-#define ONE                1ull
-#define C64(const_u64)     const_u64##ULL
-#define mask(i)            ( (u64) (ONE << (i)) )
+#define ONE                1ul
+#define U64(const_u64)     const_u64##UL
+#define BIT(i)             ( (u64) (ONE << (i)) )
 
 #define BOARDSIZE          (8*8)
+#define GAMESIZE           1024                   /* max game size (512 moves) */
 
 /**
  * sq_rel - get relative square
@@ -45,21 +46,24 @@
  * @return: Relative rank.
  */
 #define sq_rel_rank(rank, c)  ((rank_t)((7 * (c)) ^ rank))
+#define sq_rel_file(file, c)  ((file_t)((7 * (c)) ^ file))
 
 /* castle_t bits structure
  */
 typedef enum {
-    CASTLE_WK = (1 << 0),                         /* 0x01 00000001 */
-    CASTLE_WQ = (1 << 1),                         /* 0x02 00000010 */
-    CASTLE_BK = (1 << 2),                         /* 0x04 00000100 */
-    CASTLE_BQ = (1 << 3),                         /* 0x08 00001000 */
+    CASTLE_NONE = 0,
+    CASTLE_WK   = (1 << 0),                       /* 0001 */
+    CASTLE_WQ   = (1 << 1),                       /* 0010 */
+    CASTLE_BK   = (1 << 2),                       /* 0100 */
+    CASTLE_BQ   = (1 << 3),                       /* 1000 */
 
-    CASTLE_W  = (CASTLE_WK | CASTLE_WQ),          /* 00000011 W castle mask */
-    CASTLE_B  = (CASTLE_BK | CASTLE_BQ),          /* 00001100 B castle mask */
+    CASTLE_W    = (CASTLE_WK | CASTLE_WQ),        /* 0011 =  3 = W castle mask */
+    CASTLE_B    = (CASTLE_BK | CASTLE_BQ),        /* 1100 = 12 = B castle mask */
+    CASTLE_ALL  = (CASTLE_W | CASTLE_B),          /* 1111 = 15 */
 
     CASTLE_K  = (1 << 0),                         /* generic K/Q, bits 0 and 1 */
     CASTLE_Q  = (1 << 1),
-    CASTLE_KQ = (CASTLE_K |CASTLE_Q)
+    CASTLE_KQ = (CASTLE_K |CASTLE_Q),
 } castle_rights_t;
 
 /* determine is oo or ooo is possible with castle flags f and color c
@@ -75,12 +79,6 @@ typedef enum {
 #define clr_ooo(f, c)    ((f) & ~(CASTLE_Q  << (2 * (c))))
 #define clr_castle(f, c) ((f) & ~(CASTLE_KQ << (2 * (c)) ))
 
-/* game phases
- */
-#define OPENING    0
-#define MIDDLEGAME 1
-#define ENDGAME    2
-
 /* forward defs */
 typedef struct __pos_s pos_t;
 typedef struct __movelist_s movelist_t;
@@ -88,16 +86,15 @@ typedef struct __movelist_s movelist_t;
 /* basic types
  */
 typedef u64 bitboard_t;
+typedef s16 eval_t;
+typedef s8 phase_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,
@@ -106,23 +103,26 @@ typedef enum {
     A6,     B6, C6, D6, E6, F6, G6, H6,
     A7,     B7, C7, D7, E7, F7, G7, H7,
     A8,     B8, C8, D8, E8, F8, G8, H8,
-    SQUARE_MAX = 64,
+    SQUARE_NB = 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;
+    FILE_NB,
+};
+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;
+    RANK_NB,
+};
+typedef u8 rank_t;
 
-typedef enum {
+enum {
     NORTH = 8,
     EAST =  1,
     SOUTH = -NORTH,
@@ -132,7 +132,16 @@ 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)
+/* Attention here: We mix "up" (color dependent) and W/E, color independant.
+ */
+#define sq_upwest(up)     ((up) - 1)
+#define sq_upeast(up)     ((up) + 1)
+
+void init_all(void);
 
 #endif  /* _CHESSDEFS_H */

src/eval-defs.c

@@ -0,0 +1,595 @@
+/* eval-values.c - eval parameters
+ *
+ * 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 <bitops.h>
+
+#include "chessdefs.h"
+#include "position.h"
+#include "piece.h"
+#include "eval-defs.h"
+#include "util.h"
+//#include "eval-simple.h"
+//#include "eval.h"
+
+/* eval parameters definition. */
+static const struct ev_params ev_param_def [EV_PARAMS_NB] = {
+    /*                type      setable def   min    max  name */
+    [WT_MAT]  =     { PAR_SPN,  true,   100,    0,   400, "material weight" },
+    [WT_PST]  =     { PAR_SPN,  true,   100,    0,   400, "pst weight" },
+    [TST_CHK] =     { PAR_CHK,  true,     1,    0,     0, "test check" },
+    [TST_SPN] =     { PAR_BTN,  true,     0,    0,     0, "test button" },
+
+};
+
+void param_init()
+{
+    for (int i = 0; i < EV_PARAMS_NB; ++i)
+        parameters[i] = ev_param_def[i].init;
+}
+
+int param_find_name(char *name)
+{
+    for (int i = 0; i < EV_PARAMS_NB; ++i)
+        if (str_eq_case(ev_param_def[i].name, name))
+            return i;
+    return -1;
+}
+char *param_name(const int num)
+{
+    return ev_param_def[num].name;
+}
+
+eval_t param_default(const int num)
+{
+    return ev_param_def[num].init;
+}
+eval_t param_min(const int num)
+{
+    return ev_param_def[num].min;
+}
+eval_t param_max(const int num)
+{
+    return ev_param_def[num].max;
+}
+bool param_setable(const int num)
+{
+    return ev_param_def[num].setable;
+}
+int param_type(const int num)
+{
+    return ev_param_def[num].type;
+}
+
+/* parameters in use */
+eval_t parameters[EV_PARAMS_NB];
+void param_set(int num, eval_t val)
+{
+    if (num >= 0 && num < EV_PARAMS_NB &&
+        val >= param_min(num) && val <= param_max(num)) {
+        parameters[num] = val;
+    }
+}
+
+
+/*
+ * Piece-square tables. For easier reading, they are defined for black side:
+ *
+ *      {
+ *        A8 .... H8
+ *        ..........
+ *        ..........
+ *        A1 .... H1
+ *      }
+ */
+static const struct pst {
+    char *name;                                   /* one word only, no spaces */
+    int val[PIECE_TYPE_NB][PHASE_NB][SQUARE_NB];  /* MG then EG */
+} pst_defs[PST_NB] = {
+    [PST_ROFCHADE] = {
+        /*
+         * rofchade:
+         * https://www.talkchess.com/forum3/viewtopic.php?f=2&t=68311&start=19
+         */
+        "Rofchade",
+        {
+            /* A8 ..... H8
+             * ...........
+             * A1 ..... H1
+             */
+            [PAWN] = {
+                {                                 /* midgame */
+                    + 0,   0,   0,   0,   0,   0,  0,   0,
+                    +98, 134,  61,  95,  68, 126, 34, -11,
+                    - 6,   7,  26,  31,  65,  56, 25, -20,
+                    -14,  13,   6,  21,  23,  12, 17, -23,
+                    -27,  -2,  -5,  12,  17,   6, 10, -25,
+                    -26,  -4,  -4, -10,   3,   3, 33, -12,
+                    -35,  -1, -20, -23, -15,  24, 38, -22,
+                    + 0,   0,   0,   0,   0,   0,  0,   0,
+                },
+                {                                 /* endgame */
+                    + 0,   0,   0,   0,   0,   0,   0,   0,
+                    178, 173, 158, 134, 147, 132, 165, 187,
+                    +94, 100,  85,  67,  56,  53,  82,  84,
+                    +32,  24,  13,   5,  -2,   4,  17,  17,
+                    +13,   9,  -3,  -7,  -7,  -8,   3,  -1,
+                    + 4,   7,  -6,   1,   0,  -5,  -1,  -8,
+                    +13,   8,   8,  10,  13,   0,   2,  -7,
+                    + 0,   0,   0,   0,   0,   0,   0,   0,
+                }
+            },
+            [KNIGHT] = {
+                {
+                    /* midgame */
+                    -167, -89, -34, -49,  61, -97, -15, -107,
+                    -73, -41,  72,  36,  23,  62,   7,  -17,
+                    -47,  60,  37,  65,  84, 129,  73,   44,
+                    -9,  17,  19,  53,  37,  69,  18,   22,
+                    -13,   4,  16,  13,  28,  19,  21,   -8,
+                    -23,  -9,  12,  10,  19,  17,  25,  -16,
+                    -29, -53, -12,  -3,  -1,  18, -14,  -19,
+                    -105, -21, -58, -33, -17, -28, -19,  -23,
+                },
+                {                                 /* endgame */
+                    -58, -38, -13, -28, -31, -27, -63, -99,
+                    -25,  -8, -25,  -2,  -9, -25, -24, -52,
+                    -24, -20,  10,   9,  -1,  -9, -19, -41,
+                    -17,   3,  22,  22,  22,  11,   8, -18,
+                    -18,  -6,  16,  25,  16,  17,   4, -18,
+                    -23,  -3,  -1,  15,  10,  -3, -20, -22,
+                    -42, -20, -10,  -5,  -2, -20, -23, -44,
+                    -29, -51, -23, -15, -22, -18, -50, -64,
+                }
+            },
+            [BISHOP] = {
+                {                                 /* midgame */
+                    -29,  4, -82, -37, -25, -42,   7,  -8,
+                    -26, 16, -18, -13,  30,  59,  18, -47,
+                    -16, 37,  43,  40,  35,  50,  37,  -2,
+                    - 4,  5,  19,  50,  37,  37,   7,  -2,
+                    - 6, 13,  13,  26,  34,  12,  10,   4,
+                    + 0, 15,  15,  15,  14,  27,  18,  10,
+                    + 4, 15,  16,   0,   7,  21,  33,   1,
+                    -33, -3, -14, -21, -13, -12, -39, -21,
+                },
+                {                                 /* endgame */
+                    -14, -21, -11,  -8, -7,  -9, -17, -24,
+                    - 8,  -4,   7, -12, -3, -13,  -4, -14,
+                    + 2,  -8,   0,  -1, -2,   6,   0,   4,
+                    - 3,   9,  12,   9, 14,  10,   3,   2,
+                    - 6,   3,  13,  19,  7,  10,  -3,  -9,
+                    -12,  -3,   8,  10, 13,   3,  -7, -15,
+                    -14, -18,  -7,  -1,  4,  -9, -15, -27,
+                    -23,  -9, -23,  -5, -9, -16,  -5, -17,
+                },
+            },
+            [ROOK] = {
+                {                                 /* midgame */
+                    +32,  42,  32,  51, 63,  9,  31,  43,
+                    +27,  32,  58,  62, 80, 67,  26,  44,
+                    - 5,  19,  26,  36, 17, 45,  61,  16,
+                    -24, -11,   7,  26, 24, 35,  -8, -20,
+                    -36, -26, -12,  -1,  9, -7,   6, -23,
+                    -45, -25, -16, -17,  3,  0,  -5, -33,
+                    -44, -16, -20,  -9, -1, 11,  -6, -71,
+                    -19, -13,   1,  17, 16,  7, -37, -26,
+                },
+                {                                 /* endgame */
+                    13, 10, 18, 15, 12,  12,   8,   5,
+                    11, 13, 13, 11, -3,   3,   8,   3,
+                    +7,  7,  7,  5,  4,  -3,  -5,  -3,
+                    +4,  3, 13,  1,  2,   1,  -1,   2,
+                    +3,  5,  8,  4, -5,  -6,  -8, -11,
+                    -4,  0, -5, -1, -7, -12,  -8, -16,
+                    -6, -6,  0,  2, -9,  -9, -11,  -3,
+                    -9,  2,  3, -1, -5, -13,   4, -20,
+                },
+            },
+            [QUEEN] = {
+                {                                 /* midgame */
+                    -28,   0,  29,  12,  59,  44,  43,  45,
+                    -24, -39,  -5,   1, -16,  57,  28,  54,
+                    -13, -17,   7,   8,  29,  56,  47,  57,
+                    -27, -27, -16, -16,  -1,  17,  -2,   1,
+                    - 9, -26,  -9, -10,  -2,  -4,   3,  -3,
+                    -14,   2, -11,  -2,  -5,   2,  14,   5,
+                    -35,  -8,  11,   2,   8,  15,  -3,   1,
+                    - 1, -18,  -9,  10, -15, -25, -31, -50,
+                },
+                {                                 /* endgame */
+                    - 9,  22,  22,  27,  27,  19,  10,  20,
+                    -17,  20,  32,  41,  58,  25,  30,   0,
+                    -20,   6,   9,  49,  47,  35,  19,   9,
+                    + 3,  22,  24,  45,  57,  40,  57,  36,
+                    -18,  28,  19,  47,  31,  34,  39,  23,
+                    -16, -27,  15,   6,   9,  17,  10,   5,
+                    -22, -23, -30, -16, -16, -23, -36, -32,
+                    -33, -28, -22, -43,  -5, -32, -20, -41,
+                },
+            },
+            [KING] = {                            /* midgame */
+                {
+                    -65,  23,  16, -15, -56, -34,   2,  13,
+                    +29,  -1, -20,  -7,  -8,  -4, -38, -29,
+                    - 9,  24,   2, -16, -20,   6,  22, -22,
+                    -17, -20, -12, -27, -30, -25, -14, -36,
+                    -49,  -1, -27, -39, -46, -44, -33, -51,
+                    -14, -14, -22, -46, -44, -30, -15, -27,
+                    + 1,   7,  -8, -64, -43, -16,   9,   8,
+                    -15,  36,  12, -54,   8, -28,  24,  14,
+                },
+                {                                 /* endgame */
+                    -74, -35, -18, -18, -11,  15,   4, -17,
+                    -12,  17,  14,  17,  17,  38,  23,  11,
+                    +10,  17,  23,  15,  20,  45,  44,  13,
+                    - 8,  22,  24,  27,  26,  33,  26,   3,
+                    -18,  -4,  21,  24,  27,  23,   9, -11,
+                    -19,  -3,  11,  21,  23,  16,   7,  -9,
+                    -27, -11,   4,  13,  14,   4,  -5, -17,
+                    -53, -34, -21, -11, -28, -14, -24, -43
+                }
+            }
+        }
+    },                                            /* rofchade end */
+
+    [PST_CPW] = {
+        /*
+         * CPW:
+         * https://www.chessprogramming.org/Simplified_Evaluation_Function
+         * Note: ≠ https://github.com/nescitus/cpw-engine
+         */
+        "CPW",
+        {
+            /* A8 ..... H8
+             * ...........
+             * A1 ..... H1
+             */
+            [PAWN] = {
+                { /* H1                                 H8 */
+                    /* midgame */
+                    +0,  0,   0,   0,   0,   0,  0,  0,
+                    50, 50,  50,  50,  50,  50, 50, 50,
+                    10, 10,  20,  30,  30,  20, 10, 10,
+                    +5,  5,  10,  25,  25,  10,  5,  5,
+                    +0,  0,   0,  20,  20,   0,  0,  0,
+                    +5, -5, -10,   0,   0, -10, -5,  5,
+                    +5, 10,  10, -20, -20,  10, 10,  5,
+                    +0,  0,   0,   0,   0,   0,  0,  0,
+                },
+                {                                 /* endgame */
+                    +0,  0,   0,   0,   0,   0,  0,  0,
+                    50, 50,  50,  50,  50,  50, 50, 50,
+                    10, 10,  20,  30,  30,  20, 10, 10,
+                    +5,  5,  10,  25,  25,  10,  5,  5,
+                    +0,  0,   0,  20,  20,   0,  0,  0,
+                    +5, -5, -10,   0,   0, -10, -5,  5,
+                    +5, 10,  10, -20, -20,  10, 10,  5,
+                    +0,  0,   0,   0,   0,   0,  0,  0,
+                },
+            },
+            [KNIGHT] = {
+                {                                 /* midgame */
+                    -50, -40, -30, -30, -30, -30, -40, -50,
+                    -40, -20,   0,   0,   0,   0, -20, -40,
+                    -30,   0,  10,  15,  15,  10,   0, -30,
+                    -30,   5,  15,  20,  20,  15,   5, -30,
+                    -30,   0,  15,  20,  20,  15,   0, -30,
+                    -30,   5,  10,  15,  15,  10,   5, -30,
+                    -40, -20,   0,   5,   5,   0, -20, -40,
+                    -50, -40, -30, -30, -30, -30, -40, -50
+                },
+                {                                 /* endgame */
+                    -50, -40, -30, -30, -30, -30, -40, -50,
+                    -40, -20,   0,   0,   0,   0, -20, -40,
+                    -30,   0,  10,  15,  15,  10,   0, -30,
+                    -30,   5,  15,  20,  20,  15,   5, -30,
+                    -30,   0,  15,  20,  20,  15,   0, -30,
+                    -30,   5,  10,  15,  15,  10,   5, -30,
+                    -40, -20,   0,   5,   5,   0, -20, -40,
+                    -50, -40, -30, -30, -30, -30, -40, -50
+                },
+            },
+            [BISHOP] = {
+                {                                 /* midgame */
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                    -10,   0,   0,   0,   0,   0,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   5,   5,  10,  10,   5,   5, -10,
+                    -10,   0,  10,  10,  10,  10,   0, -10,
+                    -10,  10,  10,  10,  10,  10,  10, -10,
+                    -10,   5,   0,   0,   0,   0,   5, -10,
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                },
+                {                                 /* endgame */
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                    -10,   0,   0,   0,   0,   0,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   5,   5,  10,  10,   5,   5, -10,
+                    -10,   0,  10,  10,  10,  10,   0, -10,
+                    -10,  10,  10,  10,  10,  10,  10, -10,
+                    -10,   5,   0,   0,   0,   0,   5, -10,
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                },
+            },
+            [ROOK] = {
+                {                                 /* midgame */
+                    +0,  0,  0,  0,  0,  0,  0,  0,
+                    +5, 10, 10, 10, 10, 10, 10,  5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    +0,  0,  0,  5,  5,  0,  0,  0,
+                },
+                {                                 /* endgame */
+                    +0,  0,  0,  0,  0,  0,  0,  0,
+                    +5, 10, 10, 10, 10, 10, 10,  5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    +0,  0,  0,  5,  5,  0,  0,  0,
+                },
+            },
+            [QUEEN] = {
+                {                                 /* midgame */
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                    -10,   0,   0,  0,  0,   0,   0, -10,
+                    -10,   0,   5,  5,  5,   5,   0, -10,
+                    - 5,   0,   5,  5,  5,   5,   0,  -5,
+                    + 0,   0,   5,  5,  5,   5,   0,  -5,
+                    -10,   5,   5,  5,  5,   5,   0, -10,
+                    -10,   0,   5,  0,  0,   0,   0, -10,
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                },
+                {                                 /* endgame */
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                    -10,   0,   0,  0,  0,   0,   0, -10,
+                    -10,   0,   5,  5,  5,   5,   0, -10,
+                    - 5,   0,   5,  5,  5,   5,   0,  -5,
+                    + 0,   0,   5,  5,  5,   5,   0,  -5,
+                    -10,   5,   5,  5,  5,   5,   0, -10,
+                    -10,   0,   5,  0,  0,   0,   0, -10,
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                },
+            },
+            [KING] = {                            /* midgame */
+                {
+                    -30, -40, -40, -50, -50, -40, -40, -30,
+                    -30, -40, -40, -50, -50, -40, -40, -30,
+                    -30, -40, -40, -50, -50, -40, -40, -30,
+                    -30, -40, -40, -50, -50, -40, -40, -30,
+                    -20, -30, -30, -40, -40, -30, -30, -20,
+                    -10, -20, -20, -20, -20, -20, -20, -10,
+                    +20,  20,   0,   0,   0,   0,  20,  20,
+                    +20,  30,  10,   0,   0,  10,  30,  20,
+                },
+                {                                 /* endgame */
+                    -50, -40, -30, -20, -20, -30, -40, -50,
+                    -30, -20, -10,   0,   0, -10, -20, -30,
+                    -30, -10,  20,  30,  30,  20, -10, -30,
+                    -30, -10,  30,  40,  40,  30, -10, -30,
+                    -30, -10,  30,  40,  40,  30, -10, -30,
+                    -30, -10,  20,  30,  30,  20, -10, -30,
+                    -30, -30,   0,   0,   0,   0, -30, -30,
+                    -50, -30, -30, -30, -30, -30, -30, -50,
+                }
+            }
+        }
+    },                                            /* CPW end */
+
+    [PST_SJENG] = {
+        /*
+         * sjeng: https://github.com/gcp/sjeng
+         * Rook and Queen from CPW.
+         */
+        "Sjeng",
+        {
+            /* A8 ..... H8
+             * ...........
+             * A1 ..... H1
+             */
+            [PAWN] = {
+                {                                 /* midgame */
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                    5, 10, 15, 20, 20, 15, 10, 5,
+                    4,  8, 12, 16, 16, 12,  8, 4,
+                    3,  6,  9, 14, 14,  9,  6, 3,
+                    2,  4,  6, 12, 12,  6,  4, 2,
+                    1,  2,  3, 10, 10,  3,  2, 1,
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                },
+                {                                 /* endgame */
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                    5, 10, 15, 20, 20, 15, 10, 5,
+                    4,  8, 12, 16, 16, 12,  8, 4,
+                    3,  6,  9, 14, 14,  9,  6, 3,
+                    2,  4,  6, 12, 12,  6,  4, 2,
+                    1,  2,  3, 10, 10,  3,  2, 1,
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                    0,  0,  0,  0,  0,  0,  0, 0,
+                },
+            },
+            [KNIGHT] = {
+                {                                 /* midgame */
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                    -10,   0,   0,   3,   3,   0,   0, -10,
+                    -10,   0,   5,   5,   5,   5,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   0,   5,   5,   5,   5,   0, -10,
+                    -10,   0,   0,   3,   3,   0,   0, -10,
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                },
+                {                                 /* endgame */
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                    -10,   0,   0,   3,   3,   0,   0, -10,
+                    -10,   0,   5,   5,   5,   5,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   0,   5,  10,  10,   5,   0, -10,
+                    -10,   0,   5,   5,   5,   5,   0, -10,
+                    -10,   0,   0,   3,   3,   0,   0, -10,
+                    -20, -10, -10, -10, -10, -10, -10, -20,
+                },
+            },
+            [BISHOP] = {
+                {                                 /* midgame */
+                    -2, -2, -2, -2, -2, -2, -2, -2,
+                    -2,  8,  5,  5,  5,  5,  8, -2,
+                    -2,  3,  3,  5,  5,  3,  3, -2,
+                    -2,  2,  5,  4,  4,  5,  2, -2,
+                    -2,  2,  5,  4,  4,  5,  2, -2,
+                    -2,  3,  3,  5,  5,  3,  3, -2,
+                    -2,  8,  5,  5,  5,  5,  8, -2,
+                    -2, -2, -2, -2, -2, -2, -2, -2,
+                },
+                {                                 /* endgame */
+                    -2, -2, -2, -2, -2, -2, -2, -2,
+                    -2,  8,  5,  5,  5,  5,  8, -2,
+                    -2,  3,  3,  5,  5,  3,  3, -2,
+                    -2,  2,  5,  4,  4,  5,  2, -2,
+                    -2,  2,  5,  4,  4,  5,  2, -2,
+                    -2,  3,  3,  5,  5,  3,  3, -2,
+                    -2,  8,  5,  5,  5,  5,  8, -2,
+                    -2, -2, -2, -2, -2, -2, -2, -2,
+                },
+            },
+            [ROOK] = {
+                {                                 /* midgame */
+                    +0,  0,  0,  0,  0,  0,  0,  0,
+                    +5, 10, 10, 10, 10, 10, 10,  5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    +0,  0,  0,  5,  5,  0,  0,  0,
+                },
+                {                                 /* endgame */
+                    +0,  0,  0,  0,  0,  0,  0,  0,
+                    +5, 10, 10, 10, 10, 10, 10,  5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    -5,  0,  0,  0,  0,  0,  0, -5,
+                    +0,  0,  0,  5,  5,  0,  0,  0,
+                },
+            },
+            [QUEEN] = {
+                {                                 /* midgame */
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                    -10,   0,   5,  0,  0,   0,   0, -10,
+                    -10,   5,   5,  5,  5,   5,   0, -10,
+                    + 0,   0,   5,  5,  5,   5,   0,  -5,
+                    -05,   0,   5,  5,  5,   5,   0,  -5,
+                    -10,   0,   5,  5,  5,   5,   0, -10,
+                    -10,   0,   0,  0,  0,   0,   0, -10,
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                },
+                {                                 /* endgame */
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                    -10,   0,   5,  0,  0,   0,   0, -10,
+                    -10,   5,   5,  5,  5,   5,   0, -10,
+                    + 0,   0,   5,  5,  5,   5,   0,  -5,
+                    - 5,   0,   5,  5,  5,   5,   0,  -5,
+                    -10,   0,   5,  5,  5,   5,   0, -10,
+                    -10,   0,   0,  0,  0,   0,   0, -10,
+                    -20, -10, -10, -5, -5, -10, -10, -20,
+                },
+            },
+            [KING] = {                            /* midgame */
+                {
+                    -55, -55, -89, -89, -89, -89, -55, -55,
+                    -34, -34, -55, -55, -55, -55, -34, -34,
+                    -21, -21, -34, -34, -34, -34, -21, -21,
+                    -13, -13, -21, -21, -21, -21, -13, -13,
+                    - 8,  -8, -13, -13, -13, -13,  -8,  -8,
+                    - 5,  -5,  -8,  -8,  -8,  -8,  -5,  -5,
+                    - 3,  -5,  -6,  -6,  -6,  -6,  -5,  -3,
+                    + 2,  14,   0,   0,   0,   9,  14,   2,
+                },
+                {                                 /* endgame */
+                    -5, -3, -1,  0,  0, -1, -3, -5,
+                    -3, 10, 10, 10, 10, 10, 10, -3,
+                    -1, 10, 25, 25, 25, 25, 10, -1,
+                    +0, 10, 25, 30, 30, 25, 10,  0,
+                    +0, 10, 25, 30, 30, 25, 10,  0,
+                    -1, 10, 25, 25, 25, 25, 10, -1,
+                    -3, 10, 10, 10, 10, 10, 10, -3,
+                    -5, -3, -1,  0,  0, -1, -3, -5,
+                }
+            }
+        },
+    },                                            /* sjeng end */
+};
+
+int pst_current = PST_DEFAULT;
+eval_t pst_mg[COLOR_NB][PT_NB][SQUARE_NB];
+eval_t pst_eg[COLOR_NB][PT_NB][SQUARE_NB];
+
+void pst_set(char *str)
+{
+    pst_init(pst_find(str));
+}
+
+int pst_find(char *str)
+{
+    for (int i = 0; i < PST_NB; ++i) {
+        if (str_eq_case(pst_defs[i].name, str))
+            return i;
+    }
+    return -1;
+}
+
+void pst_init(int set)
+{
+    const struct pst *pst;
+
+    if (warn(set < 0 || set >= PST_NB, "wrong PST, defaulting to zero."))
+        set = 0;
+
+#   ifdef DEBUG_EVAL2
+    printf("initializing piece-square tables %d ('%s')\n", set, pst_defs[set].name);
+#   endif
+
+    pst = pst_defs + set;
+    pst_current = set;
+    int wmat = param(WT_MAT);
+    int wpst = param(WT_PST);
+    for (piece_type_t pt = PAWN; pt < PT_NB; ++pt) {
+        eval_t mid_pc = piece_midval(pt);
+        eval_t end_pc = piece_endval(pt);
+        for (square_t sq = 0; sq < SQUARE_NB; ++sq) {
+            eval_t mid_pst = pst->val[MIDGAME][pt][sq];
+            eval_t end_pst = pst->val[ENDGAME][pt][sq];
+
+            pst_mg[BLACK][pt][sq] = (mid_pc * wmat + mid_pst * wpst) / 100;
+            pst_eg[BLACK][pt][sq] = (end_pc * wmat + end_pst * wpst) / 100;
+
+            pst_mg[WHITE][pt][FLIP_V(sq)] =  pst_mg[BLACK][pt][sq];
+            pst_eg[WHITE][pt][FLIP_V(sq)] =  pst_eg[BLACK][pt][sq];
+        }
+    }
+}
+
+char *pst_name(int i)
+{
+    if (i >= 0 && i < PST_NB)
+        return pst_defs[i].name;
+    return "undef";
+}

src/eval-defs.h

@@ -0,0 +1,119 @@
+/* eval-defs.h - eval parameters
+ *
+ * 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 EVAL_DEFS_H
+#define EVAL_DEFS_H
+
+#include "chessdefs.h"
+#include "piece.h"
+#include "eval.h"
+
+/* game phases
+ */
+enum {
+    MIDGAME,
+    ENDGAME,
+    PHASE_NB
+};
+
+/* pieces weight in phase calculation.
+ */
+enum {
+    P_PHASE = 0,
+    N_PHASE = 1,
+    B_PHASE = 1,
+    R_PHASE = 2,
+    Q_PHASE = 4,
+    ALL_PHASE = P_PHASE*16 + N_PHASE*4 + B_PHASE*4 + R_PHASE*4 + Q_PHASE*2
+};
+
+/* 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 15,000.
+ */
+#define EVAL_MAX     (SHRT_MAX)                   /* 32767 */
+#define EVAL_MIN     (-EVAL_MAX)
+
+#define EVAL_INV     EVAL_MIN
+
+#define EVAL_MATE    30000
+
+/* eval parameters */
+enum {
+    WT_MAT,
+    WT_PST,
+
+    TST_SPN,
+    TST_CHK,
+
+    EV_PARAMS_NB
+};
+
+enum {
+    PAR_CHK,
+    PAR_SPN,
+    PAR_BTN,
+    PAR_STR,
+};
+
+/**
+ * ev_params - parameters definition
+ * @init: eval_t default value
+ * @min, @max: eval_t min and max values
+ * @type: variable type (PARAM_CHECK, etc...)
+ * @setable: bool setable (proposed in UCI options)
+ * @name: char * human readable name
+ */
+struct ev_params {
+    int type;
+    bool setable;                                 /* true: proposed in UCI options */
+    eval_t init, min, max;
+    char *name;
+};
+void param_init(void);
+int param_find_name(char *name);                  /* find parameter number by name */
+char *param_name(const int num);
+
+eval_t param_default(const int num);              /* get default param value */
+eval_t param_min(const int num);
+eval_t param_max(const int num);
+bool param_setable(const int num);
+int param_type(const int num);
+
+/* parameters in use */
+extern eval_t parameters[EV_PARAMS_NB];
+#define param(n) parameters[n]
+void param_set (int num, eval_t val);
+
+/* PST data */
+/**
+ * pst_defs - pre-defined piece-square tables.
+ */
+enum {
+    PST_ROFCHADE,
+    PST_CPW,
+    PST_SJENG,
+    PST_NB
+};
+
+#define PST_DEFAULT PST_CPW
+extern int pst_current;
+extern eval_t pst_mg[COLOR_NB][PT_NB][SQUARE_NB];
+extern eval_t pst_eg[COLOR_NB][PT_NB][SQUARE_NB];
+
+void pst_set(char *str);
+int pst_find(char *str);
+void pst_init(int pst);
+
+char *pst_name(int i);
+
+#endif  /* EVAL_DEFS_H */

src/eval-simple.c

@@ -11,139 +11,37 @@
  *
  */
 
-#include "br.h"
-#include "debug.h"
+#include <brlib.h>
+#include <bitops.h>
 
+#include "chessdefs.h"
 #include "piece.h"
-#include "eval-simple.h"
 #include "position.h"
+#include "eval-simple.h"
+#include "eval.h"
 
-/*
- * Tables are from https://www.chessprogramming.org/Simplified_Evaluation_Function
+/**
+ * eval_material() - eval position material
+ * @pos: &position to evaluate
  *
- * Attention! Tables are black point of view (to be visually easier to read).
+ * Basic material evaluation. Only midgame value is used.
+ *
+ * @return: the @pos material evaluation in centipawns
  */
-
-static int mg_pawn[] = {
-    0,   0,   0,   0,   0,   0,  0,  0,
-    50, 50,  50,  50,  50,  50, 50, 50,
-    10, 10,  20,  30,  30,  20, 10, 10,
-    5,   5,  10,  25,  25,  10,  5,  5,
-    0,   0,   0,  20,  20,   0,  0,  0,
-    5,  -5, -10,   0,   0, -10, -5,  5,
-    5,  10,  10, -20, -20,  10, 10,  5,
-    0,   0,   0,   0,   0,   0,  0,  0
-};
-
-static int mg_knight[] = {
-    -50, -40, -30, -30, -30, -30, -40, -50,
-    -40, -20,   0,   0,   0,   0, -20, -40,
-    -30,   0,  10,  15,  15,  10,   0, -30,
-    -30,   5,  15,  20,  20,  15,   5, -30,
-    -30,   0,  15,  20,  20,  15,   0, -30,
-    -30,   5,  10,  15,  15,  10,   5, -30,
-    -40, -20,   0,   5,   5,   0, -20, -40,
-    -50, -40, -30, -30, -30, -30, -40, -50
-};
-
-static int mg_bishop[] = {
-    -20, -10, -10, -10, -10, -10, -10, -20,
-    -10,   0,   0,   0,   0,   0,   0, -10,
-    -10,   0,   5,  10,  10,   5,   0, -10,
-    -10,   5,   5,  10,  10,   5,   5, -10,
-    -10,   0,  10,  10,  10,  10,   0, -10,
-    -10,  10,  10,  10,  10,  10,  10, -10,
-    -10,   5,   0,   0,   0,   0,   5, -10,
-    -20, -10, -10, -10, -10, -10, -10, -20
-};
-
-static int mg_rook[] = {
-    0,   0,  0,  0,  0,  0,  0,  0,
-    5,  10, 10, 10, 10, 10, 10,  5,
-    -5,  0,  0,  0,  0,  0,  0, -5,
-    -5,  0,  0,  0,  0,  0,  0, -5,
-    -5,  0,  0,  0,  0,  0,  0, -5,
-    -5,  0,  0,  0,  0,  0,  0, -5,
-    -5,  0,  0,  0,  0,  0,  0, -5,
-    0,   0,  0,  5,  5,  0,  0,  0
-};
-
-static int mg_queen[] = {
-    -20, -10, -10, -5, -5, -10, -10, -20,
-    -10,   0,   0,  0,  0,   0,   0, -10,
-    -10,   0,   5,  5,  5,   5,   0, -10,
-    -5,    0,   5,  5,  5,   5,   0,  -5,
-    0,     0,   5,  5,  5,   5,   0,  -5,
-    -10,   5,   5,  5,  5,   5,   0, -10,
-    -10,   0,   5,  0,  0,   0,   0, -10,
-    -20, -10, -10, -5, -5, -10, -10, -20
-};
-
-static int mg_king[] = {
-    -30, -40, -40, -50, -50, -40, -40, -30,
-    -30, -40, -40, -50, -50, -40, -40, -30,
-    -30, -40, -40, -50, -50, -40, -40, -30,
-    -30, -40, -40, -50, -50, -40, -40, -30,
-    -20, -30, -30, -40, -40, -30, -30, -20,
-    -10, -20, -20, -20, -20, -20, -20, -10,
-    20,  20,   0,   0,   0,   0,  20,  20,
-    20,  30,  10,   0,   0,  10,  30,  20
-};
-
-static int eg_king[] = {
-    -50, -40, -30, -20, -20, -30, -40, -50,
-    -30, -20, -10,   0,   0, -10, -20, -30,
-    -30, -10,  20,  30,  30,  20, -10, -30,
-    -30, -10,  30,  40,  40,  30, -10, -30,
-    -30, -10,  30,  40,  40,  30, -10, -30,
-    -30, -10,  20,  30,  30,  20, -10, -30,
-    -30, -30,   0,   0,   0,   0, -30, -30,
-    -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,
-    mg_bishop,
-    mg_rook,
-    mg_queen,
-    mg_king
-};
-
-static int *eg_tables[] = {
-    NULL,
-    NULL,
-    mg_pawn,
-    mg_knight,
-    mg_bishop,
-    mg_rook,
-    mg_queen,
-    eg_king
-};
-
-/* to flip vertically a square, we need to XOR it with 56
- */
-static int mg_table[2][6 + 2][64];
-static int eg_table[2][6 + 2][64];
-
-void eval_simple_init(void)
+eval_t eval_material(pos_t *pos)
 {
-#   ifdef DEBUG_EVAL
-    log_f(1, "initializing piece tables\n");
-#   endif
-    for (int piece = BB_PAWN; piece <= BB_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)];
-            mg_table[BLACK][piece][square] = mg_tables[piece][square];
-            eg_table[BLACK][piece][square] = eg_tables[piece][square];
-        }
+    eval_t val[COLOR_NB] = { 0 };
+
+    for (piece_type_t pt = PAWN; pt < KING; ++pt) {
+        eval_t pval = piece_midval(pt);
+        val[WHITE] += popcount64(pos->bb[WHITE][pt]) * pval;
+        val[BLACK] += popcount64(pos->bb[BLACK][pt]) * pval;
     }
+#   ifdef DEBUG_EVAL
+    printf("material: w:%d b:%d\n", val[WHITE], val[BLACK]);
+#   endif
+
+    return val[WHITE] - val[BLACK];
 }
 
 /**
@@ -152,47 +50,39 @@ 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
  */
 eval_t eval_simple(pos_t *pos)
 {
     eval_t eval[2] = { 0, 0 };
-    int eg = simple_is_endgame(pos);
-    int (*gg)[6 + 2][64]= eg? eg_table: mg_table;
+    eval_t mg_eval[2], eg_eval[2];
+    //struct pc_sq = sq_ int (*gg)[6 + 2][64] = eg? pc_sq_eg: pc_sq_mg;
 
-    pos->eval_simple_phase = ENDGAME;
-#   ifdef DEBUG_EVAL
-    log_f(5, "phase = %s.\n", eg? "endgame": "midgame");
-#   endif
+    //pos->eval_simple_phase = ENDGAME;
 
-    for (int color = WHITE; color <= BLACK; ++color) {
-        for (uint piece = PAWN; piece <= KING; piece <<= 1) {
-            int bb = PIECETOBB(piece), cur;
-            u64 _t;
-
-#           ifdef DEBUG_EVAL
-            log_f(5, "p=%u bb=%d %s %s: count=%d val=%ld ", piece, bb, color? "black": "white",
-                  P_SYM(piece), popcount64(pos->bb[color][bb]),
-                  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]) {
-#               ifdef DEBUG_EVAL
-                log(5, "sq=%d:%d ", cur, gg[color][bb][cur]);
-#               endif
-                eval[color] += gg[color][bb][cur];
+    for (color_t color = WHITE; color < COLOR_NB; ++color) {
+        mg_eval[color] = 0;
+        eg_eval[color] = 0;
+        for (piece_type_t pt = PAWN; pt < KING; pt++) {
+            bitboard_t bb = pos->bb[color][pt];
+            while (bb) {
+                square_t sq = bb_next(&bb);
+                mg_eval[color] += pst_mg[color][pt][sq];
+                eg_eval[color] += pst_eg[color][pt][sq];
             }
+
 #           ifdef DEBUG_EVAL
-            log(5, "\n");
+            printf("c=%d pt=%d mg=%d eg=%d\n", color, pt,
+                   mg_eval[color], eg_eval[color]);
 #           endif
+
         }
     }
 #   ifdef DEBUG_EVAL
-    log_f(2, "eval:%d white:%d black:%d\n", eval[WHITE] - eval[BLACK],
-          eval[WHITE], eval[BLACK]);
+    printf("phase:%d mg[WHITE]:%d mg[BLACK]:%d eg[WHITE]:%d eg[BLACK]:%d\n",
+           pos->phase, mg_eval[WHITE], mg_eval[BLACK], eg_eval[WHITE], eg_eval[BLACK]);
 #   endif
 
     return eval[WHITE] - eval[BLACK];

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.
  *
@@ -14,21 +14,22 @@
 #ifndef EVAL_SIMPLE_H
 #define EVAL_SIMPLE_H
 
-
 #include "chessdefs.h"
+#include "piece.h"
+#include "eval.h"
 
 /* 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)   ||         \
@@ -41,7 +42,12 @@
         simple_no_rook(p, BLACK)   &&         \
         simple_one_minor_piece(p, BLACK))) )
 
-void eval_simple_init(void);
+//s16 calc_phase(pos_t *pos);
+//int eval_simple_find(char *str);
+//void eval_simple_set(int set);
+//void eval_simple_init(char *set);
+
+eval_t eval_material(pos_t *pos);
 eval_t eval_simple(pos_t *pos);
 
 #endif  /* EVAL_SIMPLE_H */

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,64 +13,89 @@
 
 #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"
 
-inline eval_t eval_material(pos_t *pos, bool color)
+/**
+ * calc_phase - calculate position phase
+ * @pos: &position
+ *
+ * This function should be calculated when a new position is setup, or as
+ * a verification of an incremental one.
+ * phase is clamped between 0 (opening) and 24 (ending).
+ *
+ * @return:
+ */
+phase_t calc_phase(pos_t *pos)
 {
-    eval_t res = 0;
+    int phase = ALL_PHASE;
+    phase -= P_PHASE * popcount64(pos->bb[WHITE][PAWN]   | pos->bb[BLACK][PAWN]);
+    phase -= N_PHASE * popcount64(pos->bb[WHITE][KNIGHT] | pos->bb[BLACK][KNIGHT]);
+    phase -= B_PHASE * popcount64(pos->bb[WHITE][BISHOP] | pos->bb[BLACK][BISHOP]);
+    phase -= R_PHASE * popcount64(pos->bb[WHITE][ROOK]   | pos->bb[BLACK][ROOK]);
+    phase -= Q_PHASE * popcount64(pos->bb[WHITE][QUEEN]  | pos->bb[BLACK][QUEEN]);
 
-    /* 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);
-#       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);
-    }
-    return res;
+    phase = max(phase, 0);
+#   ifdef DEBUG_EVAL
+    printf("calc phase:%d\n", phase);
+#   endif
+    return phase;
 }
 
-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]);
+ * }
+ */
+
+/*
+ * 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);
     //material[BLACK] = eval_material(pos, BLACK);
     simple = eval_simple(pos);
 
-#   ifdef DEBUG_EVAL
+#   ifdef DEBUG_EVAL2
     log_f(2, "eval_simple=%d\n", simple);
 #   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
+#   ifdef DEBUG_EVAL2
     log_f(2, "square control: W:%d B:%d diff=%d\n",
           control[WHITE], control[BLACK],
           (control[WHITE] - control[BLACK]) * 10);
@@ -78,18 +103,18 @@ eval_t eval(pos_t *pos)
 
     /* 3) mobility: 10 mobility diff = 1 pawn
      */
-#   ifdef DEBUG_EVAL
+#   ifdef DEBUG_EVAL2
     log_f(2, "mobility: W:%u B:%u diff=%d\n",
           pos->mobility[WHITE], pos->mobility[BLACK],
           (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10);
 #   endif
 
-    eval_t res = simple +
-        (control[WHITE] - control[BLACK]) * 10 +
-        (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10;
-#   ifdef DEBUG_EVAL
+    //eval_t res = simple +
+    //    (control[WHITE] - control[BLACK]) * 10 +
+    //    (pos->mobility[WHITE] - pos->mobility[BLACK]) * 10;
+#   ifdef DEBUG_EVAL2
     log_f(2, "eval: %d\n", res);
 #   endif
-    pos->eval = res;
-    return res;
+    pos->eval = simple;
+    return simple;
 }

src/eval.h

@@ -1,6 +1,6 @@
 /* eval.h - static 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.
  *
@@ -17,18 +17,10 @@
 #include <limits.h>
 
 #include "chessdefs.h"
-#include "piece.h"
+#include "eval-defs.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
- */
-#define EVAL_MAX     (50000)
-#define EVAL_MIN     (-EVAL_MAX)
-#define EVAL_INVALID INT_MIN
-#define EVAL_MATE    EVAL_MAX
+phase_t calc_phase(pos_t *pos);
 
-eval_t eval_material(pos_t *pos, bool color);
 eval_t eval_mobility(pos_t *pos, bool color);
 eval_t eval_square_control(pos_t *pos, bool color);
 

src/fen.c

@@ -21,10 +21,9 @@
 #include <bug.h>
 
 #include "chessdefs.h"
-#include "util.h"
-//#include "piece.h"
-//#include "bitboard.h"
+#include "alloc.h"
 #include "position.h"
+#include "eval-defs.h"
 #include "fen.h"
 
 /* FEN description:
@@ -61,46 +60,50 @@ static const char *castle_str = "KQkq";
 #define SKIP_BLANK(p) for(;isspace(*(p)); (p)++)
 
 /**
- * fen_check(pos_t *pos) - test (and try to fix) fen-generated position.
- * @pos: position
+ * fen_ok() - test (and try to fix) fen-generated position.
+ * @pos:    &position
+ * @fixit:  action flag
  *
- * Test and fix the following:
+ * Test and possibly fix the following:
  * - inconsistent castle flags (if K & R are not in correct position)
- * - inconsistent en-passant square (turn, bad pawn position)
+ * - inconsistent en-passant square (turn, bad pawns positions)
  *
- * pos_check() is also called, leading to fatal errors if something is wrong.
+ * if @fixit is true, any error above will be fixed, and pos_ok() will
+ is also called, leading to fatal errors if something is wrong.
  *
  * @return: 0 if OK, 1 if OK after fix, -1 if fatal issue.
  */
-static int fen_check(pos_t *pos)
+int fen_ok(pos_t *pos, bool fixit)
 {
     char *colstr[2] = { "white", "black"};
     int warning = 0;
+    color_t us = pos->turn, them = OPPONENT(us);
+    int up = sq_up(us);                           /* pawn up */
+    square_t ep = pos->en_passant;
 
     /* en passant, depends on who plays next */
-    if (pos->en_passant != SQUARE_NONE) {
-        rank_t eprank = sq_rank(pos->en_passant);
-        file_t epfile = sq_file(pos->en_passant);
-        rank_t rank5 = sq_rel_rank(RANK_5, pos->turn);
-        rank_t rank6 = sq_rel_rank(RANK_6, pos->turn);
-        rank_t rank7 = sq_rel_rank(RANK_7, pos->turn);
-        piece_t pawn = pos->turn == WHITE? B_PAWN: W_PAWN;
-        if (warn(eprank != rank6 ||
-                 pos->board[sq_make(epfile, rank5)] != pawn ||
-                 pos->board[sq_make(epfile, rank6)] != EMPTY ||
-                 pos->board[sq_make(epfile, rank7)] != EMPTY,
-                 "fen warn: wrong en-passant settings. (fixed)\n")) {
-#           ifdef DEBUG_FEN
-            printf("ep5=%o ep6=%o ep7=%o\n", sq_make(epfile, rank5),
-                   sq_make(epfile, rank6), sq_make(epfile, rank7));
-#           endif
+    if (ep != SQUARE_NONE) {
+        rank_t eprank = sq_rank(ep);
+        rank_t rank6 = sq_rel_rank(RANK_6, us);
+        piece_t pawn = MAKE_PIECE(PAWN, them);
+        bitboard_t att = bb_pawn_attacks[them][ep] & pos->bb[us][PAWN];
+
+        if (eprank != rank6 ||
+            pos->board[ep - up] != pawn ||
+            pos->board[ep] != EMPTY ||
+            pos->board[ep + up] != EMPTY ||
+            att == 0ull) {
+
             warning++;
-            pos->en_passant = SQUARE_NONE;
+            if (fixit) {
+                warn(true, "pos warn: wrong en-passant settings (fixed).\n");
+                pos->en_passant = SQUARE_NONE;
+            }
         }
     }
 
     for (int color = WHITE; color <= BLACK; ++color) {
-        rank_t rank1 = color == WHITE? RANK_1: RANK_8;
+        rank_t rank1 = sq_rel_rank(RANK_1, color);
 
         /* castling */
         /* where K and R should be for valid castle flag */
@@ -109,28 +112,28 @@ static int fen_check(pos_t *pos)
         bitboard_t r_q  = bb_sq[sq_make(FILE_A, rank1)];
 
        /* where they are */
-        bitboard_t kings = pos->bb[color][KING];
-        bitboard_t rooks = pos->bb[color][ROOK];
+        bitboard_t kingbb = pos->bb[color][KING];
+        bitboard_t rookbb = pos->bb[color][ROOK];
         castle_rights_t castle_k = color == WHITE? CASTLE_WK: CASTLE_BK;
         castle_rights_t castle_q = color == WHITE? CASTLE_WQ: CASTLE_BQ;
-        if (pos->castle & castle_k) {
-            if (warn(!(k & kings && r_k & rooks),
-                     "fen warn: wrong %s short castling K or R position (fixed)\n",
-                     colstr[color])) {
-                warning++;
+        if (pos->castle & castle_k && !(k & kingbb && r_k & rookbb)) {
+            warning++;
+            if (fixit) {
+                warn(true, "fen warn: wrong %s short castling (fixed)\n",
+                     colstr[color]);
                 pos->castle &= ~castle_k;
             }
         }
-        if (pos->castle & castle_q) {
-            if (warn(!(k & kings && r_q & rooks),
-                     "fen warn: wrong %s long castling K or R position (fixed)\n",
-                     colstr[color])) {
-                warning++;
+        if (pos->castle & castle_q && !(k & kingbb && r_q & rookbb)) {
+            warning++;
+            if (fixit) {
+                warn(true, "fen warn: wrong %s long castling (fixed)\n",
+                     colstr[color]);
                 pos->castle &= ~castle_q;
             }
         }
     }
-    return pos_ok(pos, 0) ? warning: -1;
+    return warning;
 }
 
 /**
@@ -162,7 +165,7 @@ pos_t *fen2pos(pos_t *pos, const char *fen)
     char *p;
     short rank, file, tmp;
     piece_t piece;
-    int consumed, err_line = 0, err_pos, err_char;
+    int consumed, err_line = 0, err_pos = 0, err_char = 0;
     pos_t tmppos;
 
     pos_clear(&tmppos);
@@ -184,6 +187,8 @@ pos_t *fen2pos(pos_t *pos, const char *fen)
                   piece, PIECE(piece), COLOR(piece));
 #           endif
             pos_set_sq(&tmppos, sq_make(file, rank), piece);
+            if (PIECE(piece) == KING)
+                tmppos.king[COLOR(piece)] = sq_make(file, rank);
             file++;
         } else {                                  /* error */
             err_line = __LINE__, err_char = *cur, err_pos = cur - fen;
@@ -225,12 +230,12 @@ pos_t *fen2pos(pos_t *pos, const char *fen)
 
     /* 5) half moves since last capture or pawn move (50 moves rule)
      */
-    tmppos.clock_50 = 0;
+    tmppos.ply50 = 0;
     tmppos.plycount = 1;
     if (sscanf(cur, "%hd%n", &tmp, &consumed) != 1)
         goto end;                                 /* early end, ignore w/o err */
 
-    tmppos.clock_50 = tmp;
+    tmppos.ply50 = tmp;
     cur += consumed;
     SKIP_BLANK(cur);
 
@@ -248,13 +253,16 @@ end:
              err_line, err_pos, err_char, err_char)) {
         return NULL;
     }
-    if (fen_check(&tmppos) < 0)
-        return NULL;
+
+    fen_ok(&tmppos, true);                        /* fix e.p & castling flags */
+    if (!pos_ok(&tmppos, false))
+        return NULL;                              /* invalid position: ignored */
+
+    tmppos.key = zobrist_calc(&tmppos);
+    tmppos.phase = calc_phase(&tmppos);
     if (!pos)
-        pos = pos_dup(&tmppos);
-    //puts("prout 1");
-    //pos_print_raw(&tmppos, 1);
-    //puts("prout 2");
+        pos = pos_new();
+    pos_copy(&tmppos, pos);
 #   ifdef DEBUG_FEN
     pos_print_raw(&tmppos, 1);
 #   endif
@@ -282,11 +290,11 @@ char *pos2fen(const pos_t *pos, char *fen)
     int cur = 0;
 
     if (!fen)
-        fen = safe_malloc(92);
+        fen = safe_alloc(92);
 
     /*  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];
@@ -324,7 +332,7 @@ char *pos2fen(const pos_t *pos, char *fen)
         fen[cur++] = '-';
     } else {
         for (int i = 0; i < 4; ++i)
-            if (pos->castle & mask(i))
+            if (pos->castle & BIT(i))
                 fen[cur++] = castle_str[i];
     }
     fen[cur++] = ' ';
@@ -334,15 +342,15 @@ char *pos2fen(const pos_t *pos, char *fen)
     if (pos->en_passant == SQUARE_NONE) {
         fen[cur++] = '-';
     } else {
-        fen[cur++] = FILE2C(sq_file(pos->en_passant));
-        fen[cur++] = RANK2C(sq_rank(pos->en_passant));
+        strcpy(fen+cur, sq_to_string(pos->en_passant));
+        cur += 2;
     }
     fen[cur++] = ' ';
 
     /* 5) moves since last capture or pawn move (50 moves rule)
      * 6) current full move number, starting with 1
      */
-    sprintf(fen+cur, "%d %d", pos->clock_50,
+    sprintf(fen+cur, "%d %d", pos->ply50,
             1 + (pos->plycount - (pos->turn == BLACK)) / 2);
     return fen;
 }

src/fen.h

@@ -20,6 +20,7 @@
 
 extern const char *startfen;                      /* startup position */
 
+extern int fen_ok(pos_t *pos, bool fixit);
 extern pos_t *startpos(pos_t *pos);
 extern pos_t *fen2pos(pos_t *pos, const char *fen);
 extern char *pos2fen(const pos_t *pos, char *fen);

src/hash.c

@@ -0,0 +1,415 @@
+/* hash.c - hash 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 <string.h>
+#include <assert.h>
+
+#include <brlib.h>
+#include <bitops.h>
+#include <bug.h>
+
+#include "chessdefs.h"
+#include "util.h"
+#include "alloc.h"
+#include "position.h"
+#include "piece.h"
+#include "hash.h"
+
+u64 zobrist_pieces[16][64];
+u64 zobrist_castling[4 * 4 + 1];
+u64 zobrist_turn;                                 /* for black, XOR each ply */
+u64 zobrist_ep[9];                                /* 0-7: ep file, 8: SQUARE_NONE */
+
+hasht_t hash_tt;                                  /* main transposition table */
+
+/**
+ * zobrist_init() - initialize zobrist tables.
+ *
+ * Initialize all zobrist random bitmasks. Must be called before any other
+ * zobrist function, and can be called once only (further calls will be ignored).
+ */
+void zobrist_init(void)
+{
+    static bool called = false;
+    if (!called) {
+        called = true;
+        for (color_t c = WHITE; c <= BLACK; ++c) {
+            for (piece_type_t p = PAWN; p <= KING; ++p)
+                for (square_t sq = A1; sq <= H8; ++sq)
+                    zobrist_pieces[MAKE_PIECE(p, c)][sq] = rand64();
+        }
+        for (castle_rights_t c = CASTLE_NONE; c <= CASTLE_ALL; ++c)
+            zobrist_castling[c] = rand64();
+        for (file_t f = FILE_A; f <= FILE_H; ++f)
+            zobrist_ep[f] = rand64();
+        zobrist_ep[8] = 0;                        /* see EP_ZOBRIST_IDX macro */
+        zobrist_turn = rand64();
+    }
+}
+
+/**
+ * zobrist_calc() - calculate a position zobrist hash.
+ * @pos: &position
+ *
+ * Normally, Zobrist keys are incrementally calculated when doing or
+ * undoing a move.
+ * This function should normally only be called:
+ * - When starting a new position
+ * - To verify incremental Zobrist calculation is correct
+ *
+ * @return: @pos Zobrist key
+ */
+hkey_t zobrist_calc(pos_t *pos)
+{
+    hkey_t key = 0;
+
+    if (pos->turn == BLACK)
+        key ^= zobrist_turn;
+
+    for (color_t c = WHITE; c <= BLACK; ++c) {
+        for (piece_type_t pt = PAWN; pt <= KING; ++pt) {
+            piece_t piece = MAKE_PIECE(pt, c);
+            bitboard_t bb = pos->bb[c][pt];
+            while (bb) {
+                square_t sq = bb_next(&bb);
+                key ^= zobrist_pieces[piece][sq];
+            }
+        }
+    }
+    key ^= zobrist_castling[pos->castle];
+    key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
+
+    return key;
+}
+
+/**
+ * zobrist_verify() - verify current position Zobrist key.
+ * @pos: &position
+ *
+ * Verify that position Zobrist key matches a full Zobrist calculation.
+ * This function cannot be called if ZOBRIST_VERIFY is not set.
+ *
+ * @return: True if Zobrist key is OK.
+ */
+#ifdef ZOBRIST_VERIFY
+
+bool zobrist_verify(pos_t *pos)
+{
+    hkey_t diff, key = zobrist_calc(pos);
+    if (pos->key == key)
+        return true;
+
+    printf("key verify: cur=%#lx != %#lx\n", pos->key, key);
+
+    /* try to find-out the key in different zobrist tables */
+    diff = pos->key ^ key;
+
+    for (color_t c = WHITE; c <= BLACK; ++c) {
+        for (piece_type_t p = PAWN; p <= KING; ++p)
+            for (square_t sq = A1; sq <= H8; ++sq)
+                if (diff == zobrist_pieces[MAKE_PIECE(p, c)][sq]) {
+                    warn(true, "zobrist difference is piece:[%s][%s]\n",
+                         piece_to_fen(MAKE_PIECE(p, c)), sq_to_string(sq));
+                    goto end;
+                }
+    }
+    for (castle_rights_t c = CASTLE_NONE; c <= CASTLE_ALL; ++c) {
+        if (diff == zobrist_castling[c]) {
+            warn(true, "zobrist difference is castling:[%d]\n", c);
+            goto end;
+        }
+    }
+
+    for (file_t f = FILE_A; f <= FILE_H; ++f) {
+        if (diff == zobrist_ep[f]) {
+            warn(true, "zobrist difference is ep:[%d]\n", f);
+            goto end;
+        }
+    }
+    if (diff == zobrist_turn) {
+        warn(true, "zobrist difference is turn\n");
+        goto end;
+    }
+    warn(true, "zobrist diff %lx is unknown\n", diff);
+end:
+    bug_on_always(false);
+    /* not reached */
+    return true;
+}
+
+#endif
+
+/**
+ * tt_create() - create transposition table
+ * @sizemb: s32 size of hash table in Mb
+ *
+ * Create a hash table of max @sizemb (or HASH_SIZE_MBif @sizemb <= 0) Mb size.
+ * This function must be called at startup.
+ *
+ * The number of bucket_t entries fitting in @sizemb is calculated, and rounded
+ * (down) to a power of 2.
+ * This means the actual size could be lower than @sizemb (nearly halved in
+ * worst case).
+ *
+ * If transposition hashtable already exists and new size would not change,
+ * the old one is cleared.
+ * If transposition hashtable already exists and new size is different,
+ * the old one is destroyed first (old data is not preserved).
+ *
+ * TODO:
+ * - Rebuild old hashtable data ?
+ *
+ * @return: hash table size in Mb. If memory allocation fails, the function does
+ * not return.
+ */
+int tt_create(s32 sizemb)
+{
+    size_t bytes, target_nbuckets;
+    u32 nbits;
+
+    static_assert(sizeof(hentry_t) == 16, "fatal: hentry_t size != 16");
+
+    //printf("mb = %'7u ", sizemb);
+    /* adjust tt size */
+    if (sizemb <= 0)
+        sizemb = HASH_SIZE_DEFAULT;
+    sizemb = clamp(sizemb, HASH_SIZE_MIN, HASH_SIZE_MAX);
+
+    bytes = sizemb * 1024ull * 1024ull;           /* bytes wanted */
+    target_nbuckets = bytes / sizeof(bucket_t);   /* target buckets */
+
+    nbits = msb64(target_nbuckets);               /* adjust to power of 2 */
+
+    if (hash_tt.nbits != nbits) {
+        if (hash_tt.keys)
+            tt_delete();
+
+        hash_tt.nbits    = nbits;
+
+        hash_tt.nbuckets = BIT(hash_tt.nbits);
+        hash_tt.nkeys    = hash_tt.nbuckets * ENTRIES_PER_BUCKET;
+
+        hash_tt.bytes    = hash_tt.nbuckets * sizeof(bucket_t);
+        hash_tt.mb       = hash_tt.bytes / 1024 / 1024;
+
+        hash_tt.mask     = -1ull >> (64 - nbits);
+
+        hash_tt.keys     = safe_alloc_aligned_hugepage(hash_tt.bytes);
+
+        //printf("bits=%2d size=%'15lu/%'6d Mb/%'14lu buckets ",
+        //       hash_tt.nbits, hash_tt.bytes, hash_tt.mb, hash_tt.nbuckets);
+        //printf("mask=%9x\n", hash_tt.mask);
+    }
+    //else {
+    //    printf("unchanged (cleared)\n");
+    //}
+    /* attention - may fail ! */
+    tt_clear();
+
+    return hash_tt.nbits;
+}
+
+/**
+ * tt_clear() - clear transposition table
+ *
+ * Reset hashtable entries (if available) and statistic information.
+ */
+void tt_clear()
+{
+    if (hash_tt.keys)
+        memset(hash_tt.keys, 0, hash_tt.bytes);
+
+    hash_tt.used_keys = 0;
+    hash_tt.collisions = 0;
+    hash_tt.hits = 0;
+    hash_tt.misses = 0;
+}
+
+/**
+ * tt_delete() - delete transposition table
+ *
+ * free hashtable data.
+ */
+void tt_delete()
+{
+    if (hash_tt.keys) {
+        safe_free(hash_tt.keys);
+        hash_tt.keys = NULL;
+    }
+    tt_clear();
+}
+
+/**
+ * tt_probe() - probe tt for an entry
+ *
+ *
+ */
+hentry_t *tt_probe(hkey_t key)
+{
+    bucket_t *bucket;
+    hentry_t *entry;
+    int i;
+
+    bug_on(!hash_tt.keys);
+    bucket = hash_tt.keys + (key & hash_tt.mask);
+
+    /* find key in buckets */
+    for (i = 0; i < ENTRIES_PER_BUCKET; ++i) {
+        entry = bucket->entry + i;
+        if (key == entry->key)
+            break;
+    }
+    if (i < ENTRIES_PER_BUCKET)
+        return entry;
+    return NULL;
+}
+
+/**
+ * tt_probe_perft() - probe tt for an entry (perft version)
+ * @key:   Zobrist (hkey_t) key
+ * @depth: depth from search root
+ *
+ * Search transposition for @key entry with @depth depth.
+ *
+ * @return: @hentry_t address is found, TT_MISS otherwise.
+ */
+hentry_t *tt_probe_perft(const hkey_t key, const u16 depth)
+{
+    bucket_t *bucket;
+    hentry_t *entry;
+    int i;
+
+    bug_on(!hash_tt.keys);
+    bucket = hash_tt.keys + (key & hash_tt.mask);
+
+    /* find key in buckets */
+    for (i = 0; i < ENTRIES_PER_BUCKET; ++i) {
+        entry = bucket->entry + i;
+        if (key == entry->key && HASH_PERFT_DEPTH(entry->data) == depth) {
+            hash_tt.hits++;
+            /*
+             * printf("tt hit: key=%lx depth=%d bucket=%lu entry=%d!\n",
+             *        key, depth, bucket - hash_tt.keys, i);
+             */
+            return entry;
+        }
+    }
+    /*
+     * printf("tt miss: key=%lx depth=%d ucket=%lu\n",
+     *        key, depth, bucket - hash_tt.keys);
+     */
+    hash_tt.misses++;
+    return TT_MISS;
+}
+
+/**
+ * tt_store_perft() - store a transposition table entry (perft version)
+ * @key:   Zobrist (hkey_t) key
+ * @depth: depth from search root
+ * @nodes: value to store
+ *
+ */
+hentry_t *tt_store_perft(const hkey_t key, const u16 depth, const u64 nodes)
+{
+    bucket_t *bucket;
+    hentry_t *entry;
+    int replace = -1;
+    uint mindepth = 1024;
+    u64 data = HASH_PERFT(depth, nodes);
+
+    //printf("tt_store: key=%lx data=%lx depth=%d=%d nodes=%lu=%lu\n",
+    //       key, data, depth, HASH_PERFT_DEPTH(data), nodes, HASH_PERFT_VAL(data));
+    /*
+     * printf("tt_store: key=%lx depth=%d nodes=%lu ",
+     *        key, depth, nodes);
+     */
+    bug_on(!hash_tt.keys);
+    bucket = hash_tt.keys + (key & hash_tt.mask);
+
+    /* find key in buckets */
+    for (int i = 0; i < ENTRIES_PER_BUCKET; ++i) {
+        entry = bucket->entry + i;
+        //if (!entry->key) {
+        //    replace = i;
+            //hash_tt.used_keys++;
+        //    break;
+        //}
+        if (key == entry->key) {
+            if (depth == HASH_PERFT_DEPTH(entry->data)) {
+                printf("tt_store: dup key=%lx depth=%d, this should not happen!\n",
+                       key, depth);
+                return NULL;
+            }
+        }
+        /* always keep higher nodes */
+        if (HASH_PERFT_DEPTH(entry->data) < mindepth) {
+            mindepth = HASH_PERFT_DEPTH(entry->data);
+            replace = i;
+        }
+    }
+
+    if (replace >= 0) {
+        entry = bucket->entry + replace;
+
+        hash_tt.used_keys  += entry->key == 0;
+        hash_tt.collisions += entry->key && (key != entry->key);
+        /*
+         * if (HASH_PERFT_VAL(entry->data)) {
+         *     printf("REPL entry=%lu[%d] key=%lx->%lx val=%lu->%lu\n",
+         *            bucket - hash_tt.keys, replace,
+         *            entry->key, key,
+         *            HASH_PERFT_VAL(entry->data), nodes);
+         * } else {
+         *     printf("NEW entry=%lu[%d] key=%lx val=%lu\n",
+         *            bucket - hash_tt.keys, replace,
+         *            entry->key, nodes);
+         * }
+         */
+        entry->key = key;
+        entry->data = data;
+        return entry;
+    } else {
+        //printf("TT full, skip\n");
+    }
+    return NULL;
+}
+
+/**
+ * tt_info() - print hash-table information.
+ */
+void tt_info()
+{
+    if (hash_tt.keys) {
+        printf("TT: Mb:%d buckets:%'lu (bits:%u mask:%#x) entries:%'lu\n",
+               hash_tt.mb, hash_tt.nbuckets, hash_tt.nbits,
+               hash_tt.mask, hash_tt.nkeys);
+    } else {
+        printf("TT: not set.\n");
+    }
+}
+
+/**
+ * tt_stats() - print hash-table usage.
+ */
+void tt_stats()
+{
+    if (hash_tt.keys) {
+        float percent = 100.0 * hash_tt.used_keys / hash_tt.nkeys;
+        printf("hash: used:%'lu/%'lu (%.2f%%) hit:%'lu miss:%'lu coll:%'lu\n",
+               hash_tt.used_keys, hash_tt.nkeys, percent,
+               hash_tt.hits, hash_tt.misses,
+               hash_tt.collisions);
+    } else {
+        printf("hash: not set.\n");
+    }
+}

src/hash.h

@@ -0,0 +1,145 @@
+/* hash.h - hash 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 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   16                    /* default: 16Mb */
+#define HASH_SIZE_MIN        1
+#define HASH_SIZE_MAX    32768                    /* 32Gb */
+
+#define TT_MISS   NULL
+#define TT_DUP    (void *) U64(0x01)
+#define TT_OK(p)  ((p) > (void *)U64(0xF))
+
+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.
+ *
+ * Size should be exactly 16 bytes. If impossible to fit necessary data in
+ * 16 bytes in future, it should be updated to be exactly 32 bytes.
+ */
+typedef struct {
+    hkey_t key;                                   /* zobrist */
+    union {
+        u64 data;
+        struct {
+            u16 depth;                            /* ply in search */
+            s16 eval;
+            move_t move;
+            //u8 flags;                             /* maybe for locking, etc... */
+            //u8 filler;
+        };
+    };
+} hentry_t;
+
+/* hentry perft data:
+ * 0-47:  perft value
+ * 48-63: depth
+ */
+#define HASH_PERFT_MASK        U64(0xffffffffffff)
+#define HASH_PERFT(depth, val) ((((u64) depth) << 48) | ((val) & HASH_PERFT_MASK))
+#define HASH_PERFT_VAL(data)   ((data) & HASH_PERFT_MASK)
+#define HASH_PERFT_DEPTH(data) ((u16)((data) >> 48))
+
+
+typedef struct {
+    hentry_t entry[ENTRIES_PER_BUCKET];
+} bucket_t;
+
+typedef struct {
+    bucket_t *keys;                               /* &hashtable entries */
+
+    /* memory size in bytes/mb */
+    size_t bytes;
+    u32  mb;
+
+    /* size in buckets/keys */
+    size_t nbuckets;
+    size_t nkeys;                                 /* nbuckets * NBUCKETS */
+
+    /* internal representation */
+    u32  nbits;                                   /* #buckets in bits, power of 2 */
+    u32  mask;                                    /* nbuckets - 1, key mask */
+
+    /* stats - unsure about usage */
+    //size_t used_buckets;
+    size_t used_keys;
+    u64 collisions;
+    u64 hits;
+    u64 misses;
+} hasht_t;
+
+/* hack:
+ *  ep zobrist key index is 0-7 for each en-passant file, 8 for SQUARE_NONE.
+ * To transform :
+ *   - ep == 64 (SQUARE_NONE) to id = 8
+ *   - ep == 0~63 to idx = sq_file(ep), i.e. (ep & 7)
+ * we use the formula:
+ * idx = ( ( ep & SQUARE_NONE ) >> 3 ) | sq_file(ep);
+ */
+#define EP_ZOBRIST_IDX(ep) ( ( ( ep & SQUARE_NONE ) >> 3 ) | sq_file(ep) )
+
+extern hkey_t zobrist_pieces[16][64];
+extern hkey_t zobrist_castling[4 * 4 + 1];
+extern hkey_t zobrist_turn;                        /* for black, XOR each ply */
+extern hkey_t zobrist_ep[9];                       /* 0-7: ep file, 8: SQUARE_NONE */
+
+extern hasht_t hash_tt;                           /* main transposition table */
+
+void zobrist_init(void);
+hkey_t zobrist_calc(pos_t *pos);
+
+#ifdef ZOBRIST_VERIFY
+bool zobrist_verify(pos_t *pos);
+#else
+#define zobrist_verify(p) true
+#endif
+
+/**
+ * tt_prefetch() - prefetch hash table entry
+ * @hash: u64 key
+ *
+ * Prefetch memory for @key.
+ */
+static inline void tt_prefetch(hkey_t key)
+{
+    bug_on(!hash_tt.keys);
+    __builtin_prefetch(hash_tt.keys + (key & hash_tt.mask));
+}
+
+int tt_create(int Mb);
+void tt_clear(void);
+void tt_delete(void);
+
+hentry_t *tt_probe(hkey_t key);
+hentry_t *tt_probe_perft(const hkey_t key, const u16 depth);
+hentry_t *tt_store_perft(const hkey_t key, const u16 depth, const u64 nodes);
+void tt_info(void);
+void tt_stats(void);
+
+#endif  /* HASH_H */

src/hist.c

@@ -0,0 +1,177 @@
+/* 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_next() - get next history slot.
+ *
+ * return: @state_t next history slot.
+ */
+state_t *hist_next(void)
+{
+    return hist.state + hist.nstates++;
+}
+
+/**
+ * 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 r=%d) ",
+               move_to_str(movestr, st->move, 0),
+               hash_short(st->key),
+               st->repcount);
+        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 r=%d) ",
+               move_to_str(movestr, st->move, 0),
+               hash_short(st->key),
+               st->repcount);
+        if (st == HIST_START)
+            break;
+        st = hist_prev(st);
+    }
+    printf("\n");
+}

src/hist.h

@@ -0,0 +1,62 @@
+/* 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);
+state_t *hist_next(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/hq.c

@@ -1,4 +1,4 @@
-/* hyperbola-quintessence.c - hyperbola quintessence functions.
+/* hq.c - hyperbola quintessence functions.
  *
  * Copyright (C) 2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -14,18 +14,18 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "chessdefs.h"
 #include "board.h"
 #include "bitboard.h"
-#include "hyperbola-quintessence.h"
+#include "hq.h"
 
 
 uchar bb_rank_attacks[64 * 8];
 
 /**
- * hyperbola_init() - init hyperbola quintessence attack bitboards
+ * hq_init() - init hyperbola quintessence attack bitboards
  *
  * See: https://www.chessprogramming.org/Kindergarten_Bitboards
  * and  https://www.chessprogramming.org/Hyperbola_Quintessence
@@ -45,18 +45,17 @@ uchar bb_rank_attacks[64 * 8];
  *      (O <<= 2)
  *
  * TODO ? create masks excluding slider (eg. bb_diag ^ bb_sq[square]),
- * to save one operation in hyperbola_moves().
+ * to save one operation in hq_moves().
  * TODO ? replace rank attack with this idea, mapping rank to diagonal ?
  * See http://timcooijmans.blogspot.com/2014/04/
  */
-void hyperbola_init()
+void hq_init()
 {
     /* generate rank attacks, not handled by HQ
      */
     for (int occ = 0; occ < 64; ++occ) {
         for (int file = 0; file < 8; ++file) {
             int attacks = 0;
-            //int o = mask << 1;                    /* skip right square */
 
             /* set f left attacks */
             for (int slide = file - 1; slide >= 0; --slide) {
@@ -70,23 +69,15 @@ void hyperbola_init()
                 int b = bb_sq[slide];
                 attacks |= b;
                 if ((occ << 1) & b)               /* piece on b, we stop */
-                    //if ((o & b) == b)
                     break;
             }
             bb_rank_attacks[(occ << 3) + file] = attacks;
-
-            //if (((occ << 3) + file) == 171) {
-            //char str[64], str2[64];
-               //printf("mask=%x=%s file=%d att=%x=%s\n",
-               //       occ, bitboard_rank_sprint(str, occ), file,
-               //       attacks, bitboard_rank_sprint(str2, attacks));
-            //}
         }
     }
 }
 
 /**
- * hyperbola_rank_moves() - get rank moves for a sliding piece.
+ * hq_rank_moves() - get rank moves for a sliding piece.
  * @pieces: occupation bitboard
  * @sq: piece square
  *
@@ -95,22 +86,16 @@ void hyperbola_init()
  *
  * @Return: bitboard of @piece available pseudo-moves.
  */
-bitboard_t hyperbola_rank_moves(bitboard_t occ, square_t sq)
+bitboard_t hq_rank_moves(bitboard_t occ, square_t sq)
 {
     u32 rank = sq & SQ_RANKMASK;
     u32 file = sq & SQ_FILEMASK;
     u64 o = (occ >> rank) & 0176;                 /* 01111110 clear bits 0 & 7 */
-    //char zob[128], zob2[128];
-    //printf("rank_moves: occ=%lx=%s file=%d o=%lx=%s index=%ld=%ld attack=%lx=%s\n", occ,
-    //       bitboard_rank_sprint(zob, occ), file, o,
-    //       bitboard_rank_sprint(zob, o), (o << 2) + file, (o * 4) + file,
-    //       (bitboard_t)bb_rank_attacks[(o << 2) + file] << rank,
-    //       bitboard_rank_sprint(zob2, (bitboard_t)bb_rank_attacks[(o << 2) + file] << rank));
     return ((bitboard_t)bb_rank_attacks[(o << 2) + file]) << rank;
 }
 
 /**
- * hyperbola_moves() - get hyperbola pseudo-moves for a sliding piece
+ * hq_moves() - get hyperbola pseudo-moves for a sliding piece
  * @pieces: occupation bitboard
  * @sq: piece square
  * @mask: the appropriate mask (pre-calculated)
@@ -122,80 +107,80 @@ bitboard_t hyperbola_rank_moves(bitboard_t occ, square_t sq)
  *
  * @Return: bitboard of piece available pseudo-moves.
  */
-bitboard_t hyperbola_moves(const bitboard_t pieces, const square_t sq,
+bitboard_t hq_moves(const bitboard_t pieces, const square_t sq,
                                    const bitboard_t mask)
 {
     bitboard_t o = pieces & mask;
     bitboard_t r = bswap64(o);
     square_t  r_sq = FLIP_V(sq);
 
-    return (         (o - 2 * mask(sq)   )
-            ^ bswap64(r - 2 * mask(r_sq)))
+    return (         (o - 2 * BIT(sq)   )
+            ^ bswap64(r - 2 * BIT(r_sq)))
         & mask;
 }
 
 /**
- * hyperbola_file_moves() - get file pseudo-moves for a sliding piece.
+ * hq_file_moves() - get file pseudo-moves for a sliding piece.
  * @pieces: occupation bitboard
  * @sq: piece square
  *
  * @Return: bitboard of piece available pseudo-moves on its file.
  */
-bitboard_t hyperbola_file_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_file_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_moves(occ, sq, bb_sqfile[sq]);
+    return hq_moves(occ, sq, bb_sqfile[sq]);
 }
 
 /**
- * hyperbola_diag_moves() - get diagonal pseudo-moves for a sliding piece.
+ * hq_diag_moves() - get diagonal pseudo-moves for a sliding piece.
  * @pieces: occupation bitboard
  * @sq: piece square
  *
  * @Return: bitboard of piece available pseudo-moves on its diagonal.
  */
-bitboard_t hyperbola_diag_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_diag_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_moves(occ, sq, bb_sqdiag[sq]);
+    return hq_moves(occ, sq, bb_sqdiag[sq]);
 }
 
 /**
- * hyperbola_anti_moves() - get anti-diagonal pseudo-moves for a sliding piece.
+ * hq_anti_moves() - get anti-diagonal pseudo-moves for a sliding piece.
  * @pieces: occupation bitboard
  * @sq: piece square
  *
  * @Return: bitboard of piece available pseudo-moves on its anti-diagonal.
  */
-bitboard_t hyperbola_anti_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_anti_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_moves(occ, sq, bb_sqanti[sq]);
+    return hq_moves(occ, sq, bb_sqanti[sq]);
 }
 
 /**
- * hyperbola_bishop_moves() - get bitboard of bishop pseudo-moves
+ * hq_bishop_moves() - get bitboard of bishop pseudo-moves
  * @occ: occupation bitboard
  * @sq: bishop square
  *
  * @Return: bitboard of bishop available pseudo-moves.
  */
-bitboard_t hyperbola_bishop_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_bishop_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_diag_moves(occ, sq) | hyperbola_anti_moves(occ, sq);
+    return hq_diag_moves(occ, sq) | hq_anti_moves(occ, sq);
 }
 
 /**
- * hyperbola_rook_moves() - get bitboard of rook pseudo-moves
+ * hq_rook_moves() - get bitboard of rook pseudo-moves
  * @occ: occupation bitboard
  * @sq: rook square
  *
  * @Return: bitboard of rook available pseudo-moves.
  */
-bitboard_t hyperbola_rook_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_rook_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_file_moves(occ, sq) | hyperbola_rank_moves(occ, sq);
+    return hq_file_moves(occ, sq) | hq_rank_moves(occ, sq);
 }
 
 /**
- * hyperbola_queen_moves() - get bitboard of queen pseudo-moves
+ * hq_queen_moves() - get bitboard of queen pseudo-moves
  * @occ: occupation bitboard
  * @sq: queen square
  *
@@ -204,7 +189,7 @@ bitboard_t hyperbola_rook_moves(const bitboard_t occ, const square_t sq)
  *
  * @Return: bitboard of queen available pseudo-moves.
  */
-bitboard_t hyperbola_queen_moves(const bitboard_t occ, const square_t sq)
+bitboard_t hq_queen_moves(const bitboard_t occ, const square_t sq)
 {
-    return hyperbola_bishop_moves(occ, sq) | hyperbola_rook_moves(occ, sq);
+    return hq_bishop_moves(occ, sq) | hq_rook_moves(occ, sq);
 }

src/hq.h

@@ -0,0 +1,33 @@
+/* hq.h - hyperbola-quintessence definitions.
+ *
+ * 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 _HQ_H
+#define _HQ_H
+
+#include "board.h"
+#include "bitboard.h"
+
+void hq_init(void);
+
+bitboard_t hq_rank_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hq_moves(const bitboard_t pieces, const square_t sq,
+                           const bitboard_t mask);
+bitboard_t hq_file_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hq_diag_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hq_anti_moves(const bitboard_t occ, const square_t sq);
+
+bitboard_t hq_bishop_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hq_rook_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hq_queen_moves(const bitboard_t occ, const square_t sq);
+
+#endif  /* _HQ_H */

src/hyperbola-quintessence.h

@@ -1,33 +0,0 @@
-/* hyperbola-quintessence.h - hyperbola-quintessence definitions.
- *
- * 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 _HYPERBOLA_QUINTESSENCE_H
-#define _HYPERBOLA_QUINTESSENCE_H
-
-#include "board.h"
-#include "bitboard.h"
-
-void hyperbola_init(void);
-
-bitboard_t hyperbola_rank_moves(const bitboard_t occ, const square_t sq);
-bitboard_t hyperbola_moves(const bitboard_t pieces, const square_t sq,
-                           const bitboard_t mask);
-bitboard_t hyperbola_file_moves(const bitboard_t occ, const square_t sq);
-bitboard_t hyperbola_diag_moves(const bitboard_t occ, const square_t sq);
-bitboard_t hyperbola_anti_moves(const bitboard_t occ, const square_t sq);
-
-bitboard_t hyperbola_bishop_moves(const bitboard_t occ, const square_t sq);
-bitboard_t hyperbola_rook_moves(const bitboard_t occ, const square_t sq);
-bitboard_t hyperbola_queen_moves(const bitboard_t occ, const square_t sq);
-
-#endif  /* _HYPERBOLA_QUINTESSENCE_H */

src/init.c

@@ -0,0 +1,75 @@
+/* init.c - initialize all.
+ *
+ * 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 <unistd.h>
+#include <locale.h>
+
+#include "chessdefs.h"
+#include "util.h"
+#include "bitboard.h"
+#include "hq.h"
+#include "eval-defs.h"
+#include "hash.h"
+#include "hist.h"
+
+#define printff(x) ({ printf(x); fflush(stdout); })
+
+void init_all(void)
+{
+    printff("initiazing system: ");
+    /* line-buffered stdout */
+    printff("stdout buffering... ");
+    setlinebuf(stdout);
+
+    printff("locale... ");
+    /* for printf() thousands separator */
+    setlocale(LC_NUMERIC, "");
+    setlocale(LC_CTYPE, "C");
+
+    /* pseudo random generator seed */
+    printff("random generator... ");
+    rand_init(RAND_SEED_DEFAULT);
+
+    printf("done.\n");
+
+    printff("initiazing board data: ");
+    /* bitboards & hq */
+    printff("bitboards... ");
+    bitboard_init();
+
+    printff("hq bitboards... ");
+    hq_init();
+
+    printf("done.\n");
+
+    printff("initiazing move data: ");
+    /* zobrist tables & default tt hashtable */
+    printff("zobrist tables... ");
+    zobrist_init();
+
+    printff("transposition tables... ");
+    tt_create(HASH_SIZE_DEFAULT);
+
+    printf("done.\n");
+
+    printff("initiazing eval data: ");
+    printf("parameters... ");
+    param_init();
+
+    /* eval tables */
+    printf("pst tables... ");
+    pst_init(PST_DEFAULT);
+
+    printf("done.\n");
+}

src/move-do.c

@@ -15,14 +15,16 @@
 #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"
 #include "position.h"
 #include "move-do.h"
+#include "hash.h"
+#include "hist.h"
 
 /**
  * move_do() - do move.
@@ -39,63 +41,84 @@
  *   - castling
  *   - en-passant
  * - captured piece (excl. en-passant)
+ * - tt hash values are updated for:
+ *   - side-to-move
+ *   - en-passant
+ *   - castling rights.
  *
- * @return: pos.
+ * @return: updated pos.
  */
-pos_t *move_do(pos_t *pos, const move_t move) //, state_t *state)
+pos_t *move_do(pos_t *pos, const move_t move, state_t *state)
 {
-//#   ifdef DEBUG_MOVE_DO
-//    move_print(move, M_PR_NL | M_PR_LONG);
-//#   endif
-    //*state = pos->state;                          /* save irreversible changes */
-
     color_t us = pos->turn, them = OPPONENT(us);
     square_t from = move_from(move), to = move_to(move);
     piece_t piece = pos->board[from];
+    piece_t captured = pos->board[to];
     piece_type_t ptype = PIECE(piece);
-    color_t pcolor = COLOR(piece);
     piece_t new_piece = piece;
+    int up = sq_up(us);
+    hkey_t key = pos->key;
 
-    ++pos->clock_50;
+    *state = pos->state;                          /* save irreversible changes */
+    pos->prev = state;
+
+    /* update key: switch turn, reset castling and ep */
+    key ^= zobrist_turn;
+    key ^= zobrist_castling[pos->castle];
+    key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
+
+    ++pos->ply50;
     ++pos->plycount;
+    ++pos->plyroot;
     pos->en_passant = SQUARE_NONE;
     pos->turn = them;
+    pos->captured = captured;
+    pos->move = move;
 
-    bug_on(pcolor != us);
+    bug_on(COLOR(piece) != us);
 
     if (is_promotion(move)) {
         bug_on(sq_rank(to) != sq_rel_rank(RANK_8, us));
         new_piece = MAKE_PIECE(move_promoted(move), us);
     }
 
-    if (is_capture(move)) {
-        pos->clock_50 = 0;
-        pos->captured = pos->board[to];           /* save capture info */
+    if (captured != EMPTY) {
+        pos->ply50 = 0;
         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 {
             rookfrom = sq_rel(A1, us);
             rookto = sq_rel(D1, us);
         }
+        key ^= zobrist_pieces[pos->board[rookfrom]][rookto] ^
+            zobrist_pieces[pos->board[rookfrom]][rookfrom];
         pos_set_sq(pos, rookto, pos->board[rookfrom]);
         pos_clr_sq(pos, rookfrom);
         pos->castle = clr_castle(pos->castle, us);
     } else if (ptype == PAWN) {                   /* pawn non capture or e.p. */
-        pos->clock_50 = 0;
-        if (is_dpush(move))                       /* if pawn double push, set e.p. */
-            pos->en_passant = pawn_push_up(from, us);
-        else if (is_enpassant(move)) {            /* clear grabbed pawn */
-            square_t grabbed = pawn_push_up(to, them);
+        pos->ply50 = 0;
+        if (from + up + up == to) {               /* if pawn double push, set e.p. */
+            square_t ep = from + up;
+            if (bb_pawn_attacks[us][ep] & pos->bb[them][PAWN]) {
+                pos->en_passant = ep;
+                key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
+            }
+        } else if (is_enpassant(move)) {          /* clear grabbed pawn */
+            square_t grabbed = to - up;
+            piece_t pc = pos->board[grabbed];
+            key ^= zobrist_pieces[pc][grabbed];
             pos_clr_sq(pos, grabbed);
         }
     }
 
-    pos_clr_sq(pos, from);                        /* always clear "from" and set "to" */
+    key ^= zobrist_pieces[piece][from] ^ zobrist_pieces[new_piece][to];
+    pos_clr_sq(pos, from);                        /* clear "from" and set "to" */
     pos_set_sq(pos, to, new_piece);
 
     if (ptype == KING)
@@ -117,7 +140,7 @@ pos_t *move_do(pos_t *pos, const move_t move) //, state_t *state)
         else if (from == rel_h1)
             pos->castle = clr_oo(pos->castle, us);
     }
-    if (can_castle(pos->castle, them)) {          /* do we save time with this test ? */
+    if (can_castle(pos->castle, them)) {
         square_t rel_a8 = sq_rel(A8, us);
         square_t rel_h8 = sq_rel(H8, us);
         if (to == rel_a8)
@@ -126,6 +149,14 @@ pos_t *move_do(pos_t *pos, const move_t move) //, state_t *state)
             pos->castle = clr_oo(pos->castle, them);
     }
 
+    /* update castling rights key */
+    key ^= zobrist_castling[pos->castle];
+
+    pos->key = key;
+
+    pos->repcount = pos_repcount(pos);
+    zobrist_verify(pos);
+
     return pos;
 }
 
@@ -146,31 +177,27 @@ pos_t *move_do(pos_t *pos, const move_t move) //, state_t *state)
  *
  * @return: pos.
  */
-pos_t *move_undo(pos_t *pos, const move_t move)//, const state_t *state)
+pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state)
 {
-//#   ifdef DEBUG_MOVE
-    //log(1, "new move: ");
-    //move_print(0, move, M_PR_NL | M_PR_LONG);
-//#   endif
     color_t them = pos->turn, us = OPPONENT(them);
     square_t from = move_from(move), to = move_to(move);
     piece_t piece = pos->board[to];
-
+    int up = sq_up(them);
 
     if (is_promotion(move))
         piece = MAKE_PIECE(PAWN, us);
 
-    pos_clr_sq(pos, to);                          /* always clear "to" and set "from" */
-    pos_set_sq(pos, from, piece);
+    pos_clr_sq(pos, to);                          /* always clear "to" ... */
+    pos_set_sq(pos, from, piece);                 /* ... and set "from" */
 
     if (PIECE(piece) == KING)
         pos->king[us] = from;
 
-    if (is_capture(move)) {
+    if (pos->captured != EMPTY) {
         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 {
@@ -180,11 +207,169 @@ pos_t *move_undo(pos_t *pos, const move_t move)//, const state_t *state)
         pos_set_sq(pos, rookto, pos->board[rookfrom]);
         pos_clr_sq(pos, rookfrom);
     } else if (is_enpassant(move)) {              /* restore grabbed pawn */
-        square_t grabbed = pawn_push_up(to, them);
+        square_t grabbed = to + up;
         pos_set_sq(pos, grabbed, MAKE_PIECE(PAWN, them));
     }
 
-    //pos->state = *state;                          /* restore irreversible changes */
+    pos->state = *state;                          /* restore irreversible changes */
     pos->turn = us;
+    --pos->plycount;
+    --pos->plyroot;
+    return pos;
+}
+
+/**
+ * move_{do,undo}_alt - alternative move_do/move_undo (to experiment)
+ */
+pos_t *move_do_alt(pos_t *pos, const move_t move, state_t *state)
+{
+    color_t us = pos->turn, them = OPPONENT(us);
+    square_t from = move_from(move), to = move_to(move);
+    piece_t piece = pos->board[from];
+    piece_t captured = pos->board[to];
+    piece_type_t ptype = PIECE(piece);
+    piece_t new_piece = piece;
+    int up = sq_up(us);
+    hkey_t key = pos->key;
+
+    *state = pos->state;                          /* save irreversible changes */
+    pos->prev = state;
+
+    /* update key: switch turn, reset castling and ep */
+    key ^= zobrist_turn;
+    key ^= zobrist_castling[pos->castle];
+    key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
+
+    ++pos->ply50;
+    ++pos->plycount;
+    ++pos->plyroot;
+    pos->en_passant = SQUARE_NONE;
+    pos->turn = them;
+    pos->captured = captured;
+    pos->move = move;
+
+    bug_on(COLOR(piece) != us);
+
+    if (is_promotion(move)) {
+        bug_on(sq_rank(to) != sq_rel_rank(RANK_8, us));
+        new_piece = MAKE_PIECE(move_promoted(move), us);
+    }
+
+    if (captured != EMPTY) {
+        pos->ply50 = 0;
+        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 (to > from) {
+            rookfrom = sq_rel(H1, us);
+            rookto = sq_rel(F1, us);
+        } else {
+            rookfrom = sq_rel(A1, us);
+            rookto = sq_rel(D1, us);
+        }
+        key ^= zobrist_pieces[pos->board[rookfrom]][rookto] ^
+            zobrist_pieces[pos->board[rookfrom]][rookfrom];
+        pos_set_sq(pos, rookto, pos->board[rookfrom]);
+        pos_clr_sq(pos, rookfrom);
+        pos->castle = clr_castle(pos->castle, us);
+    } else if (ptype == PAWN) {                   /* pawn non capture or e.p. */
+        pos->ply50 = 0;
+        if (from + up + up == to) {               /* if pawn double push, set e.p. */
+            square_t ep = from + up;
+            if (bb_pawn_attacks[us][ep] & pos->bb[them][PAWN]) {
+                pos->en_passant = ep;
+                key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
+            }
+        } else if (is_enpassant(move)) {          /* clear grabbed pawn */
+            square_t grabbed = to - up;
+            piece_t pc = pos->board[grabbed];
+            key ^= zobrist_pieces[pc][grabbed];
+            pos_clr_sq(pos, grabbed);
+        }
+    }
+
+    key ^= zobrist_pieces[piece][from] ^ zobrist_pieces[new_piece][to];
+    pos_clr_sq(pos, from);                        /* clear "from" and set "to" */
+    pos_set_sq(pos, to, new_piece);
+
+    if (ptype == KING)
+        pos->king[us] = to;
+
+    /* update castling flags
+     * As we always consider flags are valid, we :
+     * - adjust our flags if relative from is "E1", "A1", H1"
+     * - adjust opp flags if relative to   if "A8", H8"
+     */
+    if (can_castle(pos->castle, us)) {            /* do we save time with this test ? */
+        square_t rel_e1 = sq_rel(E1, us);
+        square_t rel_a1 = sq_rel(A1, us);
+        square_t rel_h1 = sq_rel(H1, us);
+        if (from == rel_e1)
+            pos->castle = clr_castle(pos->castle, us);
+        else if (from == rel_a1)
+            pos->castle = clr_ooo(pos->castle, us);
+        else if (from == rel_h1)
+            pos->castle = clr_oo(pos->castle, us);
+    }
+    if (can_castle(pos->castle, them)) {
+        square_t rel_a8 = sq_rel(A8, us);
+        square_t rel_h8 = sq_rel(H8, us);
+        if (to == rel_a8)
+            pos->castle = clr_ooo(pos->castle, them);
+        else if (to == rel_h8)
+            pos->castle = clr_oo(pos->castle, them);
+    }
+
+    /* update castling rights key */
+    key ^= zobrist_castling[pos->castle];
+
+    pos->key = key;
+
+    pos->repcount = pos_repcount(pos);
+    zobrist_verify(pos);
+
+    return pos;
+}
+
+pos_t *move_undo_alt(pos_t *pos, const move_t move, const state_t *state)
+{
+    color_t them = pos->turn, us = OPPONENT(them);
+    square_t from = move_from(move), to = move_to(move);
+    piece_t piece = pos->board[to];
+    int up = sq_up(them);
+
+    if (is_promotion(move))
+        piece = MAKE_PIECE(PAWN, us);
+
+    pos_clr_sq(pos, to);                          /* always clear "to" ... */
+    pos_set_sq(pos, from, piece);                 /* ... and set "from" */
+
+    if (PIECE(piece) == KING)
+        pos->king[us] = from;
+
+    if (pos->captured != EMPTY) {
+        pos_set_sq(pos, to, pos->captured);       /* restore captured piece */
+    } else if (is_castle(move)) {                 /* make reverse rook move */
+        square_t rookfrom, rookto;
+        if (to > from) {
+            rookfrom = sq_rel(F1, us);
+            rookto = sq_rel(H1, us);
+        } else {
+            rookfrom = sq_rel(D1, us);
+            rookto = sq_rel(A1, us);
+        }
+        pos_set_sq(pos, rookto, pos->board[rookfrom]);
+        pos_clr_sq(pos, rookfrom);
+    } else if (is_enpassant(move)) {              /* restore grabbed pawn */
+        square_t grabbed = to + up;
+        pos_set_sq(pos, grabbed, MAKE_PIECE(PAWN, them));
+    }
+
+    pos->state = *state;                          /* restore irreversible changes */
+    pos->turn = us;
+    --pos->plycount;
+    --pos->plyroot;
     return pos;
 }

src/move-do.h

@@ -1,6 +1,6 @@
 /* move-do.h - move do/undo.
  *
- * 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.
  *
@@ -16,7 +16,11 @@
 
 #include "position.h"
 
-pos_t *move_do(pos_t *pos, const move_t move);//, state_t *state);
-pos_t *move_undo(pos_t *pos, const move_t move);//, const state_t *state);
+pos_t *move_do(pos_t *pos, const move_t move, state_t *state);
+pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state);
+
+/* new version testing */
+pos_t *move_do_alt(pos_t *pos, const move_t move, state_t *state);
+pos_t *move_undo_alt(pos_t *pos, const move_t move, const state_t *state);
 
 #endif  /* MOVE_DO_H */

src/move-gen.c

@@ -22,11 +22,10 @@
 #include "piece.h"
 #include "position.h"
 #include "move.h"
-#include "hyperbola-quintessence.h"
+#include "hq.h"
 #include "attack.h"
 #include "move-gen.h"
 
-
 /**
  * pseudo_is_legal() - check if a move is legal.
  * @pos:  position
@@ -36,76 +35,72 @@
  */
 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), king = pos->king[us], sq;
-    piece_type_t piece = PIECE(pos->board[from]);
-    bitboard_t kingbb = pos->bb[us][KING], tmp;
-    u64 pinned = mask(from) & pos->blockers & pos->bb[us][ALL_PIECES];
+    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;
 
-    /* (1) - King
-     * For castling, we already tested intermediate squares attacks
-     * in pseudo move generation, so we only care destination square here.
-     * Attention: We need to exclude king from occupation bitboard !
+    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.
+     * Attention: To test if K is in check after moving, we need to exclude
+     * king from occupation bitboard (to catch king moving away from checker
+     * on same line) !
      */
-    if (piece == KING) {
-        bitboard_t occ = pos_occ(pos) ^ kingbb;
-        return !sq_attackers(pos, occ, to, them);
+    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, as only K moves were generated.
-     * Here, allowed dest squares are only on King-checker line, or on checker
-     * square.
-     * attacker.
-     * Special cases:
-     *   e.p., legal if the taken pawn is giving check
-     *   pinned piece: always illegal
+     * Double-check is already handled in (1), as only K moves were generated
+     * by pseudo legal move generator.
+     * Special cases (illegal):
+     *   - e.p., if the grabbed pawn is *not* giving check
+     *   - piece is pinned
      */
-    if (pos->checkers) {
-        if (popcount64(pos->checkers) == 1) {     /* one checker */
-            square_t checker = ctz64(pos->checkers);
-            if (pinned)
-                return false;
-            if (is_enpassant(move)) {
-                return pawn_push_up(pos->en_passant, them) == checker;
-            }
-            bitboard_t between = bb_between[king][checker] | pos->checkers;
-            return mask(to) & between;
+    if (checkers) {
+        if (pinned)
+            return false;
+        if (is_enpassant(move)) {
+            return ep + sq_up(them) == ctz64(checkers);
         }
-        return false;                             /* double check */
+        return true;
     }
 
     /* (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 (mask(from) & pos->blockers & pos->bb[us][ALL_PIECES]) {
     if (pinned) {
-        bitboard_t line = bb_line[from][king];
-        return line & mask(to);                   /* to is not on pin line */
+        return bb_line[from][kingsq] & BIT(to);   /* is to on pinner line ? */
     }
 
     /* (4) - En-passant
-     * We only care the situation where our King and enemy R/Q are on
-     * 5th relative rank. To do so, we create an occupation bb without
-     * the 2 pawns.
+     * 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 (is_enpassant(move)) {
-         /* from rank bitboard */
-        bitboard_t rank5 = bb_sqrank[from];
-        /* enemy rooks/queens on from rank */
-        bitboard_t rooks = (pos->bb[them][ROOK] | pos->bb[them][QUEEN]) & rank5;
+        bitboard_t rank5 = bb_rel_rank(RANK_5, us);
 
-        if ((kingbb & rank5) && rooks) { /* K and enemy R/Q on rank */
-            /* captured pawn square (beside from square) */
-            square_t captured = sq_make(sq_file(pos->en_passant), sq_rank(from));
-            /* occupation bitboard without the two "disappearing" pawns */
-            bitboard_t occ = pos_occ(pos) ^ mask(from) ^ mask(captured);
+        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;
 
-            bit_for_each64(sq, tmp, rooks)        /* check all rooks/queens */
-                if (hyperbola_rank_moves(occ, sq) & kingbb)
-                    return false;
+            return !(hq_rank_moves(occ ^ exclude, kingsq) & rooks);
         }
-        return true;
     }
     return true;
 }
@@ -136,28 +131,190 @@ move_t pos_next_legal(const pos_t *pos, movelist_t *movelist, int *start)
 }
 
 /**
- * pos_all_legal() - get the list of legal moves from pseudo-legal.
+ * pos_legal_dup() - get legal moves from pseudo-legal ones in new list.
  * @pos:  position
- * @movelist: &pseudo-legal movelist_t
- * @dest: &destination movelist_t
+ * @pseudo: &movelist_t pseudo-legal moves list
+ * @legal: &movelist_t legal moves
  *
  * The pseudo-legal moves must be already calculated before calling this function.
- * No check is done on @dest limits.
+ * No check is done on @legal limits.
+ * This function is similar to pos_legal(), but creates a new list for legal moves.
+ * It should only be used for debug purpose, when we want to keep a copy of
+ * pseudo-legal moves.
  *
- * @Return: @dest
+ * @return: @legal
  */
-movelist_t *pos_all_legal(const pos_t *pos, movelist_t *movelist, movelist_t *dest)
+movelist_t *pos_legal_dup(const pos_t *pos, movelist_t *pseudo, movelist_t *legal)
 {
-    int tmp = dest->nmoves = 0;
+    int tmp = legal->nmoves = 0;
     move_t move;
 
-    while ((move = pos_next_legal(pos, movelist, &tmp)) != MOVE_NONE)
-        dest->move[dest->nmoves++] = move;
-    return dest;
+    while ((move = pos_next_legal(pos, pseudo, &tmp)) != MOVE_NONE)
+        legal->move[legal->nmoves++] = move;
+    return legal;
 }
 
 /**
- * pos_gen_pseudomoves() - generate position pseudo-legal moves
+ * pos_legal() - get legal moves from pseudo-legal ones in new list.
+ * @pos:  position
+ * @list: &movelist_t pseudo-legal moves list
+ *
+ * The pseudo-legal moves must be already calculated before calling this function.
+ * @list is replaced by legal moves.
+ *
+ * @return: @list
+ */
+movelist_t *pos_legal(const pos_t *pos, movelist_t *list)
+{
+    move_t *cur = list->move, *last = list->move + list->nmoves;
+
+    while (cur < last) {
+        if (pseudo_is_legal(pos, *cur))
+            cur++;
+        else {
+            *cur = *--last;
+        }
+    }
+    list->nmoves = last - list->move;
+    return list;
+}
+
+/**
+ * gen_pseudo_king() - generate king pseudo-legal moves.
+ * @pos: position
+ * @movelist: &movelist_t array to store pseudo-moves
+ *
+ */
+static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
+                                               bitboard_t mask)
+{
+    //color_t us    = pos->turn;
+    //square_t from = pos->king[us];
+    //bitboard_t not_my_pieces     = ~pos->bb[us][ALL_PIECES];
+    bitboard_t to_bb = bb_king_moves(mask, from);
+    square_t to;
+    while (moves) {
+        to = bb_next(&to_bb);
+        *moves++ = move_make(from, to);
+    }
+    return moves;
+}
+
+/**
+ * pos_gen_check_pseudomoves() - generate position pseudo-legal moves when in check
+ * @pos: position
+ * @movelist: &movelist_t array to store pseudo-moves
+ *
+ * Generate all @pos pseudo moves for player-to-move.
+ * @movelist is filled with the moves.
+ *
+ * Only a few validity checks are done here (i.e. moves are not generated):
+ *  - 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
+ *  - en-passant: M_EN_PASSANT
+ *  - promotion: M_PROMOTION
+ *
+ * TODO: move code to specific functions (especially castling, pawn push/capture)
+ *
+ * @Return: The total number of moves.
+ */
+
+/**
+ * gen_pseudo_escape() - generate position pseudo-legal moves when in check
+ * @pos: square_t king position
+ * @mask: possible destinations to consider
+ * @moves: &move_t array to store pseudo-moves
+ *
+ * Generate all @pos pseudo moves for player-to-move, when in check.
+ * @movelist is filled with the moves.
+ *
+ * If king is doubles-checked, only King moves will be generated.
+ * Otherwise, only moves where destination in between King or checker, or checker
+ * square.
+ *
+ */
+/*
+ * static void __always_inline gen_pseudo_escape(pos_t *pos, movelist_t *movelist)
+ * {
+ *     color_t us               = pos->turn;
+ *     color_t them             = OPPONENT(us);
+ *     square_t king            = pos->king[us];
+ *
+ *     gen_pseudo_king(pos, movelist);
+ *
+ * }
+ */
+
+/**
+ * moves_gen_flags() - generate all moves from square to bitboard (with flags).
+ * @moves: &move_t array where to store moves
+ * @from: square_t piece position
+ * @to_bb: destination bitboard
+ * @flags: flags to apply
+ *
+ * Generate (at address @moves) moves from square @from to each square in @to_bb,
+ * with flags @flags.
+ *
+ * @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)
+{
+    square_t to;
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        *moves++ = move_make_flags(from, to, flags);
+    }
+    return moves;
+}
+
+/**
+ * move_gen_promotions() - generate all promotions for given pawn and dest.
+ * @moves: &move_t array where to store moves
+ * @from: pawn position
+ * @to: promotion square
+ *
+ * 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)
+{
+    /* your attention: "downto operator" */
+    for (piece_type_t pt = QUEEN - 1; pt --> KNIGHT - 2;)
+        *moves++ = move_make_promote(from, to, pt);
+    return moves;
+}
+
+/**
+ * moves_gen() - generate all moves from square to bitboard.
+ * @moves: &move_t array where to store moves
+ * @from: square_t piece position
+ * @to_bb: destination bitboard
+ *
+ * Generate (at address @moves) moves from square @from to each square in @to_bb.
+ *
+ * @Return: New @moves.
+ */
+static inline move_t *moves_gen(move_t *moves, square_t from, bitboard_t to_bb)
+{
+    square_t to;
+    // bb_print(sq_to_string(from), to_bb);
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        *moves++ = move_make(from, to);
+    }
+    return moves;
+}
+
+/**
+ * pos_gen_pseudo() - generate position pseudo-legal moves
  * @pos: position
  * @movelist: &movelist_t array to store pseudo-moves
  *
@@ -171,166 +328,155 @@ movelist_t *pos_all_legal(const pos_t *pos, movelist_t *movelist, movelist_t *de
  *  - 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
  *
  * TODO: move code to specific functions (especially castling, pawn push/capture)
  *
- * @Return: The total number of moves.
+ * @Return: movelist
  */
-int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
+movelist_t *pos_gen_pseudo(pos_t *pos, movelist_t *movelist)
 {
     color_t us               = pos->turn;
     color_t them             = OPPONENT(us);
 
     bitboard_t my_pieces     = pos->bb[us][ALL_PIECES];
-    bitboard_t not_my_pieces = ~my_pieces;
     bitboard_t enemy_pieces  = pos->bb[them][ALL_PIECES];
+    bitboard_t dest_squares  = ~my_pieces;
     bitboard_t occ           = my_pieces | enemy_pieces;
     bitboard_t empty         = ~occ;
-
-    bitboard_t movebits, from_pawns;
-    bitboard_t tmp1, tmp2;
     move_t *moves            = movelist->move;
-    int *nmoves              = &movelist->nmoves;
-    int from, to;
+    square_t king = pos->king[us];
 
-    *nmoves = 0;
+    bitboard_t from_bb, to_bb;
+    bitboard_t tmp_bb;
+    square_t from, to;
 
-    /* king - MUST BE FIRST (we stop if doubler check) */
-    from = pos->king[us];
-    movebits = bb_king_moves(not_my_pieces, from);
-    bit_for_each64(to, tmp1, movebits & empty) {
-        moves[(*nmoves)++] = move_make(from, to);
+    /* king - MUST BE FIRST */
+    to_bb = bb_king_moves(dest_squares, king);
+    moves = moves_gen(moves, king, to_bb);
+
+    if (bb_multiple(pos->checkers))               /* double check, we stop here */
+        goto finish;
+
+    if (pos->checkers) {
+        /* one checker: we limit destination squares to line between
+         * checker and king + checker square (think: knight).
+         */
+        square_t checker = ctz64(pos->checkers);
+        dest_squares &= bb_between[king][checker] | pos->checkers;
+        enemy_pieces &= dest_squares;
+    } else {
+        /* no checker: castling moves
+         * Attention ! Castling flags are assumed correct
+         */
+        bitboard_t rel_rank1 = bb_rel_rank(RANK_1, us);
+        /* For castle, we check the opponent attacks on squares between from and to.
+         * 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);
+            }
+        }
+        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);
+            }
+        }
     }
-    bit_for_each64(to, tmp1, movebits & enemy_pieces) {
-        moves[(*nmoves)++] = move_make_capture(from, to);
-    }
-
-    if (popcount64(pos->checkers) > 1)            /* double check, we stop here */
-        return *nmoves;
 
     /* sliding pieces */
-    bit_for_each64(from, tmp1, pos->bb[us][BISHOP] | pos->bb[us][QUEEN]) {
-        movebits = hyperbola_bishop_moves(occ, from) & not_my_pieces;
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[(*nmoves)++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[(*nmoves)++] = move_make_capture(from, to);
-        }
+    from_bb = pos->bb[us][BISHOP] | pos->bb[us][QUEEN];
+    while (from_bb) {
+        from = bb_next(&from_bb);
+        to_bb = hq_bishop_moves(occ, from) & dest_squares;
+        moves = moves_gen(moves, from, to_bb);
     }
-    bit_for_each64(from, tmp1, pos->bb[us][ROOK] | pos->bb[us][QUEEN]) {
-        movebits = hyperbola_rook_moves(occ, from) & not_my_pieces;
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[(*nmoves)++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[(*nmoves)++] = move_make_capture(from, to);
-        }
+    from_bb = pos->bb[us][ROOK] | pos->bb[us][QUEEN];
+    while (from_bb) {
+        from = bb_next(&from_bb);
+        to_bb = hq_rook_moves(occ, from) & dest_squares;
+        moves = moves_gen(moves, from, to_bb);
     }
 
     /* knight */
-    bit_for_each64(from, tmp1, pos->bb[us][KNIGHT]) {
-        movebits = bb_knight_moves(not_my_pieces, from);
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[(*nmoves)++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[(*nmoves)++] = move_make_capture(from, to);
-        }
+    from_bb = pos->bb[us][KNIGHT];
+    while (from_bb) {
+        from = bb_next(&from_bb);
+        to_bb = bb_knight_moves(dest_squares, from);
+        moves = moves_gen(moves, from, to_bb);
     }
 
     /* pawn: relative rank and files */
     bitboard_t rel_rank8 = bb_rel_rank(RANK_8, us);
     bitboard_t rel_rank3 = bb_rel_rank(RANK_3, us);
 
-    /* pawn: ranks 2-6 push 1 and 2 squares */
-    movebits = pawn_shift_up(pos->bb[us][PAWN], us) & empty;
-    bit_for_each64(to, tmp1, movebits & ~rel_rank8) {
-        from = pawn_push_up(to, them);              /* reverse push */
-        moves[(*nmoves)++] = move_make(from, to);
+    /* pawn: push */
+    int shift = sq_up(us);
+    tmp_bb = bb_shift(pos->bb[us][PAWN], shift) & empty;
+
+    to_bb = tmp_bb & ~rel_rank8 & dest_squares;   /* non promotion */
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        from = to - shift;
+        *moves++ = move_make(from, to);
     }
-    bit_for_each64(to, tmp1, movebits & rel_rank8) { /* promotions */
-        from = pawn_push_up(to, them);              /* reverse push */
-        moves[(*nmoves)++] = move_make_promote(from, to, QUEEN);
-        moves[(*nmoves)++] = move_make_promote(from, to, ROOK);
-        moves[(*nmoves)++] = move_make_promote(from, to, BISHOP);
-        moves[(*nmoves)++] = move_make_promote(from, to, KNIGHT);
+    to_bb = tmp_bb & rel_rank8 & dest_squares;    /* promotions */
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        from = to - shift;
+        moves = move_gen_promotions(moves, from, to);
     }
 
     /* possible second push */
-    movebits = pawn_shift_up(movebits & rel_rank3, us) & empty;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_up(pawn_push_up(to, them), them);
-        moves[(*nmoves)++] = move_make_flags(from, to, M_DPUSH);
+    to_bb = bb_shift(tmp_bb & rel_rank3, shift) & empty & dest_squares;
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        from = to - shift - shift;
+        *moves++ = move_make(from, to);
     }
 
-    /* pawn: captures left */
-    movebits = pawn_shift_upleft(pos->bb[us][PAWN], us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits & ~rel_rank8) {
-        from = pawn_push_upleft(to, them);         /* reverse capture */
-        moves[(*nmoves)++] = move_make_capture(from, to);
+    /* pawn: captures */
+    tmp_bb = bb_pawns_attacks(pos->bb[us][PAWN], shift) & enemy_pieces;
+    to_bb = tmp_bb & ~rel_rank8;
+    while (to_bb) {
+        to = bb_next(&to_bb);
+        from_bb = bb_pawn_attacks[them][to] & pos->bb[us][PAWN];
+        while (from_bb) {
+            from = bb_next(&from_bb);
+            *moves++ = move_make(from, to);
+        }
     }
-    bit_for_each64(to, tmp1, movebits & rel_rank8) {
-        from = pawn_push_upleft(to, them);         /* reverse capture */
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, QUEEN);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, ROOK);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, BISHOP);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, KNIGHT);
-    }
-
-    /* pawn: captures right */
-    movebits = pawn_shift_upright(pos->bb[us][PAWN], us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits & ~rel_rank8) {
-        from = pawn_push_upright(to, them);       /* reverse capture */
-        moves[(*nmoves)++] = move_make_capture(from, to);
-    }
-    bit_for_each64(to, tmp1, movebits & rel_rank8) {
-        from = pawn_push_upright(to, them);       /* reverse capture */
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, QUEEN);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, ROOK);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, BISHOP);
-        moves[(*nmoves)++] = move_make_promote_capture(from, to, KNIGHT);
-    }
-
-    /* pawn: en-passant */
-    if ((to = pos->en_passant) != SQUARE_NONE) {
-        movebits = mask(to);
-        from_pawns = pos->bb[us][PAWN]
-            & (pawn_shift_upleft(movebits, them) | pawn_shift_upright(movebits, them));
-        bit_for_each64(from, tmp1, from_pawns) {
-            moves[(*nmoves)++] = move_make_enpassant(from, to);
+    to_bb = tmp_bb & rel_rank8;
+    while (to_bb) {
+        to = bb_next(&to_bb);
+        from_bb = bb_pawn_attacks[them][to] & pos->bb[us][PAWN];
+        while (from_bb) {
+            from = bb_next(&from_bb);
+            moves = move_gen_promotions(moves, from, to);
         }
     }
 
-    /* castle - Attention ! Castling flags are assumed correct
+    /* pawn: en-passant
+     * TODO: special case when in-check here ?
      */
-    if (!pos->checkers) {
-        bitboard_t rel_rank1 = bb_rel_rank(RANK_1, us);
-        from = pos->king[us];
-        square_t from_square[2] = { E1, E8 };     /* verify king is on E1/E8 */
-        bug_on(can_castle(pos->castle, us) && from != from_square[us]);
-        /* For castle, we check the opponent attacks on squares between from and to.
-         * To square attack check will be done in gen_is_legal.
-         */
-        if (can_oo(pos->castle, us)) {
-            bitboard_t occmask = rel_rank1 & (FILE_Fbb | FILE_Gbb);
-            if (!(occ & occmask) &&
-                !sq_attackers(pos, occ, from+1, them)) { /* f1/f8 */
-                moves[(*nmoves)++] = move_make_flags(from, from + 2, M_CASTLE_K);
-            }
-        }
-        if (can_ooo(pos->castle, us)) {
-            bitboard_t occmask = rel_rank1 & (FILE_Bbb | FILE_Cbb | FILE_Dbb);
-            if (!(occ & occmask) &&
-                !sq_attackers(pos, occ, from-1, them)) { /* d1/d8 */
-                moves[(*nmoves)++] = move_make_flags(from, from - 2, M_CASTLE_Q);
-            }
+    if ((to = pos->en_passant) != SQUARE_NONE) {
+        from_bb = bb_pawn_attacks[them][to] & pos->bb[us][PAWN];
+        while (from_bb) {
+            from = bb_next(&from_bb);
+            *moves++ = move_make_enpassant(from, to);
         }
     }
+
     /* TODO: add function per piece, and type, for easier debug
      */
-    return *nmoves;
+finish:
+    movelist->nmoves = moves - movelist->move;
+    return movelist;
+    //return movelist->nmoves = moves - movelist->move;
 }

src/move-gen.h

@@ -17,13 +17,15 @@
 #include "bitops.h"
 
 #include "bitboard.h"
-#include "hyperbola-quintessence.h"
+#include "hq.h"
 #include "piece.h"
 #include "move.h"
 
 bool pseudo_is_legal(const pos_t *pos, const move_t move);
 move_t pos_next_legal(const pos_t *pos, movelist_t *movelist, int *start);
-movelist_t *pos_all_legal(const pos_t *pos, movelist_t *movelist, movelist_t *dest);
-int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist);
+movelist_t *pos_legal_dup(const pos_t *pos, movelist_t *pseudo, movelist_t *legal);
+movelist_t *pos_legal(const pos_t *pos, movelist_t *list);
+
+movelist_t *pos_gen_pseudo(pos_t *pos, movelist_t *movelist);
 
 #endif  /* MOVEGEN_H */

src/move.c

@@ -1,6 +1,6 @@
 /* move.c - move management.
  *
- * 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.
  *
@@ -89,11 +89,13 @@
  */
 
 /**
- * move_str() - get a move string
+ * move_to_str() - get a move string
  * @dst: destination memory
  * @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
@@ -102,20 +104,79 @@
  * M_PR_NL:    print a newline after move
  * M_PR_EVAL:  print move eval
  */
-char *move_str(char *dst, const move_t move, __unused const int flags)
+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.
+ * @move:      move (may be partial)
+ * @movelist:  &movelist_t to search
+ *
+ * Look for @target into @list, by comparing its from, to, and promotion
+ * information.
+ *
+ * @return: move in @movelist if match found, MOVE_NONE otherwise.
+ */
+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) {
+        /* note that we compare promoted piece without checking if the move
+         * is a promotion. But, in our move representation "promoted Knight"
+         * is encoded as zero, same as when there is no promotion. This can
+         * lead to false match is @target or some @list moves are invalid,
+         * which we do not consider.
+         */
+        if (move_fromto(target)   == move_fromto(*move) &&
+            move_promoted(target) == move_promoted(*move))
+            return *move;
+    }
+    return MOVE_NONE;
+}
 
 /**
  * moves_print() - print movelist moves.
@@ -135,7 +196,7 @@ void moves_print(movelist_t *moves, __unused int flags)
     char str[16];
     //printf("%2d:", moves->nmoves);
     for (int m = 0; m < moves->nmoves; ++m)
-        printf("%s ", move_str(str, moves->move[m], flags));
+        printf("%s ", move_to_str(str, moves->move[m], flags));
     printf("\n");
 }
 
@@ -149,12 +210,13 @@ static int _moves_cmp_bysquare(const void *p1, const void *p2)
     square_t t2 = move_to(m2);
     piece_type_t prom1 = move_promoted(m1);
     piece_type_t prom2 = move_promoted(m2);
+    /* We compare origin square first */
     if (f1 < f2) return -1;
     if (f1 > f2) return 1;
-    /* f1 == f2 */
+    /* f1 == f2, we compare destination squares */
     if (t1 < t2) return -1;
     if (t1 > t2) return 1;
-    /* t1 == t2 */
+    /* t1 == t2, we compare promoted piece */
     if (prom1 < prom2) return -1;
     if (prom1 > prom2) return 1;
     return 0;

src/move.h

@@ -1,6 +1,6 @@
 /* move.h - move management.
  *
- * 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,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    = 18
+    M_OFF_FLAGS    = 14
 };
 
 typedef enum {
-    M_CAPTURE   = mask(M_OFF_FLAGS + 0),
-    M_ENPASSANT = mask(M_OFF_FLAGS + 1),
-    M_PROMOTION = mask(M_OFF_FLAGS + 2),
-    M_CASTLE_K  = mask(M_OFF_FLAGS + 3),          /* maybe only one ? */
-    M_CASTLE_Q  = mask(M_OFF_FLAGS + 5),          /* maybe only one ? */
-    M_CHECK     = mask(M_OFF_FLAGS + 6),          /* maybe unknown/useless ? */
-    M_DPUSH     = mask(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,16 +76,23 @@ static inline square_t move_to(move_t move)
     return (move >> M_OFF_TO) & 077;
 }
 
-static inline piece_type_t move_promoted(move_t move)
+static inline move_t move_fromto(move_t move)
 {
-    return (move >> M_OFF_PROMOTED) & 07;
+    return move & 07777;
 }
 
-static inline piece_type_t move_captured(move_t move)
+static inline piece_type_t move_promoted(move_t move)
 {
-    return (move >> M_OFF_CAPTURED) & 07;
+    return ((move >> M_OFF_PROMOTED) & 03) + KNIGHT;
 }
 
+/*
+ * static inline piece_type_t move_captured(move_t move)
+ * {
+ *     return (move >> M_OFF_CAPTURED) & 07;
+ * }
+ */
+
 static inline move_t move_make(square_t from, square_t to)
 {
     return (to << M_OFF_TO) | from;
@@ -101,13 +100,16 @@ static inline move_t move_make(square_t from, square_t to)
 
 static inline move_t move_make_flags(square_t from, square_t to, move_flags_t flags)
 {
-    return move_set_flags(move_make(from, to), flags);
+    return (to << M_OFF_TO) | from | flags;
+    //move_set_flags(move_make(from, to), flags);
 }
 
-static inline move_t move_make_capture(square_t from, square_t to)
-{
-    return move_make_flags(from, to, M_CAPTURE);
-}
+/*
+ * static inline move_t move_make_capture(square_t from, square_t to)
+ * {
+ *     return move_make_flags(from, to, M_CAPTURE);
+ * }
+ */
 
 static inline move_t move_make_enpassant(square_t from, square_t to)
 {
@@ -120,16 +122,20 @@ static inline move_t move_make_promote(square_t from, square_t to,
     return move_make_flags(from, to, M_PROMOTION) | (promoted << M_OFF_PROMOTED);
 }
 
-static inline move_t move_make_promote_capture(square_t from, square_t to,
-                                               piece_type_t promoted)
-{
-    return move_make_promote(from, to, promoted) | M_CAPTURE;
-}
+/*
+ * static inline move_t move_make_promote_capture(square_t from, square_t to,
+ *                                                piece_type_t promoted)
+ * {
+ *     return move_make_promote(from, to, promoted) | M_CAPTURE;
+ * }
+ */
 
-static inline move_t move_set_captured(move_t move, piece_type_t captured)
-{
-    return move | (captured << M_OFF_CAPTURED);
-}
+/*
+ * static inline move_t move_set_captured(move_t move, piece_type_t captured)
+ * {
+ *     return move | (captured << M_OFF_CAPTURED);
+ * }
+ */
 
 /* moves_print flags
  */
@@ -142,8 +148,9 @@ static inline move_t move_set_captured(move_t move, piece_type_t captured)
 #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_str(char *dst, const move_t move, __unused const int 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/perft.c

@@ -0,0 +1,194 @@
+/* perft.c - perft functions.
+ *
+ * Copyright (C) 2023-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 <brlib.h>
+
+#include "perft.h"
+#include "move-gen.h"
+#include "move-do.h"
+
+/**
+ * do_perft() - perft engine
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ *
+ * Run perft on a position.
+ *
+ * This version uses the algorithm:
+ *    gen legal moves
+ *    if last depth
+ *      return number of legal move
+ *    loop for legal move
+ *      do-move
+ *      if depth == 2
+ *
+ *      do_perft (depth -1)
+ *      undo-move
+ *
+ * @return: total moves found at @depth level.
+ */
+static u64 do_perft(pos_t *pos, int depth)
+{
+    u64 nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
+    state_t state;
+
+    pos_set_checkers_pinners_blockers(pos);
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+
+    //if (depth == 1)
+    //    return movelist.nmoves;
+
+    last = movelist.move + movelist.nmoves;
+    switch (depth) {
+        case 1:
+            /* This case could be removed if 'case 2' is handled in perft()
+             */
+            return movelist.nmoves;
+            break;
+        case 2:
+            /* For depth 2, we directly calculate the possible legal moves
+             * after each possible moves.
+             */
+            for (move = movelist.move; move < last; ++move) {
+                move_do(pos, *move, &state);
+                movelist_t movelist2;
+                pos_set_checkers_pinners_blockers(pos);
+                nodes += pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
+                move_undo(pos, *move, &state);
+            }
+            break;
+        default:
+            /* Default: Search in TT for same key+depth. Use it if found, create
+             * it otherwise.
+             */
+            for (move = movelist.move; move < last; ++move) {
+                move_do(pos, *move, &state);
+                hentry_t *entry = tt_probe_perft(pos->key, depth);
+                if (entry != TT_MISS) {
+                    nodes += HASH_PERFT_VAL(entry->data);
+                } else {
+                    u64 subnodes = do_perft(pos, depth - 1);
+                    tt_store_perft(pos->key, depth, subnodes);
+                    nodes += subnodes;
+                }
+                move_undo(pos, *move, &state);
+            }
+            //} else {
+            //subnodes = do_perft(pos, depth - 1);
+    }
+        //move_undo(pos, *move, &state);
+        //nodes += subnodes;
+    //}
+
+    return nodes;
+}
+
+/**
+ * perft() - Perform perft on position
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @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.
+ *
+ * This version uses the algorithm:
+ *    if last depth
+ *      return 1;
+ *    gen legal moves
+ *    loop for legal move
+ *      do-move
+ *      perft (depth -1)
+ *      undo-move
+ *
+ * @return: total moves found at @depth level.
+ */
+u64 perft(pos_t *pos, int depth, bool divide)
+{
+    u64 subnodes = 0, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
+    state_t state;
+
+    pos_set_checkers_pinners_blockers(pos);
+
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            subnodes = 1;
+        } else {
+            move_do(pos, *move, &state);
+            subnodes = do_perft(pos, depth - 1);
+            move_undo(pos, *move, &state);
+        }
+        if (divide) {
+            char movestr[8];
+            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+        }
+        nodes += subnodes;
+    }
+    return nodes;
+}
+
+/**
+ * perft_alt() - Perform perft on position, experimental version.
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @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 divide)
+{
+    u64 subnodes = 0, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
+    state_t state;
+
+    pos_set_checkers_pinners_blockers(pos);
+
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            subnodes = 1;
+        } else {
+            move_do_alt(pos, *move, &state);
+            if (depth == 2) {
+                movelist_t movelist2;
+                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, divide);
+            }
+            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);
+        }
+    }
+
+    return nodes;
+}

src/perft.h

@@ -0,0 +1,22 @@
+/* perft.h.h - perft.
+ *
+ * Copyright (C) 2021-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 PERFT_H
+#define PERFT_H
+
+#include "position.h"
+
+u64 perft(pos_t *pos, int depth,/* int ply,*/ bool divide);
+u64 perft_alt(pos_t *pos, int depth, int ply, bool output);
+
+#endif  /* PERFT_H */

src/piece.c

@@ -24,23 +24,23 @@
 /**
  * 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 },
+const struct piece_details piece_details[PIECE_NB] = {
+    /*             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";
@@ -78,8 +78,12 @@ char *piece_to_name(piece_t p)
 
 piece_type_t piece_t_from_char(char c)
 {
-    char *p = strchr(pieces_str, c);
-    return p? (p - pieces_str) % 6 + 1: NO_PIECE_TYPE;
+    char *p;
+    piece_type_t pt = NO_PIECE_TYPE;
+    if (c && (p = strchr(pieces_str, c))) {
+        pt = (p - pieces_str) % 6 + 1;
+    }
+    return pt;
 }
 
 //piece_type_t piece_from_promotion(char c, color_t color)

src/piece.h

@@ -24,43 +24,39 @@
  * C: 0 for white, 1: black
  * PPP: pawn (1), knight, bishop, rook, queen, king (6)
  */
-typedef enum {
+enum {
     WHITE, BLACK,
-    COLOR_MAX
-} color_t;
+    COLOR_NB
+};
+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;
+    PIECE_TYPE_NB,
+    PT_NB = PIECE_TYPE_NB
+};
+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;
+    PIECE_NB
+};
+typedef u8  piece_t;
 
-/* default values for opening, midgame, endgame
+/* 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 +64,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,10 +82,9 @@ 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 */
-} piece_details[PIECE_MAX];
+    s16  mid_value;                               /* value midgame */
+    s16  end_value;                               /* value endgame */
+} piece_details[PIECE_NB];
 
 extern const char pieces_str[6+6+1];              /* to search from fen/user input */
 
@@ -102,13 +97,22 @@ 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 eval_t piece_midval(piece_type_t pt)
+{
+    return piece_details[pt].mid_value;
+}
+static __inline eval_t piece_endval(piece_type_t pt)
+{
+    return piece_details[pt].end_value;
+}
+
 bool piece_ok(piece_t p);
 
 char *piece_to_cap(piece_t p);
@@ -118,18 +122,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

@@ -18,17 +18,20 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "brlib.h"
-#include "bitops.h"
+#include <brlib.h>
+#include <bitops.h>
+#include <bug.h>
 
 #include "chessdefs.h"
 #include "position.h"
 #include "bitboard.h"
+#include "hq.h"
 #include "fen.h"
 #include "piece.h"
-#include "util.h"
+#include "alloc.h"
 #include "board.h"
 #include "attack.h"
+#include "hist.h"
 
 /**
  * pos_new() - allocate a new position
@@ -40,7 +43,7 @@
  */
 pos_t *pos_new(void)
 {
-    return safe_malloc(sizeof(pos_t));
+    return safe_alloc(sizeof(pos_t));
 }
 
 /**
@@ -55,15 +58,31 @@ pos_t *pos_new(void)
  */
 pos_t *pos_dup(const pos_t *pos)
 {
-    pos_t *newpos = safe_malloc(sizeof(pos_t));
+    pos_t *newpos = safe_alloc(sizeof(pos_t));
 
     *newpos = *pos;
     return newpos;
 }
 
+/**
+ * pos_copy() - copy a position into another one.
+ * @from: &position to duplicate.
+ * @to: &destination position.
+ *
+ * Return a copy of @from into @to.
+ *
+ * @Return: @to.
+ */
+pos_t *pos_copy(const pos_t *from, pos_t *to)
+{
+    *to = *from;
+    return to;
+}
+
 /**
  * pos_del() - delete a position.
  * @pos: &position.
+ *
  */
 void pos_del(pos_t *pos)
 {
@@ -81,31 +100,16 @@ pos_t *pos_clear(pos_t *pos)
 #   ifdef DEBUG_POS
     printf("size(pos_board=%lu elt=%lu\n", sizeof(pos->board), sizeof(int));
 #   endif
-    pos->node_count = 0;
-    pos->turn = WHITE;
+    memset(pos, 0, sizeof (pos_t));
 
-    /* move_do/undo position state */
+    /* non-zero values */
     pos->en_passant = SQUARE_NONE;
-    pos->castle = 0;
-    pos->clock_50 = 0;
-    pos->plycount = 0;
-    //pos->captured = NO_PIECE;
+    pos->move = MOVE_NONE;
 
-    for (square_t sq = A1; sq <= H8; ++sq)
-        pos->board[sq] = EMPTY;
+    pos->king[WHITE] = SQUARE_NONE;
+    pos->king[BLACK] = SQUARE_NONE;
+    pos->prev = HIST_START;
 
-    for (color_t color = WHITE; color <= BLACK; ++color) {
-        for (piece_type_t piece = 0; piece <= KING; ++piece)
-            pos->bb[color][piece] = 0;
-        //pos->controlled[color] = 0;
-        pos->king[color] = SQUARE_NONE;
-    }
-
-    pos->checkers = 0;
-    pos->pinners = 0;
-    pos->blockers = 0;
-
-    //pos->moves.nmoves = 0;
     return pos;
 }
 
@@ -113,55 +117,46 @@ pos_t *pos_clear(pos_t *pos)
  * pos_cmp() - compare two positions..
  * @pos1, @pos2: The two &position.
  *
+ * Used only for move_{do,undo} test/debug.
+ *
  * @return: true if equal, false otherwise.
  */
 bool pos_cmp(const pos_t *pos1, const pos_t *pos2)
 {
 #define _cmpf(a) (pos1->a != pos2->a)
     bool ret = false;
-    if (warn_on(_cmpf(node_count)))
-        goto end;
-    if (warn_on(_cmpf(turn)))
+
+    if (_cmpf(node_count) || _cmpf(turn))
         goto end;
 
     /* move_do/undo position state */
-    if (warn_on(_cmpf(en_passant)))
+    if (_cmpf(key) || _cmpf(en_passant) || _cmpf(castle) ||
+        _cmpf(ply50) || _cmpf(plycount) || _cmpf(captured))
         goto end;
-    if (warn_on(_cmpf(castle)))
+
+    if (_cmpf(checkers) || _cmpf(pinners) || _cmpf(blockers))
         goto end;
-    if (warn_on(_cmpf(clock_50)))
-        goto end;
-    if (warn_on(_cmpf(plycount)))
-        goto end;
-    //if (warn_on(_cmpf(captured)))
-    //    goto end;
 
     for (square_t sq = A1; sq <= H8; ++sq)
-        if (warn_on(_cmpf(board[sq])))
+        if (_cmpf(board[sq]))
             goto end;
 
     for (color_t color = WHITE; color <= BLACK; ++color) {
-        for (piece_type_t piece = 0; piece <= KING; ++piece)
-            if (warn_on(_cmpf(bb[color][piece])))
+        for (piece_type_t piece = ALL_PIECES; piece <= KING; ++piece)
+            if (_cmpf(bb[color][piece]))
                 goto end;
-        //pos->controlled[color] = 0;
-        if (warn_on(_cmpf(king[color])))
+        if (_cmpf(king[color]))
             goto end;
     }
 
-    if (warn_on(_cmpf(checkers)))
-        goto end;
-    if (warn_on(_cmpf(pinners)))
-        goto end;
-    if (warn_on(_cmpf(blockers)))
+    if (_cmpf(checkers) ||_cmpf(pinners) || _cmpf(blockers))
         goto end;
 
     /*
-     * if (warn_on(_cmpf(moves.nmoves)))
+     * if (_cmpf(repeat.moves) ||
+     *     memcmp(pos1->repeat.key, pos2->repeat.key,
+     *            pos1->repeat.moves * sizeof pos1->repeat.key))
      *     goto end;
-     * for (int i = 0; i < pos1->moves.nmoves; ++i)
-     *     if (warn_on(_cmpf(moves.move[i])))
-     *         goto end;
      */
 
     ret = true;
@@ -178,7 +173,7 @@ end:
  * Get a bitboard of all checkers on @color king.
  * Just a wrapper over @sq_attackers().
  *
- * @return: a bitboard of attackers.
+ * @return: a bitboard of checkers.
  */
 bitboard_t pos_checkers(const pos_t *pos, const color_t color)
 {
@@ -186,25 +181,108 @@ bitboard_t pos_checkers(const pos_t *pos, const color_t color)
     return sq_attackers(pos, occ, pos->king[color], OPPONENT(color));
 }
 
+/**
+ * pos_repcount() - return position repetition count.
+ * @pos: &position to search
+ *
+ * Attention: positions before (and including) root position repcount is
+ * decreased by one. See do_moves() in uci.c.
+ *
+ * @return: The number of repetitions in history, zero otherwise.
+ */
+u8 pos_repcount(pos_t *pos)
+{
+    int c50 = pos->ply50;
+    state_t *st = &pos->state;
+    hkey_t key = pos->key;
+
+    st = hist_prev4(st);
+    //printf("is rep: START=%p ", HIST_START);
+    //printf("state=%p diff=%zd c50=%d k1=%#lx k2=%#lx\n",
+    //       st, st - HIST_START, c50, hash_short(pos->key), hash_short(st->key));
+
+    /* attention, what about root position ? Isn't it dangerous to compare with
+     * its key ? like: st->prev != HIST_START
+     */
+    for (; c50 >= 0 && st != HIST_START; st = hist_prev2(st), c50 -= 2) {
+        if (key == st->key)
+            return st->repcount + 1;
+    }
+    return false;
+}
+
 /**
  * pos_set_checkers_pinners_blockers() - calculate checkers, pinners and blockers.
  * @pos:   &position
  *
  * Set position checkers, pinners and blockers on player-to-play king.
- * It should be faster than @pos_checkers + @pos_set_pinners_blockers, as
+ * It should be slightly faster than @pos_checkers + @pos_set_pinners_blockers, as
  * some calculation will be done once.
  */
-/*
- * void pos_set_checkers_pinners_blockers(pos_t *pos)
- * {
- *     bitboard_t b_bb = pos->bb[WHITE][BISHOP] | pos->bb[BLACK][BISHOP];
- *     bitboard_t r_bb = pos->bb[WHITE][ROOK] | pos->bb[BLACK][ROOK];
- *     bitboard_t q_bb = pos->bb[WHITE][QUEEN] | pos->bb[BLACK][QUEEN];
- *
- *     /\* find out first piece on every diagonal *\/
- *
- * }
- */
+void pos_set_checkers_pinners_blockers(pos_t *pos)
+{
+    int us = pos->turn, them = OPPONENT(us);
+    bitboard_t occ = pos_occ(pos);
+    bitboard_t attackers;
+    bitboard_t checkers = 0, blockers = 0, pinners = 0;
+    bitboard_t targets, tmpcheckers, maybeblockers, tmppinners;
+    square_t king = pos->king[us];
+    int pinner;
+
+    /* bishop type - we attack with a bishop from king position */
+    attackers = pos->bb[them][BISHOP] | pos->bb[them][QUEEN];
+
+    /* targets is all "target" pieces if K was a bishop */
+    targets = hq_bishop_moves(occ, king) & occ;
+
+    /* checkers = only opponent B/Q */
+    tmpcheckers = targets & attackers;
+    checkers |= tmpcheckers;
+
+    /* maybe blockers = we remove checkers, to look "behind" */
+    maybeblockers = targets & ~tmpcheckers;
+
+    /* we find second targets, by removing first ones (excl. checkers) */
+    if (maybeblockers) {
+        targets = hq_bishop_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
+
+        /* pinners = only B/Q */
+        tmppinners = targets & attackers;
+
+        /* blockers = we find occupied squares between pinner and king */
+        while (tmppinners) {
+            pinner = bb_next(&tmppinners);
+            pinners |= BIT(pinner);
+            blockers |= bb_between[pinner][king] & maybeblockers;
+        }
+    }
+
+    /* same for rook type */
+    attackers = pos->bb[them][ROOK] | pos->bb[them][QUEEN];
+    targets = hq_rook_moves(occ, king) & occ;
+
+    tmpcheckers = targets & attackers;
+    checkers |= tmpcheckers;
+
+    maybeblockers = targets & ~tmpcheckers;
+    if (maybeblockers) {
+        targets = hq_rook_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
+        tmppinners = targets & attackers;
+        while (tmppinners) {
+            pinner = bb_next(&tmppinners);
+            pinners |= BIT(pinner);
+            blockers |= bb_between[pinner][king] & maybeblockers;
+        }
+    }
+
+    /* pawns & knights */
+    checkers |= bb_pawn_attacks[us][king] & pos->bb[them][PAWN];
+    checkers |= bb_knight[king] & pos->bb[them][KNIGHT];
+
+    pos->checkers = checkers;
+    pos->pinners = pinners;
+    pos->blockers = blockers;
+}
 
 /**
  * pos_set_pinners_blockers() - set position pinners and blockers.
@@ -282,11 +360,11 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
  * - total number of pieces > 16 or zero (per color)
  * - number of kings != 1 (per color)
  * - discrepancy between board and king (per color)
- * - discrepancy between piece bitboards and ALL_PIECES bitboards (per color)
  * - discrepancy between bitboards and board (per color)
  * - side-to-move already checking opponent king
  * - side-to-move in check more than twice
  * - kings distance is 1
+ * - TODO: - castling / e.p. flags
  *
  * In case of errors, and @strict is true, @bug_on() is called, and program will
  * be terminated.
@@ -294,55 +372,56 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
  * (eg after fen parsing), and with @strict == true otherwise (as we have some data
  * corruption).
  *
- * TODO: add more checks:
- * - kings attacking each other
- *
  * @return: (if @strict is false) return true if check is ok, false otherwise.
  */
-bool pos_ok(const pos_t *pos, const bool strict)
+bool pos_ok(pos_t *pos, const bool strict)
 {
     int n, count = 0, bbcount = 0, error = 0;
-    bitboard_t tmp;
+    color_t us = pos->turn, __unused them = OPPONENT(us);
 
     /* pawns on 1st ot 8th rank */
-    tmp = (pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) & (RANK_1bb | RANK_8bb);
-    error += warn_on(tmp);
+    error += warn_on_or_eval((pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) &
+                            (RANK_1bb | RANK_8bb));
 
     for (color_t color = WHITE; color <= BLACK; ++color) {
         /* pawn count */
         n = popcount64(pos->bb[color][PAWN]);
-        error += warn_on(n > 8);
+        error += warn_on_or_eval(n > 8);
         /* king count */
         n = popcount64(pos->bb[color][KING]);
-        error += warn_on(n != 1);
+        error += warn_on_or_eval(n != 1);
         /* king mismatch with board */
-        error += warn_on(PIECE(pos->board[pos->king[color]]) != KING);
+        error += warn_on_or_eval(PIECE(pos->board[pos->king[color]]) != KING);
         /* pieces count */
         n = popcount64(pos->bb[color][ALL_PIECES]);
-        error += warn_on(n == 0 || n > 16);
+        error += warn_on_or_eval(n == 0 || n > 16);
         bbcount += n;
     }
     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);
         piece_type_t p = PIECE(piece);
-        match = pos->bb[c][p] & mask(sq);
-        error += warn_on(!match);
+        match = pos->bb[c][p] & BIT(sq);
+        error += warn_on_or_eval(!match);
         count++;
     }
-    /* occupied occupation is different from bitboards */
-    error += warn_on(count != bbcount);
+    /* occupied board is different from bitboards */
+    error += warn_on_or_eval(count != bbcount);
     /* is opponent already in check ? */
-    error += warn_on(pos_checkers(pos, OPPONENT(pos->turn)));
+    error += warn_on_or_eval(pos_checkers(pos, them));
     /* is color to play in check more than twice ? */
-    error += warn_on(popcount64(pos_checkers(pos, OPPONENT(pos->turn))) > 2);
+    error += warn_on_or_eval(popcount64(pos_checkers(pos, us)) > 2);
     /* kings distance is less than 2 */
-    error += warn_on(sq_dist(pos->king[WHITE], pos->king[BLACK]) < 2);
+    error += warn_on_or_eval(sq_dist(pos->king[WHITE], pos->king[BLACK]) < 2);
+    /* e.p. and castling rights check */
+    error += fen_ok(pos, false);
 
-    bug_on(strict && error);
+    if (strict) {
+        bug_on_always(error);
+    }
     return error? false: true;
 }
 
@@ -355,9 +434,11 @@ void pos_print(const pos_t *pos)
     char str[128];
 
     board_print(pos->board);
-    printf("fen %s\n", pos2fen(pos, str));
-    printf("checkers: %s\n", pos_checkers2str(pos, str, sizeof(str)));
-    printf("pinners : %s\n", pos_pinners2str(pos, str, sizeof(str)));
+    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

@@ -16,43 +16,59 @@
 
 #include <stdint.h>
 
-#include "brlib.h"
-#include "bitops.h"
-#include "struct-group.h"
+#include <brlib.h>
+#include <bitops.h>
+#include <struct-group.h>
+#include <bug.h>
 
 #include "chessdefs.h"
+#include "hash.h"
 #include "bitboard.h"
 #include "piece.h"
 #include "move.h"
 #include "board.h"
+#include "eval-defs.h"
 
 typedef struct __pos_s {
     u64 node_count;                               /* evaluated nodes */
     int turn;                                     /* WHITE or BLACK */
 
-    /* data which cannot be recovered by move_undo (like castle_rights, ...),
-     * or would be expensive to recover (checkers, ...)
-     * following data can be accessed either directly, either via "movesave"
+    /* data which cannot be recovered by move_undo (like castle_rights, ...).
+     *
+     * Attention: checkers/pinners/blockers are not included here, and
+     * are not available in move_undo or any following legality check.
+     *
+     * Following data can be accessed either directly, either via "state"
      * structure name.
      * For example, pos->en_passant and pos->state.en_passant are the same.
      * 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 */
+                        move_t move;
+
+                        /* 8 bits */
                         square_t en_passant;
                         castle_rights_t castle;
-                        u16 clock_50;
-                        u16 plycount;             /* plies so far, start from 1 */
-                        piece_t captured;         /* only for move_undo */
-                        bitboard_t checkers;      /* opponent checkers */
-                        bitboard_t pinners;       /* opponent pinners */
-                        bitboard_t blockers;      /* pieces blocking pin */
+                        piece_t captured;         /* only used in move_undo */
+                        phase_t phase;
+                        u8 ply50;
+                        u8 repcount;              /* repetition count */
         );
-
+    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] */
-    //bitboard_t controlled[2];                     /* unsure */
+    bitboard_t bb[2][PT_NB];                      /* bb[0][PAWN], bb[1][ALL_PIECES] */
     square_t king[2];                             /* dup with bb, faster retrieval */
-    //movelist_t moves;
+    u16 plycount;                                 /* plies in game, start from 1 */
+    u8 plyroot;                                   /* plies since search root. root=0 */
 } pos_t;
 
 typedef struct state_s state_t;
@@ -71,11 +87,16 @@ static __always_inline void pos_set_sq(pos_t *pos, square_t square, piece_t piec
 {
     color_t color = COLOR(piece);
     piece_type_t type = PIECE(piece);
+
+    bug_on(pos->board[square] != EMPTY);
+
     pos->board[square] = piece;
-    pos->bb[color][type] |= mask(square);
-    pos->bb[color][ALL_PIECES] |= mask(square);
-    if (type == KING)
-        pos->king[color] = square;
+    pos->bb[color][type] |= BIT(square);
+    pos->bb[color][ALL_PIECES] |= BIT(square);
+    //if (type == KING)
+    //    pos->king[color] = square;
+
+    //pos->key ^= zobrist_pieces[piece][square];
 }
 
 /**
@@ -90,11 +111,16 @@ static __always_inline void pos_clr_sq(pos_t *pos, square_t square)
     piece_t piece = pos->board[square];
     piece_type_t type = PIECE(piece);
     color_t color = COLOR(piece);
+
+    bug_on(pos->board[square] == EMPTY);
+
+    //pos->key ^= zobrist_pieces[piece][square];
+
     pos->board[square] = EMPTY;
-    pos->bb[color][type] &= ~mask(square);
-    pos->bb[color][ALL_PIECES] &= ~mask(square);
-    if (type == KING)
-        pos->king[color] = SQUARE_NONE;
+    pos->bb[color][type] &= ~BIT(square);
+    pos->bb[color][ALL_PIECES] &= ~BIT(square);
+    //if (type == KING)
+    //    pos->king[color] = SQUARE_NONE;
 }
 
 /**
@@ -155,17 +181,19 @@ static __always_inline int pos_between_count(const pos_t *pos,
 
 pos_t *pos_new();
 pos_t *pos_dup(const pos_t *pos);
+pos_t *pos_copy(const pos_t *from, pos_t *to);
 void pos_del(pos_t *pos);
 pos_t *pos_clear(pos_t *pos);
 bool pos_cmp(const pos_t *pos1, const pos_t *pos2);
 
-//bitboard_t set_king_pinners_blockers(pos_t *pos);
+u8 pos_repcount(pos_t *pos);
+void pos_set_checkers_pinners_blockers(pos_t *pos);
 void pos_set_pinners_blockers(pos_t *pos);
 bitboard_t pos_checkers(const pos_t *pos, const color_t color);
 bitboard_t pos_king_pinners(const pos_t *pos, const color_t color);
 bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboard_t );
 
-bool pos_ok(const pos_t *pos, const bool strict);
+bool pos_ok(pos_t *pos, const bool strict);
 
 void pos_print(const pos_t *pos);
 void pos_print_mask(const pos_t *pos, const bitboard_t mask);

src/search.c

@@ -1,4 +1,4 @@
-/* search.c - search good moves.
+/* search.c - search for perfect move.
  *
  * Copyright (C) 2023-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -13,95 +13,27 @@
 
 #include <stdio.h>
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "position.h"
 #include "move-gen.h"
 #include "move-do.h"
 #include "search.h"
 #include "attack.h"
-
-//#include "move.h"
-//#include "eval.h"
+#include "hist.h"
 
 /**
- * perft() - Perform perft on position
- * @pos:   &position to search
- * @depth: Wanted depth.
- * @ply:   Depth level where perft is consolidated.
+ * is_draw() - check if position is draw by 50 or repetition rule.
+ * @pos: &position to search
  *
- * Print perftCalculate the negamax value of @pos. This is an extensive search, with
- * absolutely no cutoff.
+ * Note that states before (and including) root position state have
+ * their repcount decreased by one.
  *
  * @return: The @pos negamax evaluation.
  */
-u64 perft(pos_t *pos, int depth, int ply)
+bool is_draw(pos_t *pos)
 {
-    int subnodes, movetmp = 0;
-    u64 nodes = 0;
-    movelist_t pseudo = { .nmoves = 0 };
-    move_t move;
-    state_t state;
-
-    if (depth == 0)
-        return 1;
-    pos->checkers = pos_checkers(pos, pos->turn);
-    pos_set_pinners_blockers(pos);
-    state = pos->state;
-
-    pos_gen_pseudomoves(pos, &pseudo);
-    while ((move =  pos_next_legal(pos, &pseudo, &movetmp)) != MOVE_NONE) {
-        move_do(pos, move);
-        subnodes = perft(pos, depth - 1, ply + 1);
-        if (ply == 1) {
-            char movestr[8];
-            printf("%s: %d\n", move_str(movestr, move, 0), subnodes);
-        }
-        nodes += subnodes;
-        move_undo(pos, move);
-        pos->state = state;
-    }
-
-    if (ply == 1)
-        printf("\nTotal: %lu\n", nodes);
-    return nodes;
-}
-
-u64 perft2(pos_t *pos, int depth, int ply)
-{
-    int subnodes, nmove = 0;
-    u64 nodes = 0;
-    movelist_t pseudo = { .nmoves = 0 };
-    move_t move;
-    state_t state;
-
-    if (is_in_check(pos, OPPONENT(pos->turn)))
-        return 0;
-    if (depth == 0)
-        return 1;
-    pos->checkers = pos_checkers(pos, pos->turn);
-    pos_set_pinners_blockers(pos);
-    state = pos->state;
-
-    pos_gen_pseudomoves(pos, &pseudo);
-
-    for (nmove = 0; nmove < pseudo.nmoves; ++nmove ) {
-        move = pseudo.move[nmove];
-        move_do(pos, move);
-        //if (!is_in_check(pos, OPPONENT(pos->turn))) {
-        subnodes = perft2(pos, depth - 1, ply + 1);
-        nodes += subnodes;
-        if (ply == 1) {
-            char movestr[8];
-            printf("%s: %d\n", move_str(movestr, move, 0), subnodes);
-        }
-            //}
-        move_undo(pos, move);
-        pos->state = state;
-    }
-    if (ply == 1)
-        printf("\nTotal: %lu\n", nodes);
-    return nodes;
+    return (pos->ply50 > 100 || pos->repcount);
 }
 
 /**
@@ -115,34 +47,36 @@ u64 perft2(pos_t *pos, int depth, int ply)
  *
  * @return: The @pos negamax evaluation.
  */
-/*
- * eval_t negamax(pos_t *pos, int depth, int color)
- * {
- *     move_t *move;
- *     pos_t *newpos;
- *     eval_t best = EVAL_MIN, score;
- *
- *     pos->node_count++;
- *     if (depth == 0) {
- *         moves_gen_all_nomoves(pos);
- *         score = eval(pos) * color;
- *         return score;
- *     }
- *     moves_gen_all(pos);
- *     list_for_each_entry(move, &pos->moves[pos->turn], list) {
- *         newpos = move_do(pos, move);
- *         score = -negamax(newpos, depth - 1, -color);
- *         pos->node_count += newpos->node_count;
- *         move->negamax = score;
- *         if (score > best) {
- *             best = score;
- *             pos->bestmove = move;
- *         }
- *         move_undo(newpos, move);
- *     }
- *     return best;
- * }
- */
+eval_t negamax(pos_t *pos, int depth, int color)
+{
+    move_t *move, *last;
+    state_t state;
+    eval_t best = EVAL_MIN, score;
+    movelist_t movelist;
+
+    pos->node_count++;
+    if (depth == 0) {
+        score = eval(pos) * color;
+        return score;
+    }
+    pos_set_checkers_pinners_blockers(pos);
+    pos_gen_legal(pos, &movelist);
+    last = movelist.move + movelist.nmoves;
+    //moves_gen_all(pos);
+    for (move = movelist.move; move < last; ++move) {
+        //list_for_each_entry(move, &pos->moves[pos->turn], list) {
+        move_do(pos, *move, &state);
+        score = -negamax(pos, depth - 1, -color);
+        pos->node_count += pos->node_count;
+        //move->negamax = score;
+        if (score > best) {
+            best = score;
+            pos->eval = best;
+        }
+        move_undo(pos, *move, &state);
+    }
+    return best;
+}
 
 
 /**
@@ -302,24 +236,24 @@ u64 perft2(pos_t *pos, int depth, int ply)
  * @return: The @pos negamax evaluation.
  */
 /*int ab_negamax(pos_t *pos, int alpha, int beta, int depth)
-{
-    move_t *move;
-    pos_t *newpos;
-    eval_t best = EVAL_MIN, score;
+  {
+  move_t *move;
+  pos_t *newpos;
+  eval_t best = EVAL_MIN, score;
 
-    if(depth == 0) {
-       //return quiesce( alpha, beta );
-        moves_gen_all_nomoves(pos);
-       score = eval(pos) * color;
-       return score;
-    }
-   for ( all moves)  {
-      score = -alphaBeta( -beta, -alpha, depthleft - 1 );
-      if( score >= beta )
-         return beta;   //  fail hard beta-cutoff
-      if( score > alpha )
-         alpha = score; // alpha acts like max in MiniMax
-   }
-   return alpha;
-}
+  if(depth == 0) {
+  //return quiesce( alpha, beta );
+  moves_gen_all_nomoves(pos);
+  score = eval(pos) * color;
+  return score;
+  }
+  for ( all moves)  {
+  score = -alphaBeta( -beta, -alpha, depthleft - 1 );
+  if( score >= beta )
+  return beta;   //  fail hard beta-cutoff
+  if( score > alpha )
+  alpha = score; // alpha acts like max in MiniMax
+  }
+  return alpha;
+  }
 */

src/search.h

@@ -16,10 +16,8 @@
 
 #include "position.h"
 
+bool is_draw(pos_t *pos);
 //eval_t negamax(pos_t *pos, int depth, int color);
 //eval_t pvs(pos_t *pos, int depth, int alpha, int beta, int color);
 
-u64 perft(pos_t *pos, int depth, int ply);
-u64 perft2(pos_t *pos, int depth, int ply);
-
 #endif  /* SEARCH_H */

src/thread.c

@@ -0,0 +1,70 @@
+/* thread.c - thread 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 <stdio.h>
+
+#include <brlib.h>
+#include <pthread.h>
+#include <poll.h>
+#include <sys/socket.h>
+
+#include "thread.h"
+
+/* Still have to decide: thread or process ?
+ *
+ */
+thread_pool_t threadpool;
+
+
+/**
+ * thrd_create - initialize thrd.
+ */
+int thrd_create(__unused int num)
+{
+    int fd[2];
+    /* shall we make a communication channel via a pipe or socket ? */
+    int __unused ret = socketpair(AF_LOCAL, SOCK_SEQPACKET, PF_LOCAL, fd);
+    return 1;
+}
+
+/**
+ * thread_init - initialize thread pool.
+ */
+int thread_init(int nb)
+{
+    nb = clamp(nb, MIN_THRDS, MAX_THRDS);
+
+    /* stop unwanted threads, always keep 1 */
+    for (int i = nb + 1; i < threadpool.nb; ++i) {
+        printf("stopping thread %d - status = \n", i);
+        threadpool.thread[i].cmd = THRD_DO_QUIT;
+    }
+    for (int i = threadpool.nb; i < nb; ++i) {
+        printf("creating thread %d - status = \n", i);
+        thrd_create(i);
+
+    }
+
+    return nb;
+}
+
+/*
+  communication:
+  main thread -> thread
+           commands via memory
+  thread -> main thread
+           status via memory
+           output via pipe/socket
+  thread output will be output/filtered by main thread
+
+ */

src/thread.h

@@ -0,0 +1,55 @@
+/* thread.h - thread management.
+ *
+ * Copyright (C) 2021-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 THREAD_H
+#define THREAD_H
+
+#include <pthread.h>
+
+#include <brlib.h>
+
+#include "position.h"
+
+#define MIN_THRDS 1
+#define MAX_THRDS 16
+
+typedef enum {
+    THRD_DEAD,
+    THRD_IDLE,
+    THRD_WORKING,
+} thread_status_t;
+
+typedef enum {
+    /* main thread to subs */
+    THRD_DO_SEARCH,
+    THRD_DO_STOP,
+    THRD_DO_QUIT,
+} thread_cmd_t;
+
+typedef struct {
+    int id;
+    thread_status_t status;
+    thread_cmd_t cmd;
+    int fd[2];
+    pos_t pos;
+} thread_t;
+
+typedef struct {
+    int nb;
+    thread_t thread[MAX_THRDS + 1];
+} thread_pool_t;
+
+int thrd_create(__unused int num);
+int thread_init(int nb);
+
+#endif  /* THREAD_H */

src/uci.c

@@ -0,0 +1,555 @@
+/* uci.c - uci protocol
+ *
+ * Copyright (C) 2021-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 <unistd.h>
+#include <ctype.h>
+
+#include <brlib.h>
+
+#include "chessdefs.h"
+#include "util.h"
+#include "position.h"
+#include "hist.h"
+#include "fen.h"
+#include "move-gen.h"
+#include "move-do.h"
+#include "search.h"
+#include "perft.h"
+#include "eval-defs.h"
+#include "uci.h"
+
+struct command {
+    char *name;                                   /* command name */
+    int (*func)(pos_t *, char *);                 /* function doing the job */
+    char *doc;                                    /* function doc */
+};
+
+int execute_line (pos_t *, struct command *, char *);
+struct command *find_command (char *);
+
+/* The names of functions that actually do the stuff.
+ */
+
+/* standard UCI commands */
+int do_ucinewgame(pos_t *, char *);
+int do_uci(pos_t *, char *);
+int do_isready(pos_t *, char *);
+int do_quit(pos_t *, char *);
+
+int do_setoption(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 *);
+
+struct command commands[] = {
+    { "quit",       do_quit, "Quit" },
+    { "uci",        do_uci, "" },
+    { "ucinewgame", do_ucinewgame, "" },
+    { "isready",    do_isready, "" },
+    { "setoption",  do_setoption, ""},
+    { "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" },
+    { "help",       do_help, "(not UCI) This help" },
+    { "?",          do_help, "(not UCI) This help" },
+
+    { NULL, (int(*)()) NULL, NULL }
+};
+
+/* Execute a command line. */
+int execute_line(pos_t *pos, struct command *command, char *args)
+{
+    return (*command->func)(pos, args);
+}
+
+/**
+ * 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))
+            return commands + i;
+
+    return NULL;
+}
+
+/*
+ * 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_init(pos_t *pos, __unused char *arg)
+ * {
+ *     startpos(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_prmovepos(pos_t *pos, char *arg)
+ * {
+ *     struct list_head *p_cur, *tmp;
+ *     int movenum = atoi(arg), cur = 0;             /\* starts with 0 *\/
+ *     move_t *move;
+ *
+ *     log_f(1, "%s\n", arg);
+ *     list_for_each_safe(p_cur, tmp, &pos->moves[pos->turn]) {
+ *         move = list_entry(p_cur, move_t, list);
+ *         if (cur++ == movenum) {
+ *             pos_print(move->newpos);
+ *             break;
+ *         }
+ *     }
+ *
+ *     return 1;
+ * }
+ */
+
+/*
+ * 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)
+{
+    pos_clear(pos);
+    tt_clear();
+    return 1;
+}
+
+int do_uci(__unused pos_t *pos, __unused char *arg)
+{
+    printf("id name brchess " VERSION "\n");
+    printf("id author Bruno Raoult\n");
+    printf("option name Hash type spin default %d min %d max %d\n",
+           hash_tt.mb, HASH_SIZE_MIN, HASH_SIZE_MAX);
+
+    if (PST_NB > 1) {
+        printf("option name pst type combo default %s",
+               pst_name(pst_current));
+        for (int i = 0; i < PST_NB; ++i)
+            printf(" var %s", pst_name(i));
+    }
+    printf("\n");
+    for (int var = 0; var < EV_PARAMS_NB; ++var) {
+        if (param_setable(var)) {
+            int ptyp = param_type(var);
+            int pmin = param_min(var);
+            int pmax = param_max(var);
+            int pval = parameters[var];
+
+            printf("option name %s ", param_name(var));
+            switch(ptyp) {
+                case PAR_BTN:
+                    printf("type button\n");
+                    break;
+                case PAR_CHK:
+                    printf("type check default %s\n", pval? "true": "false");
+                    break;
+                case PAR_SPN:
+                    printf("type spin default %d min %d max %d\n", pval, pmin, pmax);
+                    break;
+            };
+        }
+    }
+    printf("uciok\n");
+    return 1;
+}
+
+int do_isready(__unused pos_t *pos, __unused char *arg)
+{
+    printf("readyok\n");
+    return 1;
+}
+
+int do_setoption(__unused pos_t *pos, __unused char *arg)
+{
+    char *name, *value = NULL;
+
+    if (str_token(arg, "name") != arg)
+        return 1;
+    if (!(name = str_skip_word(arg)))
+        return 1;
+    /* at this point, we got a valid parameter name */
+    value = str_token(name, "value");             /* put '\0' at name end */
+    if (value) {
+        value = str_skip_word(value);
+        if (!value)
+            return 1;
+    }
+    if (str_eq_case(name, "hash") && value) {
+        tt_create(atoi(value));
+    } else if (str_eq_case(name, "pst")) {
+        pst_set(value);
+    } else {
+        int var = param_find_name(name);
+        if (var < 0) {
+            printf("wrong parameter '%s'\n", name);
+            return 1;
+        }
+        char *pname = param_name(var);
+        printf("found param <%s> = %d\n", pname, var);
+        if (param_setable(var)) {
+            int ptyp = param_min(var);
+            int pmin = param_min(var);
+            int pmax = param_max(var);
+            int pval;
+
+            switch(ptyp) {
+                case PAR_BTN:
+                    bug_on (value);
+                    printf("do button '%s'\n", pname);
+                    break;
+                case PAR_CHK:
+                    bug_on (!value);
+                    if (str_eq_case(value, "true"))
+                        pval = 1;
+                    else if (str_eq_case(value, "false"))
+                        pval = 0;
+                    else {
+                        printf("wrong value '%s' to '%s' boolean parameter\n",
+                               value, pname);
+                        return 1;
+                    }
+                    printf("set '%s' to %s\n", pname, pval? "true": "false");
+                    param_set(var, pval);
+                    break;
+                case PAR_SPN:
+                    bug_on (!value);
+                    pval = clamp(atoi(value), pmin, pmax);
+                    printf("set '%s' to %d\n", param_name(var), pval);
+                    param_set(var, pval);
+                    break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+int do_position(pos_t *pos, char *arg)
+{
+    char *saveptr, *token, *fen, *moves;
+
+    hist_init();
+
+    /* separate "moves" section */
+    moves = str_token(arg, "moves");
+    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;
+    }
+    //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;
+    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, hist_next());
+        printf("repet=%d\n", pos->repcount);
+        //if (is_repetition(pos))
+        //    printf("rep detected\n");
+        //else if(is_draw(pos))
+        //    printf("draw detected\n");
+        hist_static_print();
+        token = strtok_r(NULL, " ", &saveptr);
+    }
+    /* reset position root, and decrease history moves repcounts.
+     * TODO: Maybe use "ucinewgame" to decide when to perform this decrease ?
+     */
+    pos->plyroot = 0;
+    for (state_t *st = &pos->state; st != HIST_START; st = hist_prev(st)) {
+        //printf("adjust rep=%d->\n");
+        st->repcount = max(0, st->repcount - 1);
+    }
+    pos_print(pos);
+    hist_print(pos);
+    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, divide);
+        else
+            perft_alt(pos, depth, 1, divide);
+    }
+    return 1;
+}
+
+int do_hist(__unused pos_t *pos, __unused char *arg)
+{
+    hist_print(pos);
+    return 0;
+}
+
+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_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;
+ * }
+ */
+
+
+static int done = 0;
+
+int do_quit(__unused pos_t *pos, __unused char *arg)
+{
+    return done = 1;
+}
+
+int uci(pos_t *pos)
+{
+    char *str = NULL, *saveptr, *token, *args;
+    size_t lenstr = 0;
+    struct command *command;
+
+    while (!done && getline(&str, &lenstr, stdin) >= 0) {
+        str = str_trim(str);
+        if (! *str)
+            continue;
+        token = strtok_r(str, " ", &saveptr);
+        if (! (command = find_command(token))) {
+            fprintf(stderr, "Unknown [%s] command. Try 'help'.\n", token);
+            continue;
+        }
+        args = strtok_r(NULL, "", &saveptr);
+        execute_line(pos, command, args);
+    }
+
+    if (str)
+        free(str);
+
+    return 0;
+}

src/uci.h

@@ -0,0 +1,21 @@
+/* uci.h - main loop.
+ *
+ * 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 UCI_H
+#define UCI_H
+
+#include "position.h"
+
+int uci(pos_t *pos);
+
+#endif  /* UCI_H */

src/util.c

@@ -1,4 +1,4 @@
-/* util.c - various util functions.
+/* util.c - generic/catchall functions.
  *
  * Copyright (C) 2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -11,8 +11,264 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+//#include <time.h>
+//#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 
+#include <bug.h>
+
+#include "chessdefs.h"
 #include "util.h"
-#include "bitboard.h"
+
+/*
+ * 1 sec      = 1000 millisec
+ * 1 millisec = 1000 microsec
+ * 1 microsec = 1000 nanosec
+ * milli = sec * 1000 + nanosec / 1000000
+ *
+ */
+
+/* We use microsec for all intermediate calcluation */
+#define NANO_IN_MICRO  1000ll                     /* nanosecond in millisecond */
+#define MICRO_IN_SEC   1000000ll                  /* millisecond in second */
+
+#define MILLI_IN_SEC   1000ll                     /* millisecond in second */
+
+#define MICRO_IN_MILLI 1000ll
+
+/**
+ * clock_start - start or restart a clock.
+ * @clock: &mclock_t clock
+ *
+ * Save current time according to @clock type.
+ */
+void clock_start(mclock_t *clock)
+{
+    clock_gettime(clock->clocktype, &clock->start);
+}
+
+/**
+ * clock_init - initializes a clock type.
+ * @clock: &mclock_t clock
+ * @type: clock type
+ *
+ * See the clock_gettime(2) for details.
+ * CLOCK_WALL (a.k.a CLOCK_REALTIME): Wall clock.
+ * CLOCK_SYSTEM (a.k.a CLOCK_MONOTONIC_RAW): System clock.
+ * CLOCK_PROCESS (a.k.a CLOCK_PROCESS_CPUTIME_ID): Process CPU clock (incl. threads).
+ * CLOCK_THREAD  (a.k.a CLOCK_THREAD_CPUTIME_ID): Thread CPU clock.
+ */
+void clock_init(mclock_t *clock, clockid_t type)
+{
+    clock->clocktype = type;
+    clock_start(clock);
+}
+
+/**
+ * clock_elapsed_μs - return a mclock_t elapsed time in microseconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: microseconds elapsed since last clock_start().
+ */
+s64 clock_elapsed_μs(mclock_t *clock)
+{
+    struct timespec current;
+    s64 μs;
+
+    clock_gettime(clock->clocktype, &current);
+    μs = ((s64)current.tv_sec - (s64)clock->start.tv_sec) * MICRO_IN_SEC +
+        ((s64)current.tv_nsec - (s64)clock->start.tv_nsec) / NANO_IN_MICRO ;
+    return μs;
+}
+
+/**
+ * clock_elapsed_ms - return a mclock_t elapsed time in milliseconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: milliseconds elapsed since last clock_start().
+ */
+s64 clock_elapsed_ms(mclock_t *clock)
+{
+    return clock_elapsed_μs(clock) / MICRO_IN_MILLI;
+}
+
+/**
+ * clock_elapsed_sec - return a mclock_t elapsed time in seconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: seconds elapsed since last clock_start().
+ */
+double clock_elapsed_sec(mclock_t *clock)
+{
+    return (double) clock_elapsed_μs(clock) / (double) MICRO_IN_SEC;
+}
+
+static u64 rand_seed = 1ull;
+
+/**
+ * rand_init() - initialize random generator seed.
+ * @seed: u64, the random generator seed.
+ *
+ * No change is made is performed if If @seed is zero. By default, @seed is
+ * 1.
+ * This seed is used by rand64().
+ */
+void rand_init(u64 seed)
+{
+    if (seed)
+        rand_seed = seed;
+}
+
+/**
+ * rand64() - get a random number, xorshift method.
+ *
+ * Source:
+ *   https://en.wikipedia.org/wiki/Xorshift#xorshift*
+ * We do not want true random numbers, like those offered by getrandom(2), as we
+ * need to be able to get predictable results.
+ * Note: For predictable results in MT, we should use separate seeds.
+ *
+ * @return: a 64 bits random number.
+ */
+u64 rand64(void)
+{
+    bug_on(rand_seed == 0ull);
+
+    rand_seed ^= rand_seed >> 12;
+    rand_seed ^= rand_seed << 25;
+    rand_seed ^= rand_seed >> 27;
+    return rand_seed * 0x2545f4914f6cdd1dull;
+}
+
+/**
+ * str_eq_case - test if two strings are equal ignoring case
+ * @str1: string1
+ * @str2: string2
+ *
+ * Compare @str1 and @str2 byte-by-byte, ignoring case.
+ *
+ * @return: true is equal, false otherwise.
+ */
+bool str_eq_case(char *str1, char *str2)
+{
+    uchar *s1 = (uchar *) str1;
+    uchar *s2 = (uchar *) str2;
+
+    for (; *s1 && *s2; ++s1, ++s2) {
+        if (tolower(*s1) != tolower(*s2))
+            break;
+    }
+    //printf("d=%lu *s1=%d *s2=%d\n", s1 - (uchar *) str1, *s1, *s2);
+    return *s2 == *s1;
+}
+
+/**
+ * str_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.
+ */
+char *str_trim(char *str)
+{
+    char *to = str, *from = str;
+    int state = 1;
+
+    bug_on(!str);
+    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 (to > str)
+        to--;
+    *to = 0;
+    return str;
+}
+
+/**
+ * str_token - split a string from next token.
+ * @str:   string to search
+ * @token: token to look for
+ *
+ * Look for token @token in string @str, and if found, split @str just before it.
+ * A token is a string delimited by one space character. However, it may contain
+ * space characters itself.
+ * @str should normally be normalized with @str_trim(), so that all consecutive
+ * blank characters are replaced by one, and leading/trailing ones removed.
+ *
+ * @return: @token address if found, NULL otherwise.
+ */
+char *str_token(char *str, const char *token)
+{
+    int len = strlen(token);
+    char *found = str;
+
+    bug_on(!str || !token);
+    if (!*token)                                  /* nothing to search */
+        return str;
+
+    while (found && *found) {
+        //printf("trying pos=%ld\n", found - str);
+        found = strstr(found, token);
+        if (found) {
+            if (!found[len] || isspace(found[len]))
+                break;
+            found = strchr(found, ' ') + 1;
+            //printf("new pos=%ld\n", found - str);
+        }
+    }
+    if (found > str)                              /* split string */
+        *(found - 1) = 0;
+    return found;
+}
+
+/**
+ * str_skip_word - find next word in a string.
+ * @str:   input string
+ *
+ * skip current word and following blank char.
+ * @str must be normalized with @str_trim(), so that all consecutive blank
+ * characters are already replaced by one, and leading/trailing ones removed.
+ * Note that 'word' means any sequence of non-space character.
+ *
+ * @str is not modified.
+ *
+ * @return: next word if found, NULL otherwise.
+ */
+char *str_skip_word(char *str)
+{
+    bug_on(!str);
+    str = strchr(str, ' ');
+    return str? str + 1: NULL;
+}

src/util.h

@@ -14,25 +14,48 @@
 #ifndef _UTIL_H
 #define _UTIL_H
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <brlib.h>
 
-#include "bug.h"
+#include <time.h>
 
-#include "chessdefs.h"
+typedef struct mclock {
+    clockid_t clocktype;
+    ulong elapsed_l;
+    double elapsed_f;
+    struct timespec start;
+} mclock_t;
 
-#undef safe_malloc
-#undef safe_free
+#define CLOCK_WALL    CLOCK_REALTIME
+#define CLOCK_SYSTEM  CLOCK_MONOTONIC_RAW
+#define CLOCK_PROCESS CLOCK_PROCESS_CPUTIME_ID
+#define CLOCK_THREAD  CLOCK_THREAD_CPUTIME_ID
 
-#define safe_malloc(size) ({                   \
-            void *_ret = malloc(size);         \
-            bug_on(_ret == NULL);              \
-            _ret;                              \
-        })
+/**
+ * CLOCK_DEFINE - define a clock type.
+ * @name: clock name
+ * @type: clock type
+ *
+ * This macro is equivalent to:
+ *   mclock_t name;
+ *   clock_init(&name, type);
+ */
+#define CLOCK_DEFINE(name, type) struct mclock name = { .clocktype = type }
 
-#define safe_free(ptr) do {                    \
-        bug_on(ptr == NULL);                   \
-        free(ptr);                             \
-    } while (0)
+void clock_init(mclock_t *clock, clockid_t type);
+void clock_start(mclock_t *clock);
+s64 clock_elapsed_μs(mclock_t *clock);
+s64 clock_elapsed_ms(mclock_t *clock);
+double clock_elapsed_sec(mclock_t *clock);
+
+#define RAND_SEED_DEFAULT U64(0xb0d1ccea)
+
+void rand_init(u64 seed);
+u64 rand64(void);
+
+
+bool str_eq_case(char *str1, char *str2);
+char *str_trim(char *str);
+char *str_token(char *str, const char *token);
+char *str_skip_word(char *str);
 
 #endif  /* UTIL_H */

test/attack-test.c

@@ -28,11 +28,12 @@ int main(int __unused ac, __unused char**av)
     int i = 0;
     char *fen;
     pos_t *pos;//, *fishpos = pos_new();
+    bitboard_t checkers, pinners, blockers;
 
     setlinebuf(stdout);                           /* line-buffered stdout */
 
     bitboard_init();
-    hyperbola_init();
+    hq_init();
 
     while ((fen = next_fen(ATTACK))) {
         //printf(">>>>> %s\n", test[i]);
@@ -41,8 +42,22 @@ int main(int __unused ac, __unused char**av)
             printf("wrong fen %d: [%s]\n", i, fen);
             continue;
         }
+        pos->checkers = pos_checkers(pos, pos->turn);
+        pos_set_pinners_blockers(pos);
+
         pos_print(pos);
 
+        checkers = pos->checkers;
+        pinners = pos->pinners;
+        blockers = pos->blockers;
+
+        pos_set_checkers_pinners_blockers(pos);
+
+        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);
+
         pos_del(pos);
         i++;
     }

test/bitboard-test.c

@@ -18,13 +18,13 @@
 
 #include "chessdefs.h"
 #include "bitboard.h"
-#include "hyperbola-quintessence.h"
+#include "hq.h"
 
 int main(int __unused ac, __unused char**av)
 {
     char str[256];
     bitboard_init();
-    hyperbola_init();
+    hq_init();
     for (int i = 0; i < 64; ++i) {
         sprintf(str, "\n%#x:\n   %-22s%-22s%-22s%-22s%-22s%-22s%-22s", i,
                 "sliding", "diagonal", "antidiagonal", "file", "rank", "knight",
@@ -46,16 +46,24 @@ int main(int __unused ac, __unused char**av)
     sprintf(str, "between: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
             "c3-c6", "c3-f6", "c3-f3", "c3-e1", "c3-c1", "c3-a1", "c3-a3", "c3-a5");
     bb_print_multi(str, 8,
-                         bb_between[C3][C6], bb_between[C3][F6],
-                         bb_between[C3][F3], bb_between[C3][E1],
-                         bb_between[C3][C1], bb_between[C3][A1],
-                         bb_between[C3][A3], bb_between[C3][A5]);
+                   bb_between[C3][C6], bb_between[C3][F6],
+                   bb_between[C3][F3], bb_between[C3][E1],
+                   bb_between[C3][C1], bb_between[C3][A1],
+                   bb_between[C3][A3], bb_between[C3][A5]);
     sprintf(str, "between: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
             "c4-c6", "c4-f6", "c4-f3", "c4-e1", "c4-c1", "c4-a1", "c4-a3", "c4-a5");
     bb_print_multi(str, 8,
-                         bb_between[C4][C6], bb_between[C4][F6],
-                         bb_between[C4][F3], bb_between[C4][E1],
-                         bb_between[C4][C1], bb_between[C4][A1],
-                         bb_between[C4][A3], bb_between[C4][A5]);
+                   bb_between[C4][C6], bb_between[C4][F6],
+                   bb_between[C4][F3], bb_between[C4][E1],
+                   bb_between[C4][C1], bb_between[C4][A1],
+                   bb_between[C4][A3], bb_between[C4][A5]);
+    sprintf(str, "Pwn att: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
+            "White a2", "Black a2", "White h7", "Black h7",
+            "White c3", "Black c3", "White e5", "Black e5");
+    bb_print_multi(str, 8,
+                   bb_pawn_attacks[WHITE][A2], bb_pawn_attacks[BLACK][A2],
+                   bb_pawn_attacks[WHITE][H7], bb_pawn_attacks[BLACK][H7],
+                   bb_pawn_attacks[WHITE][C3], bb_pawn_attacks[BLACK][C3],
+                   bb_pawn_attacks[WHITE][E5], bb_pawn_attacks[BLACK][E5]);
     return 0;
 }

test/common-test.h

@@ -28,17 +28,16 @@ struct fentest {
     char *comment;
     char *fen;
 } fentest[] = {
-    /*
-    { __LINE__.
-      ATTACK,
-      "checkers: ",
-      ""
-    },
-     */
-    /* tests rank movegen bug - FIXED
-     */
-    //"4k3/pppppppp/8/8/8/8/PPPPPPPP/2BRK3 w - - 0 1",
-    //"4k3/pppppppp/8/8/8/8/PPPPPPPP/1B1R1K2 w - - 0 1",
+    /******************************************************************
+     * TEMP TESTS BELOW - only run them (till sentinel below)         *
+     ******************************************************************/
+
+    /******************************************************************
+     * DO NOT DELETE NEXT LINE - sentinel entry for temp tests above. *
+     *                           ignored if first array entry.        *
+     ******************************************************************/
+    { __LINE__, 0, NULL, NULL },
+
     { __LINE__, MOVEGEN | MOVEDO | PERFT,
       "illegal white e.p.",
       "3k4/8/5K2/3pP3/8/2b5/8/8 w - d6 0 1",
@@ -77,58 +76,44 @@ 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,
-      "checkers: a1 h1",
-      "1k6/8/8/8/8/8/8/r2K3r w - - 1 1"
+      "only 3 K moves (but impossible situation)",
+      "1k6/8/8/8/8/8/8/r2K3r w - - 0 1"
     },
     { __LINE__, ATTACK,
       "checkers: a8 h8",
-      "R2k3R/8/8/8/8/8/8/1K6 b - - 1 1"
+      "R2k3R/8/8/8/8/8/8/1K6 b - - 0 1"
     },
     { __LINE__, ATTACK,
       "checkers: b3 g3",
-      "1k6/8/8/8/8/1r1K2r1/8/8 w - - 1 1"
+      "1k6/8/8/8/8/1r1K2r1/8/8 w - - 0 1"
     },
 
     { __LINE__, ATTACK,
       "checkers: b6 g6",
-      "8/8/1R1k2R1/8/8/8/8/1K6 b - - 1 1"
+      "8/8/1R1k2R1/8/8/8/8/1K6 b - - 0 1"
     },
 
     { __LINE__, ATTACK,
       "checkers: g2 g7",
-      "8/k5r1/8/8/6K1/8/6r1/8 w - - 1 1"
+      "8/k5r1/8/8/6K1/8/6r1/8 w - - 0 1"
     },
     { __LINE__, ATTACK,
       "checkers: g2 g7",
-      "8/6R1/8/6k1/8/8/K5R1/8 b - - 1 1"
+      "8/6R1/8/6k1/8/8/K5R1/8 b - - 0 1"
     },
     { __LINE__, ATTACK,
       "checkers: d5 e3, pinners: none (2 pieces between attacker & K)",
-      "3k4/8/8/3r3b/b7/1N2nn2/2n1B3/rNBK1Rbr w - - 1 1"
+      "3k4/8/8/3r3b/b7/1N2nn2/2n1B3/rNBK1Rbr w - - 0 1"
     },
 
     { __LINE__, ATTACK,
       "checkers: d4 e6 pinners: h4 a5 a8 h8",
-      "Rn1k1r1R/4b3/1n2N3/B7/3R3B/8/8/3K4 b - - 1 1"
+      "Rn1k1r1R/4b3/1n2N3/B7/3R3B/8/8/3K4 b - - 0 1"
     },
     { __LINE__, ATTACK,
       "checkers: d5 e3, pinners: a1 h1 a4 h5",
-      "3k4/8/8/3r3b/b7/1N2n3/4B3/rN1K1R1r w - - 1 0"
+      "3k4/8/8/3r3b/b7/1N2n3/4B3/rN1K1R1r w - - 0 1"
     },
 
     { __LINE__, MOVEGEN | MOVEDO | PERFT,
@@ -140,44 +125,34 @@ struct fentest {
       "checker: h4",
       "4k3/8/8/8/7b/8/8/4K3 w - - 0 1"
     },
-// First game moves
+    /*
+     * First game moves
+     */
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "startpos",
       "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 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"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "1.e4",
+      "startpos + 1.e4",
       "rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "1.Nh3",
-      "rnbqkbnr/pppppppp/8/8/8/7N/PPPPPPPP/RNBQKB1R b KQkq - 1 1"
+      "startpos + 1.e4 e5 2.Nf3",
+      "rnbqkbnr/pppp1ppp/8/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R b KQkq - 1 2"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "1.e4 e5 2.Nf3 Nc6",
-      "r1bqkbnr/pp1ppppp/2n5/2p5/4P3/5N2/PPPP1PPP/RNBQKB1R w KQkq - 0 1"
+      "startpos + 1.e4 e5 2.Nf3 Nc6",
+      "r1bqkbnr/pppp1ppp/2n5/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R w KQkq - 2 3"
     },
-
-    // castling test
-    // both can castle queen only
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "no Q castling",
+      "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 tests *
+     ******************/
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "both can castle K-side",
       "r3k2r/8/3B4/8/8/3b4/8/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
@@ -185,43 +160,29 @@ 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 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",
+      "2 Kings, W/B pawns on 7th for promotion",
       "k4n2/4P3/8/8/8/8/4p3/K4N2 w - - 0 1"
     },
-    // white castled, and can e.p. on c6 black can castle
-    // white is a pawn down
-    // white has 36 moves: P=11 + 1 e.p. N=6+3 B=5+5 R=1 Q=3 K=1 + 1 e.p.
-    // black has 33 moves: P=11 N=2+7 B=5 R=3 Q=3 K=1 + castle
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
+    { __LINE__, FEN | MOVEGEN,
+      "movegen: white has 36 moves",
       "rnbqk2r/pp1pbpp1/7p/2pPp3/4n3/3B1N2/PPP2PPP/RNBQ1RK1 w kq c6 0 7"
     },
-
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "",
       "4k3/4p3/8/b7/1BR1p2p/1Q3P2/5N2/4K3 w - - 0 1"
@@ -234,38 +195,46 @@ struct fentest {
       "",
       "6k1/6pp/R2p4/p1p5/8/1P1r3P/6P1/6K1 b - - 3 3"
     },
+    /*****************************************************
+     * tests from talkchess                              *
+     *****************************************************/
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "https://www.talkchess.com/forum3/viewtopic.php?f=7&t=71379",
+      "8/6kR/8/8/8/bq6/1rqqqqqq/K1nqnbrq b - - 0 1"
+    },
+    { __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,
-      "",
-      "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 1"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 1"
-    },
+    /*****************************************************
+     * tests from:                                       *
+     *   https://www.chessprogramming.net/perfect-perft/ *
+     *****************************************************/
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "",
       "8/2p5/3p4/Kp5r/1R3p1k/8/4P1P1/8 w - - 0 1"
     },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15"
-    },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "",
       "1rbqk1nr/p3ppbp/2np2p1/2p5/1p2PP2/3PB1P1/PPPQ2BP/R2NK1NR b KQk - 0 1"
@@ -286,26 +255,6 @@ struct fentest {
       "",
       "n1q1r1k1/3b3n/p2p1bp1/P1pPp2p/2P1P3/2NBB2P/3Q1PK1/1R4N1 b - - 0 1"
     },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22"
-    },
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
-      "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26"
-    },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "",
       "2r5/8/1n6/1P1p1pkp/p2P4/R1P1PKP1/8/1R6 w - - 0 1"
@@ -393,11 +342,89 @@ struct fentest {
     },
     { __LINE__, MOVEDO | PERFT,
       "simple movedo/undo: only 2 W knights",
-      "8/1k6/8/8/8/8/6K1/1NN5 w - - 0 1"
+      "5n2/1k6/8/8/5K2/8/P7/1N6 w - - 0 1"
+    },
+
+    /*****************************************************
+     * test from Rodent III                              *
+     * https://github.com/nescitus/sources/src/uci.c     *
+     *    "taken from DiscoCheck by Lucas Braeschcoming" *
+     *****************************************************/
+    { __LINE__, MOVEDO | PERFT,
+      "1.e4 c5 2.Nf3 Nc6",
+      "r1bqkbnr/pp1ppppp/2n5/2p5/4P3/5N2/PPPP1PPP/RNBQKB1R w KQkq -",
     },
     { __LINE__, MOVEDO | PERFT,
-      "simple movedo/undo: only 2 W knights",
-      "5n2/1k6/8/8/5K2/8/P7/1N6 w - - 0 1"
+      "multiple captures (kiwipete)",
+      "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq -",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "rook endgame",
+      "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - -",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "knight pseudo-sack",
+      "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "pawn chain",
+      "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "r1bbk1nr/pp3p1p/2n5/1N4p1/2Np1B2/8/PPP2PPP/2KR1B1R w kq - 0 13",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "attack for pawn",
+      "r1bq1rk1/ppp1nppp/4n3/3p3Q/3P4/1BP1B3/PP1N2PP/R4RK1 w - - 1 16",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "exchange sack",
+      "4r1k1/r1q2ppp/ppp2n2/4P3/5Rb1/1N1BQ3/PPP3PP/R5K1 w - - 1 17",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "2rqkb1r/ppp2p2/2npb1p1/1N1Nn2p/2P1PP2/8/PP2B1PP/R1BQK2R b KQ - 0 11",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "white pawn center",
+      "r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "",
+      "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "endgame",
+      "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22",
+    },
+    { __LINE__, MOVEDO | PERFT,
+      "both queens en-prise",
+      "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26",
+    },
+
+    /*****************************************************
+     * broken FEN                                        *
+     *****************************************************/
+    { __LINE__, FEN,
+      "legal EP",
+      "4k3/8/8/3pP3/8/8/8/4K3 w - d6 0 1"
+    },
+    { __LINE__, FEN,
+      "illegal EP, fix-able by fen parser",
+      "4k3/8/8/3p1P2/8/8/8/4K3 w - d6 0 1"
     },
     { __LINE__, FEN,
       "illegal EP and castle flags, fix-able by fen parser, SF crash",
@@ -418,22 +445,26 @@ struct fentest {
     { __LINE__, 0, NULL, NULL }
 };
 
-static int cur = -1;
+static int fentest_cur = -1;
 
 static char *next_fen(uint module)
 {
-    cur++;
-    while (fentest[cur].fen && !(fentest[cur].modules & module))
-        cur++;
-    return fentest[cur].fen;
+    fentest_cur++;
+
+    /* skip first entry if NULL - for special testing, see  */
+    if (fentest_cur == 0 && fentest[fentest_cur].fen == NULL)
+        fentest_cur++;
+    while (fentest[fentest_cur].fen && !(fentest[fentest_cur].modules & module))
+        fentest_cur++;
+    return fentest[fentest_cur].fen;
 }
 
 static __unused char* cur_comment()
 {
-    return fentest[cur].comment;
+    return fentest[fentest_cur].comment;
 }
 
 static __unused int cur_line()
 {
-    return fentest[cur].line;
+    return fentest[fentest_cur].line;
 }

test/fen-test.c

@@ -31,8 +31,7 @@ int main(__unused int ac, __unused char**av)
     bitboard_init();
 
     while ((fen = next_fen(FEN))) {
-        printf("***** [%s] ", fen);
-        fflush(stdout);
+        printf("line %3d: [%s] ", cur_line(), fen);
         if (!(pos = fen2pos(NULL, fen))) {
             printf("**INVALID\n");
         } else {

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/movedo-test.c

@@ -29,13 +29,10 @@ int main(int __unused ac, __unused char**av)
     int i = 0, test_line;
     char *fen, movebuf[8];;
     pos_t *pos, *savepos;
-    movelist_t pseudo;
-    move_t move;
+    movelist_t movelist;
+    move_t *move, *last;
 
-    setlinebuf(stdout);                           /* line-buffered stdout */
-
-    bitboard_init();
-    hyperbola_init();
+    init_all();
 
     while ((fen = next_fen(MOVEDO))) {
         test_line = cur_line();
@@ -44,39 +41,39 @@ int main(int __unused ac, __unused char**av)
             continue;
         }
 
-        pos->checkers = pos_checkers(pos, pos->turn);
-        pos_set_pinners_blockers(pos);
-
-        pos_gen_pseudomoves(pos, &pseudo);
+        movelist.nmoves = 0;
+        pos_set_checkers_pinners_blockers(pos);
+        pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+        last = movelist.move + movelist.nmoves;
         savepos = pos_dup(pos);
 
         state_t state = pos->state;
-        int tmp = 0, j = 0;
-        while ((move = pos_next_legal(pos, &pseudo, &tmp)) != MOVE_NONE) {
+        int j = 0;
+        for (move = movelist.move; move < last; ++move) {
             //pos_print(pos);
             //printf("i=%d j=%d  turn=%d move=[%s]\n", i, j, pos->turn,
             //       move_str(movebuf, move, 0));
             //move_p
-            move_do(pos, move);
+            move_do(pos, *move, &state);
             //pos_print(pos);
             //fflush(stdout);
             if (!pos_ok(pos, false)) {
-                printf("*** fen %d move %d [%s] invalid position after move_do\n",
-                       test_line, j, movebuf);
+                printf("*** fen %d [%s] move %d [%s] invalid position after move_do\n",
+                       test_line, fen, j, move_to_str(movebuf, *move, 0));
                 exit(0);
             }
 
             //printf("%d/%d move_do check ok\n", i, j);
-            move_undo(pos, move);
+            move_undo(pos, *move, &state);
             pos->state = state;
             if (!pos_ok(pos, false)) {
-                printf("*** fen %d move %d [%s] invalid position after move_undo\n",
-                       test_line, j, movebuf);
+                printf("*** fen %d [%s] move %d [%s] invalid position after move_undo\n",
+                       test_line, fen, j, movebuf);
                 exit(0);
             }
             if (pos_cmp(pos, savepos) != true) {
-                printf("*** fen %d move %d [%s] position differ after move_{do,undo}\n",
-                       test_line, j, movebuf);
+                printf("*** fen %d [%s] move %d [%s] position differ after move_{do,undo}\n",
+                       test_line, fen, j, movebuf);
                 exit(0);
             }
             //fflush(stdout);

test/movegen-test.c

@@ -216,7 +216,7 @@ int main(int __unused ac, __unused char**av)
     FILE *outfd;
     char *fen;
     pos_t *pos, *fishpos = pos_new();
-    movelist_t pseudo, legal, fishmoves;
+    movelist_t pseudo, fishmoves;
     //bitboard_t wrong = 0x5088000040, tmp, loop;
     //bit_for_each64(loop, tmp, )
     //printf("fishpos 1=%p\n", fishpos);
@@ -224,7 +224,7 @@ int main(int __unused ac, __unused char**av)
     setlinebuf(stdout);                           /* line-buffered stdout */
 
     bitboard_init();
-    hyperbola_init();
+    hq_init();
     outfd = open_stockfish();
 
     while ((fen = next_fen(MOVEGEN))) {
@@ -237,9 +237,11 @@ int main(int __unused ac, __unused char**av)
         }
         /* print movelists */
         send_stockfish_fen(outfd, fishpos, &fishmoves, fen);
-        pos_gen_pseudomoves(pos, &pseudo);
+
+        pos_set_checkers_pinners_blockers(pos);
+        pos_gen_pseudo(pos, &pseudo);
         //moves_print(&pseudo, 0);
-        pos_all_legal(pos, &pseudo, &legal);
+        pos_legal(pos, &pseudo);
 
         //moves_print(&legal, 0);
         //printf("Fu ");
@@ -251,7 +253,7 @@ int main(int __unused ac, __unused char**av)
 
         /* sort and print movelists */
         move_sort_by_sq(&fishmoves);
-        move_sort_by_sq(&legal);
+        move_sort_by_sq(&pseudo);
         // printf("\nFs ");
         // moves_print(fishpos, 0);
         // fflush(stdout);
@@ -260,14 +262,14 @@ int main(int __unused ac, __unused char**av)
         // fflush(stdout);
 
         /* compare movelists */
-        if (!movelists_equal(&fishmoves, &legal)) {
+        if (!movelists_equal(&fishmoves, &pseudo)) {
             pos_print(pos);
             printf("F: ");
             moves_print(&fishmoves, 0);
             printf("M: ");
-            moves_print(&legal, 0);
+            moves_print(&pseudo, 0);
         } else {
-            printf("[%s]: OK (%d Moves)\n", fen, legal.nmoves);
+            printf("[%s]: OK (%d Moves)\n", fen, pseudo.nmoves);
             //moves_print(&fishpos->moves, 0);
         }
         //compare_moves(&fishpos->moves, &legal);

test/perft-test.c

@@ -16,14 +16,16 @@
 #include <unistd.h>
 #include <time.h>
 #include <locale.h>
+#include <limits.h>
 
 #include "chessdefs.h"
+#include "util.h"
 #include "fen.h"
 #include "position.h"
 #include "move.h"
 #include "move-do.h"
 #include "move-gen.h"
-#include "search.h"
+#include "perft.h"
 
 #include "common-test.h"
 
@@ -43,6 +45,9 @@ static FILE *open_stockfish()
     int rpipe[2], wpipe[2];
     FILE *out_desc;
     pid_t pid;
+    char *buf = NULL;
+    size_t alloc = 0;
+    ssize_t buflen;
 
     if ((pipe(rpipe) < 0) || (pipe(wpipe) < 0)) {
         perror("pipe");
@@ -83,13 +88,38 @@ static FILE *open_stockfish()
     out_desc = fdopen(wpipe[WR], "w");
     setvbuf(out_desc, NULL, _IOLBF, 0);
 
+    fprintf(out_desc, "uci\n");
+    while (true) {
+        if ((buflen = getline(&buf, &alloc, stdin)) < 0) {
+            perror("getline");
+            exit(1);
+        }
+        if (!strncmp(buf, "uciok", 5))
+            break;
+    }
+    free(buf);
     return out_desc;
 }
 
-static u64 send_stockfish_fen(FILE *desc, pos_t *pos, movelist_t *movelist,
-                               char *fen, int depth)
+static void stockfish_fen(FILE *desc, char *fen)
 {
     char *buf = NULL;
+    size_t alloc = 0;
+    ssize_t buflen;
+
+    fprintf(desc, "ucinewgame\nisready\n");
+    while ((buflen = getline(&buf, &alloc, stdin)) > 0) {
+        if (!strncmp(buf, "readyok", 7))
+            break;
+    }
+    fprintf(desc, "position fen %s\n", fen);
+    free(buf);
+}
+
+static u64 stockfish_perft(FILE *desc, pos_t *pos, movelist_t *movelist,
+                           int depth, int divide)
+{
+    char *buf = NULL, movestr[8];
     u64 count, mycount = 0, fishcount;
     size_t alloc = 0;
     ssize_t buflen;
@@ -101,10 +131,12 @@ static u64 send_stockfish_fen(FILE *desc, pos_t *pos, movelist_t *movelist,
     *nmoves = 0;
     //char nodescount[] = "Nodes searched";
     //printf("nmoves = %d\n", nmoves);
-    fflush(stdout);
+    //fflush(stdout);
     //sprintf(str, "stockfish \"position fen %s\ngo perft depth\n\"", fen);
-    fprintf(desc, "position fen %s\ngo perft %d\n", fen, depth);
+    //fprintf(desc, "position fen %s\ngo perft %d\n", fen, depth);
     //fflush(desc);
+    fprintf(desc, "go perft %d\n", depth);
+
     while ((buflen = getline(&buf, &alloc, stdin)) > 0) {
         buf[--buflen] = 0;
         if (buflen == 0)
@@ -113,30 +145,15 @@ static u64 send_stockfish_fen(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);
+            }
         }
     }
-    //pos->moves.nmoves = nmoves;
-    // printf("fishcount=%d mycount=%d\n", fishcount, mycount);
     free(buf);
     return mycount;
 }
@@ -169,8 +186,6 @@ static __unused void compare_moves(movelist_t *fish, movelist_t *me)
 #define t(c) move_to(c)
 
     for (move_t *c1 = m1, *c2 = m2; (c1 - m1 < n1) || (c2 - m2 < n2);) {
-        // square_t f1 = move_from(*c1); square_t t1 = move_to(*c1);
-        // square_t f2 = move_from(*c2); square_t t2 = move_to(*c2);
 
         /* no more move in c2 */
         if (c2 - m2 >= n2) {
@@ -222,82 +237,217 @@ static __unused void compare_moves(movelist_t *fish, movelist_t *me)
     printf("F(%2d): %s\nM(%2d): %s\n", n1, str1, n2, str2);
 }
 
-
-int main(int __unused ac, __unused char**av)
+static int usage(char *prg)
 {
-    int i = 0, test_line;
-    u64 sf_count, my_count;
+    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)\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");
+    fprintf(stderr,
+            "\t-p flavor:  perft flavor, 1:perft, 2:perft_alt 3:both, default:1\n");
+    return 1;
+}
+
+int main(int ac, char**av)
+{
+    int curtest = 0;
+    u64 sf_count = 0, my_count;
+    bool comment = true, sf_run = false, divide = false;
     char *fen;
-    pos_t *pos, *savepos, *fishpos = pos_new();
+    pos_t *pos = NULL, *fenpos;
+    pos_t *fishpos = pos_new();
     movelist_t fishmoves;
-    //move_t move;
-    FILE *outfd;
-    int depth = 6;
+    FILE *outfd = NULL;
+    s64 ms, lps;
+    int opt, depth = 6, run = 3, tt, newtt = HASH_SIZE_DEFAULT;
+    struct {
+        s64 count, countskipped, ms;
+        s64 minlps, maxlps;
+        int skipped;
+        int err;
+    } res[3] = {
+        { .minlps = LONG_MAX },
+        { .minlps = LONG_MAX },
+        { .minlps = LONG_MAX },
+    };
 
-    if (ac > 1)
-        depth = atoi(av[1]);
-    printf("depth = %d\n", depth);
+    while ((opt = getopt(ac, av, "cd:mp:st:")) != -1) {
+        switch (opt) {
+            case 'c':
+                comment = false;
+                break;
+            case 'd':
+                depth = atoi(optarg);
+                if (depth <= 0)
+                    depth = 6;
+                break;
+            case 'm':
+                divide = true;
+                break;
+            case 'p':
+                run = atoi(optarg);
+                break;
+            case 's':
+                sf_run = true;
+                break;
+            case 't':
+                newtt = atoi(optarg);
+                break;
+            default:
+                    return usage(*av);
+        }
+    }
 
-    setlocale(LC_NUMERIC, "");
-    setlinebuf(stdout);                           /* line-buffered stdout */
-    outfd = open_stockfish();
+    if (!run) {
+        printf("Nothing to do, exiting\n");
+        exit(0);
+    }
 
-    bitboard_init();
-    hyperbola_init();
+    init_all();
+    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",
+           *av,
+           depth, newtt, run,
+           sf_run? "yes": "no");
+
+    tt_info();
+    printf("\n");
+
+    if (sf_run)
+        outfd = open_stockfish();
+
+    CLOCK_DEFINE(clock, CLOCK_MONOTONIC);
     while ((fen = next_fen(PERFT | MOVEDO))) {
-        test_line = cur_line();
-        if (!(pos = fen2pos(NULL, fen))) {
-            printf("wrong fen %d: [%s]\n", i, fen);
+        if (!(fenpos = fen2pos(pos, fen))) {
+            printf("wrong fen line:%d fen:%s\n\n", cur_line(), fen);
             continue;
         }
-        sf_count = send_stockfish_fen(outfd, fishpos, &fishmoves, fen, depth);
-        //pos_gen_pseudomoves(pos, &pseudo);
-        savepos = pos_dup(pos);
-        //int j = 0;
+        curtest++;
+        printf("test:%d line:%d fen:%s\n", curtest, cur_line(), fen);
+        if (comment)
+            printf("\t\"%s\"\n",
+                   *cur_comment()? cur_comment(): "no test desc");
 
-#define NANOSEC  1000000000                       /* nano sec in sec */
-#define MILLISEC 1000000                          /* milli sec in sec */
+        tt_clear();
 
-        // 1 sec = 1000 millisec
-        // 1 millisec = 1000 microsec
-        // 1 microsec = 1000 nanosec
-        // milli = sec * 1000 + nanosec / 1000000
-        struct timespec ts1, ts2;
-        s64 microsecs;
-
-        clock_gettime(CLOCK_MONOTONIC_RAW, &ts1);
-        my_count = perft(pos, depth, 1);
-        clock_gettime(CLOCK_MONOTONIC_RAW, &ts2);
-
-        microsecs = ((s64)ts2.tv_sec - (s64)ts1.tv_sec) * 1000000l
-            + ((s64)ts2.tv_nsec - (s64)ts1.tv_nsec) / 1000l ;
-        if (sf_count == my_count) {
-            printf("pt1 OK : line=%03d perft=%lu ms=%'ldms lps=%'lu \"%s\"\n",
-                   test_line, my_count, microsecs/1000l,
-                   my_count*1000000l/microsecs, fen);
-        } else  {
-            printf("pt1 ERR: line=%03d sf=%lu me=%lu \"%s\"\n",
-                   test_line, sf_count, my_count, fen);
+        pos = fenpos;
+        if (sf_run) {
+            stockfish_fen(outfd, fen);
+            clock_start(&clock);
+            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;
+                res[2].ms += ms;
+                res[2].count += sf_count;
+                if (lps > res[2].maxlps)
+                    res[2].maxlps = lps;
+                if (lps < res[2].minlps)
+                    res[2].minlps = lps;
+            }
+            printf("Stockfish : perft:%'lu ms:%'ld lps:%'lu\n",
+                   sf_count, ms, lps);
         }
 
-        clock_gettime(CLOCK_MONOTONIC_RAW, &ts1);
-        my_count = perft2(pos, depth, 1);
-        clock_gettime(CLOCK_MONOTONIC_RAW, &ts2);
+        if (run & 1) {
+            clock_start(&clock);
+            my_count = perft(pos, depth, divide);
+            ms = clock_elapsed_ms(&clock);
+            if (!ms) {
+                res[0].skipped++;
+                res[0].countskipped += my_count;
+                lps = 0;
+            } else {
+                lps = my_count * 1000l / ms;
+                res[0].ms += ms;
+                res[0].count += my_count;
+                if (lps > res[0].maxlps)
+                    res[0].maxlps = lps;
+                if (lps < res[0].minlps)
+                    res[0].minlps = lps;
+            }
 
-        microsecs = ((s64)ts2.tv_sec - (s64)ts1.tv_sec) * 1000000l
-            + ((s64)ts2.tv_nsec - (s64)ts1.tv_nsec) / 1000l ;
-        if (sf_count == my_count) {
-            printf("pt2 OK : line=%03d perft=%lu ms=%'ldms lps=%'lu \"%s\"\n\n",
-                   test_line, my_count, microsecs/1000l,
-                   my_count*1000000l/microsecs, fen);
-        } else  {
-            printf("pt2 ERR: line=%03d sf=%lu me=%lu \"%s\"\n\n",
-                   test_line, sf_count, my_count, fen);
+            if (!sf_run || sf_count == my_count) {
+                printf("perft     : perft:%'lu ms:%'ld lps:%'lu ",
+                       my_count, ms, lps);
+                tt_stats();
+            } else  {
+                printf("perft     : perft:%'lu ***ERROR***\n", my_count);
+                res[0].err++;
+            }
         }
-        pos_del(savepos);
-        pos_del(pos);
-        i++;
+
+        if (run & 2) {
+            clock_start(&clock);
+            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;
+                res[1].ms += ms;
+                res[1].count += my_count;
+                if (lps > res[1].maxlps)
+                    res[1].maxlps = lps;
+                if (lps < res[1].minlps)
+                    res[1].minlps = lps;
+            }
+
+            if (!sf_run || sf_count == my_count) {
+                printf("perft_alt : perft:%'lu ms:%'ld lps:%'lu\n",
+                       my_count, ms, lps);
+            } else  {
+                printf("perft_alt : perft:%'lu ***ERROR***\n", my_count);
+                res[1].err++;
+            }
+        }
+        printf("\n");
+    }
+    pos_del(pos);
+    if (sf_run) {
+        if (!res[2].ms)
+            res[2].ms = 1;
+        printf("total Stockfish : perft:%'lu ms:%'lu lps:%'lu min:%'lu max:%'lu "
+               "(skipped %d/%d)\n",
+               res[2].count + res[2].countskipped, res[2].ms,
+               res[2].count * 1000l / res[2].ms,
+               res[2].minlps, res[2].maxlps,
+               res[2].skipped, curtest);
+    }
+    if (run & 1) {
+        if (!res[0].ms)
+            res[0].ms = 1;
+        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,
+               curtest, res[0].skipped, res[0].err);
+    }
+    if (run & 2) {
+        if (!res[1].ms)
+            res[1].ms = 1;
+        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,
+               curtest, res[1].skipped, res[1].err);
     }
     return 0;
 }

test/tt-test.c

@@ -0,0 +1,118 @@
+/* tt-test.c - transposition table test.
+ *
+ * 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 <ctype.h>
+#include <unistd.h>
+#include <time.h>
+#include <locale.h>
+#include <limits.h>
+
+#include <brlib.h>
+
+#include "chessdefs.h"
+#include "fen.h"
+#include "position.h"
+#include "move.h"
+#include "move-do.h"
+#include "move-gen.h"
+#include "search.h"
+
+static void pr_entry(hentry_t *entry)
+{
+    if (!entry)
+        printf("entry: NULL\n");
+    else {
+        printf("entry: key=%lx depth=%d n=%lu\n",
+               entry->key, HASH_PERFT_DEPTH(entry->data),
+               HASH_PERFT_VAL(entry->data));
+    }
+}
+
+int main()
+{
+    pos_t *pos = NULL;
+    char *token, *str, buf[128];
+    hentry_t *entry;
+    move_t move;
+    state_t state;
+    movelist_t movelist;
+
+    const char *moves_array[] = {
+        "e2e4 e7e5 g1f3 b8c6",
+        "e2e4 b8c6 g1f3 e7e5"
+    };
+
+    init_all();
+
+    for (uint i = 0; i < ARRAY_SIZE(moves_array); ++i) {
+        int depth = 0;
+        str = strdup(moves_array[i]);
+        printf("%2d: ", i + 1);
+
+        pos = startpos(pos);
+        entry = tt_store_perft(pos->key, 0, 123 + depth);
+        pr_entry(entry);
+        token = strtok(str, " \t");
+        while (token) {
+            depth++;
+            printf("%s ", 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 =  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");
+        }
+        printf("\n");
+        free(str);
+    }
+    return 0;
+}
+
+/* ccls bug report: https://github.com/emacs-lsp/emacs-ccls/issues/126
+ */
+/*
+ * int called(int), caller();
+ *
+ * /\**
+ *  * called() - test ccls.
+ *  * @x: int, the test value
+ *  *
+ *  * @called() description.
+ *  *
+ *  * @return: int, a very interesting value.
+ *  *\/
+ * int called(int x) { return x; }
+ *
+ * int caller()
+ * {
+ *     int i = 0;
+ *     called(int x)
+ *     return i;
+ * }
+ */