convert piece_t, square_t etc. to u8 (no more typed enum. See C23 ?).

.dir-locals.el

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

MEMO.org

@@ -1,2 +1,18 @@
 ** 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);
+  }

Makefile

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

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

src/attack.c

@@ -42,6 +42,15 @@ bool sq_is_attacked(const pos_t *pos, const bitboard_t occ, const square_t sq, c
 {
     color_t opp = OPPONENT(c);
 
+    /*
+     * 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]))
         return true;
@@ -50,14 +59,14 @@ bool sq_is_attacked(const pos_t *pos, const bitboard_t occ, const square_t sq, c
     if (hyperbola_rook_moves(occ, sq) & (pos->bb[c][ROOK] | pos->bb[c][QUEEN]))
         return true;
 
-    /* pawn */
-    if (bb_pawn_attacks[opp][sq] & pos->bb[c][PAWN])
-        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;
@@ -100,35 +109,29 @@ 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
 
@@ -136,7 +139,7 @@ bitboard_t sq_attackers(const pos_t *pos, const bitboard_t occ, const square_t s
     to = pos->bb[c][BISHOP] | pos->bb[c][QUEEN];
     tmp = hyperbola_bishop_moves(occ, sq) & to;
     attackers |= tmp;
-#   ifdef DEBUG_ATTACK_ATTACKERS1
+#   ifdef DEBUG_ATTACK_ATTACKERS
     bb_print("att bishop/queen", tmp);
 #   endif
 
@@ -144,10 +147,9 @@ bitboard_t sq_attackers(const pos_t *pos, const bitboard_t occ, const square_t s
     to = pos->bb[c][ROOK] | pos->bb[c][QUEEN];
     tmp = hyperbola_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;
@@ -178,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 */
@@ -187,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"
@@ -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;
 
@@ -109,7 +109,7 @@ void bitboard_init(void)
      *    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);
     }
@@ -121,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;
                 }
@@ -160,10 +160,10 @@ void bitboard_init(void)
     /* 3) pawn, knight and king attacks
      */
     for (square_t sq = A1; sq <= H8; ++sq) {
-        if (sq >= A2)
-            bb_pawn_attacks[BLACK][sq] = pawn_attacks_bb(mask(sq), BLACK);
-        if (sq <= H7)
-            bb_pawn_attacks[WHITE][sq] = pawn_attacks_bb(mask(sq), WHITE);
+         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];
@@ -217,7 +217,7 @@ void bb_print(const char *title, const bitboard_t bitboard)
     //char c = p? p: 'X';
     if (title)
         printf("%s\n", title);
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {  /* "downto"" op." */
         printf("%d ", r + 1);
         for (file_t f = FILE_A; f <= FILE_H; ++f) {
             printf(" %c", bitboard & bb_sq[sq_make(f, r)] ? 'X': '.');
@@ -252,7 +252,7 @@ void bb_print_multi(const char *title, int n, ...)
     if (title)
         printf("%s\n", title);
 
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {
         for (int i = 0; i < n; ++i) {
             printf("%d ", r + 1);
             for (file_t f = FILE_A; f <= FILE_H; ++f) {
@@ -281,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

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

src/chessdefs.h

@@ -14,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
@@ -50,17 +51,19 @@
 /* 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
@@ -88,17 +91,16 @@ typedef struct __movelist_s movelist_t;
 
 /* basic types
  */
+
 typedef u64 bitboard_t;
+typedef s16 eval_t;
 
-/* eval type
+/* forward enum definition is impossible in C11.
+ * To simplify cross-dependancies, all important enum are moved here.
  */
-//typedef s32 eval_t;
 
-/* forward enum definition is impossible in C11, to simplify
- * cross-dependancies, all important enum are moved here.
- */
-typedef enum {
-    _SSQUARE_ = -1,                               /* force signed enum */
+enum {
+    //_SSQUARE_ = -1,                               /* force signed enum */
     A1 = 0, B1, C1, D1, E1, F1, G1, H1,
     A2,     B2, C2, D2, E2, F2, G2, H2,
     A3,     B3, C3, D3, E3, F3, G3, H3,
@@ -109,21 +111,24 @@ typedef enum {
     A8,     B8, C8, D8, E8, F8, G8, H8,
     SQUARE_MAX = 64,
     SQUARE_NONE = 64
-} square_t;
+};
+typedef u8 square_t;
 
-typedef enum {
-    _SFILE_ = -1,                                 /* force signed enum */
+enum {
+    //_SFILE_ = -1,                                 /* force signed enum */
     FILE_A = 0, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H,
     FILE_MAX,
-} file_t;
+};
+typedef u8 file_t;
 
-typedef enum {
-    _SRANK_ = -1,                                 /* force signed enum */
+enum {
+    //_SRANK_ = -1,                                 /* force signed enum */
     RANK_1 = 0, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8,
     RANK_MAX,
-} rank_t;
+};
+typedef u8 rank_t;
 
-typedef enum {
+enum {
     NORTH = 8,
     EAST =  1,
     SOUTH = -NORTH,
@@ -133,12 +138,15 @@ 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)
-#define sq_upleft(c)      ((c) == WHITE ? NORTH_WEST: SOUTH_EAST)
-#define sq_upright(c)     ((c) == WHITE ? NORTH_EAST: SOUTH_WEST)
+/* Attention here: We mix "up" (color dependent) and W/E, color independant.
+ */
+#define sq_upwest(up)     ((up) - 1)
+#define sq_upeast(up)     ((up) + 1)
 
 #include <time.h>
 
@@ -171,4 +179,11 @@ 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);
+
+void init_all(void);
+
 #endif  /* _CHESSDEFS_H */

src/eval-simple.c

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

src/eval-simple.h

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

src/eval.c

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

src/eval.h

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

src/fen.c

@@ -21,9 +21,7 @@
 #include <bug.h>
 
 #include "chessdefs.h"
-#include "util.h"
-//#include "piece.h"
-//#include "bitboard.h"
+#include "misc.h"
 #include "position.h"
 #include "fen.h"
 
@@ -61,46 +59,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 +111,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 +164,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 +186,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;
@@ -248,13 +252,15 @@ 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);
     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
@@ -286,7 +292,7 @@ char *pos2fen(const pos_t *pos, char *fen)
 
     /*  1) position
      */
-    for (rank_t r = RANK_8; r >= RANK_1; --r) {
+    for (rank_t r = RANK_8 + 1; r --> RANK_1;) {
         for (file_t f = FILE_A; f <= FILE_H;) {
             square_t sq = sq_make(f, r);
             piece_t piece = pos->board[sq];
@@ -324,7 +330,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,8 +340,8 @@ 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++] = ' ';
 

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

src/hist.h

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

src/hyperbola-quintessence.c

@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "brlib.h"
+#include <brlib.h>
 
 #include "chessdefs.h"
 #include "board.h"
@@ -129,8 +129,8 @@ bitboard_t hyperbola_moves(const bitboard_t pieces, const square_t sq,
     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;
 }
 

src/init.c

@@ -0,0 +1,56 @@
+/* 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 "bitboard.h"
+#include "hyperbola-quintessence.h"
+
+#include "hash.h"
+#include "hist.h"
+
+#define printff(x) ({ printf(x); fflush(stdout); })
+void init_all(void)
+{
+    /* line-buffered stdout */
+    printff("initiazing stdout buffering... ");
+    setlinebuf(stdout);
+
+    /* for printf() numeric thousands separator */
+    printff("locale... ");
+    setlocale(LC_NUMERIC, "");
+
+    /* pseudo random generator seed */
+    printff("random generator... ");
+    rand_init(RAND_SEED_DEFAULT);
+
+    /* bitboards & hq */
+    printff("bitboards... ");
+    bitboard_init();
+
+    printff("hq bitboards... ");
+    hyperbola_init();
+
+    /* zobrist tables & default tt hashtable */
+    printff("zobrist tables... ");
+    zobrist_init();
+
+    printff("transposition tables... ");
+    tt_create(HASH_SIZE_DEFAULT);
+
+    printf("done.\n");
+}

src/misc.c

@@ -12,6 +12,9 @@
  */
 
 #include <time.h>
+#include <stdlib.h>
+
+#include <bug.h>
 
 #include "chessdefs.h"
 
@@ -110,3 +113,40 @@ 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;
+}

src/misc.h

@@ -17,13 +17,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "bug.h"
-
 #include "chessdefs.h"
 
 #undef safe_malloc
 #undef safe_free
 
+/* force BUG_ON, to get a program abort for failed malloc/free
+ */
+#pragma push_macro("BUG_ON")
+#undef BUG_ON
+#define BUG_ON
+#include <bug.h>
+
 #define safe_malloc(size) ({                   \
             void *_ret = malloc(size);         \
             bug_on(_ret == NULL);              \
@@ -35,4 +40,8 @@
         free(ptr);                             \
     } while (0)
 
+/* restore BUG_ON
+ */
+#pragma pop_macro("BUG_ON")
+
 #endif  /* UTIL_H */

src/move-do.c

@@ -15,14 +15,15 @@
 #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"
 
 /**
  * move_do() - do move.
@@ -39,32 +40,39 @@
  *   - 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;
+
+    *state = pos->state;                          /* save irreversible changes */
+
+    /* 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->clock_50;
     ++pos->plycount;
     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));
@@ -73,32 +81,41 @@ pos_t *move_do(pos_t *pos, const move_t move) //, state_t *state)
 
     if (captured != EMPTY) {
         pos->clock_50 = 0;
-        //pos->captured = pos->board[to];           /* save capture info */
         bug_on(pos->board[to] == EMPTY || COLOR(pos->captured) != them);
+        key ^= zobrist_pieces[captured][to];
         pos_clr_sq(pos, to);                      /* clear square */
     } else if (is_castle(move)) {                 /* handle rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(H1, us);
             rookto = sq_rel(F1, us);
         } else {
             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 = from + up;
-        else if (is_enpassant(move)) {            /* clear grabbed pawn */
+        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)
@@ -120,7 +137,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)
@@ -129,6 +146,13 @@ 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;
+
+    zobrist_verify(pos);
+
     return pos;
 }
 
@@ -149,12 +173,8 @@ 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];
@@ -173,7 +193,7 @@ pos_t *move_undo(pos_t *pos, const move_t move)//, const state_t *state)
         pos_set_sq(pos, to, pos->captured);       /* restore captured piece */
     } else if (is_castle(move)) {                 /* make reverse rook move */
         square_t rookfrom, rookto;
-        if (is_castle_K(move)) {
+        if (to > from) {
             rookfrom = sq_rel(F1, us);
             rookto = sq_rel(H1, us);
         } else {
@@ -187,7 +207,159 @@ pos_t *move_undo(pos_t *pos, const move_t move)//, const state_t *state)
         pos_set_sq(pos, grabbed, MAKE_PIECE(PAWN, them));
     }
 
-    //pos->state = *state;                          /* restore irreversible changes */
+    pos->state = *state;                          /* restore irreversible changes */
+    pos->turn = us;
+    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 */
+
+    /* 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->clock_50;
+    ++pos->plycount;
+    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->clock_50 = 0;
+        //pos->captured = pos->board[to];           /* save capture info */
+        bug_on(pos->board[to] == EMPTY || COLOR(pos->captured) != them);
+        key ^= zobrist_pieces[captured][to];
+        pos_clr_sq(pos, to);                      /* clear square */
+    } else if (is_castle(move)) {                 /* handle rook move */
+        square_t rookfrom, rookto;
+        if (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 (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;
+
+    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;
     return pos;
 }

src/move-do.h

@@ -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

@@ -26,7 +26,6 @@
 #include "attack.h"
 #include "move-gen.h"
 
-
 /**
  * pseudo_is_legal() - check if a move is legal.
  * @pos:  position
@@ -36,13 +35,18 @@
  */
 bool pseudo_is_legal(const pos_t *pos, const move_t move)
 {
-    color_t  us = pos->turn, them = OPPONENT(us);
-    square_t from = move_from(move), to = move_to(move);
-    square_t king = pos->king[us];
+    color_t  us       = pos->turn;
+    color_t them      = OPPONENT(us);
+    square_t from     = move_from(move);
+    square_t to       = move_to(move);
+    square_t kingsq   = pos->king[us];
+    square_t ep       = pos->en_passant;
     bitboard_t kingbb = pos->bb[us][KING];
-    bitboard_t occ = pos_occ(pos);
-    u64 pinned = mask(from) & pos->blockers;
-    u64 checkers = pos->checkers;
+    bitboard_t occ    = pos_occ(pos);
+    u64 pinned        = BIT(from) & pos->blockers;
+    u64 checkers      = pos->checkers;
+
+    bug_on(pos->board[from] == NO_PIECE || COLOR(pos->board[from]) != us);
 
     /* (1) - Castling & King
      * For castling, we need to check intermediate squares attacks only.
@@ -50,63 +54,52 @@ bool pseudo_is_legal(const pos_t *pos, const move_t move)
      * king from occupation bitboard (to catch king moving away from checker
      * on same line) !
      */
-    if (unlikely(from == king)) {
-        if (unlikely(is_castle(move))) {
-            square_t dir = to > from? 1: -1;
-            if (sq_attackers(pos, occ, from + dir, them))
-                return false;
-        }
-        return !sq_attackers(pos, occ ^ kingbb, 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 in (1), as only K moves were generated
      * by pseudo legal move generator.
-     * Here, allowed dest squares are only on King-checker line, or on checker
-     * square.
-     * attacker.
-     * Special cases:
-     *   e.p., legal if the grabbed pawn is giving check
-     *   pinned piece: always illegal
+     * Special cases (illegal):
+     *   - e.p., if the grabbed pawn is *not* giving check
+     *   - piece is pinned
      */
     if (checkers) {
         if (pinned)
             return false;
-        if (bb_multiple(checkers))
-            return false;
-        square_t checker = ctz64(checkers);
         if (is_enpassant(move)) {
-            return pos->en_passant + sq_up(them) == checker;
+            return ep + sq_up(them) == ctz64(checkers);
         }
         return true;
-        //bitboard_t between = bb_between[king][checker] | pos->checkers;
-        //return mask(to) & between;
     }
 
     /* (3) - pinned pieces
-     * We verify here that pinned piece P stays on line King-P.
+     * We verify here that pinned piece P stays on line between K & dest square.
      */
-    if (mask(from) & pos->blockers) {
-        return bb_line[from][king] & mask(to);    /* is to on pinner line ? */
+    if (pinned) {
+        return bb_line[from][kingsq] & BIT(to);   /* is to on pinner line ? */
     }
 
     /* (4) - En-passant
-     * pinned pieces are handled in pinned section.
+     * pinned piece is already handled in (3).
      * One case not handled anywhere else: when the two "disappearing" pawns
      * would discover a R/Q horizontal check.
+     * Note: grabbed pawn *cannot* discover a check (impossible position).
      */
     if (is_enpassant(move)) {
-        bitboard_t rank5 = us == WHITE? RANK_5bb: RANK_4bb;
+        bitboard_t rank5 = bb_rel_rank(RANK_5, us);
 
-        if ((pos->bb[us][KING] & rank5)) {
-            bitboard_t exclude = mask(pos->en_passant - sq_up(us)) | mask(from);
+        if (kingbb & rank5) {
+            bitboard_t exclude = BIT(ep + sq_up(them)) | BIT(from);
             bitboard_t rooks = (pos->bb[them][ROOK] | pos->bb[them][QUEEN]) & rank5;
 
-            while (rooks) {
-                square_t rook = bb_next(&rooks);
-                if (hyperbola_rank_moves(occ ^ exclude, rook) & kingbb)
-                    return false;
-            }
+            return !(hyperbola_rank_moves(occ ^ exclude, kingsq) & rooks);
         }
     }
     return true;
@@ -138,24 +131,52 @@ 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_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;
 }
 
 /**
@@ -191,12 +212,9 @@ static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
  *  - castling, if king is in check
  *  - castling, if king passes an enemy-controlled square (not final square).
  * When immediately known, a few move flags are also applied in these cases:
- *  - castling: M_CASTLE_{K,Q}
- *  - capture (excl. en-passant): M_CAPTURE
+ *  - castling: M_CASTLE
  *  - en-passant: M_EN_PASSANT
- *  - pawn double push: M_DPUSH
  *  - promotion: M_PROMOTION
- *  - promotion and capture
  *
  * TODO: move code to specific functions (especially castling, pawn push/capture)
  *
@@ -230,24 +248,73 @@ static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
  */
 
 /**
- * move_make_promotions() - generate all promotions for given pawn and dest.
+ * 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 all (Q/R/B/N) promotion moves on @to for pawn @from.
+ * 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 (incremented by 4).
+ * @Return: New @moves.
  */
-static inline move_t *move_make_promotions(move_t *moves, square_t from, square_t to)
+static inline move_t *move_gen_promotions(move_t *moves, square_t from, square_t to)
 {
-    for (piece_type_t pt = QUEEN; pt >= KNIGHT; --pt)
+    /* your attention: "downto operator" */
+    for (piece_type_t pt = QUEEN - 1; pt --> KNIGHT - 2;)
         *moves++ = move_make_promote(from, to, pt);
     return moves;
 }
 
 /**
- * pos_gen_pseudomoves() - generate position pseudo-legal 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
  *
@@ -261,15 +328,14 @@ static inline move_t *move_make_promotions(move_t *moves, square_t from, square_
  *  - 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);
@@ -279,22 +345,16 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
     bitboard_t dest_squares  = ~my_pieces;
     bitboard_t occ           = my_pieces | enemy_pieces;
     bitboard_t empty         = ~occ;
+    move_t *moves            = movelist->move;
+    square_t king = pos->king[us];
 
     bitboard_t from_bb, to_bb;
     bitboard_t tmp_bb;
-    move_t *moves            = movelist->move;
-    //int *nmoves              = &movelist->nmoves;
     square_t from, to;
-    square_t king = pos->king[us];
 
-    //*nmoves = 0;
-
-    /* king - MUST BE FIRST (we stop if doubler check) */
+    /* king - MUST BE FIRST */
     to_bb = bb_king_moves(dest_squares, king);
-    while(to_bb) {
-        to = bb_next(&to_bb);
-        *moves++ = move_make(king, to);
-    }
+    moves = moves_gen(moves, king, to_bb);
 
     if (bb_multiple(pos->checkers))               /* double check, we stop here */
         goto finish;
@@ -311,42 +371,37 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
          * Attention ! Castling flags are assumed correct
          */
         bitboard_t rel_rank1 = bb_rel_rank(RANK_1, 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)) {
+
+            /* CHANGE HERE, either with bitmask >> or direct sq check */
             bitboard_t occmask = rel_rank1 & (FILE_Fbb | FILE_Gbb);
             if (!(occ & occmask)) {
-                *moves++ = move_make_flags(king, king + 2, M_CASTLE_K);
+                *moves++ = move_make_flags(king, king + 2, M_CASTLE);
             }
         }
         if (can_ooo(pos->castle, us)) {
             bitboard_t occmask = rel_rank1 & (FILE_Bbb | FILE_Cbb | FILE_Dbb);
             if (!(occ & occmask)) { // &&
-                *moves++ = move_make_flags(king, king - 2, M_CASTLE_Q);
+                *moves++ = move_make_flags(king, king - 2, M_CASTLE);
             }
         }
     }
+
     /* sliding pieces */
     from_bb = pos->bb[us][BISHOP] | pos->bb[us][QUEEN];
     while (from_bb) {
         from = bb_next(&from_bb);
         to_bb = hyperbola_bishop_moves(occ, from) & dest_squares;
-        while(to_bb) {
-            to = bb_next(&to_bb);
-            *moves++ = move_make(from, to);
-        }
+        moves = moves_gen(moves, from, to_bb);
     }
     from_bb = pos->bb[us][ROOK] | pos->bb[us][QUEEN];
     while (from_bb) {
         from = bb_next(&from_bb);
         to_bb = hyperbola_rook_moves(occ, from) & dest_squares;
-        while(to_bb) {
-            to = bb_next(&to_bb);
-            *moves++ = move_make(from, to);
-        }
+        moves = moves_gen(moves, from, to_bb);
     }
 
     /* knight */
@@ -354,10 +409,7 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
     while (from_bb) {
         from = bb_next(&from_bb);
         to_bb = bb_knight_moves(dest_squares, from);
-        while(to_bb) {
-            to = bb_next(&to_bb);
-            *moves++ = move_make(from, to);
-        }
+        moves = moves_gen(moves, from, to_bb);
     }
 
     /* pawn: relative rank and files */
@@ -374,11 +426,11 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
         from = to - shift;
         *moves++ = move_make(from, to);
     }
-    to_bb = tmp_bb & rel_rank8 & dest_squares;           /* promotions */
+    to_bb = tmp_bb & rel_rank8 & dest_squares;    /* promotions */
     while(to_bb) {
         to = bb_next(&to_bb);
         from = to - shift;
-        moves = move_make_promotions(moves, from, to);
+        moves = move_gen_promotions(moves, from, to);
     }
 
     /* possible second push */
@@ -386,66 +438,28 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
     while(to_bb) {
         to = bb_next(&to_bb);
         from = to - shift - shift;
-        *moves++ = move_make_flags(from, to, M_DPUSH);
+        *moves++ = move_make(from, to);
     }
 
     /* pawn: captures */
-    /*
-     * tmp_bb = pawn_attacks_bb(pos->bb[us][PAWN], us) & enemy_pieces;
-     * //bb_print("FAIL", tmp_bb);
-     * 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);
-     *     }
-     * }
-     * 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_promotions(moves, from, to);
-     *     }
-     * }
-     */
-
-    /* pawn: captures left */
-    bitboard_t filter = ~bb_rel_file(FILE_A, us);
-    shift = sq_upleft(us);
-    tmp_bb = bb_shift(pos->bb[us][PAWN] & filter, shift) & enemy_pieces;
-
+    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 = to - shift;
-        *moves++ = move_make(from, to);
+        from_bb = bb_pawn_attacks[them][to] & pos->bb[us][PAWN];
+        while (from_bb) {
+            from = bb_next(&from_bb);
+            *moves++ = move_make(from, to);
+        }
     }
     to_bb = tmp_bb & rel_rank8;
     while (to_bb) {
         to = bb_next(&to_bb);
-        from = to - shift;
-        moves = move_make_promotions(moves, from, to);
-    }
-
-    /* pawn: captures right */
-    filter = ~bb_rel_file(FILE_H, us);
-    shift = sq_upright(us);
-    tmp_bb = bb_shift(pos->bb[us][PAWN] & filter, shift) & enemy_pieces;
-    to_bb = tmp_bb & ~rel_rank8;
-    while (to_bb) {
-        to = bb_next(&to_bb);
-        from = to - shift;
-        *moves++ = move_make(from, to);
-    }
-    to_bb = tmp_bb & rel_rank8;
-    while (to_bb) {
-        to = bb_next(&to_bb);
-        from = to - shift;
-        moves = move_make_promotions(moves, from, to);
+        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);
+        }
     }
 
     /* pawn: en-passant
@@ -458,23 +472,11 @@ int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
             *moves++ = move_make_enpassant(from, to);
         }
     }
-    /*
-     * to_bb = mask(to);
-     *     /\* if e.p not on file H, we may add an e.p move to "up-left" *\/
-     *     filter = ~bb_rel_file(FILE_A, us);
-     *     shift = sq_upleft(us);
-     *     if (bb_shift(pos->bb[us][PAWN] & filter, shift) & to_bb)
-     *         *moves++ = move_make_enpassant(to - shift, to);
-     *
-     *     filter = ~bb_rel_file(FILE_H, us);
-     *     shift = sq_upright(us);
-     *     if (bb_shift(pos->bb[us][PAWN] & filter, shift) & to_bb)
-     *         *moves++ = move_make_enpassant(to - shift, to);
-     * }
-     */
 
     /* TODO: add function per piece, and type, for easier debug
      */
 finish:
-    return movelist->nmoves = moves - movelist->move;
+    movelist->nmoves = moves - movelist->move;
+    return movelist;
+    //return movelist->nmoves = moves - movelist->move;
 }

