WebSVN – Games.Chess Giants – Diff – /engine-crafty/chess.h

 #  if (CPUS > 1)
 #    include <pthread.h>
 #  endif
 #  include <unistd.h>
 #  include <sys/types.h>
+#  include <sys/stat.h>
 #endif
 #include <stdint.h>
-#ifdef _MSC_VER
-#include <stdint.h> // Pierre-Marie Baty -- Visual Studio lacks inttypes.h
-#define PRIu64 "I64u" // Pierre-Marie Baty -- missing definition
-#if !defined(INLINEASM)
-int MSB(uint64_t arg1); // Pierre-Marie Baty -- missing forward declaration
-int LSB(uint64_t arg1); // Pierre-Marie Baty -- missing forward declaration
-int PopCnt(uint64_t arg1); // Pierre-Marie Baty -- missing forward declaration
-#endif // !defined(INLINEASM)
-#else // !_MSC_VER
 #include <inttypes.h>
-#endif // _MSC_VER
 #include <time.h>
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #      undef  CDECL
 #      define CDECL __cdecl
 #    endif
 #  endif
 #  if !defined(BOOKDIR)
-#    define     BOOKDIR        "."
+#    define   BOOKDIR      "."
 #  endif
 #  if !defined(LOGDIR)
-#    define      LOGDIR        "."
+#    define   LOGDIR       "."
 #  endif
 #  if !defined(TBDIR)
-#    define       TBDIR     "./TB"
+#    define   TBDIR        "./TB"
 #  endif
 #  if !defined(RCDIR)
-#    define       RCDIR        "."
+#    define   RCDIR        "."
 #  endif
 #  include "lock.h"
 #  define MAXPLY                                 129
-#  define MAX_TC_NODES                      10000000
+#  define MAX_TC_NODES                       3000000
-#  define MAX_BLOCKS_PER_CPU                      64
+#  define MAX_BLOCKS                       64 * CPUS
-#  define MAX_BLOCKS         MAX_BLOCKS_PER_CPU*CPUS
 #  define BOOK_CLUSTER_SIZE                     8000
-#  define BOOK_POSITION_SIZE                      16
 #  define MERGE_BLOCK                           1000
 #  define SORT_BLOCK                         4000000
 #  define LEARN_INTERVAL                          10
 #  define LEARN_COUNTER_BAD                      -80
 #  define LEARN_COUNTER_GOOD                    +100
 #  define MATE                                 32768
 #  define PAWN_VALUE                             100
-#  define KNIGHT_VALUE                           325
+#  define KNIGHT_VALUE                           305
-#  define BISHOP_VALUE                           325
+#  define BISHOP_VALUE                           305
-#  define ROOK_VALUE                             500
+#  define ROOK_VALUE                             490
-#  define QUEEN_VALUE                           1050
+#  define QUEEN_VALUE                           1000
 #  define KING_VALUE                           40000
-#  define MAX_DRAFT                              256
 #  if !defined(CLOCKS_PER_SEC)
 #    define CLOCKS_PER_SEC 1000000
 #  endif
 typedef enum {
   A1, B1, C1, D1, E1, F1, G1, H1,
   rook = 4, queen = 5, king = 6
 } PIECE;
 typedef enum { black = 0, white = 1 } COLOR;
 typedef enum { mg = 0, eg = 1 } PHASE;
 typedef enum { empty_v = 0, pawn_v = 1, knight_v = 3,
-  bishop_v = 3, rook_v = 5, queen_v = 9, king_v = 99
+               bishop_v = 3, rook_v = 5, queen_v = 9, king_v = 99
 } PIECE_V;
+typedef enum { serial = 0, parallel = 1} SEARCH_MODE;
 typedef enum { think = 1, puzzle = 2, book = 3, annotate = 4 } SEARCH_TYPE;
 typedef enum { normal_mode, tournament_mode } PLAYING_MODE;
 typedef struct {
   int8_t castle[2];
   uint8_t enpassant_target;
   uint64_t pawn_hash_key;
   int material_evaluation;
   int kingsq[2];
   int8_t board[64];
   char pieces[2][7];
-  char majors[2];
-  char minors[2];
   char total_all_pieces;
 } POSITION;
 typedef struct {
   uint64_t word1;
   uint64_t word2;
 } HASH_ENTRY;
 typedef struct {
   uint64_t key;
-  int score_mg, score_eg;
+  int32_t score_mg, score_eg;
   unsigned char defects_k[2];
-  unsigned char defects_e[2];
-  unsigned char defects_d[2];
+  unsigned char defects_m[2];
   unsigned char defects_q[2];
-  unsigned char all[2];
   unsigned char passed[2];
-  unsigned char filler[4];
 } PAWN_HASH_ENTRY;
 typedef struct {
-  uint64_t entry[4];
+  uint64_t entry[3];
 } PXOR;
 typedef struct {
   int path[MAXPLY];
   int pathh;
   int pathl;
   int hash_path_age;
   int hash_path_moves[MAXPLY];
 } HPATH_ENTRY;
 typedef struct {
   int phase;
+  int order;
   int remaining;
-  int *last;
+  unsigned *last;
-  int excluded_moves[5];
+  unsigned done[10];
-  int num_excluded;
+  unsigned *exclude;
 } NEXT_MOVE;
