X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.cpp;h=1e01dc1f7298f5ece888713fb3edcdf3fd215910;hb=d15217b953af28669dd3e5b46303b3ca882f353e;hp=eb3cb895b51b7e1e2acccafe6899ff01ff41a432;hpb=e5077dc11e8047eb8ce32a166a73e433a7e19b15;p=stockfish

diff --git a/src/position.cpp b/src/position.cpp
index eb3cb895..1e01dc1f 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -42,7 +42,7 @@ Key Position::zobCastle[16];
 Key Position::zobSideToMove;
 Key Position::zobExclusion;
 
-Score Position::PieceSquareTable[16][64];
+Score Position::pieceSquareTable[16][64];
 
 // Material values arrays, indexed by Piece
 const Value PieceValueMidgame[17] = {
@@ -207,7 +207,7 @@ void Position::from_fen(const string& fen, bool isChess960) {
 
   // Various initialisations
   chess960 = isChess960;
-  find_checkers();
+  st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(opposite_color(sideToMove));
 
   st->key = compute_key();
   st->pawnKey = compute_pawn_key();
@@ -245,7 +245,7 @@ void Position::set_castling_rights(char token) {
     Square sqH = relative_square(c, SQ_H1);
     Square rsq, ksq = king_square(c);
 
-    token = toupper(token);
+    token = char(toupper(token));
 
     if (token == 'K')
         for (rsq = sqH; piece_on(rsq) != make_piece(c, ROOK); rsq--) {}
@@ -493,19 +493,6 @@ bool Position::move_attacks_square(Move m, Square s) const {
 }
 
 
-/// Position::find_checkers() computes the checkersBB bitboard, which
-/// contains a nonzero bit for each checking piece (0, 1 or 2). It
-/// currently works by calling Position::attackers_to, which is probably
-/// inefficient. Consider rewriting this function to use the last move
-/// played, like in non-bitboard versions of Glaurung.
-
-void Position::find_checkers() {
-
-  Color us = side_to_move();
-  st->checkersBB = attackers_to(king_square(us)) & pieces(opposite_color(us));
-}
-
-
 /// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal
 
 bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
@@ -918,9 +905,9 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
 
   // Move the piece
   Bitboard move_bb = make_move_bb(from, to);
-  do_move_bb(&(byColorBB[us]), move_bb);
-  do_move_bb(&(byTypeBB[pt]), move_bb);
-  do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares
+  do_move_bb(&byColorBB[us], move_bb);
+  do_move_bb(&byTypeBB[pt], move_bb);
+  do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares
 
   board[to] = board[from];
   board[from] = PIECE_NONE;
@@ -957,8 +944,8 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
           assert(promotion >= KNIGHT && promotion <= QUEEN);
 
           // Insert promoted piece instead of pawn
-          clear_bit(&(byTypeBB[PAWN]), to);
-          set_bit(&(byTypeBB[promotion]), to);
+          clear_bit(&byTypeBB[PAWN], to);
+          set_bit(&byTypeBB[promotion], to);
           board[to] = make_piece(us, promotion);
 
           // Update piece counts
@@ -1067,9 +1054,9 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t
         st->npMaterial[them] -= PieceValueMidgame[capture];
 
     // Remove captured piece
-    clear_bit(&(byColorBB[them]), capsq);
-    clear_bit(&(byTypeBB[capture]), capsq);
-    clear_bit(&(byTypeBB[0]), capsq);
+    clear_bit(&byColorBB[them], capsq);
+    clear_bit(&byTypeBB[capture], capsq);
+    clear_bit(&byTypeBB[0], capsq);
 
     // Update hash key
     key ^= zobrist[them][capture][capsq];
@@ -1113,12 +1100,9 @@ void Position::do_castle_move(Move m) {
   Color us = side_to_move();
   Color them = opposite_color(us);
 
-  // Reset capture field
-  st->capturedType = PIECE_TYPE_NONE;
-
   // Find source squares for king and rook
   Square kfrom = move_from(m);
-  Square rfrom = move_to(m);  // HACK: See comment at beginning of function
+  Square rfrom = move_to(m);
   Square kto, rto;
 
   assert(piece_on(kfrom) == make_piece(us, KING));
@@ -1129,28 +1113,30 @@ void Position::do_castle_move(Move m) {
   {
       kto = relative_square(us, SQ_G1);
       rto = relative_square(us, SQ_F1);
-  } else { // O-O-O
+  }
+  else // O-O-O
+  {
       kto = relative_square(us, SQ_C1);
       rto = relative_square(us, SQ_D1);
   }
 
-  // Remove pieces from source squares:
-  clear_bit(&(byColorBB[us]), kfrom);
-  clear_bit(&(byTypeBB[KING]), kfrom);
-  clear_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares
-  clear_bit(&(byColorBB[us]), rfrom);
-  clear_bit(&(byTypeBB[ROOK]), rfrom);
-  clear_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares
-
-  // Put pieces on destination squares:
-  set_bit(&(byColorBB[us]), kto);
-  set_bit(&(byTypeBB[KING]), kto);
-  set_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares
-  set_bit(&(byColorBB[us]), rto);
-  set_bit(&(byTypeBB[ROOK]), rto);
-  set_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares
-
-  // Update board array
+  // Remove pieces from source squares
+  clear_bit(&byColorBB[us], kfrom);
+  clear_bit(&byTypeBB[KING], kfrom);
+  clear_bit(&byTypeBB[0], kfrom);
+  clear_bit(&byColorBB[us], rfrom);
+  clear_bit(&byTypeBB[ROOK], rfrom);
+  clear_bit(&byTypeBB[0], rfrom);
+
+  // Put pieces on destination squares
+  set_bit(&byColorBB[us], kto);
+  set_bit(&byTypeBB[KING], kto);
+  set_bit(&byTypeBB[0], kto);
+  set_bit(&byColorBB[us], rto);
+  set_bit(&byTypeBB[ROOK], rto);
+  set_bit(&byTypeBB[0], rto);
+
+  // Update board
   Piece king = make_piece(us, KING);
   Piece rook = make_piece(us, ROOK);
   board[kfrom] = board[rfrom] = PIECE_NONE;
@@ -1160,10 +1146,13 @@ void Position::do_castle_move(Move m) {
   // Update piece lists
   pieceList[us][KING][index[kfrom]] = kto;
   pieceList[us][ROOK][index[rfrom]] = rto;
-  int tmp = index[rfrom]; // In Chess960 could be rto == kfrom
+  int tmp = index[rfrom]; // In Chess960 could be kto == rfrom
   index[kto] = index[kfrom];
   index[rto] = tmp;
 
+  // Reset capture field
+  st->capturedType = PIECE_TYPE_NONE;
+
   // Update incremental scores
   st->value += pst_delta(king, kfrom, kto);
   st->value += pst_delta(rook, rfrom, rto);
@@ -1239,8 +1228,8 @@ void Position::undo_move(Move m) {
       assert(piece_on(to) == make_piece(us, promotion));
 
       // Replace promoted piece with a pawn
-      clear_bit(&(byTypeBB[promotion]), to);
-      set_bit(&(byTypeBB[PAWN]), to);
+      clear_bit(&byTypeBB[promotion], to);
+      set_bit(&byTypeBB[PAWN], to);
 
       // Update piece counts
       pieceCount[us][promotion]--;
@@ -1257,9 +1246,9 @@ void Position::undo_move(Move m) {
 
   // Put the piece back at the source square
   Bitboard move_bb = make_move_bb(to, from);
-  do_move_bb(&(byColorBB[us]), move_bb);
-  do_move_bb(&(byTypeBB[pt]), move_bb);
-  do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares
+  do_move_bb(&byColorBB[us], move_bb);
+  do_move_bb(&byTypeBB[pt], move_bb);
+  do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares
 
   board[from] = make_piece(us, pt);
   board[to] = PIECE_NONE;
@@ -1279,9 +1268,9 @@ void Position::undo_move(Move m) {
       assert(!ep || square_is_empty(capsq));
 
       // Restore the captured piece
-      set_bit(&(byColorBB[them]), capsq);
-      set_bit(&(byTypeBB[st->capturedType]), capsq);
-      set_bit(&(byTypeBB[0]), capsq);
+      set_bit(&byColorBB[them], capsq);
+      set_bit(&byTypeBB[st->capturedType], capsq);
+      set_bit(&byTypeBB[0], capsq);
 
       board[capsq] = make_piece(them, st->capturedType);
 
@@ -1311,13 +1300,13 @@ void Position::undo_castle_move(Move m) {
   assert(move_is_castle(m));
 
   // When we have arrived here, some work has already been done by
-  // Position::undo_move.  In particular, the side to move has been switched,
+  // Position::undo_move. In particular, the side to move has been switched,
   // so the code below is correct.
   Color us = side_to_move();
 
   // Find source squares for king and rook
   Square kfrom = move_from(m);
-  Square rfrom = move_to(m);  // HACK: See comment at beginning of function
+  Square rfrom = move_to(m);
   Square kto, rto;
 
   // Find destination squares for king and rook
@@ -1325,7 +1314,9 @@ void Position::undo_castle_move(Move m) {
   {
       kto = relative_square(us, SQ_G1);
       rto = relative_square(us, SQ_F1);
-  } else { // O-O-O
+  }
+  else // O-O-O
+  {
       kto = relative_square(us, SQ_C1);
       rto = relative_square(us, SQ_D1);
   }
@@ -1333,26 +1324,28 @@ void Position::undo_castle_move(Move m) {
   assert(piece_on(kto) == make_piece(us, KING));
   assert(piece_on(rto) == make_piece(us, ROOK));
 
-  // Remove pieces from destination squares:
-  clear_bit(&(byColorBB[us]), kto);
-  clear_bit(&(byTypeBB[KING]), kto);
-  clear_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares
-  clear_bit(&(byColorBB[us]), rto);
-  clear_bit(&(byTypeBB[ROOK]), rto);
-  clear_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares
-
-  // Put pieces on source squares:
-  set_bit(&(byColorBB[us]), kfrom);
-  set_bit(&(byTypeBB[KING]), kfrom);
-  set_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares
-  set_bit(&(byColorBB[us]), rfrom);
-  set_bit(&(byTypeBB[ROOK]), rfrom);
-  set_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares
+  // Remove pieces from destination squares
+  clear_bit(&byColorBB[us], kto);
+  clear_bit(&byTypeBB[KING], kto);
+  clear_bit(&byTypeBB[0], kto);
+  clear_bit(&byColorBB[us], rto);
+  clear_bit(&byTypeBB[ROOK], rto);
+  clear_bit(&byTypeBB[0], rto);
+
+  // Put pieces on source squares
+  set_bit(&byColorBB[us], kfrom);
+  set_bit(&byTypeBB[KING], kfrom);
+  set_bit(&byTypeBB[0], kfrom);
+  set_bit(&byColorBB[us], rfrom);
+  set_bit(&byTypeBB[ROOK], rfrom);
+  set_bit(&byTypeBB[0], rfrom);
 
   // Update board
-  board[rto] = board[kto] = PIECE_NONE;
-  board[rfrom] = make_piece(us, ROOK);
-  board[kfrom] = make_piece(us, KING);
+  Piece king = make_piece(us, KING);
+  Piece rook = make_piece(us, ROOK);
+  board[kto] = board[rto] = PIECE_NONE;
+  board[kfrom] = king;
+  board[rfrom] = rook;
 
   // Update piece lists
   pieceList[us][KING][index[kto]] = kfrom;
@@ -1763,11 +1756,11 @@ void Position::init() {
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       for (Piece p = WP; p <= WK; p++)
-          PieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]);
+          pieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]);
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       for (Piece p = BP; p <= BK; p++)
-          PieceSquareTable[p][s] = -PieceSquareTable[p-8][flip_square(s)];
+          pieceSquareTable[p][s] = -pieceSquareTable[p-8][flip_square(s)];
 }
 
 
@@ -1807,7 +1800,7 @@ void Position::flip() {
       st->epSquare = flip_square(pos.st->epSquare);
 
   // Checkers
-  find_checkers();
+  st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(opposite_color(sideToMove));
 
   // Hash keys
   st->key = compute_key();
@@ -1965,10 +1958,10 @@ bool Position::is_ok(int* failedStep) const {
           for (PieceType pt = PAWN; pt <= KING; pt++)
               for (int i = 0; i < pieceCount[c][pt]; i++)
               {
-                  if (piece_on(piece_list(c, pt, i)) != make_piece(c, pt))
+                  if (piece_on(piece_list(c, pt)[i]) != make_piece(c, pt))
                       return false;
 
-                  if (index[piece_list(c, pt, i)] != i)
+                  if (index[piece_list(c, pt)[i]] != i)
                       return false;
               }