Do not special case generate_king_moves()

[stockfish] / src / movegen.cpp

diff --git a/src/movegen.cpp b/src/movegen.cpp
index b6bf6b24b83f7d578d8757f96e47171f31af140a..71204af44f6bb7b6f929fbd558ed702faa6dfb0c 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -37,7 +37,6 @@ namespace {
   int generate_white_pawn_noncaptures(const Position&, MoveStack*);
   int generate_black_pawn_noncaptures(const Position&, MoveStack*);
   int generate_piece_moves(PieceType, const Position&, MoveStack*, Color side, Bitboard t);
-  int generate_king_moves(const Position&, MoveStack*, Square from, Bitboard t);
   int generate_castle_moves(const Position&, MoveStack*, Color us);
 
 }
@@ -65,10 +64,9 @@ int generate_captures(const Position& pos, MoveStack* mlist) {
   else
       n = generate_black_pawn_captures(pos, mlist);
 
-  for (PieceType pce = KNIGHT; pce < KING; pce++)
+  for (PieceType pce = KNIGHT; pce <= KING; pce++)
       n += generate_piece_moves(pce, pos, mlist+n, us, target);
 
-  n += generate_king_moves(pos, mlist+n, pos.king_square(us), target);
   return n;
 }
 
@@ -90,10 +88,9 @@ int generate_noncaptures(const Position& pos, MoveStack *mlist) {
   else
       n = generate_black_pawn_noncaptures(pos, mlist);
 
-  for (PieceType pce = KNIGHT; pce < KING; pce++)
+  for (PieceType pce = KNIGHT; pce <= KING; pce++)
       n += generate_piece_moves(pce, pos, mlist+n, us, target);
 
-  n += generate_king_moves(pos, mlist+n, pos.king_square(us), target);
   n += generate_castle_moves(pos, mlist+n, us);
   return n;
 }
@@ -1002,11 +999,13 @@ namespace {
     return n;
   }
 
+
   int generate_piece_moves(PieceType piece, const Position &pos, MoveStack *mlist, 
                            Color side, Bitboard target) {
+
+    const Piece_attacks_fn mem_fn = piece_attacks_fn[piece];
     Square from, to;
     Bitboard b;
-    Piece_attacks_fn mem_fn = piece_attacks_fn[piece];
     int n = 0;
 
     for (int i = 0; i < pos.piece_count(side, piece); i++)
@@ -1023,21 +1022,6 @@ namespace {
   }
 
 
-  int generate_king_moves(const Position &pos, MoveStack *mlist, 
-                          Square from, Bitboard target) {
-    Square to;
-    Bitboard b;
-    int n = 0;
-    
-    b = pos.king_attacks(from) & target;
-    while(b) {
-      to = pop_1st_bit(&b);
-      mlist[n++].move = make_move(from, to);
-    }
-    return n;
-  }
-
-
   int generate_castle_moves(const Position &pos, MoveStack *mlist, Color us) {
     int n = 0;
 
@@ -1095,5 +1079,4 @@ namespace {
 
     return n;
   }
-    
 }