untabify Makefile, cosmetic change in pos_set_checkers_pinners_blockers()

simplify pos_set_checkers_pinners_blockers() (cont'd)
Makefile: add -ginline-points
2024-04-10 17:12:20 +02:00 · 2024-04-10 15:59:24 +02:00 · 2024-04-10 13:02:23 +02:00 · 2024-04-10 12:57:39 +02:00 · 2024-04-10 12:57:08 +02:00 · 2024-04-10 12:54:47 +02:00
26 changed files with 1642 additions and 620 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ vgcore.*
 *.i
 *.old
 *.save
+perf.data
 /GPATH
 /GRTAGS
 /GTAGS
--- a/85
+++ b/85
@@ -1,6 +1,6 @@
 # Makefile - brchess Makefile, **GNU make only**
 #
-# 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.
 #
@@ -21,7 +21,7 @@ RMDIR     := rmdir
 MAKE      := make

 SRCDIR    := ./src
-INCDIR    := ./src					    # used by ./test sources
+INCDIR    := ./src                                          # used by ./test sources
 OBJDIR    := ./obj
 BINDIR    := ./bin
 DEPDIR    := ./dep
@@ -34,13 +34,13 @@ BRLIBDIR  := $(BRLIB)/lib
 CCLSROOT  := .ccls-root
 CCLSFILE  := compile_commands.json

-SRC       := $(wildcard $(SRCDIR)/*.c)			    # project sources
-SRC_FN    := $(notdir $(SRC))				    # source basename
+SRC       := $(wildcard $(SRCDIR)/*.c)                      # project sources
+SRC_FN    := $(notdir $(SRC))                               # source basename
 OBJ       := $(addprefix $(OBJDIR)/,$(SRC_FN:.c=.o))

 TSTSRC    := $(wildcard $(TSTDIR)/*.c)

-LIB       := br_$(shell uname -m)			    # library name
+LIB       := br_$(shell uname -m)                           # library name
 LIBS      := $(strip -l$(LIB) -lreadline)

 DEP_FN    := $(SRC_FN)
@@ -56,7 +56,6 @@ CPPFILES  := $(SRC:.c=.i) $(TSTSRC:.c=.i)
 CPPFLAGS  := -I$(BRINCDIR) -I$(INCDIR)

 CPPFLAGS  += -DNDEBUG                                       # assert
-
 CPPFLAGS  += -DBUG_ON                                       # brlib bug.h
 CPPFLAGS  += -DWARN_ON                                      # brlib bug.h

@@ -64,16 +63,16 @@ CPPFLAGS  += -DWARN_ON                                      # brlib bug.h
 #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_POS                                    # position.c
 #CPPFLAGS  += -DDEBUG_MOVE                                   # move generation

 # 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_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
@@ -86,23 +85,40 @@ CPPFLAGS  := $(strip $(CPPFLAGS))

 ##################################### compiler flags
 CFLAGS    := -std=gnu11
-#CFLAGS    += -flto
-CFLAGS    += -O1
-CFLAGS    += -g
+
+### 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    += -march=native
 CFLAGS    += -Wmissing-declarations
-# for gprof
-# CFLAGS += -pg
-# Next one may be useful for valgrind (when invalid instructions)
-# CFLAGS += -mno-tbm

 CFLAGS    := $(strip $(CFLAGS))

+# development CFLAGS - unused - TODO
+#DEV_CFLAGS := -O1
+#DEV_CFLAGS += -g
+
+# release CFLAGS - unused - TODO
+#REL_CFLAGS := -Ofast
+
 ##################################### linker flags
-LDFLAGS   := -L$(BRLIBDIR)
-#LDFLAGS   += -flto
+LDFLAGS   := --static
+LDFLAGS   += -L$(BRLIBDIR)
+LDFLAGS   += -flto

 LDFLAGS   := $(strip $(LDFLAGS))

@@ -243,11 +259,11 @@ cleanasmcpp:
 	@$(call rmfiles,$(ASMFILES) $(CPPFILES),asm and pre-processed)

 %.i: %.c
-	@echo generating $@ (cpp processed).
+	@echo "generating $@ (cpp processed)."
 	@$(CC) -E $(CPPFLAGS) $(CFLAGS) $< -o $@

 %.s: %.c
-	@echo generating $@ (asm).
+	@echo "generating $@ (asm)."
 	@$(CC) -S -fverbose-asm $(CPPFLAGS) $(CFLAGS) $< -o $@

 ##################################### LSP (ccls)
@@ -286,19 +302,17 @@ memcheck: targets
 ##################################### test binaries
 .PHONY: testing test

-TEST          := piece-test fen-test bitboard-test movegen-test attack-test movedo-test
+TEST          := piece-test fen-test bitboard-test movegen-test attack-test
+TEST          += movedo-test perft-test

 PIECE_OBJS    := piece.o
-FEN_OBJS      := fen.o position.o piece.o bitboard.o board.o hyperbola-quintessence.o \
-	attack.o
-BB_OBJS       := fen.o position.o piece.o bitboard.o board.o hyperbola-quintessence.o \
-	attack.o
-MOVEGEN_OBJS  := fen.o position.o piece.o bitboard.o board.o hyperbola-quintessence.o \
-	attack.o move.o move-gen.o
-ATTACK_OBJS   := fen.o position.o piece.o bitboard.o board.o hyperbola-quintessence.o \
-	 attack.o move.o move-gen.o
-MOVEDO_OBJS   := fen.o position.o piece.o bitboard.o board.o hyperbola-quintessence.o \
-	 attack.o move.o move-gen.o move-do.o
+FEN_OBJS      := $(PIECE_OBJS) fen.o position.o bitboard.o board.o \
+	hyperbola-quintessence.o attack.o
+BB_OBJS       := $(FEN_OBJS)
+MOVEGEN_OBJS  := $(BB_OBJS) move.o move-gen.o
+ATTACK_OBJS   := $(MOVEGEN_OBJS)
+MOVEDO_OBJS   := $(ATTACK_OBJS) move-do.o
+PERFT_OBJS    := $(MOVEDO_OBJS) search.o misc.o

 TEST          := $(addprefix $(BINDIR)/,$(TEST))

@@ -308,6 +322,7 @@ BB_OBJS       := $(addprefix $(OBJDIR)/,$(BB_OBJS))
 MOVEGEN_OBJS  := $(addprefix $(OBJDIR)/,$(MOVEGEN_OBJS))
 ATTACK_OBJS   := $(addprefix $(OBJDIR)/,$(ATTACK_OBJS))
 MOVEDO_OBJS   := $(addprefix $(OBJDIR)/,$(MOVEDO_OBJS))
+PERFT_OBJS    := $(addprefix $(OBJDIR)/,$(PERFT_OBJS))

 test:
 	echo TEST=$(TEST)
@@ -339,6 +354,10 @@ bin/movedo-test: test/movedo-test.c test/common-test.h $(MOVEDO_OBJS)
 	@echo compiling $@ 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.
+	@$(CC) $(ALL_CFLAGS) $< $(PERFT_OBJS) $(ALL_LDFLAGS) -o $@
+
 ##################################### Makefile debug
 .PHONY: showflags wft

--- a/src/attack.c
+++ b/src/attack.c
@@ -21,7 +21,64 @@
 #include "attack.h"


-// #define DEBUG_ATTACK_ATTACKERS1
+/**
+ * sq_is_attacked() - find if a square is attacked
+ * @pos: position
+ * @occ: occupation mask used
+ * @sq:  square to test
+ * @c:   attacker color
+ *
+ * Find if a @c piece attacks @sq.
+ *
+ * Algorithm:  We perform a reverse attack, and check if any given
+ * piece type on @sq can attack a @c piece of same type.
+ *
+ * For example, if @c is white, we test for all T in P,N,B,R,Q,K if
+ * T on @sq could attack a white T piece.
+ *
+ * @Return: true if @sq is attacked by a @c piece, false otherwise.
+ */
+bool sq_is_attacked(const pos_t *pos, const bitboard_t occ, const square_t sq, const color_t c)
+{
+    color_t opp = OPPONENT(c);
+
+    /* bishop / queen */
+    if (hyperbola_bishop_moves(occ, sq) & (pos->bb[c][BISHOP] | pos->bb[c][QUEEN]))
+        return true;
+
+    /* rook / queen */
+    if (hyperbola_rook_moves(occ, sq) & (pos->bb[c][ROOK] | pos->bb[c][QUEEN]))
+        return true;
+
+    /* pawn */
+    if (bb_pawn_attacks[opp][sq] & pos->bb[c][PAWN])
+        return true;
+
+    /* knight */
+    if (bb_knight_moves(pos->bb[c][KNIGHT], sq))
+        return true;
+
+    /* king */
+    if (bb_king_moves(pos->bb[c][KING], sq))
+        return true;
+
+    return false;
+}
+
+/**
+ * is_in_check() - find if a king is in check.
+ * @pos:   position
+ * @color: king color
+ *
+ * Find if a @c king is in check. This function is a wrapper over @sq_is_attacked().
+ *
+ * @Return: true if @sq is attacked by a @c piece, false otherwise.
+ */
+bool is_in_check(const pos_t *pos, const color_t color)
+{
+    bitboard_t occ = pos_occ(pos);
+    return sq_is_attacked(pos, occ, pos->king[color], OPPONENT(color));
+}

 /**
 * sq_attackers() - find attackers on a square
--- a/src/attack.h
+++ b/src/attack.h
@@ -17,6 +17,9 @@
 #include "chessdefs.h"
 #include "bitboard.h"

+bool sq_is_attacked(const pos_t *pos, const bitboard_t occ, const square_t sq, const color_t c);
+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 sq_attackers_all(const pos_t *pos, const square_t sq);
 bitboard_t sq_pinners(const pos_t *pos, const square_t sq, const color_t c);
--- a/src/bitboard.c
+++ b/src/bitboard.c
@@ -27,7 +27,7 @@ bitboard_t bb_between_excl[64][64];
 bitboard_t bb_between[64][64];
 bitboard_t bb_line[64][64];

-bitboard_t bb_knight[64], bb_king[64];
+bitboard_t bb_knight[64], bb_king[64], bb_pawn_attacks[2][64];

 /*  vectors are clockwise from N */
 static int knight_vector[] = {
@@ -105,7 +105,9 @@ void bitboard_init(void)
    } ;
    bitboard_t tmpbb[64][4] = { 0 };

-    /* 1) square to bitboard, and in-between-sq2-excluded */
+    /* 1) square to bitboard
+     *    in-between, sq2 excluded
+     */
    for (square_t sq1 = A1; sq1 <= H8; ++sq1) {
        bb_sq[sq1] = mask(sq1);
        for (square_t sq2 = A1; sq2 <= H8; ++sq2)
@@ -151,18 +153,18 @@ void bitboard_init(void)
                    bb_line[sq1][sq2] = bb_sqdiag[sq1];
                else if (bb_sqanti[sq1] == bb_sqanti[sq2])
                    bb_line[sq1][sq2] = bb_sqanti[sq1];
-
-                //if (bb_line[sq1][sq2]) {
-                //    printf("bb_line[%d][%d] = %16lx\n", sq1, sq2, bb_line[sq1][sq2]);
-                //}
            }
        }
    }

