Changeset 1980 in kBuild

Timestamp:

Oct 27, 2008 11:25:49 PM (16 years ago)

Author:

bird

Message:

kmk: Some cleanup.

Location:

trunk/src/kmk

Files:

• commands.c (modified) (4 diffs)
• dep.h (modified) (1 diff)
• dir.c (modified) (6 diffs)
• expand.c (modified) (11 diffs)
• file.c (modified) (5 diffs)
• filedef.h (modified) (1 diff)
• function.c (modified) (5 diffs)
• hash.h (modified) (12 diffs)
• job.c (modified) (4 diffs)
• main.c (modified) (7 diffs)
• read.c (modified) (3 diffs)

trunk/src/kmk/commands.c

@@ -413 +413 @@
 
   cmds->any_recurse = 0;
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#ifndef CONFIG_WITH_COMMANDS_FUNC
+  cmds->lines_flags = xmalloc (nlines);
+#else
   cmds->lines_flags = xmalloc (nlines * sizeof (cmds->lines_flags[0]));
-#else
-  cmds->lines_flags = xmalloc (nlines);
 #endif
   for (idx = 0; idx < nlines; ++idx)
@@ -423 +423 @@
 
       for (p = lines[idx];
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#ifndef CONFIG_WITH_COMMANDS_FUNC
+            isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+';
+#else
            isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+' || *p == '%';
-#else
-           isblank ((unsigned char)*p) || *p == '-' || *p == '@' || *p == '+';
 #endif
            ++p)
@@ -536 +536 @@
   exit (10);
 #else /* not Amiga */
-#if defined(WINDOWS32) && !defined(CONFIG_NEW_WIN32_CTRL_EVENT)
+#if defined (WINDOWS32) && !defined (CONFIG_NEW_WIN32_CTRL_EVENT)
   extern HANDLE main_thread;
 
@@ -618 +618 @@
 
 #ifdef WINDOWS32
-#ifndef CONFIG_NEW_WIN32_CTRL_EVENT
+# ifndef CONFIG_NEW_WIN32_CTRL_EVENT
   if (main_thread)
     CloseHandle (main_thread);
-#endif /* !CONFIG_NEW_WIN32_CTRL_EVENT */
+# endif /* !CONFIG_NEW_WIN32_CTRL_EVENT */
   /* Cannot call W32_kill with a pid (it needs a handle).  The exit
      status of 130 emulates what happens in Bash.  */

trunk/src/kmk/dep.h

@@ -59 +59 @@
 
 
-
 #ifndef CONFIG_WITH_ALLOC_CACHES
 struct nameseq *multi_glob (struct nameseq *chain, unsigned int size);

trunk/src/kmk/dir.c

@@ -220 +220 @@
 #ifndef DIRECTORY_BUCKETS
 #ifdef KMK
-# define DIRECTORY_BUCKETS 4096
+#  define DIRECTORY_BUCKETS 4096
 # else
-#define DIRECTORY_BUCKETS 199
+#  define DIRECTORY_BUCKETS 199
 # endif
 #endif
@@ -1016 +1016 @@
 #endif
       memset (dir->contents, '\0', sizeof (struct directory_contents));
-
     }
 
@@ -1239 +1238 @@
               files += f;
               impossible += im;
-
 #ifdef KMK
               fputs ("# ", stdout);
@@ -1391 +1389 @@
   gl->gl_closedir = ansi_free;
   gl->gl_stat = local_stat;
-#ifdef __EMX__ /* The FreeBSD implemenation actually uses gl_lstat!! */
+#ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
   gl->gl_lstat = local_stat;
 #endif
@@ -1404 +1402 @@
   hash_init (&directories, DIRECTORY_BUCKETS,
              directory_hash_1, directory_hash_2, directory_hash_cmp);
-#else  /*  */
+#else  /* CONFIG_WITH_STRCACHE2 */
   hash_init_strcached (&directories, DIRECTORY_BUCKETS, &file_strcache,
                        offsetof (struct directory, name));
