From d9113d127b491db0a427a416217d55d3d298c25e Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Wed, 9 Mar 2011 09:58:26 +0100 Subject: [PATCH 1/1] Rename NonSlidingAttacksBB[] in StepAttacksBB[] No functional change. Signed-off-by: Marco Costalba --- src/bitbase.cpp | 6 +++--- src/bitboard.cpp | 10 +++++----- src/bitboard.h | 2 +- src/position.cpp | 4 ++-- src/position.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bitbase.cpp b/src/bitbase.cpp index 0c3230f2..3d4fad99 100644 --- a/src/bitbase.cpp +++ b/src/bitbase.cpp @@ -37,9 +37,9 @@ namespace { bool is_legal() const; bool is_immediate_draw() const; bool is_immediate_win() const; - Bitboard wk_attacks() const { return NonSlidingAttacksBB[WK][whiteKingSquare]; } - Bitboard bk_attacks() const { return NonSlidingAttacksBB[BK][blackKingSquare]; } - Bitboard pawn_attacks() const { return NonSlidingAttacksBB[WP][pawnSquare]; } + Bitboard wk_attacks() const { return StepAttacksBB[WK][whiteKingSquare]; } + Bitboard bk_attacks() const { return StepAttacksBB[BK][blackKingSquare]; } + Bitboard pawn_attacks() const { return StepAttacksBB[WP][pawnSquare]; } Square whiteKingSquare, blackKingSquare, pawnSquare; Color sideToMove; diff --git a/src/bitboard.cpp b/src/bitboard.cpp index bc05bfa0..c4d34aeb 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -214,7 +214,7 @@ Bitboard BAttacks[0x1480]; Bitboard SetMaskBB[65]; Bitboard ClearMaskBB[65]; -Bitboard NonSlidingAttacksBB[16][64]; +Bitboard StepAttacksBB[16][64]; Bitboard BetweenBB[64][64]; Bitboard SquaresInFrontMask[2][64]; @@ -231,7 +231,7 @@ uint8_t BitCount8Bit[256]; namespace { void init_masks(); - void init_non_sliding_attacks(); + void init_step_attacks(); void init_pseudo_attacks(); void init_between_bitboards(); Bitboard index_to_bitboard(int index, Bitboard mask); @@ -347,7 +347,7 @@ void init_bitboards() { int bishopDeltas[4][2] = {{1,1},{-1,1},{1,-1},{-1,-1}}; init_masks(); - init_non_sliding_attacks(); + init_step_attacks(); init_sliding_attacks(RAttacks, RAttackIndex, RMask, RShift, RMult, rookDeltas); init_sliding_attacks(BAttacks, BAttackIndex, BMask, BShift, BMult, bishopDeltas); init_pseudo_attacks(); @@ -384,7 +384,7 @@ namespace { BitCount8Bit[b] = (uint8_t)count_1s(b); } - void init_non_sliding_attacks() { + void init_step_attacks() { const int step[][9] = { {0}, @@ -401,7 +401,7 @@ namespace { Square to = s + Square(step[pc][k]); if (square_is_ok(to) && square_distance(s, to) < 3) - set_bit(&NonSlidingAttacksBB[pc][s], to); + set_bit(&StepAttacksBB[pc][s], to); } } diff --git a/src/bitboard.h b/src/bitboard.h index b962226b..2a4ab166 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -53,7 +53,7 @@ extern const Bitboard InFrontBB[2][8]; extern Bitboard SetMaskBB[65]; extern Bitboard ClearMaskBB[65]; -extern Bitboard NonSlidingAttacksBB[16][64]; +extern Bitboard StepAttacksBB[16][64]; extern Bitboard BetweenBB[64][64]; extern Bitboard SquaresInFrontMask[2][64]; diff --git a/src/position.cpp b/src/position.cpp index d7e0516c..8b6bafe3 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -501,7 +501,7 @@ Bitboard Position::attacks_from(Piece p, Square s) const { case WB: case BB: return attacks_from(s); case WR: case BR: return attacks_from(s); case WQ: case BQ: return attacks_from(s); - default: return NonSlidingAttacksBB[p][s]; + default: return StepAttacksBB[p][s]; } } @@ -514,7 +514,7 @@ Bitboard Position::attacks_from(Piece p, Square s, Bitboard occ) { case WB: case BB: return bishop_attacks_bb(s, occ); case WR: case BR: return rook_attacks_bb(s, occ); case WQ: case BQ: return bishop_attacks_bb(s, occ) | rook_attacks_bb(s, occ); - default: return NonSlidingAttacksBB[p][s]; + default: return StepAttacksBB[p][s]; } } diff --git a/src/position.h b/src/position.h index 7392b9ea..8bd70b16 100644 --- a/src/position.h +++ b/src/position.h @@ -431,12 +431,12 @@ inline Square Position::initial_qr_square(Color c) const { template<> inline Bitboard Position::attacks_from(Square s, Color c) const { - return NonSlidingAttacksBB[make_piece(c, PAWN)][s]; + return StepAttacksBB[make_piece(c, PAWN)][s]; } template // Knight and King and white pawns inline Bitboard Position::attacks_from(Square s) const { - return NonSlidingAttacksBB[Piece][s]; + return StepAttacksBB[Piece][s]; } template<> -- 2.39.2