X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=4e5de7f72f71214aa63c6616b960c7cd18464c58;hp=25eef007e74e0176249ae134dadee87d38ab7911;hb=45b0aea875860e9f0fe2d0435ee6163906639194;hpb=482b5b7ecebc85e427c2c839337c7a893ae3e402
diff --git a/src/types.h b/src/types.h
index 25eef007..4e5de7f7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(TYPES_H_INCLUDED)
+#ifndef TYPES_H_INCLUDED
#define TYPES_H_INCLUDED
/// For Linux and OSX configuration is done automatically using Makefile. To get
@@ -35,46 +35,16 @@
/// | only in 64-bit mode. For compiling requires hardware with
/// | popcnt support.
+#include
+#include
#include
#include
-#if defined(_MSC_VER)
+#include "platform.h"
-// Disable some silly and noisy warning from MSVC compiler
-#pragma warning(disable: 4127) // Conditional expression is constant
-#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
-#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
-#pragma warning(disable: 4996) // Function _ftime() may be unsafe
+#define unlikely(x) (x) // For code annotation purposes
-// MSVC does not support
-typedef signed __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef signed __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef signed __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-#else
-# include
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-# include
-typedef _timeb sys_time_t;
-
-inline void system_time(sys_time_t* t) { _ftime(t); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000 + t.millitm; }
-#else
-# include
-typedef timeval sys_time_t;
-
-inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000 + t.tv_usec / 1000; }
-#endif
-
-#if defined(_WIN64)
+#if defined(_WIN64) && !defined(IS_64BIT)
# include // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
# define USE_BSFQ
@@ -84,13 +54,18 @@ inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000 + t.t
# include // Intel header for _mm_popcnt_u64() intrinsic
#endif
+# if !defined(NO_PREFETCH) && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
+# include // Intel and Microsoft header for _mm_prefetch()
+# endif
+
+#define CACHE_LINE_SIZE 64
#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
-# define CACHE_LINE_ALIGNMENT __declspec(align(64))
+# define CACHE_LINE_ALIGNMENT __declspec(align(CACHE_LINE_SIZE))
#else
-# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(64)))
+# define CACHE_LINE_ALIGNMENT __attribute__ ((aligned(CACHE_LINE_SIZE)))
#endif
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
# define FORCE_INLINE __forceinline
#elif defined(__GNUC__)
# define FORCE_INLINE inline __attribute__((always_inline))
@@ -98,13 +73,13 @@ inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000 + t.t
# define FORCE_INLINE inline
#endif
-#if defined(USE_POPCNT)
+#ifdef USE_POPCNT
const bool HasPopCnt = true;
#else
const bool HasPopCnt = false;
#endif
-#if defined(IS_64BIT)
+#ifdef IS_64BIT
const bool Is64Bit = true;
#else
const bool Is64Bit = false;
@@ -113,28 +88,9 @@ const bool Is64Bit = false;
typedef uint64_t Key;
typedef uint64_t Bitboard;
-const int MAX_MOVES = 256;
-const int MAX_PLY = 256;
-const int MAX_PLY_PLUS_2 = MAX_PLY + 2;
-
-const Bitboard FileABB = 0x0101010101010101ULL;
-const Bitboard FileBBB = FileABB << 1;
-const Bitboard FileCBB = FileABB << 2;
-const Bitboard FileDBB = FileABB << 3;
-const Bitboard FileEBB = FileABB << 4;
-const Bitboard FileFBB = FileABB << 5;
-const Bitboard FileGBB = FileABB << 6;
-const Bitboard FileHBB = FileABB << 7;
-
-const Bitboard Rank1BB = 0xFF;
-const Bitboard Rank2BB = Rank1BB << (8 * 1);
-const Bitboard Rank3BB = Rank1BB << (8 * 2);
-const Bitboard Rank4BB = Rank1BB << (8 * 3);
-const Bitboard Rank5BB = Rank1BB << (8 * 4);
-const Bitboard Rank6BB = Rank1BB << (8 * 5);
-const Bitboard Rank7BB = Rank1BB << (8 * 6);
-const Bitboard Rank8BB = Rank1BB << (8 * 7);
-
+const int MAX_MOVES = 192;
+const int MAX_PLY = 100;
+const int MAX_PLY_PLUS_6 = MAX_PLY + 6;
/// A move needs 16 bits to be stored
///
@@ -148,26 +104,37 @@ const Bitboard Rank8BB = Rank1BB << (8 * 7);
/// while MOVE_NONE and MOVE_NULL have the same origin and destination square.
enum Move {
- MOVE_NONE = 0,
+ MOVE_NONE,
MOVE_NULL = 65
};
-struct MoveStack {
- Move move;
- int score;
+enum MoveType {
+ NORMAL,
+ PROMOTION = 1 << 14,
+ ENPASSANT = 2 << 14,
+ CASTLE = 3 << 14
};
-inline bool operator<(const MoveStack& f, const MoveStack& s) {
- return f.score < s.score;
-}
+enum CastleRight { // Defined as in PolyGlot book hash key
+ CASTLES_NONE,
+ WHITE_OO,
+ WHITE_OOO = WHITE_OO << 1,
+ BLACK_OO = WHITE_OO << 2,
+ BLACK_OOO = WHITE_OO << 3,
+ ALL_CASTLES = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO,
+ CASTLE_RIGHT_NB = 16
+};
+
+enum CastlingSide {
+ KING_SIDE,
+ QUEEN_SIDE,
+ CASTLING_SIDE_NB = 2
+};
-enum CastleRight {
- CASTLES_NONE = 0,
- WHITE_OO = 1,
- BLACK_OO = 2,
- WHITE_OOO = 4,
- BLACK_OOO = 8,
- ALL_CASTLES = 15
+enum Phase {
+ PHASE_ENDGAME,
+ PHASE_MIDGAME = 128,
+ MG = 0, EG = 1, PHASE_NB = 2
};
enum ScaleFactor {
@@ -178,9 +145,9 @@ enum ScaleFactor {
};
enum Bound {
- BOUND_NONE = 0,
- BOUND_UPPER = 1,
- BOUND_LOWER = 2,
+ BOUND_NONE,
+ BOUND_UPPER,
+ BOUND_LOWER,
BOUND_EXACT = BOUND_UPPER | BOUND_LOWER
};
@@ -196,22 +163,30 @@ enum Value {
VALUE_MATED_IN_MAX_PLY = -VALUE_MATE + MAX_PLY,
VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX,
- VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN
+ VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN,
+
+ PawnValueMg = 198, PawnValueEg = 258,
+ KnightValueMg = 817, KnightValueEg = 846,
+ BishopValueMg = 836, BishopValueEg = 857,
+ RookValueMg = 1270, RookValueEg = 1278,
+ QueenValueMg = 2521, QueenValueEg = 2558
};
enum PieceType {
- NO_PIECE_TYPE = 0,
- PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
+ NO_PIECE_TYPE, PAWN, KNIGHT, BISHOP, ROOK, QUEEN, KING,
+ ALL_PIECES = 0,
+ PIECE_TYPE_NB = 8
};
enum Piece {
- NO_PIECE = 16, // color_of(NO_PIECE) == NO_COLOR
- W_PAWN = 1, W_KNIGHT = 2, W_BISHOP = 3, W_ROOK = 4, W_QUEEN = 5, W_KING = 6,
- B_PAWN = 9, B_KNIGHT = 10, B_BISHOP = 11, B_ROOK = 12, B_QUEEN = 13, B_KING = 14
+ NO_PIECE,
+ W_PAWN = 1, W_KNIGHT, W_BISHOP, W_ROOK, W_QUEEN, W_KING,
+ B_PAWN = 9, B_KNIGHT, B_BISHOP, B_ROOK, B_QUEEN, B_KING,
+ PIECE_NB = 16
};
enum Color {
- WHITE, BLACK, NO_COLOR
+ WHITE, BLACK, NO_COLOR, COLOR_NB = 2
};
enum Depth {
@@ -237,6 +212,8 @@ enum Square {
SQ_A8, SQ_B8, SQ_C8, SQ_D8, SQ_E8, SQ_F8, SQ_G8, SQ_H8,
SQ_NONE,
+ SQUARE_NB = 64,
+
DELTA_N = 8,
DELTA_E = 1,
DELTA_S = -8,
@@ -251,11 +228,11 @@ enum Square {
};
enum File {
- FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H
+ FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NB
};
enum Rank {
- RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8
+ RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NB
};
@@ -264,7 +241,7 @@ enum Rank {
/// for midgame value. Compiler is free to choose the enum type as long as can
/// keep its data, so ensure Score to be an integer type.
enum Score {
- SCORE_ZERO = 0,
+ SCORE_ZERO,
SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
};
@@ -274,7 +251,7 @@ inline Score make_score(int mg, int eg) { return Score((mg << 16) + eg); }
/// Extracting the signed lower and upper 16 bits it not so trivial because
/// according to the standard a simple cast to short is implementation defined
/// and so is a right shift of a signed integer.
-inline Value mg_value(Score s) { return Value(((s + 32768) & ~0xffff) / 0x10000); }
+inline Value mg_value(Score s) { return Value(((s + 0x8000) & ~0xffff) / 0x10000); }
/// On Intel 64 bit we have a small speed regression with the standard conforming
/// version, so use a faster code in this case that, although not 100% standard
@@ -334,28 +311,27 @@ inline Score operator/(Score s, int i) {
#undef ENABLE_OPERATORS_ON
#undef ENABLE_SAFE_OPERATORS_ON
-const Value PawnValueMidgame = Value(0x0C6);
-const Value PawnValueEndgame = Value(0x102);
-const Value KnightValueMidgame = Value(0x331);
-const Value KnightValueEndgame = Value(0x34E);
-const Value BishopValueMidgame = Value(0x344);
-const Value BishopValueEndgame = Value(0x359);
-const Value RookValueMidgame = Value(0x4F6);
-const Value RookValueEndgame = Value(0x4FE);
-const Value QueenValueMidgame = Value(0x9D9);
-const Value QueenValueEndgame = Value(0x9FE);
-
-extern const Value PieceValueMidgame[17]; // Indexed by Piece or PieceType
-extern const Value PieceValueEndgame[17];
-extern int SquareDistance[64][64];
-extern uint8_t BitCount8Bit[256];
+extern Value PieceValue[PHASE_NB][PIECE_NB];
+
+struct ExtMove {
+ Move move;
+ int score;
+};
+
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.score < s.score;
+}
inline Color operator~(Color c) {
return Color(c ^ 1);
}
inline Square operator~(Square s) {
- return Square(s ^ 56);
+ return Square(s ^ 56); // Vertical flip SQ_A1 -> SQ_A8
+}
+
+inline Square operator|(File f, Rank r) {
+ return Square((r << 3) | f);
}
inline Value mate_in(int ply) {
@@ -370,19 +346,20 @@ inline Piece make_piece(Color c, PieceType pt) {
return Piece((c << 3) | pt);
}
+inline CastleRight make_castle_right(Color c, CastlingSide s) {
+ return CastleRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c));
+}
+
inline PieceType type_of(Piece p) {
return PieceType(p & 7);
}
inline Color color_of(Piece p) {
+ assert(p != NO_PIECE);
return Color(p >> 3);
}
-inline Square make_square(File f, Rank r) {
- return Square((r << 3) | f);
-}
-
-inline bool square_is_ok(Square s) {
+inline bool is_ok(Square s) {
return s >= SQ_A1 && s <= SQ_H8;
}
@@ -395,7 +372,7 @@ inline Rank rank_of(Square s) {
}
inline Square mirror(Square s) {
- return Square(s ^ 7);
+ return Square(s ^ 7); // Horizontal flip SQ_A1 -> SQ_H1
}
inline Square relative_square(Color c, Square s) {
@@ -411,32 +388,16 @@ inline Rank relative_rank(Color c, Square s) {
}
inline bool opposite_colors(Square s1, Square s2) {
- int s = s1 ^ s2;
+ int s = int(s1) ^ int(s2);
return ((s >> 3) ^ s) & 1;
}
-inline int file_distance(Square s1, Square s2) {
- return abs(file_of(s1) - file_of(s2));
-}
-
-inline int rank_distance(Square s1, Square s2) {
- return abs(rank_of(s1) - rank_of(s2));
-}
-
-inline int square_distance(Square s1, Square s2) {
- return SquareDistance[s1][s2];
-}
-
-inline char piece_type_to_char(PieceType pt) {
- return " PNBRQK"[pt];
-}
-
-inline char file_to_char(File f) {
- return char(f - FILE_A + int('a'));
+inline char file_to_char(File f, bool tolower = true) {
+ return char(f - FILE_A + (tolower ? 'a' : 'A'));
}
inline char rank_to_char(Rank r) {
- return char(r - RANK_1 + int('1'));
+ return char(r - RANK_1 + '1');
}
inline Square pawn_push(Color c) {
@@ -451,20 +412,8 @@ inline Square to_sq(Move m) {
return Square(m & 0x3F);
}
-inline bool is_special(Move m) {
- return m & (3 << 14);
-}
-
-inline bool is_promotion(Move m) {
- return (m & (3 << 14)) == (1 << 14);
-}
-
-inline int is_enpassant(Move m) {
- return (m & (3 << 14)) == (2 << 14);
-}
-
-inline int is_castle(Move m) {
- return (m & (3 << 14)) == (3 << 14);
+inline MoveType type_of(Move m) {
+ return MoveType(m & (3 << 14));
}
inline PieceType promotion_type(Move m) {
@@ -475,16 +424,9 @@ inline Move make_move(Square from, Square to) {
return Move(to | (from << 6));
}
-inline Move make_promotion(Square from, Square to, PieceType pt) {
- return Move(to | (from << 6) | (1 << 14) | ((pt - 2) << 12)) ;
-}
-
-inline Move make_enpassant(Square from, Square to) {
- return Move(to | (from << 6) | (2 << 14));
-}
-
-inline Move make_castle(Square from, Square to) {
- return Move(to | (from << 6) | (3 << 14));
+template
+inline Move make(Square from, Square to, PieceType pt = KNIGHT) {
+ return Move(to | (from << 6) | T | ((pt - KNIGHT) << 12));
}
inline bool is_ok(Move m) {
@@ -498,21 +440,4 @@ inline const std::string square_to_string(Square s) {
return ch;
}
-/// Our insertion sort implementation, works with pointers and iterators and is
-/// guaranteed to be stable, as is needed.
-template
-void sort(K first, K last)
-{
- T tmp;
- K p, q;
-
- for (p = first + 1; p < last; p++)
- {
- tmp = *p;
- for (q = p; q != first && *(q-1) < tmp; --q)
- *q = *(q-1);
- *q = tmp;
- }
-}
-
-#endif // !defined(TYPES_H_INCLUDED)
+#endif // #ifndef TYPES_H_INCLUDED