src/move-gen.h

@@ -23,7 +23,9 @@
 
 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

@@ -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,76 @@
  * 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);
+    } else {
+        move = move_make(from, to);
+    }
+    return move;
+}
+
+/**
+ * move_find_in_movelist() - find a partial move in movelist.
+ * @target:  partial move
+ * @list:    &movelist_t to search
+ *
+ * Look for @target into @list. @target must at least contain from and
+ * to square, as well as promotion information - see move_from_str().
+ * If these three pieces of information match, the corresponding move in
+ * @list is returned.
+ *
+ * @return: move, or MOVE_NONE if error.
+ */
+move_t move_find_in_movelist(move_t target, movelist_t *list)
+{
+    move_t *move = list->move, *last = move + list->nmoves;
+
+    for (; move < last; ++move) {
+        if (move_from(target) == move_from(*move) &&
+            move_to(target)   == move_to(*move) &&
+            move_promoted(target)   == move_promoted(*move))
+            return *move;
+    }
+    return MOVE_NONE;
+}
 
 /**
  * moves_print() - print movelist moves.
@@ -135,7 +193,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");
 }
 

src/move.h

@@ -19,53 +19,45 @@
 #include "board.h"
 
 /* move structure:
- * 3 3     2 2    1 1 1 1 1 1
- * 1 0     4 3    8 7 5 4 2 1    6 5    0
- * S UUUUUUU FFFFFF ccc ppp tttttt ffffff
+ * 11 11 1
+ * 54 32 1    6 5    0
+ * FF pp tttttt ffffff
  *
- * bits    len off range         type         mask        get  desc
- * ffffff    6   0   0-5     square_t          077        &077 from
- * tttttt    6   6  6-11     square_t        07700 (>>6)  &077 to
- * ppp       3  12 12-14 piece_type_t       070000 (>>12) &07  promoted
- * ccc       3  15 15-17 piece_type_t      0700000 (>>15) &07  captured
- * FFFFFF    6  18 18-23 move_flags_t    077000000 (>>18) &077 N/A  flags
- * UUUUUUU   7  24 24-30       unused 017700000000             future usage
- * S         1  31 31-31            - 020000000000             sign
+ * bits    len off range         type      mask        get  desc
+ * ffffff    6   0   0-5     square_t       077        &077 from
+ * tttttt    6   6  6-11     square_t     07700 (>>6)  &077 to
+ * pp        2  12 12-13 piece_type_t    030000 (>>12) &03  promoted
+ * FF        2  14 14-15 move_flags_t   0140000 (>>14) &03  flags
  */