-#endif /*  */
+#endif /* CONFIG_WITH_STRCACHE2 */
   hash_init (&directory_contents, DIRECTORY_BUCKETS,
              directory_contents_hash_1, directory_contents_hash_2,
@@ -1418 +1416 @@
   alloccache_init (&dirfile_cache, sizeof (struct dirfile),
                    "dirfile", NULL, NULL);
-#endif
-}
+#endif /* CONFIG_WITH_ALLOC_CACHES */
+}

trunk/src/kmk/expand.c

@@ -81 +81 @@
       unsigned int offset = ptr - variable_buffer;
       variable_buffer_length = (newlen + 100 > 2 * variable_buffer_length
-                               ? newlen + 100
-                               : 2 * variable_buffer_length);
+                                ? newlen + 100
+                                : 2 * variable_buffer_length);
       variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
       ptr = variable_buffer + offset;
@@ -116 +116 @@
       variable_buffer[0] = '\0';
     }
-#else
+#else  /* CONFIG_WITH_VALUE_LENGTH */
   if (variable_buffer == 0)
     {
@@ -123 +123 @@
       variable_buffer[0] = '\0';
     }
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
   return variable_buffer;
@@ -210 +210 @@
 /* Expand a simple reference to variable NAME, which is LENGTH chars long.  */
 
-#if defined(__GNUC__) || defined(_MSC_VER) /* bird added MSC */
+#if defined(__GNUC__)
 __inline
+#elif defined (MY_INLINE) /* bird */
+MY_INLINE
 #endif
 static char *
@@ -236 +238 @@
      unsigned int value_len;
 
+     /* XXX: Inline recursively_expand_for_file() here and what it calls, try
+             make use of O directly instead wasting time on an intermediate buffer.  */
      value = recursively_expand_for_file (v, NULL, &value_len);
      o = variable_buffer_output (o, value, value_len);
@@ -760 +764 @@
 #ifndef CONFIG_WITH_VALUE_LENGTH
   return variable_expand_string(NULL, line, (long)-1);
-#else
+#else  /* CONFIG_WITH_VALUE_LENGTH */
   char *s;
 
@@ -770 +774 @@
     }
   return variable_expand_string_2 (NULL, line, (long)-1, &s);
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 }
 
@@ -793 +797 @@
   if (!end || *end == '\0')
     return allocated_variable_expand (str);
+
   tmp = alloca (end - str + 1);
   memcpy (tmp, str, end - str);
   tmp[end - str] = '\0';
+
   return allocated_variable_expand (tmp);
 #else  /* CONFIG_WITH_VALUE_LENGTH */
@@ -844 +850 @@
 {
   char *result;
-  struct variable_set_list *save;
-  const struct floc *reading_file_saved;
+  struct variable_set_list *savev;
+  const struct floc *savef;
   long len = length == ~0U ? (long)-1 : (long)length;
   char *eol;
@@ -856 +862 @@
   else
     {
-      save = current_variable_set_list;
+      savev = current_variable_set_list;
       current_variable_set_list = file->variables;
-      reading_file_saved = reading_file;
+
+      savef = reading_file;
       if (file->cmds && file->cmds->fileinfo.filenm)
         reading_file = &file->cmds->fileinfo;
       else
         reading_file = 0;
+
       result = variable_expand_string_2 (o, line, len, &eol);
-      current_variable_set_list = save;
-      reading_file = reading_file_saved;
+
+      current_variable_set_list = savev;
+      reading_file = savef;
     }
 
@@ -1006 +1015 @@
   variable_buffer = 0;
 
-  assert ((unsigned int)v->length == strlen (v->name));
+  assert ((unsigned int)v->length == strlen (v->name)); /* bird */
   val = variable_append (v->name, strlen (v->name), current_variable_set_list);
   variable_buffer_output (val, "", 1);

trunk/src/kmk/file.c

@@ -538 +538 @@
         multi_glob (parse_file_seq (&p, '\0', &dep_cache, 1), &dep_cache);
 #endif
+
       if (! new)
         new = ood;
@@ -858 +859 @@
      and thereby save a little time.  */
   incdep_flush_and_term ();
-#endif
+#endif /* CONFIG_WITH_INCLUDEDEP */
 
   /* For every target that's not .SUFFIXES, expand its dependencies.
@@ -887 +888 @@
       for (f2 = f->double_colon; f2 != 0; f2 = f2->prev)
         f2->command_flags |= COMMANDS_NOTPARALLEL;
-#endif
+#endif /* KMK */
   free (file_slot_0);
 
@@ -1383 +1384 @@
   hash_init (&files, 1000, file_hash_1, file_hash_2, file_hash_cmp);
 # endif
-#else
+#else  /* CONFIG_WITH_STRCACHE2 */
 # ifdef KMK
   hash_init_strcached (&files, 32755, &file_strcache,
@@ -1391 +1392 @@
                        offsetof (struct file, hname));
 # endif
-#endif
+#endif /* CONFIG_WITH_STRCACHE2 */
 }
 

