Changeset 1813 in kBuild for trunk/src/kmk

Timestamp:

Oct 10, 2008 6:06:32 AM (16 years ago)

Author:

bird

Message:

kmk: inline memchr everywhere but on linux.

Location:

trunk/src/kmk

Files:

• config.h.darwin (modified) (1 diff)
• config.h.freebsd (modified) (1 diff)
• config.h.os2 (modified) (1 diff)
• config.h.solaris (modified) (1 diff)
• config.h.win (modified) (1 diff)
• inlined_memchr.h (added)

trunk/src/kmk/config.h.darwin

@@ -425 +425 @@
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+#include "inlined_memchr.h"
+

trunk/src/kmk/config.h.freebsd

@@ -429 +429 @@
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+#include "inlined_memchr.h"
+

trunk/src/kmk/config.h.os2

@@ -460 +460 @@
 #define LIBDIR "."
 
+#include "inlined_memchr.h"
+

trunk/src/kmk/config.h.solaris

@@ -425 +425 @@
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+#include "inlined_memchr.h"
+

trunk/src/kmk/config.h.win

@@ -525 +525 @@
 #define BATCH_MODE_ONLY_SHELL
 
-#if defined(_M_X64)
-#include <string.h>
-static void *
-my_inline_memchr(const void *pv, int ch, register size_t cb)
-{
-    register const unsigned int   uch = (unsigned)ch;
-    register const unsigned char *pb = (const unsigned char *)pv;
-#if 1 /* this one beats the CRT (on 2nd gen AMD64). */
-    while (cb >= 4)
-    {
-        if (*pb == uch)
-            return (unsigned char *)pb;
-        if (pb[1] == uch)
-            return (unsigned char *)pb + 1;
-        if (pb[2] == uch)
-            return (unsigned char *)pb + 2;
-        if (pb[3] == uch)
-            return (unsigned char *)pb + 3;
-        cb -= 4;
-        pb += 4;
-    }
-    switch (cb & 3)
-    {
-        case 0:
-            break;
-        case 1:
-            if (*pb == uch)
-                return (unsigned char *)pb;
-            break;
-        case 2:
-            if (*pb == uch)
-                return (unsigned char *)pb;
-            if (pb[1] == uch)
-                return (unsigned char *)pb + 1;
-            break;
-        case 3:
-            if (*pb == uch)
-                return (unsigned char *)pb;
-            if (pb[1] == uch)
-                return (unsigned char *)pb + 1;
-            if (pb[2] == uch)
-                return (unsigned char *)pb + 2;
-            break;
-    }
-
-#else /* This is just as good the CRT one. */
-    while (cb > 0)
-    {
-        if (*pb == uch)
-            return (void *)pb;
-        cb--;
-        pb++;
-    }
-#endif
-    return 0;
-}
-#define memchr my_inline_memchr
-#endif
-
+#include "inlined_memchr.h"
+