-typedef s32 move_t;
-
-/* special move_t values */
-#define MOVE_NONE ((move_t) -1)
-#define MOVE_NULL ((move_t) 0)                    /* hack: from = to = A1 */
+typedef u16 move_t;
 
 enum {
     M_OFF_FROM     = 0,
     M_OFF_TO       = 6,
     M_OFF_PROMOTED = 12,
-    M_OFF_CAPTURED = 15,
-    M_OFF_FLAGS    = 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 square_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/piece.c

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

src/position.c

@@ -18,8 +18,8 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "brlib.h"
-#include "bitops.h"
+#include <brlib.h>
+#include <bitops.h>
 
 #include "chessdefs.h"
 #include "position.h"
@@ -27,9 +27,10 @@
 #include "hyperbola-quintessence.h"
 #include "fen.h"
 #include "piece.h"
-#include "util.h"
+#include "misc.h"
 #include "board.h"
 #include "attack.h"
+#include "hist.h"
 
 /**
  * pos_new() - allocate a new position
@@ -62,9 +63,25 @@ pos_t *pos_dup(const pos_t *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)
 {
@@ -86,11 +103,13 @@ pos_t *pos_clear(pos_t *pos)
     pos->turn = WHITE;
 
     /* move_do/undo position state */
+    pos->key = 0;
     pos->en_passant = SQUARE_NONE;
     pos->castle = 0;
     pos->clock_50 = 0;
     pos->plycount = 0;
-    //pos->captured = NO_PIECE;
+    pos->move = MOVE_NONE;
+    pos->captured = NO_PIECE;
 
     for (square_t sq = A1; sq <= H8; ++sq)
         pos->board[sq] = EMPTY;
@@ -106,7 +125,6 @@ pos_t *pos_clear(pos_t *pos)
     pos->pinners = 0;
     pos->blockers = 0;
 
-    //pos->moves.nmoves = 0;
     return pos;
 }
 