+/*
+   root_move.status:
+   xxx1 = failed low this iteration
+   xx1x = failed high this iteration
+   x1xx = don't search in parallel or reduce
+xxx = move has been searched
+ */
 typedef struct {
   int move;
-/*
-   x..xx xxxx xxx1 = failed low this iteration
-   x..xx xxxx xx1x = failed high this iteration
-   x..xx xxxx x1xx = don't search in parallel or reduce
-   x..xx xxxx 1xxx = move has been searched
- */
-  unsigned int status;
+  unsigned status;
   int bm_age;
+  PATH path;
 } ROOT_MOVE;
 #  if !defined(UNIX)
 #    pragma pack(4)
 #  endif
 typedef struct {
   uint64_t position;
-  unsigned int status_played;
+  unsigned status_played;
   float learn;
 } BOOK_POSITION;
 #  if !defined(UNIX)
 #    pragma pack()
 #  endif
 } BB_POSITION;
 struct personality_term {
   char *description;
   int type;
   int size;
-  int *value;
+  void *value;
 };
-struct tree {
+struct autotune {
+  unsigned int min;
+  unsigned int max;
+  unsigned int increment;
+  char description[64];
+  char command[16];
+  unsigned int *parameter;
+};
+typedef struct tree {
+/* commonly used variables */
+  SEARCH_POSITION status[MAXPLY + 3];
+  NEXT_MOVE next_status[MAXPLY];
+  KILLER killers[MAXPLY];
   POSITION position;
   uint64_t save_hash_key[MAXPLY + 3];
   uint64_t save_pawn_hash_key[MAXPLY + 3];
-  int rep_index;
   uint64_t rep_list[256];
-  uint64_t all_pawns;
-  uint64_t nodes_searched;
-  uint64_t cache_n[64];
-  PAWN_HASH_ENTRY pawn_score;
-  SEARCH_POSITION status[MAXPLY + 3];
-  NEXT_MOVE next_status[MAXPLY];
-  PATH pv[MAXPLY];
-  int cache_n_mobility[64];
   int curmv[MAXPLY];
+  int phase[MAXPLY];
   int hash_move[MAXPLY];
-  int *last[MAXPLY];
+  unsigned *last[MAXPLY];
-  uint64_t fail_highs;
-  uint64_t fail_high_first_move;
-  unsigned int evaluations;
+  unsigned move_list[5120];
-  unsigned int egtb_probes;
-  unsigned int egtb_probes_successful;
-  unsigned int extensions_done;
-  unsigned int qchecks_done;
-  unsigned int reductions_done;
-  unsigned int moves_fpruned;
-  KILLER killers[MAXPLY];
+  PATH pv[MAXPLY];
-  int move_list[5120];
-  int sort_value[256];
+/* variables used by Evaluate() */
-  unsigned char inchk[MAXPLY];
+  PAWN_HASH_ENTRY pawn_score;
-  int phase[MAXPLY];
   int tropism[2];
   int dangerous[2];
+  uint64_t all_pawns;
   int score_mg, score_eg;
+/* statistical counters */
+  uint64_t nodes_searched;
+  uint64_t fail_highs;
+  uint64_t fail_high_first_move;
+  uint64_t evaluations;
+  uint64_t egtb_probes;
+  uint64_t egtb_hits;
+  uint64_t extensions_done;
+  uint64_t qchecks_done;
+  uint64_t moves_fpruned;
+  uint64_t moves_mpruned;
+  uint64_t LMR_done[16];
+  uint64_t null_done[16];
-#  if (CPUS > 1)
+/* thread stuff */
   lock_t lock;
-#  endif
   int thread_id;
+  volatile int joinable;
+  volatile int joined;
   volatile int stop;
-  char root_move_text[16];
-  char remaining_moves_text[16];
-  struct tree *volatile siblings[CPUS], *parent;
   volatile int nprocs;
   int alpha;
   int beta;
   volatile int value;
-  int side;
+  int wtm;
   int depth;
   int ply;
+  int in_check;
+  int *searched;
   int cutmove;
+  struct tree *volatile siblings[CPUS], *parent;
-  volatile int used;
+/* rarely accessed */
+  char root_move_text[16];
-  volatile int moves_searched;
+  char remaining_moves_text[16];
-};
+} TREE;
-typedef struct tree TREE;
+typedef struct thread {
-struct thread {
+  TREE *tree;
+  uint64_t blocks;
-  TREE *volatile tree;
+  uint64_t max_blocks;
-  volatile int idle;
+  unsigned int idle;
+  volatile unsigned int terminate;
-  char filler[52];
+  char filler[40];
-};
+} THREAD;
-typedef struct thread THREAD;
 /*
    DO NOT modify these.  these are constants, used in multiple modules.
    modification may corrupt the search in any number of ways, all bad.
  */
