diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2014-03-15 19:53:03 +0200 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2014-03-28 23:06:17 -0400 |
| commit | 3d4e9a45fc13d559aaaaed8f37ed10e26482b597 (patch) | |
| tree | f6f9aa7074d739c39e006c6f9d50ee246552ba74 | |
| parent | 77b24249f9444e48e73844e926691b1955cf8ebd (diff) | |
Migrate to using musl 0.9.13 stpcpy for better asm.js performance.
| -rw-r--r-- | src/library.js | 9 | ||||
| -rw-r--r-- | system/lib/libc/musl/src/string/stpcpy.c | 29 | ||||
| -rw-r--r-- | system/lib/libcextra.symbols | 1 | ||||
| -rw-r--r-- | tools/system_libs.py | 1 |
4 files changed, 31 insertions, 9 deletions
diff --git a/src/library.js b/src/library.js index 88c07027..225ca1b3 100644 --- a/src/library.js +++ b/src/library.js @@ -3588,15 +3588,6 @@ LibraryManager.library = { return pdest|0; }, - stpcpy: function(pdest, psrc) { - var i = 0; - do { - {{{ makeCopyValues('pdest+i', 'psrc+i', 1, 'i8', null, 1) }}}; - i ++; - } while ({{{ makeGetValue('psrc', 'i-1', 'i8') }}} != 0); - return pdest + i - 1; - }, - strncpy__asm: true, strncpy__sig: 'iiii', strncpy: function(pdest, psrc, num) { diff --git a/system/lib/libc/musl/src/string/stpcpy.c b/system/lib/libc/musl/src/string/stpcpy.c new file mode 100644 index 00000000..feb9eb81 --- /dev/null +++ b/system/lib/libc/musl/src/string/stpcpy.c @@ -0,0 +1,29 @@ +#include <string.h> +#include <stdlib.h> +#include <stdint.h> +#include <limits.h> +#include "libc.h" + +#define ALIGN (sizeof(size_t)) +#define ONES ((size_t)-1/UCHAR_MAX) +#define HIGHS (ONES * (UCHAR_MAX/2+1)) +#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS) + +char *__stpcpy(char *restrict d, const char *restrict s) +{ + size_t *wd; + const size_t *ws; + + if ((uintptr_t)s % ALIGN == (uintptr_t)d % ALIGN) { + for (; (uintptr_t)s % ALIGN; s++, d++) + if (!(*d=*s)) return d; + wd=(void *)d; ws=(const void *)s; + for (; !HASZERO(*ws); *wd++ = *ws++); + d=(void *)wd; s=(const void *)ws; + } + for (; (*d=*s); s++, d++); + + return d; +} + +weak_alias(__stpcpy, stpcpy); diff --git a/system/lib/libcextra.symbols b/system/lib/libcextra.symbols index e38afa70..fc3eaf99 100644 --- a/system/lib/libcextra.symbols +++ b/system/lib/libcextra.symbols @@ -108,6 +108,7 @@ T regfree T scalbnf D signgam + T stpcpy T strcasecmp_l T strcasestr W strchrnul diff --git a/tools/system_libs.py b/tools/system_libs.py index 1027a5a1..c02583c8 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -240,6 +240,7 @@ def calculate(temp_files, in_temp, stdout, stderr): 'memmem.c', 'mempcpy.c', 'memrchr.c', + 'stpcpy.c', 'strcasestr.c', 'strchrnul.c', 'strcspn.c', |