@@ -114,55 +132,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(__unused const pos_t *pos1, __unused const pos_t *pos2)
+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(clock_50) || _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;
@@ -179,7 +188,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)
 {
@@ -192,7 +201,7 @@ bitboard_t pos_checkers(const pos_t *pos, const color_t color)
  * @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)
@@ -228,7 +237,7 @@ void pos_set_checkers_pinners_blockers(pos_t *pos)
         /* blockers = we find occupied squares between pinner and king */
         while (tmppinners) {
             pinner = bb_next(&tmppinners);
-            pinners |= mask(pinner);
+            pinners |= BIT(pinner);
             blockers |= bb_between[pinner][king] & maybeblockers;
         }
     }
@@ -246,7 +255,7 @@ void pos_set_checkers_pinners_blockers(pos_t *pos)
         tmppinners = targets & attackers;
         while (tmppinners) {
             pinner = bb_next(&tmppinners);
-            pinners |= mask(pinner);
+            pinners |= BIT(pinner);
             blockers |= bb_between[pinner][king] & maybeblockers;
         }
     }
@@ -336,11 +345,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.
@@ -348,19 +357,25 @@ 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(__unused const pos_t *pos, __unused const bool strict)
+bool pos_ok(pos_t *pos, const bool strict)
 {
     int n, count = 0, bbcount = 0, error = 0;
-    __unused bitboard_t tmp;
+    color_t __unused us = pos->turn, __unused them = OPPONENT(us);
+
+    /* force BUG_ON and WARN_ON */
+#   pragma push_macro("BUG_ON")
+#   pragma push_macro("WARN_ON")
+#   undef BUG_ON
+#   define BUG_ON
+#   undef WARN_ON
+#   define WARN_ON
+#   include <bug.h>
 
     /* 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((pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) &
+                     (RANK_1bb | RANK_8bb));
 
     for (color_t color = WHITE; color <= BLACK; ++color) {
         /* pawn count */
@@ -383,21 +398,28 @@ bool pos_ok(__unused const pos_t *pos, __unused const bool strict)
             continue;
         color_t c = COLOR(piece);
         piece_type_t p = PIECE(piece);
-        match = pos->bb[c][p] & mask(sq);
+        match = pos->bb[c][p] & BIT(sq);
         error += warn_on(!match);
         count++;
     }
