Add evaluation tracing code

[stockfish] / src / bitboard.cpp

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index dd12dd3ad509775276ebee5345836b9b194ce35b..bc05bfa070c7d9d4afd7dba717443eaa957208e6 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -451,27 +451,19 @@ namespace {
 
   void init_sliding_attacks(Bitboard attacks[], int attackIndex[], Bitboard mask[],
                             const int shift[], const Bitboard mult[], int deltas[][2]) {
+    Bitboard b, v;
+    int i, j, index;
 
-    for (int i = 0, index = 0; i < 64; i++)
+    for (i = index = 0; i < 64; i++)
     {
         attackIndex[i] = index;
         mask[i] = sliding_attacks(i, 0, deltas, 1, 6, 1, 6);
-
-#if defined(IS_64BIT)
-        int j = (1 << (64 - shift[i]));
-#else
-        int j = (1 << (32 - shift[i]));
-#endif
+        j = 1 << ((CpuIs64Bit ? 64 : 32) - shift[i]);
 
         for (int k = 0; k < j; k++)
         {
-            Bitboard b = index_to_bitboard(k, mask[i]);
-
-#if defined(IS_64BIT)
-            Bitboard v = b * mult[i];
-#else
-            unsigned v = int(b) * int(mult[i]) ^ int(b >> 32) * int(mult[i] >> 32);
-#endif
+            b = index_to_bitboard(k, mask[i]);
+            v = CpuIs64Bit ? b * mult[i] : unsigned(b * mult[i] ^ (b >> 32) * (mult[i] >> 32));
             attacks[index + (v >> shift[i])] = sliding_attacks(i, b, deltas, 0, 7, 0, 7);
         }
         index += j;
@@ -490,8 +482,7 @@ namespace {
 
   void init_between_bitboards() {
 
-    Square s1, s2, s3;
-    SquareDelta d;
+    Square s1, s2, s3, d;
     int f, r;
 
     for (s1 = SQ_A1; s1 <= SQ_H8; s1++)
@@ -501,7 +492,7 @@ namespace {
                 f = file_distance(s1, s2);
                 r = rank_distance(s1, s2);
 
-                d = SquareDelta(s2 - s1) / Max(f, r);
+                d = (s2 - s1) / Max(f, r);
 
                 for (s3 = s1 + d; s3 != s2; s3 += d)
                     set_bit(&(BetweenBB[s1][s2]), s3);