-    /* 3) knight and king moves */
+    /* 3) pawn, knight and king attacks
+     */
    for (square_t sq = A1; sq <= H8; ++sq) {
-        //rank_t r1 = sq_rank(sq);
-        //file_t f1 = sq_file(sq);
+        if (sq >= 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);
+
        for (int vec = 0; vec < 8; ++vec) {
            int dst = sq + knight_vector[vec];
            if (sq_ok(dst)) {
@@ -190,8 +192,6 @@ void bitboard_init(void)
 */
 bitboard_t bb_knight_moves(bitboard_t notmine, square_t sq)
 {
-    //bitboard_print("bb_knight_move mask", bb_knight[sq]);
-    //bitboard_print("bb_knight_move  res", bb_knight[sq] & notmine);
    return bb_knight[sq] & notmine;
 }

--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -14,8 +14,8 @@
 #ifndef _BITBOARD_H
 #define _BITBOARD_H

-#include "brlib.h"
-#include "bitops.h"
+#include <brlib.h>
+#include <bitops.h>

 #include "chessdefs.h"
 #include "board.h"
@@ -39,9 +39,8 @@ extern bitboard_t bb_sqrank[64], bb_sqfile[64], bb_sqdiag[64], bb_sqanti[64];
 /* line (rank, file, diagonal or anti-diagonal) between two squares */
 extern bitboard_t bb_line[64][64];

-/* knight and king moves */
-extern bitboard_t bb_knight[64], bb_king[64];
-
+/* pawn, knight and king attacks */
+extern bitboard_t bb_knight[64], bb_king[64], bb_pawn_attacks[2][64];

 /* TODO (maybe C23?) when we can ensure an enum can be u64
 *
@@ -183,13 +182,64 @@ static __always_inline bitboard_t bb_file(int file)
 }
 */

+/**
+ * bb_first_bb() - return bitboard of first square of a bitboard.
+ * @bb: bitboard
+ *
+ * bb must be non-zero.
+ *
+ * @return: bitboard of first square (lsb) of @bb.
+ */
+static __always_inline square_t bb_first_bb(bitboard_t bb)
+{
+    return bb & -bb;
+}
+
+/**
+ * bb_next() - clear and return next (lsb) square of a bitboard.
+ * @bb: &bitboard
+ *
+ * The bitboard addressed by @bb must be non-zero.
+ *
+ * @return: first bit (lsb) of @bb.
+ */
+static __always_inline square_t bb_next(bitboard_t *bb)
+{
+    square_t sq = ctz64(*bb);
+    *bb &= *bb - 1;
+    return sq;
+}
+
+/**
+ * bb_multiple() - test if a bitboard has multiple bits.
+ * @bb: bitboard
+ *
+ * @return: true if @bb has more than 1 bit, false otherwise.
+ */
+static __always_inline bool bb_multiple(bitboard_t bb)
+{
+    return !!(bb & (bb - 1));
+}
+
+/**
+ * bb_shift() - shift bitboard
+ * @bb: bitboard
+ *
+ * No control is done on off-board shifting (i.e. shifting -1 from A2 gives H3).
+ *
+ * @return: true if @bb has more than 1 bit, false otherwise.
+ */
+static __always_inline bitboard_t bb_shift(bitboard_t bb, int shift)
+{
+   return shift >= 0 ? bb << shift : bb >> -shift;
+}
+
+
 #define bb_rank(r)        ((u64) RANK_1bb << ((r) * 8))
-#define BB_FILE(f)        ((u64) FILE_Abb << (f))
+#define bb_file(f)        ((u64) FILE_Abb << (f))

 #define bb_rel_rank(r, c) bb_rank(sq_rel_rank(r, c))
-
-//#define BB_REL_RANK(r, c) (RANK_1bb << (SQ_REL_RANK(r, c) * 8))
-//#define BB_REL_FILE(f, c) (FILE_Abb << (SQ_REL_RANK((f), (c))))
+#define bb_rel_file(f, c) bb_file(sq_rel_rank(f, c))

 /**
 * bb_sq_aligned() - check if two squares are aligned (same file or rank).
@@ -219,7 +269,7 @@ static __always_inline bool bb_sq_aligned3(square_t sq1, square_t sq2, square_t
 * @sq1: square 1
 * @sq2: square 2
 *
- * @return: bitboard of @betw if between @sq1 and @sq2.
+ * @return: bitboard of @sq if between @sq1 and @sq2.
 */
 static __always_inline bitboard_t bb_sq_between(square_t sq, square_t sq1, square_t sq2)
 {
@@ -260,27 +310,30 @@ static __always_inline bitboard_t shift_nw(const bitboard_t bb)
    return (bb & ~FILE_Abb) << NORTH_WEST;
 }

-#define pawn_up_value(c)          ((c) == WHITE ? 8: -8)
 /* pawn moves/attacks (for bitboards) */
 #define pawn_shift_up(bb, c)      ((c) == WHITE ? shift_n(bb): shift_s(bb))
 #define pawn_shift_upleft(bb, c)  ((c) == WHITE ? shift_nw(bb): shift_se(bb))
 #define pawn_shift_upright(bb, c) ((c) == WHITE ? shift_ne(bb): shift_sw(bb))
+
+#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))
+//#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))

-extern bitboard_t bitboard_between_excl(square_t sq1, square_t sq2);
-extern void bitboard_init(void);
+bitboard_t bitboard_between_excl(square_t sq1, square_t sq2);
+void bitboard_init(void);

-extern bitboard_t bb_knight_moves(bitboard_t occ, square_t sq);
-extern bitboard_t bb_king_moves(bitboard_t occ, square_t sq);
+bitboard_t bb_knight_moves(bitboard_t notmine, square_t sq);
+bitboard_t bb_king_moves(bitboard_t notmine, square_t sq);

-extern void bb_print(const char *title, const bitboard_t bitboard);
-extern void bb_print_multi(const char *title, const int n, ...);
-extern char *bb_rank_sprint(char *str, const uchar bb8);
-extern char *bb_sq2str(const bitboard_t bb, char *str, int len);
+void bb_print(const char *title, const bitboard_t bitboard);
+void bb_print_multi(const char *title, const int n, ...);
+char *bb_rank_sprint(char *str, const uchar bb8);
+char *bb_sq2str(const bitboard_t bb, char *str, int len);

 #endif  /* _BITBOARD_H */
--- a/src/chessdefs.h
+++ b/src/chessdefs.h
@@ -45,6 +45,7 @@
 * @return: Relative rank.
 */
 #define sq_rel_rank(rank, c)  ((rank_t)((7 * (c)) ^ rank))
+#define sq_rel_file(file, c)  ((file_t)((7 * (c)) ^ file))

 /* castle_t bits structure
 */
@@ -134,5 +135,40 @@ typedef enum {
    NORTH_WEST = (NORTH + WEST),
 } 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)
+
+#include <time.h>
+
+typedef struct mclock {
+    clockid_t clocktype;
+    ulong elapsed_l;
+    double elapsed_f;
+    struct timespec start;
+} mclock_t;
+
+#define CLOCK_WALL    CLOCK_REALTIME
+#define CLOCK_SYSTEM  CLOCK_MONOTONIC_RAW
+#define CLOCK_PROCESS CLOCK_PROCESS_CPUTIME_ID
+#define CLOCK_THREAD  CLOCK_THREAD_CPUTIME_ID
+
+/**
+ * CLOCK_DEFINE - define a clock type.
+ * @name: clock name
+ * @type: clock type
+ *
+ * This macro is equivalent to:
+ *   mclock_t name;
+ *   clock_init(&name, type);
+ */
+#define CLOCK_DEFINE(name, type) struct mclock name = { .clocktype = type }
+
+void clock_init(mclock_t *clock, clockid_t type);
+void clock_start(mclock_t *clock);
+s64 clock_elapsed_μs(mclock_t *clock);
+s64 clock_elapsed_ms(mclock_t *clock);
+double clock_elapsed_sec(mclock_t *clock);

 #endif  /* _CHESSDEFS_H */
--- a/src/fen.c
+++ b/src/fen.c
@@ -75,7 +75,7 @@ static const char *castle_str = "KQkq";
 static int fen_check(pos_t *pos)
 {
    char *colstr[2] = { "white", "black"};
-    int error = 0, warning = 0;
+    int warning = 0;

    /* en passant, depends on who plays next */
    if (pos->en_passant != SQUARE_NONE) {
@@ -130,13 +130,7 @@ static int fen_check(pos_t *pos)
            }
        }
    }
-    if (!(error = pos_check(pos, 0))) {
-        /* TODO: Should it really be here ? */
-        pos->checkers = pos_checkers(pos, pos->turn);
-        pos->pinners = pos_king_pinners(pos, pos->turn);
-        pos->blockers = pos_king_blockers(pos, pos->turn, pos->pinners);
-    }
-    return error ? -1: warning;
+    return pos_ok(pos, 0) ? warning: -1;
 }

 /**
--- a/src/hyperbola-quintessence.h
+++ b/src/hyperbola-quintessence.h
@@ -17,17 +17,17 @@
 #include "board.h"
 #include "bitboard.h"

-extern void hyperbola_init(void);
+void hyperbola_init(void);

-extern bitboard_t hyperbola_rank_moves(const bitboard_t occ, const square_t sq);
-extern bitboard_t hyperbola_moves(const bitboard_t pieces, const square_t sq,
-                                  const bitboard_t mask);
-extern bitboard_t hyperbola_file_moves(const bitboard_t occ, const square_t sq);
-extern bitboard_t hyperbola_diag_moves(const bitboard_t occ, const square_t sq);
-extern bitboard_t hyperbola_anti_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_rank_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_moves(const bitboard_t pieces, const square_t sq,
+                           const bitboard_t mask);
+bitboard_t hyperbola_file_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_diag_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_anti_moves(const bitboard_t occ, const square_t sq);

-extern bitboard_t hyperbola_bishop_moves(const bitboard_t occ, const square_t sq);
-extern bitboard_t hyperbola_rook_moves(const bitboard_t occ, const square_t sq);
-extern bitboard_t hyperbola_queen_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_bishop_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_rook_moves(const bitboard_t occ, const square_t sq);
+bitboard_t hyperbola_queen_moves(const bitboard_t occ, const square_t sq);

 #endif  /* _HYPERBOLA_QUINTESSENCE_H */
--- a/src/misc.c
+++ b/src/misc.c
@@ -0,0 +1,112 @@
+/* misc.c - generic/catchall 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 <time.h>
+
+#include "chessdefs.h"
+
+/*
+ * 1 sec      = 1000 millisec
+ * 1 millisec = 1000 microsec
+ * 1 microsec = 1000 nanosec
+ * milli = sec * 1000 + nanosec / 1000000
+ *
+ */
+
+/* We use microsec for all intermediate calcluation */
+#define NANO_IN_MICRO  1000ll                     /* nanosecond in millisecond */
+#define MICRO_IN_SEC   1000000ll                  /* millisecond in second */
+
+#define MILLI_IN_SEC   1000ll                     /* millisecond in second */
+
+#define MICRO_IN_MILLI 1000ll
+
+//#define NANO_IN_MILLI  1000000ll                         /* nanosecond in millisecond */
+//#define NANO_IN_SEC    (NANOS_IN_MS * MS_IN_SEC)
+
+
+/**
+ * clock_start - start or restart a clock.
+ * @clock: &mclock_t clock
+ *
+ * Save current time according to @clock type.
+ */
+void clock_start(mclock_t *clock)
+{
+    clock_gettime(clock->clocktype, &clock->start);
+}
+
+/**
+ * clock_init - initializes a clock type.
+ * @clock: &mclock_t clock
+ * @type: clock type
+ *
+ * See the clock_gettime(2) for details.
+ * CLOCK_WALL (a.k.a CLOCK_REALTIME): Wall clock.
+ * CLOCK_SYSTEM (a.k.a CLOCK_MONOTONIC_RAW): System clock.
+ * CLOCK_PROCESS (a.k.a CLOCK_PROCESS_CPUTIME_ID): Process CPU clock (incl. threads).
+ * CLOCK_THREAD  (a.k.a CLOCK_THREAD_CPUTIME_ID): Thread CPU clock.
+ */
+void clock_init(mclock_t *clock, clockid_t type)
+{
+    clock->clocktype = type;
+    clock_start(clock);
+}
+
+/**
+ * clock_elapsed_μs - return a mclock_t elapsed time in microseconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: microseconds elapsed since last clock_start().
+ */
+s64 clock_elapsed_μs(mclock_t *clock)
+{
+    struct timespec current;
+    s64 μs;
+
+    clock_gettime(clock->clocktype, &current);
+    μs = ((s64)current.tv_sec - (s64)clock->start.tv_sec) * MICRO_IN_SEC +
+        ((s64)current.tv_nsec - (s64)clock->start.tv_nsec) / NANO_IN_MICRO ;
+    return μs;
+}
+
+/**
+ * clock_elapsed_ms - return a mclock_t elapsed time in milliseconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: milliseconds elapsed since last clock_start().
+ */
+s64 clock_elapsed_ms(mclock_t *clock)
+{
+    return clock_elapsed_μs(clock) / MICRO_IN_MILLI;
+}
+
+/**
+ * clock_elapsed_sec - return a mclock_t elapsed time in seconds.
+ * @clock: &mclock_t clock
+ *
+ * The elapsed time is calculated between current time and last clock_start(@clock)
+ * call time.
+ *
+ * @return: seconds elapsed since last clock_start().
+ */
+double clock_elapsed_sec(mclock_t *clock)
+{
+    return (double) clock_elapsed_μs(clock) / (double) MICRO_IN_SEC;
+}
--- a/src/move-do.c
+++ b/src/move-do.c
@@ -17,10 +17,12 @@

 #include "brlib.h"
 #include "likely.h"
+#include "bug.h"

 #include "chessdefs.h"
 #include "move.h"
 #include "position.h"
+#include "move-do.h"

 /**
 * move_do() - do move.
@@ -40,29 +42,39 @@
 *
 * @return: pos.
 */
-pos_t *move_do(pos_t *pos, 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 */
+    //*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);

    ++pos->clock_50;
    ++pos->plycount;
    pos->en_passant = SQUARE_NONE;
    pos->turn = them;
+    pos->captured = captured;

-    if (is_promotion(move))
+    bug_on(pcolor != us);
+
+    if (is_promotion(move)) {
+        bug_on(sq_rank(to) != sq_rel_rank(RANK_8, us));
        new_piece = MAKE_PIECE(move_promoted(move), us);
+    }

-    if (is_capture(move)) {
+    if (captured != EMPTY) {
        pos->clock_50 = 0;
-        pos->captured = pos->board[to];           /* save capture info */
+        //pos->captured = pos->board[to];           /* save capture info */
+        bug_on(pos->board[to] == EMPTY || COLOR(pos->captured) != them);
        pos_clr_sq(pos, to);                      /* clear square */
    } else if (is_castle(move)) {                 /* handle rook move */
        square_t rookfrom, rookto;
@@ -76,12 +88,12 @@ pos_t *move_do(pos_t *pos, move_t move, state_t *state)
        pos_set_sq(pos, rookto, pos->board[rookfrom]);
        pos_clr_sq(pos, rookfrom);
        pos->castle = clr_castle(pos->castle, us);
-    } else if (PIECE(piece) == PAWN) {            /* pawn non capture or e.p. */
+    } else if (ptype == PAWN) {                   /* pawn non capture or e.p. */
        pos->clock_50 = 0;
        if (is_dpush(move))                       /* if pawn double push, set e.p. */
-            pos->en_passant = pawn_push_up(from, us);
+            pos->en_passant = from + up;
        else if (is_enpassant(move)) {            /* clear grabbed pawn */
-            square_t grabbed = pawn_push_up(to, them);
+            square_t grabbed = to - up;
            pos_clr_sq(pos, grabbed);
        }
    }
@@ -89,6 +101,9 @@ pos_t *move_do(pos_t *pos, move_t move, state_t *state)
    pos_clr_sq(pos, from);                        /* always 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"
@@ -96,7 +111,8 @@ pos_t *move_do(pos_t *pos, move_t move, state_t *state)
     */
    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);
+        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)
@@ -105,7 +121,8 @@ pos_t *move_do(pos_t *pos, move_t move, state_t *state)
            pos->castle = clr_oo(pos->castle, us);
    }
    if (can_castle(pos->castle, them)) {          /* do we save time with this test ? */
-        square_t rel_a8 = sq_rel(A8, us); square_t rel_h8 = sq_rel(H8, us);
+        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)
@@ -132,7 +149,7 @@ pos_t *move_do(pos_t *pos, 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: ");
@@ -141,16 +158,18 @@ pos_t *move_undo(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];
-
-    pos->state = *state;                          /* restore irreversible changes */
+    int up = sq_up(them);

    if (is_promotion(move))
        piece = MAKE_PIECE(PAWN, us);

-    pos_clr_sq(pos, to);                          /* always clear "to" and set "from" */
-    pos_set_sq(pos, from, piece);
+    pos_clr_sq(pos, to);                          /* always clear "to" ... */
+    pos_set_sq(pos, from, piece);                 /* ... and set "from" */

-    if (is_capture(move)) {
+    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;
@@ -164,9 +183,11 @@ pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state)
        pos_set_sq(pos, rookto, pos->board[rookfrom]);
        pos_clr_sq(pos, rookfrom);
    } else if (is_enpassant(move)) {              /* restore grabbed pawn */
-        square_t grabbed = pawn_push_up(to, them);
+        square_t grabbed = to + up;
        pos_set_sq(pos, grabbed, MAKE_PIECE(PAWN, them));
    }

