Simplify
parent
18d2ca5055
commit
7932397ed9
|
@ -1,8 +1,8 @@
|
|||
#include "bitboard.h"
|
||||
|
||||
Bitboard FileBB[FILE_NB];
|
||||
Bitboard AdjacentFilesBB[FILE_NB];
|
||||
Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB];
|
||||
Bitboard FileBB[8];
|
||||
Bitboard AdjacentFilesBB[8];
|
||||
Bitboard PawnAttackSpan[2][64];
|
||||
|
||||
/// Bitboards::init() initializes various bitboard tables. It is called at
|
||||
/// startup and relies on global objects to be already zero-initialized.
|
||||
|
@ -10,7 +10,7 @@ Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB];
|
|||
void Bitboards::init() {
|
||||
|
||||
for (File f = FILE_A; f <= FILE_H; ++f)
|
||||
FileBB[f] = f > FILE_A ? FileBB[f - 1] << 1 : FileABB;
|
||||
FileBB[f] = f > FILE_A ? FileBB[f - 1] << 1 : 0x01010101;
|
||||
|
||||
for (File f = FILE_A; f <= FILE_H; ++f)
|
||||
AdjacentFilesBB[f] = (f > FILE_A ? FileBB[f - 1] : 0) | (f < FILE_H ? FileBB[f + 1] : 0);
|
||||
|
|
|
@ -5,24 +5,6 @@
|
|||
|
||||
typedef uint64_t Bitboard;
|
||||
|
||||
enum Color {
|
||||
WHITE, BLACK, NO_COLOR, COLOR_NB = 2
|
||||
};
|
||||
|
||||
enum Square {
|
||||
SQ_A1, SQ_B1, SQ_C1, SQ_D1, SQ_E1, SQ_F1, SQ_G1, SQ_H1,
|
||||
SQ_A2, SQ_B2, SQ_C2, SQ_D2, SQ_E2, SQ_F2, SQ_G2, SQ_H2,
|
||||
SQ_A3, SQ_B3, SQ_C3, SQ_D3, SQ_E3, SQ_F3, SQ_G3, SQ_H3,
|
||||
SQ_A4, SQ_B4, SQ_C4, SQ_D4, SQ_E4, SQ_F4, SQ_G4, SQ_H4,
|
||||
SQ_A5, SQ_B5, SQ_C5, SQ_D5, SQ_E5, SQ_F5, SQ_G5, SQ_H5,
|
||||
SQ_A6, SQ_B6, SQ_C6, SQ_D6, SQ_E6, SQ_F6, SQ_G6, SQ_H6,
|
||||
SQ_A7, SQ_B7, SQ_C7, SQ_D7, SQ_E7, SQ_F7, SQ_G7, SQ_H7,
|
||||
SQ_A8, SQ_B8, SQ_C8, SQ_D8, SQ_E8, SQ_F8, SQ_G8, SQ_H8,
|
||||
SQ_NONE,
|
||||
|
||||
SQUARE_NB = 64
|
||||
};
|
||||
|
||||
enum File {
|
||||
FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NB
|
||||
};
|
||||
|
@ -45,19 +27,10 @@ inline T operator/(T d, int i) { return T(int(d) / i); } \
|
|||
inline int operator/(T d1, T d2) { return int(d1) / int(d2); } \
|
||||
inline T& operator/=(T& d, int i) { return d = T(int(d) / i); }
|
||||
|
||||
ENABLE_FULL_OPERATORS_ON(Color)
|
||||
ENABLE_FULL_OPERATORS_ON(Square)
|
||||
ENABLE_FULL_OPERATORS_ON(File)
|
||||
|
||||
inline File file_of(Square s) {
|
||||
return File(s & 7);
|
||||
}
|
||||
|
||||
namespace Bitboards { void init(); }
|
||||
|
||||
const Bitboard FileABB = 0x0101010101010101ULL;
|
||||
const Bitboard Rank1BB = 0xFF;
|
||||
|
||||
extern Bitboard AdjacentFilesBB[FILE_NB];
|
||||
|
||||
inline Bitboard adjacent_files_bb(File f) {
|
||||
|
|
|
@ -1,5 +1,2 @@
|
|||
#include "bitboard.h"
|
||||
|
||||
int main() {
|
||||
Bitboards::init();
|
||||
}
|
||||
int main() { Bitboards::init(); }
|
||||
|
|
Loading…
Reference in New Issue