Changeset 1926 in kBuild

Timestamp:

Oct 24, 2008 4:49:58 AM (16 years ago)

Author:

bird

Message:

kmk: Inlined much of handle_function/lookup_function so variable_expand_string_2 can avoid having to make the call for every variable it encounters. Also fixed the func_char_map generation.

File:

• trunk/src/kmk/function.c (modified) (5 diffs)

trunk/src/kmk/function.c

@@ -334 +334 @@
 
 #if defined (CONFIG_WITH_OPTIMIZATION_HACKS) || defined (CONFIG_WITH_VALUE_LENGTH)
-/* The maximum length of a function, once reached there is
-   it can't be function and we can skip the hash lookup drop out. */
-
-# define MAX_FUNCTION_LENGTH 12
-# define MIN_FUNCTION_LENGTH 2
-
-/* char map containing the valid function name characters. */
-static char func_char_map[256];
+
+/* Char map containing the valid function name characters. */
+char func_char_map[256];
 
 /* Do the hash table lookup. */
@@ -411 +406 @@
       e++;
     }
-  if (ch == '\0' || isblank ((unsigned char) ch))
+  if (ch == '\0' || isblank (ch))
     return lookup_function_in_hash_tab (s, e - s);
   return 0;
@@ -4296 +4291 @@
 
 
-int  /* bird split it up */
+int  /* bird split it up and hacked it. */
 #ifndef CONFIG_WITH_VALUE_LENGTH
 handle_function (char **op, const char **stringp)
@@ -4306 +4301 @@
 }
 #else  /* CONFIG_WITH_VALUE_LENGTH */
-handle_function (char **op, const char **stringp, const char *eol)
+handle_function (char **op, const char **stringp, const char *nameend, const char *eol)
 {
   const char *fname = *stringp + 1;
-  const struct function_table_entry *entry_p = lookup_function (fname, eol - fname);
+  const struct function_table_entry *entry_p =
+      lookup_function_in_hash_tab (fname, nameend - fname);
   if (!entry_p)
     return 0;
@@ -4489 +4485 @@
   {
     unsigned int i;
-    for (i = 'a'; i <= 'z'; i++)
-      func_char_map[i] = 1;
-    func_char_map[(unsigned int)'-'] = 1;
-
     for (i = 0; i < FUNCTION_TABLE_ENTRIES; i++)
       {
+        const char *fn = function_table_init[i].name;
+        while (*fn)
+          {
+            func_char_map[(int)*fn] = 1;
+            fn++;
+          }
         assert (function_table_init[i].len <= MAX_FUNCTION_LENGTH);
         assert (function_table_init[i].len >= MIN_FUNCTION_LENGTH);