-#  define WORTHLESS                 0
+#  define WORTHLESS                    0
-#  define LOWER                     1
+#  define UPPER                        1
-#  define UPPER                     2
+#  define LOWER                        2
-#  define EXACT                     3
+#  define EXACT                        3
-#  define HASH_MISS                 0
+#  define HASH_MISS                    0
-#  define HASH_HIT                  1
+#  define HASH_HIT                     1
-#  define AVOID_NULL_MOVE           2
+#  define AVOID_NULL_MOVE              2
-#  define NO_NULL                   0
+#  define NO_NULL                      0
-#  define DO_NULL                   1
+#  define DO_NULL                      1
-#  define NONE                      0
+#  define NONE                         0
-#  define EVALUATION                0
+#  define NULL_MOVE                    1
-#  define NULL_MOVE                 1
+#  define DO_NOT_REDUCE                1
-#  define HASH_MOVE                 2
+#  define HASH                         2
-#  define GENERATE_CAPTURE_MOVES    3
+#  define GENERATE_CAPTURES            3
-#  define CAPTURE_MOVES             4
+#  define CAPTURES                     4
-#  define KILLER_MOVE_1             5
+#  define KILLER1                      5
-#  define KILLER_MOVE_2             6
+#  define KILLER2                      6
-#  define KILLER_MOVE_3             7
+#  define KILLER3                      7
+#  define KILLER4                      8
+#  define COUNTER_MOVE1                9
-#  define KILLER_MOVE_4             8
+#  define COUNTER_MOVE2               10
+#  define MOVE_PAIR1                  11
+#  define MOVE_PAIR2                  12
-#  define GENERATE_ALL_MOVES        9
+#  define GENERATE_QUIET              13
+#  define HISTORY                     14
-#  define REMAINING_MOVES          10
+#  define REMAINING                   15
+#  define EVALUATION                  16
+#  define ILLEGAL                      0
+#  define LEGAL                        1
-#if defined(UNIX) && !defined(INLINEASM)
+#  define IN_WINDOW                    2
+#  define FAIL_HIGH                    3
+#if /*defined(UNIX) &&*/ !defined(INLINEASM) // Pierre-Marie Baty -- we also use them on Windows...
 int CDECL PopCnt(uint64_t);
 int CDECL MSB(uint64_t);
 int CDECL LSB(uint64_t);
 #endif
 void AlignedMalloc(void **, int, size_t);
 void AnnotatePositionHTML(TREE *RESTRICT, int, FILE *);
 char *AnnotateVtoNAG(int, int, int, int);
 void AnnotateHeaderTeX(FILE *);
 void AnnotateFooterTeX(FILE *);
 void AnnotatePositionTeX(TREE *, int, FILE *);
-uint64_t atoiKM(char *);
+uint64_t atoiKMB(char *);
 int Attacks(TREE *RESTRICT, int, int);
+uint64_t Attacked(TREE *RESTRICT, int, uint64_t);
 uint64_t AttacksFrom(TREE *RESTRICT, int, int);
 uint64_t AttacksTo(TREE *RESTRICT, int);
+void AutoTune(int, char **);
-void Bench(int);
+int Bench(int, int);
+int Bench_PGO(int, int);
-int Book(TREE *RESTRICT, int, int);
+int Book(TREE *RESTRICT, int);
 void BookClusterIn(FILE *, int, BOOK_POSITION *);
 void BookClusterOut(FILE *, int, BOOK_POSITION *);
 int BookIn32(unsigned char *);
 float BookIn32f(unsigned char *);
 uint64_t BookIn64(unsigned char *);
 int BookMask(char *);
 unsigned char *BookOut32(int);
 unsigned char *BookOut32f(float);
 unsigned char *BookOut64(uint64_t);
 int BookPonderMove(TREE *RESTRICT, int);
-void BookUp(TREE *RESTRICT, int, char **);
+void Bookup(TREE *RESTRICT, int, char **);
 void BookSort(BB_POSITION *, int, int);
