quintenk
/
ArduChess
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put more stuff in namespaces

This commit is contained in:
Quinten Kock 2020-06-20 03:28:30 +02:00
parent 21e956519e
commit e00f9231fb
4 changed files with 383 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduChess.ino
View File

@ -12,7 +12,7 @@
void setup() { void setup() {
// put your setup code here, to run once: // put your setup code here, to run once:
board_init(); Board::init();
Serial.begin(115200); Serial.begin(115200);
pinMode(LED_BUILTIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);
//perft_test(); //perft_test();
@ -21,5 +21,5 @@ void setup() {
void loop() { void loop() {
// put your main code here, to run repeatedly: // put your main code here, to run repeatedly:
handle_uci(); Uci::handle_uci();
} }

530
Board.h
View File

@ -5,287 +5,291 @@
#include "Panic.h" #include "Panic.h"
#include "Move.h" #include "Move.h"
#define BOARD_DEFAULT_VALUE { \ namespace Board {
W_ROOK, W_KNGT, W_BSHP, W_QUEN, W_KING, W_BSHP, W_KNGT, W_ROOK, 0, 0, 0, 0, 0, 0, 0, 0, \
W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, 0, 0, 0, 0, 0, 0, 0, 0, \
B_ROOK, B_KNGT, B_BSHP, B_QUEN, B_KING, B_BSHP, B_KNGT, B_ROOK, 0, 0, 0, 0, 0, 0, 0, 0, \
};
// 0x88-fill definitions #define BOARD_DEFAULT_VALUE { \
#define PTR_SIDE_AND_CASTLERIGHT 0x08 //byte (1=side, 2,4=white castle, 8,16=black) W_ROOK, W_KNGT, W_BSHP, W_QUEN, W_KING, W_BSHP, W_KNGT, W_ROOK, 0, 0, 0, 0, 0, 0, 0, 0, \
// CAN FILL 0x09 W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, W_PAWN, 0, 0, 0, 0, 0, 0, 0, 0, \
#define PTR_W_KING 0x0A // byte (points to index or maybe 64-arr index) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
#define PTR_B_KING 0x0B // (PTR_W_KING | COLOR or PTR_W_KING + COLOR) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
#define PTR_ZOBRIST 0x0C // 4 bytes 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
// 0x0D 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
// 0x0E B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, B_PAWN, 0, 0, 0, 0, 0, 0, 0, 0, \
// 0x0F B_ROOK, B_KNGT, B_BSHP, B_QUEN, B_KING, B_BSHP, B_KNGT, B_ROOK, 0, 0, 0, 0, 0, 0, 0, 0, \
};
#define PTR_ENPASSANT 0x18 // 0x88-fill definitions
#define PTR_REVMOV 0x19 #define PTR_SIDE_AND_CASTLERIGHT 0x08 //byte (1=side, 2,4=white castle, 8,16=black)
// free space // CAN FILL 0x09
#define PTR_W_KING 0x0A // byte (points to index or maybe 64-arr index)
#define PTR_B_KING 0x0B // (PTR_W_KING | COLOR or PTR_W_KING + COLOR)
#define PTR_ZOBRIST 0x0C // 4 bytes
// 0x0D
// 0x0E
// 0x0F
#define PTR_UNMOVE_START 0x28 #define PTR_ENPASSANT 0x18
#define PTR_UNMOVE_LAST 0x7F #define PTR_REVMOV 0x19
// free space
byte field[128]; #define PTR_UNMOVE_START 0x28
byte PTR_UNMOVE; #define PTR_UNMOVE_LAST 0x7F
const byte field_default_value[] PROGMEM = BOARD_DEFAULT_VALUE; byte field[128];
byte PTR_UNMOVE;
void board_init() { const byte field_default_value[] PROGMEM = BOARD_DEFAULT_VALUE;
for(int i = 0; i < 128; i++) {
field[i] = pgm_read_byte_near(field_default_value + i);
}
PTR_UNMOVE = PTR_UNMOVE_START;
field[PTR_SIDE_AND_CASTLERIGHT] = 0b11110; // all castle rights allowed, white to move
field[PTR_W_KING] = 0x04; // e1
field[PTR_B_KING] = 0x74; // e8
long* zob = (long*)&field[PTR_ZOBRIST];
*zob = 0xDEADBEEF;
}
void init() {
for(int i = 0; i < 128; i++) {
struct Unmove { field[i] = pgm_read_byte_near(field_default_value + i);
byte sq_from; // 0b(1kingside_castle?)(3rank)(1queenside_castle?)(3file)
byte sq_to; // 0b(1promoted?)(3rank)(1ep_capture?)(3file)
byte captured; // 0b(4enpassantinfo)(1color)(3piecetype)
byte revmov; // 8bit integer
};
bool black_moving() {
return field[PTR_SIDE_AND_CASTLERIGHT] & 0x1;
}
unsigned long get_zobrist() {
long* addr = (long*) &field[PTR_ZOBRIST];
return *addr;
}
void reset_unmake_stack() {
PTR_UNMOVE = PTR_UNMOVE_START;
}
void next_unmove() {
PTR_UNMOVE++;
if(PTR_UNMOVE > PTR_UNMOVE_LAST) {
panic(F("Unmove stack overflow"));
}
if(!(PTR_UNMOVE & 0x8)) {
PTR_UNMOVE += 0x8;
}
}
void prev_unmove() {
PTR_UNMOVE--;
if(PTR_UNMOVE < PTR_UNMOVE_START) {
panic(F("Unmaking from empty stack"));
}
if(!(PTR_UNMOVE & 0x8)) {
PTR_UNMOVE -= 0x8;
}
}
void store_unmove(Unmove u) {
byte *ub = (byte*) &u;
for(byte i = 0; i < sizeof(u); i++) {
field[PTR_UNMOVE] = ub[i];
next_unmove();
}
}
Unmove read_unmove() {
Unmove u;
byte* ptr = (byte*) &u;
for(int i = sizeof(u) - 1; i >= 0; i--) {
prev_unmove();
ptr[i] = field[PTR_UNMOVE];
#ifdef _ACF_CLEAR_UNMOVE
field[PTR_UNMOVE] = 0;
#endif
}
return u;
}
void print() {
Serial.println(F("BOARD:"));
for(char i = 7; i >= 0; i--) {
for(byte j = 0; j < 16; j++) {
if(j == 8)
Serial.print(F("| "));
Serial.print(field[i*16 + j], HEX);
Serial.print(F(" "));
} }
Serial.println(); PTR_UNMOVE = PTR_UNMOVE_START;
} field[PTR_SIDE_AND_CASTLERIGHT] = 0b11110; // all castle rights allowed, white to move
} field[PTR_W_KING] = 0x04; // e1
field[PTR_B_KING] = 0x74; // e8
void make(Move m) { long* zob = (long*)&field[PTR_ZOBRIST];
// TODO zobrist? *zob = 0xDEADBEEF;
// fill unmove struct with basic data
Unmove u;
u.revmov = field[PTR_REVMOV];
u.captured = field[m.sq_to] | (field[PTR_ENPASSANT] << 4);
u.sq_from = m.sq_from;
u.sq_to = m.sq_to;
byte piece_type = field[m.sq_from] & 0x7;
byte color = black_moving();
if(field[m.sq_to] || piece_type == W_PAWN) {
field[PTR_REVMOV] = 0;
} else {
field[PTR_REVMOV]++;
} }
// Calculate the move 'amount' (unique signature for dx,dy)
int sq_diff = (int)m.sq_to - (int)m.sq_from;
int sq_diff_abs = abs(sq_diff);
// TODO test the castling code more extensively struct Unmove {
// Handle castling byte sq_from; // 0b(1kingside_castle?)(3rank)(1queenside_castle?)(3file)
if(piece_type == W_KING && sq_diff_abs == 2) { byte sq_to; // 0b(1promoted?)(3rank)(1ep_capture?)(3file)
// We are castling! After all, a king cannot move byte captured; // 0b(4enpassantinfo)(1color)(3piecetype)
// more than one position except when castling. byte revmov; // 8bit integer
// Since we don't care about legality; just do it };
byte castle_source = (color ? 0x70 : 0x0);
if(sq_diff == 2) { bool black_moving() {
castle_source += 0x7; return field[PTR_SIDE_AND_CASTLERIGHT] & 0x1;
}
unsigned long get_zobrist() {
long* addr = (long*) &field[PTR_ZOBRIST];
return *addr;
}
void reset_unmake_stack() {
PTR_UNMOVE = PTR_UNMOVE_START;
}
void next_unmove() {
PTR_UNMOVE++;
if(PTR_UNMOVE > PTR_UNMOVE_LAST) {
panic(F("Unmove stack overflow"));
} }
byte castle_target = m.sq_from + (sq_diff/2); if(!(PTR_UNMOVE & 0x8)) {
field[castle_target] = field[castle_source]; PTR_UNMOVE += 0x8;
field[castle_source] = P_EMPTY;
}
// Handle castling rights
// First store the current rights in the unmove
byte our_rights = field[PTR_SIDE_AND_CASTLERIGHT] >> (color ? 3 : 1);
if(our_rights & 0b10) // kingside allowed
u.sq_from |= 0x80;
if(our_rights & 0b01) // queenside allowed
u.sq_from |= 0x08;
// We are doing the simple way:
// unset it any time a move is made from the original position.
if(m.sq_from == 0x00) // white queenside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00010;
else if(m.sq_from == 0x07) // white kingside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00100;
else if(m.sq_from == 0x04) // white king
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00110;
else if(m.sq_from == 0x70) // black queenside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b01000;
else if(m.sq_from == 0x77) // black kingside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b10000;
else if(m.sq_from == 0x74) // black king
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b11000;
// TODO: test enpassant code more than basics
// handle enpassant capture
if(
field[PTR_ENPASSANT] &&
piece_type == W_PAWN &&
(m.sq_to & 0x7) == (field[PTR_ENPASSANT] & 0x7) &&
(m.sq_to & 0x70) == (color ? 0x20 : 0x50)
) {
// all EP-conditions are met
// therefore, delete the EP-vurnerable pawn
byte ep_field = m.sq_to + (color ? 16 : -16);
field[ep_field] = P_EMPTY;
// also put information that we did an EP-capture
u.sq_to |= 0x08;
}
// handle enpassant setup (double pawn move)
if(
piece_type == W_PAWN &&
sq_diff_abs == 32
) {
// we are doing a pawn double-move.
// therefore, it allows enpassant in the next move.
field[PTR_ENPASSANT] = 0b1000 | (m.sq_from & 0x7);
} else {
// no enpassant in the next turn.
field[PTR_ENPASSANT] = 0;
}
// are we promoting?
if(m.pc_prom != P_EMPTY) {
// promoting; indicate this in the sq_to byte in unmove.
field[m.sq_to] = m.pc_prom;
u.sq_to |= 0x80;
} else {
// not promoting; so keep the same piece type
field[m.sq_to] = field[m.sq_from];
}
// then delete the original copy.
field[m.sq_from] = P_EMPTY;
// Switch sides
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01;
store_unmove(u);
}
void unmake() {
Unmove u = read_unmove();
field[PTR_REVMOV] = u.revmov;
byte sq_from = u.sq_from & 0x77;
byte sq_to = u.sq_to & 0x77;
byte prom_ep_capt = u.sq_to & 0x88;
if(prom_ep_capt == 0) {
// regular move
field[sq_from] = field[sq_to];
} else if (prom_ep_capt == 0x80) {
// piece was promoted
// so the source is a pawn
field[sq_from] = W_PAWN | (field[sq_to] & 0b1000);
} else if (prom_ep_capt == 0x08) {
// we did an enpassant capture
byte ep_sq = (sq_to & 0x07) | (sq_from & 0x70);
field[ep_sq] = W_PAWN | black_moving() << 3;
// also undo the regular move
field[sq_from] = field[sq_to];
}
byte castleright_offset = 3 - 2*black_moving();
if(u.sq_from & 0x80) {
// restore king side castling rights
field[PTR_SIDE_AND_CASTLERIGHT] |= 0b10 << castleright_offset;
}
if(u.sq_from & 0x08) {
field[PTR_SIDE_AND_CASTLERIGHT] |= 0b01 << castleright_offset;
}
int sq_diff = (int)sq_to - (int)sq_from;
int sq_diff_abs = abs(sq_diff);
if((field[sq_from] & 0x7) == W_KING && sq_diff_abs == 2) {
// we castled
byte castle_source = 0x70*!black_moving();
if(sq_diff == 2) {
castle_source += 0x7;
} }
byte castle_target = sq_from + (sq_diff/2); }
// move rook back to original position void prev_unmove() {
field[castle_source] = field[castle_target]; PTR_UNMOVE--;
// and clear where it was put if(PTR_UNMOVE < PTR_UNMOVE_START) {
field[castle_target] = P_EMPTY; panic(F("Unmaking from empty stack"));
}
if(!(PTR_UNMOVE & 0x8)) {
PTR_UNMOVE -= 0x8;
}
}
void store_unmove(Unmove u) {
byte *ub = (byte*) &u;
for(byte i = 0; i < sizeof(u); i++) {
field[PTR_UNMOVE] = ub[i];
next_unmove();
}
}
Unmove read_unmove() {
Unmove u;
byte* ptr = (byte*) &u;
for(int i = sizeof(u) - 1; i >= 0; i--) {
prev_unmove();
ptr[i] = field[PTR_UNMOVE];
#ifdef _ACF_CLEAR_UNMOVE
field[PTR_UNMOVE] = 0;
#endif
}
return u;
} }
field[sq_to] = u.captured & 0b1111; void print() {
Serial.println(F("BOARD:"));
for(char i = 7; i >= 0; i--) {
for(byte j = 0; j < 16; j++) {
if(j == 8)
Serial.print(F("| "));
Serial.print(field[i*16 + j], HEX);
Serial.print(F(" "));
}
Serial.println();
}
}
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01; void make(Move m) {
field[PTR_ENPASSANT] = u.captured >> 4; // TODO zobrist?
// fill unmove struct with basic data
Unmove u;
u.revmov = field[PTR_REVMOV];
u.captured = field[m.sq_to] | (field[PTR_ENPASSANT] << 4);
u.sq_from = m.sq_from;
u.sq_to = m.sq_to;
byte piece_type = field[m.sq_from] & 0x7;
byte color = black_moving();
if(field[m.sq_to] || piece_type == W_PAWN) {
field[PTR_REVMOV] = 0;
} else {
field[PTR_REVMOV]++;
}
// Calculate the move 'amount' (unique signature for dx,dy)
int sq_diff = (int)m.sq_to - (int)m.sq_from;
int sq_diff_abs = abs(sq_diff);
// TODO test the castling code more extensively
// Handle castling
if(piece_type == W_KING && sq_diff_abs == 2) {
// We are castling! After all, a king cannot move
// more than one position except when castling.
// Since we don't care about legality; just do it
byte castle_source = (color ? 0x70 : 0x0);
if(sq_diff == 2) {
castle_source += 0x7;
}
byte castle_target = m.sq_from + (sq_diff/2);
field[castle_target] = field[castle_source];
field[castle_source] = P_EMPTY;
}
// Handle castling rights
// First store the current rights in the unmove
byte our_rights = field[PTR_SIDE_AND_CASTLERIGHT] >> (color ? 3 : 1);
if(our_rights & 0b10) // kingside allowed
u.sq_from |= 0x80;
if(our_rights & 0b01) // queenside allowed
u.sq_from |= 0x08;
// We are doing the simple way:
// unset it any time a move is made from the original position.
if(m.sq_from == 0x00) // white queenside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00010;
else if(m.sq_from == 0x07) // white kingside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00100;
else if(m.sq_from == 0x04) // white king
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b00110;
else if(m.sq_from == 0x70) // black queenside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b01000;
else if(m.sq_from == 0x77) // black kingside rook
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b10000;
else if(m.sq_from == 0x74) // black king
field[PTR_SIDE_AND_CASTLERIGHT] &= ~0b11000;
// TODO: test enpassant code more than basics
// handle enpassant capture
if(
field[PTR_ENPASSANT] &&
piece_type == W_PAWN &&
(m.sq_to & 0x7) == (field[PTR_ENPASSANT] & 0x7) &&
(m.sq_to & 0x70) == (color ? 0x20 : 0x50)
) {
// all EP-conditions are met
// therefore, delete the EP-vurnerable pawn
byte ep_field = m.sq_to + (color ? 16 : -16);
field[ep_field] = P_EMPTY;
// also put information that we did an EP-capture
u.sq_to |= 0x08;
}
// handle enpassant setup (double pawn move)
if(
piece_type == W_PAWN &&
sq_diff_abs == 32
) {
// we are doing a pawn double-move.
// therefore, it allows enpassant in the next move.
field[PTR_ENPASSANT] = 0b1000 | (m.sq_from & 0x7);
} else {
// no enpassant in the next turn.
field[PTR_ENPASSANT] = 0;
}
// are we promoting?
if(m.pc_prom != P_EMPTY) {
// promoting; indicate this in the sq_to byte in unmove.
field[m.sq_to] = m.pc_prom;
u.sq_to |= 0x80;
} else {
// not promoting; so keep the same piece type
field[m.sq_to] = field[m.sq_from];
}
// then delete the original copy.
field[m.sq_from] = P_EMPTY;
// Switch sides
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01;
store_unmove(u);
}
void unmake() {
Unmove u = read_unmove();
field[PTR_REVMOV] = u.revmov;
byte sq_from = u.sq_from & 0x77;
byte sq_to = u.sq_to & 0x77;
byte prom_ep_capt = u.sq_to & 0x88;
if(prom_ep_capt == 0) {
// regular move
field[sq_from] = field[sq_to];
} else if (prom_ep_capt == 0x80) {
// piece was promoted
// so the source is a pawn
field[sq_from] = W_PAWN | (field[sq_to] & 0b1000);
} else if (prom_ep_capt == 0x08) {
// we did an enpassant capture
byte ep_sq = (sq_to & 0x07) | (sq_from & 0x70);
field[ep_sq] = W_PAWN | black_moving() << 3;
// also undo the regular move
field[sq_from] = field[sq_to];
}
byte castleright_offset = 3 - 2*black_moving();
if(u.sq_from & 0x80) {
// restore king side castling rights
field[PTR_SIDE_AND_CASTLERIGHT] |= 0b10 << castleright_offset;
}
if(u.sq_from & 0x08) {
field[PTR_SIDE_AND_CASTLERIGHT] |= 0b01 << castleright_offset;
}
int sq_diff = (int)sq_to - (int)sq_from;
int sq_diff_abs = abs(sq_diff);
if((field[sq_from] & 0x7) == W_KING && sq_diff_abs == 2) {
// we castled
byte castle_source = 0x70*!black_moving();
if(sq_diff == 2) {
castle_source += 0x7;
}
byte castle_target = sq_from + (sq_diff/2);
// move rook back to original position
field[castle_source] = field[castle_target];
// and clear where it was put
field[castle_target] = P_EMPTY;
}
field[sq_to] = u.captured & 0b1111;
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01;
field[PTR_ENPASSANT] = u.captured >> 4;
}
} }