trunk/src/kmk/filedef.h

@@ -211 +211 @@
 #define ORDINARY_MTIME_MAX ((FILE_TIMESTAMP_S (NEW_MTIME) \
                              << FILE_TIMESTAMP_LO_BITS) \
-                            + ORDINARY_MTIME_MIN + (FILE_TIMESTAMPS_PER_S - 1)) /* bird: MSC overflow fix */
+                            + ORDINARY_MTIME_MIN + (FILE_TIMESTAMPS_PER_S - 1)) /* bird: MSC overflow fix - XXX: darwin is bitching, check it again, org: ORDINARY_MTIME_MIN + FILE_TIMESTAMPS_PER_S - 1) */
 
 /* Modtime value to use for `infinitely new'.  We used to get the current time

trunk/src/kmk/function.c

@@ -340 +340 @@
 /* Do the hash table lookup. */
 
-__inline static const struct function_table_entry *
+MY_INLINE const struct function_table_entry *
 lookup_function_in_hash_tab (const char *s, unsigned char len)
 {
@@ -352 +352 @@
 /* Look up a function by name.  */
 
-__inline static const struct function_table_entry *
+MY_INLINE const struct function_table_entry *
 lookup_function (const char *s, unsigned int len)
 {
@@ -517 +517 @@
                        0),
                       sizeof (struct nameseq));
-#else
+#else  /* CONFIG_WITH_ALLOC_CACHES */
   chain = multi_glob (parse_file_seq
                       (&line, '\0', &nameseq_cache,
@@ -525 +525 @@
                        0),
                       &nameseq_cache);
-#endif
+#endif /* CONFIG_WITH_ALLOC_CACHES */
 
   if (result == 0)
@@ -1032 +1032 @@
       free (var->value);
       var->value = savestring (p, len);
+
       result = allocated_variable_expand (body);
 

trunk/src/kmk/hash.h

@@ -100 +100 @@
 /* hash and comparison macros for case-sensitive string keys. */
 
-#ifndef CONFIG_WITH_OPTIMIZATION_HACKS
 #define STRING_HASH_1(KEY, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -106 +105 @@
     (RESULT) += (*_key_ << (_key_[1] & 0xf)); \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-# define STRING_HASH_1(KEY, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_; \
-  while (_ch_) \
-    { \
-      unsigned char _ch2_ = *++_key_; \
-     (RESULT) += (_ch_ << (_ch2_ & 0xf)); \
-     _ch_ = _ch2_; \
-    } \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_STRING_HASH_1(KEY) do { \
   unsigned long _result_ = 0; \
@@ -124 +111 @@
 } while (0)
 
-#ifndef CONFIG_WITH_OPTIMIZATION_HACKS
 #define STRING_HASH_2(KEY, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -130 +116 @@
     (RESULT) += (*_key_ << (_key_[1] & 0x7)); \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-# define STRING_HASH_2(KEY, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_; \