-int BookUpCompare(const void *, const void *);
+int BookupCompare(const void *, const void *);
-BB_POSITION BookUpNextPosition(int, int);
+BB_POSITION BookupNextPosition(int, int);
 int CheckInput(void);
 void ClearHashTableScores(void);
 int ComputeDifficulty(int, int);
+void CopyFromParent(TREE *RESTRICT);
 void CopyToParent(TREE *RESTRICT, TREE *RESTRICT, int);
-void CopyToChild(TREE *RESTRICT, int);
 void CraftyExit(int);
 void DisplayArray(int *, int);
 void DisplayArrayX2(int *, int *, int);
 void DisplayBitBoard(uint64_t);
 void Display2BitBoards(uint64_t, uint64_t);
 void DisplayChessBoard(FILE *, POSITION);
 char *DisplayEvaluation(int, int);
 char *DisplayEvaluationKibitz(int, int);
 void DisplayFT(int, int, int);
-char *DisplayHHMM(unsigned int);
+char *DisplayHHMM(unsigned);
-char *DisplayHHMMSS(unsigned int);
+char *DisplayHHMMSS(unsigned);
-char *DisplayKMB(uint64_t);
+char *DisplayKMB(uint64_t, int);
+void DisplayFail(TREE *RESTRICT, int, int, int, int, int, int, int);
+char *DisplayPath(TREE *RESTRICT, int, PATH *);
-void DisplayPV(TREE *RESTRICT, int, int, int, PATH *);
+void DisplayPV(TREE *RESTRICT, int, int, int, PATH *, int);
-char *DisplayTime(unsigned int);
+char *DisplayTime(unsigned);
-char *Display2Times(unsigned int);
+char *Display2Times(unsigned);
-char *DisplayTimeKibitz(unsigned int);
+char *DisplayTimeKibitz(unsigned);
-void DisplayTreeState(TREE *RESTRICT, int, int, int);
 void DisplayChessMove(char *, int);
 int Drawn(TREE *RESTRICT, int);
-void DisplayType3(int *, int *);
-void DisplayType4(int *, int *);
-void DisplayType5(int *, int);
-void DisplayType6(int *);
 void Edit(void);
 #  if !defined(NOEGTB)
 int EGTBProbe(TREE *RESTRICT, int, int, int *);
 void EGTBPV(TREE *RESTRICT, int);
 #  endif
 int Evaluate(TREE *RESTRICT, int, int, int, int);
 void EvaluateBishops(TREE *RESTRICT, int);
-void EvaluateDevelopment(TREE *RESTRICT, int, int);
+void EvaluateCastling(TREE *RESTRICT, int, int);
 int EvaluateDraws(TREE *RESTRICT, int, int, int);
 int EvaluateHasOpposition(int, int, int);
-void EvaluateKings(TREE *RESTRICT, int, int);
+void EvaluateKing(TREE *RESTRICT, int, int);
-int EvaluateKingsFile(TREE *RESTRICT, int, int);
+int EvaluateKingsFile(TREE * RESTRICT, int, int, int);
 void EvaluateKnights(TREE *RESTRICT, int);
 void EvaluateMate(TREE *RESTRICT, int);
 void EvaluateMaterial(TREE *RESTRICT, int);
 void EvaluatePassedPawns(TREE *RESTRICT, int, int);
 void EvaluatePassedPawnRaces(TREE *RESTRICT, int);
 int Exclude(TREE *RESTRICT, int, int);
 int FindBlockID(TREE *RESTRICT);
 char *FormatPV(TREE *RESTRICT, int, PATH);
 int FTbSetCacheSize(void *, unsigned long);
 int GameOver(int);
-int *GenerateCaptures(TREE *RESTRICT, int, int, int *);
+unsigned *GenerateCaptures(TREE *RESTRICT, int, int, unsigned *);
-int *GenerateCheckEvasions(TREE *RESTRICT, int, int, int *);
+unsigned *GenerateCheckEvasions(TREE *RESTRICT, int, int, unsigned *);
-int *GenerateChecks(TREE *RESTRICT, int, int *);
+unsigned *GenerateChecks(TREE *RESTRICT, int, unsigned *);
-int *GenerateNoncaptures(TREE *RESTRICT, int, int, int *);
+unsigned *GenerateNoncaptures(TREE *RESTRICT, int, int, unsigned *);
-int HashProbe(TREE *RESTRICT, int, int, int, int, int, int*);
-void HashStore(TREE *RESTRICT, int, int, int, int, int, int);
-void HashStorePV(TREE *RESTRICT, int, int);
+TREE *GetBlock(TREE *, int);
-int IInitializeTb(char *);
 void Initialize(void);
 void InitializeAttackBoards(void);
 void InitializeChessBoard(TREE *);
 int InitializeGetLogID();
