Changeset 1840 for trunk/src/kmk/variable.c

Timestamp:

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

Author:

bird

Message:

better? predictions can do bad stuff...

File:

• trunk/src/kmk/variable.c (modified) (4 diffs)

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;