bruno/brchess
1
0
Fork 0
Code Issues 10 Projects Releases Wiki Activity

simplify bitboard macros & move_gen use bitboard for occupied square

Browse Source
This commit is contained in:
Bruno Raoult
2021-11-12 12:28:44 +01:00
parent bd88da013c
commit 4365838276
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/board.h
View File

@@ -36,7 +36,8 @@ typedef struct board_s {
/* definitions for bitboard representation
*/
#define BB(f, r) (8 * (r) + (f)) /* from rank,file to bitboard */
#define BB(f, r) (1ULL << (8 * (r) + (f))) /* from rank,file to bitboard */
#define SQ88_2_BB(s) (BB(FILE88(s), RANK88(s))) /* from sq88 to bitboard */
#define FILEBB(b) ((b) % 8) /* from sq88 to file */
#define RANKBB(b) ((b) / 8) /* from sq88 to rank */

2
src/fen.c
View File

@@ -83,7 +83,7 @@ pos_t *fen2pos(pos_t *pos, char *fen)
log_i(5, "f=%d r=%d *p=%c piece=%c color=%d\n",
file, rank, *p, cp, color);
# endif
pos->occupied[color] |= (1LL << BB(file, rank));
pos->occupied[color] |= BB(file, rank);
SET_COLOR(piece, color);
board[SQ88(file, rank)].piece = piece;
board[SQ88(file, rank)].s_piece =

36
src/move.c
View File

@@ -280,7 +280,7 @@ int pseudo_moves_pawn(pos_t *pos, piece_list_t *ppiece, bool doit)
# endif
if (SQ88_NOK(new))
continue;
pos->controlled[vcolor] |= (1ULL << BB(FILE88(new), RANK88(new)));
pos->controlled[vcolor] |= SQ88_2_BB(new);
if (board[new].piece && COLOR(board[new].piece) != color) {
//log_f(2, "pawn capture mobility\n");
pos->mobility[vcolor]++;
@@ -374,6 +374,7 @@ int pseudo_moves_gen(pos_t *pos, piece_list_t *ppiece, bool doit)
board_t *board = pos->board;
move_t *move;
int count = 0;
u64 bb_new;
# ifdef DEBUG_MOVE
log_f(1, "pos:%p turn:%s piece:%d [%s %s] at %#04x[%c%c]\n",
@@ -397,22 +398,33 @@ int pseudo_moves_gen(pos_t *pos, piece_list_t *ppiece, bool doit)
# endif
break;
}
bb_new = SQ88_2_BB(new);
# ifdef DEBUG_MOVE
log_i(4, "trying %c%c\n", FILE2C(GET_F(new)), RANK2C(GET_R(new)));
log_i(2, "trying %#x=%c%c bb=%#lx\n",
new, FILE2C(GET_F(new)), RANK2C(GET_R(new)),
bb_new);
//bitboard_print(new_bitboard);
# endif
pos->controlled[vcolor] |= (1ULL << BB(FILE88(new), RANK88(new)));
if (board[new].piece) {
pos->controlled[vcolor] |= bb_new;;
/* king: do not move to opponent controlled square */
if (piece == KING && pos->controlled[OPPONENT(vcolor)] & bb_new) {
# ifdef DEBUG_MOVE
log_i(5, "color=%d color2=%d\n", color, COLOR(board[new].piece));
log_i(1, "%s king cannot move to %c%c\n",
IS_WHITE(color)? "white": "black",
FILE2C(GET_F(new)), RANK2C(GET_R(new)));
# endif
break;
}
if (bb_new & pos->occupied[vcolor]) {
//bitboard_print(pos->occupied[vcolor]);
//bitboard_print(pos->occupied[OPPONENT(vcolor)]);
# ifdef DEBUG_MOVE
log_i(1, "BB: skipping %#llx [%c%c] (same color piece)\n",
new, FILE2C(GET_F(new)), RANK2C(GET_R(new)));
# endif
/* own color on dest square */
if (COLOR(board[new].piece) == color) {
# ifdef DEBUG_MOVE
log_i(5, "skipping %04x (same color piece)\n", new);
# endif
break;
}
}
/* we are sure the move is valid : we create move */