-void InitializeHashTables(void);
+void InitializeHashTables(int);
 void InitializeKillers(void);
 void InitializeKingSafety(void);
 void InitializeMagic(void);
 uint64_t InitializeMagicBishop(int, uint64_t);
 uint64_t InitializeMagicRook(int, uint64_t);
 uint64_t InitializeMagicOccupied(int *, int, uint64_t);
 void InitializeMasks(void);
 void InitializePawnMasks(void);
+void InitializeReductions(void);
 void InitializeSMP(void);
+int IInitializeTb(char *);
-int InputMove(TREE *RESTRICT, char *, int, int, int, int);
+int InputMove(TREE *RESTRICT, int, int, int, int, char *);
-int InputMoveICS(TREE *RESTRICT, char *, int, int, int, int);
+int InputMoveICS(TREE *RESTRICT, int, int, int, int, char *);
 uint64_t InterposeSquares(int, int, int);
 void Interrupt(int);
 int InvalidPosition(TREE *RESTRICT);
 int Iterate(int, int, int);
+int Join(int64_t);
 void Kibitz(int, int, int, int, int, uint64_t, int, int, char *);
-void Killer(TREE *RESTRICT, int, int);
+void History(TREE *RESTRICT, int, int, int, int, int*);
 int KingPawnSquare(int, int, int, int);
 int LearnAdjust(int);
 void LearnBook(void);
 int LearnFunction(int, int, int, int);
 void LearnValue(int, int);
 void MakeMove(TREE *RESTRICT, int, int, int);
 void MakeMoveRoot(TREE *RESTRICT, int, int);
 void NewGame(int);
-int NextEvasion(TREE *RESTRICT, int, int);
-int NextMove(TREE *RESTRICT, int, int);
+int NextMove(TREE *RESTRICT, int, int, int, int);
 int NextRootMove(TREE *RESTRICT, TREE *RESTRICT, int);
 int NextRootMoveParallel(void);
+void NextSort(TREE *RESTRICT, int);
 int Option(TREE *RESTRICT);
 int OptionMatch(char *, char *);
 void OptionPerft(TREE *RESTRICT, int, int, int);
-void Output(TREE *RESTRICT, int);
+void Output(TREE *RESTRICT);
 char *OutputMove(TREE *RESTRICT, int, int, int);
 int ParseTime(char *);
 void Pass(void);
 int PinnedOnKing(TREE *RESTRICT, int, int);
 int Ponder(int);
 void Print(int, char *, ...);
+int HashProbe(TREE *RESTRICT, int, int, int, int, int, int*);
+void HashStore(TREE *RESTRICT, int, int, int, int, int, int);
-char *PrintKM(size_t, int);
+void HashStorePV(TREE *RESTRICT, int, int);
 int Quiesce(TREE *RESTRICT, int, int, int, int, int);
 int QuiesceEvasions(TREE *RESTRICT, int, int, int, int);
-unsigned int Random32(void);
+unsigned Random32(void);
 uint64_t Random64(void);
-int Read(int, char *, size_t); // Pierre-Marie Baty -- sanitize buffer ops
+int Read(int, char *);
 int ReadChessMove(TREE *RESTRICT, FILE *, int, int);
 void ReadClear(void);
-unsigned int ReadClock(void);
+unsigned ReadClock(void);
 int ReadPGN(FILE *, int);
 int ReadNextMove(TREE *RESTRICT, char *, int, int);
 int ReadParse(char *, char *args[], char *);
 int ReadInput(void);
 int Repeat(TREE *RESTRICT, int);
-int Repeat3x(TREE *RESTRICT, int);
+int Repeat3x(TREE *RESTRICT);
 void ResignOrDraw(TREE *RESTRICT, int);
 void RestoreGame(void);
 void RootMoveList(int);
-int Search(TREE *RESTRICT, int, int, int, int, int, int);
+int Search(TREE *RESTRICT, int, int, int, int, int, int, int);
+int SearchMove(TREE *RESTRICT, int, int, int, int, int, int, int, int, int);
+int SearchMoveList(TREE *RESTRICT, int, int, int, int, int, int *, int, int, int);
-int SearchParallel(TREE *RESTRICT, int, int, int, int, int, int);
+int SearchNull(TREE * RESTRICT, int, int, int, int);
-void Trace(TREE *RESTRICT, int, int, int, int, int, const char *, int);
+void Trace(TREE *RESTRICT, int, int, int, int, int, const char *, int, int, int);
 void SetBoard(TREE *, int, char **, int);
 void SetChessBitBoards(TREE *);
 void SharedFree(void *address);