38
Movegen.h
View File

@ -28,11 +28,11 @@ Move Movegen::next_move() {
while(square <= 0x77) { while(square <= 0x77) {
if(square & 0x88) square += 8; if(square & 0x88) square += 8;
byte piece_type = field[square] & 0x7; byte piece_type = Board::field[square] & 0x7;
if( if(
(field[square] & 0x7) && (Board::field[square] & 0x7) &&
(field[square] & 0x8) == black_moving() << 3 (Board::field[square] & 0x8) == Board::black_moving() << 3
) { ) {
// there is an own piece to investigate // there is an own piece to investigate
Move m; Move m;
@ -78,8 +78,8 @@ Move Movegen::generate_sliding(byte piece_type) {
} }
// currently, we are at the next move target // currently, we are at the next move target
// this means: we can try to generate this as a move! // this means: we can try to generate this as a move!
byte piece = field[square]; byte piece = Board::field[square];
byte target = field[target_square]; byte target = Board::field[target_square];
if(target) { if(target) {
// we encountered a piece! there are two outcomes here: // we encountered a piece! there are two outcomes here:
// second, it can be the opponent's. then, we can capture it! // second, it can be the opponent's. then, we can capture it!
@ -112,8 +112,8 @@ Move Movegen::generate_non_sliding(byte piece_type) {
direction++; direction++;
byte target = field[target_square]; byte target = Board::field[target_square];
byte piece = field[square]; byte piece = Board::field[square];
if((target_square & 0x88) || (target && (target & 0x8) == (piece & 0x8))) { if((target_square & 0x88) || (target && (target & 0x8) == (piece & 0x8))) {
// uh oh, off board or same color obstacle // uh oh, off board or same color obstacle
@ -125,7 +125,7 @@ Move Movegen::generate_non_sliding(byte piece_type) {
Move Movegen::generate_pawn() { Move Movegen::generate_pawn() {
// TODO: implement capture promotion // TODO: implement capture promotion
byte color = black_moving(); byte color = Board::black_moving();
byte offset; byte offset;
byte target; byte target;
GP_START: GP_START:
@ -135,7 +135,7 @@ Move Movegen::generate_pawn() {
direction = 1; // next try, go ahead further direction = 1; // next try, go ahead further
offset = color ? -0x10 : 0x10; offset = color ? -0x10 : 0x10;
target_square = square + offset; target_square = square + offset;
if(field[target_square] || if(Board::field[target_square] ||
(square & 0x70) == (color ? 0x10 : 0x60) (square & 0x70) == (color ? 0x10 : 0x60)
) { ) {
// moving ahead is not possible, not even a capture! // moving ahead is not possible, not even a capture!
@ -152,7 +152,7 @@ Move Movegen::generate_pawn() {
direction = 2; direction = 2;
offset = color ? -0x20 : 0x20; offset = color ? -0x20 : 0x20;
target_square = square + offset; target_square = square + offset;
if(!(field[target_square]) && if(!(Board::field[target_square]) &&
(square & 0x70) == (color ? 0x60 : 0x10) (square & 0x70) == (color ? 0x60 : 0x10)
) { ) {
return Move{square, target_square, P_EMPTY}; return Move{square, target_square, P_EMPTY};
@ -165,15 +165,15 @@ Move Movegen::generate_pawn() {
direction = 3; direction = 3;
offset = color ? -0x11 : 0xF; offset = color ? -0x11 : 0xF;
target_square = square + offset; target_square = square + offset;
target = field[target_square]; target = Board::field[target_square];
if(!(target_square & 0x88)) { if(!(target_square & 0x88)) {
if(target && (target & 0x8) != (field[square] & 0x8)) { if(target && (target & 0x8) != (Board::field[square] & 0x8)) {
// normal capture allowded // normal capture allowded
return Move{square, target_square, P_EMPTY}; return Move{square, target_square, P_EMPTY};
} else if(field[PTR_ENPASSANT]) { } else if(Board::field[PTR_ENPASSANT]) {
// note that EP being legal only happens // note that EP being legal only happens
// when the target field is empty. so this saves some effort. // when the target field is empty. so this saves some effort.
byte ep_col = field[PTR_ENPASSANT] & 0x7; byte ep_col = Board::field[PTR_ENPASSANT] & 0x7;
if( if(
ep_col == (target_square & 0x7) && ep_col == (target_square & 0x7) &&
(square & 0x70) == (color ? 0x30 : 0x40) (square & 0x70) == (color ? 0x30 : 0x40)
@ -189,15 +189,15 @@ Move Movegen::generate_pawn() {
direction = 4; direction = 4;
offset = color ? -0xF : 0x11; offset = color ? -0xF : 0x11;
target_square = square + offset; target_square = square + offset;
target = field[target_square]; target = Board::field[target_square];
if(!(target_square & 0x88)) { if(!(target_square & 0x88)) {
if(target && (target & 0x8) != (field[square] & 0x8)) { if(target && (target & 0x8) != (Board::field[square] & 0x8)) {
// normal capture allowded // normal capture allowded
return Move{square, target_square, P_EMPTY}; return Move{square, target_square, P_EMPTY};
} else if(field[PTR_ENPASSANT]) { } else if(Board::field[PTR_ENPASSANT]) {
// note that EP being legal only happens // note that EP being legal only happens
// when the target field is empty. so this saves some effort. // when the target field is empty. so this saves some effort.
byte ep_col = field[PTR_ENPASSANT] & 0x7; byte ep_col = Board::field[PTR_ENPASSANT] & 0x7;
if( if(
ep_col == (target_square & 0x7) && ep_col == (target_square & 0x7) &&
(square & 0x70) == (color ? 0x30 : 0x40) (square & 0x70) == (color ? 0x30 : 0x40)
@ -213,7 +213,7 @@ Move Movegen::generate_pawn() {
direction = 5; direction = 5;
offset = color ? -0x10 : 0x10; offset = color ? -0x10 : 0x10;
target_square = square + offset; target_square = square + offset;
target = field[target_square]; target = Board::field[target_square];
if(target && (target_square & 0x70) == (color ? 0x70 : 0x00)) { if(target && (target_square & 0x70) == (color ? 0x70 : 0x00)) {
// we can promote! // we can promote!
return Move{square, target_square, (Piece)(W_QUEN | color << 3)}; return Move{square, target_square, (Piece)(W_QUEN | color << 3)};

189
Uci.h
View File

@ -5,116 +5,117 @@
#define PS2(s) ([]{ static const char c[] PROGMEM = (s); return &c[0]; }()) #define PS2(s) ([]{ static const char c[] PROGMEM = (s); return &c[0]; }())
typedef void uci_return; namespace Uci {
typedef uci_return (*uci_handler)(); typedef void uci_return;
typedef uci_return (*uci_handler)();
struct uci_cmd { struct uci_cmd {
const char* command; const char* command;
uci_handler handler; uci_handler handler;
}; };
void clear_line() { void clear_line() {
int peek = Serial.peek(); int peek = Serial.peek();
if(peek == -1) return; if(peek == -1) return;
do { do {
peek = Serial.read(); peek = Serial.read();
} while(peek != '\n'); } while(peek != '\n');
} }
uci_return uci_hello() { uci_return uci_hello() {
Serial.println(F("id name ArduChess\nid author Quinten Kock\nuciok")); Serial.println(F("id name ArduChess\nid author Quinten Kock\nuciok"));
} }
uci_return uci_unimpl() { uci_return uci_unimpl() {
Serial.println(F("Function not implemented yet")); Serial.println(F("Function not implemented yet"));
} }
uci_return uci_unknown() { uci_return uci_unknown() {
Serial.println(F("Not an UCI command")); Serial.println(F("Not an UCI command"));
} }
uci_return uci_perft() { uci_return uci_perft() {
int depth = Serial.parseInt(); int depth = Serial.parseInt();
unsigned long result = pseudo_perft(depth); unsigned long result = pseudo_perft(depth);
Serial.print(F("perft(")); Serial.print(F("perft("));
Serial.print(depth); Serial.print(depth);
Serial.print(F(") result: ")); Serial.print(F(") result: "));
Serial.println(result); Serial.println(result);
} }
const char UCI_COMMAND_uci[] PROGMEM = "uci"; const char UCI_COMMAND_uci[] PROGMEM = "uci";
const char UCI_COMMAND_debug[] PROGMEM = "debug"; const char UCI_COMMAND_debug[] PROGMEM = "debug";
const char UCI_COMMAND_isready[] PROGMEM = "isready"; const char UCI_COMMAND_isready[] PROGMEM = "isready";
const char UCI_COMMAND_setoption[] PROGMEM = "setoption"; const char UCI_COMMAND_setoption[] PROGMEM = "setoption";
const char UCI_COMMAND_ucinewgame[] PROGMEM = "ucinewgame"; const char UCI_COMMAND_ucinewgame[] PROGMEM = "ucinewgame";
const char UCI_COMMAND_position[] PROGMEM = "position"; const char UCI_COMMAND_position[] PROGMEM = "position";
const char UCI_COMMAND_go[] PROGMEM = "go"; const char UCI_COMMAND_go[] PROGMEM = "go";
const char UCI_COMMAND_stop[] PROGMEM = "stop"; const char UCI_COMMAND_stop[] PROGMEM = "stop";
const char UCI_COMMAND_ponderhit[] PROGMEM = "ponderhit"; const char UCI_COMMAND_ponderhit[] PROGMEM = "ponderhit";
const char UCI_COMMAND_quit[] PROGMEM = "quit"; const char UCI_COMMAND_quit[] PROGMEM = "quit";
const char UCI_COMMAND_bench[] PROGMEM = "bench"; const char UCI_COMMAND_bench[] PROGMEM = "bench";
const char UCI_COMMAND_perft[] PROGMEM = "perft"; const char UCI_COMMAND_perft[] PROGMEM = "perft";
const uci_cmd UCI_COMMANDS[] PROGMEM = { const uci_cmd UCI_COMMANDS[] PROGMEM = {
{UCI_COMMAND_uci, &uci_hello}, {UCI_COMMAND_uci, &uci_hello},
{UCI_COMMAND_debug, &uci_unimpl}, {UCI_COMMAND_debug, &uci_unimpl},
{UCI_COMMAND_isready, &uci_unimpl}, {UCI_COMMAND_isready, &uci_unimpl},
{UCI_COMMAND_setoption, &uci_unimpl}, {UCI_COMMAND_setoption, &uci_unimpl},
{UCI_COMMAND_ucinewgame, &uci_unimpl}, {UCI_COMMAND_ucinewgame, &uci_unimpl},
{UCI_COMMAND_position, &uci_unimpl}, {UCI_COMMAND_position, &uci_unimpl},
{UCI_COMMAND_go, &uci_unimpl}, {UCI_COMMAND_go, &uci_unimpl},
{UCI_COMMAND_stop, &uci_unimpl}, {UCI_COMMAND_stop, &uci_unimpl},
{UCI_COMMAND_ponderhit, &uci_unimpl}, {UCI_COMMAND_ponderhit, &uci_unimpl},
{UCI_COMMAND_quit, &uci_unimpl}, {UCI_COMMAND_quit, &uci_unimpl},
{UCI_COMMAND_bench, &bench}, {UCI_COMMAND_bench, &bench},
{UCI_COMMAND_perft, &uci_perft}, {UCI_COMMAND_perft, &uci_perft},
}; };
const uci_cmd UCI_INVALID = {PS2(""), &uci_unknown}; const uci_cmd UCI_INVALID = {PS2(""), &uci_unknown};
uci_cmd get_uci_command(const char* command) { uci_cmd get_uci_command(const char* command) {
size_t command_num = sizeof(UCI_COMMANDS) / sizeof(uci_cmd); size_t command_num = sizeof(UCI_COMMANDS) / sizeof(uci_cmd);
for(size_t i = 0; i < command_num; i++) { for(size_t i = 0; i < command_num; i++) {
size_t ci = 0; size_t ci = 0;
uci_cmd to_try; uci_cmd to_try;
memcpy_P(&to_try, &UCI_COMMANDS[i], sizeof(uci_cmd)); memcpy_P(&to_try, &UCI_COMMANDS[i], sizeof(uci_cmd));
while(true) { while(true) {
char reference = pgm_read_byte_near(to_try.command + ci); char reference = pgm_read_byte_near(to_try.command + ci);
if(reference != command[ci]) { if(reference != command[ci]) {
break; break;
}
if(command[ci] == '\0') {
return to_try;
}
ci++;
} }
if(command[ci] == '\0') { }
return to_try; return UCI_INVALID;
}
String read_word() {
int incoming = Serial.read();
String str = String();
do {
if(incoming != -1) {
str += (char)incoming;
} }
ci++; incoming = Serial.read();
} while(incoming != '\n' && incoming != ' ');
return str;
}
uci_return handle_uci() {
if(Serial.available()) {
// There is input available; so likely a command
String command = read_word();
uci_cmd handler = get_uci_command(command.c_str());
handler.handler();
clear_line();
} }
} }
return UCI_INVALID;
} }
String read_word() {
int incoming = Serial.read();
String str = String();
do {
if(incoming != -1) {
str += (char)incoming;
}
incoming = Serial.read();
} while(incoming != '\n' && incoming != ' ');
return str;
}
uci_return handle_uci() {
if(Serial.available()) {
// There is input available; so likely a command
String command = read_word();
uci_cmd handler = get_uci_command(command.c_str());
handler.handler();
clear_line();
}
}
#endif #endif