X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=12260e3b9dd99fd3b67bddce75dc9498bcd81499;hb=9d044cf4ee933257c65cbd8c01589dd88778a1dd;hp=129738a95e009b883fbf56e52b7d67f8e688cd4d;hpb=3e20c6c07ddfe2d5f04cf268727ae466e3b36128;p=stockfish

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 129738a9..12260e3b 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -40,68 +40,74 @@ namespace {
     QUEEN_SIDE
   };
 
-  // Function
+  const bool CAPTURE = true;
+  const bool NON_CAPTURE = false;
+
+  // Functions
   bool castling_is_check(const Position&, CastlingSide);
 
-  // Templates
+  // Helper templates
   template<CastlingSide Side>
-  MoveStack* generate_castle_moves(const Position&, MoveStack*);
-  template<PieceType>
-  MoveStack* generate_piece_checks(const Position&, MoveStack*, Color us, Bitboard, Square);
+  MoveStack* generate_castle_moves(const Position& pos, MoveStack* mlist);
+
   template<Color Us, Rank, Bitboard, SquareDelta>
-  MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
-                                                Bitboard blockSquares, MoveStack* mlist);
+  MoveStack* generate_pawn_blocking_evasions(const Position&, Bitboard, Bitboard, MoveStack*);
 
-  // Template generate_pawn_captures() with specializations
   template<Color, Color, Bitboard, SquareDelta, SquareDelta, SquareDelta>
-  MoveStack* do_generate_pawn_captures(const Position& pos, MoveStack* mlist);
+  MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist);
 
-  template<Color>
-  inline MoveStack* generate_pawn_captures(const Position& p, MoveStack* m) {
-      return do_generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m);
-  }
-  template<>
-  inline MoveStack* generate_pawn_captures<BLACK>(const Position& p, MoveStack* m) {
-      return do_generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m);
-  }
-
-  // Template generate_pawn_noncaptures() with specializations
   template<Color, Color, Bitboard, Bitboard, SquareDelta, SquareDelta, SquareDelta>
-  MoveStack* do_generate_pawn_noncaptures(const Position& pos, MoveStack* mlist);
-
-  template<Color>
-  inline MoveStack* generate_pawn_noncaptures(const Position& p, MoveStack* m) {
-      return do_generate_pawn_noncaptures<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m);
-  }
-  template<>
-  inline MoveStack* generate_pawn_noncaptures<BLACK>(const Position& p, MoveStack* m) {
-      return do_generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m);
-  }
+  MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist);
 
-  // Template generate_pawn_checks() with specializations
   template<Color, Color, Bitboard, Bitboard, SquareDelta>
-  MoveStack* do_generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
+  MoveStack* generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
+
+  // Template generate_piece_checks() with specializations
+  template<PieceType>
+  MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square);
 
-  template<Color>
-  inline MoveStack* generate_pawn_checks(const Position& p, MoveStack* m, Bitboard dc, Square ksq) {
-      return do_generate_pawn_checks<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_N>(p, dc, ksq, m);
-  }
   template<>
-  inline MoveStack* generate_pawn_checks<BLACK>(const Position& p, MoveStack* m, Bitboard dc, Square ksq) {
-      return do_generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
+  inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+
+    if (us == WHITE)
+        return generate_pawn_checks<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_N>(p, dc, ksq, m);
+    else
+        return generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
+
   }
 
   // Template generate_piece_moves() with specializations
   template<PieceType>
   MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
+
   template<>
   MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target);
 
+  template<PieceType Piece, bool Capture>
+  inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) {
+
+      assert(Piece == PAWN);
+
+      if (Capture)
+          return (us == WHITE ? generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
+                              : generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+      else
+          return (us == WHITE ? generate_pawn_noncaptures<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
+                              : generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+  }
+
   // Template generate_piece_blocking_evasions() with specializations
   template<PieceType>
   MoveStack* generate_piece_blocking_evasions(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
+
   template<>
-  MoveStack* generate_piece_blocking_evasions<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard np, Bitboard bs);
+  inline MoveStack* generate_piece_blocking_evasions<PAWN>(const Position& p, MoveStack* m, Color us,
+                                                           Bitboard np, Bitboard bs) {
+    if (us == WHITE)
+        return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, np, bs, m);
+    else
+        return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, np, bs, m);
+  }
 }
 
 
