generate_evasions() avoid to calculate pinned pieces

Pass as function argument.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 4bb2a7f76c5cd9e01a7b2d5a334d64621c796eef..f30d45720234603fe1dd3b0bec3fef05c5631861 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -204,7 +204,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
 /// only legal moves.  It returns the number of generated moves. This
 /// function is very ugly, and needs cleaning up some time later.  FIXME
 
 /// only legal moves.  It returns the number of generated moves. This
 /// function is very ugly, and needs cleaning up some time later.  FIXME
 

-int generate_evasions(const Position& pos, MoveStack* mlist) {
+int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {

 
   assert(pos.is_ok());
   assert(pos.is_check());
 
   assert(pos.is_ok());
   assert(pos.is_check());


@@ -265,12 +265,10 @@ int generate_evasions(const Position& pos, MoveStack* mlist) {
   if (!(checkers & (checkers - 1))) // Only one bit set?
   {
       Square checksq = first_1(checkers);
   if (!(checkers & (checkers - 1))) // Only one bit set?
   {
       Square checksq = first_1(checkers);

+      Bitboard not_pinned = ~pinned;

 
       assert(pos.color_of_piece_on(checksq) == them);
 
 
       assert(pos.color_of_piece_on(checksq) == them);
 

-      // Find pinned pieces
-      Bitboard not_pinned = ~pos.pinned_pieces(us);
-

       // Generate captures of the checking piece
 
       // Pawn captures
       // Generate captures of the checking piece
 
       // Pawn captures


@@ -361,15 +359,15 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) {
 
   assert(pos.is_ok());
 
 
   assert(pos.is_ok());
 

+  Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
+

   if (pos.is_check())
   if (pos.is_check())

-      return generate_evasions(pos, mlist);
+      return generate_evasions(pos, mlist, pinned);

 
   // Generate pseudo-legal moves
   int n = generate_captures(pos, mlist);
   n += generate_noncaptures(pos, mlist + n);
 
 
   // Generate pseudo-legal moves
   int n = generate_captures(pos, mlist);
   n += generate_noncaptures(pos, mlist + n);
 

-  Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
-

   // Remove illegal moves from the list
   for (int i = 0; i < n; i++)
       if (!pos.pl_move_is_legal(mlist[i].move, pinned))
   // Remove illegal moves from the list
   for (int i = 0; i < n; i++)
       if (!pos.pl_move_is_legal(mlist[i].move, pinned))

diff --git a/src/movegen.h b/src/movegen.h
index 034dd389250099b9eb7fe46f730bcd4ff8cf1c08..48e0dec032ca848ec00118c82d9719fd7c1a8968 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -35,7 +35,7 @@
 extern int generate_captures(const Position &pos, MoveStack *mlist);
 extern int generate_noncaptures(const Position &pos, MoveStack *mlist);
 extern int generate_checks(const Position &pos, MoveStack *mlist, Bitboard dc);
 extern int generate_captures(const Position &pos, MoveStack *mlist);
 extern int generate_noncaptures(const Position &pos, MoveStack *mlist);
 extern int generate_checks(const Position &pos, MoveStack *mlist, Bitboard dc);

-extern int generate_evasions(const Position &pos, MoveStack *mlist);
+extern int generate_evasions(const Position &pos, MoveStack *mlist, Bitboard pinned);

 extern int generate_legal_moves(const Position &pos, MoveStack *mlist);
 extern bool move_is_legal(const Position &pos, const Move m, Bitboard pinned);
 
 extern int generate_legal_moves(const Position &pos, MoveStack *mlist);
 extern bool move_is_legal(const Position &pos, const Move m, Bitboard pinned);
 

diff --git a/src/movepick.cpp b/src/movepick.cpp
index eb57f78a9cf1eb5b09e3f76926465291d4913477..671430708575ab1c6e2834ba9ce2e7c0594b0aa2 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -162,7 +162,7 @@ Move MovePicker::get_next_move() {
 
     case PH_EVASIONS:
         assert(pos.is_check());
 
     case PH_EVASIONS:
         assert(pos.is_check());

-        numOfMoves = generate_evasions(pos, moves);
+        numOfMoves = generate_evasions(pos, moves, pinned);

         score_evasions();
         movesPicked = 0;
         break;
         score_evasions();
         movesPicked = 0;
         break;