-    /* occupied occupation is different from bitboards */
+    /* occupied board is different from bitboards */
     error += warn_on(count != bbcount);
     /* is opponent already in check ? */
-    error += warn_on(pos_checkers(pos, OPPONENT(pos->turn)));
+    error += warn_on(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(popcount64(pos_checkers(pos, us)) > 2);
     /* kings distance is less than 2 */
     error += warn_on(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(error);
+        /* not reached */
+    }
     return error? false: true;
+#   pragma pop_macro("WARN_ON")
+#   pragma pop_macro("BUG_ON")
 }
 
 /**
@@ -409,9 +431,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,11 +16,13 @@
 
 #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"
@@ -30,29 +32,39 @@ 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 */
+                        u16 plycount;             /* plies so far, start from 1 */
+                        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 */
+                        u8 clock_50;
         );
-
+    eval_t eval;
+    bitboard_t checkers;                          /* opponent checkers */
+    bitboard_t pinners;                           /* opponent pinners */
+    bitboard_t blockers;                          /* pieces blocking pin */
     piece_t board[BOARDSIZE];
     bitboard_t bb[2][PIECE_TYPE_MAX];             /* bb[0][PAWN], bb[1][ALL_PIECES] */
-    //bitboard_t controlled[2];                     /* unsure */
     square_t king[2];                             /* dup with bb, faster retrieval */