+    //pos->state = *state;                          /* restore irreversible changes */
+    pos->turn = us;
    return pos;
 }
--- a/src/move-do.h
+++ b/src/move-do.h
@@ -1,6 +1,6 @@
 /* move-do.h - move do/undo.
 *
- * Copyright (C) 2021 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
 * Some rights reserved. See COPYING.
 *
@@ -14,7 +14,9 @@
 #ifndef MOVE_DO_H
 #define MOVE_DO_H

-//extern pos_t *move_do(pos_t *pos, move_t *move);
-//extern void move_undo(pos_t *pos, move_t *move);
+#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);

 #endif  /* MOVE_DO_H */
--- a/src/move-gen.c
+++ b/src/move-gen.c
@@ -36,66 +36,78 @@
 */
 bool pseudo_is_legal(const pos_t *pos, const move_t move)
 {
-    color_t us = pos->turn, them = OPPONENT(us);
-    square_t from = move_from(move), to = move_to(move), king = pos->king[us], sq;
-    piece_type_t piece = PIECE(pos->board[from]);
-    bitboard_t kingbb = pos->bb[us][KING], tmp;
+    color_t  us = pos->turn, them = OPPONENT(us);
+    square_t from = move_from(move), to = move_to(move);
+    square_t king = pos->king[us];
+    bitboard_t kingbb = pos->bb[us][KING];
+    bitboard_t occ = pos_occ(pos);
+    u64 pinned = mask(from) & pos->blockers;
+    u64 checkers = pos->checkers;

-    /* (1) - King
-     * For castling, we already tested intermediate squares attacks
-     * in pseudo move generation, so we only care destination square here.
-     * Attention: We need to exclude king from occupation bitboard !
+    /* (1) - Castling & King
+     * For castling, we need to check intermediate squares attacks only.
+     * Attention: To test if K is in check after moving, we need to exclude
+     * king from occupation bitboard (to catch king moving away from checker
+     * on same line) !
     */
-    if (piece == KING) {
-        bitboard_t occ = pos_occ(pos) ^ kingbb;
-        return !sq_attackers(pos, occ, to, them);
+    if (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);
    }

    /* (2) - King is in check
-     * Double-check is already handled, as only K moves were generated.
-     * Here, allowed moves are only on King-attacker line, including
-     * attacker.We can move a piece on
-     * in pseudo move generation, so we only care destination square here.
+     * 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
     */
-    if (pos->checkers) {
-        if (popcount64(pos->checkers) == 1) {     /* one checker */
-            square_t checker = ctz64(pos->checkers);
-            bitboard_t between = bb_between[king][checker];
-            return mask(to) & between;
+    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 false;                             /* double check */
+        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.
     */
-    if (mask(from) & pos->blockers & pos->bb[us][ALL_PIECES]) {
-        bitboard_t line = bb_line[from][king];
-        return line & mask(to);                   /* to is not on pin line */
+    if (mask(from) & pos->blockers) {
+        return bb_line[from][king] & mask(to);    /* is to on pinner line ? */
    }

    /* (4) - En-passant
-     * We only care the situation where our King and enemy R/Q are on
-     * 5th relative rank. To do so, we create an occupation bb without
-     * the 2 pawns.
+     * pinned pieces are handled in pinned section.
+     * One case not handled anywhere else: when the two "disappearing" pawns
+     * would discover a R/Q horizontal check.
     */
    if (is_enpassant(move)) {
-         /* from rank bitboard */
-        bitboard_t rank5 = bb_sqrank[from];
-        /* enemy rooks/queens on from rank */
-        bitboard_t rooks = (pos->bb[them][ROOK] | pos->bb[them][QUEEN]) & rank5;
+        bitboard_t rank5 = us == WHITE? RANK_5bb: RANK_4bb;

-        if ((kingbb & rank5) && rooks) { /* K and enemy R/Q on rank */
-            /* captured pawn square (beside from square) */
-            square_t captured = sq_make(sq_file(pos->en_passant), sq_rank(from));
-            /* occupation bitboard without the two "disappearing" pawns */
-            bitboard_t occ = pos_occ(pos) ^ mask(from) ^ mask(captured);
+        if ((pos->bb[us][KING] & rank5)) {
+            bitboard_t exclude = mask(pos->en_passant - sq_up(us)) | mask(from);
+            bitboard_t rooks = (pos->bb[them][ROOK] | pos->bb[them][QUEEN]) & rank5;

-            bit_for_each64(sq, tmp, rooks)        /* check all rooks/queens */
-                if (hyperbola_rank_moves(occ, sq) & kingbb)
+            while (rooks) {
+                square_t rook = bb_next(&rooks);
+                if (hyperbola_rank_moves(occ ^ exclude, rook) & kingbb)
                    return false;
+            }
        }
-        return true;
    }
    return true;
 }
@@ -103,18 +115,19 @@ bool pseudo_is_legal(const pos_t *pos, const move_t move)
 /**
 * pos_next_legal() - get next legal move in position.
 * @pos:  position
- * @start:  &int, starting position in move list
+ * @movelist: &pseudo-legal movelist
+ * @start:  &int, starting position in @movelist
 *
 * Get next valid move in @pos move list, from move @start, or MOVE_NONE.
 * @start is set to next non-checked move in pseudo-legal list.
 * Position pseudo-legal moves must be already calculated before calling this function.
 *
- * @return: move, or -1 if no move.
+ * @return: move, or MOVE_NONE if no move.
 */
-move_t pos_next_legal(const pos_t *pos, int *start)
+move_t pos_next_legal(const pos_t *pos, movelist_t *movelist, int *start)
 {
-    const int nmoves = pos->moves.nmoves;
-    const move_t *moves = pos->moves.move;
+    const int nmoves = movelist->nmoves;
+    const move_t *moves = movelist->move;
    move_t move;

    while (*start < nmoves) {
@@ -127,37 +140,59 @@ move_t pos_next_legal(const pos_t *pos, int *start)
 /**
 * pos_all_legal() - get the list of legal moves from pseudo-legal.
 * @pos:  position
- * @dest: destination &movelist_t
+ * @movelist: &pseudo-legal movelist_t
+ * @dest: &destination movelist_t
 *
 * The pseudo-legal moves must be already calculated before calling this function.
 * No check is done on @dest limits.
 *
 * @Return: @dest
 */
-movelist_t *pos_all_legal(const pos_t *pos, movelist_t *dest)
+movelist_t *pos_all_legal(const pos_t *pos, movelist_t *movelist, movelist_t *dest)
 {
    int tmp = dest->nmoves = 0;
    move_t move;
-    //int tmp = 0;

-    while ((move = pos_next_legal(pos, &tmp)) != MOVE_NONE)
+    while ((move = pos_next_legal(pos, movelist, &tmp)) != MOVE_NONE)
        dest->move[dest->nmoves++] = move;
    return dest;
 }

 /**
- * pos_gen_pseudomoves() - generate position pseudo-legal moves
+ * gen_pseudo_king() - generate king pseudo-legal moves.
 * @pos: position
+ * @movelist: &movelist_t array to store pseudo-moves
+ *
+ */
+static inline __unused move_t *gen_pseudo_king(move_t *moves, square_t from,
+                                               bitboard_t mask)
+{
+    //color_t us    = pos->turn;
+    //square_t from = pos->king[us];
+    //bitboard_t not_my_pieces     = ~pos->bb[us][ALL_PIECES];
+    bitboard_t to_bb = bb_king_moves(mask, from);
+    square_t to;
+    while (moves) {
+        to = bb_next(&to_bb);
+        *moves++ = move_make(from, to);
+    }
+    return moves;
+}
+
+/**
+ * pos_gen_check_pseudomoves() - generate position pseudo-legal moves when in check
+ * @pos: position
+ * @movelist: &movelist_t array to store pseudo-moves
 *
 * Generate all @pos pseudo moves for player-to-move.
- * The @pos->moves table is filled with the moves.
+ * @movelist is filled with the moves.
 *
 * Only a few validity checks are done here (i.e. moves are not generated):
 *  - castling, if king is in check
 *  - castling, if king passes an enemy-controlled square (not final square).
 * When immediately known, a few move flags are also applied in these cases:
 *  - castling: M_CASTLE_{K,Q}
- *  - pawn capture (excl. en-passant): M_CAPTURE
+ *  - capture (excl. en-passant): M_CAPTURE
 *  - en-passant: M_EN_PASSANT
 *  - pawn double push: M_DPUSH
 *  - promotion: M_PROMOTION
@@ -167,179 +202,279 @@ movelist_t *pos_all_legal(const pos_t *pos, movelist_t *dest)
 *
 * @Return: The total number of moves.
 */
-int pos_gen_pseudomoves(pos_t *pos)
+
+/**
+ * gen_pseudo_escape() - generate position pseudo-legal moves when in check
+ * @pos: square_t king position
+ * @mask: possible destinations to consider
+ * @moves: &move_t array to store pseudo-moves
+ *
+ * Generate all @pos pseudo moves for player-to-move, when in check.
+ * @movelist is filled with the moves.
+ *
+ * If king is doubles-checked, only King moves will be generated.
+ * Otherwise, only moves where destination in between King or checker, or checker
+ * square.
+ *
+ */
+/*
+ * static void __always_inline gen_pseudo_escape(pos_t *pos, movelist_t *movelist)
+ * {
+ *     color_t us               = pos->turn;
+ *     color_t them             = OPPONENT(us);
+ *     square_t king            = pos->king[us];
+ *
+ *     gen_pseudo_king(pos, movelist);
+ *
+ * }
+ */
+
+/**
+ * move_make_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.
+ *
+ * @Return: New @moves (incremented by 4).
+ */
+static inline move_t *move_make_promotions(move_t *moves, square_t from, square_t to)
+{
+    for (piece_type_t pt = QUEEN; pt >= KNIGHT; --pt)
+        *moves++ = move_make_promote(from, to, pt);
+    return moves;
+}
+
+/**
+ * pos_gen_pseudomoves() - generate position pseudo-legal moves
+ * @pos: position
+ * @movelist: &movelist_t array to store pseudo-moves
+ *
+ * Generate all @pos pseudo moves for player-to-move.
+ * @movelist is filled with the moves.
+ *
+ * Only a few validity checks are done here (i.e. moves are not generated):
+ *  - castling, if king is in check
+ *  - castling, if king passes an enemy-controlled square (not final square).
+ * When immediately known, a few move flags are also applied in these cases:
+ *  - castling: M_CASTLE_{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.
+ */
+int pos_gen_pseudomoves(pos_t *pos, movelist_t *movelist)
 {
    color_t us               = pos->turn;
    color_t them             = OPPONENT(us);

    bitboard_t my_pieces     = pos->bb[us][ALL_PIECES];
-    bitboard_t not_my_pieces = ~my_pieces;
    bitboard_t enemy_pieces  = pos->bb[them][ALL_PIECES];
+    bitboard_t dest_squares  = ~my_pieces;
    bitboard_t occ           = my_pieces | enemy_pieces;
    bitboard_t empty         = ~occ;

-    bitboard_t movebits, from_pawns;
-    bitboard_t tmp1, tmp2;
+    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];

-    move_t *moves            = pos->moves.move;
-    int nmoves               = pos->moves.nmoves;
-    int from, to;
-
-    bug_on(nmoves != 0);
+    //*nmoves = 0;

    /* king - MUST BE FIRST (we stop if doubler check) */
-    from = pos->king[us];
-    movebits = bb_king_moves(not_my_pieces, from);
-    bit_for_each64(to, tmp1, movebits & empty) {
-        moves[nmoves++] = move_make(from, to);
-    }
-    bit_for_each64(to, tmp1, movebits & enemy_pieces) {
-        moves[nmoves++] = move_make_capture(from, to);
+    to_bb = bb_king_moves(dest_squares, king);
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        *moves++ = move_make(king, to);
    }

-    if (popcount64(pos->checkers) > 1)            /* double check, we stop here */
-        return (pos->moves.nmoves = nmoves);
+    if (bb_multiple(pos->checkers))               /* double check, we stop here */
+        goto finish;

-    /* sliding pieces */
-    bit_for_each64(from, tmp1, pos->bb[us][BISHOP] | pos->bb[us][QUEEN]) {
-        movebits = hyperbola_bishop_moves(occ, from) & not_my_pieces;
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[nmoves++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[nmoves++] = move_make_capture(from, to);
-        }
-    }
-    bit_for_each64(from, tmp1, pos->bb[us][ROOK] | pos->bb[us][QUEEN]) {
-        // printf("rook=%d/%s\n", from, sq_to_string(from));
-        movebits = hyperbola_rook_moves(occ, from) & not_my_pieces;
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[nmoves++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[nmoves++] = move_make_capture(from, to);
-        }
-    }
-
-    /* knight */
-    bit_for_each64(from, tmp1, pos->bb[us][KNIGHT]) {
-        movebits = bb_knight_moves(not_my_pieces, from);
-        bit_for_each64(to, tmp2, movebits & empty) {
-            moves[nmoves++] = move_make(from, to);
-        }
-        bit_for_each64(to, tmp2, movebits & enemy_pieces) {
-            moves[nmoves++] = move_make_capture(from, to);
-        }
-    }
-
-    /* pawn: relative rank and files */
-    bitboard_t rel_rank7 = bb_rel_rank(RANK_7, us);
-    bitboard_t rel_rank3 = bb_rel_rank(RANK_3, us);
-
-    /* pawn: ranks 2-6 push 1 and 2 squares */
-    movebits = pawn_shift_up(pos->bb[us][PAWN] & ~rel_rank7, us) & empty;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_up(to, them);              /* reverse push */
-        //printf("push %d->%d %s->%s", from, to, sq_to_string(from), sq_to_string(to));
-        moves[nmoves++] = move_make(from, to);
-    }
-    /* possible second push */
-    movebits = pawn_shift_up(movebits & rel_rank3, us) & empty;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_up(pawn_push_up(to, them), them);
-        moves[nmoves++] = move_make_flags(from, to, M_DPUSH);
-    }
-
-    /* pawn: ranks 2-6 captures left */
-    from_pawns = pos->bb[us][PAWN] & ~rel_rank7; // & ~rel_filea;
-    movebits = pawn_shift_upleft(from_pawns, us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_upleft(to, them);         /* reverse capture */
-        moves[nmoves++] = move_make_capture(from, to);
-    }
-    /* pawn: ranks 2-6 captures right */
-    from_pawns = pos->bb[us][PAWN] & ~rel_rank7; // & ~rel_fileh;
-    movebits = pawn_shift_upright(from_pawns, us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_upright(to, them);
-        moves[nmoves++] = move_make_capture(from, to);
-    }
-
-    /* pawn: en-passant */
-    if ((to = pos->en_passant) != SQUARE_NONE) {
-        movebits = mask(to);
-        from_pawns = pos->bb[us][PAWN]
-            & (pawn_shift_upleft(movebits, them) | pawn_shift_upright(movebits, them));
-        bit_for_each64(from, tmp1, from_pawns) {
-            moves[nmoves++] = move_make_enpassant(from, to);
-        }
-    }
-
-    /* pawn: rank 7 push */
-    movebits = pawn_shift_up(pos->bb[us][PAWN] & rel_rank7, us) & empty;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_up(to, them);              /* reverse push */
-        moves[nmoves++] = move_make_promote(from, to, QUEEN);
-        moves[nmoves++] = move_make_promote(from, to, ROOK);
-        moves[nmoves++] = move_make_promote(from, to, BISHOP);
-        moves[nmoves++] = move_make_promote(from, to, KNIGHT);
-    }
-    /* pawn promotion: rank 7 captures left */
-    from_pawns = pos->bb[us][PAWN] & rel_rank7; // & ~rel_filea;
-    movebits = pawn_shift_upleft(from_pawns, us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_upleft(to, them);         /* reverse capture */
-        moves[nmoves++] = move_make_promote_capture(from, to, QUEEN);
-        moves[nmoves++] = move_make_promote_capture(from, to, ROOK);
-        moves[nmoves++] = move_make_promote_capture(from, to, BISHOP);
-        moves[nmoves++] = move_make_promote_capture(from, to, KNIGHT);
-    }
-    /* pawn: rank 7 captures right */
-    from_pawns = pos->bb[us][PAWN] & rel_rank7; // & ~rel_fileh;
-    movebits = pawn_shift_upright(from_pawns, us) & enemy_pieces;
-    bit_for_each64(to, tmp1, movebits) {
-        from = pawn_push_upright(to, them);         /* reverse capture */
-        moves[nmoves++] = move_make_promote_capture(from, to, QUEEN);
-        moves[nmoves++] = move_make_promote_capture(from, to, ROOK);
-        moves[nmoves++] = move_make_promote_capture(from, to, BISHOP);
-        moves[nmoves++] = move_make_promote_capture(from, to, KNIGHT);
-    }
-
-    /* castle - Attention ! Castling flags are assumed correct
-     */
-    if (!pos->checkers) {
+    if (pos->checkers) {
+        /* one checker: we limit destination squares to line between
+         * checker and king + checker square (think: knight).
+         */
+        square_t checker = ctz64(pos->checkers);
+        dest_squares &= bb_between[king][checker] | pos->checkers;
+        enemy_pieces &= dest_squares;
+    } else {
+        /* no checker: castling moves
+         * Attention ! Castling flags are assumed correct
+         */
        bitboard_t rel_rank1 = bb_rel_rank(RANK_1, us);
-        from = pos->king[us];
-        square_t from_square[2] = { E1, E8 };     /* verify king is on E1/E8 */
-        bug_on(can_castle(pos->castle, us) && from != from_square[us]);
+        //square_t from_square[2] = { E1, E8 };     /* verify king is on E1/E8 */
+        //bug_on(can_castle(pos->castle, us) && from != from_square[us]);
        /* For castle, we check the opponent attacks on squares between from and to.
         * To square attack check will be done in gen_is_legal.
         */
        if (can_oo(pos->castle, us)) {
            bitboard_t occmask = rel_rank1 & (FILE_Fbb | FILE_Gbb);
-            if (!(occ & occmask) &&
-                !sq_attackers(pos, occ, from+1, them)) { /* f1/f8 */
-                moves[nmoves++] = move_make_flags(from, from + 2, M_CASTLE_K);
+            if (!(occ & occmask)) {
+                *moves++ = move_make_flags(king, king + 2, M_CASTLE_K);
            }
        }
        if (can_ooo(pos->castle, us)) {
            bitboard_t occmask = rel_rank1 & (FILE_Bbb | FILE_Cbb | FILE_Dbb);
-            if (!(occ & occmask) &&
-                !sq_attackers(pos, occ, from-1, them)) { /* d1/d8 */
-                moves[nmoves++] = move_make_flags(from, from - 2, M_CASTLE_Q);
+            if (!(occ & occmask)) { // &&
+                *moves++ = move_make_flags(king, king - 2, M_CASTLE_Q);
            }
        }
    }
-    /* TODO
-     * DONE. pawn ranks 2-6 advance (1 push, + 2 squares for rank 2)
-     * DONE. pawns rank 7 advance + promotions
-     * DONE. pawns ranks 2-6 captures, left and right
-     * DONE. pawns en-passant (with capture)
-     * DONE. pawns rank 7 capture + promotion
-     * DONE. castle
-     *
-     * add function per piece, and type, for easier debug
-     *
+    /* 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);
+        }
+    }
+    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);
+        }
+    }
+
+    /* knight */
+    from_bb = pos->bb[us][KNIGHT];
+    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);
+        }
+    }
+
+    /* pawn: relative rank and files */
+    bitboard_t rel_rank8 = bb_rel_rank(RANK_8, us);
+    bitboard_t rel_rank3 = bb_rel_rank(RANK_3, us);
+
+    /* pawn: push */
+    int shift = sq_up(us);
+    tmp_bb = bb_shift(pos->bb[us][PAWN], shift) & empty;
+
+    to_bb = tmp_bb & ~rel_rank8 & dest_squares;   /* non promotion */
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        from = to - shift;
+        *moves++ = move_make(from, to);
+    }
+    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);
+    }
+
+    /* possible second push */
+    to_bb = bb_shift(tmp_bb & rel_rank3, shift) & empty & dest_squares;
+    while(to_bb) {
+        to = bb_next(&to_bb);
+        from = to - shift - shift;
+        *moves++ = move_make_flags(from, to, M_DPUSH);
+    }
+
+    /* 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);
+     *     }
+     * }
     */