-  while (_ch_) \
-    { \
-      unsigned char _ch2_ = *++_key_; \
-     (RESULT) += (_ch_ << (_ch2_ & 0x7)); \
-     _ch_ = _ch2_; \
-    } \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_STRING_HASH_2(KEY) do { \
   unsigned long _result_ = 0; \
@@ -155 +129 @@
 } while (0)
 
-#ifndef CONFIG_WITH_OPTIMIZATION_HACKS
+
 #define STRING_N_HASH_1(KEY, N, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -164 +138 @@
   (RESULT) += *++_key_; \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-# define STRING_N_HASH_1(KEY, N, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_; \
-  int _n_ = (N); \
-  if (_n_) \
-    { \
-      for (;;) \
-        { \
-          unsigned char _ch2_; \
-          if (!--_n_) \
-            { \
-              (RESULT) += _ch_; \
-              break; \
-            } \
-          _ch2_ = *++_key_; \
-          (RESULT) += (_ch_ << (_ch2_ & 0xf)); \
-          _ch_ = _ch2_; \
-          if (!_ch_) break; \
-        } \
-    } \
-  else \
-    (RESULT) += _ch_; \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_STRING_N_HASH_1(KEY, N) do { \
   unsigned long _result_ = 0; \
@@ -195 +144 @@
 } while (0)
 
-#ifndef CONFIG_WITH_OPTIMIZATION_HACKS
 #define STRING_N_HASH_2(KEY, N, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -204 +152 @@
   (RESULT) += *++_key_; \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-# define STRING_N_HASH_2(KEY, N, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_; \
-  int _n_ = (N); \
-  if (_n_) \
-    { \
-      for (;;) \
-        { \
-          unsigned char _ch2_; \
-          if (!--_n_) \
-            { \
-              (RESULT) += _ch_; \
-              break; \
-            } \
-          _ch2_ = *++_key_; \
-          (RESULT) += (_ch_ << (_ch2_ & 0x7)); \
-          _ch_ = _ch2_; \
-          if (!_ch_) break; \
-        } \
-    } \
-  else \
-    (RESULT) += _ch_; \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_STRING_N_HASH_2(KEY, N) do { \
   unsigned long _result_ = 0; \
@@ -246 +169 @@
 /* hash and comparison macros for case-insensitive string _key_s. */
 
-#if 1 /*ndef CONFIG_WITH_OPTIMIZATION_HACKS - testme */
 #define ISTRING_HASH_1(KEY, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -252 +174 @@
     (RESULT) += ((isupper (*_key_) ? tolower (*_key_) : *_key_) << (_key_[1] & 0xf)); \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-#define ISTRING_HASH_1(KEY, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_;
-  while (_ch_) \
-    { \
-      unsigned _ch2_ = *++_key_; \
-      (RESULT) += ((isupper (_ch_) ? tolower (_ch_) : _ch_) << (_ch2_ & 0xf)); \
-      _ch_ = _ch2_; \
-    } \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_ISTRING_HASH_1(KEY) do { \
   unsigned long _result_ = 0; \
@@ -270 +180 @@
 } while (0)
 
-#if 1 /* ndef CONFIG_WITH_OPTIMIZATION_HACKS - testme */
 #define ISTRING_HASH_2(KEY, RESULT) do { \
   unsigned char const *_key_ = (unsigned char const *) (KEY) - 1; \
@@ -276 +185 @@
     (RESULT) += ((isupper (*_key_) ? tolower (*_key_) : *_key_) << (_key_[1] & 0x7)); \
 } while (0)
-#else /* CONFIG_WITH_OPTIMIZATION_HACKS */
-#define ISTRING_HASH_2(KEY, RESULT) do { \
-  unsigned char const *_key_ = (unsigned char const *) (KEY); \
-  unsigned int _ch_ = *_key_;
-  while (_ch_) \
-    { \
-      unsigned _ch2_ = *++_key_; \
-      (RESULT) += ((isupper (_ch_) ? tolower (_ch_) : _ch_) << (_ch2_ & 0x7)); \
-      _ch_ = _ch2_; \
-    } \
-} while (0)
-#endif /* CONFIG_WITH_OPTIMIZATION_HACKS */
 #define return_ISTRING_HASH_2(KEY) do { \
   unsigned long _result_ = 0; \

