X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=f22df724952a81d82cac66616c6921641b560d5e;hp=a9683825f096513439ccdec76b7dd0737c518c2e;hb=9bffe811c44b88ba3b5dd0904539c8ca14257a35;hpb=4f5f97107ed263c4e7bd700b031ce269f94c18b4

diff --git a/src/movegen.cpp b/src/movegen.cpp
index a9683825..f22df724 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -40,52 +40,30 @@ namespace {
     QUEEN_SIDE
   };
 
+  static const bool CAPTURE = true;
+  static const bool NON_CAPTURE = false;
+
   // Function
   bool castling_is_check(const Position&, CastlingSide);
 
-  // Template
+  // Main templates
   template<CastlingSide Side>
   MoveStack* generate_castle_moves(const Position&, MoveStack*);
 
-  // Template generate_pawn_captures() with specializations
+  template<PieceType>
+  MoveStack* generate_piece_checks(const Position&, MoveStack*, Color us, Bitboard, Square);
+
+  // Helper templates
+  template<Color Us, Rank, Bitboard, SquareDelta>
+  MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
+                                                Bitboard blockSquares, MoveStack* mlist);
+
   template<Color, Color, Bitboard, SquareDelta, SquareDelta, SquareDelta>
   MoveStack* do_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);
-  }
-
-  // Template generate_pawn_blocking_evasions() with specializations
-  template<Color Us, Rank, Bitboard, SquareDelta>
-  MoveStack* do_generate_pawn_blocking_evasions(const Position& pos, Bitboard not_pinned,
-                                                Bitboard blockSquares, MoveStack* mlist);
-  template<Color>
-  inline MoveStack* generate_pawn_blocking_evasions(const Position& p, MoveStack* m, Bitboard np, Bitboard bs) {
-      return do_generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, np, bs, m);
-  }
-  template<>
-  inline MoveStack* generate_pawn_blocking_evasions<BLACK>(const Position& p, MoveStack* m, Bitboard np, Bitboard bs) {
-      return do_generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, np, bs, m);
-  }
-
   // Template generate_pawn_checks() with specializations
   template<Color, Color, Bitboard, Bitboard, SquareDelta>
   MoveStack* do_generate_pawn_checks(const Position&, Bitboard, Square, MoveStack*);
@@ -99,17 +77,31 @@ namespace {
       return do_generate_pawn_checks<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_S>(p, dc, ksq, m);
   }
 
-  // non-pawn templates
+  // 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>
-  MoveStack* generate_piece_checks(const Position&, MoveStack*, Color us, Bitboard, Square);
+  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 ? do_generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
+                              : do_generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
+      else
+          return (us == WHITE ? do_generate_pawn_noncaptures<WHITE, BLACK, Rank8BB, Rank3BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
+                              : do_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*, Bitboard, Bitboard);
+  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);
 }
 
 
@@ -134,12 +126,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);
 }
@@ -157,11 +144,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);
@@ -323,29 +306,12 @@ int generate_evasions(const Position& pos, MoveStack* mlist) {
 
           assert((pos.occupied_squares() & blockSquares) == EmptyBoardBB);
 
-          // Pawn moves. Because a blocking evasion can never be a capture, we
-          // only generate pawn pushes.
-          if (us == WHITE)
-              mlist = generate_pawn_blocking_evasions<WHITE>(pos, mlist, not_pinned, blockSquares);
-          else
-              mlist = generate_pawn_blocking_evasions<BLACK>(pos, mlist, not_pinned, blockSquares);
-
           // Pieces moves
-          b1 = pos.knights(us) & not_pinned;
-          if (b1)
-              mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, b1, blockSquares);
-
-          b1 = pos.bishops(us) & not_pinned;
-          if (b1)
-              mlist = generate_piece_blocking_evasions<BISHOP>(pos, mlist, b1, blockSquares);
-
-          b1 = pos.rooks(us) & not_pinned;
-          if (b1)
-              mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, b1, blockSquares);
-
-          b1 = pos.queens(us) & not_pinned;
-          if (b1)
-              mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, b1, blockSquares);
+          mlist = generate_piece_blocking_evasions<PAWN>(pos, mlist, us, not_pinned, blockSquares);
+          mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, us, not_pinned, blockSquares);
+          mlist = generate_piece_blocking_evasions<BISHOP>(pos, mlist, us, not_pinned, blockSquares);
+          mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, us, not_pinned, blockSquares);
+          mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, us, not_pinned, blockSquares);
     }
 
     // Finally, the ugly special case of en passant captures. An en passant
@@ -621,8 +587,10 @@ namespace {
   }
 
   template<PieceType Piece>
-  MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist,
-                                              Bitboard b, Bitboard blockSquares) {
+  MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us,
+                                              Bitboard not_pinned, Bitboard blockSquares) {
+
+    Bitboard b = pos.pieces_of_color_and_type(us, Piece) & not_pinned;
     while (b)
     {
         Square from = pop_1st_bit(&b);
@@ -632,6 +600,14 @@ 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