+void SortRootMoves(void);
+int Split(TREE *RESTRICT);
 int StrCnt(char *, char);
-int Swap(TREE *RESTRICT, int, int);
+int SEE(TREE *RESTRICT, int, int);
-int SwapO(TREE *RESTRICT, int, int);
+int SEEO(TREE *RESTRICT, int, int);
-void Test(char *);
+void Test(char *, FILE *, int, int);
-void TestEPD(char *);
+void TestEPD(char *, FILE *, int, int);
-int Thread(TREE *RESTRICT);
+void ThreadAffinity(int);
-void WaitForAllThreadsInitialized(void);
 void *STDCALL ThreadInit(void *);
 #  if !defined(UNIX)
 void ThreadMalloc(int64_t);
 #  endif
+int ThreadSplit(TREE *RESTRICT, int, int, int, int, int);
 void ThreadStop(TREE *RESTRICT);
+void ThreadTrace(TREE * RESTRICT, int, int);
-int ThreadWait(int64_t, TREE *RESTRICT);
+int ThreadWait(int, TREE *RESTRICT);
+int Threat(TREE *, int, int, int, int);
 void TimeAdjust(int, int);
 int TimeCheck(TREE *RESTRICT, int);
 void TimeSet(int);
 void UnmakeMove(TREE *RESTRICT, int, int, int);
 int ValidMove(TREE *RESTRICT, int, int, int);
 int VerifyMove(TREE *RESTRICT, int, int, int);
 void ValidatePosition(TREE *RESTRICT, int, int, char *);
+void WaitForAllThreadsInitialized(void);
 #  if !defined(UNIX)
 extern void *WinMallocInterleaved(size_t, int);
 extern void WinFreeInterleaved(void *, size_t);
-#    define MallocInterleaved(cBytes, cThreads)\
+#    define MallocInterleaved(cBytes, cThreads)     \
-    WinMallocInterleaved(cBytes, cThreads)
+       WinMallocInterleaved(cBytes, cThreads)
-#    define FreeInterleaved(pMemory, cBytes)\
+#    define FreeInterleaved(pMemory, cBytes)        \
-    WinFreeInterleaved(pMemory, cBytes)
+       WinFreeInterleaved(pMemory, cBytes)
 #  else
 #    if defined(NUMA)
 #      define MallocInterleaved(cBytes, cThreads) numa_alloc_interleaved(cBytes)
-#      define FreeInterleaved(pMemory, cBytes)    numa_free(pMemory, 1)
+#      define FreeInterleaved(pMemory, cBytes)          numa_free(pMemory, 1)
 #    else
 #      define MallocInterleaved(cBytes, cThreads) malloc(cBytes)
-#      define FreeInterleaved(pMemory, cBytes)    free(pMemory)
+#      define FreeInterleaved(pMemory, cBytes)          free(pMemory)
 #    endif
 #  endif
 #  define Abs(a)    (((a) > 0) ? (a) : -(a))
 #  define Max(a,b)  (((a) > (b)) ? (a) : (b))
 #  define Min(a,b)  (((a) < (b)) ? (a) : (b))
+#  define Sign(a)   ((a) < 0 ? -1 : +1)
 #  define FileDistance(a,b) abs(File(a) - File(b))
 #  define RankDistance(a,b) abs(Rank(a) - Rank(b))
 #  define Distance(a,b) Max(FileDistance(a,b), RankDistance(a,b))
-#  define DrawScore(side)                 (draw_score[side])
+#  define DrawScore(side)                  (draw_score[side])
 #  define PopCnt8Bit(a) (pop_cnt_8bit[a])
 #  define MSB8Bit(a) (msb_8bit[a])
 #  define LSB8Bit(a) (lsb_8bit[a])
+#  define HistoryIndex(side, m) ((side << 9) + (Piece(m) << 6) + To(m))
 /*
-  side = side to move
+   side = side to move
-  mptr = pointer into move list
+   mptr = pointer into move list
-  m = bit vector of to squares to unpack
+   m = bit vector of to squares to unpack
-  t = pre-computed from + moving piece
+   t = pre-computed from + moving piece
  */
