X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=64c44f28a0eba0d4d985854339e3aa50bd2f130f;hp=c7c29a4ec5f61bab915c67c1937cc513308e5999;hb=20621ed3e3588468c44ab2f69a82eedc6f5c0119;hpb=b05fbb3733df535a3fdf99e8d832001e57929699

diff --git a/src/movegen.cpp b/src/movegen.cpp
index c7c29a4e..64c44f28 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -49,7 +49,7 @@ namespace {
     Square rfrom = pos.castle_rook_square(CR[us]);
     Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
     Square rto = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
-    Bitboard enemies = pos.pieces(flip(us));
+    Bitboard enemies = pos.pieces(~us);
 
     assert(!pos.in_check());
     assert(pos.piece_on(kfrom) == make_piece(us, KING));
@@ -141,12 +141,13 @@ namespace {
         else
             (void)ksq; // Silence a warning under MSVC
     }
+
     return mlist;
   }
 
 
   template<Color Us, MoveType Type>
-  MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq) {
+  MoveStack* generate_pawn_moves(const Position& pos, MoveStack* mlist, Bitboard target, Square ksq = SQ_NONE) {
 
     // Calculate our parametrized parameters at compile time, named according to
     // the point of view of white side.
@@ -251,14 +252,13 @@ namespace {
                                            Color us, const CheckInfo& ci) {
     assert(Pt != KING && Pt != PAWN);
 
-    Bitboard checkSqs, b;
     Square from;
     const Square* pl = pos.piece_list(us, Pt);
 
     if ((from = *pl++) == SQ_NONE)
         return mlist;
 
-    checkSqs = ci.checkSq[Pt] & pos.empty_squares();
+    Bitboard checkSqs = ci.checkSq[Pt] & pos.empty_squares();
 
     do
     {
@@ -269,7 +269,7 @@ namespace {
         if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
             continue;
 
-        b = pos.attacks_from<Pt>(from) & checkSqs;
+        Bitboard b = pos.attacks_from<Pt>(from) & checkSqs;
         SERIALIZE(b);
 
     } while ((from = *pl++) != SQ_NONE);
@@ -278,24 +278,6 @@ namespace {
   }
 
 
-  template<>
-  FORCE_INLINE MoveStack* generate_direct_checks<PAWN>(const Position& p, MoveStack* m,
-                                                       Color us, const CheckInfo& ci) {
-
-    return us == WHITE ? generate_pawn_moves<WHITE, MV_NON_CAPTURE_CHECK>(p, m, ci.dcCandidates, ci.ksq)
-                       : generate_pawn_moves<BLACK, MV_NON_CAPTURE_CHECK>(p, m, ci.dcCandidates, ci.ksq);
-  }
-
-
-  template<PieceType Pt, MoveType Type>
-  FORCE_INLINE MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us, Bitboard t) {
-
-    assert(Pt == PAWN);
-    return us == WHITE ? generate_pawn_moves<WHITE, Type>(p, m, t, SQ_NONE)
-                       : generate_pawn_moves<BLACK, Type>(p, m, t, SQ_NONE);
-  }
-
-
   template<PieceType Pt>
   FORCE_INLINE MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
 
@@ -311,6 +293,7 @@ namespace {
             SERIALIZE(b);
         } while (*++pl != SQ_NONE);
     }
+
     return mlist;
   }
 
@@ -346,15 +329,17 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
   Bitboard target;
 
   if (Type == MV_CAPTURE)
-      target = pos.pieces(flip(us));
+      target = pos.pieces(~us);
 
   else if (Type == MV_NON_CAPTURE)
       target = pos.empty_squares();
 
   else if (Type == MV_NON_EVASION)
-      target = pos.pieces(flip(us)) | pos.empty_squares();
+      target = pos.pieces(~us) | pos.empty_squares();
+
+  mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target)
+                       : generate_pawn_moves<BLACK, Type>(pos, mlist, target));
 
-  mlist = generate_piece_moves<PAWN, Type>(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);
@@ -403,7 +388,9 @@ MoveStack* generate<MV_NON_CAPTURE_CHECK>(const Position& pos, MoveStack* mlist)
      SERIALIZE(b);
   }
 
-  mlist = generate_direct_checks<PAWN>(pos, mlist, us, ci);
+  mlist = (us == WHITE ? generate_pawn_moves<WHITE, MV_NON_CAPTURE_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq)
+                       : generate_pawn_moves<BLACK, MV_NON_CAPTURE_CHECK>(pos, mlist, ci.dcCandidates, ci.ksq));
+
   mlist = generate_direct_checks<KNIGHT>(pos, mlist, us, ci);
   mlist = generate_direct_checks<BISHOP>(pos, mlist, us, ci);
   mlist = generate_direct_checks<ROOK>(pos, mlist, us, ci);
@@ -444,7 +431,7 @@ MoveStack* generate<MV_EVASION>(const Position& pos, MoveStack* mlist) {
       checkersCnt++;
       checksq = pop_1st_bit(&b);
 
-      assert(color_of(pos.piece_on(checksq)) == flip(us));
+      assert(color_of(pos.piece_on(checksq)) == ~us);
 
       switch (type_of(pos.piece_on(checksq)))
       {
@@ -480,7 +467,9 @@ MoveStack* generate<MV_EVASION>(const Position& pos, MoveStack* mlist) {
   // Blocking evasions or captures of the checking piece
   target = squares_between(checksq, ksq) | checkers;
 
-  mlist = generate_piece_moves<PAWN, MV_EVASION>(pos, mlist, us, target);
+  mlist = (us == WHITE ? generate_pawn_moves<WHITE, MV_EVASION>(pos, mlist, target)
+                       : generate_pawn_moves<BLACK, MV_EVASION>(pos, mlist, 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);