Changeset 429 in kBuild

Timestamp:

Mar 26, 2006 6:07:04 AM (19 years ago)

Author:

bird

Message:

optimizing for the libc project.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (2 diffs)
• file.c (modified) (1 diff)
• make.h (modified) (1 diff)
• misc.c (modified) (3 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -22 +22 @@
         CONFIG_NO_DEFAULT_VARIABLES \
         KMK
+        
         
 kmk_SOURCES         = \
@@ -90 +91 @@
 # Standalone kmkbuiltin commands.
 #
-PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_install kmk_ln kmk_rm 
+PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_install kmk_ln kmk_rm
 
 kmk_append_TEMPLATE = BIN

trunk/src/gmake/file.c

@@ -968 +968 @@
 init_hash_files (void)
 {
+#ifdef KMK
+  hash_init (&files, 8192, file_hash_1, file_hash_2, file_hash_cmp);
+#else
   hash_init (&files, 1000, file_hash_1, file_hash_2, file_hash_cmp);
+#endif
 }
 

trunk/src/gmake/make.h

@@ -424 +424 @@
 extern void collapse_continuations PARAMS ((char *));
 extern void remove_comments PARAMS((char *));
+#ifdef KMK
+#define lindex(s, limit, c) ((char *)memchr((s), (c), (limit) - (s)))
+#else
 extern char *lindex PARAMS ((const char *, const char *, int));
+#endif
 extern int alpha_compare PARAMS ((const void *, const void *));
 extern void print_spaces PARAMS ((unsigned int));

trunk/src/gmake/misc.c

@@ -22 +22 @@
 #include "dep.h"
 #include "debug.h"
+
+#ifdef __EMX__  /* saves 5-10ms on libc */
+# define bcopy(src, dst, size)   __builtin_memcpy((dst), (src), (size))
+#endif
 
 /* Variadic functions.  We go through contortions to allow proper function
@@ -420 +424 @@
 
 
+#ifndef KMK /* This is really a reimplemntation of memchr. */
 /* Limited INDEX:
    Search through the string STRING, which ends at LIMIT, for the character C.
@@ -435 +440 @@
   return 0;
 }
+#endif
 
 

trunk/src/gmake/variable.c

@@ -149 +149 @@
 init_hash_global_variable_set (void)
 {
-  hash_init (&global_variable_set.table, VARIABLE_BUCKETS,
+  hash_init (&global_variable_set.table,
+#ifdef KMK
+             8192,
+#else
+             VARIABLE_BUCKETS,
+#endif
              variable_hash_1, variable_hash_2, variable_hash_cmp);
 }