-    return (pos->moves.nmoves = nmoves);
+
+    /* 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;
+
+    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);
+    }
+
+    /* 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);
+    }
+
+    /* pawn: en-passant
+     * TODO: special case when in-check here ?
+     */
+    if ((to = pos->en_passant) != SQUARE_NONE) {
+        from_bb = bb_pawn_attacks[them][to] & pos->bb[us][PAWN];
+        while (from_bb) {
+            from = bb_next(&from_bb);
+            *moves++ = move_make_enpassant(from, to);
+        }
+    }
+    /*
+     * 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;
 }
--- a/src/move-gen.h
+++ b/src/move-gen.h
@@ -22,8 +22,8 @@
 #include "move.h"

 bool pseudo_is_legal(const pos_t *pos, const move_t move);
-move_t pos_next_legal(const pos_t *pos, int *start);
-movelist_t *pos_all_legal(const pos_t *pos, movelist_t *dest);
-int pos_gen_pseudomoves(pos_t *pos);
+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);

 #endif  /* MOVEGEN_H */
--- a/src/move.c
+++ b/src/move.c
@@ -1,6 +1,6 @@
 /* move.c - move management.
 *
- * Copyright (C) 2021 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
 * Some rights reserved. See COPYING.
 *
--- a/src/move.h
+++ b/src/move.h
@@ -1,6 +1,6 @@
 /* move.h - move management.
 *
- * Copyright (C) 2021 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
 * Some rights reserved. See COPYING.
 *
@@ -35,8 +35,8 @@
 typedef s32 move_t;

 /* special move_t values */
-#define MOVE_NONE (-1)
-#define MOVE_NULL (0)                             /* hack: from = to = A1 */
+#define MOVE_NONE ((move_t) -1)
+#define MOVE_NULL ((move_t) 0)                    /* hack: from = to = A1 */

 enum {
    M_OFF_FROM     = 0,
--- a/src/position.c
+++ b/src/position.c
@@ -24,6 +24,7 @@
 #include "chessdefs.h"
 #include "position.h"
 #include "bitboard.h"
+#include "hyperbola-quintessence.h"
 #include "fen.h"
 #include "piece.h"
 #include "util.h"
@@ -89,7 +90,7 @@ pos_t *pos_clear(pos_t *pos)
    pos->castle = 0;
    pos->clock_50 = 0;
    pos->plycount = 0;
-    pos->captured = NO_PIECE;
+    //pos->captured = NO_PIECE;

    for (square_t sq = A1; sq <= H8; ++sq)
        pos->board[sq] = EMPTY;
@@ -105,8 +106,7 @@ pos_t *pos_clear(pos_t *pos)
    pos->pinners = 0;
    pos->blockers = 0;

-    //pos->moves.curmove = 0;
-    pos->moves.nmoves = 0;
+    //pos->moves.nmoves = 0;
    return pos;
 }

@@ -116,7 +116,7 @@ pos_t *pos_clear(pos_t *pos)
 *
 * @return: true if equal, false otherwise.
 */
-bool pos_cmp(const pos_t *pos1, const pos_t *pos2)
+bool pos_cmp(__unused const pos_t *pos1, __unused const pos_t *pos2)
 {
 #define _cmpf(a) (pos1->a != pos2->a)
    bool ret = false;
@@ -134,8 +134,8 @@ bool pos_cmp(const pos_t *pos1, const pos_t *pos2)
        goto end;
    if (warn_on(_cmpf(plycount)))
        goto end;
-    if (warn_on(_cmpf(captured)))
-        goto end;
+    //if (warn_on(_cmpf(captured)))
+    //    goto end;

    for (square_t sq = A1; sq <= H8; ++sq)
        if (warn_on(_cmpf(board[sq])))
@@ -157,11 +157,13 @@ bool pos_cmp(const pos_t *pos1, const pos_t *pos2)
    if (warn_on(_cmpf(blockers)))
        goto end;

-    if (warn_on(_cmpf(moves.nmoves)))
-        goto end;
-    for (int i = 0; i < pos1->moves.nmoves; ++i)
-        if (warn_on(_cmpf(moves.move[i])))
-            goto end;
+    /*
+     * if (warn_on(_cmpf(moves.nmoves)))
+     *     goto end;
+     * for (int i = 0; i < pos1->moves.nmoves; ++i)
+     *     if (warn_on(_cmpf(moves.move[i])))
+     *         goto end;
+     */

    ret = true;
 end:
@@ -185,6 +187,102 @@ bitboard_t pos_checkers(const pos_t *pos, const color_t color)
    return sq_attackers(pos, occ, pos->king[color], OPPONENT(color));
 }