trunk/src/kmk/job.c

@@ -780 +780 @@
                 message (0, "The failing command:\n%s", c->file->cmds->command_lines[c->command_line - 1]);
             }
-#else
+#else  /* !KMK */
             child_error (c->file->name, exit_code, exit_sig, coredump, 0);
-#endif
+#endif /* !KMK */
 
           c->file->update_status = 2;
@@ -1059 +1059 @@
       else if (*p == '%')
         flags |= COMMAND_GETTER_SKIP_IT;
-#endif 
+#endif
       else if (!isblank ((unsigned char)*p))
 #ifndef CONFIG_WITH_KMK_BUILTIN
@@ -1235 +1235 @@
         }
 
-#ifndef VMS
+# ifndef VMS
       free (argv[0]);
       free ((char *) argv);
-#endif
+# endif
 
       /* synchronous command execution? */
@@ -2820 +2820 @@
                       && !isspace ((unsigned char)p[1])
 # ifdef KMK
-                      && strchr (sh_chars, p[1]) == 0 
+                      && strchr (sh_chars, p[1]) == 0
                       && (p[1] != '"' || !unixy_shell))
 # else
                       && strchr (sh_chars_sh, p[1]) == 0)
-# endif 
+# endif
                     /* back up one notch, to copy the backslash */
                     --p;

trunk/src/kmk/main.c

@@ -679 +679 @@
   alloccache_init (&variable_set_list_cache, sizeof (struct variable_set_list), "variable_set_list", NULL, NULL);
 }
-#endif
+#endif /* CONFIG_WITH_ALLOC_CACHES */
 
 static void
@@ -787 +787 @@
               db_level |= DB_KMK;
               break;
-#endif
+#endif /* DB_KMK */
             default:
               fatal (NILF, _("unknown debug level specification `%s'"), p);
@@ -809 +809 @@
 set_make_priority_and_affinity (void)
 {
-#ifdef WINDOWS32
+# ifdef WINDOWS32
   DWORD dwPriority;
   if (process_affinity)
@@ -830 +830 @@
              dwPriority, GetLastError ());
 
-#else /*#elif HAVE_NICE */
+# else /*#elif HAVE_NICE */
   int nice_level = 0;
   switch (process_priority)
@@ -846 +846 @@
     fprintf (stderr, "warning: nice (%d) failed: %s\n",
              nice_level, strerror (errno));
-#endif
+# endif
 }
-#endif
+#endif /* KMK */
 
 
@@ -1287 +1287 @@
 #if defined(set_space_map_entry) /*bird*/
 char space_map[space_map_size];
-#endif
+#endif /* set_space_map_entry */
 
 
@@ -1307 +1307 @@
   char *windows32_path = NULL;
 
-#ifndef ELECTRIC_HEAP /* Drop this because it prevent JIT debugging. */
+#ifndef ELECTRIC_HEAP /* Drop this because it prevents JIT debugging. */
   SetUnhandledExceptionFilter(handle_runtime_exceptions);
 #endif /* !ELECTRIC_HEAP */

trunk/src/kmk/read.c

@@ -175 +175 @@
 static char *find_char_unquote (char *string, int stop1, int stop2,
                                 int blank, int ignorevars);
-#else
+#else  /* CONFIG_WITH_VALUE_LENGTH */
 __inline static char *remove_comments (char *line, char *eol);
 __inline static char *find_char_unquote_0 (char *string, int stop1, char **eosp);
@@ -181 +181 @@
                                    int blank, int ignorevars,
                                    unsigned int string_len);
-__inline static char *
+MY_INLINE char *
 find_char_unquote (char *string, int stop1, int stop2, int blank, int ignorevars)
 {
@@ -195 +195 @@
     return find_char_unquote_2 (string, stop1, stop2, blank, ignorevars, 0);
 }
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */