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

Use move assignment in movegen.h

Browse source 
No functional change and same speed (tested with perft)
This commit is contained in:
Marco Costalba 2015-02-01 16:32:21 +01:00
parent e56e5045dd
commit 1c7a727795
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/movegen.cpp
View file

@ -59,7 +59,7 @@ namespace {
if (Checks && !pos.gives_check(m, *ci)) if (Checks && !pos.gives_check(m, *ci))
return moveList; return moveList;
(moveList++)->move = m; *moveList++ = m;
return (void)ci, moveList; // Silence a warning under MSVC return (void)ci, moveList; // Silence a warning under MSVC
} }
@ -69,19 +69,19 @@ namespace {
inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) { inline ExtMove* make_promotions(ExtMove* moveList, Square to, const CheckInfo* ci) {
if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS)
(moveList++)->move = make<PROMOTION>(to - Delta, to, QUEEN); *moveList++ = make<PROMOTION>(to - Delta, to, QUEEN);
if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS) if (Type == QUIETS || Type == EVASIONS || Type == NON_EVASIONS)
{ {
(moveList++)->move = make<PROMOTION>(to - Delta, to, ROOK); *moveList++ = make<PROMOTION>(to - Delta, to, ROOK);
(moveList++)->move = make<PROMOTION>(to - Delta, to, BISHOP); *moveList++ = make<PROMOTION>(to - Delta, to, BISHOP);
(moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT); *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
} }
// Knight promotion is the only promotion that can give a direct check // Knight promotion is the only promotion that can give a direct check
// that's not already included in the queen promotion. // that's not already included in the queen promotion.
if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq))
(moveList++)->move = make<PROMOTION>(to - Delta, to, KNIGHT); *moveList++ = make<PROMOTION>(to - Delta, to, KNIGHT);
return (void)ci, moveList; // Silence a warning under MSVC return (void)ci, moveList; // Silence a warning under MSVC
} }
@ -145,13 +145,13 @@ namespace {
while (b1) while (b1)
{ {
Square to = pop_lsb(&b1); Square to = pop_lsb(&b1);
(moveList++)->move = make_move(to - Up, to); *moveList++ = make_move(to - Up, to);
} }
while (b2) while (b2)
{ {
Square to = pop_lsb(&b2); Square to = pop_lsb(&b2);
(moveList++)->move = make_move(to - Up - Up, to); *moveList++ = make_move(to - Up - Up, to);
} }
} }
@ -187,13 +187,13 @@ namespace {
while (b1) while (b1)
{ {
Square to = pop_lsb(&b1); Square to = pop_lsb(&b1);
(moveList++)->move = make_move(to - Right, to); *moveList++ = make_move(to - Right, to);
} }
while (b2) while (b2)
{ {
Square to = pop_lsb(&b2); Square to = pop_lsb(&b2);
(moveList++)->move = make_move(to - Left, to); *moveList++ = make_move(to - Left, to);
} }
if (pos.ep_square() != SQ_NONE) if (pos.ep_square() != SQ_NONE)
@ -211,7 +211,7 @@ namespace {
assert(b1); assert(b1);
while (b1) while (b1)
(moveList++)->move = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square()); *moveList++ = make<ENPASSANT>(pop_lsb(&b1), pos.ep_square());
} }
} }
@ -245,7 +245,7 @@ namespace {
b &= ci->checkSq[Pt]; b &= ci->checkSq[Pt];
while (b) while (b)
(moveList++)->move = make_move(from, pop_lsb(&b)); *moveList++ = make_move(from, pop_lsb(&b));
} }
return moveList; return moveList;
@ -269,7 +269,7 @@ namespace {
Square ksq = pos.king_square(Us); Square ksq = pos.king_square(Us);
Bitboard b = pos.attacks_from<KING>(ksq) & target; Bitboard b = pos.attacks_from<KING>(ksq) & target;
while (b) while (b)
(moveList++)->move = make_move(ksq, pop_lsb(&b)); *moveList++ = make_move(ksq, pop_lsb(&b));
} }
if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us)) if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
@ -348,7 +348,7 @@ ExtMove* generate<QUIET_CHECKS>(const Position& pos, ExtMove* moveList) {
b &= ~PseudoAttacks[QUEEN][ci.ksq]; b &= ~PseudoAttacks[QUEEN][ci.ksq];
while (b) while (b)
(moveList++)->move = make_move(from, pop_lsb(&b)); *moveList++ = make_move(from, pop_lsb(&b));
} }
return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, moveList, ~pos.pieces(), &ci) return us == WHITE ? generate_all<WHITE, QUIET_CHECKS>(pos, moveList, ~pos.pieces(), &ci)
@ -380,7 +380,7 @@ ExtMove* generate<EVASIONS>(const Position& pos, ExtMove* moveList) {
// Generate evasions for king, capture and non capture moves // Generate evasions for king, capture and non capture moves
Bitboard b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks; Bitboard b = pos.attacks_from<KING>(ksq) & ~pos.pieces(us) & ~sliderAttacks;
while (b) while (b)
(moveList++)->move = make_move(ksq, pop_lsb(&b)); *moveList++ = make_move(ksq, pop_lsb(&b));
if (more_than_one(pos.checkers())) if (more_than_one(pos.checkers()))
return moveList; // Double check, only a king move can save the day return moveList; // Double check, only a king move can save the day
@ -406,9 +406,9 @@ ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList) moveList = pos.checkers() ? generate<EVASIONS >(pos, moveList)
: generate<NON_EVASIONS>(pos, moveList); : generate<NON_EVASIONS>(pos, moveList);
while (cur != moveList) while (cur != moveList)
if ( (pinned || from_sq(cur->move) == ksq || type_of(cur->move) == ENPASSANT) if ( (pinned || from_sq(*cur) == ksq || type_of(*cur) == ENPASSANT)
&& !pos.legal(cur->move, pinned)) && !pos.legal(*cur, pinned))
cur->move = (--moveList)->move; *cur = (--moveList)->move;
else else
++cur; ++cur;

2
src/movepick.cpp
View file

@ -245,7 +245,7 @@ void MovePicker::generate_next_stage() {
/* Fall through */ /* Fall through */
case STOP: case STOP:
endMoves = cur + 1; // Avoid another next_phase() call endMoves = cur + 1; // Avoid another generate_next_stage() call
break; break;
default: default: