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

Move SquareDistance[] to bitboard.cpp

Browse Source 
No functional change.
This commit is contained in:
Marco Costalba
2013-06-23 13:08:10 +02:00
parent 908d98820b
commit 8cff4862a6
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bitboard.h
View File

@@ -80,6 +80,8 @@ extern Bitboard PassedPawnMask[COLOR_NB][SQUARE_NB];
extern Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB]; extern Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB];
extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB]; extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
extern int SquareDistance[SQUARE_NB][SQUARE_NB];
const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL; const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL;
/// Overloads of bitwise operators between a Bitboard and a Square for testing /// Overloads of bitwise operators between a Bitboard and a Square for testing
@@ -105,13 +107,22 @@ inline Bitboard operator^(Bitboard b, Square s) {
return b ^ SquareBB[s]; return b ^ SquareBB[s];
} }
/// more_than_one() returns true if in 'b' there is more than one bit set
inline bool more_than_one(Bitboard b) { inline bool more_than_one(Bitboard b) {
return b & (b - 1); return b & (b - 1);
} }
inline int square_distance(Square s1, Square s2) {
return SquareDistance[s1][s2];
}
inline int file_distance(Square s1, Square s2) {
return abs(file_of(s1) - file_of(s2));
}
inline int rank_distance(Square s1, Square s2) {
return abs(rank_of(s1) - rank_of(s2));
}
/// shift_bb() moves bitboard one step along direction Delta. Mainly for pawns. /// shift_bb() moves bitboard one step along direction Delta. Mainly for pawns.

13
src/types.h
View File

@@ -310,7 +310,6 @@ inline Score operator/(Score s, int i) {
#undef ENABLE_SAFE_OPERATORS_ON #undef ENABLE_SAFE_OPERATORS_ON
extern Value PieceValue[PHASE_NB][PIECE_NB]; extern Value PieceValue[PHASE_NB][PIECE_NB];
extern int SquareDistance[SQUARE_NB][SQUARE_NB];
struct MoveStack { struct MoveStack {
Move move; Move move;
@@ -391,18 +390,6 @@ inline bool opposite_colors(Square s1, Square s2) {
return ((s >> 3) ^ s) & 1; return ((s >> 3) ^ s) & 1;
} }
inline int file_distance(Square s1, Square s2) {
return abs(file_of(s1) - file_of(s2));
}
inline int rank_distance(Square s1, Square s2) {
return abs(rank_of(s1) - rank_of(s2));
}
inline int square_distance(Square s1, Square s2) {
return SquareDistance[s1][s2];
}
inline char file_to_char(File f, bool tolower = true) { inline char file_to_char(File f, bool tolower = true) {
return char(f - FILE_A + (tolower ? 'a' : 'A')); return char(f - FILE_A + (tolower ? 'a' : 'A'));
} }