Changeset 1830 for trunk/src/kmk

Timestamp:

Oct 11, 2008, 12:56:20 PM (17 years ago)

Author:

bird

Message:

kmk: more insane optimizations.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (3 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -45 +45 @@
 #define VARIABLE_BUFFER_ZONE    5
 
+#ifndef KMK
 static unsigned int variable_buffer_length;
+#else
+unsigned int variable_buffer_length;
+#endif
 char *variable_buffer;
 
+#ifndef KMK
 /* Subroutine of variable_expand and friends:
    The text to add is LENGTH chars starting at STRING to the variable_buffer.
@@ -63 +68 @@
     {
       unsigned int offset = ptr - variable_buffer;
-#ifdef KMK
-      variable_buffer_length = variable_buffer_length <= 1024
-                             ? 2048 : variable_buffer_length * 4;
-      if (variable_buffer_length < newlen + 100)
-          variable_buffer_length = (newlen + 100 + 1023) & ~1023U;
-#else
       variable_buffer_length = (newlen + 100 > 2 * variable_buffer_length
                                ? newlen + 100
                                : 2 * variable_buffer_length);
-#endif
       variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
       ptr = variable_buffer + offset;
@@ -80 +78 @@
   return ptr + length;
 }
+#endif
 
 /* Return a pointer to the beginning of the variable buffer.  */

trunk/src/kmk/variable.h

@@ -127 +127 @@
 extern char *variable_buffer;
 extern struct variable_set_list *current_variable_set_list;
+#ifdef KMK
+extern unsigned int variable_buffer_length;
+#define VARIABLE_BUFFER_ZONE    5
+#endif
 
 /* expand.c */
+#ifndef KMK
 char *variable_buffer_output (char *ptr, const char *string, unsigned int length);
+#else /* KMK */
+/* Subroutine of variable_expand and friends:
+   The text to add is LENGTH chars starting at STRING to the variable_buffer.
+   The text is added to the buffer at PTR, and the updated pointer into
+   the buffer is returned as the value.  Thus, the value returned by
+   each call to variable_buffer_output should be the first argument to
+   the following call.  */
+
+__inline static char *
+variable_buffer_output (char *ptr, const char *string, unsigned int length)
+{
+  register unsigned int newlen = length + (ptr - variable_buffer);
+
+  if ((newlen + VARIABLE_BUFFER_ZONE) > variable_buffer_length)
+    {
+      unsigned int offset = ptr - variable_buffer;
+      variable_buffer_length = variable_buffer_length <= 1024
+                             ? 2048 : variable_buffer_length * 4;
+      if (variable_buffer_length < newlen + 100)
+          variable_buffer_length = (newlen + 100 + 1023) & ~1023U;
+      variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
+      ptr = variable_buffer + offset;
+    }
+
+# ifndef _MSC_VER
+  switch (length)
+    {
+      case 4: ptr[3] = string[3];
+      case 3: ptr[2] = string[2];
+      case 2: ptr[1] = string[1];
+      case 1: ptr[0] = string[0];
+      case 0:
+          break;
+      default:
+          memcpy (ptr, string, length);
+          break;
+    }
+# else
+  memcpy (ptr, string, length);
+# endif
+  return ptr + length;
+}
+
+#endif /* KMK */
 char *variable_expand (const char *line);
 char *variable_expand_for_file (const char *line, struct file *file);