@@ -126,12 +132,7 @@ int generate_captures(const Position& pos, MoveStack* mlist) {
   mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
   mlist = generate_piece_moves<BISHOP>(pos, mlist, us, target);
   mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, target);
-
-  if (us == WHITE)
-      mlist = generate_pawn_captures<WHITE>(pos, mlist);
-  else
-      mlist = generate_pawn_captures<BLACK>(pos, mlist);
-
+  mlist = generate_piece_moves<PAWN, CAPTURE>(pos, mlist, us);
   mlist = generate_piece_moves<KING>(pos, mlist, us, target);
   return int(mlist - mlist_start);
 }
@@ -149,11 +150,7 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) {
   Bitboard target = pos.empty_squares();
   MoveStack* mlist_start = mlist;
 
-  if (us == WHITE)
-      mlist = generate_pawn_noncaptures<WHITE>(pos, mlist);
-  else
-      mlist = generate_pawn_noncaptures<BLACK>(pos, mlist);
-
+  mlist = generate_piece_moves<PAWN, NON_CAPTURE>(pos, mlist, us);
   mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, target);
   mlist = generate_piece_moves<BISHOP>(pos, mlist, us, target);
   mlist = generate_piece_moves<ROOK>(pos, mlist, us, target);
@@ -179,13 +176,8 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
 
   assert(pos.piece_on(ksq) == king_of_color(opposite_color(us)));
 
-  // Pawn moves
-  if (us == WHITE)
-     mlist = generate_pawn_checks<WHITE>(pos, mlist, dc, ksq);
-  else
-     mlist = generate_pawn_checks<BLACK>(pos, mlist, dc, ksq);
-
   // Pieces moves
+  mlist = generate_piece_checks<PAWN>(pos, mlist, us, dc, ksq);
   mlist = generate_piece_checks<KNIGHT>(pos, mlist, us, dc, ksq);
   mlist = generate_piece_checks<BISHOP>(pos, mlist, us, dc, ksq);
   mlist = generate_piece_checks<ROOK>(pos, mlist, us, dc, ksq);
@@ -609,19 +601,10 @@ namespace {
     return mlist;
   }
 
-  template<>
-  MoveStack* generate_piece_blocking_evasions<PAWN>(const Position& p, MoveStack* m, Color us,
-                                                    Bitboard np, Bitboard bs) {
-    if (us == WHITE)
-        return do_generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, np, bs, m);
-    else
-        return do_generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, np, bs, m);
-  }
-
   template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
            SquareDelta TDELTA_NW, SquareDelta TDELTA_N
           >
-  MoveStack* do_generate_pawn_captures(const Position& pos, MoveStack* mlist) {
+  MoveStack* generate_pawn_captures(const Position& pos, MoveStack* mlist) {
 
     Square to;
     Bitboard pawns = pos.pawns(Us);
@@ -694,7 +677,7 @@ namespace {
   template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB,
            SquareDelta TDELTA_NE, SquareDelta TDELTA_NW, SquareDelta TDELTA_N
           >
-  MoveStack* do_generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
+  MoveStack* generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
 
     Bitboard pawns = pos.pawns(Us);
     Bitboard enemyPieces = pos.pieces_of_color(Them);
@@ -751,7 +734,7 @@ namespace {
 
 
   template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB, SquareDelta TDELTA_N>
-  MoveStack* do_generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
+  MoveStack* generate_pawn_checks(const Position& pos, Bitboard dc, Square ksq, MoveStack* mlist)
   {
     // Find all friendly pawns not on the enemy king's file
     Bitboard b1, b2, b3;
@@ -840,8 +823,8 @@ namespace {
   }
 
   template<Color Us, Rank TRANK_8, Bitboard TRank3BB, SquareDelta TDELTA_N>
-  MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
-                                                Bitboard blockSquares, MoveStack* mlist) {
+  MoveStack* generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
+                                             Bitboard blockSquares, MoveStack* mlist) {
     Square to;
 
     // Find non-pinned pawns