/*
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
/// | only in 64-bit mode. For compiling requires hardware with
/// | popcnt support.
+#include <cassert>
#include <cctype>
#include <climits>
#include <cstdlib>
# include <xmmintrin.h> // 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)
BOUND_NONE = 0,
BOUND_UPPER = 1,
BOUND_LOWER = 2,
- BOUND_EXACT = BOUND_UPPER | BOUND_LOWER | 4
+ BOUND_EXACT = BOUND_UPPER | BOUND_LOWER
};
enum Value {
/// 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
}
inline Color color_of(Piece p) {
- return p == NO_PIECE ? NO_COLOR : Color(p >> 3);
+ assert(p != NO_PIECE);
+ return Color(p >> 3);
}
inline bool is_ok(Square s) {
return SquareDistance[s1][s2];
}
-inline char file_to_char(File f) {
- return char(f - FILE_A + '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) {
template<MoveType T>
inline Move make(Square from, Square to, PieceType pt = KNIGHT) {
- return Move(to | (from << 6) | T | ((pt - KNIGHT) << 12)) ;
+ return Move(to | (from << 6) | T | ((pt - KNIGHT) << 12));
}
inline bool is_ok(Move m) {
return ch;
}
-/// Our insertion sort implementation, works with pointers and iterators and is
-/// guaranteed to be stable, as is needed.
-template<typename T, typename K>
-void sort(K begin, K end)
-{
- T tmp;
- K p, q;
-
- for (p = begin + 1; p < end; p++)
- {
- tmp = *p;
- for (q = p; q != begin && *(q-1) < tmp; --q)
- *q = *(q-1);
- *q = tmp;
- }
-}
-
#endif // !defined(TYPES_H_INCLUDED)