HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-25 11:36:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert C++11 merge

Browse Source 
Restore the state of repo back to commit 'Simplify pawn code a bit' (1e6d21dbb6)

No functional change
This commit is contained in:
Joona Kiiski
2015-03-07 07:38:22 +00:00
parent 6fa6da3ee1
commit 856a5f3aaa
29 changed files with 987 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/movegen.cpp
View File

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