-    //movelist_t moves;
 } pos_t;
 
 typedef struct state_s state_t;
@@ -71,11 +83,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 +107,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,6 +177,7 @@ 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);
@@ -165,7 +188,7 @@ 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

@@ -23,9 +23,10 @@
 
 /**
  * perft() - Perform perft on position
- * @pos:   &position to search
- * @depth: Wanted depth.
- * @ply:   perft depth level.
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @output: 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.
@@ -33,86 +34,115 @@
  * This version uses the algorithm:
  *    if last depth
  *      return 1;
- *    gen pseudo-legal moves
- *    loop for each legal move
+ *    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, int ply)
+u64 perft(pos_t *pos, int depth, int ply, bool output)
 {
-    int subnodes, movetmp = 0;
-    u64 nodes = 0;
-    movelist_t pseudo;
-    move_t move;
+    u64 subnodes, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
     state_t state;
+#   ifdef PERFT_MOVE_HISTORY
+    static movelist_t stack;
+    if (ply == 1)
+        stack.nmoves = 0;
+#   endif
 
-    if (depth == 0)
-        return 1;
-    pseudo.nmoves = 0;
-    pos->checkers = pos_checkers(pos, pos->turn);
-    pos_set_pinners_blockers(pos);
-    state = pos->state;
+    pos_set_checkers_pinners_blockers(pos);
 
-    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);
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            nodes++;
+        } else {
+            move_do(pos, *move, &state);
+#           ifdef PERFT_MOVE_HISTORY
+            stack.move[stack.nmoves++] = *move;
+#           endif
+            if (depth == 2) {
+                movelist_t movelist2;
+                pos_set_checkers_pinners_blockers(pos);
+                subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
+            } else if (ply >= 3) {
+                hentry_t *entry = tt_probe_perft(pos->key, depth);
+                if (entry != TT_MISS) {
+                    subnodes = HASH_PERFT_VAL(entry->data);
+                } else {
+                    subnodes = perft(pos, depth - 1, ply + 1, output);
+                    tt_store_perft(pos->key, depth, subnodes);
+                }
+            } else {
+                subnodes = perft(pos, depth - 1, ply + 1, output);
+            }
+            if (output && ply == 1) {
+                char movestr[8];
+                printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+            }
+            nodes += subnodes;
+            move_undo(pos, *move, &state);
+#           ifdef PERFT_MOVE_HISTORY
+            stack.nmoves--;
+#           endif
         }
-        nodes += subnodes;
-        move_undo(pos, move);
-        pos->state = state;
     }
 
-    if (ply == 1)
+    if (output && ply == 1)
         printf("Total: %lu\n", nodes);
     return nodes;
 }
 
 /**
- * perft_new_pinners() - Perform perft on position
- * @pos:   &position to search
- * @depth: Wanted depth.
- * @ply:   perft depth level.
+ * perft_alt() - Perform perft on position, experimental version.
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @output: 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_new_pinners(pos_t *pos, int depth, int ply)
+u64 perft_alt(pos_t *pos, int depth, int ply, bool output)
 {
-    int subnodes, movetmp = 0;
-    u64 nodes = 0;
-    movelist_t pseudo;
-    move_t move;
+    u64 subnodes, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
     state_t state;
 
-    if (depth == 0)
-        return 1;
-    pseudo.nmoves = 0;
     pos_set_checkers_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_new_pinners(pos, depth - 1, ply + 1);
-        if (ply == 1) {
-            char movestr[8];
-            printf("%s: %d\n", move_str(movestr, move, 0), subnodes);
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            nodes++;
+        } 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, output);
+            }
+            if (output && ply == 1) {
+                char movestr[8];
+                printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+            }
+            nodes += subnodes;
+            move_undo_alt(pos, *move, &state);
         }
-        nodes += subnodes;
-        move_undo(pos, move);
-        pos->state = state;
     }
 
-    if (ply == 1)
+    if (output && ply == 1)
         printf("Total: %lu\n", nodes);
     return nodes;
 }
@@ -315,24 +345,24 @@ u64 perft_new_pinners(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

@@ -19,8 +19,7 @@
 //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);
-u64 perft_new_pinners(pos_t *pos, int depth, int ply);
+u64 perft(pos_t *pos, int depth, int ply, bool output);
+u64 perft_alt(pos_t *pos, int depth, int ply, bool output);
 
 #endif  /* SEARCH_H */