+/**
+ * pos_set_checkers_pinners_blockers() - calculate checkers, pinners and blockers.
+ * @pos:   &position
+ *
+ * Set position checkers, pinners and blockers on player-to-play king.
+ * It should be faster than @pos_checkers + @pos_set_pinners_blockers, as
+ * some calculation will be done once.
+ */
+void pos_set_checkers_pinners_blockers(pos_t *pos)
+{
+    int us = pos->turn, them = OPPONENT(us);
+    bitboard_t occ = pos_occ(pos);
+    bitboard_t attackers;
+    bitboard_t checkers = 0, blockers = 0, pinners = 0;
+    bitboard_t targets, tmpcheckers, maybeblockers, tmppinners;
+    square_t king = pos->king[us];
+    int pinner;
+
+    /* bishop type - we attack with a bishop from king position */
+    attackers = pos->bb[them][BISHOP] | pos->bb[them][QUEEN];
+
+    /* targets is all "target" pieces if K was a bishop */
+    targets = hyperbola_bishop_moves(occ, king) & occ;
+
+    /* checkers = only opponent B/Q */
+    tmpcheckers = targets & attackers;
+    checkers |= tmpcheckers;
+
+    /* maybe blockers = we remove checkers, to look "behind" */
+    maybeblockers = targets & ~tmpcheckers;
+
+    /* we find second targets, by removing first ones (excl. checkers) */
+    if (maybeblockers) {
+        targets = hyperbola_bishop_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
+
+        /* pinners = only B/Q */
+        tmppinners = targets & attackers;
+
+        /* blockers = we find occupied squares between pinner and king */
+        while (tmppinners) {
+            pinner = bb_next(&tmppinners);
+            pinners |= mask(pinner);
+            blockers |= bb_between[pinner][king] & maybeblockers;
+        }
+    }
+
+    /* same for rook type */
+    attackers = pos->bb[them][ROOK] | pos->bb[them][QUEEN];
+    targets = hyperbola_rook_moves(occ, king) & occ;
+
+    tmpcheckers = targets & attackers;
+    checkers |= tmpcheckers;
+
+    maybeblockers = targets & ~tmpcheckers;
+    if (maybeblockers) {
+        targets = hyperbola_rook_moves(occ ^ maybeblockers, king) ^ tmpcheckers;
+        tmppinners = targets & attackers;
+        while (tmppinners) {
+            pinner = bb_next(&tmppinners);
+            pinners |= mask(pinner);
+            blockers |= bb_between[pinner][king] & maybeblockers;
+        }
+    }
+
+    /* pawns & knights */
+    checkers |= bb_pawn_attacks[us][king] & pos->bb[them][PAWN];
+    checkers |= bb_knight[king] & pos->bb[them][KNIGHT];
+
+    pos->checkers = checkers;
+    pos->pinners = pinners;
+    pos->blockers = blockers;
+}
+
+/**
+ * pos_set_pinners_blockers() - set position pinners and blockers.
+ * @pos:   &position
+ *
+ * set position pinners and blockers on player-to-play king.
+ */
+void pos_set_pinners_blockers(pos_t *pos)
+{
+    color_t color = pos->turn;
+    square_t king = pos->king[color];
+    bitboard_t tmp, occ = pos_occ(pos), blockers = 0;
+    int pinner;
+
+    pos->pinners = sq_pinners(pos, king, OPPONENT(pos->turn));
+    bit_for_each64(pinner, tmp, pos->pinners) {
+        //bitboard_t blocker =
+        // warn_on(popcount64(blocker) != 1);
+        blockers |= bb_between_excl[pinner][king] & occ;
+    }
+    pos->blockers = blockers;
+    return;
+}
+
 /**
 * pos_king_pinners() - get the "pinners" on a king "pinners".
 * @pos:   &position
@@ -217,19 +315,18 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
    square_t pinner, king = pos->king[color];

    bit_for_each64(pinner, tmp, pinners) {
-        bitboard_t blocker = bb_between_excl[pinner][king] & occ;
-        warn_on(popcount64(blocker) != 1);
-        if (popcount64(blocker) != 1) {
-            printf("n blockers = %d\n", popcount64(blocker));
-            bb_print("blockers", blocker);
-        }
-        blockers |= blocker;
+        //warn_on(popcount64(blocker) != 1);
+        //if (popcount64(blocker) != 1) {
+        //    printf("n blockers = %d\n", popcount64(blocker));
+        //    bb_print("blockers", blocker);
+        //}
+        blockers |= bb_between_excl[pinner][king] & occ;
    }
    return blockers;
 }

 /**
- * pos_check() - extensive position consistency check.
+ * pos_ok() - extensive position consistency check.
 * @pos:    &position
 * @strict: if true, call bug_on() on any error.
 *
@@ -254,12 +351,12 @@ bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboa
 * TODO: add more checks:
 * - kings attacking each other
 *
- * @Return: Number of detected error (only if @strict is false).
+ * @return: (if @strict is false) return true if check is ok, false otherwise.
 */
-int pos_check(const pos_t *pos, const bool strict)
+bool pos_ok(__unused const pos_t *pos, __unused const bool strict)
 {
    int n, count = 0, bbcount = 0, error = 0;
-    bitboard_t tmp;
+    __unused bitboard_t tmp;

    /* pawns on 1st ot 8th rank */
    tmp = (pos->bb[WHITE][PAWN] | pos->bb[BLACK][PAWN]) & (RANK_1bb | RANK_8bb);
@@ -281,7 +378,7 @@ int pos_check(const pos_t *pos, const bool strict)
    }
    for (square_t sq = 0; sq < 64; ++sq) {
        piece_t piece = pos->board[sq];
-        bitboard_t match;
+        __unused bitboard_t match;
        if (piece == EMPTY)
            continue;
        color_t c = COLOR(piece);
@@ -300,7 +397,7 @@ int pos_check(const pos_t *pos, const bool strict)
    error += warn_on(sq_dist(pos->king[WHITE], pos->king[BLACK]) < 2);

    bug_on(strict && error);
-    return error;
+    return error? false: true;
 }

 /**
@@ -332,7 +429,7 @@ void pos_print_mask(const pos_t *pos, const bitboard_t mask)
 }

 /**
- * pos_print_board_raw - print simple position board (octal/FEN symbol values)
+ * pos_print_raw - print simple position board (octal/FEN symbol values)
 * @bb: the bitboard
 * @type: int, 0 for octal, 1 for fen symbol
 */
--- a/src/position.h
+++ b/src/position.h
@@ -30,7 +30,8 @@ typedef struct __pos_s {
    u64 node_count;                               /* evaluated nodes */
    int turn;                                     /* WHITE or BLACK */

-    /* data which cannot be recovered by move_undo
+    /* 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"
     * structure name.
     * For example, pos->en_passant and pos->state.en_passant are the same.
@@ -42,17 +43,16 @@ typedef struct __pos_s {
                        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 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 */
-    bitboard_t checkers;                          /* opponent checkers */
-    bitboard_t pinners;                           /* opponent pinners */
-    bitboard_t blockers;                          /* pieces blocking pin */
-    movelist_t moves;
+    //movelist_t moves;
 } pos_t;

 typedef struct state_s state_t;
@@ -159,14 +159,13 @@ void pos_del(pos_t *pos);
 pos_t *pos_clear(pos_t *pos);
 bool pos_cmp(const pos_t *pos1, const pos_t *pos2);

+void pos_set_checkers_pinners_blockers(pos_t *pos);
+void pos_set_pinners_blockers(pos_t *pos);
 bitboard_t pos_checkers(const pos_t *pos, const color_t color);
 bitboard_t pos_king_pinners(const pos_t *pos, const color_t color);
 bitboard_t pos_king_blockers(const pos_t *pos, const color_t color, const bitboard_t );
-//bitboard_t set_king_pinners_blockers(pos_t *pos);
-//char *pos_checkers2str(const pos_t *pos, char *str);
-//char *pos_pinners2str(const pos_t *pos, char *str);

-int pos_check(const pos_t *pos, const bool strict);
+bool pos_ok(const 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);
--- a/src/search.c
+++ b/src/search.c
@@ -1,6 +1,6 @@
-/* search.c - search good moves.
+/* search.c - perft + search.
 *
- * Copyright (C) 2023 Bruno Raoult ("br")
+ * Copyright (C) 2023-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
 * Some rights reserved. See COPYING.
 *
@@ -11,14 +11,111 @@
 *
 */

+#include <stdio.h>

-#include <br.h>
-#include <list.h>
-#include "debug.h"
+#include <brlib.h>

-#include "move.h"
-#include "eval.h"
+#include "position.h"
+#include "move-gen.h"
+#include "move-do.h"
 #include "search.h"
+#include "attack.h"
+
+/**
+ * perft() - Perform perft on position
+ * @pos:   &position to search
+ * @depth: Wanted depth.
+ * @ply:   perft depth level.
+ *
+ * Run perft on a position. This function displays the available moves at @depth
+ * level for each possible first move, and the total of moves.
+ *
+ * This version uses the algorithm:
+ *    if last depth
+ *      return 1;
+ *    gen pseudo-legal moves
+ *    loop for each 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)
+{
+    int subnodes, movetmp = 0;
+    u64 nodes = 0;
+    movelist_t pseudo;
+    move_t move;
+    state_t state;
+
+    if (depth == 0)
+        return 1;
+    pseudo.nmoves = 0;
+    pos->checkers = pos_checkers(pos, pos->turn);
+    pos_set_pinners_blockers(pos);
+    state = pos->state;
+
+    pos_gen_pseudomoves(pos, &pseudo);
+    while ((move =  pos_next_legal(pos, &pseudo, &movetmp)) != MOVE_NONE) {
+        move_do(pos, move);
+        subnodes = perft(pos, depth - 1, ply + 1);
+        if (ply == 1) {
+            char movestr[8];
+            printf("%s: %d\n", move_str(movestr, move, 0), subnodes);
+        }
+        nodes += subnodes;
+        move_undo(pos, move);
+        pos->state = state;
+    }
+
+    if (ply == 1)
+        printf("Total: %lu\n", nodes);
+    return nodes;
+}
+
+/**
+ * perft_new_pinners() - Perform perft on position
+ * @pos:   &position to search
+ * @depth: Wanted depth.
+ * @ply:   perft depth level.
+ *
+ * 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)
+{
+    int subnodes, movetmp = 0;
+    u64 nodes = 0;
+    movelist_t pseudo;
+    move_t move;
+    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);
+        }
+        nodes += subnodes;
+        move_undo(pos, move);
+        pos->state = state;
+    }
+
+    if (ply == 1)
+        printf("Total: %lu\n", nodes);
+    return nodes;
+}

 /**
 * negamax() - search position negamax.
@@ -31,32 +128,34 @@
 *
 * @return: The @pos negamax evaluation.
 */
-eval_t negamax(pos_t *pos, int depth, int color)
-{
-    move_t *move;
-    pos_t *newpos;
-    eval_t best = EVAL_MIN, score;
-
-    pos->node_count++;
-    if (depth == 0) {
-        moves_gen_all_nomoves(pos);
-        score = eval(pos) * color;
-        return score;
-    }
-    moves_gen_all(pos);
-    list_for_each_entry(move, &pos->moves[pos->turn], list) {
-        newpos = move_do(pos, move);
-        score = -negamax(newpos, depth - 1, -color);
-        pos->node_count += newpos->node_count;
-        move->negamax = score;
-        if (score > best) {
-            best = score;
-            pos->bestmove = move;
-        }
-        move_undo(newpos, move);
-    }
-    return best;
-}
+/*
+ * eval_t negamax(pos_t *pos, int depth, int color)
+ * {
+ *     move_t *move;
+ *     pos_t *newpos;
+ *     eval_t best = EVAL_MIN, score;
+ *
+ *     pos->node_count++;
+ *     if (depth == 0) {
+ *         moves_gen_all_nomoves(pos);
+ *         score = eval(pos) * color;
+ *         return score;
+ *     }
+ *     moves_gen_all(pos);
+ *     list_for_each_entry(move, &pos->moves[pos->turn], list) {
+ *         newpos = move_do(pos, move);
+ *         score = -negamax(newpos, depth - 1, -color);
+ *         pos->node_count += newpos->node_count;
+ *         move->negamax = score;
+ *         if (score > best) {
+ *             best = score;
+ *             pos->bestmove = move;
+ *         }
+ *         move_undo(newpos, move);
+ *     }
+ *     return best;
+ * }
+ */


 /**
@@ -74,74 +173,76 @@ eval_t negamax(pos_t *pos, int depth, int color)
 *
 * @return: The @pos PVS evaluation.
 */
-eval_t pvs(pos_t *pos, int depth, int alpha, int beta, int color)
-{
-    move_t *move;
-    pos_t *newpos;
-    eval_t score = EVAL_INVALID;
-    bool firstchild = true;
-
-    pos->node_count++;
-
-    if (depth == 0) {
-        //return quiesce(p, alpha, beta);           /* leaf node */
-        moves_gen_all_nomoves(pos);
-        score = eval(pos) * color;
-        log_f(2, "Terminal: depth=%d ", depth);
-        log_f(2, "score=%d alpha=%d beta=%d\n", score, alpha, beta);
-        return score;
-    }
-
-    moves_gen_all(pos);
-    //moves_print(pos, M_PR_EVAL);
-    /* do the full search for first child */
-    //move = list_first_entry_or_null(&pos->moves[pos->turn], move_t, list);
-
-    list_for_each_entry(move, &pos->moves[pos->turn], list) {
-        newpos = move_do(pos, move);
-        log(2, "%.*s", 5 - depth, "                ");
-        if (firstchild) {                               /* first child */
-            score = -pvs(newpos, depth - 1, -beta, -alpha, -color);
-            log_f(2, "First child depth=%d move=", depth);
-            //move_print(0, move, 0);
-            log(2, "score=%d alpha=%d beta=%d\n", score, alpha, beta);
-            pos->bestmove = move;
-        } else {
-            /* search with a null window */
-            score = -pvs(newpos, depth - 1, -alpha - 1, -alpha, -color);
-            log_f(2, "Other child depth=%d move=", depth);
-            //move_print(0, move, 0);
-            log_f(2, "score=%d alpha=%d beta=%d ", score, alpha, beta);
-            /* for fail-soft:  if (score > alpha && score < beta) */
-            if (score > alpha) {
-                /* if failed high, do a full re-search */
-                log_f(2, "doing full search.");
-                score = -pvs(newpos, depth - 1, -beta, -alpha, -color);
-            }
-            log(2, "\n");
-        }
-        pos->node_count += newpos->node_count;
-        move_undo(newpos, move);
-        if (score >= beta) {                      /* fail-hard hard beta cut-off */
-            log(2, "%.*s", 5 - depth, "                ");
-            log_f(2, "depth=%d score=%d alpha=%d beta=%d beta cut-off.\n",
-                  depth, score, alpha, beta);
-            return beta;
-        }
-        if (score > alpha) {
-            log(2, "%.*s", 5 - depth, "                ");
-            log_f(2, "depth=%d setting new alpha from %d to %d\n",
-                  depth, alpha, score);
-            alpha = score;
-            pos->bestmove = move;
-        }
-        move->pos = NULL;
-        move->negamax = score;
-        firstchild = false;
-    }
-
-    return alpha;
-}
+/*
+ * eval_t pvs(pos_t *pos, int depth, int alpha, int beta, int color)
+ * {
+ *     move_t *move;
+ *     pos_t *newpos;
+ *     eval_t score = EVAL_INVALID;
+ *     bool firstchild = true;
+ *
+ *     pos->node_count++;
+ *
+ *     if (depth == 0) {
+ *         //return quiesce(p, alpha, beta);           /\* leaf node *\/
+ *         moves_gen_all_nomoves(pos);
+ *         score = eval(pos) * color;
+ *         log_f(2, "Terminal: depth=%d ", depth);
+ *         log_f(2, "score=%d alpha=%d beta=%d\n", score, alpha, beta);
+ *         return score;
+ *     }
+ *
+ *     moves_gen_all(pos);
+ *     //moves_print(pos, M_PR_EVAL);
+ *     /\* do the full search for first child *\/
+ *     //move = list_first_entry_or_null(&pos->moves[pos->turn], move_t, list);
+ *
+ *     list_for_each_entry(move, &pos->moves[pos->turn], list) {
+ *         newpos = move_do(pos, move);
+ *         log(2, "%.*s", 5 - depth, "                ");
+ *         if (firstchild) {                               /\* first child *\/
+ *             score = -pvs(newpos, depth - 1, -beta, -alpha, -color);
+ *             log_f(2, "First child depth=%d move=", depth);
+ *             //move_print(0, move, 0);
+ *             log(2, "score=%d alpha=%d beta=%d\n", score, alpha, beta);
+ *             pos->bestmove = move;
+ *         } else {
+ *             /\* search with a null window *\/
+ *             score = -pvs(newpos, depth - 1, -alpha - 1, -alpha, -color);
+ *             log_f(2, "Other child depth=%d move=", depth);
+ *             //move_print(0, move, 0);
+ *             log_f(2, "score=%d alpha=%d beta=%d ", score, alpha, beta);
+ *             /\* for fail-soft:  if (score > alpha && score < beta) *\/
+ *             if (score > alpha) {
+ *                 /\* if failed high, do a full re-search *\/
+ *                 log_f(2, "doing full search.");
+ *                 score = -pvs(newpos, depth - 1, -beta, -alpha, -color);
+ *             }
+ *             log(2, "\n");
+ *         }
+ *         pos->node_count += newpos->node_count;
+ *         move_undo(newpos, move);
+ *         if (score >= beta) {                      /\* fail-hard hard beta cut-off *\/
+ *             log(2, "%.*s", 5 - depth, "                ");
+ *             log_f(2, "depth=%d score=%d alpha=%d beta=%d beta cut-off.\n",
+ *                   depth, score, alpha, beta);
+ *             return beta;
+ *         }
+ *         if (score > alpha) {
+ *             log(2, "%.*s", 5 - depth, "                ");
+ *             log_f(2, "depth=%d setting new alpha from %d to %d\n",
+ *                   depth, alpha, score);
+ *             alpha = score;
+ *             pos->bestmove = move;
+ *         }
+ *         move->pos = NULL;
+ *         move->negamax = score;
+ *         firstchild = false;
+ *     }
+ *
+ *     return alpha;
+ * }
+ */

 /*
 * int negascout (pos_t *pos, int depth, int alpha, int beta )
--- a/src/search.h
+++ b/src/search.h
@@ -1,6 +1,6 @@
 /* search.h - search for perfect move.
 *
- * Copyright (C) 2021 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
 * Licensed under the GNU General Public License v3.0 or later.
 * Some rights reserved. See COPYING.
 *
@@ -16,7 +16,11 @@

 #include "position.h"

-eval_t negamax(pos_t *pos, int depth, int color);
-eval_t pvs(pos_t *pos, int depth, int alpha, int beta, int color);
+//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);

 #endif  /* SEARCH_H */
