Changeset 1840 in kBuild for trunk/src/kmk

Timestamp:

Oct 11, 2008 7:59:17 PM (16 years ago)

Author:

bird

Message:

better? predictions can do bad stuff...

Location:

trunk/src/kmk

Files:

• make.h (modified) (2 diffs)
• misc.c (modified) (3 diffs)
• variable.c (modified) (4 diffs)

trunk/src/kmk/make.h

@@ -150 +150 @@
 #endif
 
-#if defined(KMK) || defined(CONFIG_WITH_VALUE_LENGTH)
+#if defined(KMK) || defined(CONFIG_WITH_VALUE_LENGTH) || defined (VARIABLE_HASH)
 # ifdef _MSC_VER
 #  define MY_INLINE     _inline static
@@ -170 +170 @@
 # else
 #  define MY_ASSERT_MSG(expr, printfargs)   do { } while (0)
+# endif
+
+# ifdef __GNUC__
+#  define MY_PREDICT_TRUE(expr)  __builtin_expect(!!(expr), 1)
+#  define MY_PREDICT_FALSE(expr) __builtin_expect(!!(expr), 0)
+# else
+#  define MY_PREDICT_TRUE(expr)  (expr)
+#  define MY_PREDICT_FALSE(expr) (expr)
 # endif
 #endif

trunk/src/kmk/misc.c

@@ -551 +551 @@
   const char *p = *ptr;
   const char *e;
-  unsigned char ch;
 
   /* skip blanks */
   for (;;)
     {
-      ch = *p;
-      if (!isblank(ch))
-        break;
-      ch = p[1];
-      if (!isblank(ch))
+      unsigned char ch0, ch1, ch2, ch3;
+
+      ch0 = *p;
+      if (MY_PREDICT_FALSE(!isblank(ch0)))
         {
+          if (!ch0)
+              return NULL;
+          break;
+        }
+      ch1 = p[1];
+      if (MY_PREDICT_FALSE(!isblank(ch1)))
+        {
+          if (!ch1)
+              return NULL;
           p += 1;
           break;
         }
-      ch = p[2];
-      if (!isblank(ch))
+      ch2 = p[2];
+      if (MY_PREDICT_FALSE(!isblank(ch2)))
         {
+          if (!ch2)
+              return NULL;
           p += 2;
           break;
         }
-      ch = p[3];
-      if (!isblank(ch))
+      ch3 = p[3];
+      if (MY_PREDICT_TRUE(!isblank(ch3)))
         {
+          if (!ch3)
+              return NULL;
           p += 3;
           break;
@@ -579 +590 @@
       p += 4;
     }
-  if (!ch)
-    {
-      *ptr = p;
-      return 0;
-    }
 
   /* skip ahead until EOS or blanks. */
@@ -589 +595 @@
   for (;;)
     {
-      ch = *e;
-      if (isblank(ch) || ch == '\0')
+      unsigned char ch0, ch1, ch2, ch3;
+
+      ch0 = *e;
+      if (MY_PREDICT_FALSE(isblank(ch0) || ch0 == '\0'))
         break;
-      ch = e[1];
-      if (isblank(ch) || ch == '\0')
+      ch1 = e[1];
+      if (MY_PREDICT_FALSE(isblank(ch1) || ch1 == '\0'))
         {
           e += 1;
           break;
         }
-      ch = e[2];
-      if (isblank(ch) || ch == '\0')
+      ch2 = e[2];
+      if (MY_PREDICT_FALSE(isblank(ch2) || ch2 == '\0'))
         {
           e += 2;
           break;
         }
-      ch = e[3];
-      if (isblank(ch) || ch == '\0')
+      ch3 = e[3];
+      if (MY_PREDICT_FALSE(isblank(ch3) || ch3 == '\0'))
         {
           e += 3;

trunk/src/kmk/variable.c

@@ -352 +352 @@
 #else /* VARIABLE_HASH */
 
-# ifdef __GNUC__
-#  define PREDICT_TRUE(expr)  __builtin_expect(!!(expr), 1)
-#  define PREDICT_FALSE(expr) __builtin_expect(!!(expr), 0)
-# else
-#  define PREDICT_TRUE(expr)  (expr)
-#  define PREDICT_FALSE(expr) (expr)
-# endif
-
 inline static int
 variable_hash_cmp_2_memcmp (const char *xs, const char *ys, unsigned int length)
@@ -446 +438 @@
           result  = *(int32_t*)xs - *(int32_t*)ys;
           result |= *(int32_t*)(xs + 4) - *(int32_t*)(ys + 4);
-          if (PREDICT_FALSE(result))
+          if (MY_PREDICT_FALSE(result))
             return result;
           xs += 8;
@@ -514 +506 @@
           result |= xs[4] - ys[4];
 #endif
-          if (PREDICT_FALSE(result))
+          if (MY_PREDICT_FALSE(result))
             return result;
           xs += 8;
@@ -559 +551 @@
   result = (x->hash1 - y->hash1)
          | (x->length - y->length);
-  if (PREDICT_TRUE(result))
+  if (MY_PREDICT_TRUE(result))
     return result;