src/util.c

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

test/attack-test.c

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

test/common-test.h

@@ -28,15 +28,15 @@ struct fentest {
     char *comment;
     char *fen;
 } fentest[] = {
-    /*
-    { __LINE__.
-      ATTACK,
-      "checkers: ",
-      ""
-    },
-     */
+    /******************************************************************
+     * TEMP TESTS BELOW - only run them (till sentinel below)         *
+     ******************************************************************/
 
-/* ***************** TEMP TESTS ABOVE ************************** */
+    /******************************************************************
+     * 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.",
@@ -76,20 +76,6 @@ struct fentest {
       "illegal e.p. bug perft at depth 4",
       "1nbqkbn1/ppp2ppp/4p3/r1rpP3/6K1/P7/1PPP1PPP/RNBQ1BNR b - - 1 2"
     },
-    /*
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT,
-     *   "illegal e.p. bug perft depth 3",
-     *   "1nbqkbn1/ppp2ppp/4p3/2rpP3/r5K1/P7/1PPP1PPP/RNBQ1BNR w - - 2 3"
-     * },
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT,
-     *   "illegal e.p. bug perft depth 2",
-     *   "1nbqkbn1/ppp2ppp/4p3/2rpP3/r4PK1/P7/1PPP2PP/RNBQ1BNR b - - 0 3"
-     * },
-     * { __LINE__, MOVEGEN | MOVEDO | PERFT | PERFT,
-     *   "illegal e.p. bug perft depth 1 - fixed",
-     *   "1nb1kbn1/ppp2ppp/4p3/2rpP1q1/r4PK1/P7/1PPP2PP/RNBQ1BNR w - - 1 4"
-     * },
-     */
     { __LINE__, ATTACK,
       "only 3 K moves (but impossible situation)",
       "1k6/8/8/8/8/8/8/r2K3r w - - 0 1"
@@ -139,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,
@@ -184,30 +160,27 @@ struct fentest {
       "r3k2r/8/3BB3/8/8/3bb3/8/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
+      "No castling for white",
       "r2bkb1r/8/8/8/8/3bb3/8/R2BKB1R w KQkq - 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "4 castle possible, only K+R",
+      "4 castling possible, only K+R",
       "r3k2r/8/8/8/8/8/8/R3K2R w KQkq - 0 1"
     },
-    //
-    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "only kings on A1/A8, white to play",
-      "k7/8/8/8/8/8/8/K7 w - - 0 1"
-    },
-    //
+    /*
+     * { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+     *   "only kings on A1/A8, white to play",
+     *   "k7/8/8/8/8/8/8/K7 w - - 0 1"
+     * },
+     */
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "only one move possible (Pf2xBg3)",
       "k7/8/8/1p1p4/pPpPp3/P1PpPpb1/NBNP1P2/KBB1B3 w - - 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "only 2 moves possible (Ph5xg6 e.p., Ph5-h6)",
       "k7/8/8/1p1p2pP/pPpPp3/P1PpPp2/NBNP1P2/KBB1B3 w - g6 0 1"
     },
-    //
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "2 Kings, W/B/ pawns on 7th for promotion",
       "k4n2/4P3/8/8/8/8/4p3/K4N2 w - - 0 1"
@@ -233,12 +206,41 @@ struct fentest {
       "",
       "6k1/6pp/R2p4/p1p5/8/1P1r3P/6P1/6K1 b - - 3 3"
     },
