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();
} }

88
Board.h
View File

@ -5,7 +5,9 @@
#include "Panic.h" #include "Panic.h"
#include "Move.h" #include "Move.h"
#define BOARD_DEFAULT_VALUE { \ namespace Board {
#define BOARD_DEFAULT_VALUE { \
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_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, \ 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, \
@ -14,31 +16,31 @@
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_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, \ 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 // 0x88-fill definitions
#define PTR_SIDE_AND_CASTLERIGHT 0x08 //byte (1=side, 2,4=white castle, 8,16=black) #define PTR_SIDE_AND_CASTLERIGHT 0x08 //byte (1=side, 2,4=white castle, 8,16=black)
// CAN FILL 0x09 // CAN FILL 0x09
#define PTR_W_KING 0x0A // byte (points to index or maybe 64-arr index) #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_B_KING 0x0B // (PTR_W_KING | COLOR or PTR_W_KING + COLOR)
#define PTR_ZOBRIST 0x0C // 4 bytes #define PTR_ZOBRIST 0x0C // 4 bytes
// 0x0D // 0x0D
// 0x0E // 0x0E
// 0x0F // 0x0F
#define PTR_ENPASSANT 0x18 #define PTR_ENPASSANT 0x18
#define PTR_REVMOV 0x19 #define PTR_REVMOV 0x19
// free space // free space
#define PTR_UNMOVE_START 0x28 #define PTR_UNMOVE_START 0x28
#define PTR_UNMOVE_LAST 0x7F #define PTR_UNMOVE_LAST 0x7F
byte field[128]; byte field[128];
byte PTR_UNMOVE; byte PTR_UNMOVE;
const byte field_default_value[] PROGMEM = BOARD_DEFAULT_VALUE; const byte field_default_value[] PROGMEM = BOARD_DEFAULT_VALUE;
void board_init() { void init() {
for(int i = 0; i < 128; i++) { for(int i = 0; i < 128; i++) {
field[i] = pgm_read_byte_near(field_default_value + i); field[i] = pgm_read_byte_near(field_default_value + i);
} }
@ -48,31 +50,31 @@ void board_init() {
field[PTR_B_KING] = 0x74; // e8 field[PTR_B_KING] = 0x74; // e8
long* zob = (long*)&field[PTR_ZOBRIST]; long* zob = (long*)&field[PTR_ZOBRIST];
*zob = 0xDEADBEEF; *zob = 0xDEADBEEF;
} }
struct Unmove { struct Unmove {
byte sq_from; // 0b(1kingside_castle?)(3rank)(1queenside_castle?)(3file) byte sq_from; // 0b(1kingside_castle?)(3rank)(1queenside_castle?)(3file)
byte sq_to; // 0b(1promoted?)(3rank)(1ep_capture?)(3file) byte sq_to; // 0b(1promoted?)(3rank)(1ep_capture?)(3file)
byte captured; // 0b(4enpassantinfo)(1color)(3piecetype) byte captured; // 0b(4enpassantinfo)(1color)(3piecetype)
byte revmov; // 8bit integer byte revmov; // 8bit integer
}; };
bool black_moving() { bool black_moving() {
return field[PTR_SIDE_AND_CASTLERIGHT] & 0x1; return field[PTR_SIDE_AND_CASTLERIGHT] & 0x1;
} }
unsigned long get_zobrist() { unsigned long get_zobrist() {
long* addr = (long*) &field[PTR_ZOBRIST]; long* addr = (long*) &field[PTR_ZOBRIST];
return *addr; return *addr;
} }
void reset_unmake_stack() { void reset_unmake_stack() {
PTR_UNMOVE = PTR_UNMOVE_START; PTR_UNMOVE = PTR_UNMOVE_START;
} }
void next_unmove() { void next_unmove() {
PTR_UNMOVE++; PTR_UNMOVE++;
if(PTR_UNMOVE > PTR_UNMOVE_LAST) { if(PTR_UNMOVE > PTR_UNMOVE_LAST) {
panic(F("Unmove stack overflow")); panic(F("Unmove stack overflow"));
@ -80,8 +82,8 @@ void next_unmove() {
if(!(PTR_UNMOVE & 0x8)) { if(!(PTR_UNMOVE & 0x8)) {
PTR_UNMOVE += 0x8; PTR_UNMOVE += 0x8;
} }
} }
void prev_unmove() { void prev_unmove() {
PTR_UNMOVE--; PTR_UNMOVE--;
if(PTR_UNMOVE < PTR_UNMOVE_START) { if(PTR_UNMOVE < PTR_UNMOVE_START) {
panic(F("Unmaking from empty stack")); panic(F("Unmaking from empty stack"));
@ -89,15 +91,15 @@ void prev_unmove() {
if(!(PTR_UNMOVE & 0x8)) { if(!(PTR_UNMOVE & 0x8)) {
PTR_UNMOVE -= 0x8; PTR_UNMOVE -= 0x8;
} }
} }
void store_unmove(Unmove u) { void store_unmove(Unmove u) {
byte *ub = (byte*) &u; byte *ub = (byte*) &u;
for(byte i = 0; i < sizeof(u); i++) { for(byte i = 0; i < sizeof(u); i++) {
field[PTR_UNMOVE] = ub[i]; field[PTR_UNMOVE] = ub[i];
next_unmove(); next_unmove();
} }
} }
Unmove read_unmove() { Unmove read_unmove() {
Unmove u; Unmove u;
byte* ptr = (byte*) &u; byte* ptr = (byte*) &u;
for(int i = sizeof(u) - 1; i >= 0; i--) { for(int i = sizeof(u) - 1; i >= 0; i--) {
@ -108,10 +110,10 @@ Unmove read_unmove() {
#endif #endif
} }
return u; return u;
} }
void print() { void print() {
Serial.println(F("BOARD:")); Serial.println(F("BOARD:"));
for(char i = 7; i >= 0; i--) { for(char i = 7; i >= 0; i--) {
for(byte j = 0; j < 16; j++) { for(byte j = 0; j < 16; j++) {
@ -122,9 +124,9 @@ void print() {
} }
Serial.println(); Serial.println();
} }
} }
void make(Move m) { void make(Move m) {
// TODO zobrist? // TODO zobrist?
// fill unmove struct with basic data // fill unmove struct with basic data
@ -231,9 +233,9 @@ void make(Move m) {
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01; field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01;
store_unmove(u); store_unmove(u);
} }
void unmake() { void unmake() {
Unmove u = read_unmove(); Unmove u = read_unmove();
field[PTR_REVMOV] = u.revmov; field[PTR_REVMOV] = u.revmov;
@ -286,6 +288,8 @@ void unmake() {
field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01; field[PTR_SIDE_AND_CASTLERIGHT] ^= 0x01;
field[PTR_ENPASSANT] = u.captured >> 4; 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)};

71
Uci.h
View File

@ -5,59 +5,60 @@
#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},
@ -70,11 +71,11 @@ const uci_cmd UCI_COMMANDS[] PROGMEM = {
{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;
@ -92,9 +93,9 @@ uci_cmd get_uci_command(const char* command) {
} }
} }
return UCI_INVALID; return UCI_INVALID;
} }
String read_word() { String read_word() {
int incoming = Serial.read(); int incoming = Serial.read();
String str = String(); String str = String();
do { do {
@ -104,9 +105,9 @@ String read_word() {
incoming = Serial.read(); incoming = Serial.read();
} while(incoming != '\n' && incoming != ' '); } while(incoming != '\n' && incoming != ' ');
return str; return str;
} }
uci_return handle_uci() { uci_return handle_uci() {
if(Serial.available()) { if(Serial.available()) {
// There is input available; so likely a command // There is input available; so likely a command
String command = read_word(); String command = read_word();
@ -114,7 +115,7 @@ uci_return handle_uci() {
handler.handler(); handler.handler();
clear_line(); clear_line();
} }
}
} }
#endif #endif