--- a/test/attack-test.c
+++ b/test/attack-test.c
@@ -28,6 +28,7 @@ int main(int __unused ac, __unused char**av)
    int i = 0;
    char *fen;
    pos_t *pos;//, *fishpos = pos_new();
+    bitboard_t checkers, pinners, blockers;

    setlinebuf(stdout);                           /* line-buffered stdout */

@@ -41,8 +42,22 @@ int main(int __unused ac, __unused char**av)
            printf("wrong fen %d: [%s]\n", i, fen);
            continue;
        }
+        pos->checkers = pos_checkers(pos, pos->turn);
+        pos_set_pinners_blockers(pos);
+
        pos_print(pos);

+        checkers = pos->checkers;
+        pinners = pos->pinners;
+        blockers = pos->blockers;
+
+        pos_set_checkers_pinners_blockers(pos);
+
+        printf("******* %s\n", cur_comment());
+        bb_print_multi("checkers", 2, checkers, pos->checkers);
+        bb_print_multi("pinners", 2, pinners, pos->pinners);
+        bb_print_multi("blockers", 2, blockers, pos->blockers);
+
        pos_del(pos);
        i++;
    }
--- a/test/bitboard-test.c
+++ b/test/bitboard-test.c
@@ -46,16 +46,24 @@ int main(int __unused ac, __unused char**av)
    sprintf(str, "between: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
            "c3-c6", "c3-f6", "c3-f3", "c3-e1", "c3-c1", "c3-a1", "c3-a3", "c3-a5");
    bb_print_multi(str, 8,
-                         bb_between[C3][C6], bb_between[C3][F6],
-                         bb_between[C3][F3], bb_between[C3][E1],
-                         bb_between[C3][C1], bb_between[C3][A1],
-                         bb_between[C3][A3], bb_between[C3][A5]);
+                   bb_between[C3][C6], bb_between[C3][F6],
+                   bb_between[C3][F3], bb_between[C3][E1],
+                   bb_between[C3][C1], bb_between[C3][A1],
+                   bb_between[C3][A3], bb_between[C3][A5]);
    sprintf(str, "between: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
            "c4-c6", "c4-f6", "c4-f3", "c4-e1", "c4-c1", "c4-a1", "c4-a3", "c4-a5");
    bb_print_multi(str, 8,
-                         bb_between[C4][C6], bb_between[C4][F6],
-                         bb_between[C4][F3], bb_between[C4][E1],
-                         bb_between[C4][C1], bb_between[C4][A1],
-                         bb_between[C4][A3], bb_between[C4][A5]);
+                   bb_between[C4][C6], bb_between[C4][F6],
+                   bb_between[C4][F3], bb_between[C4][E1],
+                   bb_between[C4][C1], bb_between[C4][A1],
+                   bb_between[C4][A3], bb_between[C4][A5]);
+    sprintf(str, "Pwn att: %-22s%-22s%-22s%-22s%-22s%-22s%-22s%-22s",
+            "White a2", "Black a2", "White h7", "Black h7",
+            "White c3", "Black c3", "White e5", "Black e5");
+    bb_print_multi(str, 8,
+                   bb_pawn_attacks[WHITE][A2], bb_pawn_attacks[BLACK][A2],
+                   bb_pawn_attacks[WHITE][H7], bb_pawn_attacks[BLACK][H7],
+                   bb_pawn_attacks[WHITE][C3], bb_pawn_attacks[BLACK][C3],
+                   bb_pawn_attacks[WHITE][E5], bb_pawn_attacks[BLACK][E5]);
    return 0;
 }
--- a/test/common-test.h
+++ b/test/common-test.h
@@ -20,160 +20,195 @@
 #define MOVEGEN     4
 #define ATTACK      8
 #define MOVEDO     16
+#define PERFT      32

 struct fentest {
+    int line;
    uint modules;
    char *comment;
    char *fen;
 } fentest[] = {
    /*
-    { ATTACK,
+    { __LINE__.
+      ATTACK,
      "checkers: ",
      ""
    },
     */
-    /* tests rank movegen bug - FIXED
-     */
-    //"4k3/pppppppp/8/8/8/8/PPPPPPPP/2BRK3 w - - 0 1",
-    //"4k3/pppppppp/8/8/8/8/PPPPPPPP/1B1R1K2 w - - 0 1",
-    { MOVEGEN,
-      "illegal white e.p.",
-      "3k4/8/8/2qpPK2/8/8/8/8 w - d6 0 1",
-    },
-    { MOVEGEN,
-      "illegal black e.p.",
-      "8/8/8/8/2QPpk2/8/8/3K4 b - d3 0 1",
-    },

-    { MOVEGEN,
+/* ***************** TEMP TESTS ABOVE ************************** */
+
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "illegal white e.p.",
      "3k4/8/5K2/3pP3/8/2b5/8/8 w - d6 0 1",
    },
-    { MOVEGEN,
+    { __LINE__, PERFT,
+      "only K, pawn push and ep moves",
+      "3k4/8/8/3pPK2/8/8/8/8 w - d6 0 1"
+    },
+
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "illegal white e.p.",
+      "3k4/8/8/2qpPK2/8/8/8/8 w - d6 0 1",
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "illegal black e.p.",
+      "8/8/8/8/2QPpk2/8/8/3K4 b - d3 0 1",
+    },
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "illegal black e.p.",
      "8/8/2B5/8/3Pp3/5k2/8/3K4 b - d3 0 1",
    },

-    { MOVEGEN,
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "legal white e.p.",
      "1K1k4/8/8/3pP3/8/6b1/8/8 w - d6 0 1",
    },
-    { MOVEGEN,
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "legal black e.p.",
      "8/8/6B1/8/3Pp3/8/8/1k1K4 b - d3 0 1",
    },
-
-    { MOVEGEN,
-      "white mate.",
-      "1nbqkbn1/ppp1pppp/8/r1rpP1K1/8/8/PPPP1PPP/RNBQ1BNR w - d6 0 1",
-    },
-    { MOVEGEN,
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "illegal e.p.",
      "1nbqkbn1/ppp1pppp/8/r1rpP1K1/8/8/PPPP1PPP/RNBQ1BNR w - d6 0 1",
    },
-    { ATTACK,
-      "checkers: a1 h1",
-      "1k6/8/8/8/8/8/8/r2K3r w - - 1 1"
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
+      "illegal e.p. bug perft at depth 4",
+      "1nbqkbn1/ppp2ppp/4p3/r1rpP3/6K1/P7/1PPP1PPP/RNBQ1BNR b - - 1 2"
    },