-
-    // some of tests below are from:
-    // - Rodent IV
-    // - https://www.chessprogramming.net/perfect-perft/
+    /*************************************
+     * Some FEN found on talkchess forum *
+     *************************************/
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
-      "",
+      "from https://www.talkchess.com/forum/viewtopic.php?t=42463",
+      "rnbqkb1r/pp1p1ppp/2p5/4P3/2B5/8/PPP1NnPP/RNBQK2R w KQkq - 0 6"
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "8/p7/8/1P6/K1k3p1/6P1/7P/8 w - - 0 1", // Perft(8) == 8,103,790
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "8/5p2/8/2k3P1/p3K3/8/1P6/8 b - - 0 1"  // Perft(8) == 64,451,405
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "n1n5/PPPk4/8/8/8/8/4Kppp/5N1N b - - 0 1" // Perft(6) == 71,179,139
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "r3k2r/p6p/8/B7/1pp1p3/3b4/P6P/R3K2R w KQkq - 0 1" // Perft(6) == 77,054,993
+    },
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "from https://talkchess.com/viewtopic.php?t=74153",
+      "r3k2r/pb3p2/5npp/n2p4/1p1PPB2/6P1/P2N1PBP/R3K2R w KQkq - 0 1" // Perft(5) == 29,179,893
+    },
+
+    /*****************************************************
+     * some of tests below are from:                     *
+     * - Rodent IV                                       *
+     * - https://www.chessprogramming.net/perfect-perft/ *
+     *****************************************************/
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "\"kiwipete\"",
       "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 1"
     },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
@@ -394,6 +396,14 @@ struct fentest {
       "simple movedo/undo: only 2 W knights",
       "5n2/1k6/8/8/5K2/8/P7/1N6 w - - 0 1"
     },
+    { __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",
       "4k3/8/8/8/7B/8/8/4K3 w KQkq e6 0 1"
@@ -413,22 +423,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);
@@ -239,9 +239,9 @@ int main(int __unused ac, __unused char**av)
         send_stockfish_fen(outfd, fishpos, &fishmoves, fen);
 
         pos_set_checkers_pinners_blockers(pos);
-        pos_gen_pseudomoves(pos, &pseudo);
+        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 ");
@@ -253,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);
@@ -262,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,6 +16,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <locale.h>
+#include <limits.h>
 
 #include "chessdefs.h"
 #include "fen.h"
@@ -43,6 +44,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,11 +87,36 @@ 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)
 {
     char *buf = NULL;
     u64 count, mycount = 0, fishcount;
@@ -101,10 +130,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)
@@ -222,89 +253,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)");
+    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, moves_output = 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;
-    s64 ms1 = 0, ms1_total = 0;
-    s64 ms2 = 0, ms2_total = 0;
+    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 },
+    };
 
-    int depth = 6, run = 3;
+    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':
+                moves_output = false;
+                break;
+            case 'p':
+                run = atoi(optarg);
+                break;
+            case 's':
+                sf_run = true;
+                break;
+            case 't':
+                newtt = atoi(optarg);
+                break;
+            default:
+                    return usage(*av);
+        }
+    }
 
-    if (ac > 1)
-        depth = atoi(av[1]);
-    if (ac > 2)
-        run =  atoi(av[2]) & 3;
-    printf("depth = %d run=%d\n", depth, run);
-
-    if (!run)
+    if (!run) {
+        printf("Nothing to do, exiting\n");
         exit(0);
-    setlocale(LC_NUMERIC, "");
-    setlinebuf(stdout);                           /* line-buffered stdout */
-    outfd = open_stockfish();
+    }
 
-    bitboard_init();
-    hyperbola_init();
+    init_all();
+    tt = hash_tt.mb;
 
-    CLOCK_DEFINE(clock, CLOCK_PROCESS);
+    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);
-        savepos = pos_dup(pos);
+        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");
+
+        tt_clear();
+
+        pos = fenpos;
+        if (sf_run) {
+            stockfish_fen(outfd, fen);
+            clock_start(&clock);
+            sf_count = stockfish_perft(outfd, fishpos, &fishmoves, depth);
+            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);
+        }
 
         if (run & 1) {
             clock_start(&clock);
-            my_count = perft(pos, depth, 1);
-            ms1 = clock_elapsed_ms(&clock);
-            ms1_total += ms1;
+            my_count = perft(pos, depth, 1, moves_output);
+            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;
+            }
 
-            if (sf_count == my_count) {
-                printf("pt1 OK : line=%3d perft=%'lu %'ldms lps=%'lu \"%s\"\n",
-                       test_line, my_count, ms1,
-                       ms1? my_count*1000l/ms1: 0,
-                       fen);
+            if (!sf_run || sf_count == my_count) {
+                printf("perft     : perft:%'lu ms:%'ld lps:%'lu ",
+                       my_count, ms, lps);
+                tt_stats();
             } else  {
-                printf("pt1 ERR: line=%3d sf=%'lu me=%'lu \"%s\"\n",
-                       test_line, sf_count, my_count, fen);
+                printf("perft     : perft:%'lu ***ERROR***\n", my_count);
+                res[0].err++;
             }
         }
 
         if (run & 2) {
             clock_start(&clock);
-            my_count = perft_new_pinners(pos, depth, 1);
-            ms2 = clock_elapsed_ms(&clock);
-            ms2_total += ms2;
+            my_count = perft_alt(pos, depth, 1, moves_output);
+            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_count == my_count) {
-                printf("pt2 OK : line=%3d perft=%'lu %'ldms lps=%'lu \"%s\"\n",
-                       test_line, my_count, ms2,
-                       ms2? my_count*1000l/ms2: 0,
-                       fen);
+            if (!sf_run || sf_count == my_count) {
+                printf("perft_alt : perft:%'lu ms:%'ld lps:%'lu\n",
+                       my_count, ms, lps);
             } else  {
-                printf("pt2 ERR: line=%3d sf=%'lu me=%'lu \"%s\"\n",
-                       test_line, sf_count, my_count, fen);
+                printf("perft_alt : perft:%'lu ***ERROR***\n", my_count);
+                res[1].err++;
             }
         }
         printf("\n");
-        pos_del(savepos);
-        pos_del(pos);
-        i++;
-        /* to run first test only */
-        // exit(0);
     }
-    if (run & 1)
-        printf("total perft  %'ldms\n", ms1_total);
-    if (run & 2)
-        printf("total perft2 %'ldms\n", ms2_total);
+    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;
+ * }
+ */