kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-12 03:59:15 +00:00
Code Issues Releases Wiki Activity

Cleanup pinned and friends in movegen.cpp

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-02-19 16:37:03 +01:00
parent 5f142ec209
commit 0a0ea36e25
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/movegen.cpp
View file

@ -166,13 +166,14 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) {
/// generate_checks() generates all pseudo-legal non-capturing, non-promoting /// generate_checks() generates all pseudo-legal non-capturing, non-promoting
/// checks. It returns the number of generated moves. /// 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_ok());
assert(!pos.is_check()); assert(!pos.is_check());
Color us = pos.side_to_move(); Color us = pos.side_to_move();
Square ksq = pos.king_square(opposite_color(us)); Square ksq = pos.king_square(opposite_color(us));
Bitboard dc = pos.discovered_check_candidates(us);
MoveStack* mlist_start = mlist; MoveStack* mlist_start = mlist;
assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING)); 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 /// in check. Unlike the other move generation functions, this one generates
/// only legal moves. It returns the number of generated moves. /// 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_ok());
assert(pos.is_check()); 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? if (!(checkers & (checkers - 1))) // Only one bit set?
{ {
Square checksq = first_1(checkers); 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()); Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
if (pos.is_check()) if (pos.is_check())
return generate_evasions(pos, mlist, pinned); return generate_evasions(pos, mlist);
// Generate pseudo-legal moves // Generate pseudo-legal moves
int n = generate_captures(pos, mlist); 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 /// returned. If not, the function returns false. This function must
/// only be used when the side to move is not in check. /// 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_ok());
assert(!pos.is_check()); assert(!pos.is_check());
assert(move_is_ok(m)); assert(move_is_ok(m));
assert(pinned == pos.pinned_pieces(pos.side_to_move()));
Color us = pos.side_to_move(); Color us = pos.side_to_move();
Color them = opposite_color(us); Color them = opposite_color(us);
Square from = move_from(m); Square from = move_from(m);
Piece pc = pos.piece_on(from); 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 // If the from square is not occupied by a piece belonging to the side to
// move, the move is obviously not legal. // move, the move is obviously not legal.

6
src/movegen.h
View file

@ -34,10 +34,10 @@
extern int generate_captures(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_noncaptures(const Position &pos, MoveStack *mlist);
extern int generate_checks(const Position &pos, MoveStack *mlist, Bitboard dc); extern int generate_checks(const Position &pos, MoveStack *mlist);
extern int generate_evasions(const Position &pos, MoveStack *mlist, Bitboard pinned); 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)

8
src/movepick.cpp
View file

@ -130,7 +130,7 @@ Move MovePicker::get_next_move() {
if (ttMove != MOVE_NONE) if (ttMove != MOVE_NONE)
{ {
assert(move_is_ok(ttMove)); assert(move_is_ok(ttMove));
if (move_is_legal(pos, ttMove, pinned)) if (move_is_legal(pos, ttMove))
return ttMove; return ttMove;
} }
break; break;
@ -139,7 +139,7 @@ Move MovePicker::get_next_move() {
if (mateKiller != MOVE_NONE) if (mateKiller != MOVE_NONE)
{ {
assert(move_is_ok(mateKiller)); assert(move_is_ok(mateKiller));
if (move_is_legal(pos, mateKiller, pinned)) if (move_is_legal(pos, mateKiller))
return mateKiller; return mateKiller;
} }
break; break;
@ -162,7 +162,7 @@ Move MovePicker::get_next_move() {
case PH_EVASIONS: case PH_EVASIONS:
assert(pos.is_check()); assert(pos.is_check());
numOfMoves = generate_evasions(pos, moves, pinned); numOfMoves = generate_evasions(pos, moves);
score_evasions(); score_evasions();
movesPicked = 0; movesPicked = 0;
break; break;
@ -174,7 +174,7 @@ Move MovePicker::get_next_move() {
break; break;
case PH_QCHECKS: case PH_QCHECKS:
numOfMoves = generate_checks(pos, moves, dc); numOfMoves = generate_checks(pos, moves);
movesPicked = 0; movesPicked = 0;
break; break;