-    { ATTACK,
+    /*
+     * { __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"
+    },
+    { __LINE__, ATTACK,
      "checkers: a8 h8",
-      "R2k3R/8/8/8/8/8/8/1K6 b - - 1 1"
+      "R2k3R/8/8/8/8/8/8/1K6 b - - 0 1"
    },
-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: b3 g3",
-      "1k6/8/8/8/8/1r1K2r1/8/8 w - - 1 1"
+      "1k6/8/8/8/8/1r1K2r1/8/8 w - - 0 1"
    },

-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: b6 g6",
-      "8/8/1R1k2R1/8/8/8/8/1K6 b - - 1 1"
+      "8/8/1R1k2R1/8/8/8/8/1K6 b - - 0 1"
    },

-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: g2 g7",
-      "8/k5r1/8/8/6K1/8/6r1/8 w - - 1 1"
+      "8/k5r1/8/8/6K1/8/6r1/8 w - - 0 1"
    },
-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: g2 g7",
-      "8/6R1/8/6k1/8/8/K5R1/8 b - - 1 1"
+      "8/6R1/8/6k1/8/8/K5R1/8 b - - 0 1"
    },
-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: d5 e3, pinners: none (2 pieces between attacker & K)",
-      "3k4/8/8/3r3b/b7/1N2nn2/2n1B3/rNBK1Rbr w - - 1 1"
+      "3k4/8/8/3r3b/b7/1N2nn2/2n1B3/rNBK1Rbr w - - 0 1"
    },

-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: d4 e6 pinners: h4 a5 a8 h8",
-      "Rn1k1r1R/4b3/1n2N3/B7/3R3B/8/8/3K4 b - - 1 1"
+      "Rn1k1r1R/4b3/1n2N3/B7/3R3B/8/8/3K4 b - - 0 1"
    },
-    { ATTACK,
+    { __LINE__, ATTACK,
      "checkers: d5 e3, pinners: a1 h1 a4 h5",
-      "3k4/8/8/3r3b/b7/1N2n3/4B3/rN1K1R1r w - - 1 0"
+      "3k4/8/8/3r3b/b7/1N2n3/4B3/rN1K1R1r w - - 0 1"
    },

-    { MOVEGEN,
+    { __LINE__, MOVEGEN | MOVEDO | PERFT,
      "only pawn captures",
      "4k3/8/2p1p3/2PpP3/8/pp4pp/PP4PP/4K3 w - d6 0 1"
    },

-    { FEN | ATTACK,
+    { __LINE__, FEN | ATTACK,
      "checker: h4",
      "4k3/8/8/8/7b/8/8/4K3 w - - 0 1"
    },
 // First game moves
-    { FEN | MOVEGEN,
-      "initial pos",
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "startpos",
      "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    //{ __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",
      "rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "1.Nh3",
      "rnbqkbnr/pppppppp/8/8/8/7N/PPPPPPPP/RNBQKB1R b KQkq - 1 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "1.e4 e5 2.Nf3 Nc6",
      "r1bqkbnr/pp1ppppp/2n5/2p5/4P3/5N2/PPPP1PPP/RNBQKB1R w KQkq - 0 1"
    },

    // castling test
    // both can castle queen only
-    { FEN | MOVEGEN,
-      "",
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "no Q castling",
      "r3k2r/8/3B4/8/8/3b4/8/R3K2R w KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
-      "",
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "no castling, 2 mates in 1",
      "r3k2r/8/3BB3/8/8/3bb3/8/R3K2R w KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r2bkb1r/8/8/8/8/3bb3/8/R2BKB1R w KQkq - 0 1"
    },
    //
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "4 castle possible, only K+R",
      "r3k2r/8/8/8/8/8/8/R3K2R w KQkq - 0 1"
    },
    //
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "only kings on A1/A8, white to play",
      "k7/8/8/8/8/8/8/K7 w - - 0 1"
    },
    //
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "only one move possible (Pf2xBg3)",
      "k7/8/8/1p1p4/pPpPp3/P1PpPpb1/NBNP1P2/KBB1B3 w - - 0 1"
    },
    //
-    { FEN | MOVEGEN,
+    { __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"
    },
    //
-    { FEN | MOVEGEN,
+    { __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"
    },
@@ -181,20 +216,20 @@ struct fentest {
    // white is a pawn down
    // white has 36 moves: P=11 + 1 e.p. N=6+3 B=5+5 R=1 Q=3 K=1 + 1 e.p.
    // black has 33 moves: P=11 N=2+7 B=5 R=3 Q=3 K=1 + castle
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "rnbqk2r/pp1pbpp1/7p/2pPp3/4n3/3B1N2/PPP2PPP/RNBQ1RK1 w kq c6 0 7"
    },

-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "4k3/4p3/8/b7/1BR1p2p/1Q3P2/5N2/4K3 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1bq1rk1/pppp1ppp/2n2n2/4p3/2B1P3/3PPN2/PPP3PP/RN1QK2R b KQ - 1 7"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "6k1/6pp/R2p4/p1p5/8/1P1r3P/6P1/6K1 b - - 3 3"
    },
@@ -202,197 +237,198 @@ struct fentest {
    // some of tests below are from:
    // - Rodent IV
    // - https://www.chessprogramming.net/perfect-perft/
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r3k2r/p1ppqpb1/bn2pnp1/3PN3/1p2P3/2N2Q1p/PPPBBPPP/R3K2R w KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "8/2p5/3p4/Kp5r/1R3p1k/8/4P1P1/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "4rrk1/pp1n3p/3q2pQ/2p1pb2/2PP4/2P3N1/P2B2PP/4RRK1 b - - 7 19"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "rq3rk1/ppp2ppp/1bnpb3/3N2B1/3NP3/7P/PPPQ1PP1/2KR3R w - - 7 14"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1bq1r1k/1pp1n1pp/1p1p4/4p2Q/4Pp2/1BNP4/PPP2PPP/3R1RK1 w - - 2 14"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r3r1k1/2p2ppp/p1p1bn2/8/1q2P3/2NPQN2/PPP3PP/R4RK1 b - - 2 15"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "1rbqk1nr/p3ppbp/2np2p1/2p5/1p2PP2/3PB1P1/PPPQ2BP/R2NK1NR b KQk - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1bqk2r/pp1p1ppp/2n1pn2/2p5/1bPP4/2NBP3/PP2NPPP/R1BQK2R b KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "rnb1kb1r/ppp2ppp/1q2p3/4P3/2P1Q3/5N2/PP1P1PPP/R1B1KB1R b KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1b2rk1/pp2nppp/1b2p3/3p4/3N1P2/2P2NP1/PP3PBP/R3R1K1 b - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "n1q1r1k1/3b3n/p2p1bp1/P1pPp2p/2P1P3/2NBB2P/3Q1PK1/1R4N1 b - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1bq1r1k/b1p1npp1/p2p3p/1p6/3PP3/1B2NN2/PP3PPP/R2Q1RK1 w - - 1 16"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "3r1rk1/p5pp/bpp1pp2/8/q1PP1P2/b3P3/P2NQRPP/1R2B1K1 b - - 6 22"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r1q2rk1/2p1bppp/2Pp4/p6b/Q1PNp3/4B3/PP1R1PPP/2K4R w - - 2 18"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "4k2r/1pb2ppp/1p2p3/1R1p4/3P4/2r1PN2/P4PPP/1R4K1 b - - 3 22"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "3q2k1/pb3p1p/4pbp1/2r5/PpN2N2/1P2P2P/5PP1/Q2R2K1 b - - 4 26"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "2r5/8/1n6/1P1p1pkp/p2P4/R1P1PKP1/8/1R6 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r2q1rk1/1b1nbppp/4p3/3pP3/p1pP4/PpP2N1P/1P3PP1/R1BQRNK1 b - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "6k1/5pp1/7p/p1p2n1P/P4N2/6P1/1P3P1K/8 w - - 0 35"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r4rk1/1pp1q1pp/p2p4/3Pn3/1PP1Pp2/P7/3QB1PP/2R2RK1 b - - 0 1"
    },

-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "r3k2r/Pppp1ppp/1b3nbN/nP6/BBP1P3/q4N2/Pp1P2PP/R2Q1RK1 w kq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "",
      "1k6/1b6/8/8/7R/8/8/4K2R b K - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Illegal ep move #1",
      "3k4/3p4/8/K1P4r/8/8/8/8 b - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Illegal ep move #2",
      "8/8/4k3/8/2p5/8/B2P2K1/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "EP Capture Checks Opponent",
      "8/8/1k6/2b5/2pP4/8/5K2/8 b - d3 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Short Castling Gives Check",
      "5k2/8/8/8/8/8/8/4K2R w K - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Long Castling Gives Check",
      "3k4/8/8/8/8/8/8/R3K3 w Q - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Castle Rights",
      "r3k2r/1b4bq/8/8/8/8/7B/R3K2R w KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Castling Prevented",
      "r3k2r/8/3Q4/8/8/5q2/8/R3K2R b KQkq - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Promote out of Check",
      "2K2r2/4P3/8/8/8/8/8/3k4 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Discovered Check",
      "8/8/1P2K3/8/2n5/1q6/8/5k2 b - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Promote to give check",
      "4k3/1P6/8/8/8/8/K7/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Under Promote to give check",
      "8/P1k5/K7/8/8/8/8/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Self Stalemate",
      "K1k5/8/P7/8/8/8/8/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Stalemate & Checkmate",
      "8/k1P5/8/1K6/8/8/8/8 w - - 0 1"
    },
-    { FEN | MOVEGEN,
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
      "Stalemate & Checkmate",
      "8/8/2k5/5q2/5n2/8/5K2/8 b - - 0 1"
    },
-
-    { 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"
-    },
-    { FEN,
-      "illegal, SF crash",
-      "4k3/8/8/8/7b/8/8/4K3 b - - 0 1"
-    },
-    { FEN,
-      "illegal, SF crash",
-      "2r1k3/3B4/8/8/8/8/8/4K3 w - - 0 1"
-    },
-    { FEN,
-      "illegal, SF crash",
-      "2r1k3/3P4/8/8/8/8/8/4K3 w - - 0 1"
-    },
-    { MOVEDO,
+    { __LINE__, MOVEDO | PERFT,
      "simple movedo/undo: only 2 W knights",
      "8/1k6/8/8/8/8/6K1/1NN5 w - - 0 1"
    },
-    { MOVEDO,
-      "simple movedo/undo: only 2 W knights",
-      "8/1k6/8/8/8/8/6K1/1NN5 w - - 0 1"
-    },
-    { MOVEDO,
+    { __LINE__, MOVEDO | PERFT,
      "simple movedo/undo: only 2 W knights",
      "5n2/1k6/8/8/5K2/8/P7/1N6 w - - 0 1"
    },
-    { 0, NULL, NULL }
+    { __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"
+    },
+    { __LINE__, FEN,
+      "illegal, SF crash",
+      "4k3/8/8/8/7b/8/8/4K3 b - - 0 1"
+    },
+    { __LINE__, FEN,
+      "illegal, SF crash",
+      "2r1k3/3B4/8/8/8/8/8/4K3 w - - 0 1"
+    },
+    { __LINE__, FEN,
+      "illegal, SF crash",
+      "2r1k3/3P4/8/8/8/8/8/4K3 w - - 0 1"
+    },
+    { __LINE__, 0, NULL, NULL }
 };

-static int cur = 0;
+static int cur = -1;

 static char *next_fen(uint module)
 {
+    cur++;
    while (fentest[cur].fen && !(fentest[cur].modules & module))
        cur++;
-    return fentest[cur].fen ? fentest[cur++].fen: NULL;
+    return fentest[cur].fen;
 }

 static __unused char* cur_comment()
 {
    return fentest[cur].comment;
 }
+
+static __unused int cur_line()
+{
+    return fentest[cur].line;
+}
--- a/test/movedo-test.c
+++ b/test/movedo-test.c
@@ -26,9 +26,10 @@

 int main(int __unused ac, __unused char**av)
 {
-    int i = 1;
+    int i = 0, test_line;
    char *fen, movebuf[8];;
    pos_t *pos, *savepos;
+    movelist_t pseudo;
    move_t move;

    setlinebuf(stdout);                           /* line-buffered stdout */
@@ -36,42 +37,54 @@ int main(int __unused ac, __unused char**av)
    bitboard_init();
    hyperbola_init();

-    while ((fen = next_fen(MOVEGEN | MOVEDO))) {
+    while ((fen = next_fen(MOVEDO))) {
+        test_line = cur_line();
        if (!(pos = fen2pos(NULL, fen))) {
            printf("wrong fen %d: [%s]\n", i, fen);
            continue;
        }
-        pos_gen_pseudomoves(pos);
-        savepos = pos_dup(pos);
-        if (pos_cmp(pos, savepos) != true) {
-            printf("*** positions differ 1\n");
-            exit(0);
-        }
-        int tmp = 0, j = 1;
-        while ((move = pos_next_legal(pos, &tmp)) != MOVE_NONE) {
-            state_t state;

-            pos_print(pos);
-            printf("i=%d j=%d  turn=%d move=[%s]\n", i, j, pos->turn,
-                   move_str(movebuf, move, 0));
+        pos->checkers = pos_checkers(pos, pos->turn);
+        pos_set_pinners_blockers(pos);
+
+        pos_gen_pseudomoves(pos, &pseudo);
+        savepos = pos_dup(pos);
+
+        state_t state = pos->state;
+        int tmp = 0, j = 0;
+        while ((move = pos_next_legal(pos, &pseudo, &tmp)) != MOVE_NONE) {
+            //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, &state);
-            pos_print(pos);
-            fflush(stdout);
-            pos_check(pos, true);
-            printf("%d/%d move_do check ok\n", i, j);
-            move_undo(pos, move, &state);
-            if (pos_cmp(pos, savepos) != true) {
-                printf("*** positions differ 2\n");
+            move_do(pos, move);
+            //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);
                exit(0);
            }
-            fflush(stdout);
-            pos_check(pos, true);
-            printf("%d/%d move_undo check ok\n", i, j);

-            if (j++ == 1000)
+            //printf("%d/%d move_do check ok\n", i, j);
+            move_undo(pos, move);
+            pos->state = state;
+            if (!pos_ok(pos, false)) {
+                printf("*** fen %d move %d [%s] invalid position after move_undo\n",
+                       test_line, 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);
+                exit(0);
+            }
+            //fflush(stdout);
+            //pos_check(pos, true);
+            //printf("%d/%d move_undo check ok\n", i, j);
+            j++;
        }
+        printf("fen %d line=%d [%s] %d move_{do,undo} OK\n", i, test_line, fen, j);
        pos_del(savepos);
        pos_del(pos);
        i++;
--- a/test/movegen-test.c
+++ b/test/movegen-test.c
@@ -76,7 +76,7 @@ static FILE *open_stockfish()
    return out_desc;
 }

-static void send_stockfish_fen(FILE *desc, pos_t *pos, char *fen)
+static void send_stockfish_fen(FILE *desc, pos_t *pos, movelist_t *movelist, char *fen)
 {
    char *buf = NULL;
    int count, __unused mycount = 0, fishcount;
@@ -85,8 +85,9 @@ static void send_stockfish_fen(FILE *desc, pos_t *pos, char *fen)

    pos_clear(pos);

-    move_t *moves = pos->moves.move;
-    int nmoves = pos->moves.nmoves;
+    move_t *moves = movelist->move;
+    int *nmoves = &movelist->nmoves;
+    *nmoves = 0;
    //char nodescount[] = "Nodes searched";
    //printf("nmoves = %d\n", nmoves);
    fflush(stdout);
@@ -109,7 +110,7 @@ static void send_stockfish_fen(FILE *desc, pos_t *pos, char *fen)
            //       buf[0], buf[1], buf[2], buf[3],
            //       sq_to_string(from), sq_to_string(to),
            //       count);
-            moves[nmoves++] = move_make(from, to);
+            moves[(*nmoves)++] = move_make(from, to);

        } else if (sscanf(buf, "%*5s: %d", &count) == 1) {
            square_t from = sq_from_string(buf);
@@ -120,10 +121,10 @@ static void send_stockfish_fen(FILE *desc, pos_t *pos, char *fen)
            //       buf[0], buf[1], buf[2], buf[3],
            //       sq_to_string(from), sq_to_string(to),
            //       count);
-            moves[nmoves++] = move_make_promote(from, to, promoted);
+            moves[(*nmoves)++] = move_make_promote(from, to, promoted);
        }
    }
-    pos->moves.nmoves = nmoves;
+    //pos->moves.nmoves = nmoves;
    // printf("fishcount=%d mycount=%d\n", fishcount, mycount);
    free(buf);
 }
@@ -215,7 +216,7 @@ int main(int __unused ac, __unused char**av)
    FILE *outfd;
    char *fen;
    pos_t *pos, *fishpos = pos_new();
-    movelist_t legal;
+    movelist_t pseudo, legal, fishmoves;
    //bitboard_t wrong = 0x5088000040, tmp, loop;
    //bit_for_each64(loop, tmp, )
    //printf("fishpos 1=%p\n", fishpos);
@@ -235,9 +236,14 @@ int main(int __unused ac, __unused char**av)
            continue;
        }
        /* print movelists */
-        send_stockfish_fen(outfd, fishpos, fen);
-        pos_gen_pseudomoves(pos);
-        pos_all_legal(pos, &legal);
+        send_stockfish_fen(outfd, fishpos, &fishmoves, fen);
+
+        pos_set_checkers_pinners_blockers(pos);
+        pos_gen_pseudomoves(pos, &pseudo);
+        //moves_print(&pseudo, 0);
+        pos_all_legal(pos, &pseudo, &legal);
+
+        //moves_print(&legal, 0);
        //printf("Fu ");
        //moves_print(fishpos, 0);
        //fflush(stdout);
@@ -246,7 +252,7 @@ int main(int __unused ac, __unused char**av)
        //fflush(stdout);

        /* sort and print movelists */
-        move_sort_by_sq(&fishpos->moves);
+        move_sort_by_sq(&fishmoves);
        move_sort_by_sq(&legal);
        // printf("\nFs ");
        // moves_print(fishpos, 0);
@@ -256,10 +262,10 @@ int main(int __unused ac, __unused char**av)
        // fflush(stdout);

        /* compare movelists */
