kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 00:33:09 +00:00
Code Issues Releases Wiki Activity

Small cleanup in init_sliding_attacks()

Browse source 
No functional change both in 32 and 64 bits.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-19 17:48:05 +01:00
parent e8f885145b
commit 59c85346d2
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/bitboard.cpp
View file

@ -235,7 +235,7 @@ namespace {
void init_pseudo_attacks(); void init_pseudo_attacks();
void init_between_bitboards(); void init_between_bitboards();
Bitboard index_to_bitboard(int index, Bitboard mask); Bitboard index_to_bitboard(int index, Bitboard mask);
Bitboard sliding_attacks(int sq, Bitboard block, int dirs, int deltas[][2], Bitboard sliding_attacks(int sq, Bitboard occupied, int deltas[][2],
int fmin, int fmax, int rmin, int rmax); int fmin, int fmax, int rmin, int rmax);
void init_sliding_attacks(Bitboard attacks[], int attackIndex[], Bitboard mask[], void init_sliding_attacks(Bitboard attacks[], int attackIndex[], Bitboard mask[],
const int shift[], const Bitboard mult[], int deltas[][2]); const int shift[], const Bitboard mult[], int deltas[][2]);
@ -405,31 +405,33 @@ namespace {
} }
} }
Bitboard sliding_attacks(int sq, Bitboard block, int dirs, int deltas[][2], Bitboard sliding_attacks(int sq, Bitboard occupied, int deltas[][2],
int fmin=0, int fmax=7, int rmin=0, int rmax=7) { int fmin, int fmax, int rmin, int rmax) {
Bitboard result = 0; int dx, dy, f, r;
int rk = sq / 8; int rk = sq / 8;
int fl = sq % 8; int fl = sq % 8;
Bitboard attacks = EmptyBoardBB;
for (int i = 0; i < dirs; i++) for (int i = 0; i < 4; i++)
{ {
int dx = deltas[i][0]; dx = deltas[i][0];
int dy = deltas[i][1]; dy = deltas[i][1];
int f = fl + dx; f = fl + dx;
int r = rk + dy; r = rk + dy;
while ( (dx == 0 || (f >= fmin && f <= fmax)) while ( (dx == 0 || (f >= fmin && f <= fmax))
&& (dy == 0 || (r >= rmin && r <= rmax))) && (dy == 0 || (r >= rmin && r <= rmax)))
{ {
result |= (1ULL << (f + r*8)); attacks |= (1ULL << (f + r * 8));
if (block & (1ULL << (f + r*8)))
if (occupied & (1ULL << (f + r * 8)))
break; break;
f += dx; f += dx;
r += dy; r += dy;
} }
} }
return result; return attacks;
} }
Bitboard index_to_bitboard(int index, Bitboard mask) { Bitboard index_to_bitboard(int index, Bitboard mask) {
@ -453,7 +455,7 @@ namespace {
for (int i = 0, index = 0; i < 64; i++) for (int i = 0, index = 0; i < 64; i++)
{ {
attackIndex[i] = index; attackIndex[i] = index;
mask[i] = sliding_attacks(i, 0, 4, deltas, 1, 6, 1, 6); mask[i] = sliding_attacks(i, 0, deltas, 1, 6, 1, 6);
#if defined(IS_64BIT) #if defined(IS_64BIT)
int j = (1 << (64 - shift[i])); int j = (1 << (64 - shift[i]));
@ -463,14 +465,14 @@ namespace {
for (int k = 0; k < j; k++) for (int k = 0; k < j; k++)
{ {
Bitboard b = index_to_bitboard(k, mask[i]);
#if defined(IS_64BIT) #if defined(IS_64BIT)
Bitboard b = index_to_bitboard(k, mask[i]); Bitboard v = b * mult[i];
attacks[index + ((b * mult[i]) >> shift[i])] = sliding_attacks(i, b, 4, deltas);
#else #else
Bitboard b = index_to_bitboard(k, mask[i]);
unsigned v = int(b) * int(mult[i]) ^ int(b >> 32) * int(mult[i] >> 32); unsigned v = int(b) * int(mult[i]) ^ int(b >> 32) * int(mult[i] >> 32);
attacks[index + (v >> shift[i])] = sliding_attacks(i, b, 4, deltas);
#endif #endif
attacks[index + (v >> shift[i])] = sliding_attacks(i, b, deltas, 0, 7, 0, 7);
} }
index += j; index += j;
} }

8
src/bitboard.h
View file

@ -190,17 +190,13 @@ inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) {
inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) {
Bitboard b = blockers & RMask[s]; Bitboard b = blockers & RMask[s];
return RAttacks[RAttackIndex[s] + return RAttacks[RAttackIndex[s] +
(unsigned(int(b) * int(RMult[s]) ^ (unsigned(int(b) * int(RMult[s]) ^ int(b >> 32) * int(RMult[s] >> 32)) >> RShift[s])];
int(b >> 32) * int(RMult[s] >> 32))
>> RShift[s])];
} }
inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) {
Bitboard b = blockers & BMask[s]; Bitboard b = blockers & BMask[s];
return BAttacks[BAttackIndex[s] + return BAttacks[BAttackIndex[s] +
(unsigned(int(b) * int(BMult[s]) ^ (unsigned(int(b) * int(BMult[s]) ^ int(b >> 32) * int(BMult[s] >> 32)) >> BShift[s])];
int(b >> 32) * int(BMult[s] >> 32))
>> BShift[s])];
} }
#endif #endif