From ea16985ea5b6fc239f33aa333c0c0a6e8f2c7dcc Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 18 Oct 2008 09:49:51 +0200 Subject: [PATCH] Do not special case generate_king_moves() Teoretically a little slowdown. If after testing we verify the slowdown has impact on ELO we revert the change. Signed-off-by: Marco Costalba --- src/movegen.cpp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/movegen.cpp b/src/movegen.cpp index 2972eeee..71204af4 100644 --- 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,6 +999,7 @@ namespace { return n; } + int generate_piece_moves(PieceType piece, const Position &pos, MoveStack *mlist, Color side, Bitboard target) { @@ -1024,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; -- 2.39.2