-#  define Extract(side, mptr, m, t)                                        \
+#  define Extract(side, mptr, m, t)                                         \
-  for ( ; m ; Clear(to, m)) {                                              \
+  for ( ; m ; Clear(to, m)) {                                               \
-    to = Advanced(side, m);                                                \
+    to = MostAdvanced(side, m);                                             \
-    *mptr++ = t | (to << 6) | (Abs(PcOnSq(to)) << 15);                     \
+    *mptr++ = t | (to << 6) | (Abs(PcOnSq(to)) << 15);                      \
+  }
 #  define Check(side) Attacks(tree, Flip(side), KingSQ(side))
 #  define Attack(from,to) (!(intervening[from][to] & OccupiedSquares))
 #  define BishopAttacks(square, occ) *(magic_bishop_indices[square]+((((occ)&magic_bishop_mask[square])*magic_bishop[square])>>magic_bishop_shift[square]))
 #  define BishopMobility(square, occ) *(magic_bishop_mobility_indices[square]+((((occ)&magic_bishop_mask[square])*magic_bishop[square])>>magic_bishop_shift[square]))
 #  define PawnAttacks(side, square)   pawn_attacks[side][square]
 #  define Reversible(p)               (tree->status[p].reversible)
 #  define RookAttacks(square, occ) *(magic_rook_indices[square]+((((occ)&magic_rook_mask[square])*magic_rook[square])>>magic_rook_shift[square]))
 #  define RookMobility(square, occ) *(magic_rook_mobility_indices[square]+((((occ)&magic_rook_mask[square])*magic_rook[square])>>magic_rook_shift[square]))
 #  define QueenAttacks(square, occ)   (BishopAttacks(square, occ)|RookAttacks(square, occ))
-#  define Rank(x)       ((x)>>3)
+#  define Rank(x)        ((x)>>3)
-#  define File(x)       ((x)&7)
+#  define File(x)        ((x)&7)
-#  define Flip(x)       ((x)^1)
+#  define Flip(x)        ((x)^1)
-#  define Advanced(side, squares) ((side) ? MSB(squares) : LSB(squares))
+#  define MostAdvanced(side, squares) ((side) ? MSB(squares) : LSB(squares))
+#  define LeastAdvanced(side, squares) ((side) ? LSB(squares) : MSB(squares))
 #  define MinMax(side, v1, v2) ((side) ? Min((v1), (v2)) : Max((v1), (v2)))
 #  define InFront(side, k, p) ((side) ? k > p : k < p)
 #  define Behind(side, k, p) ((side) ? k < p : k > p)
+#  define Passed(sq, wtm)        (!(mask_passed[wtm][sq] & Pawns(Flip(wtm))))
 #  define RankAttacks(a) (RookAttacks(a, OccupiedSquares) & rank_mask[Rank(a)])
 #  define FileAttacks(a) (RookAttacks(a, OccupiedSquares) & file_mask[File(a)])
 #  define Diaga1Attacks(a) (BishopAttacks(a, OccupiedSquares) & (plus9dir[a] | minus9dir[a]))
 #  define Diagh1Attacks(a) (BishopAttacks(a, OccupiedSquares) & (plus7dir[a] | minus7dir[a]))
 #  define InterposeSquares(kingsq, checksq) intervening[kingsq][checksq]
 /*
    the following macros are used to extract the pieces of a move that are
    kept compressed into the rightmost 21 bits of a simple integer.
  */
-#  define Passed(sq, wtm)       (!(mask_passed[wtm][sq] & Pawns(Flip(wtm))))
 #  define From(a)               ((a) & 63)
 #  define To(a)                 (((a)>>6) & 63)
 #  define Piece(a)              (((a)>>12) & 7)
 #  define Captured(a)           (((a)>>15) & 7)
 #  define Promote(a)            (((a)>>18) & 7)
+#  define Move(a)               (a & 0x1fffff)
+#  define SortV(a)              (a >> 21)
 #  define CaptureOrPromote(a)   (((a)>>15) & 63)
+#  define PawnPush(c, a)        (Piece(a) == pawn &&                          \
+                                     rankflip[c][Rank(To(a))] >= RANK6        \
+                                     && !(mask_passed[c][To(a)] &             \
+                                          Pawns(Flip(c))))
+#  define CastleMove(c, a)       (Piece(a) == king && Abs(File(To(a)) -       \
+                                     File(From(a))) > 1)
-#  define SetMask(a)            (set_mask[a])
+#  define SetMask(a)             (set_mask[a])
-#  define ClearMask(a)          (clear_mask[a])
+#  define ClearMask(a)           (clear_mask[a])
-#  define Pawns(c)              (tree->position.color[c].pieces[pawn])
+#  define Pawns(c)               (tree->position.color[c].pieces[pawn])
-#  define Knights(c)            (tree->position.color[c].pieces[knight])
+#  define Knights(c)             (tree->position.color[c].pieces[knight])
-#  define Bishops(c)            (tree->position.color[c].pieces[bishop])
+#  define Bishops(c)             (tree->position.color[c].pieces[bishop])
-#  define Rooks(c)              (tree->position.color[c].pieces[rook])
+#  define Rooks(c)               (tree->position.color[c].pieces[rook])
-#  define Queens(c)             (tree->position.color[c].pieces[queen])
+#  define Queens(c)              (tree->position.color[c].pieces[queen])
-#  define Kings(c)              (tree->position.color[c].pieces[king])
+#  define Kings(c)               (tree->position.color[c].pieces[king])
-#  define KingSQ(c)             (tree->position.kingsq[c])
+#  define KingSQ(c)              (tree->position.kingsq[c])
-#  define Occupied(c)           (tree->position.color[c].pieces[occupied])
+#  define Occupied(c)            (tree->position.color[c].pieces[occupied])
-#  define Pieces(c, p)          (tree->position.color[c].pieces[p])
+#  define Pieces(c, p)           (tree->position.color[c].pieces[p])
-#  define TotalPieces(c, p)     (tree->position.pieces[c][p])
+#  define TotalPieces(c, p)      (tree->position.pieces[c][p])
-#  define TotalMinors(c)        (tree->position.minors[c])
-#  define TotalMajors(c)        (tree->position.majors[c])
-#  define PieceValues(c, p)     (piece_values[p][c])
+#  define PieceValues(c, p)      (piece_values[c][p])
-#  define TotalAllPieces        (tree->position.total_all_pieces)
+#  define TotalAllPieces         (tree->position.total_all_pieces)
-#  define Material              (tree->position.material_evaluation)
+#  define Material               (tree->position.material_evaluation)
-#  define MaterialSTM(side)     ((side) ? Material : -Material)
+#  define MaterialSTM(side)      ((side) ? Material : -Material)
-#  define MateScore(s)          (Abs(s) > 32000)
+#  define MateScore(s)           (Abs(s) > 32000)
-#  define Castle(ply, c)        (tree->status[ply].castle[c])
+#  define Castle(ply, c)         (tree->status[ply].castle[c])
-#  define HashKey               (tree->position.hash_key)
+#  define HashKey                (tree->position.hash_key)
-#  define PawnHashKey           (tree->position.pawn_hash_key)
+#  define PawnHashKey            (tree->position.pawn_hash_key)
-#  define EnPassant(ply)        (tree->status[ply].enpassant_target)
+#  define EnPassant(ply)         (tree->status[ply].enpassant_target)
-#  define EnPassantTarget(ply)  (EnPassant(ply) ? SetMask(EnPassant(ply)) : 0)
+#  define EnPassantTarget(ply)   (EnPassant(ply) ? SetMask(EnPassant(ply)) : 0)
-#  define PcOnSq(sq)            (tree->position.board[sq])
+#  define PcOnSq(sq)             (tree->position.board[sq])
-#  define OccupiedSquares       (Occupied(white) | Occupied(black))
+#  define OccupiedSquares        (Occupied(white) | Occupied(black))
-#  define Color(square)         (square_color[square] ? dark_squares : ~dark_squares)
+#  define Color(square)       (square_color[square] ? dark_squares : ~dark_squares)
-#  define SideToMove(c)         ((c) ? "White" : "Black")
+#  define SideToMove(c)          ((c) ? "White" : "Black")
 /*
    the following macros are used to Set and Clear a specific bit in the
    second argument.  this is done to make the code more readable, rather
    than to make it faster.
  */
  */
 #  define Hash(stm,piece,square)     (HashKey^=randoms[stm][piece][square])
 #  define HashP(stm,square)          (PawnHashKey^=randoms[stm][pawn][square])
 #  define HashCastle(stm,direction)  (HashKey^=castle_random[stm][direction])
 #  define HashEP(sq)                 (HashKey^=enpassant_random[sq])
-#  define SavePV(tree,ply,ph)   do {                                        \
+#  define SavePV(tree,ply,ph)        do {                                     \
-        tree->pv[ply-1].path[ply-1]=tree->curmv[ply-1];                     \
+        tree->pv[ply-1].path[ply-1]=tree->curmv[ply-1];                       \
-        tree->pv[ply-1].pathl=ply;                          \
+        tree->pv[ply-1].pathl=ply;                                            \
-        tree->pv[ply-1].pathh=ph;                           \
+        tree->pv[ply-1].pathh=ph;                                             \
-        tree->pv[ply-1].pathd=iteration_depth;} while(0)
+        tree->pv[ply-1].pathd=iteration;} while(0)
 #  if defined(INLINEASM)
 #    include "inline.h"
-#  endif
-#  if defined(UNIX)
-#    define SPEAK "./speak "
-#  else
-#    define SPEAK ".\\Speak.exe "
 #  endif
 #endif
 /* *INDENT-ON* */

Subversion Repositories Games.Chess Giants

Games.Chess Giants/engine-crafty/chess.h – Rev 33 → 108