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

Use compiler name lookup to simplify code

Browse Source 
We don't need different names between a function and a
template. Compiler will know when use one or the other.

This let use restore original count_1s_xx() names instead of
sw_count_1s_xxx so to simplify a bit the code.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2009-05-24 10:15:23 +01:00
parent 6c9a64124a
commit 76024ac40e
7 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/evaluate.cpp
View File

@@ -494,8 +494,8 @@ void init_eval(int threads) {
for (Bitboard b = 0ULL; b < 256ULL; b++)
{
assert(count_1s<false>(b) == int(uint8_t(count_1s<false>(b))));
BitCount8Bit[b] = (uint8_t)count_1s<false>(b);
assert(count_1s(b) == int(uint8_t(count_1s(b))));
BitCount8Bit[b] = (uint8_t)count_1s(b);
}
}
@@ -757,7 +757,7 @@ namespace {
// quality of the pawn shelter.
int attackUnits =
Min((ei.kingAttackersCount[them] * ei.kingAttackersWeight[them]) / 2, 25)
+ (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15<false>(undefended)) * 3
+ (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3
+ InitKingDanger[relative_square(us, s)] - (shelter >> 5);
// Analyse safe queen contact checks
@@ -773,7 +773,7 @@ namespace {
{
// The bitboard b now contains the squares available for safe queen
// contact checks.
int count = count_1s_max_15<false>(b);
int count = count_1s_max_15(b);
attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1);
// Is there a mate threat?
@@ -813,12 +813,12 @@ namespace {
// Queen checks
b2 = b & ei.attacked_by(them, QUEEN);
if( b2)
attackUnits += QueenCheckBonus * count_1s_max_15<false>(b2);
attackUnits += QueenCheckBonus * count_1s_max_15(b2);
// Rook checks
b2 = b & ei.attacked_by(them, ROOK);
if (b2)
attackUnits += RookCheckBonus * count_1s_max_15<false>(b2);
attackUnits += RookCheckBonus * count_1s_max_15(b2);
}
if (QueenCheckBonus > 0 || BishopCheckBonus > 0)
{
@@ -827,12 +827,12 @@ namespace {
// Queen checks
b2 = b & ei.attacked_by(them, QUEEN);
if (b2)
attackUnits += QueenCheckBonus * count_1s_max_15<false>(b2);
attackUnits += QueenCheckBonus * count_1s_max_15(b2);
// Bishop checks
b2 = b & ei.attacked_by(them, BISHOP);
if (b2)
attackUnits += BishopCheckBonus * count_1s_max_15<false>(b2);
attackUnits += BishopCheckBonus * count_1s_max_15(b2);
}
if (KnightCheckBonus > 0)
{
@@ -841,7 +841,7 @@ namespace {
// Knight checks
b2 = b & ei.attacked_by(them, KNIGHT);
if (b2)
attackUnits += KnightCheckBonus * count_1s_max_15<false>(b2);
attackUnits += KnightCheckBonus * count_1s_max_15(b2);
}
// Analyse discovered checks (only for non-pawns right now, consider
@@ -850,7 +850,7 @@ namespace {
{
b = p.discovered_check_candidates(them) & ~p.pawns();
if (b)
attackUnits += DiscoveredCheckBonus * count_1s_max_15<false>(b) * (sente? 2 : 1);
attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1);
}
// Has a mate threat been found? We don't do anything here if the
@@ -985,7 +985,7 @@ namespace {
if (d < 0)
{
int mtg = RANK_8 - relative_rank(us, s);
int blockerCount = count_1s_max_15<false>(squares_in_front_of(us,s) & pos.occupied_squares());
int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares());
mtg += blockerCount;
d += blockerCount;
if (d < 0)
@@ -1146,8 +1146,8 @@ namespace {
behindFriendlyPawns |= (behindFriendlyPawns << 16);
}
int space = count_1s_max_15<false>(safeSquares)
+ count_1s_max_15<false>(behindFriendlyPawns & safeSquares);
int space = count_1s_max_15(safeSquares)
+ count_1s_max_15(behindFriendlyPawns & safeSquares);
ei.mgValue += Sign[us] * apply_weight(Value(space * ei.mi->space_weight()), WeightSpace);
}