Cleanup pinned and friends in movegen.cpp

No functional change.

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

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 258f9c710616a208339b055599f999c0817b382a..94bc173e10c94f142043a2ff5c94726f8b3371a0 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -166,13 +166,14 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) {
 /// generate_checks() generates all pseudo-legal non-capturing, non-promoting
 /// checks. It returns the number of generated moves.
 
 /// generate_checks() generates all pseudo-legal non-capturing, non-promoting
 /// checks. It returns the number of generated moves.
 

-int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
+int generate_checks(const Position& pos, MoveStack* mlist) {

 
   assert(pos.is_ok());
   assert(!pos.is_check());
 
   Color us = pos.side_to_move();
   Square ksq = pos.king_square(opposite_color(us));
 
   assert(pos.is_ok());
   assert(!pos.is_check());
 
   Color us = pos.side_to_move();
   Square ksq = pos.king_square(opposite_color(us));

+  Bitboard dc = pos.discovered_check_candidates(us);

   MoveStack* mlist_start = mlist;
 
   assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
   MoveStack* mlist_start = mlist;
 
   assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));


@@ -204,7 +205,7 @@ int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
 /// in check. Unlike the other move generation functions, this one generates
 /// only legal moves. It returns the number of generated moves.
 
 /// in check. Unlike the other move generation functions, this one generates
 /// only legal moves. It returns the number of generated moves.
 

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

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


@@ -258,6 +259,7 @@ int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned) {
   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 pinned = pos.pinned_pieces(us);

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


@@ -350,7 +352,7 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) {
   Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
 
   if (pos.is_check())
   Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
 
   if (pos.is_check())

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

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


@@ -371,17 +373,17 @@ int generate_legal_moves(const Position& pos, MoveStack* mlist) {
 /// returned. If not, the function returns false.  This function must
 /// only be used when the side to move is not in check.
 
 /// returned. If not, the function returns false.  This function must
 /// only be used when the side to move is not in check.
 

-bool move_is_legal(const Position& pos, const Move m, Bitboard pinned) {
+bool move_is_legal(const Position& pos, const Move m) {

 
   assert(pos.is_ok());
   assert(!pos.is_check());
   assert(move_is_ok(m));
 
   assert(pos.is_ok());
   assert(!pos.is_check());
   assert(move_is_ok(m));

-  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);
 
   Color us = pos.side_to_move();
   Color them = opposite_color(us);
   Square from = move_from(m);
   Piece pc = pos.piece_on(from);

+  Bitboard pinned = pos.pinned_pieces(us);

 
   // If the from square is not occupied by a piece belonging to the side to
   // move, the move is obviously not legal.
 
   // If the from square is not occupied by a piece belonging to the side to
   // move, the move is obviously not legal.

diff --git a/src/movegen.h b/src/movegen.h
index 48e0dec032ca848ec00118c82d9719fd7c1a8968..bdb7df48d52e3fab30278b7581d877439c4f4841 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -34,10 +34,10 @@
 
 extern int generate_captures(const Position &pos, MoveStack *mlist);
 extern int generate_noncaptures(const Position &pos, MoveStack *mlist);
 
 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, Bitboard pinned);
+extern int generate_checks(const Position &pos, MoveStack *mlist);
+extern int generate_evasions(const Position &pos, MoveStack *mlist);

 extern int generate_legal_moves(const Position &pos, MoveStack *mlist);
 extern int generate_legal_moves(const Position &pos, MoveStack *mlist);

-extern bool move_is_legal(const Position &pos, const Move m, Bitboard pinned);
+extern bool move_is_legal(const Position &pos, const Move m);

 
 
 #endif // !defined(MOVEGEN_H_INCLUDED)
 
 
 #endif // !defined(MOVEGEN_H_INCLUDED)

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 671430708575ab1c6e2834ba9ce2e7c0594b0aa2..c90f8df1e6d398e2cf7f7ab3a4ae63be7c4f3dc1 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -130,7 +130,7 @@ Move MovePicker::get_next_move() {
         if (ttMove != MOVE_NONE)
         {
             assert(move_is_ok(ttMove));
         if (ttMove != MOVE_NONE)
         {
             assert(move_is_ok(ttMove));

-            if (move_is_legal(pos, ttMove, pinned))
+            if (move_is_legal(pos, ttMove))

                 return ttMove;
         }
         break;
                 return ttMove;
         }
         break;


@@ -139,7 +139,7 @@ Move MovePicker::get_next_move() {
         if (mateKiller != MOVE_NONE)
         {
             assert(move_is_ok(mateKiller));
         if (mateKiller != MOVE_NONE)
         {
             assert(move_is_ok(mateKiller));

-            if (move_is_legal(pos, mateKiller, pinned))
+            if (move_is_legal(pos, mateKiller))

                 return mateKiller;
        }
        break;
                 return mateKiller;
        }
        break;


@@ -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, pinned);
+        numOfMoves = generate_evasions(pos, moves);

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


@@ -174,7 +174,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_QCHECKS:
         break;
 
     case PH_QCHECKS:

-        numOfMoves = generate_checks(pos, moves, dc);
+        numOfMoves = generate_checks(pos, moves);

         movesPicked = 0;
         break;
 
         movesPicked = 0;
         break;