Ticket #145: hash.c.patch

gnugo/engine/hash.c

@@ -28 +28 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <string.h>
 
 
 
@@ -58 +59 @@
 {
   int i;
   Hashvalue h = 0;
+  const int limit = CHAR_BIT * sizeof(Hashvalue);
 
-  for (i = 0; 32*i < (int) (CHAR_BIT*sizeof(Hashvalue)); i++)
-    h |= (Hashvalue) gg_urand() << 32*i;
+  for (i = 0; i < limit; i += 32)
+    h |= ((Hashvalue) gg_urand()) << i;
 
   return h;
 }
@@ -70 +72 @@
 hash_init_zobrist_array(Hash_data *array, int size)
 {
   int i, j;
-  for (i = 0; i < size; i++)
-    for (j = 0; j < NUM_HASHVALUES; j++)
+  for (i = 0; i < size; ++i)
+    for (j = 0; j < NUM_HASHVALUES; ++j)
       array[i].hashval[j] = hash_rand();
 }
 
@@ -111 +113 @@
 
   hashdata_clear(target);
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (p[pos] == WHITE)
+  scan_board(pos,
+
+    Intersection intersection = p[pos];
+
+    if (intersection == WHITE)
       hashdata_xor(*target, white_hash[pos]);
-    else if (p[pos] == BLACK)
+    else if (intersection == BLACK)
       hashdata_xor(*target, black_hash[pos]);
-  }
+  )
 
-  if (ko_pos != 0)
+  if (ko_pos != NO_MOVE)
     hashdata_xor(*target, ko_hash[ko_pos]);
 }
 
 /* Clear hashdata. */
-void
+inline void
 hashdata_clear(Hash_data *hd)
 {
-  int i;
-  for (i = 0; i < NUM_HASHVALUES; i++)
-    hd->hashval[i] = 0;
+  memset(hd->hashval, 0, NUM_HASHVALUES * sizeof(Hashvalue));
 }
 
 /* Set or remove ko in the hash value and hash position.  */
-void
+inline void
 hashdata_invert_ko(Hash_data *hd, int pos)
 {
   hashdata_xor(*hd, ko_hash[pos]);
@@ -140 +143 @@
 
 
 /* Set or remove a stone of COLOR at pos in a Hash_data.  */
-void
+inline void
 hashdata_invert_stone(Hash_data *hd, int pos, int color)
 {
   if (color == BLACK)
@@ -151 +154 @@
 
 
 /* Set or remove the komaster value in the hash data. */
-void
+inline void
 hashdata_invert_komaster(Hash_data *hd, int komaster)
 {
   hashdata_xor(*hd, komaster_hash[komaster]);
 }
 
 /* Set or remove the komaster position in the hash data. */
-void
+inline void
 hashdata_invert_kom_pos(Hash_data *hd, int kom_pos)
 {
   hashdata_xor(*hd, kom_pos_hash[kom_pos]);
@@ -168 +171 @@
 Hash_data
 goal_to_hashvalue(const signed char *goal)
 {
-  int pos;
   Hash_data return_value;
+  int pos;
   
   hashdata_clear(&return_value);
-  
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos) && goal[pos])
+
+  scan_board(pos,
+    if (goal[pos])
       hashdata_xor(return_value, goal_hash[pos]);
+  );
+  
+  /* code in scan_board is equal but faster
+
+  for (pos = BOARDMIN; pos < BOARDMAX; ++pos)
+    if (ON_BOARD(pos) && *(goal + pos))
+      hashdata_xor(return_value, *(goal_hash + pos));*/
   
   return return_value;
 }
@@ -191 +201 @@
   int k;
 
   /* Loop backwards for consistency between 32 and 64 bit platforms. */
-  for (k = NUM_HASHVALUES - 1; k >= 0; k--) {
+  for (k = NUM_HASHVALUES - 1; k >= 0; --k) {
     n += sprintf(buffer + n, HASHVALUE_PRINT_FORMAT,
                  HASHVALUE_NUM_DIGITS, hashdata->hashval[k]);
     gg_assert(n < BUFFER_SIZE);
@@ -205 +215 @@
 hashdata_is_equal_func(Hash_data *hd1, Hash_data *hd2)
 {
   int i;
-  for (i = 0; i < NUM_HASHVALUES; i++)
+  for (i = 0; i < NUM_HASHVALUES; ++i)
     if (hd1->hashval[i] != hd2->hashval[i])
       return 0;