-        if (!movelists_equal(&fishpos->moves, &legal)) {
+        if (!movelists_equal(&fishmoves, &legal)) {
            pos_print(pos);
            printf("F: ");
-            moves_print(&fishpos->moves, 0);
+            moves_print(&fishmoves, 0);
            printf("M: ");
            moves_print(&legal, 0);
        } else {
--- a/test/perft-test.c
+++ b/test/perft-test.c
@@ -0,0 +1,310 @@
+/* perft-test.c - perft 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 <unistd.h>
+#include <time.h>
+#include <locale.h>
+
+#include "chessdefs.h"
+#include "fen.h"
+#include "position.h"
+#include "move.h"
+#include "move-do.h"
+#include "move-gen.h"
+#include "search.h"
+
+#include "common-test.h"
+
+#define RD 0
+#define WR 1
+
+typedef struct {
+    move_t move;
+    int count;
+} ddperft;
+
+/**
+ * return write pipd fd
+ */
+static FILE *open_stockfish()
+{
+    int rpipe[2], wpipe[2];
+    FILE *out_desc;
+    pid_t pid;
+
+    if ((pipe(rpipe) < 0) || (pipe(wpipe) < 0)) {
+        perror("pipe");
+        return NULL;
+    }
+    if ((pid = fork()) < 0) {
+        perror("fork");
+        return NULL;
+    }
+
+    if (!pid) {                                   /* stockfish */
+        setvbuf(stdin,  NULL, _IOLBF, 0);
+        setvbuf(stdout, NULL, _IOLBF, 0);
+        setvbuf(stderr, NULL, _IOLBF, 0);
+
+        dup2(wpipe[RD], STDIN_FILENO);
+        dup2(rpipe[WR], STDOUT_FILENO);
+        dup2(rpipe[WR], STDERR_FILENO);
+
+        close(wpipe[RD]);
+        close(wpipe[WR]);
+        close(rpipe[RD]);
+        close(rpipe[WR]);
+        if (execlp("stockfish", "stockfish", NULL) == -1) {
+            perror("execlp");
+            return NULL;
+        }
+        return 0;                                 /* not reached */
+    }
+    /* us */
+    dup2(rpipe[RD], STDIN_FILENO);
+    setvbuf(stdin, NULL, _IOLBF, 0);
+
+    close(wpipe[RD]);
+    close(rpipe[RD]);
+    close(rpipe[WR]);
+
+    out_desc = fdopen(wpipe[WR], "w");
+    setvbuf(out_desc, NULL, _IOLBF, 0);
+
+    return out_desc;
+}
+
+static u64 send_stockfish_fen(FILE *desc, pos_t *pos, movelist_t *movelist,
+                               char *fen, int depth)
+{
+    char *buf = NULL;
+    u64 count, mycount = 0, fishcount;
+    size_t alloc = 0;
+    ssize_t buflen;
+
+    pos_clear(pos);
+
+    move_t *moves = movelist->move;
+    int *nmoves = &movelist->nmoves;
+    *nmoves = 0;
+    //char nodescount[] = "Nodes searched";
+    //printf("nmoves = %d\n", nmoves);
+    fflush(stdout);
+    //sprintf(str, "stockfish \"position fen %s\ngo perft depth\n\"", fen);
+    fprintf(desc, "position fen %s\ngo perft %d\n", fen, depth);
+    //fflush(desc);
+    while ((buflen = getline(&buf, &alloc, stdin)) > 0) {
+        buf[--buflen] = 0;
+        if (buflen == 0)
+            continue;
+        if (sscanf(buf, "Nodes searched: %lu", &fishcount) == 1) {
+            break;
+        }
+        //printf("%d: %s\n", line++, buf);
+        if (sscanf(buf, "%*4s: %lu", &count) == 1) {
+            square_t from = sq_from_string(buf);
+            square_t to   = sq_from_string(buf + 2);
+            mycount += count;
+            //printf("move found: %c%c->%c%c %s->%s count=%d\n",
+            //       buf[0], buf[1], buf[2], buf[3],
+            //       sq_to_string(from), sq_to_string(to),
+            //       count);
+            moves[(*nmoves)++] = move_make(from, to);
+
+        } else if (sscanf(buf, "%*5s: %lu", &count) == 1) {
+            square_t from = sq_from_string(buf);
+            square_t to   = sq_from_string(buf + 2);
+            piece_type_t promoted = piece_t_from_char(*(buf + 4));
+            mycount += count;
+            //printf("move found: %c%c->%c%c %s->%s count=%d\n",
+            //       buf[0], buf[1], buf[2], buf[3],
+            //       sq_to_string(from), sq_to_string(to),
+            //       count);
+            moves[(*nmoves)++] = move_make_promote(from, to, promoted);
+        }
+    }
+    //pos->moves.nmoves = nmoves;
+    // printf("fishcount=%d mycount=%d\n", fishcount, mycount);
+    free(buf);
+    return mycount;
+}
+
+static __unused bool movelists_equal(movelist_t *fish, movelist_t *me)
+{
+    move_t *m1 = fish->move, *m2 = me->move;
+    int n1 = fish->nmoves, n2 = me->nmoves;
+    int mask = 077777;
+
+    if (n1 != n2)
+        return false;
+    for (int cur = 0; cur < n1; ++cur) {
+        if ((m1[cur] & mask) != (m2[cur] & mask))
+            return false;
+    }
+    return true;
+}
+
+static __unused void compare_moves(movelist_t *fish, movelist_t *me)
+{
+    char str1[1024] = {0}, str2[1024] = {0}, tmpstr[1024];
+    char *skip = "      ";
+    move_t *m1 = fish->move;
+    move_t *m2 = me->move;
+    int n1 = fish->nmoves;
+    int n2 = me->nmoves;
+
+#define f(c) move_from(c)
+#define t(c) move_to(c)
+
+    for (move_t *c1 = m1, *c2 = m2; (c1 - m1 < n1) || (c2 - m2 < n2);) {
+        // square_t f1 = move_from(*c1); square_t t1 = move_to(*c1);
+        // square_t f2 = move_from(*c2); square_t t2 = move_to(*c2);
+
+        /* no more move in c2 */
+        if (c2 - m2 >= n2) {
+            while (c1 - m1 < n1) {
+                sprintf(tmpstr, " %s-%s", sq_to_string(f(*c1)), sq_to_string(t(*c1)));
+                strcat (str1, tmpstr);
+                c1++;
+            }
+            break;
+        }
+        if (c1 - m1 >= n1) {
+            while (c2 - m2 < n2) {
+                sprintf(tmpstr, " %s-%s", sq_to_string(f(*c2)), sq_to_string(t(*c2)));
+                strcat (str2, tmpstr);
+                c2++;
+            }
+            break;
+        }
+
+        /* missing move in c2 */
+        if (f(*c1) < f(*c2) ||
+            (f(*c1) == f(*c2) && t(*c1) < t(*c2))) {
+            strcat(str2, skip);
+            sprintf(tmpstr, " %s-%s", sq_to_string(f(*c1)), sq_to_string(t(*c1)));
+            strcat (str1, tmpstr);
+            while ((c1 - m1 < n1) && (f(*c1) < f(*c2) ||
+                                      (f(*c1) == f(*c2) && t(*c1) < t(*c2)))) {
+                c1++;
+            }
+            continue;
+        }
+        /* missing move in c1 */
+        if (f(*c1) > f(*c2) ||
+            (f(*c1) == f(*c2) && t(*c1) > t(*c2))) {
+            strcat(str1, skip);
+            sprintf(tmpstr, " %s-%s", sq_to_string(f(*c2)), sq_to_string(t(*c2)));
+            strcat (str2, tmpstr);
+            while ((c2 - m2 < n2) && (f(*c1) > f(*c2) ||
+                                      (f(*c1) == f(*c2) && t(*c1) > t(*c2)))) {
+                c2++;
+            }
+            continue;
+        }
+        sprintf(tmpstr, " %s-%s", sq_to_string(f(*c1)), sq_to_string(t(*c1)));
+        strcat(str1, tmpstr);
+        strcat(str2, tmpstr);
+        c1++, c2++;
+    }
+    printf("F(%2d): %s\nM(%2d): %s\n", n1, str1, n2, str2);
+}
+
+
+int main(int __unused ac, __unused char**av)
+{
+    int i = 0, test_line;
+    u64 sf_count, my_count;
+    char *fen;
+    pos_t *pos, *savepos, *fishpos = pos_new();
+    movelist_t fishmoves;
+    //move_t move;
+    FILE *outfd;
+    s64 ms1 = 0, ms1_total = 0;
+    s64 ms2 = 0, ms2_total = 0;
+
+    int depth = 6, run = 3;
+
+    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)
+        exit(0);
+    setlocale(LC_NUMERIC, "");
+    setlinebuf(stdout);                           /* line-buffered stdout */
+    outfd = open_stockfish();
+
+    bitboard_init();
+    hyperbola_init();
+
+    CLOCK_DEFINE(clock, CLOCK_PROCESS);
+    while ((fen = next_fen(PERFT | MOVEDO))) {
+        test_line = cur_line();
+        if (!(pos = fen2pos(NULL, fen))) {
+            printf("wrong fen %d: [%s]\n", i, fen);
+            continue;
+        }
+        sf_count = send_stockfish_fen(outfd, fishpos, &fishmoves, fen, depth);
+        savepos = pos_dup(pos);
+
+        if (run & 1) {
+            clock_start(&clock);
+            my_count = perft(pos, depth, 1);
+            ms1 = clock_elapsed_ms(&clock);
+            ms1_total += ms1;
+
+            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);
+            } else  {
+                printf("pt1 ERR: line=%3d sf=%'lu me=%'lu \"%s\"\n",
+                       test_line, sf_count, my_count, fen);
+            }
+        }
+
+        if (run & 2) {
+            clock_start(&clock);
+            my_count = perft_new_pinners(pos, depth, 1);
+            ms2 = clock_elapsed_ms(&clock);
+            ms2_total += ms2;
+
+            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);
+            } else  {
+                printf("pt2 ERR: line=%3d sf=%'lu me=%'lu \"%s\"\n",
+                       test_line, sf_count, my_count, fen);
+            }
+        }
+        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);
+    return 0;
+}
Author	SHA1	Message	Date
Bruno Raoult	926dfa0765	untabify Makefile, cosmetic change in pos_set_checkers_pinners_blockers()	2024-04-10 17:12:20 +02:00
Bruno Raoult	374116b1e7	simplify pos_set_checkers_pinners_blockers() (cont'd)	2024-04-10 15:59:24 +02:00
Bruno Raoult	9b5c2253b1	Makefile: add -ginline-points	2024-04-10 13:02:23 +02:00
Bruno Raoult	e301e6c726	bug fix in perft() - stupid initialization !	2024-04-10 12:57:39 +02:00
Bruno Raoult	e78eae21e6	cleanup move_do()	2024-04-10 12:57:08 +02:00
Bruno Raoult	711306c92a	simplify/improve pos_set_checkers_pinners_blockers()	2024-04-10 12:54:47 +02:00
Bruno Raoult	660722fadc	cleanup	2024-04-10 12:53:31 +02:00
Bruno Raoult	e8240c6cab	move_make_promotions(), clean move_do(), pos_gen_pseudomoves()	2024-04-09 08:15:43 +02:00
Bruno Raoult	eb590f1438	bug fix, wrong perft recursion !	2024-04-09 08:11:31 +02:00
Bruno Raoult	f2ce20a504	add bb_pawn_attacks[][], bb_shift()	2024-04-09 08:10:53 +02:00
Bruno Raoult	027aa2c132	bb: bb_{first_bb,next,multiple{}, chessdefs: relative sq diffs	2024-04-04 10:03:43 +02:00
Bruno Raoult	30af886594	comment	2024-04-02 21:18:01 +02:00
Bruno Raoult	afecbeb955	movegen-test: add set_checkers_pinners_blockers call	2024-04-02 20:40:44 +02:00
Bruno Raoult	05748e19ab	Makefile: build static	2024-04-02 20:38:50 +02:00
Bruno Raoult	4816b4a53a	experiment: add pos_set_checkers_pinners_blockers()	2024-03-30 18:45:13 +01:00
Bruno Raoult	96744cea20	perft-test: option to run perft/perft2/both	2024-03-29 10:00:01 +01:00
Bruno Raoult	24207583d1	perft2: is_in_check() before recursion	2024-03-29 09:59:14 +01:00
Bruno Raoult	92d6909546	update (C) notice	2024-03-28 10:37:52 +01:00
Bruno Raoult	85ae4a2230	better comments on perft() and perft2()	2024-03-28 09:41:39 +01:00
Bruno Raoult	ad8a9609ce	misc.c: add a few basic clock functions	2024-03-28 08:33:27 +01:00
Bruno Raoult	ad704c216b	Merge branch 'perft': perft() and perft2() - see comments. perft: normal "get_next_legal()" before movegen perft2: is_in_check() after movegen	2024-03-27 18:09:25 +01:00
Bruno Raoult	26b9a5b58a	brchess func calls changes, always run perft() & perft2()	2024-03-27 12:53:42 +01:00
Bruno Raoult	65fe74c9c5	movegen: don't separate promotions, perft: loop uses next_legal()	2024-03-27 12:52:39 +01:00
Bruno Raoult	9b2f5ff751	move_{do,undo}: do not save/restore pos state	2024-03-27 12:42:45 +01:00
Bruno Raoult	edcc87be5a	a few more perft debug tests	2024-03-27 12:41:38 +01:00
Bruno Raoult	09afd98971	fen2pos: no more pos_checkers etc... position.c: pos_check -> pos_ok (bool)	2024-03-27 12:40:16 +01:00
Bruno Raoult	08ba989170	is_legal: fix check+pinned and knight check; perft-test + perft2()	2024-03-26 17:43:59 +01:00
Bruno Raoult	7637bdad10	attack.c: sq_is_attacked() and is_in_check()	2024-03-26 17:34:11 +01:00
Bruno Raoult	70d6c23c00	position add: pos_set_pinners_blockers()	2024-03-26 17:31:44 +01:00
Bruno Raoult	aaeab03089	revert captured in position before change to move struct	2024-03-23 19:49:35 +01:00
Bruno Raoult	ce2e0e8459	add forgotten changes in bitboard-switch branch (git is so... difficult)	2024-03-23 17:41:15 +01:00
Bruno Raoult	d0279125ae	move_{do,undo}: FIX forgotten king[] update, add few bug_on()	2024-03-23 17:37:40 +01:00
Bruno Raoult	798047b84d	Merge branch 'bitboard-switch'	2024-03-23 17:26:26 +01:00