Changeset 1886 in kBuild for trunk/src/kmk/variable.c

Timestamp:

Oct 19, 2008 10:27:49 PM (16 years ago)

Author:

bird

Message:

kmk: variable+strcache2 hacking.

File:

• trunk/src/kmk/variable.c (modified) (11 diffs)

trunk/src/kmk/variable.c

@@ -108 +108 @@
 #if defined(VARIABLE_HASH) || defined(CONFIG_WITH_OPTIMIZATION_HACKS)
 # ifdef _MSC_VER
-#  define inline _inline
 typedef signed int int32_t;
 # endif
-static inline unsigned long variable_hash_2i(register const char *var, register int length)
+MY_INLINE unsigned long variable_hash_2i(register const char *var, register int length)
 {
 # define UPDATE_HASH(ch) hash = (ch) + (hash << 6) + (hash << 16) - hash
@@ -170 +169 @@
 }
 
-static inline unsigned long variable_hash_1i(register const char *var, register int length)
+MY_INLINE unsigned long variable_hash_1i(register const char *var, register int length)
 {
 # define UPDATE_HASH(ch) hash = ((hash << 5) + hash) + (ch)
@@ -339 +338 @@
 }
 
-#ifndef VARIABLE_HASH
-static int
-variable_hash_cmp (const void *xv, const void *yv)
-{
-  struct variable const *x = (struct variable const *) xv;
-  struct variable const *y = (struct variable const *) yv;
-  int result = x->length - y->length;
-  if (result)
-    return result;
-  return_STRING_N_COMPARE (x->name, y->name, x->length);
-}
-#else /* VARIABLE_HASH */
-
-inline static int
+#if defined(VARIABLE_HASH) || defined(KMK)
+
+MY_INLINE int
 variable_hash_cmp_2_memcmp (const char *xs, const char *ys, unsigned int length)
 {
@@ -426 +414 @@
 }
 
-inline static int
+MY_INLINE int
 variable_hash_cmp_2_inlined (const char *xs, const char *ys, unsigned int length)
 {
@@ -532 +520 @@
 }
 
-inline static int
+#endif /* VARIABLE_HASH || KMK */
+
+#ifndef VARIABLE_HASH
+static int
+variable_hash_cmp (const void *xv, const void *yv)
+{
+  struct variable const *x = (struct variable const *) xv;
+  struct variable const *y = (struct variable const *) yv;
+# ifndef CONFIG_WITH_STRCACHE2
+  int result = x->length - y->length;
+  if (result)
+    return result;
+# else  /* CONFIG_WITH_STRCACHE2 */
+  int result;
+
+  if (x->value != (char *)x) /* hack: strcache indicator  */
+    {
+      assert (y->value != (char *)y);
+      return x->name == y->name ? 0 : -1;
+    }
+
+  /* lookup path:  */
+  result = x->length - y->length;
+  if (result)
+    return result;
+# endif /* CONFIG_WITH_STRCACHE2 */
+
+# ifndef KMK
+  return_STRING_N_COMPARE (x->name, y->name, x->length);
+# else  /* KMK */
+#  if 0
+  return variable_hash_cmp_2_memcmp(x->name, y->name, x->length);
+#  else
+  return variable_hash_cmp_2_inlined(x->name, y->name, x->length);
+#  endif
+# endif /* KMK */
+}
+
+#else /* VARIABLE_HASH */
+
+MY_INLINE int
 variable_hash_cmp (const void *xv, const void *yv)
 {
@@ -549 +577 @@
     __asm__("int3");
 # endif /* VARIABLE_HASH_STRICT */
+
+# ifdef CONFIG_WITH_STRCACHE2
+  /* strcaching */
+  if (x->value != (char *)x) /* hack: strcache indicator  */
+    {
+      assert (y->value != (char *)y);
+      return x->name == y->name ? 0 : -1;
+    }
+#endif
 
   /* hash 1 & length */
@@ -649 +686 @@
     set = &global_variable_set;
 
+#ifndef CONFIG_WITH_STRCACHE2
   var_key.name = (char *) name;
+#else
+  var_key.value = NULL; /* hack: name cached. (value != var) */
+  var_key.name = name = strcache2_add (&variable_strcache, name, length);
+#endif
   var_key.length = length;
 #ifdef VARIABLE_HASH /* bird */
@@ -721 +763 @@
   v->name = savestring (name, length);
 #else
-  v->name = strcache2_add (&variable_strcache, name, length);
+  v->name = name; /* already cached. */
 #endif
   v->length = length;
 #ifdef VARIABLE_HASH /* bird */
-  v->hash1 = variable_hash_1i (name, length);
+  v->hash1 = variable_hash_1i (name, length); /* FIXME: Unnecessary! */
   v->hash2 = 0;
 #endif
@@ -887 +929 @@
   var_key.hash1 = variable_hash_1i (name, length);
   var_key.hash2 = 0;
+#endif
+#ifdef CONFIG_WITH_STRCACHE2
+  var_key.value = (char *)&var_key; /* hack: name not cached */
 #endif
 
@@ -1008 +1053 @@
   var_key.hash1 = variable_hash_1i (name, length);
   var_key.hash2 = 0;
+#endif
+#ifdef CONFIG_WITH_STRCACHE2
+  var_key.value = (char *)&var_key; /* hack: name not cached */
 #endif
 
@@ -1768 +1816 @@
   makelevel_key.hash2 = 0;
 #endif
+#ifdef CONFIG_WITH_STRCACHE2
+  makelevel_key.value = (char *)&makelevel_key; /* hack: name not cached */
+#endif
   hash_delete (&table, &makelevel_key);