mirror of
https://github.com/sockspls/badfish
synced 2025-05-01 17:19:36 +00:00
Retire empty_squares()
Use ~pos.occupied_squares() instead and avoid to hide the ~ computation. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
ec5b9994b5
commit
4aadd1e401
2 changed files with 8 additions and 13 deletions
|
@ -155,7 +155,7 @@ namespace {
|
||||||
// Single and double pawn pushes, no promotions
|
// Single and double pawn pushes, no promotions
|
||||||
if (Type != MV_CAPTURE)
|
if (Type != MV_CAPTURE)
|
||||||
{
|
{
|
||||||
emptySquares = (Type == MV_QUIET ? target : pos.empty_squares());
|
emptySquares = (Type == MV_QUIET ? target : ~pos.occupied_squares());
|
||||||
|
|
||||||
b1 = move_pawns<UP>(pawnsNotOn7) & emptySquares;
|
b1 = move_pawns<UP>(pawnsNotOn7) & emptySquares;
|
||||||
b2 = move_pawns<UP>(b1 & TRank3BB) & emptySquares;
|
b2 = move_pawns<UP>(b1 & TRank3BB) & emptySquares;
|
||||||
|
@ -193,7 +193,7 @@ namespace {
|
||||||
if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB)))
|
if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB)))
|
||||||
{
|
{
|
||||||
if (Type == MV_CAPTURE)
|
if (Type == MV_CAPTURE)
|
||||||
emptySquares = pos.empty_squares();
|
emptySquares = ~pos.occupied_squares();
|
||||||
|
|
||||||
if (Type == MV_EVASION)
|
if (Type == MV_EVASION)
|
||||||
emptySquares &= target;
|
emptySquares &= target;
|
||||||
|
@ -246,7 +246,7 @@ namespace {
|
||||||
|
|
||||||
if (*pl != SQ_NONE)
|
if (*pl != SQ_NONE)
|
||||||
{
|
{
|
||||||
target = ci.checkSq[Pt] & pos.empty_squares(); // Non capture checks only
|
target = ci.checkSq[Pt] & ~pos.occupied_squares(); // Non capture checks only
|
||||||
|
|
||||||
do {
|
do {
|
||||||
from = *pl;
|
from = *pl;
|
||||||
|
@ -321,10 +321,10 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) {
|
||||||
target = pos.pieces(~us);
|
target = pos.pieces(~us);
|
||||||
|
|
||||||
else if (Type == MV_QUIET)
|
else if (Type == MV_QUIET)
|
||||||
target = pos.empty_squares();
|
target = ~pos.occupied_squares();
|
||||||
|
|
||||||
else if (Type == MV_NON_EVASION)
|
else if (Type == MV_NON_EVASION)
|
||||||
target = pos.pieces(~us) | pos.empty_squares();
|
target = pos.pieces(~us) | ~pos.occupied_squares();
|
||||||
|
|
||||||
mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target)
|
mlist = (us == WHITE ? generate_pawn_moves<WHITE, Type>(pos, mlist, target)
|
||||||
: generate_pawn_moves<BLACK, Type>(pos, mlist, target));
|
: generate_pawn_moves<BLACK, Type>(pos, mlist, target));
|
||||||
|
@ -369,7 +369,7 @@ MoveStack* generate<MV_QUIET_CHECK>(const Position& pos, MoveStack* mlist) {
|
||||||
if (pt == PAWN)
|
if (pt == PAWN)
|
||||||
continue; // Will be generated togheter with direct checks
|
continue; // Will be generated togheter with direct checks
|
||||||
|
|
||||||
Bitboard b = pos.attacks_from(Piece(pt), from) & pos.empty_squares();
|
Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.occupied_squares();
|
||||||
|
|
||||||
if (pt == KING)
|
if (pt == KING)
|
||||||
b &= ~PseudoAttacks[QUEEN][ci.ksq];
|
b &= ~PseudoAttacks[QUEEN][ci.ksq];
|
||||||
|
|
|
@ -108,7 +108,6 @@ public:
|
||||||
Color side_to_move() const;
|
Color side_to_move() const;
|
||||||
|
|
||||||
// Bitboard representation of the position
|
// Bitboard representation of the position
|
||||||
Bitboard empty_squares() const;
|
|
||||||
Bitboard occupied_squares() const;
|
Bitboard occupied_squares() const;
|
||||||
Bitboard pieces(Color c) const;
|
Bitboard pieces(Color c) const;
|
||||||
Bitboard pieces(PieceType pt) const;
|
Bitboard pieces(PieceType pt) const;
|
||||||
|
@ -291,10 +290,6 @@ inline Bitboard Position::occupied_squares() const {
|
||||||
return occupied;
|
return occupied;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Bitboard Position::empty_squares() const {
|
|
||||||
return ~occupied;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Bitboard Position::pieces(Color c) const {
|
inline Bitboard Position::pieces(Color c) const {
|
||||||
return byColorBB[c];
|
return byColorBB[c];
|
||||||
}
|
}
|
||||||
|
@ -356,11 +351,11 @@ inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Bitboard Position::attacks_from(Piece p, Square s) const {
|
inline Bitboard Position::attacks_from(Piece p, Square s) const {
|
||||||
return attacks_from(p, s, occupied_squares());
|
return attacks_from(p, s, occupied);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Bitboard Position::attackers_to(Square s) const {
|
inline Bitboard Position::attackers_to(Square s) const {
|
||||||
return attackers_to(s, occupied_squares());
|
return attackers_to(s, occupied);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Bitboard Position::checkers() const {
|
inline Bitboard Position::checkers() const {
|
||||||
|
|
Loading…
Add table
Reference in a new issue