Micro-optimize castling handling in do_move()

[stockfish] / src / move.h

diff --git a/src/move.h b/src/move.h
index 223d2a28ef54838c5e1efeeb22b50a9f2e44b273..42d3bbe9750d31e55993911d6c72f704d255d12f 100644 (file)
--- a/src/move.h
+++ b/src/move.h
@@ -23,12 +23,10 @@
 #include <string>
 
 #include "misc.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
+#include "types.h"
 
 // Maximum number of allowed moves per position
-const int MOVES_MAX = 256;
+const int MAX_MOVES = 256;
 
 /// A move needs 16 bits to be stored
 ///
@@ -132,7 +130,7 @@ inline T pick_best(T* curMove, T* lastMove)
 
 
 inline Square move_from(Move m) {
-  return Square((int(m) >> 6) & 0x3F);
+  return Square((m >> 6) & 0x3F);
 }
 
 inline Square move_to(Move m) {
@@ -163,24 +161,24 @@ inline bool move_is_long_castle(Move m) {
   return move_is_castle(m) && (move_to(m) < move_from(m));
 }
 
-inline PieceType move_promotion_piece(Move m) {
-  return move_is_promotion(m) ? PieceType(((int(m) >> 12) & 3) + 2) : PIECE_TYPE_NONE;
+inline PieceType promotion_piece_type(Move m) {
+  return PieceType(((m >> 12) & 3) + 2);
 }
 
 inline Move make_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6));
+  return Move(to | (from << 6));
 }
 
 inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
-  return Move(int(to) | (int(from) << 6) | ((int(promotion) - 2) << 12) | (1 << 14));
+  return Move(to | (from << 6) | ((promotion - 2) << 12) | (1 << 14));
 }
 
 inline Move make_ep_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6) | (2 << 14));
+  return Move(to | (from << 6) | (2 << 14));
 }
 
 inline Move make_castle_move(Square from, Square to) {
-  return Move(int(to) | (int(from) << 6) | (3 << 14));
+  return Move(to | (from << 6) | (3 << 14));
 }
 
 inline bool move_is_ok(Move m) {
@@ -192,6 +190,6 @@ class Position;
 extern const std::string move_to_uci(Move m, bool chess960);
 extern Move move_from_uci(const Position& pos, const std::string& str);
 extern const std::string move_to_san(Position& pos, Move m);
-extern const std::string pretty_pv(Position& pos, int time, int depth, Value score, ValueType type, Move pv[]);
+extern const std::string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
 
 #endif // !defined(MOVE_H_INCLUDED)