X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=995f54f06c97b1f352b4cbb2ecfa8f2831070b9d;hp=a76d9f7c8e403b35dee1c7f2429310e6d020bf08;hb=bafb9f1a25204d06960a44f0637736edce233629;hpb=76024ac40ea45e44a8389cb4206d40b884e259a5

diff --git a/src/movegen.cpp b/src/movegen.cpp
index a76d9f7c..995f54f0 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -29,7 +29,7 @@
 
 // Simple macro to wrap a very common while loop, no facny, no flexibility,
 // hardcoded list name 'mlist' and from square 'from'.
-#define SERIALIZE_MOVES(b, bsf) while (b) (*mlist++).move = make_move(from, pop_1st_bit<bsf>(&b))
+#define SERIALIZE_MOVES(b) while (b) (*mlist++).move = make_move(from, pop_1st_bit(&b))
 
 ////
 //// Local definitions
@@ -83,22 +83,22 @@ namespace {
   }
 
   // Template generate_piece_checks() with specializations
-  template<PieceType, bool HasBSF>
+  template<PieceType>
   MoveStack* generate_piece_checks(const Position&, MoveStack*, Color, Bitboard, Square);
 
   template<>
-  inline MoveStack* generate_piece_checks<PAWN, false>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
+  inline MoveStack* generate_piece_checks<PAWN>(const Position& p, MoveStack* m, Color us, Bitboard dc, Square ksq) {
 
     return (us == WHITE ? generate_pawn_checks<WHITE>(p, dc, ksq, m)
                         : generate_pawn_checks<BLACK>(p, dc, ksq, m));
   }
 
   // Template generate_piece_moves() with specializations and overloads
-  template<PieceType, bool HasBSF>
+  template<PieceType>
   MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
 
   template<>
-  MoveStack* generate_piece_moves<KING, false>(const Position&, MoveStack*, Color, Bitboard);
+  MoveStack* generate_piece_moves<KING>(const Position&, MoveStack*, Color, Bitboard);
 
   template<PieceType Piece, MoveType Type>
   inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) {
@@ -113,12 +113,12 @@ namespace {
                               : generate_pawn_noncaptures<BLACK>(p, m));
   }
 
-  template<PieceType, bool HasBSF>
+  template<PieceType>
   MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
 
   template<>
-  inline MoveStack* generate_piece_moves<PAWN, false>(const Position& p, MoveStack* m,
-                                                      Color us, Bitboard t, Bitboard pnd) {
+  inline MoveStack* generate_piece_moves<PAWN>(const Position& p, MoveStack* m,
+                                               Color us, Bitboard t, Bitboard pnd) {
 
     return (us == WHITE ? generate_pawn_blocking_evasions<WHITE>(p, pnd, t, m)
                         : generate_pawn_blocking_evasions<BLACK>(p, pnd, t, m));
@@ -133,7 +133,7 @@ namespace {
 
 /// generate_captures generates() all pseudo-legal captures and queen
 /// promotions.  The return value is the number of moves generated.
-template<bool HasBSF>
+
 int generate_captures(const Position& pos, MoveStack* mlist) {
 
   assert(pos.is_ok());
@@ -143,25 +143,19 @@ int generate_captures(const Position& pos, MoveStack* mlist) {
   Bitboard target = pos.pieces_of_color(opposite_color(us));
   MoveStack* mlist_start = mlist;
 
-  mlist = generate_piece_moves<QUEEN,  HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<ROOK,   HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, target);
+  mlist = generate_piece_moves<QUEEN>(pos, mlist, us, target);
+  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);
   mlist = generate_piece_moves<PAWN, CAPTURE>(pos, mlist, us);
-  mlist = generate_piece_moves<KING, false>(pos, mlist, us, target);
+  mlist = generate_piece_moves<KING>(pos, mlist, us, target);
   return int(mlist - mlist_start);
 }
 
-int generate_captures(const Position& pos, MoveStack* mlist) {
-
-    return CpuHasPOPCNT ? generate_captures<true>(pos, mlist)
-                        : generate_captures<false>(pos, mlist);
-}
-
 
 /// generate_noncaptures() generates all pseudo-legal non-captures and
 /// underpromotions. The return value is the number of moves generated.
-template<bool HasBSF>
+
 int generate_noncaptures(const Position& pos, MoveStack* mlist) {
 
   assert(pos.is_ok());
@@ -172,26 +166,20 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) {
   MoveStack* mlist_start = mlist;
 
   mlist = generate_piece_moves<PAWN, NON_CAPTURE>(pos, mlist, us);
-  mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<ROOK,   HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<QUEEN,  HasBSF>(pos, mlist, us, target);
-  mlist = generate_piece_moves<KING,   false>(pos, mlist, us, target);
+  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);
+  mlist = generate_piece_moves<QUEEN>(pos, mlist, us, target);
+  mlist = generate_piece_moves<KING>(pos, mlist, us, target);
   mlist = generate_castle_moves<KING_SIDE>(pos, mlist);
   mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist);
   return int(mlist - mlist_start);
 }
 
-int generate_noncaptures(const Position& pos, MoveStack* mlist) {
-
-    return CpuHasPOPCNT ? generate_noncaptures<true>(pos, mlist)
-                        : generate_noncaptures<false>(pos, mlist);
-}
-
 
 /// generate_non_capture_checks() generates all pseudo-legal non-capturing,
 /// non-promoting checks. It returns the number of generated moves.
-template<bool HasBSF>
+
 int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
 
   assert(pos.is_ok());
@@ -204,12 +192,12 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard
   assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
 
   // Pieces moves
