Ticket #145: cache.h.patch

gnugo/engine/cache.h

@@ -32 +32 @@
  * (Reading/Hashing) for more information.  
  */
 
+#if SIZEOF_INT == 4
+  typedef unsigned int HASHNODE_DATATYPE;
+#elif SIZEOF_LONG == 4
+  typedef unsigned long HASHNODE_DATATYPE;
+#elif SIZEOF_INT > 4
+  typedef unsigned short HASHNODE_DATATYPE;
+#elif
+  #error Long type size has to be at least 4 bytes.
+#endif
 
 /* Hashnode: a node stored in the transposition table.
  *
  * In addition to the position, the hash lock encodes the following data,
  * all hashed:
- *   komaster
- *   kom_pos
+ *   ko
+ *   komaster (look in doc)
+ *   kom_pos (look in doc)
  *   routine
- *   str1
- *   str2
+ *   target1
+ *   target2
  *   extra hashvalue, optional (e.g. encoding a goal array)
  *
  * The data field packs into 32 bits the following
@@ -54 +64 @@
  *   cost           :  4 bits
  *   remaining_depth:  5 bits (depth - stackp)  NOTE: HN_MAX_REMAINING_DEPTH
  *
- *   The last 9 bits together give an index for the total costs.
+ *   The last 9 bits together give a reliability index (bigger index means
+ *   more reliable result).
+ *   Values are results of analyzed position (WIN, LOSE, etc.)
  */
 typedef struct {
   Hash_data key;
-  unsigned int data; /* Should be 32 bits, but only wastes 25% if 64 bits. */
+  HASHNODE_DATATYPE data; /* 32-bit value */
 } Hashnode;
 
 #define HN_MAX_REMAINING_DEPTH 31
@@ -67 +79 @@
 /* Hashentry: an entry, with two nodes of the hash_table
  */
 typedef struct {
-  Hashnode deepest;
+  Hashnode most_reliable;
   Hashnode newest;
 } Hashentry;
 
@@ -76 +88 @@
 #define hn_get_value2(hn)           ((hn >> 19) & 0x0f)
 #define hn_get_move(hn)             ((hn >>  9) & 0x3ff)
 #define hn_get_cost(hn)             ((hn >>  5) & 0x0f)
-#define hn_get_remaining_depth(hn)  ((hn >>  0) & 0x1f)
-#define hn_get_total_cost(hn)       ((hn >>  0) & 0x1ff)
+#define hn_get_remaining_depth(hn)  ((hn/*>>  0*/) & 0x1f)
+#define hn_get_reliability(hn)      ((hn/*>>  0*/) & 0x1ff)
 
 #define hn_create_data(remaining_depth, value1, value2, move, cost) \
     ((((value1)         & 0x0f)  << 23) \
    | (((value2)         & 0x0f)  << 19) \
    | (((move)           & 0x3ff) <<  9) \
    | (((cost)           & 0x0f)  <<  5) \
-   | (((remaining_depth & 0x1f)  <<  0)))
+   | (((remaining_depth & 0x1f)/*<<  0*/)))
 
 
 /* Transposition_table: transposition table used for caching. */
 typedef struct {
   unsigned int num_entries;
   Hashentry *entries;
-  int is_clean;
 } Transposition_table;
 
 extern Transposition_table ttable;
@@ -101 +112 @@
  */
 #define DEFAULT_NUMBER_OF_CACHE_ENTRIES 350000
 
-void tt_free(Transposition_table *table);
+inline void tt_free(Transposition_table *table);
 int  tt_get(Transposition_table *table, enum routine_id routine,
             int target1, int target2, int remaining_depth,
             Hash_data *extra_hash,
@@ -212 +223 @@
   do { \
     tt_update(&ttable, routine, str, NO_MOVE, remaining_depth, NULL,\
               value, 0, move);\
-    if ((value) != 0 && (point) != 0) *(point) = (move); \
+    if ((point) != NULL && (value) != 0) \
+          *(point) = (move); \
     return (value); \
   } while (0)
 
@@ -220 +232 @@
   do { \
     tt_update(&ttable, routine, str1, str2, remaining_depth, NULL, \
               value1, value2, move); \
-    if ((value1) != 0 && (point) != 0) *(point) = (move); \
+    if ((point) != NULL && (value1) != 0) \
+          *(point) = (move); \
     return; \
   } while (0)
 
@@ -228 +241 @@
   do { \
     tt_update(&ttable, routine, str1, str2, remaining_depth, NULL,\
               value, 0, move);\
-    if ((value) != 0 && (point) != 0) *(point) = (move); \
+    if ((point) != NULL && (value) != 0) \
+          *(point) = (move); \
     return (value); \
   } while (0)
 
@@ -236 +250 @@
   do { \
     tt_update(&ttable, routine, str, NO_MOVE, remaining_depth, hash,\
               value, 0, move);\
-    if ((value) != 0 && (point) != 0) *(point) = (move); \
+    if ((point) != NULL && (value) != 0) \
+          *(point) = (move); \
     return (value); \
   } while (0)
 
@@ -244 +259 @@
   do { \
     tt_update(&ttable, routine, str, NO_MOVE, remaining_depth, NULL,\
               value1, value2, move);\
-    if ((value1) != 0 && (point) != 0) *(point) = (move); \
+    if ((point) != NULL && (value1) != 0) \
+          *(point) = (move); \
     return (value1); \
   } while (0)