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

Magic::index()

Browse Source 
Make magic_index() a member of Magic since it uses all it's members
and keep us from having to pass the function pointer around to
init_magics().

No functional change

Closes #1146
This commit is contained in:
mstembera
2017-06-28 17:11:17 -07:00
committed by Joona Kiiski
parent 7e897a64f2
commit 69eb391cd7
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bitboard.cpp
View File

@@ -54,9 +54,7 @@ namespace {
Bitboard RookTable[0x19000]; // To store rook attacks
Bitboard BishopTable[0x1480]; // To store bishop attacks
typedef unsigned (Fn)(const Magic&, Bitboard);
void init_magics(Bitboard table[], Magic magics[], Square deltas[], Fn index);
void init_magics(Bitboard table[], Magic magics[], Square deltas[]);
// bsf_index() returns the index into BSFTable[] to look up the bitscan. Uses
// Matt Taylor's folding for 32 bit case, extended to 64 bit by Kim Walisch.
@@ -204,8 +202,8 @@ void Bitboards::init() {
Square RookDeltas[] = { NORTH, EAST, SOUTH, WEST };
Square BishopDeltas[] = { NORTH_EAST, SOUTH_EAST, SOUTH_WEST, NORTH_WEST };
init_magics(RookTable, RookMagics, RookDeltas, magic_index);
init_magics(BishopTable, BishopMagics, BishopDeltas, magic_index);
init_magics(RookTable, RookMagics, RookDeltas);
init_magics(BishopTable, BishopMagics, BishopDeltas);
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
{
@@ -251,7 +249,7 @@ namespace {
// chessprogramming.wikispaces.com/Magic+Bitboards. In particular, here we
// use the so called "fancy" approach.
void init_magics(Bitboard table[], Magic magics[], Square deltas[], Fn index) {
void init_magics(Bitboard table[], Magic magics[], Square deltas[]) {
int seeds[][RANK_NB] = { { 8977, 44560, 54343, 38998, 5731, 95205, 104912, 17020 },
{ 728, 10316, 55013, 32803, 12281, 15100, 16645, 255 } };
@@ -311,7 +309,7 @@ namespace {
// m.attacks[] after every failed attempt.
for (++cnt, i = 0; i < size; ++i)
{
unsigned idx = index(m, occupancy[i]);
unsigned idx = m.index(occupancy[i]);
if (epoch[idx] < cnt)
{