-  mlist = generate_piece_checks<PAWN, false>(pos, mlist, us, dc, ksq);
-  mlist = generate_piece_checks<KNIGHT, HasBSF>(pos, mlist, us, dc, ksq);
-  mlist = generate_piece_checks<BISHOP, HasBSF>(pos, mlist, us, dc, ksq);
-  mlist = generate_piece_checks<ROOK,   HasBSF>(pos, mlist, us, dc, ksq);
-  mlist = generate_piece_checks<QUEEN,  HasBSF>(pos, mlist, us, dc, ksq);
-  mlist = generate_piece_checks<KING, false>(pos, mlist, us, dc, ksq);
+  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);
+  mlist = generate_piece_checks<QUEEN>(pos, mlist, us, dc, ksq);
+  mlist = generate_piece_checks<KING>(pos, mlist, us, dc, ksq);
 
   // Castling moves that give check. Very rare but nice to have!
   if (   pos.can_castle_queenside(us)
@@ -225,17 +213,11 @@ int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard
   return int(mlist - mlist_start);
 }
 
-int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
-
-    return CpuHasPOPCNT ? generate_non_capture_checks<true>(pos, mlist, dc)
-                        : generate_non_capture_checks<false>(pos, mlist, dc);
-}
-
 
 /// generate_evasions() generates all check evasions when the side to move is
 /// in check. Unlike the other move generation functions, this one generates
 /// only legal moves. It returns the number of generated moves.
-template<bool HasBSF>
+
 int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
 
   assert(pos.is_ok());
@@ -331,11 +313,11 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
 
           if (blockSquares != EmptyBoardBB)
           {
-              mlist = generate_piece_moves<PAWN, false>(pos, mlist, us, blockSquares, pinned);
-              mlist = generate_piece_moves<KNIGHT, HasBSF>(pos, mlist, us, blockSquares, pinned);
-              mlist = generate_piece_moves<BISHOP, HasBSF>(pos, mlist, us, blockSquares, pinned);
-              mlist = generate_piece_moves<ROOK,   HasBSF>(pos, mlist, us, blockSquares, pinned);
-              mlist = generate_piece_moves<QUEEN,  HasBSF>(pos, mlist, us, blockSquares, pinned);
+              mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
+              mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
+              mlist = generate_piece_moves<BISHOP>(pos, mlist, us, blockSquares, pinned);
+              mlist = generate_piece_moves<ROOK>(pos, mlist, us, blockSquares, pinned);
+              mlist = generate_piece_moves<QUEEN>(pos, mlist, us, blockSquares, pinned);
           }
       }
 
@@ -368,12 +350,6 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
   return int(mlist - mlist_start);
 }
 
-int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
-
-    return CpuHasPOPCNT ? generate_evasions<true>(pos, mlist, pinned)
-                        : generate_evasions<false>(pos, mlist, pinned);
-}
-
 
 /// generate_legal_moves() computes a complete list of legal moves in the
 /// current position. This function is not very fast, and should be used
@@ -417,7 +393,6 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
   assert(pinned == pos.pinned_pieces(pos.side_to_move()));
 
   Color us = pos.side_to_move();
-  Color them = opposite_color(us);
   Square from = move_from(m);
   Piece pc = pos.piece_on(from);
 
@@ -426,6 +401,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
   if (color_of_piece(pc) != us)
       return false;
 
+  Color them = opposite_color(us);
   Square to = move_to(m);
 
   // En passant moves
@@ -590,7 +566,7 @@ bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
 
 namespace {
 
-  template<PieceType Piece, bool HasBSF>
+  template<PieceType Piece>
   MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
 
     Square from;
@@ -600,12 +576,12 @@ namespace {
     {
         from = pos.piece_list(us, Piece, i);
         b = pos.piece_attacks<Piece>(from) & target;
-        SERIALIZE_MOVES(b, HasBSF);
+        SERIALIZE_MOVES(b);
     }
     return mlist;
   }
 
-  template<PieceType Piece, bool HasBSF>
+  template<PieceType Piece>
   MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist,
                                   Color us, Bitboard target, Bitboard pinned) {
     Square from;
@@ -618,19 +594,19 @@ namespace {
             continue;
 
         b = pos.piece_attacks<Piece>(from) & target;
-        SERIALIZE_MOVES(b, HasBSF);
+        SERIALIZE_MOVES(b);
     }
     return mlist;
   }
 
   template<>
-  MoveStack* generate_piece_moves<KING, false>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+  MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
 
     Bitboard b;
     Square from = pos.king_square(us);
 
     b = pos.piece_attacks<KING>(from) & target;
-    SERIALIZE_MOVES(b, false);
+    SERIALIZE_MOVES(b);
     return mlist;
   }
 
@@ -840,7 +816,7 @@ namespace {
     return mlist;
   }
 
-  template<PieceType Piece, bool HasBSF>
+  template<PieceType Piece>
   MoveStack* generate_piece_checks(const Position& pos, MoveStack* mlist, Color us,
                                    Bitboard dc, Square ksq) {
 
@@ -855,7 +831,7 @@ namespace {
         if (Piece == KING)
             bb &= ~QueenPseudoAttacks[ksq];
 
-        SERIALIZE_MOVES(bb, HasBSF);
+        SERIALIZE_MOVES(bb);
     }
 
     // Direct checks
@@ -875,7 +851,7 @@ namespace {
                 continue;
 
             Bitboard bb = pos.piece_attacks<Piece>(from) & checkSqs;
-            SERIALIZE_MOVES(bb, HasBSF);
+            SERIALIZE_MOVES(bb);
         }
     }
     return mlist;