diff --git a/ChangeLog.md b/ChangeLog.md index 4e711985cf082..d023ef8340e03 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -18,8 +18,13 @@ to browse the changes between the tags. See docs/process.md for more on how version tagging works. -2.0.35 +3.0.0 ------ +- The version of musl libc used by emscripten was upgraded from v1.1.15 to + v1.2.2. There could be some minor size regressions (or gains) due to changes + in upstream musl code but we don't expect anything major. Since this fairly + change (at least internally) we are bumping the major version of emscripten + to 3. (#13006) 2.0.34 - 11/04/2021 ------------------- diff --git a/emscripten-version.txt b/emscripten-version.txt index 97789748fc01c..3fae1add35e11 100644 --- a/emscripten-version.txt +++ b/emscripten-version.txt @@ -1 +1 @@ -2.0.35-git +3.0.0-git diff --git a/src/library.js b/src/library.js index 9b655ab4f058d..887a4f1465fb0 100644 --- a/src/library.js +++ b/src/library.js @@ -594,9 +594,9 @@ LibraryManager.library = { __localtime_r: 'localtime_r', // musl-internal function used to implement both `asctime` and `asctime_r` - __asctime__deps: ['mktime'], - __asctime__sig: 'iii', - __asctime: function(tmPtr, buf) { + __asctime_r__deps: ['mktime'], + __asctime_r__sig: 'iii', + __asctime_r: function(tmPtr, buf) { var date = { tm_sec: {{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'i32') }}}, tm_min: {{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_min, 'i32') }}}, @@ -632,11 +632,11 @@ LibraryManager.library = { return ret; }, - ctime_r__deps: ['localtime_r', '__asctime', '$withStackSave'], + ctime_r__deps: ['localtime_r', '__asctime_r', '$withStackSave'], ctime_r__sig: 'iii', ctime_r: function(time, buf) { return withStackSave(function() { - return ___asctime(_localtime_r(time, stackAlloc({{{ C_STRUCTS.tm.__size__ }}})), buf); + return ___asctime_r(_localtime_r(time, stackAlloc({{{ C_STRUCTS.tm.__size__ }}})), buf); }); }, diff --git a/src/library_pthread.js b/src/library_pthread.js index e2e088f07aa45..3d6b6d3394dd4 100644 --- a/src/library_pthread.js +++ b/src/library_pthread.js @@ -125,6 +125,26 @@ var LibraryPThread = { }, #endif +#if PTHREADS_DEBUG + detachStateToString: function(state) { + if (state === {{{ cDefine('DT_EXITED') }}}) return 'DT_EXITED'; + if (state === {{{ cDefine('DT_EXITING') }}}) return 'DT_EXITING'; + if (state === {{{ cDefine('DT_JOINABLE') }}}) return 'DT_JOINABLE'; + if (state === {{{ cDefine('DT_DETACHED') }}}) return 'DT_DETACHED'; + assert(false); + }, +#endif + + setDetachState: function(thread, newstate) { +#if PTHREADS_DEBUG + var oldstate = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detach_state }}}) >> 2); + var oldname = PThread.detachStateToString(oldstate); + var newname = PThread.detachStateToString(newstate); + console.log('thread 0x' + thread.toString(16) + ' state change: ' + oldname + ' -> ' + newname); +#endif + Atomics.store(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detach_state }}}) >> 2, newstate); + }, + terminateAllThreads: function() { #if ASSERTIONS assert(!ENVIRONMENT_IS_PTHREAD, 'Internal Error! terminateAllThreads() can only ever be called from main application thread!'); @@ -278,8 +298,8 @@ var LibraryPThread = { } else if (cmd === 'detachedExit') { #if ASSERTIONS assert(worker.pthread); - var detached = Atomics.load(HEAPU32, (worker.pthread.threadInfoStruct + {{{ C_STRUCTS.pthread.detached }}}) >> 2); - assert(detached); + var detach_state = Atomics.load(HEAPU32, (worker.pthread.threadInfoStruct + {{{ C_STRUCTS.pthread.detach_state }}}) >> 2); + assert(detach_state == {{{ cDefine('DT_EXITED') }}}); #endif PThread.returnWorkerToPool(worker); } else if (cmd === 'cancelDone') { @@ -570,6 +590,7 @@ var LibraryPThread = { worker: worker, stackBase: threadParams.stackBase, stackSize: threadParams.stackSize, + initialState: {{{ cDefine('DT_JOINABLE') }}}, allocatedOwnStack: threadParams.allocatedOwnStack, // Info area for this thread in Emscripten HEAP (shared) threadInfoStruct: threadParams.pthread_ptr @@ -577,12 +598,9 @@ var LibraryPThread = { var tis = pthread.threadInfoStruct >> 2; // spawnThread is always called with a zero-initialized thread struct so // no need to set any valudes to zero here. - Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.detached }}} >> 2), threadParams.detached); + PThread.setDetachState(pthread.threadInfoStruct, threadParams.initialState); Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.stack_size }}} >> 2), threadParams.stackSize); Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.stack }}} >> 2), stackHigh); - Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.attr }}} + 0/*_a_stacksize*/ >> 2), threadParams.stackSize); - Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.attr }}} + 8/*_a_stackaddr*/ >> 2), stackHigh); - Atomics.store(HEAPU32, tis + ({{{ C_STRUCTS.pthread.attr }}} + 12/*_a_detach*/ >> 2), threadParams.detached); #if PTHREADS_PROFILING PThread.createProfilerBlock(pthread.threadInfoStruct); @@ -772,23 +790,16 @@ var LibraryPThread = { var stackSize = 0; var stackBase = 0; - // Default thread attr is PTHREAD_CREATE_JOINABLE, i.e. start as not detached. - var detached = 0; + // Default thread state is DT_JOINABLE, i.e. start as not detached. + var initialState = {{{ cDefine('DT_JOINABLE') }}}; // When musl creates C11 threads it passes __ATTRP_C11_THREAD (-1) which // treat as if it was NULL. if (attr && attr != {{{ cDefine('__ATTRP_C11_THREAD') }}}) { stackSize = {{{ makeGetValue('attr', 0/*_a_stacksize*/, 'i32') }}}; - // Musl has a convention that the stack size that is stored to the pthread - // attribute structure is always musl's #define DEFAULT_STACK_SIZE - // smaller than the actual created stack size. That is, stored stack size - // of 0 would mean a stack of DEFAULT_STACK_SIZE in size. All musl - // functions hide this impl detail, and offset the size transparently, so - // pthread_*() API user does not see this offset when operating with - // the pthread API. When reading the structure directly on JS side - // however, we need to offset the size manually here. - stackSize += {{{ cDefine('DEFAULT_STACK_SIZE') }}}; stackBase = {{{ makeGetValue('attr', 8/*_a_stackaddr*/, 'i32') }}}; - detached = {{{ makeGetValue('attr', 12/*_a_detach*/, 'i32') }}} !== 0/*PTHREAD_CREATE_JOINABLE*/; + if ({{{ makeGetValue('attr', 12/*_a_detach*/, 'i32') }}}) { + initialState = {{{ cDefine('DT_DETACHED') }}}; + } } else { // According to // http://man7.org/linux/man-pages/man3/pthread_create.3.html, default @@ -822,7 +833,7 @@ var LibraryPThread = { stackBase: stackBase, stackSize: stackSize, allocatedOwnStack: allocatedOwnStack, - detached: detached, + initialState: initialState, startRoutine: start_routine, pthread_ptr: pthread_ptr, arg: arg, @@ -880,14 +891,19 @@ var LibraryPThread = { } var self = {{{ makeGetValue('thread', C_STRUCTS.pthread.self, 'i32') }}}; if (self !== thread) { - err('pthread_join attempted on thread ' + thread + ', which does not point to a valid thread, or does not exist anymore!'); + err('pthread_join attempted on thread 0x' + thread.toString(16) + ', which does not point to a valid thread, or does not exist anymore!'); return {{{ cDefine('ESRCH') }}}; } - var detached = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detached }}} ) >> 2); - if (detached) { - err('Attempted to join thread ' + thread + ', which was already detached!'); + var detach_state = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detach_state }}}) >> 2); + if (detach_state == {{{ cDefine('DT_DETACHED') }}}) { + err('Attempted to join thread 0x' + thread.toString(16) + ', which was already detached!'); return {{{ cDefine('EINVAL') }}}; // The thread is already detached, can no longer join it! } + + if (detach_state == {{{ cDefine('DT_EXITED') }}}) { + err('Attempted to join thread 0x' + thread.toString(16) + ', which was already joined!'); + return {{{ cDefine('EINVAL') }}}; + } if (ENVIRONMENT_IS_PTHREAD && _pthread_self() == thread) { err('PThread ' + thread + ' is attempting to join to itself!'); return {{{ cDefine('EDEADLK') }}}; @@ -904,14 +920,14 @@ var LibraryPThread = { #endif for (;;) { - var threadStatus = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.threadStatus }}} ) >> 2); - if (threadStatus == 1) { // Exited? + var detach_state = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detach_state }}} ) >> 2); + if (detach_state == {{{ cDefine('DT_EXITING') }}}) { // Exiting? if (status) { var result = Atomics.load(HEAPU32, (thread + {{{ C_STRUCTS.pthread.result }}} ) >> 2); {{{ makeSetValue('status', 0, 'result', 'i32') }}}; } - // Mark the thread as detached. - Atomics.store(HEAPU32, (thread + {{{ C_STRUCTS.pthread.detached }}} ) >> 2, 1); + // Mark the thread as exited. + PThread.setDetachState(thread, {{{ cDefine('DT_EXITED') }}}); if (!ENVIRONMENT_IS_PTHREAD) cleanupThread(thread); else postMessage({ 'cmd': 'cleanupThread', 'thread': thread }); return 0; @@ -924,7 +940,7 @@ var LibraryPThread = { // runtime and launched main()), assist pthreads in performing operations // that they need to access the Emscripten main runtime for. if (!ENVIRONMENT_IS_PTHREAD) _emscripten_main_thread_process_queued_calls(); - _emscripten_futex_wait(thread + {{{ C_STRUCTS.pthread.threadStatus }}}, threadStatus, ENVIRONMENT_IS_PTHREAD ? 100 : 1); + _emscripten_futex_wait(thread + {{{ C_STRUCTS.pthread.detach_state }}}, detach_state, ENVIRONMENT_IS_PTHREAD ? 100 : 1); } }, @@ -977,7 +993,8 @@ var LibraryPThread = { err('pthread_cancel attempted on thread ' + thread + ', which does not point to a valid thread, or does not exist anymore!'); return {{{ cDefine('ESRCH') }}}; } - Atomics.compareExchange(HEAPU32, (thread + {{{ C_STRUCTS.pthread.threadStatus }}} ) >> 2, 0, 2); // Signal the thread that it needs to cancel itself. + // Signal the thread that it needs to cancel itself. + Atomics.store(HEAPU32, (thread + {{{ C_STRUCTS.pthread.cancel }}}) >> 2, 1); if (!ENVIRONMENT_IS_PTHREAD) cancelThread(thread); else postMessage({ 'cmd': 'cancelThread', 'thread': thread}); return 0; diff --git a/src/struct_info_internal.json b/src/struct_info_internal.json index f3f6400ddf7df..939d8f70d2379 100644 --- a/src/struct_info_internal.json +++ b/src/struct_info_internal.json @@ -6,14 +6,19 @@ "file": "pthread_impl.h", "structs": { "pthread": [ - "threadStatus", "profilerBlock", "self", - "detached", + "tsd", + "detach_state", "stack", "stack_size", "result", - "attr" + "robust_list", + "tid", + "cancel", + "canceldisable", + "cancelasync", + "locale" ], "pthread_attr_t#": [ "_a_transferredcanvases" @@ -26,9 +31,12 @@ ] }, "defines": [ - "DEFAULT_STACK_SIZE", "__ATTRP_C11_THREAD", - "EM_THREAD_NAME_MAX" + "EM_THREAD_NAME_MAX", + "DT_EXITED", + "DT_EXITING", + "DT_JOINABLE", + "DT_DETACHED" ] }, { diff --git a/system/include/compat/sys/random.h b/system/include/compat/sys/random.h index 72f3bf7a26bd6..0cb5ee45ba917 100644 --- a/system/include/compat/sys/random.h +++ b/system/include/compat/sys/random.h @@ -9,6 +9,8 @@ extern "C" { // syscall which is unnecessary indirection for us. int getentropy(void *buffer, size_t length); +#include_next + #ifdef __cplusplus } #endif diff --git a/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp index 96cfbb53f1c82..ab1e64c360309 100644 --- a/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -104,7 +104,11 @@ extern struct ps_strings *__ps_strings; #endif #if SANITIZER_EMSCRIPTEN +#define weak __attribute__(__weak__) +#define hidden __attribute__((__visibility__("hidden"))) #include +#undef weak +#undef hidden #include #include #include diff --git a/system/lib/dlmalloc.c b/system/lib/dlmalloc.c index 0eb6493963a5a..88d3ffcef2f9d 100644 --- a/system/lib/dlmalloc.c +++ b/system/lib/dlmalloc.c @@ -867,6 +867,10 @@ extern "C" { #ifndef USE_DL_PREFIX // XXX Emscripten XXX #if defined(__EMSCRIPTEN__) +void* __libc_malloc(size_t) __attribute__((weak, alias("dlmalloc"))); +void __libc_free(void*) __attribute__((weak, alias("dlfree"))); +void* __libc_calloc(size_t) __attribute__((weak, alias("dlcalloc"))); +void* __libc_realloc(void*, size_t) __attribute__((weak, alias("dlrealloc"))); void* malloc(size_t) __attribute__((weak, alias("dlmalloc"))); void free(void*) __attribute__((weak, alias("dlfree"))); void* calloc(size_t, size_t) __attribute__((weak, alias("dlcalloc"))); diff --git a/system/lib/emmalloc.c b/system/lib/emmalloc.c index 80a53512eef6e..3054712609806 100644 --- a/system/lib/emmalloc.c +++ b/system/lib/emmalloc.c @@ -793,6 +793,7 @@ void *emmalloc_memalign(size_t alignment, size_t size) return ptr; } extern __typeof(emmalloc_memalign) emscripten_builtin_memalign __attribute__((alias("emmalloc_memalign"))); +extern __typeof(emmalloc_memalign) __libc_memalign __attribute__((alias("emmalloc_memalign"))); void * EMMALLOC_EXPORT memalign(size_t alignment, size_t size) { @@ -811,6 +812,7 @@ void *emmalloc_malloc(size_t size) return emmalloc_memalign(MALLOC_ALIGNMENT, size); } extern __typeof(emmalloc_malloc) emscripten_builtin_malloc __attribute__((alias("emmalloc_malloc"))); +extern __typeof(emmalloc_malloc) __libc_malloc __attribute__((alias("emmalloc_malloc"))); void * EMMALLOC_EXPORT malloc(size_t size) { @@ -912,6 +914,7 @@ void emmalloc_free(void *ptr) #endif } extern __typeof(emmalloc_free) emscripten_builtin_free __attribute__((alias("emmalloc_free"))); +extern __typeof(emmalloc_free) __libc_free __attribute__((alias("emmalloc_free"))); void EMMALLOC_EXPORT free(void *ptr) { @@ -1132,6 +1135,7 @@ void *emmalloc_realloc(void *ptr, size_t size) { return emmalloc_aligned_realloc(ptr, MALLOC_ALIGNMENT, size); } +extern __typeof(emmalloc_realloc) __libc_realloc __attribute__((alias("emmalloc_realloc"))); void * EMMALLOC_EXPORT realloc(void *ptr, size_t size) { @@ -1167,6 +1171,7 @@ void *emmalloc_calloc(size_t num, size_t size) memset(ptr, 0, bytes); return ptr; } +extern __typeof(emmalloc_calloc) __libc_calloc __attribute__((alias("emmalloc_calloc"))); void * EMMALLOC_EXPORT calloc(size_t num, size_t size) { diff --git a/system/lib/libc/README.md b/system/lib/libc/README.md index 55572c8cb803a..f26571c6b44e7 100644 --- a/system/lib/libc/README.md +++ b/system/lib/libc/README.md @@ -1,5 +1,9 @@ -This folder contains the musl version of libc at `/musl`. The upstream version can be found at http://www.musl-libc.org/. -Most of the source comes from musl 1.1.15, with some exceptions listed below. +This folder contains the musl version of libc at `/musl`. The upstream version +can be found at http://www.musl-libc.org/. + +Most of the source comes from musl v1.2.2, with some exceptions listed below. +We track these changes from upstream in https://github.com/emscripten-core/musl +and use a script (`system/lib/update_musl.py`) to pull in updates. Some changes have been made to the version that was taken from upstream, including: diff --git a/system/lib/libc/compat/aligned_alloc.c b/system/lib/libc/compat/aligned_alloc.c index 02bf50fb17db9..0941e5ddf0024 100644 --- a/system/lib/libc/compat/aligned_alloc.c +++ b/system/lib/libc/compat/aligned_alloc.c @@ -2,7 +2,7 @@ // Musl has an aligned_alloc routine, but that builds on top of standard malloc(). We are using dlmalloc, so // can route to its implementation instead. -void * __attribute__((weak)) aligned_alloc(size_t alignment, size_t size) +void * weak aligned_alloc(size_t alignment, size_t size) { void *ptr; if ((alignment % sizeof(void *) != 0) || (size % alignment) != 0) diff --git a/system/lib/libc/crt1.c b/system/lib/libc/crt1.c index 229a629b81f8c..9c08ac18f4aed 100644 --- a/system/lib/libc/crt1.c +++ b/system/lib/libc/crt1.c @@ -12,7 +12,7 @@ #include #include -__attribute__((weak)) void __wasm_call_ctors(void); +__attribute__((__weak__)) void __wasm_call_ctors(void); int __original_main(void); diff --git a/system/lib/libc/musl/COPYRIGHT b/system/lib/libc/musl/COPYRIGHT index f0ee3b78d8798..c1628e9ac84f9 100644 --- a/system/lib/libc/musl/COPYRIGHT +++ b/system/lib/libc/musl/COPYRIGHT @@ -1,7 +1,7 @@ musl as a whole is licensed under the following standard MIT license: ---------------------------------------------------------------------- -Copyright © 2005-2014 Rich Felker, et al. +Copyright © 2005-2020 Rich Felker, et al. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -25,22 +25,39 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Authors/contributors include: +A. Wilcox +Ada Worcester Alex Dowad +Alex Suykov Alexander Monakov +Andre McCurdy +Andrew Kelley Anthony G. Basile +Aric Belsito Arvid Picciani +Bartosz Brachaczek +Benjamin Peterson Bobby Bingham Boris Brezillon Brent Cook Chris Spiegel Clément Vasseur Daniel Micay +Daniel Sabogal +Daurnimator +David Carlier +David Edelsohn Denys Vlasenko +Dmitry Ivanov +Dmitry V. Levin +Drew DeVault Emil Renner Berthing +Fangrui Song Felix Fietkau Felix Janda Gianluca Anzolin Hauke Mehrtens +He X Hiltjo Posthuma Isaac Dunham Jaydeep Patil @@ -49,32 +66,47 @@ Jeremy Huntwork Jo-Philipp Wich Joakim Sindholt John Spencer -Josiah Worcester +Julien Ramseier Justin Cormack +Kaarle Ritvanen Khem Raj Kylie McClain +Leah Neukirchen Luca Barbato Luka Perkov M Farkas-Dyck (Strake) Mahesh Bodapati +Markus Wichmann +Masanori Ogino +Michael Clark Michael Forney +Mikhail Kremnyov Natanael Copa Nicholas J. Kain orc Pascal Cuoq +Patrick Oppenlander Petr Hosek +Petr Skocik Pierre Carrier +Reini Urban Rich Felker Richard Pennington +Ryan Fairfax +Samuel Holland +Segev Finer Shiz sin Solar Designer Stefan Kristiansson +Stefan O'Rear Szabolcs Nagy Timo Teräs Trutz Behn Valentin Ochs +Will Dietz William Haddon +William Pitcock Portions of this software are derived from third-party works licensed under terms compatible with the above MIT license: @@ -90,14 +122,18 @@ Copyright © 1993,2004 Sun Microsystems or Copyright © 2003-2011 David Schultz or Copyright © 2003-2009 Steven G. Kargl or Copyright © 2003-2009 Bruce D. Evans or -Copyright © 2008 Stephen L. Moshier +Copyright © 2008 Stephen L. Moshier or +Copyright © 2017-2018 Arm Limited and labelled as such in comments in the individual source files. All have been licensed under extremely permissive terms. -The ARM memcpy code (src/string/arm/memcpy_el.S) is Copyright © 2008 +The ARM memcpy code (src/string/arm/memcpy.S) is Copyright © 2008 The Android Open Source Project and is licensed under a two-clause BSD license. It was taken from Bionic libc, used on Android. +The AArch64 memcpy and memset code (src/string/aarch64/*) are +Copyright © 1999-2019, Arm Limited. + The implementation of DES for crypt (src/crypt/crypt_des.c) is Copyright © 1994 David Burren. It is licensed under a BSD license. @@ -109,12 +145,6 @@ in jurisdictions that may not recognize the public domain. The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011 Valentin Ochs and is licensed under an MIT-style license. -The BSD PRNG implementation (src/prng/random.c) and XSI search API -(src/search/*.c) functions are Copyright © 2011 Szabolcs Nagy and -licensed under following terms: "Permission to use, copy, modify, -and/or distribute this code for any purpose with or without fee is -hereby granted. There is no warranty." - The x86_64 port was written by Nicholas J. Kain and is licensed under the standard MIT terms. diff --git a/system/lib/libc/musl/INSTALL b/system/lib/libc/musl/INSTALL index 526c3f62ed2d4..c583691d75047 100644 --- a/system/lib/libc/musl/INSTALL +++ b/system/lib/libc/musl/INSTALL @@ -55,29 +55,38 @@ and ABI combinations: * Little-endian default; big-endian variants also supported * MIPS - * ABI is o32 + * ABI is o32, fp32/fpxx (except on r6 which is fp64) * Big-endian default; little-endian variants also supported * Default ABI variant uses FPU registers; alternate soft-float ABI that does not use FPU registers or instructions is available * MIPS2 or later, or kernel emulation of ll/sc (standard in Linux) is required + * MIPS32r6, an incompatible ISA, is supported as a variant "mipsr6" * MIPS64 - * ABI is n64 (LP64) + * ABI is n64 (LP64) or n32 (ILP32) * Big-endian default; little-endian variants also supported * Default ABI variant uses FPU registers; alternate soft-float ABI that does not use FPU registers or instructions is available * PowerPC - * Only 32-bit is supported * Compiler toolchain must provide 64-bit long double, not IBM double-double or IEEE quad * For dynamic linking, compiler toolchain must be configured for "secure PLT" variant +* PowerPC64 + * Both little and big endian variants are supported + * Compiler toolchain must provide 64-bit long double, not IBM + double-double or IEEE quad + * Compiler toolchain must use the new (ELFv2) ABI regardless of + whether it is for little or big endian + +* S390X (64-bit S390) + * SuperH (SH) * Standard ELF ABI or FDPIC ABI (shared-text without MMU) - * Little-endian by default; big-engian variant also supported + * Little-endian by default; big-endian variant also supported * Full FPU ABI or soft-float ABI is supported, but the single-precision-only FPU ABI is not @@ -88,6 +97,11 @@ and ABI combinations: * OpenRISC 1000 (or1k) +* RISC-V 64 + * Little endian + * Hard, soft, and hard-single/soft-double floating point ABIs + * Standard ELF; no shared-text NOMMU support + Build and Installation Procedure diff --git a/system/lib/libc/musl/Makefile b/system/lib/libc/musl/Makefile index 8246b78f73b34..e8cc443675efc 100644 --- a/system/lib/libc/musl/Makefile +++ b/system/lib/libc/musl/Makefile @@ -17,7 +17,8 @@ includedir = $(prefix)/include libdir = $(prefix)/lib syslibdir = /lib -SRC_DIRS = $(addprefix $(srcdir)/,src/* crt ldso) +MALLOC_DIR = mallocng +SRC_DIRS = $(addprefix $(srcdir)/,src/* src/malloc/$(MALLOC_DIR) crt ldso $(COMPAT_SRC_DIRS)) BASE_GLOBS = $(addsuffix /*.c,$(SRC_DIRS)) ARCH_GLOBS = $(addsuffix /$(ARCH)/*.[csS],$(SRC_DIRS)) BASE_SRCS = $(sort $(wildcard $(BASE_GLOBS))) @@ -27,7 +28,7 @@ ARCH_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(ARCH_SRCS))) REPLACED_OBJS = $(sort $(subst /$(ARCH)/,/,$(ARCH_OBJS))) ALL_OBJS = $(addprefix obj/, $(filter-out $(REPLACED_OBJS), $(sort $(BASE_OBJS) $(ARCH_OBJS)))) -LIBC_OBJS = $(filter obj/src/%,$(ALL_OBJS)) +LIBC_OBJS = $(filter obj/src/%,$(ALL_OBJS)) $(filter obj/compat/%,$(ALL_OBJS)) LDSO_OBJS = $(filter obj/ldso/%,$(ALL_OBJS:%.o=%.lo)) CRT_OBJS = $(filter obj/crt/%,$(ALL_OBJS)) @@ -35,7 +36,7 @@ AOBJS = $(LIBC_OBJS) LOBJS = $(LIBC_OBJS:.o=.lo) GENH = obj/include/bits/alltypes.h obj/include/bits/syscall.h GENH_INT = obj/src/internal/version.h -IMPH = $(addprefix $(srcdir)/, src/internal/stdio_impl.h src/internal/pthread_impl.h src/internal/libc.h) +IMPH = $(addprefix $(srcdir)/, src/internal/stdio_impl.h src/internal/pthread_impl.h src/internal/locale_impl.h src/internal/libc.h) LDFLAGS = LDFLAGS_AUTO = @@ -46,7 +47,7 @@ CFLAGS_AUTO = -Os -pipe CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc CFLAGS_ALL = $(CFLAGS_C99FSE) -CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I$(srcdir)/arch/$(ARCH) -I$(srcdir)/arch/generic -Iobj/src/internal -I$(srcdir)/src/internal -Iobj/include -I$(srcdir)/include +CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I$(srcdir)/arch/$(ARCH) -I$(srcdir)/arch/generic -Iobj/src/internal -I$(srcdir)/src/include -I$(srcdir)/src/internal -Iobj/include -I$(srcdir)/include CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS) LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) @@ -75,6 +76,7 @@ WRAPCC_CLANG = clang LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1 -include config.mak +-include $(srcdir)/arch/$(ARCH)/arch.mak ifeq ($(ARCH),) @@ -113,24 +115,17 @@ obj/crt/rcrt1.o: $(srcdir)/ldso/dlstart.c obj/crt/Scrt1.o obj/crt/rcrt1.o: CFLAGS_ALL += -fPIC -obj/crt/$(ARCH)/crti.o: $(srcdir)/crt/$(ARCH)/crti.s - -obj/crt/$(ARCH)/crtn.o: $(srcdir)/crt/$(ARCH)/crtn.s - OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=$(srcdir)/src/%)) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo): CFLAGS += -O3 -MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c -$(MEMOPS_SRCS:%.c=obj/%.o) $(MEMOPS_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS) - -NOSSP_SRCS = $(wildcard crt/*.c) \ - src/env/__libc_start_main.c src/env/__init_tls.c \ - src/env/__stack_chk_fail.c \ - src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \ - src/string/memset.c src/string/$(ARCH)/memset.c \ - src/string/memcpy.c src/string/$(ARCH)/memcpy.c \ - ldso/dlstart.c ldso/dynlink.c -$(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) +MEMOPS_OBJS = $(filter %/memcpy.o %/memmove.o %/memcmp.o %/memset.o, $(LIBC_OBJS)) +$(MEMOPS_OBJS) $(MEMOPS_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS) + +NOSSP_OBJS = $(CRT_OBJS) $(LDSO_OBJS) $(filter \ + %/__libc_start_main.o %/__init_tls.o %/__stack_chk_fail.o \ + %/__set_thread_area.o %/memset.o %/memcpy.o \ + , $(LIBC_OBJS)) +$(NOSSP_OBJS) $(NOSSP_OBJS:%.o=%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) $(CRT_OBJS): CFLAGS_ALL += -DCRT diff --git a/system/lib/libc/musl/VERSION b/system/lib/libc/musl/VERSION index 645377eea8d0f..23aa8390630cc 100644 --- a/system/lib/libc/musl/VERSION +++ b/system/lib/libc/musl/VERSION @@ -1 +1 @@ -1.1.15 +1.2.2 diff --git a/system/lib/libc/musl/WHATSNEW b/system/lib/libc/musl/WHATSNEW index be688cbb8ba15..e1d01982a2ac6 100644 --- a/system/lib/libc/musl/WHATSNEW +++ b/system/lib/libc/musl/WHATSNEW @@ -1730,3 +1730,560 @@ arch-specific bugs fixed: - broken posix_fadvise on arm and powerpc (32-bit) - thread structure/dtv corruption on powerpc at thread startup - various wrong mips and powerpc ioctl and termios constant values + + + +1.1.16 release notes + +new features: +- s390x (64-bit S/390) port +- pthread_setname_np extension function +- limited pthread_setattr_default_np function to set stack size defaults +- header-level support for linux 4.7, 4.8, and 4.9 features +- confstr _CS_V6_ENV and _CS_V7_ENV items + +compatibility: +- public prototypes for abi-compat *_unlocked symbols, etc. +- fflush_unlocked(NULL) now works +- resolv.h __RES version macro now matches supported APIs +- workaround for gdb bugs backtracing across signals on x86_64 +- anchors ^ and $ are now accepted in BRE subexpressions +- building for thumb2-only arm isa levels is now possible + +bugs fixed: +- integer overflows in regexec buffer allocation (CVE-2016-8859) +- failure of regexec to report matches at offsets past INT_MAX +- static-pie executables with initialized thread-local storage crashed +- printf failed to catch EOVERFLOW in some cases, wrongly produced it in others +- printf produced wrong output, result for float with precision near INT_MAX +- printf produced wrong results with alt-form octal, zero flag, & field width +- printf float rounding was wrong for some midpoint cases +- swprintf printed junk after internal (256-byte) buffer filled up +- strtod family rounded incorrectly in several corner cases +- getmntent failed to handle long records +- getopt_long_only wrongly treated "--" as an option +- asctime output wrongly varied by locale +- strftime %y specifier produced wrong output for negative tm_year +- time zone names quoted with <> were misparsed +- corner case integer overflow in tm_year for some date conversions +- failure to load shared libs whose names were prefixes of standard lib names +- wrong error codes for several failure cases in various functions +- various asymptomatic undefined behavior +- various minor namespace issues in headers + +arch-specific bugs fixed: +- tcsetattr regression on mips (completely non-working) +- wrong pread/pwrite syscall calling convention on sh +- wrong preadv2/pwritev2 syscall numbers on x32 +- mrand48/jrand48 produced wrong-signedness results on 64-bit archs + + +1.1.17 release notes + +new features: +- RTLD_LAZY deferred symbol binding, functionally equivalent to lazy binding +- safeguard against dlopen of multiple libc versions/instances +- new posix_spawn flag POSIX_SPAWN_SETSID +- posix_spawnattr_setflags now reports unknown flags as error +- ldso option --argv0 to set argv[0] +- added _NL_LOCALE_NAME extension to nl_langinfo + +compatibility: +- dlopen local-to-global promotion no longer changes existing symbols +- gettext now searches locale name variants for translation files +- increased locale name length limit from 15 to 23 bytes +- setlocale(LC_ALL, 0) returns single name if all categories are same +- realloc no longer fails when mremap doesn't work +- getservby* no longer treat numeric port strings as service records +- mmap now works around incorrect EPERM error codes from kernel +- impact of REG_* namespace pollution in x86[_64] signal.h is reduced +- arm atomic asm now assembles correctly with new binutils +- PAGE_SIZE on arm is no longer constant (quiet upstream ABI relaxation) +- lsearch/lfind now pass args to compare callback in canonical order +- STB_WEAK and STB_GNU_UNIQUE symbols now behave same as STB_GLOBAL +- better clang CFLAGS checks in configure +- global vis.h hack, which made lld refuse to link to libc.so, is disabled + +performance: +- single-instruction optimized math functions for aarch64, s390x, powerpc64 +- fast path for ASCII in towupper/towlower +- new mostly-integer-math fma function + +semantic bugs fixed: +- POSIX-format TZ dst time transitions were wrong for southern hemisphere +- regex REG_NEWLINE semantics were wrong with negated brackets +- various bugs in strptime %j, %p, %C formats +- iconv mapped some characters to legacy 8bit encodings incorrectly +- glob failed to match "/" +- UTF-8 decoder accepted invalid f4 9x xx xx code sequences +- scanf %% conversion failed to consume whitespace +- glob with GLOB_PERIOD wrongly descended into . and .. +- nftw gave incorrect base name offset when pathname ends in "/" +- functional regression in resolv.conf attempts option +- scalbn could produce wrong result due to double rounding in subnormal range +- strftime %y format wrong with negative years +- mbsnrtowcs and wcsnrtombs mishandled input limits +- minor issues with error codes for various functions + +safety/consistency bugs fixed: +- stack-based buffer overflow in dns response processing +- invalid free in regexec on certain error paths +- invalid free in globfree after failed glob +- one-byte buffer overflow in legacy getpass function +- failed dlopen corrupted thread-local storage module list +- race in pthread_create with priority attributes could leave signals masked +- multithreaded set*id() functions could induce spurious EINTRs +- dl_iterate_phdr reported wrong base address in static PIE +- fd leak and wrong cancellation state after dns socket failure +- memory leaks and other issues in environment-modification functions +- read-after-free race in pthread_detach +- memmem performed single-byte over-read in short-needle code paths +- read via uninitialized pointer in gettext core +- bindtextdomain broke bindings for all other domains +- various silent undefined behavior +- getopt clobbered optopt on success + +arch-specific bugs fixed: +- x32 dynamic TLS accesses crashed +- s390x was missing dlsym entry point (needed for RTLD_NEXT) +- powerpc64 ldso startup could crash depending on link order +- powerpc64 setjmp/longjmp didn't properly save/restore TOC pointer +- thumb2 setjmp/longjmp silently broke at ld-time with text not aligned +- fchown was broken on archs without SYS_fchown syscall +- fstatat was broken on mips64 +- various incorrect constants in powerpc64 and mips headers + + +1.1.18 release notes + +regression fixes: +- glob failed to match literal . and .. path components +- build for armv4t ISA level was broken + +other bug fixes: +- stack overflow in posix_spawnp with large PATH variable in environment + + +1.1.19 release notes + +new features: +- iconv framework for processing stateful encodings +- iconv support for iso-2022-jp +- iconv support for converting to legacy JIS-based Japanese encodings +- iconv support for UTF-16/32 with BOM-determined endianness +- iconv ibm1047 (ebcdic latin1-equivalent) support +- iconv cp866 (dos cyrillic) support +- character data tables & case mappings updated to Unicode 10.0 +- fopencookie stdio extension +- strftime padding character extensions +- header-level support for new linux features through 4.13 + +compatibility: +- UTC timezone is now called UTC instead of GMT +- _DIRENT_HAVE_D_* macros in dirent.h +- dladdr dli_fbase definition now matches other implementations +- pthread_getattr_np now reports guard size +- strftime '+' modifier better matches apparent intent of POSIX +- getopt_long handles long option names containing '=' +- better compatibility with linux uapi headers +- workaround linux bug where getcwd can return non-absolute pathname +- configure logic for finding compiler_rt with clang +- execvp path search now continues after ENOTDIR components + +bugs fixed: +- fgetwc failed when character crossed buffer boundary +- memory corruption after failing to dlopen a second libc +- sysconf reported infinite rlimits incorrectly +- getopt_long --opt=arg did not work with partial matches +- printf was wrong for alt-form octal with value 0, no explicit precision +- endian errors in arpa/nameser.h and netinet/icmp6.h (missing endian.h) +- atfork handler could clobber fork's errno +- iconv could wrongly output surrogate pairs in ucs2 +- fmemopen buffer underallocation with extreme size argument +- getaddrinfo AI_NUMERICSERV wrong error code +- data race in at_quick_exit +- ldd failed to honor rpath $ORIGIN for program in . without "./" prefix + +arch-specfic bugs fixed: +- x32 unistd.h wrongly reported LP64 instead of ILP32 +- aarch64 signal.h had wrong type for ucontext_t uc_link member + + +1.1.20 release notes + +new features: +- m68k port +- replacement of malloc is now allowed/supported +- setvbuf now accepts caller-provided buffers for stdio streams +- getrandom syscall wrapper, getentropy function +- mlock2 syscall wrapper +- memfd_create syscall wrapper +- explicit_bzero function +- header-level support for new linux features through 4.17 +- wcsftime now supports padding specifier extensions +- dynamic linker's reclaim_gaps now works on fdpic archs +- getaddrinfo now honors AI_ADDRCONFIG +- pthread_attr_init now honors pthread_setattr_default_np defaults + +hardening: +- prevent bypass of guarantee that suids start with fd 0/1/2 open +- dlopen now rejects libraries with initial-exec refs to dynamic TLS + +compatibility: +- elf.h: new flags, aux vector entry types, etc. +- minor namespace issues in several headers +- intNN_t types used in bitfields now safe against -funsigned-bitfields +- complex arc trig/hyperbolic functions were badly broken +- nice function returned wrong value +- stdio locks no longer depend on read-after-free not faulting +- avoid excessive stack usage in getcwd +- inet_ntop no longer compresses single zeros in IPv6 (RFC 5952) +- resolver routability probe for sorting results works on no-IPv6 systems +- added missing ST_RELATIME definition to statvfs.h +- uchar.h now works with old C++ profiles +- added missing and arch-specific commands to ptrace.h +- musl-gcc wrapper now works with default-pie host toolchains + +bugs fixed: +- getopt wrongly treating colons in optstring as valid option chars +- nl_langinfo_l(CODESET, loc) reported wrong locale's value +- out-of-tree build produced broken crt files with stack protector enabled +- fmaf produced wrong result for some corner cases +- out of bounds write for zero length buffer passed to gethostname +- getopt_long_only wrongly prefix-matched long-options over short ones +- pthread_kill wrongly returned ESRCH for exited by valid pthread_t's +- iconv buffer overflow converting to legacy JIS-based encodings +- iconv conversion to "UTF-32" (no explicit endianness) failed (regression) +- iconv mishandled big5-hkscs characters that map to two unicode chars +- dynamic linker didn't map/clear bss for libraries with single LOAD segment +- resolver wrongly duplicated trailing dot from query into canonical name +- some futex waits omitted timeout arg to syscall, thereby spun on EFAULT +- dladdr mishandled addresses not matching symbols +- alignment of dirent structures from readdir was broken (regression) +- strftime %z output wrong sign for offsets <1 hour west of UTC +- limits.h, pathconf erroneously defined SYMLINK_MAX +- FP_ILOGB0 and FP_ILOGBNAN definitions were not valid for use in #if +- getopt failed to update optarg and optind correctly on missing argument +- EMULTIHOP error lacked strerror text +- mktime malfunctioned with tm_isdst>0 but no-DST POSIX-format time zone +- async thread self-cancellation produced a deadlock condition +- pthread_barrierattr_setpshared failed to produce EINVAL for bad argument +- fileno failed to produce EBADF for non-fd-associated FILEs +- fmemopen's w+ mode failed to truncate buffer at open +- open_[w]memstream did not bind stream orientation at open time +- system wrongly returned 0x7f00 instead of -1 on error +- wide printf functions ignored field width for %c formats +- fprintf failed to set stream orientation for unbuffered stream or no output +- psignal, psiginfo, and perror wrongly set stream orientation for stderr +- psignal, psiginfo potentially clobbered errno on success + +arch-specfic bugs fixed: +- on arm/aarch64/sh, local-exec TLS layout mismatched ABI with large align +- on arm/microblaze/sh, struct ipc_perm mismatched (buggy) kernel ABI +- SO_PEERSEC definition was wrong on mips +- on mips, return from start function passed to clone crashed (runaway exec) +- printf %a precision specifier malfunctioned except on ld80 archs +- async thread cancellation crashed on powerpc64 and sh-fdpic + + +1.1.21 release notes + +new features: +- setting default thread stack size via PT_GNU_STACK program header +- arm vfork implementation +- arm tlsdesc/gnu2 tls dialect support +- name_to_handle_at and name_to_handle_at syscall wrappers +- header-level support for new linux features through 4.18 + +optimizations: +- glob rewrite with much better performance and stack usage properties +- single-threaded and already-locked fast paths for getc/putc variants +- single-instruction fma implementations for arm, s390x, powerpc, & x86_64 +- single-instruction fabs and sqrt implementations for powerpc +- size and performance from making all internal-only functions/data hidden +- made &errno and pthread_self results cachable again (attribute((const))) +- significant speedup in strtod with short inputs +- new tsearch AVL tree implementation, smaller and faster +- special-cased nop calls to wmemmove +- fixed erroneously suboptimal skip conditions in strstr and memmem + +hardening: +- default thread stack guard size increased from 4k to 8k + +compatibility: +- default thread stack size increased from 80k to 128k +- building for arm as thumb2 with clang internal assembler now works +- aio threads could overflow stack on kernels that break MINSIGSTKSZ ABI +- aio threads no longer call malloc (problematic with malloc replacement) +- pthread_sigmask/sigprocmask now ignore an invalid how when not changing mask + +bugs fixed: +- soft deadlock regression in stdio FILE locks with >2 threads contending +- deadlock and buffered data loss race in fclose +- race condition leading to possible crash in dcngettext plural forms +- glob failed to see past searchable-but-unreadable path components +- getdelim wrongly realloc'd buffer that was already exactly right size +- getdelim failed to set stream orientation on early error +- ttyname[_r] reported wrong error when given bad fd +- pthread_key_delete left old tsd values exposed if slot was reused +- freeaddrinfo failed to support freeing sublists +- access to optopt was broken by copy relocations +- memccpy returned wrong result if first byte past buffer end matched +- wordexp read past end of input string ending in backslash +- sem_wait and sem_timedwait were wrongly not interruptible by signals +- getspnam[_r] wrongly treated not-found as an error + +arch-specfic bugs fixed: +- soft deadlocks (missing futex wake) on powerpc locking +- dlsym returned wrong address for thread-local symbols on ppc/mips/m68k + + +1.1.22 release notes + +new features: +- priority-inheritance mutexes +- membarrier syscall, pre-registration to use it, fallback emulation +- header-level support for new linux features in 4.19, 4.20, 5.0 + +major internal changes: +- complete, async-safe view of all existent threads as global list +- robust __synccall based on new thread list +- new dynamic TLS is installed synchronously at dlopen +- TLSDESC resolver functions no longer make bad ABI assumptions to call C +- resolved shared library dependencies are now recorded + +compatibility & conformance: +- dependency-order shared library constructor execution +- sigaltstack no longer rejects SS_AUTODISARM, future flags +- FILE is now a complete (dummy) type in pre-C11 feature profiles +- setvbuf reports failure on invalid arguments +- TSVTX is exposed unconditionally in tar.h +- multithreaded set*id() no longer depends on /proc +- key slot reuse after pthread_key_delete no longer depends on /proc + +bugs fixed: +- failures in multithreaded set*id() with concurrent thread creation/exit +- interposed free was called from invalid/inconsistent contexts +- freeaddrinfo performed invalid free of some partial results lists +- dlsym dependency order search had false negatives and false positives +- dn_skipname gave wrong results for labels with 8-bit content +- dcngettext clobbered errno, often breaking printing of error messages +- sscanf read past end of buffer under certain conditions (1.1.21 regression) +- pthread_key_create spuriously failed under race condition (1.1.21 regression) +- fdopendir wrongly succeeded with O_PATH file descriptors +- gets behaved incorrectly in presence of null bytes +- namespace violations in c11 tsd and mutex function dependencies +- incorrect prototype for makecontext (unimplemented) + +arch-specfic bugs fixed: +- s390x had wrong values for POSIX_FADV_DONTNEED/_NOREUSE + + + +1.1.23 release notes + +new features: +- riscv64 port +- configure now allows customizing AR and RANLIB vars +- header-level support for new linux features in 5.1 + +major internal changes: +- removed extern __syscall; syscall header code is now fully self-contained + +performance: +- new math library implementation for log/exp/pow +- aarch64 dynamic tlsdesc function is streamlined + +compatibility & conformance: +- O_TTY_INIT is now defined +- sys/types.h no longer pollutes namespace with sys/sysmacros.h in any profile +- powerpc asm is now compatible with clang internal assembler + +changes for new POSIX interpretations: +- fgetwc now sets stream error indicator on encoding errors +- fmemopen no longer rejects 0 size + +bugs fixed: +- static TLS for shared libraries was allocated wrong on "Variant I" archs +- crash in dladdr reading through uninitialized pointer on non-match +- sigaltstack wrongly errored out on invalid ss_size when doing SS_DISABLE +- getdents function misbehaved with buffer length larger than INT_MAX +- set*id could deadlock after fork from multithreaded process + +arch-specfic bugs fixed: +- s390x SO_PEERSEC definition was wrong +- passing of 64-bit syscall arguments was broken on microblaze +- posix_fadvise was broken on mips due to missing 7-arg syscall support +- vrregset_t layout and member naming was wrong on powerpc64 + + + +1.1.24 release notes + +new features: +- GLOB_TILDE extension to glob +- non-stub catgets localization API, using netbsd binary catalog format +- posix_spawn file actions for [f]chdir (extension, pending future standard) +- secure_getenv function (extension) +- copy_file_range syscall wrapper (Linux extension) +- header-level support for new linux features in 5.2 + +performance: +- new fast path for lrint (generic C version) on 32-bit archs + +major internal changes: +- functions involving time are overhauled to be time64-ready in 32-bit archs +- x32 uses the new time64 code paths to replace nasty hacks in syscall glue + +compatibility & conformance: +- support for powerpc[64] unaligned relocation types +- powerpc[64] and sh sys/user.h no longer clash with kernel asm/ptrace.h +- select no longer modifies timeout on failure (or at all) +- mips64 stat results are no longer limited to 32-bit time range +- optreset (BSD extension) now has a public declaration +- support for clang inconsistencies in wchar_t type vs some 32-bit archs +- mips r6 syscall asm no longer has invalid lo/hi register clobbers +- vestigial asm declarations of __tls_get_new are removed (broke some tooling) +- riscv64 mcontext_t mismatch glibc's member naming is corrected + +bugs fixed: +- glob failed to match broken symlinks consistently +- invalid use of interposed calloc to allocate initial TLS +- various dlsym symbol resolution logic errors +- semctl with SEM_STAT_ANY didn't work +- pthread_create with explicit scheduling was subject to priority inversion +- pthread_create failure path had data race for thread count +- timer_create with SIGEV_THREAD notification had data race getting timer id +- wide printf family failed to support l modifier for float formats + +arch-specific bugs fixed: +- x87 floating point stack imbalance in math asm (i386-only CVE-2019-14697) +- x32 clock_adjtime, getrusage, wait3, wait4 produced junk (struct mismatches) +- lseek broken on x32 and mipsn32 with large file offsets +- riscv64 atomics weren't compiler barriers +- riscv64 atomics had broken asm constraints (missing earlyclobber flag) +- arm clone() was broken when compiled as thumb if start function returned +- mipsr6 setjmp/longjmp did not preserve fpu register state correctly + + + +1.2.0 release notes + +new features: +- time_t is now 64-bit on all archs (not just 64-bit archs) +- character type & case mapping data updated to Unicode 12.1.0 +- header-level support for new linux features in 5.3 and 5.4 + +performance: +- new O(1) wchar_t case mapping implementation +- i386 now uses C math code for exp, faster than old asm +- mips math asm + +compatibility & conformance: +- endian.h now aims to conform to future POSIX definition +- support older compilers that don't accept powerpc math asm constraints +- fdpic code in ldso was incompatible with valid optimizations in gcc 9+ +- RLIMIT_RTTIME was missing from sys/resource.h + +bugs fixed: +- wcwidth wrongly returned 0 for most of planes 4 and up +- missing case mapping between U+03F3 and U+037F +- wrong cacosh results for arguments with negative imaginary part +- wrong catanf/catanl results for various classes of arguments +- wrong return value for ungetc with argument outside [0,UCHAR_MAX] +- posix_openpt with no ptys available produced wrong errno + +arch-specific bugs fixed: +- sigcontext/regset definition mistakes & omissions on m68k, powerpc64 +- fesetenv(FE_DFL_ENV) crashed on riscv64 +- sh2 dynamic linker was broken since 1.1.21 (crash in stage 2b) +- arm dynamic linker chose wrong tls/atomic variants since 1.1.21 +- some math library functions returned excess precision on i386 +- unconfirmed regression in fchmodat AT_SYMLINK_NOFOLLOW on mips* + + + +1.2.1 release notes + +major changes: +- new malloc implementation (mallocng & overhauled bump allocator) + +new features: +- DNS queries via res_* now set AD flag, report zone signedness (DNSSEC) +- PTHREAD_NULL macro (POSIX-future) + +performance: +- optimized memcpy and memset for aarch64 +- optimized memcpy for arm now supports big endian +- optimized x86_64 remquol +- improved strerror without linear search + +bugs fixed: +- lock-skipping for processes that returned to single-threaded was wrong +- AF_UNSPEC dns lookups mishandled single failure in paired A+AAAA +- res_send and res_query returned wrong value on errors from nameserver +- corrupted sysvipc timestamps on 32-bit archs with old kernels +- incorrect parsing of timezone offsets after overly-long zone name +- clock_adjtime was broken on 32-bit archs (time64) +- pthread_kill as not async-signal-safe +- pthread_cancel was not async-cancel-safe +- large-ulp errors in various math functions in non-default rounding modes + +arch-specific bugs fixed: +- arm clock_gettime was broken on some hw due to bad time64 vdso +- m68k sqrtl lacked long double precision +- mips* syscall mechanism regressions on older kernels +- mips* had negated error codes for some syscalls (kernel bug) +- mips* SIGEMT was wrongly called SIGSTKFLT +- sh fesetround didn't work correctly on sh + + + +1.2.2 release notes + +major changes: +- child restrictions lifted after fork of multithreaded parent + +new features: +- _Fork function (POSIX-future) +- reallocarray function (extension from OpenBSD, now widespread) +- gettid function (kernel tid as supported concept) +- SIGEV_THREAD_ID sigevent API (Linux extension) +- tcgetwinsize and tcsetwinsize functions (POSIX-future) + +performance: +- faster software sqrt on archs without native sqrt instruction + +compatibility: +- realpath no longer depends on procfs availability & accuracy +- time zone parser now always prefers 64-bit tables if present +- crypt_blowfish now supports $2b$ prefix +- res_query now reports errors via h_errno +- set*id and setrlimit are now safe in vforked/cloned child +- setgroups now applies to all threads +- dlopen debugger notification is improved, should work with lldb +- setrlimit no longer needs __synccall broadcast on linux 2.6.36+ +- faccessat with AT_EACCESS no longer needs child process on linux 5.8+ + +bugs fixed: +- buffer overflow and infinite loop errors in wcsnrtombs (CVE-2020-28928) +- sem_close unmapped still-referenced semaphores +- fork of process with active aio could deadlock or crash paren +- pthread_cond_wait was broken with priority-inheritance mutex +- getgrouplist wrongly failed when nscd reported an empty list +- abort could leak modified SIGABRT disposition to fork or posix_spawn child +- regression with mallocng: malloc_usable_size(0) crashed +- readlink wrongly gave EINVAL on zero length dest buffer +- sqrtl was severely inaccurate (not correctly rounded) on ldquad archs +- assert failure wrongly flushed stdio (possible deadlock) +- MUSL_LOCPATH search was broken with multiple components +- missing newline in herror output +- possible deadlock in pthread_exit with pshared mutex or barrier usage +- pthread_mutexattr_getprotocol didn't read back protocol +- v4l2 ioctl translation for pre-time64 kernels didn't work + +arch-specific bugs fixed: +- x86_64 longjmp failed to handle 0 argument reliably +- i386 __set_thread_area fallback for pre-2.6 kernels didn't work +- missing O_LARGEFILE macro value on x86_64, x32, mips64 +- unpredictable s390x breakage from failure to preserve call-saved registers diff --git a/system/lib/libc/musl/arch/emscripten/bits/alltypes.h b/system/lib/libc/musl/arch/emscripten/bits/alltypes.h index 64ebb875e168b..2d727fcafc08e 100644 --- a/system/lib/libc/musl/arch/emscripten/bits/alltypes.h +++ b/system/lib/libc/musl/arch/emscripten/bits/alltypes.h @@ -1,3 +1,9 @@ +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __USE_TIME_BITS64 1 + +#define __BYTE_ORDER __LITTLE_ENDIAN + #define _Addr __PTRDIFF_TYPE__ #define _Int64 __INT64_TYPE__ #define _Reg __PTRDIFF_TYPE__ @@ -85,9 +91,9 @@ typedef long suseconds_t; #if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t) typedef struct { union { - int __i[10]; - volatile int __vi[10]; - unsigned __s[10]; + int __i[9]; + volatile int __vi[9]; + unsigned __s[9]; } __u; #ifdef __EMSCRIPTEN__ // For canvas transfer implementation in Emscripten, use an extra control field @@ -99,12 +105,12 @@ typedef struct { #endif #if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t) -typedef struct { union { int __i[7]; volatile int __vi[7]; volatile void *__p[7]; } __u; } pthread_mutex_t; +typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *__p[6]; } __u; } pthread_mutex_t; #define __DEFINED_pthread_mutex_t #endif #if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t) -typedef struct { union { int __i[7]; volatile int __vi[7]; volatile void *__p[7]; } __u; } mtx_t; +typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *__p[6]; } __u; } mtx_t; #define __DEFINED_mtx_t #endif @@ -418,6 +424,12 @@ struct iovec { void *iov_base; size_t iov_len; }; #endif +#if defined(__NEED_struct_winsize) && !defined(__DEFINED_struct_winsize) +struct winsize { unsigned short ws_row, ws_col, ws_xpixel, ws_ypixel; }; +#define __DEFINED_struct_winsize +#endif + + #if defined(__NEED_socklen_t) && !defined(__DEFINED_socklen_t) typedef unsigned socklen_t; #define __DEFINED_socklen_t diff --git a/system/lib/libc/musl/arch/emscripten/kstat.h b/system/lib/libc/musl/arch/emscripten/kstat.h new file mode 100644 index 0000000000000..72c5d0af803e6 --- /dev/null +++ b/system/lib/libc/musl/arch/emscripten/kstat.h @@ -0,0 +1,3 @@ +#include + +#define kstat stat diff --git a/system/lib/libc/musl/arch/emscripten/pthread_arch.h b/system/lib/libc/musl/arch/emscripten/pthread_arch.h index 77ef9a2bf1151..a62934a5d2214 100644 --- a/system/lib/libc/musl/arch/emscripten/pthread_arch.h +++ b/system/lib/libc/musl/arch/emscripten/pthread_arch.h @@ -1,4 +1,4 @@ -struct pthread *__pthread_self(void); +uintptr_t __get_tp(void); #define TP_ADJ(p) (p) diff --git a/system/lib/libc/musl/arch/generic/bits/dirent.h b/system/lib/libc/musl/arch/generic/bits/dirent.h new file mode 100644 index 0000000000000..c845fe82dda20 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/dirent.h @@ -0,0 +1,11 @@ +#define _DIRENT_HAVE_D_RECLEN +#define _DIRENT_HAVE_D_OFF +#define _DIRENT_HAVE_D_TYPE + +struct dirent { + ino_t d_ino; + off_t d_off; + unsigned short d_reclen; + unsigned char d_type; + char d_name[256]; +}; diff --git a/system/lib/libc/musl/arch/generic/bits/fcntl.h b/system/lib/libc/musl/arch/generic/bits/fcntl.h index ae233cc003c2c..730a98cfe65a8 100644 --- a/system/lib/libc/musl/arch/generic/bits/fcntl.h +++ b/system/lib/libc/musl/arch/generic/bits/fcntl.h @@ -30,9 +30,15 @@ #define F_SETSIG 10 #define F_GETSIG 11 +#if __LONG_MAX == 0x7fffffffL #define F_GETLK 12 #define F_SETLK 13 #define F_SETLKW 14 +#else +#define F_GETLK 5 +#define F_SETLK 6 +#define F_SETLKW 7 +#endif #define F_SETOWN_EX 15 #define F_GETOWN_EX 16 diff --git a/system/lib/libc/musl/src/internal/syscall.c b/system/lib/libc/musl/arch/generic/bits/hwcap.h similarity index 100% rename from system/lib/libc/musl/src/internal/syscall.c rename to system/lib/libc/musl/arch/generic/bits/hwcap.h diff --git a/system/lib/libc/musl/arch/generic/bits/ioctl.h b/system/lib/libc/musl/arch/generic/bits/ioctl.h index c2035fc529124..60ae8b850b17b 100644 --- a/system/lib/libc/musl/arch/generic/bits/ioctl.h +++ b/system/lib/libc/musl/arch/generic/bits/ioctl.h @@ -63,6 +63,9 @@ #define TIOCGPKT 0x80045438 #define TIOCGPTLCK 0x80045439 #define TIOCGEXCL 0x80045440 +#define TIOCGPTPEER 0x5441 +#define TIOCGISO7816 0x80285442 +#define TIOCSISO7816 0xc0285443 #define FIONCLEX 0x5450 #define FIOCLEX 0x5451 @@ -81,24 +84,6 @@ #define TIOCGICOUNT 0x545D #define FIOQSIZE 0x5460 -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01 - -struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; -}; - #define TIOCM_LE 0x001 #define TIOCM_DTR 0x002 #define TIOCM_RTS 0x004 @@ -114,91 +99,17 @@ struct winsize { #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -#define N_TTY 0 -#define N_SLIP 1 -#define N_MOUSE 2 -#define N_PPP 3 -#define N_STRIP 4 -#define N_AX25 5 -#define N_X25 6 -#define N_6PACK 7 -#define N_MASC 8 -#define N_R3964 9 -#define N_PROFIBUS_FDL 10 -#define N_IRDA 11 -#define N_SMSBLOCK 12 -#define N_HDLC 13 -#define N_SYNC_PPP 14 -#define N_HCI 15 - #define FIOSETOWN 0x8901 #define SIOCSPGRP 0x8902 #define FIOGETOWN 0x8903 #define SIOCGPGRP 0x8904 #define SIOCATMARK 0x8905 +#if __LONG_MAX == 0x7fffffff +#define SIOCGSTAMP _IOR(0x89, 6, char[16]) +#define SIOCGSTAMPNS _IOR(0x89, 7, char[16]) +#else #define SIOCGSTAMP 0x8906 - -#define SIOCADDRT 0x890B -#define SIOCDELRT 0x890C -#define SIOCRTMSG 0x890D - -#define SIOCGIFNAME 0x8910 -#define SIOCSIFLINK 0x8911 -#define SIOCGIFCONF 0x8912 -#define SIOCGIFFLAGS 0x8913 -#define SIOCSIFFLAGS 0x8914 -#define SIOCGIFADDR 0x8915 -#define SIOCSIFADDR 0x8916 -#define SIOCGIFDSTADDR 0x8917 -#define SIOCSIFDSTADDR 0x8918 -#define SIOCGIFBRDADDR 0x8919 -#define SIOCSIFBRDADDR 0x891a -#define SIOCGIFNETMASK 0x891b -#define SIOCSIFNETMASK 0x891c -#define SIOCGIFMETRIC 0x891d -#define SIOCSIFMETRIC 0x891e -#define SIOCGIFMEM 0x891f -#define SIOCSIFMEM 0x8920 -#define SIOCGIFMTU 0x8921 -#define SIOCSIFMTU 0x8922 -#define SIOCSIFNAME 0x8923 -#define SIOCSIFHWADDR 0x8924 -#define SIOCGIFENCAP 0x8925 -#define SIOCSIFENCAP 0x8926 -#define SIOCGIFHWADDR 0x8927 -#define SIOCGIFSLAVE 0x8929 -#define SIOCSIFSLAVE 0x8930 -#define SIOCADDMULTI 0x8931 -#define SIOCDELMULTI 0x8932 -#define SIOCGIFINDEX 0x8933 -#define SIOGIFINDEX SIOCGIFINDEX -#define SIOCSIFPFLAGS 0x8934 -#define SIOCGIFPFLAGS 0x8935 -#define SIOCDIFADDR 0x8936 -#define SIOCSIFHWBROADCAST 0x8937 -#define SIOCGIFCOUNT 0x8938 - -#define SIOCGIFBR 0x8940 -#define SIOCSIFBR 0x8941 - -#define SIOCGIFTXQLEN 0x8942 -#define SIOCSIFTXQLEN 0x8943 - -#define SIOCDARP 0x8953 -#define SIOCGARP 0x8954 -#define SIOCSARP 0x8955 - -#define SIOCDRARP 0x8960 -#define SIOCGRARP 0x8961 -#define SIOCSRARP 0x8962 - -#define SIOCGIFMAP 0x8970 -#define SIOCSIFMAP 0x8971 - -#define SIOCADDDLCI 0x8980 -#define SIOCDELDLCI 0x8981 - -#define SIOCDEVPRIVATE 0x89F0 -#define SIOCPROTOPRIVATE 0x89E0 +#define SIOCGSTAMPNS 0x8907 +#endif #include diff --git a/system/lib/libc/musl/arch/generic/bits/ipc.h b/system/lib/libc/musl/arch/generic/bits/ipc.h index 779c42fd7bf52..40d6f3a2587cf 100644 --- a/system/lib/libc/musl/arch/generic/bits/ipc.h +++ b/system/lib/libc/musl/arch/generic/bits/ipc.h @@ -9,5 +9,3 @@ struct ipc_perm { long __pad1; long __pad2; }; - -#define IPC_64 0x100 diff --git a/system/lib/libc/musl/arch/generic/bits/ipcstat.h b/system/lib/libc/musl/arch/generic/bits/ipcstat.h new file mode 100644 index 0000000000000..0018ad1e20f62 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/ipcstat.h @@ -0,0 +1 @@ +#define IPC_STAT 2 diff --git a/system/lib/libc/musl/arch/generic/bits/kd.h b/system/lib/libc/musl/arch/generic/bits/kd.h new file mode 100644 index 0000000000000..33b873f49c261 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/kd.h @@ -0,0 +1 @@ +#include diff --git a/system/lib/libc/musl/arch/generic/bits/limits.h b/system/lib/libc/musl/arch/generic/bits/limits.h new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/system/lib/libc/musl/arch/generic/bits/link.h b/system/lib/libc/musl/arch/generic/bits/link.h new file mode 100644 index 0000000000000..4a94d8f895b16 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/link.h @@ -0,0 +1 @@ +typedef uint32_t Elf_Symndx; diff --git a/system/lib/libc/musl/arch/generic/bits/msg.h b/system/lib/libc/musl/arch/generic/bits/msg.h index bc8436c4ad267..2e23ca27f5807 100644 --- a/system/lib/libc/musl/arch/generic/bits/msg.h +++ b/system/lib/libc/musl/arch/generic/bits/msg.h @@ -1,11 +1,8 @@ struct msqid_ds { struct ipc_perm msg_perm; time_t msg_stime; - int __unused1; time_t msg_rtime; - int __unused2; time_t msg_ctime; - int __unused3; unsigned long msg_cbytes; msgqnum_t msg_qnum; msglen_t msg_qbytes; diff --git a/system/lib/libc/musl/arch/generic/bits/ptrace.h b/system/lib/libc/musl/arch/generic/bits/ptrace.h new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/system/lib/libc/musl/arch/generic/bits/sem.h b/system/lib/libc/musl/arch/generic/bits/sem.h index c629b81ebb2a0..5184eb5977ece 100644 --- a/system/lib/libc/musl/arch/generic/bits/sem.h +++ b/system/lib/libc/musl/arch/generic/bits/sem.h @@ -1,16 +1,14 @@ struct semid_ds { struct ipc_perm sem_perm; time_t sem_otime; - time_t __unused1; time_t sem_ctime; - time_t __unused2; #if __BYTE_ORDER == __LITTLE_ENDIAN unsigned short sem_nsems; - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; #else - char __sem_nsems_pad[sizeof(time_t)-sizeof(short)]; + char __sem_nsems_pad[sizeof(long)-sizeof(short)]; unsigned short sem_nsems; #endif - time_t __unused3; - time_t __unused4; + long __unused3; + long __unused4; }; diff --git a/system/lib/libc/musl/arch/generic/bits/shm.h b/system/lib/libc/musl/arch/generic/bits/shm.h index 45d1d15783238..8d19378191bac 100644 --- a/system/lib/libc/musl/arch/generic/bits/shm.h +++ b/system/lib/libc/musl/arch/generic/bits/shm.h @@ -4,11 +4,8 @@ struct shmid_ds { struct ipc_perm shm_perm; size_t shm_segsz; time_t shm_atime; - int __unused1; time_t shm_dtime; - int __unused2; time_t shm_ctime; - int __unused3; pid_t shm_cpid; pid_t shm_lpid; unsigned long shm_nattch; @@ -25,4 +22,3 @@ struct shm_info { unsigned long shm_tot, shm_rss, shm_swp; unsigned long __swap_attempts, __swap_successes; }; - diff --git a/system/lib/libc/musl/arch/generic/bits/socket.h b/system/lib/libc/musl/arch/generic/bits/socket.h index 1f73b995c68a6..e69de29bb2d1d 100644 --- a/system/lib/libc/musl/arch/generic/bits/socket.h +++ b/system/lib/libc/musl/arch/generic/bits/socket.h @@ -1,15 +0,0 @@ -struct msghdr { - void *msg_name; - socklen_t msg_namelen; - struct iovec *msg_iov; - int msg_iovlen; - void *msg_control; - socklen_t msg_controllen; - int msg_flags; -}; - -struct cmsghdr { - socklen_t cmsg_len; - int cmsg_level; - int cmsg_type; -}; diff --git a/system/lib/libc/musl/arch/generic/bits/soundcard.h b/system/lib/libc/musl/arch/generic/bits/soundcard.h new file mode 100644 index 0000000000000..fade986fe4212 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/soundcard.h @@ -0,0 +1 @@ +#include diff --git a/system/lib/libc/musl/arch/generic/bits/termios.h b/system/lib/libc/musl/arch/generic/bits/termios.h index 434c02c89aba2..124f71d20196c 100644 --- a/system/lib/libc/musl/arch/generic/bits/termios.h +++ b/system/lib/libc/musl/arch/generic/bits/termios.h @@ -51,6 +51,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0000400 #define NL0 0000000 #define NL1 0000400 @@ -70,6 +71,7 @@ struct termios { #define FFDLY 0100000 #define FF0 0000000 #define FF1 0100000 +#endif #define VTDLY 0040000 #define VT0 0000000 diff --git a/system/lib/libc/musl/arch/generic/bits/vt.h b/system/lib/libc/musl/arch/generic/bits/vt.h new file mode 100644 index 0000000000000..834abfbc8fbb4 --- /dev/null +++ b/system/lib/libc/musl/arch/generic/bits/vt.h @@ -0,0 +1 @@ +#include diff --git a/system/lib/libc/musl/arch/generic/fp_arch.h b/system/lib/libc/musl/arch/generic/fp_arch.h new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/system/lib/libc/musl/config.mak b/system/lib/libc/musl/config.mak new file mode 100644 index 0000000000000..5b46fcdcdedec --- /dev/null +++ b/system/lib/libc/musl/config.mak @@ -0,0 +1,32 @@ +# This version of config.mak was generated by: +# ./configure +# Any changes made here will be lost if configure is re-run +AR = $(CROSS_COMPILE)ar +RANLIB = $(CROSS_COMPILE)ranlib +ARCH = x86_64 +SUBARCH = +ASMSUBARCH = +srcdir = . +prefix = /usr/local/musl +exec_prefix = $(prefix) +bindir = $(exec_prefix)/bin +libdir = $(prefix)/lib +includedir = $(prefix)/include +syslibdir = /lib +CC = gcc +CFLAGS = +CFLAGS_AUTO = -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -Werror=implicit-function-declaration -Werror=implicit-int -Werror=pointer-sign -Werror=pointer-arith +CFLAGS_C99FSE = -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack +CFLAGS_MEMOPS = -fno-tree-loop-distribute-patterns +CFLAGS_NOSSP = -fno-stack-protector +CPPFLAGS = +LDFLAGS = +LDFLAGS_AUTO = -Wl,--sort-section,alignment -Wl,--sort-common -Wl,--gc-sections -Wl,--hash-style=both -Wl,--no-undefined -Wl,--exclude-libs=ALL -Wl,--dynamic-list=./dynamic.list +CROSS_COMPILE = +LIBCC = -lgcc -lgcc_eh +OPTIMIZE_GLOBS = internal/*.c malloc/*.c string/*.c +ALL_TOOLS = obj/musl-gcc +TOOL_LIBS = lib/musl-gcc.specs +ADD_CFI = no +WRAPCC_GCC = $(CC) +AOBJS = $(LOBJS) diff --git a/system/lib/libc/musl/configure b/system/lib/libc/musl/configure index 928455e7e9f5f..d0386090f80ad 100755 --- a/system/lib/libc/musl/configure +++ b/system/lib/libc/musl/configure @@ -30,12 +30,14 @@ System types: Optional features: --enable-optimize=... optimize listed components for speed over size [auto] --enable-debug build with debugging information [disabled] - --enable-warnings build with recommended warnings flags [disabled] - --enable-visibility use global visibility options to optimize PIC [auto] + --disable-warnings build with recommended warnings flags [enabled] --enable-wrapper=... build given musl toolchain wrapper [auto] --disable-shared inhibit building shared library [enabled] --disable-static inhibit building static library [enabled] +Optional packages: + --with-malloc=... choose malloc implementation [mallocng] + Some influential environment variables: CC C compiler command [detected] CFLAGS C compiler flags [-Os -pipe ...] @@ -134,13 +136,13 @@ build= target= optimize=auto debug=no -warnings=no -visibility=auto +warnings=yes shared=auto static=yes wrapper=auto gcc_wrapper=no clang_wrapper=no +malloc_dir=mallocng for arg ; do case "$arg" in @@ -163,8 +165,6 @@ case "$arg" in --disable-debug|--enable-debug=no) debug=no ;; --enable-warnings|--enable-warnings=yes) warnings=yes ;; --disable-warnings|--enable-warnings=no) warnings=no ;; ---enable-visibility|--enable-visibility=yes) visibility=yes ;; ---disable-visibility|--enable-visibility=no) visibility=no ;; --enable-wrapper|--enable-wrapper=yes) wrapper=detect ;; --enable-wrapper=all) wrapper=yes ; gcc_wrapper=yes ; clang_wrapper=yes ;; --enable-wrapper=gcc) wrapper=yes ; gcc_wrapper=yes ;; @@ -172,10 +172,13 @@ case "$arg" in --disable-wrapper|--enable-wrapper=no) wrapper=no ;; --enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ; gcc_wrapper=yes ;; --disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;; +--with-malloc=*) malloc_dir=${arg#*=} ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; +AR=*) AR=${arg#*=} ;; +RANLIB=*) RANLIB=${arg#*=} ;; CC=*) CC=${arg#*=} ;; CFLAGS=*) CFLAGS=${arg#*=} ;; CPPFLAGS=*) CPPFLAGS=${arg#*=} ;; @@ -201,7 +204,7 @@ fi abs_builddir="$(pwd)" || fail "$0: cannot determine working directory" abs_srcdir="$(cd $srcdir && pwd)" || fail "$0: invalid source directory $srcdir" test "$abs_srcdir" = "$abs_builddir" && srcdir=. -test "$srcdir" != "." -a -f Makefile -a ! -h Makefile && fail "$0: Makefile already exists in the working directory" +test "$srcdir" != "." && test -f Makefile && test ! -h Makefile && fail "$0: Makefile already exists in the working directory" # # Get a temp filename we can use @@ -216,6 +219,12 @@ done set +C trap 'rm "$tmpc"' EXIT INT QUIT TERM HUP +# +# Check that the requested malloc implementation exists +# +test -d "$srcdir/src/malloc/$malloc_dir" \ +|| fail "$0: error: chosen malloc implementation '$malloc_dir' does not exist" + # # Check whether we are cross-compiling, and set a default # CROSS_COMPILE prefix if none was provided. @@ -249,6 +258,7 @@ fi # tryflag CFLAGS_TRY -Werror=unknown-warning-option tryflag CFLAGS_TRY -Werror=unused-command-line-argument +tryflag CFLAGS_TRY -Werror=ignored-optimization-argument tryldflag LDFLAGS_TRY -Werror=unknown-warning-option tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument @@ -269,7 +279,7 @@ echo "$cc_family" # # Figure out toolchain wrapper to build # -if test "$wrapper" = auto -o "$wrapper" = detect ; then +if test "$wrapper" = auto || test "$wrapper" = detect ; then echo "#include " > "$tmpc" echo "#if ! __GLIBC__" >> "$tmpc" echo "#error no" >> "$tmpc" @@ -318,14 +328,16 @@ i?86*) ARCH=i386 ;; x86_64-x32*|x32*|x86_64*x32) ARCH=x32 ;; x86_64-nt64*) ARCH=nt64 ;; x86_64*) ARCH=x86_64 ;; -mips64*) ARCH=mips64 ;; +m68k*) ARCH=m68k ;; +mips64*|mipsisa64*) ARCH=mips64 ;; mips*) ARCH=mips ;; microblaze*) ARCH=microblaze ;; or1k*) ARCH=or1k ;; -powerpc64*) ARCH=powerpc64 ;; -powerpc*) ARCH=powerpc ;; +powerpc64*|ppc64*) ARCH=powerpc64 ;; +powerpc*|ppc*) ARCH=powerpc ;; +riscv64*) ARCH=riscv64 ;; sh[1-9bel-]*|sh|superh*) ARCH=sh ;; -asmjs-unknown-emscripten) ARCH=emscripten ;; +s390x*) ARCH=s390x ;; unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;; *) fail "$0: unknown or unsupported target \"$target\"" ;; esac @@ -456,7 +468,7 @@ tryflag CFLAGS_AUTO -pipe # pointer is no longer needed for debugging. # if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" ; then : -else +else tryflag CFLAGS_AUTO -fomit-frame-pointer fi @@ -493,6 +505,16 @@ fnmatch '-march=*|*\ -march=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -march=i48 fnmatch '-mtune=*|*\ -mtune=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -mtune=generic fi +# +# GCC defines -w as overriding any -W options, regardless of order, but +# clang has a bunch of annoying warnings enabled by default and needs -w +# to start from a clean slate. So use -w if building with clang. Also +# turn off a common on-by-default cast warning regardless of compiler. +# +test "$cc_family" = clang && tryflag CFLAGS_AUTO -w + +tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast + # # Even with -std=c99, gcc accepts some constructs which are constraint # violations. We want to treat these as errors regardless of whether @@ -503,49 +525,30 @@ tryflag CFLAGS_AUTO -Werror=implicit-function-declaration tryflag CFLAGS_AUTO -Werror=implicit-int # XXX EMSCRIPTEN tryflag CFLAGS_AUTO -Werror=pointer-sign tryflag CFLAGS_AUTO -Werror=pointer-arith +tryflag CFLAGS_AUTO -Werror=int-conversion +tryflag CFLAGS_AUTO -Werror=incompatible-pointer-types +tryflag CFLAGS_AUTO -Werror=discarded-qualifiers +tryflag CFLAGS_AUTO -Werror=discarded-array-qualifiers -if test "x$warnings" = xyes ; then -tryflag CFLAGS_AUTO -Wall -tryflag CFLAGS_AUTO -Wno-parentheses -tryflag CFLAGS_AUTO -Wno-uninitialized -tryflag CFLAGS_AUTO -Wno-missing-braces -tryflag CFLAGS_AUTO -Wno-unused-value -tryflag CFLAGS_AUTO -Wno-unused-but-set-variable -tryflag CFLAGS_AUTO -Wno-unknown-pragmas -tryflag CFLAGS_AUTO -Wno-pointer-to-int-cast -fi - -if test "x$visibility" = xauto ; then -# This test checks toolchain support for several things: -# - the -include option -# - the attributes/pragmas used in vis.h -# - linking code that takes the address of protected symbols -# - gcc 3.x bug that wrongly claims declarations mismatch -printf "checking whether global visibility preinclude works... " -cat > "$tmpc" </dev/null 2>&1 ; then -visibility=yes -else -visibility=no -fi -printf "%s\n" "$visibility" -fi +# +# GCC ignores unused arguements by default, but Clang needs this extra +# parameter to stop printing warnings about LDFLAGS passed during +# compiling stage and CFLAGS passed during linking stage. +# +test "$cc_family" = clang && tryflag CFLAGS_AUTO -Qunused-arguments -if test "x$visibility" = xyes ; then -CFLAGS_AUTO="$CFLAGS_AUTO -include vis.h" -CFLAGS_AUTO="${CFLAGS_AUTO# }" +if test "x$warnings" = xyes ; then +tryflag CFLAGS_AUTO -Waddress +tryflag CFLAGS_AUTO -Warray-bounds +tryflag CFLAGS_AUTO -Wchar-subscripts +tryflag CFLAGS_AUTO -Wduplicate-decl-specifier +tryflag CFLAGS_AUTO -Winit-self +tryflag CFLAGS_AUTO -Wreturn-type +tryflag CFLAGS_AUTO -Wsequence-point +tryflag CFLAGS_AUTO -Wstrict-aliasing +tryflag CFLAGS_AUTO -Wunused-function +tryflag CFLAGS_AUTO -Wunused-label +tryflag CFLAGS_AUTO -Wunused-variable fi # Determine if the compiler produces position-independent code (PIC) @@ -581,14 +584,18 @@ tryldflag LDFLAGS_AUTO -Wl,--no-undefined # versions built without shared library support and pcc are broken. tryldflag LDFLAGS_AUTO -Wl,--exclude-libs=ALL -# Linking with -Bsymbolic-functions is no longer mandatory for -# the dynamic linker to work, but enable it if it works as -# a linking optimization. -tryldflag LDFLAGS_AUTO -Wl,-Bsymbolic-functions +# Public data symbols must be interposable to allow for copy +# relocations, but otherwise we want to bind symbols at libc link +# time to eliminate startup relocations and PLT overhead. Use +# --dynamic-list rather than -Bsymbolic-functions for greater +# control over what symbols are left unbound. +tryldflag LDFLAGS_AUTO -Wl,--dynamic-list="$srcdir/dynamic.list" # Find compiler runtime library test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh test -z "$LIBCC" && tryldflag LIBCC -lcompiler_rt +test -z "$LIBCC" && try_libcc=`$CC -print-libgcc-file-name 2>/dev/null` \ + && tryldflag LIBCC "$try_libcc" test -z "$LIBCC" && try_libcc=`$CC -print-file-name=libpcc.a 2>/dev/null` \ && tryldflag LIBCC "$try_libcc" printf "using compiler runtime libraries: %s\n" "$LIBCC" @@ -597,11 +604,30 @@ printf "using compiler runtime libraries: %s\n" "$LIBCC" SUBARCH= t="$CFLAGS_C99FSE $CPPFLAGS $CFLAGS" +if test "$ARCH" = "i386" ; then +printf "checking whether compiler can use ebx in PIC asm constraints... " +cat > "$tmpc" </dev/null 2>&1 ; then +printf "yes\n" +else +printf "no\n" +CFLAGS_AUTO="$CFLAGS_AUTO -DBROKEN_EBX_ASM" +fi +fi + if test "$ARCH" = "x86_64" ; then trycppif __ILP32__ "$t" && ARCH=x32 fi if test "$ARCH" = "arm" ; then +if trycppif __thumb2__ "$t" ; then +tryflag CFLAGS_AUTO -mimplicit-it=always +tryflag CFLAGS_AUTO -Wa,-mimplicit-it=always +tryflag CFLAGS_AUTO -Wa,-mthumb +fi trycppif __ARMEB__ "$t" && SUBARCH=${SUBARCH}eb trycppif __ARM_PCS_VFP "$t" && SUBARCH=${SUBARCH}hf # Versions of clang up until at least 3.8 have the wrong constraint codes @@ -624,6 +650,13 @@ if test "$ARCH" = "aarch64" ; then trycppif __AARCH64EB__ "$t" && SUBARCH=${SUBARCH}_be fi +if test "$ARCH" = "m68k" ; then +if trycppif "__HAVE_68881__" ; then : ; +elif trycppif "__mcffpu__" ; then SUBARCH="-fp64" +else SUBARCH="-sf" +fi +fi + if test "$ARCH" = "mips" ; then trycppif "__mips_isa_rev >= 6" "$t" && SUBARCH=${SUBARCH}r6 trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" && SUBARCH=${SUBARCH}el @@ -641,6 +674,15 @@ if test "$ARCH" = "powerpc" ; then trycppif "__NO_FPRS__ && !_SOFT_FLOAT" "$t" && fail \ "$0: error: compiler's floating point configuration is unsupported" trycppif _SOFT_FLOAT "$t" && SUBARCH=${SUBARCH}-sf +printf "checking whether compiler can use 'd' constraint in asm... " +echo 'double f(double x) { __asm__ ("fabs %0, %1" : "=d"(x) : "d"(x)); return x; }' > "$tmpc" +if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then +printf "yes\n" +else +printf "no\n" +CFLAGS_AUTO="$CFLAGS_AUTO -DBROKEN_PPC_D_ASM" +CFLAGS_AUTO="${CFLAGS_AUTO# }" +fi fi test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \ @@ -652,6 +694,11 @@ trycppif __LITTLE_ENDIAN__ "$t" && SUBARCH=${SUBARCH}le trycppif _SOFT_FLOAT "$t" && fail "$0: error: soft-float not supported on powerpc64" fi +if test "$ARCH" = "riscv64" ; then +trycppif __riscv_float_abi_soft "$t" && SUBARCH=${SUBARCH}-sf +trycppif __riscv_float_abi_single "$t" && SUBARCH=${SUBARCH}-sp +fi + if test "$ARCH" = "sh" ; then tryflag CFLAGS_AUTO -Wa,--isa=any trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb @@ -693,9 +740,8 @@ esac # printf "checking whether compiler's long double definition matches float.h... " echo '#include ' > "$tmpc" -echo '#if LDBL_MANT_DIG == 53' >> "$tmpc" -echo 'typedef char ldcheck[9-(int)sizeof(long double)];' >> "$tmpc" -echo '#endif' >> "$tmpc" +echo '#define C(m,s) (m==LDBL_MANT_DIG && s==sizeof(long double))' >> "$tmpc" +echo 'typedef char ldcheck[(C(53,8)||C(64,12)||C(64,16)||C(113,16))*2-1];' >> "$tmpc" if $CC $CFLAGS_C99FSE \ -I$srcdir/arch/$ARCH -I$srcdir/arch/generic -I$srcdir/include \ $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then @@ -727,6 +773,8 @@ cat << EOF # This version of config.mak was generated by: # $cmdline # Any changes made here will be lost if configure is re-run +AR = ${AR:-\$(CROSS_COMPILE)ar} +RANLIB = ${RANLIB:-\$(CROSS_COMPILE)ranlib} ARCH = $ARCH SUBARCH = $SUBARCH ASMSUBARCH = $ASMSUBARCH @@ -752,6 +800,7 @@ OPTIMIZE_GLOBS = $OPTIMIZE_GLOBS ALL_TOOLS = $tools TOOL_LIBS = $tool_libs ADD_CFI = $ADD_CFI +MALLOC_DIR = $malloc_dir EOF test "x$static" = xno && echo "STATIC_LIBS =" test "x$shared" = xno && echo "SHARED_LIBS =" diff --git a/system/lib/libc/musl/dynamic.list b/system/lib/libc/musl/dynamic.list new file mode 100644 index 0000000000000..ee0d363b648df --- /dev/null +++ b/system/lib/libc/musl/dynamic.list @@ -0,0 +1,45 @@ +{ +environ; +__environ; + +stdin; +stdout; +stderr; + +malloc; +calloc; +realloc; +free; +memalign; +posix_memalign; +aligned_alloc; +malloc_usable_size; + +timezone; +daylight; +tzname; +__timezone; +__daylight; +__tzname; + +signgam; +__signgam; + +optarg; +optind; +opterr; +optopt; +optreset; +__optreset; + +getdate_err; + +h_errno; + +program_invocation_name; +program_invocation_short_name; +__progname; +__progname_full; + +__stack_chk_guard; +}; diff --git a/system/lib/libc/musl/include/aio.h b/system/lib/libc/musl/include/aio.h index 19bc28a9b19e0..453c41b7489f3 100644 --- a/system/lib/libc/musl/include/aio.h +++ b/system/lib/libc/musl/include/aio.h @@ -62,6 +62,10 @@ int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sige #define off64_t off_t #endif +#if _REDIR_TIME64 +__REDIR(aio_suspend, __aio_suspend_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/alloca.h b/system/lib/libc/musl/include/alloca.h index d2e6f1c681eeb..b8d183d144efa 100644 --- a/system/lib/libc/musl/include/alloca.h +++ b/system/lib/libc/musl/include/alloca.h @@ -10,9 +10,7 @@ extern "C" { void *alloca(size_t); -#ifdef __GNUC__ #define alloca __builtin_alloca -#endif #ifdef __cplusplus } diff --git a/system/lib/libc/musl/include/alltypes.h.in b/system/lib/libc/musl/include/alltypes.h.in index 6a9c105fb6c02..d47aeea9aa8b8 100644 --- a/system/lib/libc/musl/include/alltypes.h.in +++ b/system/lib/libc/musl/include/alltypes.h.in @@ -1,3 +1,7 @@ +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __USE_TIME_BITS64 1 + TYPEDEF unsigned _Addr size_t; TYPEDEF unsigned _Addr uintptr_t; TYPEDEF _Addr ptrdiff_t; @@ -5,12 +9,14 @@ TYPEDEF _Addr ssize_t; TYPEDEF _Addr intptr_t; TYPEDEF _Addr regoff_t; TYPEDEF _Reg register_t; +TYPEDEF _Int64 time_t; +TYPEDEF _Int64 suseconds_t; TYPEDEF signed char int8_t; -TYPEDEF short int16_t; -TYPEDEF int int32_t; -TYPEDEF _Int64 int64_t; -TYPEDEF _Int64 intmax_t; +TYPEDEF signed short int16_t; +TYPEDEF signed int int32_t; +TYPEDEF signed _Int64 int64_t; +TYPEDEF signed _Int64 intmax_t; TYPEDEF unsigned char uint8_t; TYPEDEF unsigned short uint16_t; TYPEDEF unsigned int uint32_t; @@ -35,7 +41,7 @@ TYPEDEF void * timer_t; TYPEDEF int clockid_t; TYPEDEF long clock_t; STRUCT timeval { time_t tv_sec; suseconds_t tv_usec; }; -STRUCT timespec { time_t tv_sec; long tv_nsec; }; +STRUCT timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); }; TYPEDEF int pid_t; TYPEDEF unsigned id_t; @@ -57,8 +63,12 @@ TYPEDEF struct { unsigned __attr; } pthread_condattr_t; TYPEDEF struct { unsigned __attr; } pthread_barrierattr_t; TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t; +STRUCT _IO_FILE { char __x; }; TYPEDEF struct _IO_FILE FILE; +TYPEDEF __builtin_va_list va_list; +TYPEDEF __builtin_va_list __isoc_va_list; + TYPEDEF struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t; TYPEDEF struct __locale_struct * locale_t; @@ -67,9 +77,19 @@ TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t; STRUCT iovec { void *iov_base; size_t iov_len; }; +STRUCT winsize { unsigned short ws_row, ws_col, ws_xpixel, ws_ypixel; }; + TYPEDEF unsigned socklen_t; TYPEDEF unsigned short sa_family_t; +TYPEDEF struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t; +TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t; +TYPEDEF struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t; +TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t; +TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t; +TYPEDEF struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t; +TYPEDEF struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t; + #undef _Addr #undef _Int64 #undef _Reg diff --git a/system/lib/libc/musl/include/arpa/inet.h b/system/lib/libc/musl/include/arpa/inet.h index 37f8c11eed4de..9d20a15ba4226 100644 --- a/system/lib/libc/musl/include/arpa/inet.h +++ b/system/lib/libc/musl/include/arpa/inet.h @@ -24,11 +24,6 @@ struct in_addr inet_makeaddr(in_addr_t, in_addr_t); in_addr_t inet_lnaof(struct in_addr); in_addr_t inet_netof(struct in_addr); -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN -#define INET_ADDRSTRLEN 16 -#define INET6_ADDRSTRLEN 46 - #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/assert.h b/system/lib/libc/musl/include/assert.h index 1ae0ea55d20df..d14ec94e7a263 100644 --- a/system/lib/libc/musl/include/assert.h +++ b/system/lib/libc/musl/include/assert.h @@ -16,10 +16,7 @@ extern "C" { #endif -#ifdef __EMSCRIPTEN__ -_Noreturn -#endif -void __assert_fail (const char *, const char *, int, const char *); +_Noreturn void __assert_fail (const char *, const char *, int, const char *); #ifdef __cplusplus } diff --git a/system/lib/libc/musl/include/dirent.h b/system/lib/libc/musl/include/dirent.h index 006a360e1c4c5..650ecf646ad71 100644 --- a/system/lib/libc/musl/include/dirent.h +++ b/system/lib/libc/musl/include/dirent.h @@ -15,15 +15,9 @@ extern "C" { #include -typedef struct __dirstream DIR; +#include -struct dirent { - ino_t d_ino; - off_t d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; -}; +typedef struct __dirstream DIR; #define d_fileno d_ino @@ -33,13 +27,16 @@ DIR *opendir(const char *); struct dirent *readdir(DIR *); int readdir_r(DIR *__restrict, struct dirent *__restrict, struct dirent **__restrict); void rewinddir(DIR *); -void seekdir(DIR *, long); -long telldir(DIR *); int dirfd(DIR *); int alphasort(const struct dirent **, const struct dirent **); int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **)); +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +void seekdir(DIR *, long); +long telldir(DIR *); +#endif + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define DT_UNKNOWN 0 #define DT_FIFO 1 diff --git a/system/lib/libc/musl/include/dlfcn.h b/system/lib/libc/musl/include/dlfcn.h index 78fb0733b2eb8..13ab71dd071eb 100644 --- a/system/lib/libc/musl/include/dlfcn.h +++ b/system/lib/libc/musl/include/dlfcn.h @@ -35,6 +35,10 @@ int dladdr(const void *, Dl_info *); int dlinfo(void *, int, void *); #endif +#if _REDIR_TIME64 +__REDIR(dlsym, __dlsym_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/elf.h b/system/lib/libc/musl/include/elf.h index 0721d63f73a17..b5e7befb02980 100644 --- a/system/lib/libc/musl/include/elf.h +++ b/system/lib/libc/musl/include/elf.h @@ -212,13 +212,111 @@ typedef struct { #define EM_OR1K 92 #define EM_OPENRISC 92 #define EM_ARC_A5 93 +#define EM_ARC_COMPACT 93 #define EM_XTENSA 94 +#define EM_VIDEOCORE 95 +#define EM_TMM_GPP 96 +#define EM_NS32K 97 +#define EM_TPC 98 +#define EM_SNP1K 99 +#define EM_ST200 100 +#define EM_IP2K 101 +#define EM_MAX 102 +#define EM_CR 103 +#define EM_F2MC16 104 +#define EM_MSP430 105 +#define EM_BLACKFIN 106 +#define EM_SE_C33 107 +#define EM_SEP 108 +#define EM_ARCA 109 +#define EM_UNICORE 110 +#define EM_EXCESS 111 +#define EM_DXP 112 #define EM_ALTERA_NIOS2 113 +#define EM_CRX 114 +#define EM_XGATE 115 +#define EM_C166 116 +#define EM_M16C 117 +#define EM_DSPIC30F 118 +#define EM_CE 119 +#define EM_M32C 120 +#define EM_TSK3000 131 +#define EM_RS08 132 +#define EM_SHARC 133 +#define EM_ECOG2 134 +#define EM_SCORE7 135 +#define EM_DSP24 136 +#define EM_VIDEOCORE3 137 +#define EM_LATTICEMICO32 138 +#define EM_SE_C17 139 +#define EM_TI_C6000 140 +#define EM_TI_C2000 141 +#define EM_TI_C5500 142 +#define EM_TI_ARP32 143 +#define EM_TI_PRU 144 +#define EM_MMDSP_PLUS 160 +#define EM_CYPRESS_M8C 161 +#define EM_R32C 162 +#define EM_TRIMEDIA 163 +#define EM_QDSP6 164 +#define EM_8051 165 +#define EM_STXP7X 166 +#define EM_NDS32 167 +#define EM_ECOG1X 168 +#define EM_MAXQ30 169 +#define EM_XIMO16 170 +#define EM_MANIK 171 +#define EM_CRAYNV2 172 +#define EM_RX 173 +#define EM_METAG 174 +#define EM_MCST_ELBRUS 175 +#define EM_ECOG16 176 +#define EM_CR16 177 +#define EM_ETPU 178 +#define EM_SLE9X 179 +#define EM_L10M 180 +#define EM_K10M 181 #define EM_AARCH64 183 +#define EM_AVR32 185 +#define EM_STM8 186 +#define EM_TILE64 187 #define EM_TILEPRO 188 #define EM_MICROBLAZE 189 +#define EM_CUDA 190 #define EM_TILEGX 191 -#define EM_NUM 192 +#define EM_CLOUDSHIELD 192 +#define EM_COREA_1ST 193 +#define EM_COREA_2ND 194 +#define EM_ARC_COMPACT2 195 +#define EM_OPEN8 196 +#define EM_RL78 197 +#define EM_VIDEOCORE5 198 +#define EM_78KOR 199 +#define EM_56800EX 200 +#define EM_BA1 201 +#define EM_BA2 202 +#define EM_XCORE 203 +#define EM_MCHP_PIC 204 +#define EM_KM32 210 +#define EM_KMX32 211 +#define EM_EMX16 212 +#define EM_EMX8 213 +#define EM_KVARC 214 +#define EM_CDP 215 +#define EM_COGE 216 +#define EM_COOL 217 +#define EM_NORC 218 +#define EM_CSR_KALIMBA 219 +#define EM_Z80 220 +#define EM_VISIUM 221 +#define EM_FT32 222 +#define EM_MOXIE 223 +#define EM_AMDGPU 224 +#define EM_RISCV 243 +#define EM_BPF 247 +#define EM_CSKY 252 +#define EM_NUM 253 + #define EM_ALPHA 0x9026 #define EV_NONE 0 @@ -505,6 +603,7 @@ typedef struct { #define PT_GNU_EH_FRAME 0x6474e550 #define PT_GNU_STACK 0x6474e551 #define PT_GNU_RELRO 0x6474e552 +#define PT_GNU_PROPERTY 0x6474e553 #define PT_LOSUNW 0x6ffffffa #define PT_SUNWBSS 0x6ffffffa #define PT_SUNWSTACK 0x6ffffffb @@ -526,6 +625,7 @@ typedef struct { #define NT_PRSTATUS 1 +#define NT_PRFPREG 2 #define NT_FPREGSET 2 #define NT_PRPSINFO 3 #define NT_PRXREG 4 @@ -547,6 +647,19 @@ typedef struct { #define NT_PPC_VMX 0x100 #define NT_PPC_SPE 0x101 #define NT_PPC_VSX 0x102 +#define NT_PPC_TAR 0x103 +#define NT_PPC_PPR 0x104 +#define NT_PPC_DSCR 0x105 +#define NT_PPC_EBB 0x106 +#define NT_PPC_PMU 0x107 +#define NT_PPC_TM_CGPR 0x108 +#define NT_PPC_TM_CFPR 0x109 +#define NT_PPC_TM_CVMX 0x10a +#define NT_PPC_TM_CVSX 0x10b +#define NT_PPC_TM_SPR 0x10c +#define NT_PPC_TM_CTAR 0x10d +#define NT_PPC_TM_CPPR 0x10e +#define NT_PPC_TM_CDSCR 0x10f #define NT_386_TLS 0x200 #define NT_386_IOPERM 0x201 #define NT_X86_XSTATE 0x202 @@ -559,14 +672,28 @@ typedef struct { #define NT_S390_LAST_BREAK 0x306 #define NT_S390_SYSTEM_CALL 0x307 #define NT_S390_TDB 0x308 +#define NT_S390_VXRS_LOW 0x309 +#define NT_S390_VXRS_HIGH 0x30a +#define NT_S390_GS_CB 0x30b +#define NT_S390_GS_BC 0x30c +#define NT_S390_RI_CB 0x30d #define NT_ARM_VFP 0x400 #define NT_ARM_TLS 0x401 #define NT_ARM_HW_BREAK 0x402 #define NT_ARM_HW_WATCH 0x403 #define NT_ARM_SYSTEM_CALL 0x404 +#define NT_ARM_SVE 0x405 +#define NT_ARM_PAC_MASK 0x406 +#define NT_ARM_PACA_KEYS 0x407 +#define NT_ARM_PACG_KEYS 0x408 #define NT_METAG_CBUF 0x500 #define NT_METAG_RPIPE 0x501 #define NT_METAG_TLS 0x502 +#define NT_ARC_V2 0x600 +#define NT_VMCOREDD 0x700 +#define NT_MIPS_DSP 0x800 +#define NT_MIPS_FP_MODE 0x801 +#define NT_MIPS_MSA 0x802 #define NT_VERSION 1 @@ -624,7 +751,8 @@ typedef struct { #define DT_ENCODING 32 #define DT_PREINIT_ARRAY 32 #define DT_PREINIT_ARRAYSZ 33 -#define DT_NUM 34 +#define DT_SYMTAB_SHNDX 34 +#define DT_NUM 35 #define DT_LOOS 0x6000000d #define DT_HIOS 0x6ffff000 #define DT_LOPROC 0x70000000 @@ -724,6 +852,8 @@ typedef struct { #define DF_1_SYMINTPOSE 0x00800000 #define DF_1_GLOBAUDIT 0x01000000 #define DF_1_SINGLETON 0x02000000 +#define DF_1_STUB 0x04000000 +#define DF_1_PIE 0x08000000 #define DTF_1_PARINIT 0x00000001 #define DTF_1_CONFEXP 0x00000002 @@ -905,7 +1035,16 @@ typedef struct { #define AT_L2_CACHESHAPE 36 #define AT_L3_CACHESHAPE 37 +#define AT_L1I_CACHESIZE 40 +#define AT_L1I_CACHEGEOMETRY 41 +#define AT_L1D_CACHESIZE 42 +#define AT_L1D_CACHEGEOMETRY 43 +#define AT_L2_CACHESIZE 44 +#define AT_L2_CACHEGEOMETRY 45 +#define AT_L3_CACHESIZE 46 +#define AT_L3_CACHEGEOMETRY 47 +#define AT_MINSIGSTKSZ 51 typedef struct { @@ -947,6 +1086,7 @@ typedef struct { #define NT_GNU_BUILD_ID 3 #define NT_GNU_GOLD_VERSION 4 +#define NT_GNU_PROPERTY_TYPE_0 5 @@ -1000,7 +1140,25 @@ typedef struct { #define R_68K_GLOB_DAT 20 #define R_68K_JMP_SLOT 21 #define R_68K_RELATIVE 22 -#define R_68K_NUM 23 +#define R_68K_TLS_GD32 25 +#define R_68K_TLS_GD16 26 +#define R_68K_TLS_GD8 27 +#define R_68K_TLS_LDM32 28 +#define R_68K_TLS_LDM16 29 +#define R_68K_TLS_LDM8 30 +#define R_68K_TLS_LDO32 31 +#define R_68K_TLS_LDO16 32 +#define R_68K_TLS_LDO8 33 +#define R_68K_TLS_IE32 34 +#define R_68K_TLS_IE16 35 +#define R_68K_TLS_IE8 36 +#define R_68K_TLS_LE32 37 +#define R_68K_TLS_LE16 38 +#define R_68K_TLS_LE8 39 +#define R_68K_TLS_DTPMOD32 40 +#define R_68K_TLS_DTPREL32 41 +#define R_68K_TLS_TPREL32 42 +#define R_68K_NUM 43 #define R_386_NONE 0 #define R_386_32 1 @@ -2136,6 +2294,7 @@ enum #define PPC64_OPT_TLS 1 #define PPC64_OPT_MULTI_TOC 2 +#define PPC64_OPT_LOCALENTRY 4 #define STO_PPC64_LOCAL_BIT 5 #define STO_PPC64_LOCAL_MASK 0xe0 @@ -2469,6 +2628,61 @@ enum #define R_ARM_NUM 256 +#define R_CKCORE_NONE 0 +#define R_CKCORE_ADDR32 1 +#define R_CKCORE_PCRELIMM8BY4 2 +#define R_CKCORE_PCRELIMM11BY2 3 +#define R_CKCORE_PCREL32 5 +#define R_CKCORE_PCRELJSR_IMM11BY2 6 +#define R_CKCORE_RELATIVE 9 +#define R_CKCORE_COPY 10 +#define R_CKCORE_GLOB_DAT 11 +#define R_CKCORE_JUMP_SLOT 12 +#define R_CKCORE_GOTOFF 13 +#define R_CKCORE_GOTPC 14 +#define R_CKCORE_GOT32 15 +#define R_CKCORE_PLT32 16 +#define R_CKCORE_ADDRGOT 17 +#define R_CKCORE_ADDRPLT 18 +#define R_CKCORE_PCREL_IMM26BY2 19 +#define R_CKCORE_PCREL_IMM16BY2 20 +#define R_CKCORE_PCREL_IMM16BY4 21 +#define R_CKCORE_PCREL_IMM10BY2 22 +#define R_CKCORE_PCREL_IMM10BY4 23 +#define R_CKCORE_ADDR_HI16 24 +#define R_CKCORE_ADDR_LO16 25 +#define R_CKCORE_GOTPC_HI16 26 +#define R_CKCORE_GOTPC_LO16 27 +#define R_CKCORE_GOTOFF_HI16 28 +#define R_CKCORE_GOTOFF_LO16 29 +#define R_CKCORE_GOT12 30 +#define R_CKCORE_GOT_HI16 31 +#define R_CKCORE_GOT_LO16 32 +#define R_CKCORE_PLT12 33 +#define R_CKCORE_PLT_HI16 34 +#define R_CKCORE_PLT_LO16 35 +#define R_CKCORE_ADDRGOT_HI16 36 +#define R_CKCORE_ADDRGOT_LO16 37 +#define R_CKCORE_ADDRPLT_HI16 38 +#define R_CKCORE_ADDRPLT_LO16 39 +#define R_CKCORE_PCREL_JSR_IMM26BY2 40 +#define R_CKCORE_TOFFSET_LO16 41 +#define R_CKCORE_DOFFSET_LO16 42 +#define R_CKCORE_PCREL_IMM18BY2 43 +#define R_CKCORE_DOFFSET_IMM18 44 +#define R_CKCORE_DOFFSET_IMM18BY2 45 +#define R_CKCORE_DOFFSET_IMM18BY4 46 +#define R_CKCORE_GOT_IMM18BY4 48 +#define R_CKCORE_PLT_IMM18BY4 49 +#define R_CKCORE_PCREL_IMM7BY4 50 +#define R_CKCORE_TLS_LE32 51 +#define R_CKCORE_TLS_IE32 52 +#define R_CKCORE_TLS_GD32 53 +#define R_CKCORE_TLS_LDM32 54 +#define R_CKCORE_TLS_LDO32 55 +#define R_CKCORE_TLS_DTPMOD32 56 +#define R_CKCORE_TLS_DTPOFF32 57 +#define R_CKCORE_TLS_TPOFF32 58 #define EF_IA_64_MASKOS 0x0000000f @@ -3013,6 +3227,65 @@ enum #define R_OR1K_TLS_DTPOFF 33 #define R_OR1K_TLS_DTPMOD 34 +#define R_BPF_NONE 0 +#define R_BPF_MAP_FD 1 + +#define R_RISCV_NONE 0 +#define R_RISCV_32 1 +#define R_RISCV_64 2 +#define R_RISCV_RELATIVE 3 +#define R_RISCV_COPY 4 +#define R_RISCV_JUMP_SLOT 5 +#define R_RISCV_TLS_DTPMOD32 6 +#define R_RISCV_TLS_DTPMOD64 7 +#define R_RISCV_TLS_DTPREL32 8 +#define R_RISCV_TLS_DTPREL64 9 +#define R_RISCV_TLS_TPREL32 10 +#define R_RISCV_TLS_TPREL64 11 + +#define R_RISCV_BRANCH 16 +#define R_RISCV_JAL 17 +#define R_RISCV_CALL 18 +#define R_RISCV_CALL_PLT 19 +#define R_RISCV_GOT_HI20 20 +#define R_RISCV_TLS_GOT_HI20 21 +#define R_RISCV_TLS_GD_HI20 22 +#define R_RISCV_PCREL_HI20 23 +#define R_RISCV_PCREL_LO12_I 24 +#define R_RISCV_PCREL_LO12_S 25 +#define R_RISCV_HI20 26 +#define R_RISCV_LO12_I 27 +#define R_RISCV_LO12_S 28 +#define R_RISCV_TPREL_HI20 29 +#define R_RISCV_TPREL_LO12_I 30 +#define R_RISCV_TPREL_LO12_S 31 +#define R_RISCV_TPREL_ADD 32 +#define R_RISCV_ADD8 33 +#define R_RISCV_ADD16 34 +#define R_RISCV_ADD32 35 +#define R_RISCV_ADD64 36 +#define R_RISCV_SUB8 37 +#define R_RISCV_SUB16 38 +#define R_RISCV_SUB32 39 +#define R_RISCV_SUB64 40 +#define R_RISCV_GNU_VTINHERIT 41 +#define R_RISCV_GNU_VTENTRY 42 +#define R_RISCV_ALIGN 43 +#define R_RISCV_RVC_BRANCH 44 +#define R_RISCV_RVC_JUMP 45 +#define R_RISCV_RVC_LUI 46 +#define R_RISCV_GPREL_I 47 +#define R_RISCV_GPREL_S 48 +#define R_RISCV_TPREL_I 49 +#define R_RISCV_TPREL_S 50 +#define R_RISCV_RELAX 51 +#define R_RISCV_SUB6 52 +#define R_RISCV_SET6 53 +#define R_RISCV_SET8 54 +#define R_RISCV_SET16 55 +#define R_RISCV_SET32 56 +#define R_RISCV_32_PCREL 57 + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/endian.h b/system/lib/libc/musl/include/endian.h index 1bd444518ab5f..172c43203af12 100644 --- a/system/lib/libc/musl/include/endian.h +++ b/system/lib/libc/musl/include/endian.h @@ -3,25 +3,19 @@ #include -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __PDP_ENDIAN 3412 +#define __NEED_uint16_t +#define __NEED_uint32_t +#define __NEED_uint64_t -#if defined(__GNUC__) && defined(__BYTE_ORDER__) -#define __BYTE_ORDER __BYTE_ORDER__ -#else -#include -#endif +#include -#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#define __PDP_ENDIAN 3412 #define BIG_ENDIAN __BIG_ENDIAN #define LITTLE_ENDIAN __LITTLE_ENDIAN #define PDP_ENDIAN __PDP_ENDIAN #define BYTE_ORDER __BYTE_ORDER -#include - static __inline uint16_t __bswap16(uint16_t __x) { return __x<<8 | __x>>8; @@ -40,43 +34,47 @@ static __inline uint64_t __bswap64(uint64_t __x) #if __BYTE_ORDER == __LITTLE_ENDIAN #define htobe16(x) __bswap16(x) #define be16toh(x) __bswap16(x) -#define betoh16(x) __bswap16(x) #define htobe32(x) __bswap32(x) #define be32toh(x) __bswap32(x) -#define betoh32(x) __bswap32(x) #define htobe64(x) __bswap64(x) #define be64toh(x) __bswap64(x) -#define betoh64(x) __bswap64(x) #define htole16(x) (uint16_t)(x) #define le16toh(x) (uint16_t)(x) -#define letoh16(x) (uint16_t)(x) #define htole32(x) (uint32_t)(x) #define le32toh(x) (uint32_t)(x) -#define letoh32(x) (uint32_t)(x) #define htole64(x) (uint64_t)(x) #define le64toh(x) (uint64_t)(x) -#define letoh64(x) (uint64_t)(x) #else #define htobe16(x) (uint16_t)(x) #define be16toh(x) (uint16_t)(x) -#define betoh16(x) (uint16_t)(x) #define htobe32(x) (uint32_t)(x) #define be32toh(x) (uint32_t)(x) -#define betoh32(x) (uint32_t)(x) #define htobe64(x) (uint64_t)(x) #define be64toh(x) (uint64_t)(x) -#define betoh64(x) (uint64_t)(x) #define htole16(x) __bswap16(x) #define le16toh(x) __bswap16(x) -#define letoh16(x) __bswap16(x) #define htole32(x) __bswap32(x) #define le32toh(x) __bswap32(x) -#define letoh32(x) __bswap32(x) #define htole64(x) __bswap64(x) #define le64toh(x) __bswap64(x) -#define letoh64(x) __bswap64(x) #endif +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define betoh16(x) __bswap16(x) +#define betoh32(x) __bswap32(x) +#define betoh64(x) __bswap64(x) +#define letoh16(x) (uint16_t)(x) +#define letoh32(x) (uint32_t)(x) +#define letoh64(x) (uint64_t)(x) +#else +#define betoh16(x) (uint16_t)(x) +#define betoh32(x) (uint32_t)(x) +#define betoh64(x) (uint64_t)(x) +#define letoh16(x) __bswap16(x) +#define letoh32(x) __bswap32(x) +#define letoh64(x) __bswap64(x) +#endif #endif #endif diff --git a/system/lib/libc/musl/include/errno.h b/system/lib/libc/musl/include/errno.h index 93f5f6ecb6c35..0361b33ad348a 100644 --- a/system/lib/libc/musl/include/errno.h +++ b/system/lib/libc/musl/include/errno.h @@ -9,6 +9,9 @@ extern "C" { #include +#ifdef __GNUC__ +__attribute__((const)) +#endif int *__errno_location(void); #define errno (*__errno_location()) diff --git a/system/lib/libc/musl/include/fcntl.h b/system/lib/libc/musl/include/fcntl.h index e8bc80b399c79..0467f397e5aec 100644 --- a/system/lib/libc/musl/include/fcntl.h +++ b/system/lib/libc/musl/include/fcntl.h @@ -40,8 +40,9 @@ int openat(int, const char *, int, ...); int posix_fadvise(int, off_t, off_t, int); int posix_fallocate(int, off_t, off_t); -#define O_SEARCH O_PATH -#define O_EXEC O_PATH +#define O_SEARCH O_PATH +#define O_EXEC O_PATH +#define O_TTY_INIT 0 #define O_ACCMODE (03|O_SEARCH) #define O_RDONLY 00 @@ -70,8 +71,10 @@ int posix_fallocate(int, off_t, off_t); #define POSIX_FADV_RANDOM 1 #define POSIX_FADV_SEQUENTIAL 2 #define POSIX_FADV_WILLNEED 3 +#ifndef POSIX_FADV_DONTNEED #define POSIX_FADV_DONTNEED 4 #define POSIX_FADV_NOREUSE 5 +#endif #undef SEEK_SET #undef SEEK_CUR @@ -107,9 +110,14 @@ int posix_fallocate(int, off_t, off_t); #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define AT_NO_AUTOMOUNT 0x800 #define AT_EMPTY_PATH 0x1000 +#define AT_STATX_SYNC_TYPE 0x6000 +#define AT_STATX_SYNC_AS_STAT 0x0000 +#define AT_STATX_FORCE_SYNC 0x2000 +#define AT_STATX_DONT_SYNC 0x4000 +#define AT_RECURSIVE 0x8000 #define FAPPEND O_APPEND -#define FFSYNC O_FSYNC +#define FFSYNC O_SYNC #define FASYNC O_ASYNC #define FNONBLOCK O_NONBLOCK #define FNDELAY O_NDELAY @@ -136,6 +144,19 @@ int posix_fallocate(int, off_t, off_t); #define F_SEAL_SHRINK 0x0002 #define F_SEAL_GROW 0x0004 #define F_SEAL_WRITE 0x0008 +#define F_SEAL_FUTURE_WRITE 0x0010 + +#define F_GET_RW_HINT 1035 +#define F_SET_RW_HINT 1036 +#define F_GET_FILE_RW_HINT 1037 +#define F_SET_FILE_RW_HINT 1038 + +#define RWF_WRITE_LIFE_NOT_SET 0 +#define RWH_WRITE_LIFE_NONE 1 +#define RWH_WRITE_LIFE_SHORT 2 +#define RWH_WRITE_LIFE_MEDIUM 3 +#define RWH_WRITE_LIFE_LONG 4 +#define RWH_WRITE_LIFE_EXTREME 5 #define DN_ACCESS 0x00000001 #define DN_MODIFY 0x00000002 @@ -153,12 +174,18 @@ int lockf(int, int, off_t); #define F_OWNER_PID 1 #define F_OWNER_PGRP 2 #define F_OWNER_GID 2 +struct file_handle { + unsigned handle_bytes; + int handle_type; + unsigned char f_handle[]; +}; struct f_owner_ex { int type; pid_t pid; }; #define FALLOC_FL_KEEP_SIZE 1 #define FALLOC_FL_PUNCH_HOLE 2 +#define MAX_HANDLE_SZ 128 #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 #define SYNC_FILE_RANGE_WAIT_AFTER 4 @@ -168,6 +195,8 @@ struct f_owner_ex { #define SPLICE_F_GIFT 8 int fallocate(int, int, off_t, off_t); #define fallocate64 fallocate +int name_to_handle_at(int, const char *, struct file_handle *, int *, int); +int open_by_handle_at(int, struct file_handle *, int); ssize_t readahead(int, off_t, size_t); int sync_file_range(int, off_t, off_t, unsigned); ssize_t vmsplice(int, const struct iovec *, size_t, unsigned); diff --git a/system/lib/libc/musl/include/features.h b/system/lib/libc/musl/include/features.h index 3cc3e57933e1a..85cfb72a0d427 100644 --- a/system/lib/libc/musl/include/features.h +++ b/system/lib/libc/musl/include/features.h @@ -24,6 +24,8 @@ #if __STDC_VERSION__ >= 199901L || defined(__cplusplus) #define __inline inline +#elif !defined(__GNUC__) +#define __inline #endif #if __STDC_VERSION__ >= 201112L @@ -33,4 +35,6 @@ #define _Noreturn #endif +#define __REDIR(x,y) __typeof__(x) x __asm__(#y) + #endif diff --git a/system/lib/libc/musl/include/glob.h b/system/lib/libc/musl/include/glob.h index 76f6c1c68a235..4a562a206d520 100644 --- a/system/lib/libc/musl/include/glob.h +++ b/system/lib/libc/musl/include/glob.h @@ -31,6 +31,9 @@ void globfree(glob_t *); #define GLOB_NOESCAPE 0x40 #define GLOB_PERIOD 0x80 +#define GLOB_TILDE 0x1000 +#define GLOB_TILDE_CHECK 0x4000 + #define GLOB_NOSPACE 1 #define GLOB_ABORTED 2 #define GLOB_NOMATCH 3 diff --git a/system/lib/libc/musl/include/grp.h b/system/lib/libc/musl/include/grp.h index 358181bf139a2..27e8c5e6c6726 100644 --- a/system/lib/libc/musl/include/grp.h +++ b/system/lib/libc/musl/include/grp.h @@ -29,12 +29,14 @@ struct group *getgrnam(const char *); int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct group *getgrent(void); void endgrent(void); void setgrent(void); +#endif #ifdef _GNU_SOURCE -struct group *fgetgrent(FILE *stream); +struct group *fgetgrent(FILE *); int putgrent(const struct group *, FILE *); #endif diff --git a/system/lib/libc/musl/include/ifaddrs.h b/system/lib/libc/musl/include/ifaddrs.h index 4726db6e09387..c0328a8ea5103 100644 --- a/system/lib/libc/musl/include/ifaddrs.h +++ b/system/lib/libc/musl/include/ifaddrs.h @@ -24,8 +24,8 @@ struct ifaddrs { #define ifa_broadaddr ifa_ifu.ifu_broadaddr #define ifa_dstaddr ifa_ifu.ifu_dstaddr -void freeifaddrs(struct ifaddrs *ifp); -int getifaddrs(struct ifaddrs **ifap); +void freeifaddrs(struct ifaddrs *); +int getifaddrs(struct ifaddrs **); #ifdef __cplusplus } diff --git a/system/lib/libc/musl/include/langinfo.h b/system/lib/libc/musl/include/langinfo.h index 2153c42e99e13..519c061294c0f 100644 --- a/system/lib/libc/musl/include/langinfo.h +++ b/system/lib/libc/musl/include/langinfo.h @@ -77,6 +77,12 @@ extern "C" { #define YESEXPR 0x50000 #define NOEXPR 0x50001 +#define _NL_LOCALE_NAME(cat) (((cat)<<16) | 0xffff) + +#if defined(_GNU_SOURCE) +#define NL_LOCALE_NAME(cat) _NL_LOCALE_NAME(cat) +#endif + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define YESSTR 0x50002 #define NOSTR 0x50003 diff --git a/system/lib/libc/musl/include/limits.h b/system/lib/libc/musl/include/limits.h index f9805a1e15964..53a27b9de43fa 100644 --- a/system/lib/libc/musl/include/limits.h +++ b/system/lib/libc/musl/include/limits.h @@ -3,13 +3,11 @@ #include -/* Most limits are system-specific */ - -#include +#include /* __LONG_MAX */ /* Support signed or unsigned plain-char */ -#if '\0'-1 > 0 +#if '\xff' > 0 #define CHAR_MIN 0 #define CHAR_MAX 255 #else @@ -17,8 +15,6 @@ #define CHAR_MAX 127 #endif -/* Some universal constants... */ - #define CHAR_BIT 8 #define SCHAR_MIN (-128) #define SCHAR_MAX 127 @@ -30,8 +26,10 @@ #define INT_MAX 0x7fffffff #define UINT_MAX 0xffffffffU #define LONG_MIN (-LONG_MAX-1) +#define LONG_MAX __LONG_MAX #define ULONG_MAX (2UL*LONG_MAX+1) #define LLONG_MIN (-LLONG_MAX-1) +#define LLONG_MAX 0x7fffffffffffffffLL #define ULLONG_MAX (2ULL*LLONG_MAX+1) #define MB_LEN_MAX 4 @@ -39,15 +37,14 @@ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#include + #define PIPE_BUF 4096 -#ifdef PAGE_SIZE -#define PAGESIZE PAGE_SIZE -#endif #define FILESIZEBITS 64 +#ifndef NAME_MAX #define NAME_MAX 255 -#define SYMLINK_MAX 255 +#endif #define PATH_MAX 4096 -#define NZERO 20 #define NGROUPS_MAX 32 #define ARG_MAX 131072 #define IOV_MAX 1024 @@ -58,6 +55,12 @@ #define TTY_NAME_MAX 32 #define HOST_NAME_MAX 255 +#if LONG_MAX == 0x7fffffffL +#define LONG_BIT 32 +#else +#define LONG_BIT 64 +#endif + /* Implementation choices... */ #define PTHREAD_KEYS_MAX 128 @@ -82,13 +85,22 @@ #define RE_DUP_MAX 255 #define NL_ARGMAX 9 -#define NL_LANGMAX 32 #define NL_MSGMAX 32767 #define NL_SETMAX 255 #define NL_TEXTMAX 2048 #endif +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) + +#ifdef PAGESIZE +#define PAGE_SIZE PAGESIZE +#endif +#define NZERO 20 +#define NL_LANGMAX 32 + +#endif + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) \ || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) diff --git a/system/lib/libc/musl/include/link.h b/system/lib/libc/musl/include/link.h index 9349cddd5da7d..815018594c777 100644 --- a/system/lib/libc/musl/include/link.h +++ b/system/lib/libc/musl/include/link.h @@ -16,8 +16,7 @@ extern "C" { #define ElfW(type) Elf32_ ## type #endif -/* this is the same everywhere except alpha and s390 */ -typedef uint32_t Elf_Symndx; +#include struct dl_phdr_info { ElfW(Addr) dlpi_addr; diff --git a/system/lib/libc/musl/include/math.h b/system/lib/libc/musl/include/math.h index 6ac91da24f943..14f28ec8c6465 100644 --- a/system/lib/libc/musl/include/math.h +++ b/system/lib/libc/musl/include/math.h @@ -27,7 +27,7 @@ extern "C" { #define MATH_ERREXCEPT 2 #define math_errhandling 2 -#define FP_ILOGBNAN (-1-(int)(((unsigned)-1)>>1)) +#define FP_ILOGBNAN (-1-0x7fffffff) #define FP_ILOGB0 FP_ILOGBNAN #define FP_NAN 0 @@ -36,6 +36,18 @@ extern "C" { #define FP_SUBNORMAL 3 #define FP_NORMAL 4 +#ifdef __FP_FAST_FMA +#define FP_FAST_FMA 1 +#endif + +#ifdef __FP_FAST_FMAF +#define FP_FAST_FMAF 1 +#endif + +#ifdef __FP_FAST_FMAL +#define FP_FAST_FMAL 1 +#endif + int __fpclassify(double); int __fpclassifyf(float); int __fpclassifyl(long double); diff --git a/system/lib/libc/musl/include/mqueue.h b/system/lib/libc/musl/include/mqueue.h index f5cbe79656b3a..0c807ea0cbb26 100644 --- a/system/lib/libc/musl/include/mqueue.h +++ b/system/lib/libc/musl/include/mqueue.h @@ -30,6 +30,11 @@ ssize_t mq_timedreceive(mqd_t, char *__restrict, size_t, unsigned *__restrict, c int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *); int mq_unlink(const char *); +#if _REDIR_TIME64 +__REDIR(mq_timedreceive, __mq_timedreceive_time64); +__REDIR(mq_timedsend, __mq_timedsend_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/net/if.h b/system/lib/libc/musl/include/net/if.h index 1a4059d60f680..774cbff0b5064 100644 --- a/system/lib/libc/musl/include/net/if.h +++ b/system/lib/libc/musl/include/net/if.h @@ -89,7 +89,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; char ifru_newname[IFNAMSIZ]; - void *ifru_data; + char *ifru_data; } ifr_ifru; }; @@ -116,7 +116,7 @@ struct ifreq { struct ifconf { int ifc_len; union { - void *ifcu_buf; + char *ifcu_buf; struct ifreq *ifcu_req; } ifc_ifcu; }; @@ -125,6 +125,13 @@ struct ifconf { #define ifc_req ifc_ifcu.ifcu_req #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) +#define __UAPI_DEF_IF_IFCONF 0 +#define __UAPI_DEF_IF_IFMAP 0 +#define __UAPI_DEF_IF_IFNAMSIZ 0 +#define __UAPI_DEF_IF_IFREQ 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + #endif #ifdef __cplusplus diff --git a/system/lib/libc/musl/include/net/if_arp.h b/system/lib/libc/musl/include/net/if_arp.h index 18d5dcf977add..27becc835eeb4 100644 --- a/system/lib/libc/musl/include/net/if_arp.h +++ b/system/lib/libc/musl/include/net/if_arp.h @@ -59,6 +59,7 @@ struct arphdr { #define ARPHRD_LAPB 516 #define ARPHRD_DDCMP 517 #define ARPHRD_RAWHDLC 518 +#define ARPHRD_RAWIP 519 #define ARPHRD_TUNNEL 768 #define ARPHRD_TUNNEL6 769 @@ -91,6 +92,8 @@ struct arphdr { #define ARPHRD_CAIF 822 #define ARPHRD_IP6GRE 823 #define ARPHRD_NETLINK 824 +#define ARPHRD_6LOWPAN 825 +#define ARPHRD_VSOCKMON 826 #define ARPHRD_VOID 0xFFFF #define ARPHRD_NONE 0xFFFE diff --git a/system/lib/libc/musl/include/netdb.h b/system/lib/libc/musl/include/netdb.h index 967ca211f9dab..d096c78183b56 100644 --- a/system/lib/libc/musl/include/netdb.h +++ b/system/lib/libc/musl/include/netdb.h @@ -24,8 +24,6 @@ struct addrinfo { struct addrinfo *ai_next; }; -#define IPPORT_RESERVED 1024 - #define AI_PASSIVE 0x01 #define AI_CANONNAME 0x02 #define AI_NUMERICHOST 0x04 @@ -117,6 +115,9 @@ struct protoent *getprotobynumber (int); || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) struct hostent *gethostbyname (const char *); struct hostent *gethostbyaddr (const void *, socklen_t, int); +#ifdef __GNUC__ +__attribute__((const)) +#endif int *__h_errno_location(void); #define h_errno (*__h_errno_location()) #define HOST_NOT_FOUND 1 diff --git a/system/lib/libc/musl/include/netinet/if_ether.h b/system/lib/libc/musl/include/netinet/if_ether.h index 4c2322b3153b5..55a2ff1b17531 100644 --- a/system/lib/libc/musl/include/netinet/if_ether.h +++ b/system/lib/libc/musl/include/netinet/if_ether.h @@ -5,15 +5,20 @@ #include #define ETH_ALEN 6 +#define ETH_TLEN 2 #define ETH_HLEN 14 #define ETH_ZLEN 60 #define ETH_DATA_LEN 1500 #define ETH_FRAME_LEN 1514 #define ETH_FCS_LEN 4 +#define ETH_MIN_MTU 68 +#define ETH_MAX_MTU 0xFFFFU #define ETH_P_LOOP 0x0060 #define ETH_P_PUP 0x0200 #define ETH_P_PUPAT 0x0201 +#define ETH_P_TSN 0x22F0 +#define ETH_P_ERSPAN2 0x22EB #define ETH_P_IP 0x0800 #define ETH_P_X25 0x0805 #define ETH_P_ARP 0x0806 @@ -50,21 +55,31 @@ #define ETH_P_AOE 0x88A2 #define ETH_P_8021AD 0x88A8 #define ETH_P_802_EX1 0x88B5 +#define ETH_P_ERSPAN 0x88BE +#define ETH_P_PREAUTH 0x88C7 #define ETH_P_TIPC 0x88CA +#define ETH_P_LLDP 0x88CC +#define ETH_P_MRP 0x88E3 #define ETH_P_MACSEC 0x88E5 #define ETH_P_8021AH 0x88E7 #define ETH_P_MVRP 0x88F5 #define ETH_P_1588 0x88F7 +#define ETH_P_NCSI 0x88F8 #define ETH_P_PRP 0x88FB #define ETH_P_FCOE 0x8906 #define ETH_P_TDLS 0x890D #define ETH_P_FIP 0x8914 +#define ETH_P_IBOE 0x8915 #define ETH_P_80221 0x8917 +#define ETH_P_HSR 0x892F +#define ETH_P_NSH 0x894F #define ETH_P_LOOPBACK 0x9000 #define ETH_P_QINQ1 0x9100 #define ETH_P_QINQ2 0x9200 #define ETH_P_QINQ3 0x9300 #define ETH_P_EDSA 0xDADA +#define ETH_P_DSA_8021Q 0xDADB +#define ETH_P_IFE 0xED3E #define ETH_P_AF_IUCV 0xFBFB #define ETH_P_802_3_MIN 0x0600 @@ -93,6 +108,8 @@ #define ETH_P_PHONET 0x00F5 #define ETH_P_IEEE802154 0x00F6 #define ETH_P_CAIF 0x00F7 +#define ETH_P_XDSA 0x00F8 +#define ETH_P_MAP 0x00F9 struct ethhdr { uint8_t h_dest[ETH_ALEN]; @@ -126,5 +143,6 @@ do { \ (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ } while(0) +#define __UAPI_DEF_ETHHDR 0 #endif diff --git a/system/lib/libc/musl/include/netinet/in.h b/system/lib/libc/musl/include/netinet/in.h index f6bb77b1fb09c..f9594339f0269 100644 --- a/system/lib/libc/musl/include/netinet/in.h +++ b/system/lib/libc/musl/include/netinet/in.h @@ -52,6 +52,7 @@ struct ipv6_mreq { #define INADDR_UNSPEC_GROUP ((in_addr_t) 0xe0000000) #define INADDR_ALLHOSTS_GROUP ((in_addr_t) 0xe0000001) #define INADDR_ALLRTRS_GROUP ((in_addr_t) 0xe0000002) +#define INADDR_ALLSNOOPERS_GROUP ((in_addr_t) 0xe000006a) #define INADDR_MAX_LOCAL_GROUP ((in_addr_t) 0xe00000ff) #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } @@ -59,8 +60,6 @@ struct ipv6_mreq { extern const struct in6_addr in6addr_any, in6addr_loopback; -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN #define INET_ADDRSTRLEN 16 #define INET6_ADDRSTRLEN 46 @@ -69,6 +68,8 @@ uint16_t htons(uint16_t); uint32_t ntohl(uint32_t); uint16_t ntohs(uint16_t); +#define IPPORT_RESERVED 1024 + #define IPPROTO_IP 0 #define IPPROTO_HOPOPTS 0 #define IPPROTO_ICMP 1 @@ -100,8 +101,10 @@ uint16_t ntohs(uint16_t); #define IPPROTO_MH 135 #define IPPROTO_UDPLITE 136 #define IPPROTO_MPLS 137 +#define IPPROTO_ETHERNET 143 #define IPPROTO_RAW 255 -#define IPPROTO_MAX 256 +#define IPPROTO_MPTCP 262 +#define IPPROTO_MAX 263 #define IN6_IS_ADDR_UNSPECIFIED(a) \ (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \ @@ -198,6 +201,8 @@ uint16_t ntohs(uint16_t); #define IP_NODEFRAG 22 #define IP_CHECKSUM 23 #define IP_BIND_ADDRESS_NO_PORT 24 +#define IP_RECVFRAGSIZE 25 +#define IP_RECVERR_RFC4884 26 #define IP_MULTICAST_IF 32 #define IP_MULTICAST_TTL 33 #define IP_MULTICAST_LOOP 34 @@ -332,6 +337,8 @@ struct ip6_mtuinfo { #define IPV6_V6ONLY 26 #define IPV6_JOIN_ANYCAST 27 #define IPV6_LEAVE_ANYCAST 28 +#define IPV6_MULTICAST_ALL 29 +#define IPV6_ROUTER_ALERT_ISOLATE 30 #define IPV6_IPSEC_POLICY 34 #define IPV6_XFRM_POLICY 35 #define IPV6_HDRINCL 36 @@ -359,6 +366,8 @@ struct ip6_mtuinfo { #define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR #define IPV6_TRANSPARENT 75 #define IPV6_UNICAST_IF 76 +#define IPV6_RECVFRAGSIZE 77 +#define IPV6_FREEBIND 78 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP @@ -385,6 +394,21 @@ struct ip6_mtuinfo { #define IPV6_RTHDR_TYPE_0 0 +#define __UAPI_DEF_IN_ADDR 0 +#define __UAPI_DEF_IN_IPPROTO 0 +#define __UAPI_DEF_IN_PKTINFO 0 +#define __UAPI_DEF_IP_MREQ 0 +#define __UAPI_DEF_SOCKADDR_IN 0 +#define __UAPI_DEF_IN_CLASS 0 +#define __UAPI_DEF_IN6_ADDR 0 +#define __UAPI_DEF_IN6_ADDR_ALT 0 +#define __UAPI_DEF_SOCKADDR_IN6 0 +#define __UAPI_DEF_IPV6_MREQ 0 +#define __UAPI_DEF_IPPROTO_V6 0 +#define __UAPI_DEF_IPV6_OPTIONS 0 +#define __UAPI_DEF_IN6_PKTINFO 0 +#define __UAPI_DEF_IP6_MTUINFO 0 + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/netinet/ip.h b/system/lib/libc/musl/include/netinet/ip.h index d7fa8d5e4e9b2..0ae132a58584b 100644 --- a/system/lib/libc/musl/include/netinet/ip.h +++ b/system/lib/libc/musl/include/netinet/ip.h @@ -7,7 +7,6 @@ extern "C" { #include #include -#include struct timestamp { uint8_t len; @@ -191,6 +190,8 @@ struct ip_timestamp { #define IP_MSS 576 +#define __UAPI_DEF_IPHDR 0 + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/netinet/ip6.h b/system/lib/libc/musl/include/netinet/ip6.h index a4347a53fd7dd..50c626a69c646 100644 --- a/system/lib/libc/musl/include/netinet/ip6.h +++ b/system/lib/libc/musl/include/netinet/ip6.h @@ -7,7 +7,6 @@ extern "C" { #include #include -#include struct ip6_hdr { union { diff --git a/system/lib/libc/musl/include/netinet/ip_icmp.h b/system/lib/libc/musl/include/netinet/ip_icmp.h index 2f4a86ddd4cf2..b9e0df8997e14 100644 --- a/system/lib/libc/musl/include/netinet/ip_icmp.h +++ b/system/lib/libc/musl/include/netinet/ip_icmp.h @@ -23,6 +23,7 @@ struct icmphdr { uint16_t __unused; uint16_t mtu; } frag; + uint8_t reserved[4]; } un; }; diff --git a/system/lib/libc/musl/include/netinet/tcp.h b/system/lib/libc/musl/include/netinet/tcp.h index 9ea64c451ce47..b7b997f5fde54 100644 --- a/system/lib/libc/musl/include/netinet/tcp.h +++ b/system/lib/libc/musl/include/netinet/tcp.h @@ -30,6 +30,17 @@ #define TCP_CC_INFO 26 #define TCP_SAVE_SYN 27 #define TCP_SAVED_SYN 28 +#define TCP_REPAIR_WINDOW 29 +#define TCP_FASTOPEN_CONNECT 30 +#define TCP_ULP 31 +#define TCP_MD5SIG_EXT 32 +#define TCP_FASTOPEN_KEY 33 +#define TCP_FASTOPEN_NO_COOKIE 34 +#define TCP_ZEROCOPY_RECEIVE 35 +#define TCP_INQ 36 +#define TCP_TX_DELAY 37 + +#define TCP_CM_INQ TCP_INQ #define TCP_ESTABLISHED 1 #define TCP_SYN_SENT 2 @@ -43,6 +54,34 @@ #define TCP_LISTEN 10 #define TCP_CLOSING 11 +enum { + TCP_NLA_PAD, + TCP_NLA_BUSY, + TCP_NLA_RWND_LIMITED, + TCP_NLA_SNDBUF_LIMITED, + TCP_NLA_DATA_SEGS_OUT, + TCP_NLA_TOTAL_RETRANS, + TCP_NLA_PACING_RATE, + TCP_NLA_DELIVERY_RATE, + TCP_NLA_SND_CWND, + TCP_NLA_REORDERING, + TCP_NLA_MIN_RTT, + TCP_NLA_RECUR_RETRANS, + TCP_NLA_DELIVERY_RATE_APP_LMT, + TCP_NLA_SNDQ_SIZE, + TCP_NLA_CA_STATE, + TCP_NLA_SND_SSTHRESH, + TCP_NLA_DELIVERED, + TCP_NLA_DELIVERED_CE, + TCP_NLA_BYTES_SENT, + TCP_NLA_BYTES_RETRANS, + TCP_NLA_DSACK_DUPS, + TCP_NLA_REORD_SEEN, + TCP_NLA_SRTT, + TCP_NLA_TIMEOUT_REHASH, + TCP_NLA_BYTES_NOTSENT, +}; + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define TCPOPT_EOL 0 #define TCPOPT_NOP 1 @@ -61,7 +100,6 @@ #include #include #include -#include typedef uint32_t tcp_seq; @@ -145,6 +183,13 @@ struct tcphdr { #define TCP_CA_Recovery 3 #define TCP_CA_Loss 4 +enum tcp_fastopen_client_fail { + TFO_STATUS_UNSPEC, + TFO_COOKIE_UNAVAILABLE, + TFO_DATA_NOT_ACKED, + TFO_SYN_RETRANSMITTED, +}; + struct tcp_info { uint8_t tcpi_state; uint8_t tcpi_ca_state; @@ -153,6 +198,7 @@ struct tcp_info { uint8_t tcpi_backoff; uint8_t tcpi_options; uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4; + uint8_t tcpi_delivery_rate_app_limited : 1, tcpi_fastopen_client_fail : 2; uint32_t tcpi_rto; uint32_t tcpi_ato; uint32_t tcpi_snd_mss; @@ -187,18 +233,62 @@ struct tcp_info { uint32_t tcpi_min_rtt; uint32_t tcpi_data_segs_in; uint32_t tcpi_data_segs_out; + uint64_t tcpi_delivery_rate; + uint64_t tcpi_busy_time; + uint64_t tcpi_rwnd_limited; + uint64_t tcpi_sndbuf_limited; + uint32_t tcpi_delivered; + uint32_t tcpi_delivered_ce; + uint64_t tcpi_bytes_sent; + uint64_t tcpi_bytes_retrans; + uint32_t tcpi_dsack_dups; + uint32_t tcpi_reord_seen; + uint32_t tcpi_rcv_ooopack; + uint32_t tcpi_snd_wnd; }; #define TCP_MD5SIG_MAXKEYLEN 80 +#define TCP_MD5SIG_FLAG_PREFIX 0x1 +#define TCP_MD5SIG_FLAG_IFINDEX 0x2 + struct tcp_md5sig { struct sockaddr_storage tcpm_addr; - uint16_t __tcpm_pad1; + uint8_t tcpm_flags; + uint8_t tcpm_prefixlen; uint16_t tcpm_keylen; - uint32_t __tcpm_pad2; + int tcpm_ifindex; uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; }; +struct tcp_diag_md5sig { + uint8_t tcpm_family; + uint8_t tcpm_prefixlen; + uint16_t tcpm_keylen; + uint32_t tcpm_addr[4]; + uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; +}; + +#define TCP_REPAIR_ON 1 +#define TCP_REPAIR_OFF 0 +#define TCP_REPAIR_OFF_NO_WP -1 + +struct tcp_repair_window { + uint32_t snd_wl1; + uint32_t snd_wnd; + uint32_t max_window; + uint32_t rcv_wnd; + uint32_t rcv_wup; +}; + +struct tcp_zerocopy_receive { + uint64_t address; + uint32_t length; + uint32_t recv_skip_hint; + uint32_t inq; + int32_t err; +}; + #endif #endif diff --git a/system/lib/libc/musl/include/netinet/udp.h b/system/lib/libc/musl/include/netinet/udp.h index b1b0eb819af5d..40c3f2034d6df 100644 --- a/system/lib/libc/musl/include/netinet/udp.h +++ b/system/lib/libc/musl/include/netinet/udp.h @@ -24,10 +24,18 @@ struct udphdr { #define UDP_CORK 1 #define UDP_ENCAP 100 +#define UDP_NO_CHECK6_TX 101 +#define UDP_NO_CHECK6_RX 102 +#define UDP_SEGMENT 103 +#define UDP_GRO 104 #define UDP_ENCAP_ESPINUDP_NON_IKE 1 #define UDP_ENCAP_ESPINUDP 2 #define UDP_ENCAP_L2TPINUDP 3 +#define UDP_ENCAP_GTP0 4 +#define UDP_ENCAP_GTP1U 5 +#define UDP_ENCAP_RXRPC 6 +#define TCP_ENCAP_ESPINTCP 7 #define SOL_UDP 17 diff --git a/system/lib/libc/musl/include/netpacket/packet.h b/system/lib/libc/musl/include/netpacket/packet.h index f2210ce81678d..b36e092ad4fb6 100644 --- a/system/lib/libc/musl/include/netpacket/packet.h +++ b/system/lib/libc/musl/include/netpacket/packet.h @@ -48,6 +48,7 @@ struct packet_mreq { #define PACKET_QDISC_BYPASS 20 #define PACKET_ROLLOVER_STATS 21 #define PACKET_FANOUT_DATA 22 +#define PACKET_IGNORE_OUTGOING 23 #define PACKET_MR_MULTICAST 0 #define PACKET_MR_PROMISC 1 diff --git a/system/lib/libc/musl/include/poll.h b/system/lib/libc/musl/include/poll.h index daccc760bb26a..472e4b8470bae 100644 --- a/system/lib/libc/musl/include/poll.h +++ b/system/lib/libc/musl/include/poll.h @@ -44,6 +44,12 @@ int poll (struct pollfd *, nfds_t, int); int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); #endif +#if _REDIR_TIME64 +#ifdef _GNU_SOURCE +__REDIR(ppoll, __ppoll_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/pthread.h b/system/lib/libc/musl/include/pthread.h index 3d2e0c45d84ab..0492f26a6ba88 100644 --- a/system/lib/libc/musl/include/pthread.h +++ b/system/lib/libc/musl/include/pthread.h @@ -74,11 +74,17 @@ extern "C" { #define PTHREAD_BARRIER_SERIAL_THREAD (-1) +#define PTHREAD_NULL ((pthread_t)0) + + int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict); int pthread_detach(pthread_t); _Noreturn void pthread_exit(void *); int pthread_join(pthread_t, void **); +#ifdef __GNUC__ +__attribute__((const)) +#endif pthread_t pthread_self(void); int pthread_equal(pthread_t, pthread_t); @@ -214,10 +220,23 @@ struct cpu_set_t; int pthread_getaffinity_np(pthread_t, size_t, struct cpu_set_t *); int pthread_setaffinity_np(pthread_t, size_t, const struct cpu_set_t *); int pthread_getattr_np(pthread_t, pthread_attr_t *); +int pthread_setname_np(pthread_t, const char *); +int pthread_getattr_default_np(pthread_attr_t *); +int pthread_setattr_default_np(const pthread_attr_t *); int pthread_tryjoin_np(pthread_t, void **); int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); #endif +#if _REDIR_TIME64 +__REDIR(pthread_mutex_timedlock, __pthread_mutex_timedlock_time64); +__REDIR(pthread_cond_timedwait, __pthread_cond_timedwait_time64); +__REDIR(pthread_rwlock_timedrdlock, __pthread_rwlock_timedrdlock_time64); +__REDIR(pthread_rwlock_timedwrlock, __pthread_rwlock_timedwrlock_time64); +#ifdef _GNU_SOURCE +__REDIR(pthread_timedjoin_np, __pthread_timedjoin_np_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/pwd.h b/system/lib/libc/musl/include/pwd.h index 07a5871d722ef..4f470b558b15f 100644 --- a/system/lib/libc/musl/include/pwd.h +++ b/system/lib/libc/musl/include/pwd.h @@ -27,9 +27,11 @@ struct passwd { char *pw_shell; }; +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) void setpwent (void); void endpwent (void); struct passwd *getpwent (void); +#endif struct passwd *getpwuid (uid_t); struct passwd *getpwnam (const char *); diff --git a/system/lib/libc/musl/include/resolv.h b/system/lib/libc/musl/include/resolv.h index e12cb3c7da84e..8b23ad66cc761 100644 --- a/system/lib/libc/musl/include/resolv.h +++ b/system/lib/libc/musl/include/resolv.h @@ -61,7 +61,7 @@ typedef struct __res_state { } _u; } *res_state; -#define __RES 19991006 +#define __RES 19960801 #ifndef _PATH_RESCONF #define _PATH_RESCONF "/etc/resolv.conf" diff --git a/system/lib/libc/musl/include/sched.h b/system/lib/libc/musl/include/sched.h index af82d6c9bd27b..fda4b48460309 100644 --- a/system/lib/libc/musl/include/sched.h +++ b/system/lib/libc/musl/include/sched.h @@ -18,10 +18,16 @@ extern "C" { struct sched_param { int sched_priority; - int sched_ss_low_priority; - struct timespec sched_ss_repl_period; - struct timespec sched_ss_init_budget; - int sched_ss_max_repl; + int __reserved1; +#if _REDIR_TIME64 + long __reserved2[4]; +#else + struct { + time_t __reserved1; + long __reserved2; + } __reserved2[2]; +#endif + int __reserved3; }; int sched_get_priority_max(int); @@ -43,10 +49,12 @@ int sched_yield(void); #ifdef _GNU_SOURCE #define CSIGNAL 0x000000ff +#define CLONE_NEWTIME 0x00000080 #define CLONE_VM 0x00000100 #define CLONE_FS 0x00000200 #define CLONE_FILES 0x00000400 #define CLONE_SIGHAND 0x00000800 +#define CLONE_PIDFD 0x00001000 #define CLONE_PTRACE 0x00002000 #define CLONE_VFORK 0x00004000 #define CLONE_PARENT 0x00008000 @@ -72,6 +80,7 @@ int setns(int, int); void *memcpy(void *__restrict, const void *__restrict, size_t); int memcmp(const void *, const void *, size_t); +void *memset (void *, int, size_t); void *calloc(size_t, size_t); void free(void *); @@ -82,7 +91,7 @@ int sched_getaffinity(pid_t, size_t, cpu_set_t *); int sched_setaffinity(pid_t, size_t, const cpu_set_t *); #define __CPU_op_S(i, size, set, op) ( (i)/8U >= (size) ? 0 : \ - ((set)->__bits[(i)/8/sizeof(long)] op (1UL<<((i)%(8*sizeof(long))))) ) + (((unsigned long *)(set))[(i)/8/sizeof(long)] op (1UL<<((i)%(8*sizeof(long))))) ) #define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=) #define CPU_CLR_S(i, size, set) __CPU_op_S(i, size, set, &=~) @@ -94,8 +103,8 @@ static __inline void __CPU_##func##_S(size_t __size, cpu_set_t *__dest, \ { \ size_t __i; \ for (__i=0; __i<__size/sizeof(long); __i++) \ - __dest->__bits[__i] = __src1->__bits[__i] \ - op __src2->__bits[__i] ; \ + ((unsigned long *)__dest)[__i] = ((unsigned long *)__src1)[__i] \ + op ((unsigned long *)__src2)[__i] ; \ } __CPU_op_func_S(AND, &) @@ -129,6 +138,10 @@ __CPU_op_func_S(XOR, ^) #endif +#if _REDIR_TIME64 +__REDIR(sched_rr_get_interval, __sched_rr_get_interval_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/semaphore.h b/system/lib/libc/musl/include/semaphore.h index 277c47d6f7425..3690f49609d16 100644 --- a/system/lib/libc/musl/include/semaphore.h +++ b/system/lib/libc/musl/include/semaphore.h @@ -29,6 +29,10 @@ int sem_trywait(sem_t *); int sem_unlink(const char *); int sem_wait(sem_t *); +#if _REDIR_TIME64 +__REDIR(sem_timedwait, __sem_timedwait_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/signal.h b/system/lib/libc/musl/include/signal.h index e206f7b2c224d..52126780dabca 100644 --- a/system/lib/libc/musl/include/signal.h +++ b/system/lib/libc/musl/include/signal.h @@ -180,14 +180,24 @@ struct sigevent { union sigval sigev_value; int sigev_signo; int sigev_notify; - void (*sigev_notify_function)(union sigval); - pthread_attr_t *sigev_notify_attributes; - char __pad[56-3*sizeof(long)]; + union { + char __pad[64 - 2*sizeof(int) - sizeof(union sigval)]; + pid_t sigev_notify_thread_id; + struct { + void (*sigev_notify_function)(union sigval); + pthread_attr_t *sigev_notify_attributes; + } __sev_thread; + } __sev_fields; }; +#define sigev_notify_thread_id __sev_fields.sigev_notify_thread_id +#define sigev_notify_function __sev_fields.__sev_thread.sigev_notify_function +#define sigev_notify_attributes __sev_fields.__sev_thread.sigev_notify_attributes + #define SIGEV_SIGNAL 0 #define SIGEV_NONE 1 #define SIGEV_THREAD 2 +#define SIGEV_THREAD_ID 4 int __libc_current_sigrtmin(void); int __libc_current_sigrtmax(void); @@ -210,7 +220,7 @@ int sigpending(sigset_t *); int sigwait(const sigset_t *__restrict, int *__restrict); int sigwaitinfo(const sigset_t *__restrict, siginfo_t *__restrict); int sigtimedwait(const sigset_t *__restrict, siginfo_t *__restrict, const struct timespec *__restrict); -int sigqueue(pid_t, int, const union sigval); +int sigqueue(pid_t, int, union sigval); int pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict); int pthread_kill(pthread_t, int); @@ -231,6 +241,9 @@ int sigrelse(int); void (*sigset(int, void (*)(int)))(int); #define TRAP_BRKPT 1 #define TRAP_TRACE 2 +#define TRAP_BRANCH 3 +#define TRAP_HWBKPT 4 +#define TRAP_UNK 5 #define POLL_IN 1 #define POLL_OUT 2 #define POLL_MSG 3 @@ -239,6 +252,8 @@ void (*sigset(int, void (*)(int)))(int); #define POLL_HUP 6 #define SS_ONSTACK 1 #define SS_DISABLE 2 +#define SS_AUTODISARM (1U << 31) +#define SS_FLAG_BITS SS_AUTODISARM #endif #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) @@ -266,6 +281,14 @@ typedef int sig_atomic_t; void (*signal(int, void (*)(int)))(int); int raise(int); +#if _REDIR_TIME64 +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ + || defined(_BSD_SOURCE) +__REDIR(sigtimedwait, __sigtimedwait_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/spawn.h b/system/lib/libc/musl/include/spawn.h index 29c799ee91c62..8eb73e003a65e 100644 --- a/system/lib/libc/musl/include/spawn.h +++ b/system/lib/libc/musl/include/spawn.h @@ -21,12 +21,16 @@ struct sched_param; #define POSIX_SPAWN_SETSIGMASK 8 #define POSIX_SPAWN_SETSCHEDPARAM 16 #define POSIX_SPAWN_SETSCHEDULER 32 +#define POSIX_SPAWN_USEVFORK 64 +#define POSIX_SPAWN_SETSID 128 typedef struct { int __flags; pid_t __pgrp; sigset_t __def, __mask; - int __prio, __pol, __pad[16]; + int __prio, __pol; + void *__fn; + char __pad[64-sizeof(void *)]; } posix_spawnattr_t; typedef struct { @@ -67,6 +71,11 @@ int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t *__restrict, int int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int); int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int); +#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) +int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t *__restrict, const char *__restrict); +int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *, int); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/stdarg.h b/system/lib/libc/musl/include/stdarg.h index 60d4e2af172fa..3256f80500191 100644 --- a/system/lib/libc/musl/include/stdarg.h +++ b/system/lib/libc/musl/include/stdarg.h @@ -9,14 +9,10 @@ extern "C" { #include -#if __GNUC__ >= 3 #define va_start(v,l) __builtin_va_start(v,l) #define va_end(v) __builtin_va_end(v) #define va_arg(v,l) __builtin_va_arg(v,l) #define va_copy(d,s) __builtin_va_copy(d,s) -#else -#include -#endif #ifdef __cplusplus } diff --git a/system/lib/libc/musl/include/stdio.h b/system/lib/libc/musl/include/stdio.h index e24168ac4d5d2..f155404f1a083 100644 --- a/system/lib/libc/musl/include/stdio.h +++ b/system/lib/libc/musl/include/stdio.h @@ -15,6 +15,10 @@ extern "C" { #define __NEED___isoc_va_list #define __NEED_size_t +#if __STDC_VERSION__ < 201112L +#define __NEED_struct__IO_FILE +#endif + #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ || defined(_BSD_SOURCE) @@ -59,6 +63,7 @@ extern "C" { typedef union _G_fpos64_t { char __opaque[16]; + long long __lldata; double __align; } fpos_t; @@ -192,6 +197,20 @@ int vasprintf(char **, const char *, __isoc_va_list); #ifdef _GNU_SOURCE char *fgets_unlocked(char *, int, FILE *); int fputs_unlocked(const char *, FILE *); + +typedef ssize_t (cookie_read_function_t)(void *, char *, size_t); +typedef ssize_t (cookie_write_function_t)(void *, const char *, size_t); +typedef int (cookie_seek_function_t)(void *, off_t *, int); +typedef int (cookie_close_function_t)(void *); + +typedef struct _IO_cookie_io_functions_t { + cookie_read_function_t *read; + cookie_write_function_t *write; + cookie_seek_function_t *seek; + cookie_close_function_t *close; +} cookie_io_functions_t; + +FILE *fopencookie(void *, const char *, cookie_io_functions_t); #endif #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) diff --git a/system/lib/libc/musl/include/stdlib.h b/system/lib/libc/musl/include/stdlib.h index d2c911fcd7a3f..b54a051fe9fd9 100644 --- a/system/lib/libc/musl/include/stdlib.h +++ b/system/lib/libc/musl/include/stdlib.h @@ -39,7 +39,7 @@ void *malloc (size_t); void *calloc (size_t, size_t); void *realloc (void *, size_t); void free (void *); -void *aligned_alloc(size_t alignment, size_t size); +void *aligned_alloc(size_t, size_t); _Noreturn void abort (void); int atexit (void (*) (void)); @@ -145,6 +145,7 @@ int getloadavg(double *, int); int clearenv(void); #define WCOREDUMP(s) ((s) & 0x80) #define WIFCONTINUED(s) ((s) == 0xffff) +void *reallocarray (void *, size_t, size_t); #endif #ifdef _GNU_SOURCE @@ -152,6 +153,7 @@ int ptsname_r(int, char *, size_t); char *ecvt(double, int, int *, int *); char *fcvt(double, int, int *, int *); char *gcvt(double, int, char *); +char *secure_getenv(const char *); struct __locale_struct; float strtof_l(const char *__restrict, char **__restrict, struct __locale_struct *); double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); diff --git a/system/lib/libc/musl/include/string.h b/system/lib/libc/musl/include/string.h index ff9badb9c307f..795a2abcd990a 100644 --- a/system/lib/libc/musl/include/string.h +++ b/system/lib/libc/musl/include/string.h @@ -82,13 +82,12 @@ void *memccpy (void *__restrict, const void *__restrict, int, size_t); char *strsep(char **, const char *); size_t strlcat (char *, const char *, size_t); size_t strlcpy (char *, const char *, size_t); +void explicit_bzero (void *, size_t); #endif #ifdef _GNU_SOURCE #define strdupa(x) strcpy(alloca(strlen(x)+1),x) int strverscmp (const char *, const char *); -int strcasecmp_l (const char *, const char *, locale_t); -int strncasecmp_l (const char *, const char *, size_t, locale_t); char *strchrnul(const char *, int); char *strcasestr(const char *, const char *); void *memmem(const void *, size_t, const void *, size_t); diff --git a/system/lib/libc/musl/include/sys/acct.h b/system/lib/libc/musl/include/sys/acct.h index 9b0ba36fbe93a..fae9d0508f9c8 100644 --- a/system/lib/libc/musl/include/sys/acct.h +++ b/system/lib/libc/musl/include/sys/acct.h @@ -6,7 +6,6 @@ extern "C" { #endif #include -#include #include #include diff --git a/system/lib/libc/musl/include/sys/auxv.h b/system/lib/libc/musl/include/sys/auxv.h index 6dcf9adc2c4e8..ddccf57ff6f38 100644 --- a/system/lib/libc/musl/include/sys/auxv.h +++ b/system/lib/libc/musl/include/sys/auxv.h @@ -6,6 +6,7 @@ extern "C" { #endif #include +#include unsigned long getauxval(unsigned long); diff --git a/system/lib/libc/musl/include/sys/epoll.h b/system/lib/libc/musl/include/sys/epoll.h index ffe2311f97d3a..ac81a8418a0cc 100644 --- a/system/lib/libc/musl/include/sys/epoll.h +++ b/system/lib/libc/musl/include/sys/epoll.h @@ -21,6 +21,7 @@ enum EPOLL_EVENTS { __EPOLL_DUMMY }; #define EPOLLPRI 0x002 #define EPOLLOUT 0x004 #define EPOLLRDNORM 0x040 +#define EPOLLNVAL 0x020 #define EPOLLRDBAND 0x080 #define EPOLLWRNORM 0x100 #define EPOLLWRBAND 0x200 diff --git a/system/lib/libc/musl/include/sys/fanotify.h b/system/lib/libc/musl/include/sys/fanotify.h index daab76b13ba7f..10e5f15e24b1d 100644 --- a/system/lib/libc/musl/include/sys/fanotify.h +++ b/system/lib/libc/musl/include/sys/fanotify.h @@ -5,6 +5,8 @@ extern "C" { #endif +#include + struct fanotify_event_metadata { unsigned event_len; unsigned char vers; @@ -19,6 +21,18 @@ struct fanotify_event_metadata { int pid; }; +struct fanotify_event_info_header { + unsigned char info_type; + unsigned char pad; + unsigned short len; +}; + +struct fanotify_event_info_fid { + struct fanotify_event_info_header hdr; + fsid_t fsid; + unsigned char handle[]; +}; + struct fanotify_response { int fd; unsigned response; @@ -26,15 +40,26 @@ struct fanotify_response { #define FAN_ACCESS 0x01 #define FAN_MODIFY 0x02 +#define FAN_ATTRIB 0x04 #define FAN_CLOSE_WRITE 0x08 #define FAN_CLOSE_NOWRITE 0x10 #define FAN_OPEN 0x20 +#define FAN_MOVED_FROM 0x40 +#define FAN_MOVED_TO 0x80 +#define FAN_CREATE 0x100 +#define FAN_DELETE 0x200 +#define FAN_DELETE_SELF 0x400 +#define FAN_MOVE_SELF 0x800 +#define FAN_OPEN_EXEC 0x1000 #define FAN_Q_OVERFLOW 0x4000 #define FAN_OPEN_PERM 0x10000 #define FAN_ACCESS_PERM 0x20000 -#define FAN_ONDIR 0x40000000 +#define FAN_OPEN_EXEC_PERM 0x40000 +#define FAN_DIR_MODIFY 0x00080000 #define FAN_EVENT_ON_CHILD 0x08000000 +#define FAN_ONDIR 0x40000000 #define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) +#define FAN_MOVE (FAN_MOVED_FROM | FAN_MOVED_TO) #define FAN_CLOEXEC 0x01 #define FAN_NONBLOCK 0x02 #define FAN_CLASS_NOTIF 0 @@ -43,22 +68,35 @@ struct fanotify_response { #define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT) #define FAN_UNLIMITED_QUEUE 0x10 #define FAN_UNLIMITED_MARKS 0x20 +#define FAN_ENABLE_AUDIT 0x40 +#define FAN_REPORT_TID 0x100 +#define FAN_REPORT_FID 0x200 +#define FAN_REPORT_DIR_FID 0x00000400 +#define FAN_REPORT_NAME 0x00000800 +#define FAN_REPORT_DFID_NAME (FAN_REPORT_DIR_FID | FAN_REPORT_NAME) #define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS) #define FAN_MARK_ADD 0x01 #define FAN_MARK_REMOVE 0x02 #define FAN_MARK_DONT_FOLLOW 0x04 #define FAN_MARK_ONLYDIR 0x08 -#define FAN_MARK_MOUNT 0x10 #define FAN_MARK_IGNORED_MASK 0x20 #define FAN_MARK_IGNORED_SURV_MODIFY 0x40 #define FAN_MARK_FLUSH 0x80 +#define FAN_MARK_INODE 0x00 +#define FAN_MARK_MOUNT 0x10 +#define FAN_MARK_FILESYSTEM 0x100 +#define FAN_MARK_TYPE_MASK (FAN_MARK_INODE | FAN_MARK_MOUNT | FAN_MARK_FILESYSTEM) #define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_DONT_FOLLOW | FAN_MARK_ONLYDIR | FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY | FAN_MARK_FLUSH) #define FAN_ALL_EVENTS (FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN) #define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM) #define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS | FAN_ALL_PERM_EVENTS | FAN_Q_OVERFLOW) #define FANOTIFY_METADATA_VERSION 3 +#define FAN_EVENT_INFO_TYPE_FID 1 +#define FAN_EVENT_INFO_TYPE_DFID_NAME 2 +#define FAN_EVENT_INFO_TYPE_DFID 3 #define FAN_ALLOW 0x01 #define FAN_DENY 0x02 +#define FAN_AUDIT 0x10 #define FAN_NOFD -1 #define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata)) #define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, (struct fanotify_event_metadata*)(((char *)(meta)) + (meta)->event_len)) diff --git a/system/lib/libc/musl/include/sys/inotify.h b/system/lib/libc/musl/include/sys/inotify.h index 46638cac9d4b4..69b5863199228 100644 --- a/system/lib/libc/musl/include/sys/inotify.h +++ b/system/lib/libc/musl/include/sys/inotify.h @@ -40,6 +40,7 @@ struct inotify_event { #define IN_ONLYDIR 0x01000000 #define IN_DONT_FOLLOW 0x02000000 #define IN_EXCL_UNLINK 0x04000000 +#define IN_MASK_CREATE 0x10000000 #define IN_MASK_ADD 0x20000000 #define IN_ISDIR 0x40000000 diff --git a/system/lib/libc/musl/include/sys/ioctl.h b/system/lib/libc/musl/include/sys/ioctl.h index d0415b3da2ecc..a9a2346ee753a 100644 --- a/system/lib/libc/musl/include/sys/ioctl.h +++ b/system/lib/libc/musl/include/sys/ioctl.h @@ -4,8 +4,114 @@ extern "C" { #endif +#define __NEED_struct_winsize + +#include #include +#define N_TTY 0 +#define N_SLIP 1 +#define N_MOUSE 2 +#define N_PPP 3 +#define N_STRIP 4 +#define N_AX25 5 +#define N_X25 6 +#define N_6PACK 7 +#define N_MASC 8 +#define N_R3964 9 +#define N_PROFIBUS_FDL 10 +#define N_IRDA 11 +#define N_SMSBLOCK 12 +#define N_HDLC 13 +#define N_SYNC_PPP 14 +#define N_HCI 15 +#define N_GIGASET_M101 16 +#define N_SLCAN 17 +#define N_PPS 18 +#define N_V253 19 +#define N_CAIF 20 +#define N_GSM0710 21 +#define N_TI_WL 22 +#define N_TRACESINK 23 +#define N_TRACEROUTER 24 +#define N_NCI 25 +#define N_SPEAKUP 26 +#define N_NULL 27 + +#define TIOCPKT_DATA 0 +#define TIOCPKT_FLUSHREAD 1 +#define TIOCPKT_FLUSHWRITE 2 +#define TIOCPKT_STOP 4 +#define TIOCPKT_START 8 +#define TIOCPKT_NOSTOP 16 +#define TIOCPKT_DOSTOP 32 +#define TIOCPKT_IOCTL 64 + +#define TIOCSER_TEMT 1 + +#define SIOCADDRT 0x890B +#define SIOCDELRT 0x890C +#define SIOCRTMSG 0x890D + +#define SIOCGIFNAME 0x8910 +#define SIOCSIFLINK 0x8911 +#define SIOCGIFCONF 0x8912 +#define SIOCGIFFLAGS 0x8913 +#define SIOCSIFFLAGS 0x8914 +#define SIOCGIFADDR 0x8915 +#define SIOCSIFADDR 0x8916 +#define SIOCGIFDSTADDR 0x8917 +#define SIOCSIFDSTADDR 0x8918 +#define SIOCGIFBRDADDR 0x8919 +#define SIOCSIFBRDADDR 0x891a +#define SIOCGIFNETMASK 0x891b +#define SIOCSIFNETMASK 0x891c +#define SIOCGIFMETRIC 0x891d +#define SIOCSIFMETRIC 0x891e +#define SIOCGIFMEM 0x891f +#define SIOCSIFMEM 0x8920 +#define SIOCGIFMTU 0x8921 +#define SIOCSIFMTU 0x8922 +#define SIOCSIFNAME 0x8923 +#define SIOCSIFHWADDR 0x8924 +#define SIOCGIFENCAP 0x8925 +#define SIOCSIFENCAP 0x8926 +#define SIOCGIFHWADDR 0x8927 +#define SIOCGIFSLAVE 0x8929 +#define SIOCSIFSLAVE 0x8930 +#define SIOCADDMULTI 0x8931 +#define SIOCDELMULTI 0x8932 +#define SIOCGIFINDEX 0x8933 +#define SIOGIFINDEX SIOCGIFINDEX +#define SIOCSIFPFLAGS 0x8934 +#define SIOCGIFPFLAGS 0x8935 +#define SIOCDIFADDR 0x8936 +#define SIOCSIFHWBROADCAST 0x8937 +#define SIOCGIFCOUNT 0x8938 + +#define SIOCGIFBR 0x8940 +#define SIOCSIFBR 0x8941 + +#define SIOCGIFTXQLEN 0x8942 +#define SIOCSIFTXQLEN 0x8943 + +#define SIOCDARP 0x8953 +#define SIOCGARP 0x8954 +#define SIOCSARP 0x8955 + +#define SIOCDRARP 0x8960 +#define SIOCGRARP 0x8961 +#define SIOCSRARP 0x8962 + +#define SIOCGIFMAP 0x8970 +#define SIOCSIFMAP 0x8971 + +#define SIOCADDDLCI 0x8980 +#define SIOCDELDLCI 0x8981 + +#define SIOCDEVPRIVATE 0x89F0 +#define SIOCPROTOPRIVATE 0x89E0 + int ioctl (int, int, ...); #ifdef __cplusplus diff --git a/system/lib/libc/musl/include/sys/ipc.h b/system/lib/libc/musl/include/sys/ipc.h index c5a39819c5e70..9e366b7bed049 100644 --- a/system/lib/libc/musl/include/sys/ipc.h +++ b/system/lib/libc/musl/include/sys/ipc.h @@ -22,6 +22,7 @@ extern "C" { #endif #include +#include #define IPC_CREAT 01000 #define IPC_EXCL 02000 @@ -29,7 +30,6 @@ extern "C" { #define IPC_RMID 0 #define IPC_SET 1 -#define IPC_STAT 2 #define IPC_INFO 3 #define IPC_PRIVATE ((key_t) 0) diff --git a/system/lib/libc/musl/include/sys/kd.h b/system/lib/libc/musl/include/sys/kd.h index 793fd59fe38ed..42122b9c3a4c4 100644 --- a/system/lib/libc/musl/include/sys/kd.h +++ b/system/lib/libc/musl/include/sys/kd.h @@ -1,8 +1 @@ -#ifndef _SYS_KD_H -#define _SYS_KD_H - -#define _LINUX_TYPES_H -#include -#undef _LINUX_TYPES_H - -#endif +#include diff --git a/system/lib/libc/musl/include/sys/membarrier.h b/system/lib/libc/musl/include/sys/membarrier.h new file mode 100644 index 0000000000000..10cb31083c0b2 --- /dev/null +++ b/system/lib/libc/musl/include/sys/membarrier.h @@ -0,0 +1,17 @@ +#ifndef _SYS_MEMBARRIER_H +#define _SYS_MEMBARRIER_H + +#define MEMBARRIER_CMD_QUERY 0 +#define MEMBARRIER_CMD_GLOBAL 1 +#define MEMBARRIER_CMD_GLOBAL_EXPEDITED 2 +#define MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED 4 +#define MEMBARRIER_CMD_PRIVATE_EXPEDITED 8 +#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16 +#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE 32 +#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE 64 + +#define MEMBARRIER_CMD_SHARED MEMBARRIER_CMD_GLOBAL + +int membarrier(int, int); + +#endif diff --git a/system/lib/libc/musl/include/sys/mman.h b/system/lib/libc/musl/include/sys/mman.h index 8a5149c980b37..4d603e91046a8 100644 --- a/system/lib/libc/musl/include/sys/mman.h +++ b/system/lib/libc/musl/include/sys/mman.h @@ -20,6 +20,7 @@ extern "C" { #define MAP_SHARED 0x01 #define MAP_PRIVATE 0x02 +#define MAP_SHARED_VALIDATE 0x03 #define MAP_TYPE 0x0f #define MAP_FIXED 0x10 #define MAP_ANON 0x20 @@ -33,8 +34,25 @@ extern "C" { #define MAP_NONBLOCK 0x10000 #define MAP_STACK 0x20000 #define MAP_HUGETLB 0x40000 +#define MAP_SYNC 0x80000 +#define MAP_FIXED_NOREPLACE 0x100000 #define MAP_FILE 0 +#define MAP_HUGE_SHIFT 26 +#define MAP_HUGE_MASK 0x3f +#define MAP_HUGE_64KB (16 << 26) +#define MAP_HUGE_512KB (19 << 26) +#define MAP_HUGE_1MB (20 << 26) +#define MAP_HUGE_2MB (21 << 26) +#define MAP_HUGE_8MB (23 << 26) +#define MAP_HUGE_16MB (24 << 26) +#define MAP_HUGE_32MB (25 << 26) +#define MAP_HUGE_256MB (28 << 26) +#define MAP_HUGE_512MB (29 << 26) +#define MAP_HUGE_1GB (30 << 26) +#define MAP_HUGE_2GB (31 << 26) +#define MAP_HUGE_16GB (34U << 26) + #define PROT_NONE 0 #define PROT_READ 1 #define PROT_WRITE 2 @@ -72,10 +90,26 @@ extern "C" { #define MADV_NOHUGEPAGE 15 #define MADV_DONTDUMP 16 #define MADV_DODUMP 17 +#define MADV_WIPEONFORK 18 +#define MADV_KEEPONFORK 19 +#define MADV_COLD 20 +#define MADV_PAGEOUT 21 #define MADV_HWPOISON 100 #define MADV_SOFT_OFFLINE 101 #endif +#ifdef _GNU_SOURCE +#define MREMAP_MAYMOVE 1 +#define MREMAP_FIXED 2 +#define MREMAP_DONTUNMAP 4 + +#define MLOCK_ONFAULT 0x01 + +#define MFD_CLOEXEC 0x0001U +#define MFD_ALLOW_SEALING 0x0002U +#define MFD_HUGETLB 0x0004U +#endif + #include void *mmap (void *, size_t, int, int, int, off_t); @@ -92,14 +126,13 @@ int mlockall (int); int munlockall (void); #ifdef _GNU_SOURCE -#define MREMAP_MAYMOVE 1 -#define MREMAP_FIXED 2 void *mremap (void *, size_t, size_t, int, ...); int remap_file_pages (void *, size_t, int, size_t, int); +int memfd_create (const char *, unsigned); +int mlock2 (const void *, size_t, unsigned); #endif #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -#define MLOCK_ONFAULT 0x01 int madvise (void *, size_t, int); int mincore (void *, size_t, unsigned char *); #endif diff --git a/system/lib/libc/musl/include/sys/mount.h b/system/lib/libc/musl/include/sys/mount.h index 6674e657754ea..57a89c09ecb1f 100644 --- a/system/lib/libc/musl/include/sys/mount.h +++ b/system/lib/libc/musl/include/sys/mount.h @@ -47,6 +47,7 @@ extern "C" { #define MS_I_VERSION (1<<23) #define MS_STRICTATIME (1<<24) #define MS_LAZYTIME (1<<25) +#define MS_NOREMOTELOCK (1<<27) #define MS_NOSEC (1<<28) #define MS_BORN (1<<29) #define MS_ACTIVE (1<<30) diff --git a/system/lib/libc/musl/include/sys/msg.h b/system/lib/libc/musl/include/sys/msg.h index 139f22b7008fa..db5c62a42f593 100644 --- a/system/lib/libc/musl/include/sys/msg.h +++ b/system/lib/libc/musl/include/sys/msg.h @@ -25,8 +25,9 @@ typedef unsigned long msglen_t; #define MSG_NOERROR 010000 #define MSG_EXCEPT 020000 -#define MSG_STAT 11 +#define MSG_STAT (11 | (IPC_STAT & 0x100)) #define MSG_INFO 12 +#define MSG_STAT_ANY (13 | (IPC_STAT & 0x100)) struct msginfo { int msgpool, msgmap, msgmax, msgmnb, msgmni, msgssz, msgtql; diff --git a/system/lib/libc/musl/include/sys/param.h b/system/lib/libc/musl/include/sys/param.h index 344c0d234ba55..ce6b801980c10 100644 --- a/system/lib/libc/musl/include/sys/param.h +++ b/system/lib/libc/musl/include/sys/param.h @@ -7,7 +7,7 @@ #define MAXPATHLEN 4096 #define NBBY 8 #define NGROUPS 32 -#define CANBSIZE 255 +#define CANBSIZ 255 #define NOFILE 256 #define NCARGS 131072 #define DEV_BSIZE 512 diff --git a/system/lib/libc/musl/include/sys/personality.h b/system/lib/libc/musl/include/sys/personality.h index 31d43dfe13ea4..411dc47563928 100644 --- a/system/lib/libc/musl/include/sys/personality.h +++ b/system/lib/libc/musl/include/sys/personality.h @@ -5,7 +5,9 @@ extern "C" { #endif +#define UNAME26 0x0020000 #define ADDR_NO_RANDOMIZE 0x0040000 +#define FDPIC_FUNCPTRS 0x0080000 #define MMAP_PAGE_ZERO 0x0100000 #define ADDR_COMPAT_LAYOUT 0x0200000 #define READ_IMPLIES_EXEC 0x0400000 @@ -17,6 +19,7 @@ extern "C" { #define PER_LINUX 0 #define PER_LINUX_32BIT ADDR_LIMIT_32BIT +#define PER_LINUX_FDPIC FDPIC_FUNCPTRS #define PER_SVR4 (1 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO) #define PER_SVR3 (2 | STICKY_TIMEOUTS | SHORT_INODE) #define PER_SCOSVR3 (3 | STICKY_TIMEOUTS | WHOLE_SECONDS | SHORT_INODE) diff --git a/system/lib/libc/musl/include/sys/prctl.h b/system/lib/libc/musl/include/sys/prctl.h index 24f4f8bdfb74c..4b9fcc050802c 100644 --- a/system/lib/libc/musl/include/sys/prctl.h +++ b/system/lib/libc/musl/include/sys/prctl.h @@ -130,6 +130,37 @@ struct prctl_mm_map { #define PR_CAP_AMBIENT_LOWER 3 #define PR_CAP_AMBIENT_CLEAR_ALL 4 +#define PR_SVE_SET_VL 50 +#define PR_SVE_SET_VL_ONEXEC (1 << 18) +#define PR_SVE_GET_VL 51 +#define PR_SVE_VL_LEN_MASK 0xffff +#define PR_SVE_VL_INHERIT (1 << 17) + +#define PR_GET_SPECULATION_CTRL 52 +#define PR_SET_SPECULATION_CTRL 53 +#define PR_SPEC_STORE_BYPASS 0 +#define PR_SPEC_INDIRECT_BRANCH 1 +#define PR_SPEC_NOT_AFFECTED 0 +#define PR_SPEC_PRCTL (1UL << 0) +#define PR_SPEC_ENABLE (1UL << 1) +#define PR_SPEC_DISABLE (1UL << 2) +#define PR_SPEC_FORCE_DISABLE (1UL << 3) +#define PR_SPEC_DISABLE_NOEXEC (1UL << 4) + +#define PR_PAC_RESET_KEYS 54 +#define PR_PAC_APIAKEY (1UL << 0) +#define PR_PAC_APIBKEY (1UL << 1) +#define PR_PAC_APDAKEY (1UL << 2) +#define PR_PAC_APDBKEY (1UL << 3) +#define PR_PAC_APGAKEY (1UL << 4) + +#define PR_SET_TAGGED_ADDR_CTRL 55 +#define PR_GET_TAGGED_ADDR_CTRL 56 +#define PR_TAGGED_ADDR_ENABLE (1UL << 0) + +#define PR_SET_IO_FLUSHER 57 +#define PR_GET_IO_FLUSHER 58 + int prctl (int, ...); #ifdef __cplusplus diff --git a/system/lib/libc/musl/include/sys/procfs.h b/system/lib/libc/musl/include/sys/procfs.h index e23bf1ad6b9f6..38e58c168b416 100644 --- a/system/lib/libc/musl/include/sys/procfs.h +++ b/system/lib/libc/musl/include/sys/procfs.h @@ -23,10 +23,9 @@ struct elf_prstatus { pid_t pr_ppid; pid_t pr_pgrp; pid_t pr_sid; - struct timeval pr_utime; - struct timeval pr_stime; - struct timeval pr_cutime; - struct timeval pr_cstime; + struct { + long tv_sec, tv_usec; + } pr_utime, pr_stime, pr_cutime, pr_cstime; elf_gregset_t pr_reg; int pr_fpvalid; }; diff --git a/system/lib/libc/musl/include/sys/ptrace.h b/system/lib/libc/musl/include/sys/ptrace.h index d9d4540874425..5d62a9859aac6 100644 --- a/system/lib/libc/musl/include/sys/ptrace.h +++ b/system/lib/libc/musl/include/sys/ptrace.h @@ -40,6 +40,8 @@ extern "C" { #define PTRACE_GETSIGMASK 0x420a #define PTRACE_SETSIGMASK 0x420b #define PTRACE_SECCOMP_GET_FILTER 0x420c +#define PTRACE_SECCOMP_GET_METADATA 0x420d +#define PTRACE_GET_SYSCALL_INFO 0x420e #define PT_READ_I PTRACE_PEEKTEXT #define PT_READ_D PTRACE_PEEKDATA @@ -83,15 +85,51 @@ extern "C" { #define PTRACE_EVENT_VFORK_DONE 5 #define PTRACE_EVENT_EXIT 6 #define PTRACE_EVENT_SECCOMP 7 +#define PTRACE_EVENT_STOP 128 #define PTRACE_PEEKSIGINFO_SHARED 1 -struct ptrace_peeksiginfo_args { +#define PTRACE_SYSCALL_INFO_NONE 0 +#define PTRACE_SYSCALL_INFO_ENTRY 1 +#define PTRACE_SYSCALL_INFO_EXIT 2 +#define PTRACE_SYSCALL_INFO_SECCOMP 3 + +#include + +struct __ptrace_peeksiginfo_args { uint64_t off; uint32_t flags; int32_t nr; }; +struct __ptrace_seccomp_metadata { + uint64_t filter_off; + uint64_t flags; +}; + +struct __ptrace_syscall_info { + uint8_t op; + uint8_t __pad[3]; + uint32_t arch; + uint64_t instruction_pointer; + uint64_t stack_pointer; + union { + struct { + uint64_t nr; + uint64_t args[6]; + } entry; + struct { + int64_t rval; + uint8_t is_error; + } exit; + struct { + uint64_t nr; + uint64_t args[6]; + uint32_t ret_data; + } seccomp; + }; +}; + long ptrace(int, ...); #ifdef __cplusplus diff --git a/system/lib/libc/musl/include/sys/random.h b/system/lib/libc/musl/include/sys/random.h new file mode 100644 index 0000000000000..59e40ab897f64 --- /dev/null +++ b/system/lib/libc/musl/include/sys/random.h @@ -0,0 +1,20 @@ +#ifndef _SYS_RANDOM_H +#define _SYS_RANDOM_H +#ifdef __cplusplus +extern "C" { +#endif + +#define __NEED_size_t +#define __NEED_ssize_t +#include + +#define GRND_NONBLOCK 0x0001 +#define GRND_RANDOM 0x0002 +#define GRND_INSECURE 0x0004 + +ssize_t getrandom(void *, size_t, unsigned); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/system/lib/libc/musl/include/sys/resource.h b/system/lib/libc/musl/include/sys/resource.h index 70d793d563f58..3068328d09612 100644 --- a/system/lib/libc/musl/include/sys/resource.h +++ b/system/lib/libc/musl/include/sys/resource.h @@ -90,7 +90,8 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *); #define RLIMIT_MSGQUEUE 12 #define RLIMIT_NICE 13 #define RLIMIT_RTPRIO 14 -#define RLIMIT_NLIMITS 15 +#define RLIMIT_RTTIME 15 +#define RLIMIT_NLIMITS 16 #define RLIM_NLIMITS RLIMIT_NLIMITS @@ -104,6 +105,10 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *); #define rlim64_t rlim_t #endif +#if _REDIR_TIME64 +__REDIR(getrusage, __getrusage_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/select.h b/system/lib/libc/musl/include/sys/select.h index d34cbf10d9cc9..b3bab1d57b492 100644 --- a/system/lib/libc/musl/include/sys/select.h +++ b/system/lib/libc/musl/include/sys/select.h @@ -35,6 +35,11 @@ int pselect (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, co #define NFDBITS (8*(int)sizeof(long)) #endif +#if _REDIR_TIME64 +__REDIR(select, __select_time64); +__REDIR(pselect, __pselect_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/sem.h b/system/lib/libc/musl/include/sys/sem.h index e7c369803ade8..a747784ede9e0 100644 --- a/system/lib/libc/musl/include/sys/sem.h +++ b/system/lib/libc/musl/include/sys/sem.h @@ -25,14 +25,13 @@ extern "C" { #define SETVAL 16 #define SETALL 17 -#include - #include #define _SEM_SEMUN_UNDEFINED 1 -#define SEM_STAT 18 +#define SEM_STAT (18 | (IPC_STAT & 0x100)) #define SEM_INFO 19 +#define SEM_STAT_ANY (20 | (IPC_STAT & 0x100)) struct seminfo { int semmap; @@ -61,6 +60,12 @@ int semop(int, struct sembuf *, size_t); int semtimedop(int, struct sembuf *, size_t, const struct timespec *); #endif +#if _REDIR_TIME64 +#ifdef _GNU_SOURCE +__REDIR(semtimedop, __semtimedop_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/shm.h b/system/lib/libc/musl/include/sys/shm.h index 67be822bc3baa..fd708cab1eb8c 100644 --- a/system/lib/libc/musl/include/sys/shm.h +++ b/system/lib/libc/musl/include/sys/shm.h @@ -33,13 +33,29 @@ extern "C" { #define SHM_LOCK 11 #define SHM_UNLOCK 12 -#define SHM_STAT 13 +#define SHM_STAT (13 | (IPC_STAT & 0x100)) #define SHM_INFO 14 +#define SHM_STAT_ANY (15 | (IPC_STAT & 0x100)) #define SHM_DEST 01000 #define SHM_LOCKED 02000 #define SHM_HUGETLB 04000 #define SHM_NORESERVE 010000 +#define SHM_HUGE_SHIFT 26 +#define SHM_HUGE_MASK 0x3f +#define SHM_HUGE_64KB (16 << 26) +#define SHM_HUGE_512KB (19 << 26) +#define SHM_HUGE_1MB (20 << 26) +#define SHM_HUGE_2MB (21 << 26) +#define SHM_HUGE_8MB (23 << 26) +#define SHM_HUGE_16MB (24 << 26) +#define SHM_HUGE_32MB (25 << 26) +#define SHM_HUGE_256MB (28 << 26) +#define SHM_HUGE_512MB (29 << 26) +#define SHM_HUGE_1GB (30 << 26) +#define SHM_HUGE_2GB (31 << 26) +#define SHM_HUGE_16GB (34U << 26) + typedef unsigned long shmatt_t; void *shmat(int, const void *, int); diff --git a/system/lib/libc/musl/include/sys/signalfd.h b/system/lib/libc/musl/include/sys/signalfd.h index 55431b91673c0..e881e2cfddcc7 100644 --- a/system/lib/libc/musl/include/sys/signalfd.h +++ b/system/lib/libc/musl/include/sys/signalfd.h @@ -35,7 +35,11 @@ struct signalfd_siginfo { uint64_t ssi_stime; uint64_t ssi_addr; uint16_t ssi_addr_lsb; - uint8_t pad[128-12*4-4*8-2]; + uint16_t __pad2; + int32_t ssi_syscall; + uint64_t ssi_call_addr; + uint32_t ssi_arch; + uint8_t __pad[128-14*4-5*8-2*2]; }; #ifdef __cplusplus diff --git a/system/lib/libc/musl/include/sys/socket.h b/system/lib/libc/musl/include/sys/socket.h index 59ab1e2ff9518..38f5bb17b3b8d 100644 --- a/system/lib/libc/musl/include/sys/socket.h +++ b/system/lib/libc/musl/include/sys/socket.h @@ -19,6 +19,40 @@ extern "C" { #include +struct msghdr { + void *msg_name; + socklen_t msg_namelen; + struct iovec *msg_iov; +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN + int __pad1; +#endif + int msg_iovlen; +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN + int __pad1; +#endif + void *msg_control; +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN + int __pad2; +#endif + socklen_t msg_controllen; +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN + int __pad2; +#endif + int msg_flags; +}; + +struct cmsghdr { +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN + int __pad1; +#endif + socklen_t cmsg_len; +#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN + int __pad1; +#endif + int cmsg_level; + int cmsg_type; +}; + #ifdef _GNU_SOURCE struct ucred { pid_t pid; @@ -107,7 +141,10 @@ struct linger { #define PF_NFC 39 #define PF_VSOCK 40 #define PF_KCM 41 -#define PF_MAX 42 +#define PF_QIPCRTR 42 +#define PF_SMC 43 +#define PF_XDP 44 +#define PF_MAX 45 #define AF_UNSPEC PF_UNSPEC #define AF_LOCAL PF_LOCAL @@ -154,6 +191,9 @@ struct linger { #define AF_NFC PF_NFC #define AF_VSOCK PF_VSOCK #define AF_KCM PF_KCM +#define AF_QIPCRTR PF_QIPCRTR +#define AF_SMC PF_SMC +#define AF_XDP PF_XDP #define AF_MAX PF_MAX #ifndef SO_DEBUG @@ -176,15 +216,36 @@ struct linger { #define SO_PEERCRED 17 #define SO_RCVLOWAT 18 #define SO_SNDLOWAT 19 -#define SO_RCVTIMEO 20 -#define SO_SNDTIMEO 21 #define SO_ACCEPTCONN 30 +#define SO_PEERSEC 31 #define SO_SNDBUFFORCE 32 #define SO_RCVBUFFORCE 33 #define SO_PROTOCOL 38 #define SO_DOMAIN 39 #endif +#ifndef SO_RCVTIMEO +#if __LONG_MAX == 0x7fffffff +#define SO_RCVTIMEO 66 +#define SO_SNDTIMEO 67 +#else +#define SO_RCVTIMEO 20 +#define SO_SNDTIMEO 21 +#endif +#endif + +#ifndef SO_TIMESTAMP +#if __LONG_MAX == 0x7fffffff +#define SO_TIMESTAMP 63 +#define SO_TIMESTAMPNS 64 +#define SO_TIMESTAMPING 65 +#else +#define SO_TIMESTAMP 29 +#define SO_TIMESTAMPNS 35 +#define SO_TIMESTAMPING 37 +#endif +#endif + #define SO_SECURITY_AUTHENTICATION 22 #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 #define SO_SECURITY_ENCRYPTION_NETWORK 24 @@ -196,15 +257,10 @@ struct linger { #define SO_GET_FILTER SO_ATTACH_FILTER #define SO_PEERNAME 28 -#define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP - -#define SO_PEERSEC 31 #define SO_PASSSEC 34 -#define SO_TIMESTAMPNS 35 #define SCM_TIMESTAMPNS SO_TIMESTAMPNS #define SO_MARK 36 -#define SO_TIMESTAMPING 37 #define SCM_TIMESTAMPING SO_TIMESTAMPING #define SO_RXQ_OVFL 40 #define SO_WIFI_STATUS 41 @@ -222,6 +278,17 @@ struct linger { #define SO_ATTACH_REUSEPORT_CBPF 51 #define SO_ATTACH_REUSEPORT_EBPF 52 #define SO_CNX_ADVICE 53 +#define SCM_TIMESTAMPING_OPT_STATS 54 +#define SO_MEMINFO 55 +#define SO_INCOMING_NAPI_ID 56 +#define SO_COOKIE 57 +#define SCM_TIMESTAMPING_PKTINFO 58 +#define SO_PEERGROUPS 59 +#define SO_ZEROCOPY 60 +#define SO_TXTIME 61 +#define SCM_TXTIME SO_TXTIME +#define SO_BINDTOIFINDEX 62 +#define SO_DETACH_REUSEPORT_BPF 68 #ifndef SOL_SOCKET #define SOL_SOCKET 1 @@ -253,6 +320,8 @@ struct linger { #define SOL_ALG 279 #define SOL_NFC 280 #define SOL_KCM 281 +#define SOL_TLS 282 +#define SOL_XDP 283 #define SOMAXCONN 128 @@ -274,6 +343,7 @@ struct linger { #define MSG_MORE 0x8000 #define MSG_WAITFORONE 0x10000 #define MSG_BATCH 0x40000 +#define MSG_ZEROCOPY 0x4000000 #define MSG_FASTOPEN 0x20000000 #define MSG_CMSG_CLOEXEC 0x40000000 @@ -331,6 +401,12 @@ int setsockopt (int, int, int, const void *, socklen_t); int sockatmark (int); +#if _REDIR_TIME64 +#ifdef _GNU_SOURCE +__REDIR(recvmmsg, __recvmmsg_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/soundcard.h b/system/lib/libc/musl/include/sys/soundcard.h index fade986fe4212..5ca776461e084 100644 --- a/system/lib/libc/musl/include/sys/soundcard.h +++ b/system/lib/libc/musl/include/sys/soundcard.h @@ -1 +1 @@ -#include +#include diff --git a/system/lib/libc/musl/include/sys/stat.h b/system/lib/libc/musl/include/sys/stat.h index 82a649043dc8b..10d446c463eca 100644 --- a/system/lib/libc/musl/include/sys/stat.h +++ b/system/lib/libc/musl/include/sys/stat.h @@ -79,12 +79,15 @@ int fchmod(int, mode_t); int fchmodat(int, const char *, mode_t, int); mode_t umask(mode_t); int mkdir(const char *, mode_t); -int mknod(const char *, mode_t, dev_t); int mkfifo(const char *, mode_t); int mkdirat(int, const char *, mode_t); -int mknodat(int, const char *, mode_t, dev_t); int mkfifoat(int, const char *, mode_t); +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +int mknod(const char *, mode_t, dev_t); +int mknodat(int, const char *, mode_t, dev_t); +#endif + int futimens(int, const struct timespec [2]); int utimensat(int, const char *, const struct timespec [2], int); @@ -107,6 +110,15 @@ int lchmod(const char *, mode_t); #define off64_t off_t #endif +#if _REDIR_TIME64 +__REDIR(stat, __stat_time64); +__REDIR(fstat, __fstat_time64); +__REDIR(lstat, __lstat_time64); +__REDIR(fstatat, __fstatat_time64); +__REDIR(futimens, __futimens_time64); +__REDIR(utimensat, __utimensat_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/statvfs.h b/system/lib/libc/musl/include/sys/statvfs.h index e0839ecac3266..793490b6dc8c1 100644 --- a/system/lib/libc/musl/include/sys/statvfs.h +++ b/system/lib/libc/musl/include/sys/statvfs.h @@ -11,8 +11,6 @@ extern "C" { #define __NEED_fsfilcnt_t #include -#include - struct statvfs { unsigned long f_bsize, f_frsize; fsblkcnt_t f_blocks, f_bfree, f_bavail; @@ -42,6 +40,7 @@ int fstatvfs (int, struct statvfs *); #define ST_IMMUTABLE 512 #define ST_NOATIME 1024 #define ST_NODIRATIME 2048 +#define ST_RELATIME 4096 #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) #define statvfs64 statvfs diff --git a/system/lib/libc/musl/include/sys/time.h b/system/lib/libc/musl/include/sys/time.h index e4b379aea8590..cdc67ef650fe3 100644 --- a/system/lib/libc/musl/include/sys/time.h +++ b/system/lib/libc/musl/include/sys/time.h @@ -10,9 +10,6 @@ extern "C" { int gettimeofday (struct timeval *__restrict, void *__restrict); -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ - || defined(_BSD_SOURCE) - #define ITIMER_REAL 0 #define ITIMER_VIRTUAL 1 #define ITIMER_PROF 2 @@ -26,8 +23,6 @@ int getitimer (int, struct itimerval *); int setitimer (int, const struct itimerval *__restrict, struct itimerval *__restrict); int utimes (const char *, const struct timeval [2]); -#endif - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) struct timezone { int tz_minuteswest; @@ -61,6 +56,20 @@ int adjtime (const struct timeval *, struct timeval *); (void)0 ) #endif +#if _REDIR_TIME64 +__REDIR(gettimeofday, __gettimeofday_time64); +__REDIR(getitimer, __getitimer_time64); +__REDIR(setitimer, __setitimer_time64); +__REDIR(utimes, __utimes_time64); +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +__REDIR(futimes, __futimes_time64); +__REDIR(futimesat, __futimesat_time64); +__REDIR(lutimes, __lutimes_time64); +__REDIR(settimeofday, __settimeofday_time64); +__REDIR(adjtime, __adjtime64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/timeb.h b/system/lib/libc/musl/include/sys/timeb.h index 108c1f5ccbbd4..628239b7ed934 100644 --- a/system/lib/libc/musl/include/sys/timeb.h +++ b/system/lib/libc/musl/include/sys/timeb.h @@ -4,6 +4,8 @@ extern "C" { #endif +#include + #define __NEED_time_t #include @@ -16,6 +18,10 @@ struct timeb { int ftime(struct timeb *); +#if _REDIR_TIME64 +__REDIR(ftime, __ftime64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/timerfd.h b/system/lib/libc/musl/include/sys/timerfd.h index 9724d903472c5..1b832cdd8f8fa 100644 --- a/system/lib/libc/musl/include/sys/timerfd.h +++ b/system/lib/libc/musl/include/sys/timerfd.h @@ -12,6 +12,7 @@ extern "C" { #define TFD_CLOEXEC O_CLOEXEC #define TFD_TIMER_ABSTIME 1 +#define TFD_TIMER_CANCEL_ON_SET (1 << 1) struct itimerspec; @@ -19,6 +20,11 @@ int timerfd_create(int, int); int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *); int timerfd_gettime(int, struct itimerspec *); +#if _REDIR_TIME64 +__REDIR(timerfd_settime, __timerfd_settime64); +__REDIR(timerfd_gettime, __timerfd_gettime64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/timex.h b/system/lib/libc/musl/include/sys/timex.h index 2e688880a8b2d..8b417e1be258c 100644 --- a/system/lib/libc/musl/include/sys/timex.h +++ b/system/lib/libc/musl/include/sys/timex.h @@ -91,6 +91,11 @@ struct timex { int adjtimex(struct timex *); int clock_adjtime(clockid_t, struct timex *); +#if _REDIR_TIME64 +__REDIR(adjtimex, __adjtimex_time64); +__REDIR(clock_adjtime, __clock_adjtime64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/ttydefaults.h b/system/lib/libc/musl/include/sys/ttydefaults.h index d251b715c6757..edb55bc4d68a5 100644 --- a/system/lib/libc/musl/include/sys/ttydefaults.h +++ b/system/lib/libc/musl/include/sys/ttydefaults.h @@ -6,16 +6,11 @@ #define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) #define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL) #define TTYDEF_SPEED (B9600) -#define CTRL(x) (x&037) +#define CTRL(x) ((x)&037) #define CEOF CTRL('d') -#ifdef _POSIX_VDISABLE -#define CEOL _POSIX_VDISABLE -#define CSTATUS _POSIX_VDISABLE -#else #define CEOL '\0' #define CSTATUS '\0' -#endif #define CERASE 0177 #define CINTR CTRL('c') diff --git a/system/lib/libc/musl/include/sys/vt.h b/system/lib/libc/musl/include/sys/vt.h index 834abfbc8fbb4..5000de499fa27 100644 --- a/system/lib/libc/musl/include/sys/vt.h +++ b/system/lib/libc/musl/include/sys/vt.h @@ -1 +1 @@ -#include +#include diff --git a/system/lib/libc/musl/include/sys/wait.h b/system/lib/libc/musl/include/sys/wait.h index 50c5c709a6bea..d4b1f2e185c66 100644 --- a/system/lib/libc/musl/include/sys/wait.h +++ b/system/lib/libc/musl/include/sys/wait.h @@ -13,7 +13,8 @@ extern "C" { typedef enum { P_ALL = 0, P_PID = 1, - P_PGID = 2 + P_PGID = 2, + P_PIDFD = 3 } idtype_t; pid_t wait (int *); @@ -53,6 +54,13 @@ pid_t wait4 (pid_t, int *, int, struct rusage *); #define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu) #define WIFCONTINUED(s) ((s) == 0xffff) +#if _REDIR_TIME64 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +__REDIR(wait3, __wait3_time64); +__REDIR(wait4, __wait4_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/sys/xattr.h b/system/lib/libc/musl/include/sys/xattr.h index f926493cbca80..eeeaafc44f09f 100644 --- a/system/lib/libc/musl/include/sys/xattr.h +++ b/system/lib/libc/musl/include/sys/xattr.h @@ -13,10 +13,10 @@ extern "C" { ssize_t getxattr(const char *, const char *, void *, size_t); ssize_t lgetxattr(const char *, const char *, void *, size_t); -ssize_t fgetxattr(int filedes, const char *, void *, size_t); +ssize_t fgetxattr(int, const char *, void *, size_t); ssize_t listxattr(const char *, char *, size_t); ssize_t llistxattr(const char *, char *, size_t); -ssize_t flistxattr(int filedes, char *, size_t); +ssize_t flistxattr(int, char *, size_t); int setxattr(const char *, const char *, const void *, size_t, int); int lsetxattr(const char *, const char *, const void *, size_t, int); int fsetxattr(int, const char *, const void *, size_t, int); @@ -24,6 +24,8 @@ int removexattr(const char *, const char *); int lremovexattr(const char *, const char *); int fremovexattr(int, const char *); +#define __UAPI_DEF_XATTR 0 + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/termios.h b/system/lib/libc/musl/include/termios.h index d73c780d41a42..cbb533010e8b2 100644 --- a/system/lib/libc/musl/include/termios.h +++ b/system/lib/libc/musl/include/termios.h @@ -8,6 +8,7 @@ extern "C" { #include #define __NEED_pid_t +#define __NEED_struct_winsize #include @@ -27,6 +28,9 @@ int cfsetispeed (struct termios *, speed_t); int tcgetattr (int, struct termios *); int tcsetattr (int, int, const struct termios *); +int tcgetwinsize (int, struct winsize *); +int tcsetwinsize (int, const struct winsize *); + int tcsendbreak (int, int); int tcdrain (int); int tcflush (int, int); diff --git a/system/lib/libc/musl/include/threads.h b/system/lib/libc/musl/include/threads.h index 017948261e9f8..52ec3100eb9e2 100644 --- a/system/lib/libc/musl/include/threads.h +++ b/system/lib/libc/musl/include/threads.h @@ -75,11 +75,17 @@ int cnd_timedwait(cnd_t *__restrict, mtx_t *__restrict, const struct timespec *_ int cnd_wait(cnd_t *, mtx_t *); int tss_create(tss_t *, tss_dtor_t); -void tss_delete(tss_t key); +void tss_delete(tss_t); int tss_set(tss_t, void *); void *tss_get(tss_t); +#if _REDIR_TIME64 +__REDIR(thrd_sleep, __thrd_sleep_time64); +__REDIR(mtx_timedlock, __mtx_timedlock_time64); +__REDIR(cnd_timedwait, __cnd_timedwait_time64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/time.h b/system/lib/libc/musl/include/time.h index a408679c2b0e0..5494df1836733 100644 --- a/system/lib/libc/musl/include/time.h +++ b/system/lib/libc/musl/include/time.h @@ -111,6 +111,8 @@ int timer_settime (timer_t, int, const struct itimerspec *__restrict, struct iti int timer_gettime (timer_t, struct itimerspec *); int timer_getoverrun (timer_t); +extern char *tzname[2]; + #endif @@ -118,7 +120,6 @@ int timer_getoverrun (timer_t); char *strptime (const char *__restrict, const char *__restrict, struct tm *__restrict); extern int daylight; extern long timezone; -extern char *tzname[2]; extern int getdate_err; struct tm *getdate (const char *); #endif @@ -129,6 +130,34 @@ int stime(const time_t *); time_t timegm(struct tm *); #endif +#if _REDIR_TIME64 +__REDIR(time, __time64); +__REDIR(difftime, __difftime64); +__REDIR(mktime, __mktime64); +__REDIR(gmtime, __gmtime64); +__REDIR(localtime, __localtime64); +__REDIR(ctime, __ctime64); +__REDIR(timespec_get, __timespec_get_time64); +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ + || defined(_BSD_SOURCE) +__REDIR(gmtime_r, __gmtime64_r); +__REDIR(localtime_r, __localtime64_r); +__REDIR(ctime_r, __ctime64_r); +__REDIR(nanosleep, __nanosleep_time64); +__REDIR(clock_getres, __clock_getres_time64); +__REDIR(clock_gettime, __clock_gettime64); +__REDIR(clock_settime, __clock_settime64); +__REDIR(clock_nanosleep, __clock_nanosleep_time64); +__REDIR(timer_settime, __timer_settime64); +__REDIR(timer_gettime, __timer_gettime64); +#endif +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +__REDIR(stime, __stime64); +__REDIR(timegm, __timegm_time64); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/uchar.h b/system/lib/libc/musl/include/uchar.h index 8dabf1ed9b8ee..7e5c4d4068949 100644 --- a/system/lib/libc/musl/include/uchar.h +++ b/system/lib/libc/musl/include/uchar.h @@ -3,7 +3,9 @@ #ifdef __cplusplus extern "C" { -#else +#endif + +#if __cplusplus < 201103L typedef unsigned short char16_t; typedef unsigned char32_t; #endif diff --git a/system/lib/libc/musl/include/ucontext.h b/system/lib/libc/musl/include/ucontext.h index 3bb776ed6a869..0f75712548c34 100644 --- a/system/lib/libc/musl/include/ucontext.h +++ b/system/lib/libc/musl/include/ucontext.h @@ -15,7 +15,7 @@ extern "C" { struct __ucontext; int getcontext(struct __ucontext *); -void makecontext(struct __ucontext *, void (*)(void), int, ...); +void makecontext(struct __ucontext *, void (*)(), int, ...); int setcontext(const struct __ucontext *); int swapcontext(struct __ucontext *, const struct __ucontext *); diff --git a/system/lib/libc/musl/include/unistd.h b/system/lib/libc/musl/include/unistd.h index 23989653c3b2d..bf7a7abc8cde0 100644 --- a/system/lib/libc/musl/include/unistd.h +++ b/system/lib/libc/musl/include/unistd.h @@ -92,6 +92,7 @@ unsigned sleep(unsigned); int pause(void); pid_t fork(void); +pid_t _Fork(void); int execve(const char *, char *const [], char *const []); int execv(const char *, char *const []); int execle(const char *, const char *, ...); @@ -120,10 +121,8 @@ gid_t getgid(void); gid_t getegid(void); int getgroups(int, gid_t []); int setuid(uid_t); -int setreuid(uid_t, uid_t); int seteuid(uid_t); int setgid(gid_t); -int setregid(gid_t, gid_t); int setegid(gid_t); char *getlogin(void); @@ -140,12 +139,13 @@ long fpathconf(int, int); long sysconf(int); size_t confstr(int, char *, size_t); +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define F_ULOCK 0 #define F_LOCK 1 #define F_TLOCK 2 #define F_TEST 3 - -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +int setreuid(uid_t, uid_t); +int setregid(gid_t, gid_t); int lockf(int, int, off_t); long gethostid(void); int nice(int); @@ -186,6 +186,8 @@ int acct(const char *); /* XXX EMSCRIPTEN long syscall(long, ...); */ int execvpe(const char *, char *const [], char *const []); int issetugid(void); +int getentropy(void *, size_t); +extern int optreset; #endif #ifdef _GNU_SOURCE @@ -198,6 +200,7 @@ char *get_current_dir_name(void); int syncfs(int); int euidaccess(const char *, int); int eaccess(const char *, int); +ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned); pid_t gettid(void); #endif @@ -486,6 +489,8 @@ pid_t gettid(void); #define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS 1145 #define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS 1146 #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147 +#define _CS_V6_ENV 1148 +#define _CS_V7_ENV 1149 #ifdef __cplusplus } diff --git a/system/lib/libc/musl/include/utime.h b/system/lib/libc/musl/include/utime.h index dd5ff927c25d1..5755bd53ee866 100644 --- a/system/lib/libc/musl/include/utime.h +++ b/system/lib/libc/musl/include/utime.h @@ -5,6 +5,8 @@ extern "C" { #endif +#include + #define __NEED_time_t #include @@ -16,6 +18,10 @@ struct utimbuf { int utime (const char *, const struct utimbuf *); +#if _REDIR_TIME64 +__REDIR(utime, __utime64); +#endif + #ifdef __cplusplus } #endif diff --git a/system/lib/libc/musl/include/utmpx.h b/system/lib/libc/musl/include/utmpx.h index 9e5cc955eb1f8..b293f427e6b0d 100644 --- a/system/lib/libc/musl/include/utmpx.h +++ b/system/lib/libc/musl/include/utmpx.h @@ -16,6 +16,7 @@ extern "C" { struct utmpx { short ut_type; + short __ut_pad1; pid_t ut_pid; char ut_line[32]; char ut_id[4]; @@ -25,7 +26,11 @@ struct utmpx { short __e_termination; short __e_exit; } ut_exit; - long ut_session; +#if __BYTE_ORDER == 1234 + int ut_session, __ut_pad2; +#else + int __ut_pad2, ut_session; +#endif struct timeval ut_tv; unsigned ut_addr_v6[4]; char __unused[20]; @@ -38,7 +43,7 @@ struct utmpx *getutxline(const struct utmpx *); struct utmpx *pututxline(const struct utmpx *); void setutxent(void); -#if defined(_BSD_SOURCE) | defined(_GNU_SOURCE) +#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) #define e_exit __e_exit #define e_termination __e_termination void updwtmpx(const char *, const struct utmpx *); diff --git a/system/lib/libc/musl/include/wchar.h b/system/lib/libc/musl/include/wchar.h index 0167dce6b577a..88eb55b18cc1f 100644 --- a/system/lib/libc/musl/include/wchar.h +++ b/system/lib/libc/musl/include/wchar.h @@ -14,6 +14,10 @@ extern "C" { #define __NEED_wint_t #define __NEED_mbstate_t +#if __STDC_VERSION__ < 201112L +#define __NEED_struct__IO_FILE +#endif + #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define __NEED_locale_t @@ -53,7 +57,7 @@ int wcscmp (const wchar_t *, const wchar_t *); int wcsncmp (const wchar_t *, const wchar_t *, size_t); int wcscoll(const wchar_t *, const wchar_t *); -size_t wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict, size_t n); +size_t wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict, size_t); wchar_t *wcschr (const wchar_t *, wchar_t); wchar_t *wcsrchr (const wchar_t *, wchar_t); @@ -136,6 +140,21 @@ size_t wcsftime (wchar_t *__restrict, size_t, const wchar_t *__restrict, const s #undef iswdigit +#if defined(_GNU_SOURCE) +wint_t fgetwc_unlocked (FILE *); +wint_t getwc_unlocked (FILE *); +wint_t getwchar_unlocked (void); +wint_t fputwc_unlocked (wchar_t, FILE *); +wint_t putwc_unlocked (wchar_t, FILE *); +wint_t putwchar_unlocked (wchar_t); +wchar_t *fgetws_unlocked (wchar_t *__restrict, int, FILE *__restrict); +int fputws_unlocked (const wchar_t *__restrict, FILE *__restrict); +#endif + +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +size_t wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict, const struct tm *__restrict, locale_t); +#endif + #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) FILE *open_wmemstream(wchar_t **, size_t *); @@ -150,7 +169,7 @@ int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t); int wcsncasecmp(const wchar_t *, const wchar_t *, size_t); int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t); int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); -size_t wcsxfrm_l(wchar_t *__restrict, const wchar_t *__restrict, size_t n, locale_t); +size_t wcsxfrm_l(wchar_t *__restrict, const wchar_t *__restrict, size_t, locale_t); #endif #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) diff --git a/system/lib/libc/musl/ldso/dlstart.c b/system/lib/libc/musl/ldso/dlstart.c index 4dbe17843ca27..20d50f2cbc8d6 100644 --- a/system/lib/libc/musl/ldso/dlstart.c +++ b/system/lib/libc/musl/ldso/dlstart.c @@ -1,5 +1,6 @@ #include #include "dynlink.h" +#include "libc.h" #ifndef START #define START "_dlstart" @@ -11,14 +12,13 @@ #ifndef GETFUNCSYM #define GETFUNCSYM(fp, sym, got) do { \ - __attribute__((__visibility__("hidden"))) void sym(); \ + hidden void sym(); \ static void (*static_func_ptr)() = sym; \ __asm__ __volatile__ ( "" : "+m"(static_func_ptr) : : "memory"); \ *(fp) = static_func_ptr; } while(0) #endif -__attribute__((__visibility__("hidden"))) -void _dlstart_c(size_t *sp, size_t *dynv) +hidden void _dlstart_c(size_t *sp, size_t *dynv) { size_t i, aux[AUX_CNT], dyn[DYN_CNT]; size_t *rel, rel_size, base; diff --git a/system/lib/libc/musl/ldso/dynlink.c b/system/lib/libc/musl/ldso/dynlink.c index e458f38673d76..6b868c841476a 100644 --- a/system/lib/libc/musl/ldso/dynlink.c +++ b/system/lib/libc/musl/ldso/dynlink.c @@ -1,5 +1,5 @@ #define _GNU_SOURCE -#include +#define SYSCALL_NO_TLS 1 #include #include #include @@ -17,15 +17,26 @@ #include #include #include +#include +#include #include "pthread_impl.h" +#include "fork_impl.h" #include "libc.h" #include "dynlink.h" +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc __libc_realloc +#define free __libc_free + static void error(const char *, ...); #define MAXP2(a,b) (-(-(a)&-(b))) #define ALIGN(x,y) ((x)+(y)-1 & -(y)) +#define container_of(p,t,m) ((t*)((char *)(p)-offsetof(t,m))) +#define countof(a) ((sizeof (a))/(sizeof (a)[0])) + struct debug { int ver; void *head; @@ -52,28 +63,33 @@ struct dso { Phdr *phdr; int phnum; size_t phentsize; - int refcnt; Sym *syms; - uint32_t *hashtab; + Elf_Symndx *hashtab; uint32_t *ghashtab; int16_t *versym; char *strings; + struct dso *syms_next, *lazy_next; + size_t *lazy, lazy_cnt; unsigned char *map; size_t map_len; dev_t dev; ino_t ino; - signed char global; char relocated; char constructed; char kernel_mapped; + char mark; + char bfs_built; + char runtime_loaded; struct dso **deps, *needed_by; + size_t ndeps_direct; + size_t next_dep; + pthread_t ctor_visitor; char *rpath_orig, *rpath; struct tls_module tls; size_t tls_id; size_t relro_start, relro_end; - void **new_dtv; + uintptr_t *new_dtv; unsigned char *new_tls; - volatile int new_dtv_idx, new_tls_idx; struct td_index *td_index; struct dso *fini_next; char *shortname; @@ -95,12 +111,7 @@ struct symdef { struct dso *dso; }; -int __init_tp(void *); -void __init_libc(char **, char *); -void *__copy_tls(unsigned char *); - -__attribute__((__visibility__("hidden"))) -const char *__libc_get_version(void); +typedef void (*stage3_func)(size_t *, size_t *); static struct builtin_tls { char c; @@ -113,30 +124,36 @@ static struct builtin_tls { static size_t *saved_addends, *apply_addends_to; static struct dso ldso; -static struct dso *head, *tail, *fini_head; +static struct dso *head, *tail, *fini_head, *syms_tail, *lazy_head; static char *env_path, *sys_path; static unsigned long long gencnt; static int runtime; static int ldd_mode; static int ldso_fail; static int noload; +static int shutting_down; static jmp_buf *rtld_fail; static pthread_rwlock_t lock; static struct debug debug; static struct tls_module *tls_tail; static size_t tls_cnt, tls_offset, tls_align = MIN_TLS_ALIGN; static size_t static_tls_cnt; -static pthread_mutex_t init_fini_lock = { ._m_type = PTHREAD_MUTEX_RECURSIVE }; +static pthread_mutex_t init_fini_lock; +static pthread_cond_t ctor_cond; +static struct dso *builtin_deps[2]; +static struct dso *const no_deps[1]; +static struct dso *builtin_ctor_queue[4]; +static struct dso **main_ctor_queue; static struct fdpic_loadmap *app_loadmap; static struct fdpic_dummy_loadmap app_dummy_loadmap; struct debug *_dl_debug_addr = &debug; -__attribute__((__visibility__("hidden"))) -void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0; +extern hidden int __malloc_replaced; -__attribute__((__visibility__("hidden"))) -extern void (*const __init_array_end)(void), (*const __fini_array_end)(void); +hidden void (*const __init_array_start)(void)=0, (*const __fini_array_start)(void)=0; + +extern hidden void (*const __init_array_end)(void), (*const __fini_array_end)(void); weak_alias(__init_array_start, __init_array_end); weak_alias(__fini_array_start, __fini_array_end); @@ -157,10 +174,32 @@ static void *laddr(const struct dso *p, size_t v) for (j=0; v-p->loadmap->segs[j].p_vaddr >= p->loadmap->segs[j].p_memsz; j++); return (void *)(v - p->loadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr); } -#define fpaddr(p, v) ((void (*)())&(struct funcdesc){ \ - laddr(p, v), (p)->got }) +static void *laddr_pg(const struct dso *p, size_t v) +{ + size_t j=0; + size_t pgsz = PAGE_SIZE; + if (!p->loadmap) return p->base + v; + for (j=0; ; j++) { + size_t a = p->loadmap->segs[j].p_vaddr; + size_t b = a + p->loadmap->segs[j].p_memsz; + a &= -pgsz; + b += pgsz-1; + b &= -pgsz; + if (v-aloadmap->segs[j].p_vaddr + p->loadmap->segs[j].addr); +} +static void (*fdbarrier(void *p))() +{ + void (*fd)(); + __asm__("" : "=r"(fd) : "0"(p)); + return fd; +} +#define fpaddr(p, v) fdbarrier((&(struct funcdesc){ \ + laddr(p, v), (p)->got })) #else #define laddr(p, v) (void *)((p)->base + (v)) +#define laddr_pg(p, v) laddr(p, v) #define fpaddr(p, v) ((void (*)())laddr(p, v)) #endif @@ -206,7 +245,7 @@ static Sym *sysv_lookup(const char *s, uint32_t h, struct dso *dso) { size_t i; Sym *syms = dso->syms; - uint32_t *hashtab = dso->hashtab; + Elf_Symndx *hashtab = dso->hashtab; char *strings = dso->strings; for (i=hashtab[2+h%hashtab[0]]; i; i=hashtab[2+hashtab[0]+i]) { if ((!dso->versym || dso->versym[i] >= 0) @@ -256,21 +295,18 @@ static Sym *gnu_lookup_filtered(uint32_t h1, uint32_t *hashtab, struct dso *dso, #define ARCH_SYM_REJECT_UND(s) 0 #endif -static struct symdef find_sym(struct dso *dso, const char *s, int need_def) +#if defined(__GNUC__) +__attribute__((always_inline)) +#endif +static inline struct symdef find_sym2(struct dso *dso, const char *s, int need_def, int use_deps) { - uint32_t h = 0, gh, gho, *ght; - size_t ghm = 0; + uint32_t h = 0, gh = gnu_hash(s), gho = gh / (8*sizeof(size_t)), *ght; + size_t ghm = 1ul << gh % (8*sizeof(size_t)); struct symdef def = {0}; - for (; dso; dso=dso->next) { + struct dso **deps = use_deps ? dso->deps : 0; + for (; dso; dso=use_deps ? *deps++ : dso->syms_next) { Sym *sym; - if (!dso->global) continue; if ((ght = dso->ghashtab)) { - if (!ghm) { - gh = gnu_hash(s); - int maskbits = 8 * sizeof ghm; - gho = gh / maskbits; - ghm = 1ul << gh % maskbits; - } sym = gnu_lookup_filtered(gh, ght, dso, s, gho, ghm); } else { if (!h) h = sysv_hash(s); @@ -286,17 +322,17 @@ static struct symdef find_sym(struct dso *dso, const char *s, int need_def) continue; if (!(1<<(sym->st_info&0xf) & OK_TYPES)) continue; if (!(1<<(sym->st_info>>4) & OK_BINDS)) continue; - - if (def.sym && sym->st_info>>4 == STB_WEAK) continue; def.sym = sym; def.dso = dso; - if (sym->st_info>>4 == STB_GLOBAL) break; + break; } return def; } -__attribute__((__visibility__("hidden"))) -ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic(); +static struct symdef find_sym(struct dso *dso, const char *s, int need_def) +{ + return find_sym2(dso, s, need_def, 0); +} static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stride) { @@ -326,17 +362,40 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri if (skip_relative && IS_RELATIVE(rel[1], dso->syms)) continue; type = R_TYPE(rel[1]); if (type == REL_NONE) continue; - sym_index = R_SYM(rel[1]); reloc_addr = laddr(dso, rel[0]); + + if (stride > 2) { + addend = rel[2]; + } else if (type==REL_GOT || type==REL_PLT|| type==REL_COPY) { + addend = 0; + } else if (reuse_addends) { + /* Save original addend in stage 2 where the dso + * chain consists of just ldso; otherwise read back + * saved addend since the inline one was clobbered. */ + if (head==&ldso) + saved_addends[save_slot] = *reloc_addr; + addend = saved_addends[save_slot++]; + } else { + addend = *reloc_addr; + } + + sym_index = R_SYM(rel[1]); if (sym_index) { sym = syms + sym_index; name = strings + sym->st_name; - ctx = type==REL_COPY ? head->next : head; - def = (sym->st_info&0xf) == STT_SECTION + ctx = type==REL_COPY ? head->syms_next : head; + def = (sym->st_info>>4) == STB_LOCAL ? (struct symdef){ .dso = dso, .sym = sym } : find_sym(ctx, name, type==REL_PLT); if (!def.sym && (sym->st_shndx != SHN_UNDEF || sym->st_info>>4 != STB_WEAK)) { + if (dso->lazy && (type==REL_PLT || type==REL_GOT)) { + dso->lazy[3*dso->lazy_cnt+0] = rel[0]; + dso->lazy[3*dso->lazy_cnt+1] = rel[1]; + dso->lazy[3*dso->lazy_cnt+2] = addend; + dso->lazy_cnt++; + continue; + } error("Error relocating %s: %s: symbol not found", dso->name, name); if (runtime) longjmp(*rtld_fail, 1); @@ -348,27 +407,18 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri def.dso = dso; } - if (stride > 2) { - addend = rel[2]; - } else if (type==REL_GOT || type==REL_PLT|| type==REL_COPY) { - addend = 0; - } else if (reuse_addends) { - /* Save original addend in stage 2 where the dso - * chain consists of just ldso; otherwise read back - * saved addend since the inline one was clobbered. */ - if (head==&ldso) - saved_addends[save_slot] = *reloc_addr; - addend = saved_addends[save_slot++]; - } else { - addend = *reloc_addr; - } - sym_val = def.sym ? (size_t)laddr(def.dso, def.sym->st_value) : 0; tls_val = def.sym ? def.sym->st_value : 0; + if ((type == REL_TPOFF || type == REL_TPOFF_NEG) + && def.dso->tls_id > static_tls_cnt) { + error("Error relocating %s: %s: initial-exec TLS " + "resolves to dynamic definition in %s", + dso->name, name, def.dso->name); + longjmp(*rtld_fail, 1); + } + switch(type) { - case REL_NONE: - break; case REL_OFFSET: addend -= (size_t)reloc_addr; case REL_SYMBOLIC: @@ -376,6 +426,9 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri case REL_PLT: *reloc_addr = sym_val + addend; break; + case REL_USYMBOLIC: + memcpy(reloc_addr, &(size_t){sym_val + addend}, sizeof(size_t)); + break; case REL_RELATIVE: *reloc_addr = (size_t)base + addend; break; @@ -419,7 +472,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri #endif case REL_TLSDESC: if (stride<3) addend = reloc_addr[1]; - if (runtime && def.dso->tls_id >= static_tls_cnt) { + if (def.dso->tls_id > static_tls_cnt) { struct td_index *new = malloc(sizeof *new); if (!new) { error( @@ -430,7 +483,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri new->next = dso->td_index; dso->td_index = new; new->args[0] = def.dso->tls_id; - new->args[1] = tls_val + addend; + new->args[1] = tls_val + addend - DTP_OFFSET; reloc_addr[0] = (size_t)__tlsdesc_dynamic; reloc_addr[1] = (size_t)new; } else { @@ -443,6 +496,13 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri + addend; #endif } +#ifdef TLSDESC_BACKWARDS + /* Some archs (32-bit ARM at least) invert the order of + * the descriptor members. Fix them up here. */ + size_t tmp = reloc_addr[0]; + reloc_addr[0] = reloc_addr[1]; + reloc_addr[1] = tmp; +#endif break; default: error("Error relocating %s: unsupported relocation type %d", @@ -453,26 +513,38 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri } } +static void redo_lazy_relocs() +{ + struct dso *p = lazy_head, *next; + lazy_head = 0; + for (; p; p=next) { + next = p->lazy_next; + size_t size = p->lazy_cnt*3*sizeof(size_t); + p->lazy_cnt = 0; + do_relocs(p, p->lazy, size, 3); + if (p->lazy_cnt) { + p->lazy_next = lazy_head; + lazy_head = p; + } else { + free(p->lazy); + p->lazy = 0; + p->lazy_next = 0; + } + } +} + /* A huge hack: to make up for the wastefulness of shared libraries * needing at least a page of dirty memory even if they have no global * data, we reclaim the gaps at the beginning and end of writable maps - * and "donate" them to the heap by setting up minimal malloc - * structures and then freeing them. */ + * and "donate" them to the heap. */ static void reclaim(struct dso *dso, size_t start, size_t end) { - size_t *a, *z; if (start >= dso->relro_start && start < dso->relro_end) start = dso->relro_end; if (end >= dso->relro_start && end < dso->relro_end) end = dso->relro_start; - start = start + 6*sizeof(size_t)-1 & -4*sizeof(size_t); - end = (end & -4*sizeof(size_t)) - 2*sizeof(size_t); - if (start>end || end-start < 4*sizeof(size_t)) return; - a = laddr(dso, start); - z = laddr(dso, end); - a[-2] = 1; - a[-1] = z[0] = end-start + 2*sizeof(size_t) | 1; - z[1] = 1; - free(a); + if (start >= end) return; + char *base = laddr_pg(dso, start); + __malloc_donate(base, base+(end-start)); } static void reclaim_gaps(struct dso *dso) @@ -480,7 +552,6 @@ static void reclaim_gaps(struct dso *dso) Phdr *ph = dso->phdr; size_t phcnt = dso->phnum; - if (DL_FDPIC) return; // FIXME for (; phcnt--; ph=(void *)((char *)ph+dso->phentsize)) { if (ph->p_type!=PT_LOAD) continue; if ((ph->p_flags&(PF_R|PF_W))!=(PF_R|PF_W)) continue; @@ -490,6 +561,20 @@ static void reclaim_gaps(struct dso *dso) } } +static ssize_t read_loop(int fd, void *p, size_t n) +{ + for (size_t i=0; ip_type == PT_GNU_RELRO) { dso->relro_start = ph->p_vaddr & -PAGE_SIZE; dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; + } else if (ph->p_type == PT_GNU_STACK) { + if (!runtime && ph->p_memsz > __default_stacksize) { + __default_stacksize = + ph->p_memsz < DEFAULT_STACK_MAX ? + ph->p_memsz : DEFAULT_STACK_MAX; + } } if (ph->p_type != PT_LOAD) continue; nsegs++; @@ -675,18 +766,17 @@ static void *map_library(int fd, struct dso *dso) dso->phnum = eh->e_phnum; dso->phentsize = eh->e_phentsize; } - /* Reuse the existing mapping for the lowest-address LOAD */ - if ((ph->p_vaddr & -PAGE_SIZE) == addr_min && !DL_NOMMU_SUPPORT) - continue; this_min = ph->p_vaddr & -PAGE_SIZE; this_max = ph->p_vaddr+ph->p_memsz+PAGE_SIZE-1 & -PAGE_SIZE; off_start = ph->p_offset & -PAGE_SIZE; prot = (((ph->p_flags&PF_R) ? PROT_READ : 0) | ((ph->p_flags&PF_W) ? PROT_WRITE: 0) | ((ph->p_flags&PF_X) ? PROT_EXEC : 0)); - if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED) - goto error; - if (ph->p_memsz > ph->p_filesz) { + /* Reuse the existing mapping for the lowest-address LOAD */ + if ((ph->p_vaddr & -PAGE_SIZE) != addr_min || DL_NOMMU_SUPPORT) + if (mmap_fixed(base+this_min, this_max-this_min, prot, MAP_PRIVATE|MAP_FIXED, fd, off_start) == MAP_FAILED) + goto error; + if (ph->p_memsz > ph->p_filesz && (ph->p_flags&PF_W)) { size_t brk = (size_t)base+ph->p_vaddr+ph->p_filesz; size_t pgbrk = brk+PAGE_SIZE-1 & -PAGE_SIZE; memset((void *)brk, 0, pgbrk-brk & PAGE_SIZE-1); @@ -705,7 +795,6 @@ static void *map_library(int fd, struct dso *dso) dso->base = base; dso->dynv = laddr(dso, dyn); if (dso->tls.size) dso->tls.image = laddr(dso, tls_image); - if (!runtime) reclaim_gaps(dso); free(allocated_buf); return map; noexec: @@ -788,7 +877,19 @@ static int fixup_rpath(struct dso *p, char *buf, size_t buf_size) origin = p->name; } t = strrchr(origin, '/'); - l = t ? t-origin : 0; + if (t) { + l = t-origin; + } else { + /* Normally p->name will always be an absolute or relative + * pathname containing at least one '/' character, but in the + * case where ldso was invoked as a command to execute a + * program in the working directory, app.name may not. Fix. */ + origin = "."; + l = 1; + } + /* Disallow non-absolute origins for suid/sgid/AT_SECURE. */ + if (libc.secure && *origin != '/') + return 0; p->rpath = malloc(strlen(p->rpath_orig) + n*l + 1); if (!p->rpath) return -1; @@ -855,7 +956,7 @@ static void *dl_mmap(size_t n) #else p = (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0); #endif - return p == MAP_FAILED ? 0 : p; + return (unsigned long)p > -4096UL ? 0 : p; } static void makefuncdescs(struct dso *p) @@ -905,27 +1006,28 @@ static struct dso *load_library(const char *name, struct dso *needed_by) /* Catch and block attempts to reload the implementation itself */ if (name[0]=='l' && name[1]=='i' && name[2]=='b') { - static const char *rp, reserved[] = - "c\0pthread\0rt\0m\0dl\0util\0xnet\0"; - char *z = strchr(name, '.'); - if (z) { - size_t l = z-name; - for (rp=reserved; *rp && strncmp(name+3, rp, l-3); rp+=strlen(rp)+1); - if (*rp) { - if (ldd_mode) { - /* Track which names have been resolved - * and only report each one once. */ - static unsigned reported; - unsigned mask = 1U<<(rp-reserved); - if (!(reported & mask)) { - reported |= mask; - dprintf(1, "\t%s => %s (%p)\n", - name, ldso.name, - ldso.base); - } + static const char reserved[] = + "c.pthread.rt.m.dl.util.xnet."; + const char *rp, *next; + for (rp=reserved; *rp; rp=next) { + next = strchr(rp, '.') + 1; + if (strncmp(name+3, rp, next-rp) == 0) + break; + } + if (*rp) { + if (ldd_mode) { + /* Track which names have been resolved + * and only report each one once. */ + static unsigned reported; + unsigned mask = 1U<<(rp-reserved); + if (!(reported & mask)) { + reported |= mask; + dprintf(1, "\t%s => %s (%p)\n", + name, ldso.name, + ldso.base); } - is_self = 1; } + is_self = 1; } } if (!strcmp(name, ldso.name)) is_self = 1; @@ -933,7 +1035,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) if (!ldso.prev) { tail->next = &ldso; ldso.prev = tail; - tail = ldso.next ? ldso.next : &ldso; + tail = &ldso; } return &ldso; } @@ -944,7 +1046,6 @@ static struct dso *load_library(const char *name, struct dso *needed_by) /* Search for the name to see if it's already loaded */ for (p=head->next; p; p=p->next) { if (p->shortname && !strcmp(p->shortname, name)) { - p->refcnt++; return p; } } @@ -978,13 +1079,17 @@ static struct dso *load_library(const char *name, struct dso *needed_by) snprintf(etc_ldso_path, sizeof etc_ldso_path, "%.*s/etc/ld-musl-" LDSO_ARCH ".path", (int)prefix_len, prefix); - FILE *f = fopen(etc_ldso_path, "rbe"); - if (f) { - if (getdelim(&sys_path, (size_t[1]){0}, 0, f) <= 0) { + fd = open(etc_ldso_path, O_RDONLY|O_CLOEXEC); + if (fd>=0) { + size_t n = 0; + if (!fstat(fd, &st)) n = st.st_size; + if ((sys_path = malloc(n+1))) + sys_path[n] = 0; + if (!sys_path || read_loop(fd, sys_path, n)<0) { free(sys_path); sys_path = ""; } - fclose(f); + close(fd); } else if (errno != ENOENT) { sys_path = ""; } @@ -1007,7 +1112,6 @@ static struct dso *load_library(const char *name, struct dso *needed_by) if (!p->shortname && pathname != name) p->shortname = strrchr(p->name, '/')+1; close(fd); - p->refcnt++; return p; } } @@ -1015,6 +1119,21 @@ static struct dso *load_library(const char *name, struct dso *needed_by) close(fd); if (!map) return 0; + /* Avoid the danger of getting two versions of libc mapped into the + * same process when an absolute pathname was used. The symbols + * checked are chosen to catch both musl and glibc, and to avoid + * false positives from interposition-hack libraries. */ + decode_dyn(&temp_dso); + if (find_sym(&temp_dso, "__libc_start_main", 1).sym && + find_sym(&temp_dso, "stdin", 1).sym) { + unmap_library(&temp_dso); + return load_library("libc.so", needed_by); + } + /* Past this point, if we haven't reached runtime yet, ldso has + * committed either to use the mapped library or to abort execution. + * Unmapping is not possible, so we can safely reclaim gaps. */ + if (!runtime) reclaim_gaps(&temp_dso); + /* Allocate storage for the new DSO. When there is TLS, this * storage must include a reservation for all pre-existing * threads to obtain copies of both the new TLS, and an @@ -1034,12 +1153,11 @@ static struct dso *load_library(const char *name, struct dso *needed_by) return 0; } memcpy(p, &temp_dso, sizeof temp_dso); - decode_dyn(p); p->dev = st.st_dev; p->ino = st.st_ino; - p->refcnt = 1; p->needed_by = needed_by; p->name = p->buf; + p->runtime_loaded = runtime; strcpy(p->name, pathname); /* Add a shortname only if name arg was not an explicit pathname. */ if (pathname != name) p->shortname = strrchr(p->name, '/')+1; @@ -1047,9 +1165,9 @@ static struct dso *load_library(const char *name, struct dso *needed_by) p->tls_id = ++tls_cnt; tls_align = MAXP2(tls_align, p->tls.align); #ifdef TLS_ABOVE_TP - p->tls.offset = tls_offset + ( (tls_align-1) & - -(tls_offset + (uintptr_t)p->tls.image) ); - tls_offset += p->tls.size; + p->tls.offset = tls_offset + ( (p->tls.align-1) & + (-tls_offset + (uintptr_t)p->tls.image) ); + tls_offset = p->tls.offset + p->tls.size; #else tls_offset += p->tls.size + p->tls.align - 1; tls_offset -= (tls_offset + (uintptr_t)p->tls.image) @@ -1075,29 +1193,99 @@ static struct dso *load_library(const char *name, struct dso *needed_by) return p; } +static void load_direct_deps(struct dso *p) +{ + size_t i, cnt=0; + + if (p->deps) return; + /* For head, all preloads are direct pseudo-dependencies. + * Count and include them now to avoid realloc later. */ + if (p==head) for (struct dso *q=p->next; q; q=q->next) + cnt++; + for (i=0; p->dynv[i]; i+=2) + if (p->dynv[i] == DT_NEEDED) cnt++; + /* Use builtin buffer for apps with no external deps, to + * preserve property of no runtime failure paths. */ + p->deps = (p==head && cnt<2) ? builtin_deps : + calloc(cnt+1, sizeof *p->deps); + if (!p->deps) { + error("Error loading dependencies for %s", p->name); + if (runtime) longjmp(*rtld_fail, 1); + } + cnt=0; + if (p==head) for (struct dso *q=p->next; q; q=q->next) + p->deps[cnt++] = q; + for (i=0; p->dynv[i]; i+=2) { + if (p->dynv[i] != DT_NEEDED) continue; + struct dso *dep = load_library(p->strings + p->dynv[i+1], p); + if (!dep) { + error("Error loading shared library %s: %m (needed by %s)", + p->strings + p->dynv[i+1], p->name); + if (runtime) longjmp(*rtld_fail, 1); + continue; + } + p->deps[cnt++] = dep; + } + p->deps[cnt] = 0; + p->ndeps_direct = cnt; +} + static void load_deps(struct dso *p) { - size_t i, ndeps=0; - struct dso ***deps = &p->deps, **tmp, *dep; - for (; p; p=p->next) { - for (i=0; p->dynv[i]; i+=2) { - if (p->dynv[i] != DT_NEEDED) continue; - dep = load_library(p->strings + p->dynv[i+1], p); - if (!dep) { - error("Error loading shared library %s: %m (needed by %s)", - p->strings + p->dynv[i+1], p->name); - if (runtime) longjmp(*rtld_fail, 1); - continue; - } - if (runtime) { - tmp = realloc(*deps, sizeof(*tmp)*(ndeps+2)); - if (!tmp) longjmp(*rtld_fail, 1); - tmp[ndeps++] = dep; - tmp[ndeps] = 0; - *deps = tmp; - } + if (p->deps) return; + for (; p; p=p->next) + load_direct_deps(p); +} + +static void extend_bfs_deps(struct dso *p) +{ + size_t i, j, cnt, ndeps_all; + struct dso **tmp; + + /* Can't use realloc if the original p->deps was allocated at + * program entry and malloc has been replaced, or if it's + * the builtin non-allocated trivial main program deps array. */ + int no_realloc = (__malloc_replaced && !p->runtime_loaded) + || p->deps == builtin_deps; + + if (p->bfs_built) return; + ndeps_all = p->ndeps_direct; + + /* Mark existing (direct) deps so they won't be duplicated. */ + for (i=0; p->deps[i]; i++) + p->deps[i]->mark = 1; + + /* For each dependency already in the list, copy its list of direct + * dependencies to the list, excluding any items already in the + * list. Note that the list this loop iterates over will grow during + * the loop, but since duplicates are excluded, growth is bounded. */ + for (i=0; p->deps[i]; i++) { + struct dso *dep = p->deps[i]; + for (j=cnt=0; jndeps_direct; j++) + if (!dep->deps[j]->mark) cnt++; + tmp = no_realloc ? + malloc(sizeof(*tmp) * (ndeps_all+cnt+1)) : + realloc(p->deps, sizeof(*tmp) * (ndeps_all+cnt+1)); + if (!tmp) { + error("Error recording dependencies for %s", p->name); + if (runtime) longjmp(*rtld_fail, 1); + continue; + } + if (no_realloc) { + memcpy(tmp, p->deps, sizeof(*tmp) * (ndeps_all+1)); + no_realloc = 0; } + p->deps = tmp; + for (j=0; jndeps_direct; j++) { + if (dep->deps[j]->mark) continue; + dep->deps[j]->mark = 1; + p->deps[ndeps_all++] = dep->deps[j]; + } + p->deps[ndeps_all] = 0; } + p->bfs_built = 1; + for (p=head; p; p=p->next) + p->mark = 0; } static void load_preload(char *s) @@ -1114,9 +1302,24 @@ static void load_preload(char *s) } } -static void make_global(struct dso *p) +static void add_syms(struct dso *p) +{ + if (!p->syms_next && syms_tail != p) { + syms_tail->syms_next = p; + syms_tail = p; + } +} + +static void revert_syms(struct dso *old_tail) { - for (; p; p=p->next) p->global = 1; + struct dso *p, *next; + /* Chop off the tail of the list of dsos that participate in + * the global symbol table, reverting them to RTLD_LOCAL. */ + for (p=old_tail; p; p=next) { + next = p->syms_next; + p->syms_next = 0; + } + syms_tail = old_tail; } static void do_mips_relocs(struct dso *p, size_t *got) @@ -1174,6 +1377,12 @@ static void kernel_mapped_dso(struct dso *p) } else if (ph->p_type == PT_GNU_RELRO) { p->relro_start = ph->p_vaddr & -PAGE_SIZE; p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; + } else if (ph->p_type == PT_GNU_STACK) { + if (!runtime && ph->p_memsz > __default_stacksize) { + __default_stacksize = + ph->p_memsz < DEFAULT_STACK_MAX ? + ph->p_memsz : DEFAULT_STACK_MAX; + } } if (ph->p_type != PT_LOAD) continue; if (ph->p_vaddr < min_addr) @@ -1192,7 +1401,18 @@ void __libc_exit_fini() { struct dso *p; size_t dyn[DYN_CNT]; + pthread_t self = __pthread_self(); + + /* Take both locks before setting shutting_down, so that + * either lock is sufficient to read its value. The lock + * order matches that in dlopen to avoid deadlock. */ + pthread_rwlock_wrlock(&lock); + pthread_mutex_lock(&init_fini_lock); + shutting_down = 1; + pthread_rwlock_unlock(&lock); for (p=fini_head; p; p=p->fini_next) { + while (p->ctor_visitor && p->ctor_visitor!=self) + pthread_cond_wait(&ctor_cond, &init_fini_lock); if (!p->constructed) continue; decode_vec(p->dynv, dyn, DYN_CNT); if (dyn[0] & (1<prev) { - if (p->constructed) continue; - p->constructed = 1; + if (who<0) { + pthread_rwlock_wrlock(&lock); + pthread_mutex_lock(&init_fini_lock); + } else { + pthread_mutex_unlock(&init_fini_lock); + pthread_rwlock_unlock(&lock); + } +} + +static struct dso **queue_ctors(struct dso *dso) +{ + size_t cnt, qpos, spos, i; + struct dso *p, **queue, **stack; + + if (ldd_mode) return 0; + + /* Bound on queue size is the total number of indirect deps. + * If a bfs deps list was built, we can use it. Otherwise, + * bound by the total number of DSOs, which is always safe and + * is reasonable we use it (for main app at startup). */ + if (dso->bfs_built) { + for (cnt=0; dso->deps[cnt]; cnt++) + dso->deps[cnt]->mark = 0; + cnt++; /* self, not included in deps */ + } else { + for (cnt=0, p=head; p; cnt++, p=p->next) + p->mark = 0; + } + cnt++; /* termination slot */ + if (dso==head && cnt <= countof(builtin_ctor_queue)) + queue = builtin_ctor_queue; + else + queue = calloc(cnt, sizeof *queue); + + if (!queue) { + error("Error allocating constructor queue: %m\n"); + if (runtime) longjmp(*rtld_fail, 1); + return 0; + } + + /* Opposite ends of the allocated buffer serve as an output queue + * and a working stack. Setup initial stack with just the argument + * dso and initial queue empty... */ + stack = queue; + qpos = 0; + spos = cnt; + stack[--spos] = dso; + dso->next_dep = 0; + dso->mark = 1; + + /* Then perform pseudo-DFS sort, but ignoring circular deps. */ + while (sposnext_dep < p->ndeps_direct) { + if (p->deps[p->next_dep]->mark) { + p->next_dep++; + } else { + stack[--spos] = p; + p = p->deps[p->next_dep]; + p->next_dep = 0; + p->mark = 1; + } + } + queue[qpos++] = p; + } + queue[qpos] = 0; + for (i=0; imark = 0; + for (i=0; ictor_visitor && queue[i]->ctor_visitor->tid < 0) { + error("State of %s is inconsistent due to multithreaded fork\n", + queue[i]->name); + free(queue); + if (runtime) longjmp(*rtld_fail, 1); + } + + return queue; +} + +static void do_init_fini(struct dso **queue) +{ + struct dso *p; + size_t dyn[DYN_CNT], i; + pthread_t self = __pthread_self(); + + pthread_mutex_lock(&init_fini_lock); + for (i=0; (p=queue[i]); i++) { + while ((p->ctor_visitor && p->ctor_visitor!=self) || shutting_down) + pthread_cond_wait(&ctor_cond, &init_fini_lock); + if (p->ctor_visitor || p->constructed) + continue; + p->ctor_visitor = self; + decode_vec(p->dynv, dyn, DYN_CNT); if (dyn[0] & ((1<fini_next = fini_head; fini_head = p; } + + pthread_mutex_unlock(&init_fini_lock); + #ifndef NO_LEGACY_INITFINI if ((dyn[0] & (1<ctor_visitor = 0; + p->constructed = 1; + pthread_cond_broadcast(&ctor_cond); } - if (need_locking) pthread_mutex_unlock(&init_fini_lock); + pthread_mutex_unlock(&init_fini_lock); } void __libc_start_init(void) { - do_init_fini(tail); + do_init_fini(main_ctor_queue); + if (!__malloc_replaced && main_ctor_queue != builtin_ctor_queue) + free(main_ctor_queue); + main_ctor_queue = 0; } static void dl_debug_state(void) @@ -1255,52 +1565,6 @@ void __init_tls(size_t *auxv) { } -__attribute__((__visibility__("hidden"))) -void *__tls_get_new(size_t *v) -{ - pthread_t self = __pthread_self(); - - /* Block signals to make accessing new TLS async-signal-safe */ - sigset_t set; - __block_all_sigs(&set); - if (v[0]<=(size_t)self->dtv[0]) { - __restore_sigs(&set); - return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET; - } - - /* This is safe without any locks held because, if the caller - * is able to request the Nth entry of the DTV, the DSO list - * must be valid at least that far out and it was synchronized - * at program startup or by an already-completed call to dlopen. */ - struct dso *p; - for (p=head; p->tls_id != v[0]; p=p->next); - - /* Get new DTV space from new DSO if needed */ - if (v[0] > (size_t)self->dtv[0]) { - void **newdtv = p->new_dtv + - (v[0]+1)*a_fetch_add(&p->new_dtv_idx,1); - memcpy(newdtv, self->dtv, - ((size_t)self->dtv[0]+1) * sizeof(void *)); - newdtv[0] = (void *)v[0]; - self->dtv = self->dtv_copy = newdtv; - } - - /* Get new TLS memory from all new DSOs up to the requested one */ - unsigned char *mem; - for (p=head; ; p=p->next) { - if (!p->tls_id || self->dtv[p->tls_id]) continue; - mem = p->new_tls + (p->tls.size + p->tls.align) - * a_fetch_add(&p->new_tls_idx,1); - mem += ((uintptr_t)p->tls.image - (uintptr_t)mem) - & (p->tls.align-1); - self->dtv[p->tls_id] = mem; - memcpy(mem, p->tls.image, p->tls.len); - if (p->tls_id == v[0]) break; - } - __restore_sigs(&set); - return mem + v[1] + DTP_OFFSET; -} - static void update_tls_size() { libc.tls_cnt = tls_cnt; @@ -1313,6 +1577,56 @@ static void update_tls_size() tls_align); } +static void install_new_tls(void) +{ + sigset_t set; + pthread_t self = __pthread_self(), td; + struct dso *dtv_provider = container_of(tls_tail, struct dso, tls); + uintptr_t (*newdtv)[tls_cnt+1] = (void *)dtv_provider->new_dtv; + struct dso *p; + size_t i, j; + size_t old_cnt = self->dtv[0]; + + __block_app_sigs(&set); + __tl_lock(); + /* Copy existing dtv contents from all existing threads. */ + for (i=0, td=self; !i || td!=self; i++, td=td->next) { + memcpy(newdtv+i, td->dtv, + (old_cnt+1)*sizeof(uintptr_t)); + newdtv[i][0] = tls_cnt; + } + /* Install new dtls into the enlarged, uninstalled dtv copies. */ + for (p=head; ; p=p->next) { + if (p->tls_id <= old_cnt) continue; + unsigned char *mem = p->new_tls; + for (j=0; jtls.image - (uintptr_t)mem) + & (p->tls.align-1); + memcpy(new, p->tls.image, p->tls.len); + newdtv[j][p->tls_id] = + (uintptr_t)new + DTP_OFFSET; + mem += p->tls.size + p->tls.align; + } + if (p->tls_id == tls_cnt) break; + } + + /* Broadcast barrier to ensure contents of new dtv is visible + * if the new dtv pointer is. The __membarrier function has a + * fallback emulation using signals for kernels that lack the + * feature at the syscall level. */ + + __membarrier(MEMBARRIER_CMD_PRIVATE_EXPEDITED, 0); + + /* Install new dtv for each thread. */ + for (j=0, td=self; !j || td!=self; j++, td=td->next) { + td->dtv = newdtv[j]; + } + + __tl_unlock(); + __restore_sigs(&set); +} + /* Stage 1 of the dynamic linker is defined in dlstart.c. It calls the * following stage 2 and stage 3 functions via primitive symbolic lookup * since it does not have access to their addresses to begin with. */ @@ -1324,15 +1638,16 @@ static void update_tls_size() * linker itself, but some of the relocations performed may need to be * replaced later due to copy relocations in the main program. */ -__attribute__((__visibility__("hidden"))) -void __dls2(unsigned char *base, size_t *sp) +hidden void __dls2(unsigned char *base, size_t *sp) { + size_t *auxv; + for (auxv=sp+1+*sp+1; *auxv; auxv++); + auxv++; if (DL_FDPIC) { void *p1 = (void *)sp[-2]; void *p2 = (void *)sp[-1]; if (!p1) { - size_t *auxv, aux[AUX_CNT]; - for (auxv=sp+1+*sp+1; *auxv; auxv++); auxv++; + size_t aux[AUX_CNT]; decode_vec(auxv, aux, AUX_CNT); if (aux[AT_BASE]) ldso.base = (void *)aux[AT_BASE]; else ldso.base = (void *)(aux[AT_PHDR] & -4096); @@ -1345,7 +1660,6 @@ void __dls2(unsigned char *base, size_t *sp) } Ehdr *ehdr = (void *)ldso.base; ldso.name = ldso.shortname = "libc.so"; - ldso.global = 1; ldso.phnum = ehdr->e_phnum; ldso.phdr = laddr(&ldso, ehdr->e_phoff); ldso.phentsize = ehdr->e_phentsize; @@ -1375,12 +1689,36 @@ void __dls2(unsigned char *base, size_t *sp) ldso.relocated = 0; - /* Call dynamic linker stage-3, __dls3, looking it up + /* Call dynamic linker stage-2b, __dls2b, looking it up * symbolically as a barrier against moving the address * load across the above relocation processing. */ + struct symdef dls2b_def = find_sym(&ldso, "__dls2b", 0); + if (DL_FDPIC) ((stage3_func)&ldso.funcdescs[dls2b_def.sym-ldso.syms])(sp, auxv); + else ((stage3_func)laddr(&ldso, dls2b_def.sym->st_value))(sp, auxv); +} + +/* Stage 2b sets up a valid thread pointer, which requires relocations + * completed in stage 2, and on which stage 3 is permitted to depend. + * This is done as a separate stage, with symbolic lookup as a barrier, + * so that loads of the thread pointer and &errno can be pure/const and + * thereby hoistable. */ + +void __dls2b(size_t *sp, size_t *auxv) +{ + /* Setup early thread pointer in builtin_tls for ldso/libc itself to + * use during dynamic linking. If possible it will also serve as the + * thread pointer at runtime. */ + search_vec(auxv, &__hwcap, AT_HWCAP); + libc.auxv = auxv; + libc.tls_size = sizeof builtin_tls; + libc.tls_align = tls_align; + if (__init_tp(__copy_tls((void *)builtin_tls)) < 0) { + a_crash(); + } + struct symdef dls3_def = find_sym(&ldso, "__dls3", 0); - if (DL_FDPIC) ((stage3_func)&ldso.funcdescs[dls3_def.sym-ldso.syms])(sp); - else ((stage3_func)laddr(&ldso, dls3_def.sym->st_value))(sp); + if (DL_FDPIC) ((stage3_func)&ldso.funcdescs[dls3_def.sym-ldso.syms])(sp, auxv); + else ((stage3_func)laddr(&ldso, dls3_def.sym->st_value))(sp, auxv); } /* Stage 3 of the dynamic linker is called with the dynamic linker/libc @@ -1388,12 +1726,13 @@ void __dls2(unsigned char *base, size_t *sp) * process dependencies and relocations for the main application and * transfer control to its entry point. */ -_Noreturn void __dls3(size_t *sp) +void __dls3(size_t *sp, size_t *auxv) { static struct dso app, vdso; - size_t aux[AUX_CNT], *auxv; + size_t aux[AUX_CNT]; size_t i; char *env_preload=0; + char *replace_argv0=0; size_t vdso_base; int argc = *sp; char **argv = (void *)(sp+1); @@ -1403,23 +1742,13 @@ _Noreturn void __dls3(size_t *sp) /* Find aux vector just past environ[] and use it to initialize * global data that may be needed before we can make syscalls. */ __environ = envp; - for (i=argc+1; argv[i]; i++); - libc.auxv = auxv = (void *)(argv+i+1); decode_vec(auxv, aux, AUX_CNT); - __hwcap = aux[AT_HWCAP]; + search_vec(auxv, &__sysinfo, AT_SYSINFO); + __pthread_self()->sysinfo = __sysinfo; libc.page_size = aux[AT_PAGESZ]; libc.secure = ((aux[0]&0x7800)!=0x7800 || aux[AT_UID]!=aux[AT_EUID] || aux[AT_GID]!=aux[AT_EGID] || aux[AT_SECURE]); - /* Setup early thread pointer in builtin_tls for ldso/libc itself to - * use during dynamic linking. If possible it will also serve as the - * thread pointer at runtime. */ - libc.tls_size = sizeof builtin_tls; - libc.tls_align = tls_align; - if (__init_tp(__copy_tls((void *)builtin_tls)) < 0) { - a_crash(); - } - /* Only trust user/env if kernel says we're not suid/sgid */ if (!libc.secure) { env_path = getenv("LD_LIBRARY_PATH"); @@ -1478,6 +1807,10 @@ _Noreturn void __dls3(size_t *sp) if (opt[7]=='=') env_preload = opt+8; else if (opt[7]) *argv = 0; else if (*argv) env_preload = *argv++; + } else if (!memcmp(opt, "argv0", 5)) { + if (opt[5]=='=') replace_argv0 = opt+6; + else if (opt[5]) *argv = 0; + else if (*argv) replace_argv0 = *argv++; } else { argv[0] = 0; } @@ -1488,7 +1821,7 @@ _Noreturn void __dls3(size_t *sp) "Version %s\n" "Dynamic Program Loader\n" "Usage: %s [options] [--] pathname%s\n", - __libc_get_version(), ldname, + __libc_version, ldname, ldd_mode ? "" : " [args]"); _exit(1); } @@ -1497,13 +1830,11 @@ _Noreturn void __dls3(size_t *sp) dprintf(2, "%s: cannot load %s: %s\n", ldname, argv[0], strerror(errno)); _exit(1); } - runtime = 1; Ehdr *ehdr = (void *)map_library(fd, &app); if (!ehdr) { dprintf(2, "%s: %s: Not a valid dynamic program\n", ldname, argv[0]); _exit(1); } - runtime = 0; close(fd); ldso.name = ldname; app.name = argv[0]; @@ -1522,10 +1853,10 @@ _Noreturn void __dls3(size_t *sp) libc.tls_head = tls_tail = &app.tls; app.tls_id = tls_cnt = 1; #ifdef TLS_ABOVE_TP - app.tls.offset = 0; - tls_offset = app.tls.size - + ( -((uintptr_t)app.tls.image + app.tls.size) - & (app.tls.align-1) ); + app.tls.offset = GAP_ABOVE_TP; + app.tls.offset += (-GAP_ABOVE_TP + (uintptr_t)app.tls.image) + & (app.tls.align-1); + tls_offset = app.tls.offset + app.tls.size; #else tls_offset = app.tls.offset = app.tls.size + ( -((uintptr_t)app.tls.image + app.tls.size) @@ -1533,7 +1864,6 @@ _Noreturn void __dls3(size_t *sp) #endif tls_align = MAXP2(tls_align, app.tls.align); } - app.global = 1; decode_dyn(&app); if (DL_FDPIC) { makefuncdescs(&app); @@ -1548,8 +1878,23 @@ _Noreturn void __dls3(size_t *sp) argv[-3] = (void *)app.loadmap; } - /* Attach to vdso, if provided by the kernel */ - if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR)) { + /* Initial dso chain consists only of the app. */ + head = tail = syms_tail = &app; + + /* Donate unused parts of app and library mapping to malloc */ + reclaim_gaps(&app); + reclaim_gaps(&ldso); + + /* Load preload/needed libraries, add symbols to global namespace. */ + ldso.deps = (struct dso **)no_deps; + if (env_preload) load_preload(env_preload); + load_deps(&app); + for (struct dso *p=head; p; p=p->next) + add_syms(p); + + /* Attach to vdso, if provided by the kernel, last so that it does + * not become part of the global namespace. */ + if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR) && vdso_base) { Ehdr *ehdr = (void *)vdso_base; Phdr *phdr = vdso.phdr = (void *)(vdso_base + ehdr->e_phoff); vdso.phnum = ehdr->e_phnum; @@ -1562,26 +1907,14 @@ _Noreturn void __dls3(size_t *sp) } vdso.name = ""; vdso.shortname = "linux-gate.so.1"; - vdso.global = 1; vdso.relocated = 1; + vdso.deps = (struct dso **)no_deps; decode_dyn(&vdso); - vdso.prev = &ldso; - ldso.next = &vdso; + vdso.prev = tail; + tail->next = &vdso; + tail = &vdso; } - /* Initial dso chain consists only of the app. */ - head = tail = &app; - - /* Donate unused parts of app and library mapping to malloc */ - reclaim_gaps(&app); - reclaim_gaps(&ldso); - - /* Load preload/needed libraries, add their symbols to the global - * namespace, and perform all remaining relocations. */ - if (env_preload) load_preload(env_preload); - load_deps(&app); - make_global(&app); - for (i=0; app.dynv[i]; i+=2) { if (!DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG) app.dynv[i+1] = (size_t)&debug; @@ -1591,19 +1924,36 @@ _Noreturn void __dls3(size_t *sp) } } - /* The main program must be relocated LAST since it may contin - * copy relocations which depend on libraries' relocations. */ - reloc_all(app.next); - reloc_all(&app); + /* This must be done before final relocations, since it calls + * malloc, which may be provided by the application. Calling any + * application code prior to the jump to its entry point is not + * valid in our model and does not work with FDPIC, where there + * are additional relocation-like fixups that only the entry point + * code can see to perform. */ + main_ctor_queue = queue_ctors(&app); + /* Initial TLS must also be allocated before final relocations + * might result in calloc being a call to application code. */ update_tls_size(); + void *initial_tls = builtin_tls; if (libc.tls_size > sizeof builtin_tls || tls_align > MIN_TLS_ALIGN) { - void *initial_tls = calloc(libc.tls_size, 1); + initial_tls = calloc(libc.tls_size, 1); if (!initial_tls) { dprintf(2, "%s: Error getting %zu bytes thread-local storage: %m\n", argv[0], libc.tls_size); _exit(127); } + } + static_tls_cnt = tls_cnt; + + /* The main program must be relocated LAST since it may contain + * copy relocations which depend on libraries' relocations. */ + reloc_all(app.next); + reloc_all(&app); + + /* Actual copying to new TLS needs to happen after relocations, + * since the TLS images might have contained relocated addresses. */ + if (initial_tls != builtin_tls) { if (__init_tp(__copy_tls(initial_tls)) < 0) { a_crash(); } @@ -1617,11 +1967,18 @@ _Noreturn void __dls3(size_t *sp) if (__copy_tls((void*)builtin_tls) != self) a_crash(); libc.tls_size = tmp_tls_size; } - static_tls_cnt = tls_cnt; if (ldso_fail) _exit(127); if (ldd_mode) _exit(0); + /* Determine if malloc was interposed by a replacement implementation + * so that calloc and the memalign family can harden against the + * possibility of incomplete replacement. */ + if (find_sym(head, "malloc", 1).dso != &ldso) + __malloc_replaced = 1; + if (find_sym(head, "aligned_alloc", 1).dso != &ldso) + __aligned_alloc_replaced = 1; + /* Switch to runtime mode: any further failures in the dynamic * linker are a reportable failure rather than a fatal startup * error. */ @@ -1631,23 +1988,48 @@ _Noreturn void __dls3(size_t *sp) debug.bp = dl_debug_state; debug.head = head; debug.base = ldso.base; - debug.state = 0; + debug.state = RT_CONSISTENT; _dl_debug_state(); + if (replace_argv0) argv[0] = replace_argv0; + errno = 0; CRTJMP((void *)aux[AT_ENTRY], argv-1); for(;;); } +static void prepare_lazy(struct dso *p) +{ + size_t dyn[DYN_CNT], n, flags1=0; + decode_vec(p->dynv, dyn, DYN_CNT); + search_vec(p->dynv, &flags1, DT_FLAGS_1); + if (dyn[DT_BIND_NOW] || (dyn[DT_FLAGS] & DF_BIND_NOW) || (flags1 & DF_1_NOW)) + return; + n = dyn[DT_RELSZ]/2 + dyn[DT_RELASZ]/3 + dyn[DT_PLTRELSZ]/2 + 1; + if (NEED_MIPS_GOT_RELOCS) { + size_t j=0; search_vec(p->dynv, &j, DT_MIPS_GOTSYM); + size_t i=0; search_vec(p->dynv, &i, DT_MIPS_SYMTABNO); + n += i-j; + } + p->lazy = calloc(n, 3*sizeof(size_t)); + if (!p->lazy) { + error("Error preparing lazy relocation for %s: %m", p->name); + longjmp(*rtld_fail, 1); + } + p->lazy_next = lazy_head; + lazy_head = p; +} + void *dlopen(const char *file, int mode) { - struct dso *volatile p, *orig_tail, *next; + struct dso *volatile p, *orig_tail, *orig_syms_tail, *orig_lazy_head, *next; struct tls_module *orig_tls_tail; size_t orig_tls_cnt, orig_tls_offset, orig_tls_align; size_t i; int cs; jmp_buf jb; + struct dso **volatile ctor_queue = 0; if (!file) return head; @@ -1655,20 +2037,27 @@ void *dlopen(const char *file, int mode) pthread_rwlock_wrlock(&lock); __inhibit_ptc(); + debug.state = RT_ADD; + _dl_debug_state(); + p = 0; + if (shutting_down) { + error("Cannot dlopen while program is exiting."); + goto end; + } orig_tls_tail = tls_tail; orig_tls_cnt = tls_cnt; orig_tls_offset = tls_offset; orig_tls_align = tls_align; + orig_lazy_head = lazy_head; + orig_syms_tail = syms_tail; orig_tail = tail; noload = mode & RTLD_NOLOAD; rtld_fail = &jb; if (setjmp(*rtld_fail)) { /* Clean up anything new that was (partially) loaded */ - if (p && p->deps) for (i=0; p->deps[i]; i++) - if (p->deps[i]->global < 0) - p->deps[i]->global = 0; + revert_syms(orig_syms_tail); for (p=orig_tail->next; p; p=next) { next = p->next; while (p->td_index) { @@ -1683,11 +2072,15 @@ void *dlopen(const char *file, int mode) unmap_library(p); free(p); } + free(ctor_queue); + ctor_queue = 0; if (!orig_tls_tail) libc.tls_head = 0; tls_tail = orig_tls_tail; + if (tls_tail) tls_tail->next = 0; tls_cnt = orig_tls_cnt; tls_offset = orig_tls_offset; tls_align = orig_tls_align; + lazy_head = orig_lazy_head; tail = orig_tail; tail->next = 0; p = 0; @@ -1703,39 +2096,59 @@ void *dlopen(const char *file, int mode) } /* First load handling */ - if (!p->deps) { - load_deps(p); - if (p->deps) for (i=0; p->deps[i]; i++) - if (!p->deps[i]->global) - p->deps[i]->global = -1; - if (!p->global) p->global = -1; + load_deps(p); + extend_bfs_deps(p); + pthread_mutex_lock(&init_fini_lock); + int constructed = p->constructed; + pthread_mutex_unlock(&init_fini_lock); + if (!constructed) ctor_queue = queue_ctors(p); + if (!p->relocated && (mode & RTLD_LAZY)) { + prepare_lazy(p); + for (i=0; p->deps[i]; i++) + if (!p->deps[i]->relocated) + prepare_lazy(p->deps[i]); + } + if (!p->relocated || (mode & RTLD_GLOBAL)) { + /* Make new symbols global, at least temporarily, so we can do + * relocations. If not RTLD_GLOBAL, this is reverted below. */ + add_syms(p); + for (i=0; p->deps[i]; i++) + add_syms(p->deps[i]); + } + if (!p->relocated) { reloc_all(p); - if (p->deps) for (i=0; p->deps[i]; i++) - if (p->deps[i]->global < 0) - p->deps[i]->global = 0; - if (p->global < 0) p->global = 0; } - if (mode & RTLD_GLOBAL) { - if (p->deps) for (i=0; p->deps[i]; i++) - p->deps[i]->global = 1; - p->global = 1; - } + /* If RTLD_GLOBAL was not specified, undo any new additions + * to the global symbol table. This is a nop if the library was + * previously loaded and already global. */ + if (!(mode & RTLD_GLOBAL)) + revert_syms(orig_syms_tail); + + /* Processing of deferred lazy relocations must not happen until + * the new libraries are committed; otherwise we could end up with + * relocations resolved to symbol definitions that get removed. */ + redo_lazy_relocs(); update_tls_size(); - _dl_debug_state(); + if (tls_cnt != orig_tls_cnt) + install_new_tls(); orig_tail = tail; end: + debug.state = RT_CONSISTENT; + _dl_debug_state(); __release_ptc(); if (p) gencnt++; pthread_rwlock_unlock(&lock); - if (p) do_init_fini(orig_tail); + if (ctor_queue) { + do_init_fini(ctor_queue); + free(ctor_queue); + } pthread_setcancelstate(cs, 0); return p; } -__attribute__((__visibility__("hidden"))) -int __dl_invalid_handle(void *h) +hidden int __dl_invalid_handle(void *h) { struct dso *p; for (p=head; p; p=p->next) if (h==p) return 0; @@ -1760,81 +2173,59 @@ static void *addr2dso(size_t a) return p; } } else { + Phdr *ph = p->phdr; + size_t phcnt = p->phnum; + size_t entsz = p->phentsize; + size_t base = (size_t)p->base; + for (; phcnt--; ph=(void *)((char *)ph+entsz)) { + if (ph->p_type != PT_LOAD) continue; + if (a-base-ph->p_vaddr < ph->p_memsz) + return p; + } if (a-(size_t)p->map < p->map_len) - return p; + return 0; } } return 0; } -void *__tls_get_addr(size_t *); - static void *do_dlsym(struct dso *p, const char *s, void *ra) { - size_t i; - uint32_t h = 0, gh = 0, *ght; - Sym *sym; - if (p == head || p == RTLD_DEFAULT || p == RTLD_NEXT) { - if (p == RTLD_DEFAULT) { - p = head; - } else if (p == RTLD_NEXT) { - p = addr2dso((size_t)ra); - if (!p) p=head; - p = p->next; - } - struct symdef def = find_sym(p, s, 0); - if (!def.sym) goto failed; - if ((def.sym->st_info&0xf) == STT_TLS) - return __tls_get_addr((size_t []){def.dso->tls_id, def.sym->st_value}); - if (DL_FDPIC && (def.sym->st_info&0xf) == STT_FUNC) - return def.dso->funcdescs + (def.sym - def.dso->syms); - return laddr(def.dso, def.sym->st_value); - } - if (__dl_invalid_handle(p)) + int use_deps = 0; + if (p == head || p == RTLD_DEFAULT) { + p = head; + } else if (p == RTLD_NEXT) { + p = addr2dso((size_t)ra); + if (!p) p=head; + p = p->next; + } else if (__dl_invalid_handle(p)) { return 0; - if ((ght = p->ghashtab)) { - gh = gnu_hash(s); - sym = gnu_lookup(gh, ght, p, s); - } else { - h = sysv_hash(s); - sym = sysv_lookup(s, h, p); - } - if (sym && (sym->st_info&0xf) == STT_TLS) - return __tls_get_addr((size_t []){p->tls_id, sym->st_value}); - if (DL_FDPIC && sym && sym->st_shndx && (sym->st_info&0xf) == STT_FUNC) - return p->funcdescs + (sym - p->syms); - if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES)) - return laddr(p, sym->st_value); - if (p->deps) for (i=0; p->deps[i]; i++) { - if ((ght = p->deps[i]->ghashtab)) { - if (!gh) gh = gnu_hash(s); - sym = gnu_lookup(gh, ght, p->deps[i], s); - } else { - if (!h) h = sysv_hash(s); - sym = sysv_lookup(s, h, p->deps[i]); - } - if (sym && (sym->st_info&0xf) == STT_TLS) - return __tls_get_addr((size_t []){p->deps[i]->tls_id, sym->st_value}); - if (DL_FDPIC && sym && sym->st_shndx && (sym->st_info&0xf) == STT_FUNC) - return p->deps[i]->funcdescs + (sym - p->deps[i]->syms); - if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES)) - return laddr(p->deps[i], sym->st_value); - } -failed: - error("Symbol not found: %s", s); - return 0; + } else + use_deps = 1; + struct symdef def = find_sym2(p, s, 0, use_deps); + if (!def.sym) { + error("Symbol not found: %s", s); + return 0; + } + if ((def.sym->st_info&0xf) == STT_TLS) + return __tls_get_addr((tls_mod_off_t []){def.dso->tls_id, def.sym->st_value-DTP_OFFSET}); + if (DL_FDPIC && (def.sym->st_info&0xf) == STT_FUNC) + return def.dso->funcdescs + (def.sym - def.dso->syms); + return laddr(def.dso, def.sym->st_value); } -int dladdr(const void *addr, Dl_info *info) +int dladdr(const void *addr_arg, Dl_info *info) { + size_t addr = (size_t)addr_arg; struct dso *p; Sym *sym, *bestsym; uint32_t nsym; char *strings; - void *best = 0; + size_t best = 0; + size_t besterr = -1; pthread_rwlock_rdlock(&lock); - p = addr2dso((size_t)addr); + p = addr2dso(addr); pthread_rwlock_unlock(&lock); if (!p) return 0; @@ -1844,11 +2235,12 @@ int dladdr(const void *addr, Dl_info *info) nsym = count_syms(p); if (DL_FDPIC) { - size_t idx = ((size_t)addr-(size_t)p->funcdescs) + size_t idx = (addr-(size_t)p->funcdescs) / sizeof(*p->funcdescs); if (idx < nsym && (sym[idx].st_info&0xf) == STT_FUNC) { - best = p->funcdescs + idx; + best = (size_t)(p->funcdescs + idx); bestsym = sym + idx; + besterr = 0; } } @@ -1856,31 +2248,40 @@ int dladdr(const void *addr, Dl_info *info) if (sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES) && (1<<(sym->st_info>>4) & OK_BINDS)) { - void *symaddr = laddr(p, sym->st_value); - if (symaddr > addr || symaddr < best) + size_t symaddr = (size_t)laddr(p, sym->st_value); + if (symaddr > addr || symaddr <= best) continue; best = symaddr; bestsym = sym; + besterr = addr - symaddr; if (addr == symaddr) break; } } - if (!best) return 0; - - if (DL_FDPIC && (bestsym->st_info&0xf) == STT_FUNC) - best = p->funcdescs + (bestsym - p->syms); + if (best && besterr > bestsym->st_size-1) { + best = 0; + bestsym = 0; + } info->dli_fname = p->name; - info->dli_fbase = p->base; + info->dli_fbase = p->map; + + if (!best) { + info->dli_sname = 0; + info->dli_saddr = 0; + return 1; + } + + if (DL_FDPIC && (bestsym->st_info&0xf) == STT_FUNC) + best = (size_t)(p->funcdescs + (bestsym - p->syms)); info->dli_sname = strings + bestsym->st_name; - info->dli_saddr = best; + info->dli_saddr = (void *)best; return 1; } -__attribute__((__visibility__("hidden"))) -void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra) +hidden void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra) { void *res; pthread_rwlock_rdlock(&lock); @@ -1889,6 +2290,33 @@ void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra) return res; } +hidden void *__dlsym_redir_time64(void *restrict p, const char *restrict s, void *restrict ra) +{ +#if _REDIR_TIME64 + const char *suffix, *suffix2 = ""; + char redir[36]; + + /* Map the symbol name to a time64 version of itself according to the + * pattern used for naming the redirected time64 symbols. */ + size_t l = strnlen(s, sizeof redir); + if (l<4 || l==sizeof redir) goto no_redir; + if (s[l-2]=='_' && s[l-1]=='r') { + l -= 2; + suffix2 = s+l; + } + if (l<4) goto no_redir; + if (!strcmp(s+l-4, "time")) suffix = "64"; + else suffix = "_time64"; + + /* Use the presence of the remapped symbol name in libc to determine + * whether it's one that requires time64 redirection; replace if so. */ + snprintf(redir, sizeof redir, "__%.*s%s%s", (int)l, s, suffix, suffix2); + if (find_sym(&ldso, redir, 1).sym) s = redir; +no_redir: +#endif + return __dlsym(p, s, ra); +} + int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data) { struct dso *current; @@ -1915,9 +2343,6 @@ int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void return ret; } -__attribute__((__visibility__("hidden"))) -void __dl_vseterr(const char *, va_list); - static void error(const char *fmt, ...) { va_list ap; diff --git a/system/lib/libc/musl/src/aio/aio.c b/system/lib/libc/musl/src/aio/aio.c index aafd8e8cb7786..a1a3e7914b02e 100644 --- a/system/lib/libc/musl/src/aio/aio.c +++ b/system/lib/libc/musl/src/aio/aio.c @@ -5,10 +5,16 @@ #include #include #include +#include #include "syscall.h" #include "atomic.h" -#include "libc.h" #include "pthread_impl.h" +#include "aio_impl.h" + +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc __libc_realloc +#define free __libc_free /* The following is a threads-based implementation of AIO with minimal * dependence on implementation details. Most synchronization is @@ -41,13 +47,6 @@ * blocked permanently. */ -struct aio_args { - struct aiocb *cb; - int op; - int err; - sem_t sem; -}; - struct aio_thread { pthread_t td; struct aiocb *cb; @@ -65,21 +64,40 @@ struct aio_queue { struct aio_thread *head; }; +struct aio_args { + struct aiocb *cb; + struct aio_queue *q; + int op; + sem_t sem; +}; + static pthread_rwlock_t maplock = PTHREAD_RWLOCK_INITIALIZER; static struct aio_queue *****map; static volatile int aio_fd_cnt; volatile int __aio_fut; +static size_t io_thread_stack_size; + +#define MAX(a,b) ((a)>(b) ? (a) : (b)) + static struct aio_queue *__aio_get_queue(int fd, int need) { - if (fd < 0) return 0; + if (fd < 0) { + errno = EBADF; + return 0; + } int a=fd>>24; unsigned char b=fd>>16, c=fd>>8, d=fd; struct aio_queue *q = 0; pthread_rwlock_rdlock(&maplock); if ((!map || !map[a] || !map[a][b] || !map[a][b][c] || !(q=map[a][b][c][d])) && need) { pthread_rwlock_unlock(&maplock); + if (fcntl(fd, F_GETFD) < 0) return 0; pthread_rwlock_wrlock(&maplock); + if (!io_thread_stack_size) { + unsigned long val = __getauxval(AT_MINSIGSTKSZ); + io_thread_stack_size = MAX(MINSIGSTKSZ+2048, val+512); + } if (!map) map = calloc(sizeof *map, (-1U/2+1)>>24); if (!map) goto out; if (!map[a]) map[a] = calloc(sizeof **map, 256); @@ -196,12 +214,11 @@ static void *io_thread_func(void *ctx) size_t len = cb->aio_nbytes; off_t off = cb->aio_offset; - struct aio_queue *q = __aio_get_queue(fd, 1); + struct aio_queue *q = args->q; ssize_t ret; - args->err = q ? 0 : EAGAIN; + pthread_mutex_lock(&q->lock); sem_post(&args->sem); - if (!q) return 0; at.op = op; at.running = 1; @@ -213,7 +230,6 @@ static void *io_thread_func(void *ctx) at.prev = 0; if ((at.next = q->head)) at.next->prev = &at; q->head = &at; - q->ref++; if (!q->init) { int seekable = lseek(fd, 0, SEEK_CUR) >= 0; @@ -263,9 +279,19 @@ static int submit(struct aiocb *cb, int op) pthread_attr_t a; sigset_t allmask, origmask; pthread_t td; - struct aio_args args = { .cb = cb, .op = op }; + struct aio_queue *q = __aio_get_queue(cb->aio_fildes, 1); + struct aio_args args = { .cb = cb, .op = op, .q = q }; sem_init(&args.sem, 0, 0); + if (!q) { + if (errno != EBADF) errno = EAGAIN; + cb->__ret = -1; + cb->__err = errno; + return -1; + } + q->ref++; + pthread_mutex_unlock(&q->lock); + if (cb->aio_sigevent.sigev_notify == SIGEV_THREAD) { if (cb->aio_sigevent.sigev_notify_attributes) a = *cb->aio_sigevent.sigev_notify_attributes; @@ -273,7 +299,7 @@ static int submit(struct aiocb *cb, int op) pthread_attr_init(&a); } else { pthread_attr_init(&a); - pthread_attr_setstacksize(&a, PTHREAD_STACK_MIN); + pthread_attr_setstacksize(&a, io_thread_stack_size); pthread_attr_setguardsize(&a, 0); } pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED); @@ -281,17 +307,15 @@ static int submit(struct aiocb *cb, int op) pthread_sigmask(SIG_BLOCK, &allmask, &origmask); cb->__err = EINPROGRESS; if (pthread_create(&td, &a, io_thread_func, &args)) { - errno = EAGAIN; - ret = -1; + pthread_mutex_lock(&q->lock); + __aio_unref_queue(q); + cb->__err = errno = EAGAIN; + cb->__ret = ret = -1; } pthread_sigmask(SIG_SETMASK, &origmask, 0); if (!ret) { while (sem_wait(&args.sem)); - if (args.err) { - errno = args.err; - ret = -1; - } } return ret; @@ -343,8 +367,9 @@ int aio_cancel(int fd, struct aiocb *cb) sigfillset(&allmask); pthread_sigmask(SIG_BLOCK, &allmask, &origmask); + errno = ENOENT; if (!(q = __aio_get_queue(fd, 0))) { - if (fcntl(fd, F_GETFD) < 0) ret = -1; + if (errno == EBADF) ret = -1; goto done; } @@ -371,9 +396,23 @@ int __aio_close(int fd) return fd; } -LFS64(aio_cancel); -LFS64(aio_error); -LFS64(aio_fsync); -LFS64(aio_read); -LFS64(aio_write); -LFS64(aio_return); +void __aio_atfork(int who) +{ + if (who<0) { + pthread_rwlock_rdlock(&maplock); + return; + } + if (who>0 && map) for (int a=0; a<(-1U/2+1)>>24; a++) + if (map[a]) for (int b=0; b<256; b++) + if (map[a][b]) for (int c=0; c<256; c++) + if (map[a][b][c]) for (int d=0; d<256; d++) + map[a][b][c][d] = 0; + pthread_rwlock_unlock(&maplock); +} + +weak_alias(aio_cancel, aio_cancel64); +weak_alias(aio_error, aio_error64); +weak_alias(aio_fsync, aio_fsync64); +weak_alias(aio_read, aio_read64); +weak_alias(aio_write, aio_write64); +weak_alias(aio_return, aio_return64); diff --git a/system/lib/libc/musl/src/aio/aio_suspend.c b/system/lib/libc/musl/src/aio/aio_suspend.c index 08fb5ddcf1a7b..1c1060e340a13 100644 --- a/system/lib/libc/musl/src/aio/aio_suspend.c +++ b/system/lib/libc/musl/src/aio/aio_suspend.c @@ -2,10 +2,8 @@ #include #include #include "atomic.h" -#include "libc.h" #include "pthread_impl.h" - -extern volatile int __aio_fut; +#include "aio_impl.h" int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec *ts) { @@ -76,4 +74,6 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec } } -LFS64(aio_suspend); +#if !_REDIR_TIME64 +weak_alias(aio_suspend, aio_suspend64); +#endif diff --git a/system/lib/libc/musl/src/aio/lio_listio.c b/system/lib/libc/musl/src/aio/lio_listio.c index bd37767ebfe06..0799c15d8b16f 100644 --- a/system/lib/libc/musl/src/aio/lio_listio.c +++ b/system/lib/libc/musl/src/aio/lio_listio.c @@ -3,7 +3,6 @@ #include #include #include "pthread_impl.h" -#include "libc.h" struct lio_state { struct sigevent *sev; @@ -114,7 +113,7 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st if (st) { pthread_attr_t a; - sigset_t set; + sigset_t set, set_old; pthread_t td; if (sev->sigev_notify == SIGEV_THREAD) { @@ -129,16 +128,16 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st } pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED); sigfillset(&set); - pthread_sigmask(SIG_BLOCK, &set, &set); + pthread_sigmask(SIG_BLOCK, &set, &set_old); if (pthread_create(&td, &a, wait_thread, st)) { free(st); errno = EAGAIN; return -1; } - pthread_sigmask(SIG_SETMASK, &set, 0); + pthread_sigmask(SIG_SETMASK, &set_old, 0); } return 0; } -LFS64(lio_listio); +weak_alias(lio_listio, lio_listio64); diff --git a/system/lib/libc/musl/src/complex/__cexp.c b/system/lib/libc/musl/src/complex/__cexp.c index 05ac28c75c627..003d20af6efb7 100644 --- a/system/lib/libc/musl/src/complex/__cexp.c +++ b/system/lib/libc/musl/src/complex/__cexp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" static const uint32_t k = 1799; /* constant for reduction */ static const double kln2 = 1246.97177782734161156; /* k * ln2 */ diff --git a/system/lib/libc/musl/src/complex/__cexpf.c b/system/lib/libc/musl/src/complex/__cexpf.c index 69b54045afd4a..ee5ff2bce7e8f 100644 --- a/system/lib/libc/musl/src/complex/__cexpf.c +++ b/system/lib/libc/musl/src/complex/__cexpf.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" static const uint32_t k = 235; /* constant for reduction */ static const float kln2 = 162.88958740F; /* k * ln2 */ diff --git a/system/lib/libc/musl/src/complex/cabs.c b/system/lib/libc/musl/src/complex/cabs.c index f61d364e47d26..c5ad58ab9353a 100644 --- a/system/lib/libc/musl/src/complex/cabs.c +++ b/system/lib/libc/musl/src/complex/cabs.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" double cabs(double complex z) { diff --git a/system/lib/libc/musl/src/complex/cabsf.c b/system/lib/libc/musl/src/complex/cabsf.c index 30b25c70315dd..619f28d39de57 100644 --- a/system/lib/libc/musl/src/complex/cabsf.c +++ b/system/lib/libc/musl/src/complex/cabsf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float cabsf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/cabsl.c b/system/lib/libc/musl/src/complex/cabsl.c index 40a067c1c59f1..d37e3f2ea5059 100644 --- a/system/lib/libc/musl/src/complex/cabsl.c +++ b/system/lib/libc/musl/src/complex/cabsl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double cabsl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/cacos.c b/system/lib/libc/musl/src/complex/cacos.c index 27c356364c8c6..c39d257b44b52 100644 --- a/system/lib/libc/musl/src/complex/cacos.c +++ b/system/lib/libc/musl/src/complex/cacos.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME: Hull et al. "Implementing the complex arcsine and arccosine functions using exception handling" 1997 diff --git a/system/lib/libc/musl/src/complex/cacosf.c b/system/lib/libc/musl/src/complex/cacosf.c index 11852659523a4..2e048540fac8c 100644 --- a/system/lib/libc/musl/src/complex/cacosf.c +++ b/system/lib/libc/musl/src/complex/cacosf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME diff --git a/system/lib/libc/musl/src/complex/cacosh.c b/system/lib/libc/musl/src/complex/cacosh.c index 8c68cb01fd603..76127f75f4bb1 100644 --- a/system/lib/libc/musl/src/complex/cacosh.c +++ b/system/lib/libc/musl/src/complex/cacosh.c @@ -1,9 +1,12 @@ -#include "libm.h" +#include "complex_impl.h" /* acosh(z) = i acos(z) */ double complex cacosh(double complex z) { + int zineg = signbit(cimag(z)); + z = cacos(z); - return CMPLX(-cimag(z), creal(z)); + if (zineg) return CMPLX(cimag(z), -creal(z)); + else return CMPLX(-cimag(z), creal(z)); } diff --git a/system/lib/libc/musl/src/complex/cacoshf.c b/system/lib/libc/musl/src/complex/cacoshf.c index ade01c0907c83..8bd80581ae0d7 100644 --- a/system/lib/libc/musl/src/complex/cacoshf.c +++ b/system/lib/libc/musl/src/complex/cacoshf.c @@ -1,7 +1,10 @@ -#include "libm.h" +#include "complex_impl.h" float complex cacoshf(float complex z) { + int zineg = signbit(cimagf(z)); + z = cacosf(z); - return CMPLXF(-cimagf(z), crealf(z)); + if (zineg) return CMPLXF(cimagf(z), -crealf(z)); + else return CMPLXF(-cimagf(z), crealf(z)); } diff --git a/system/lib/libc/musl/src/complex/cacoshl.c b/system/lib/libc/musl/src/complex/cacoshl.c index 65342557f9a54..3a284be9c68c2 100644 --- a/system/lib/libc/musl/src/complex/cacoshl.c +++ b/system/lib/libc/musl/src/complex/cacoshl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex cacoshl(long double complex z) @@ -8,7 +8,10 @@ long double complex cacoshl(long double complex z) #else long double complex cacoshl(long double complex z) { + int zineg = signbit(cimagl(z)); + z = cacosl(z); - return CMPLXL(-cimagl(z), creall(z)); + if (zineg) return CMPLXL(cimagl(z), -creall(z)); + else return CMPLXL(-cimagl(z), creall(z)); } #endif diff --git a/system/lib/libc/musl/src/complex/cacosl.c b/system/lib/libc/musl/src/complex/cacosl.c index 7fd4a2f6b4424..cc20dcd7d954d 100644 --- a/system/lib/libc/musl/src/complex/cacosl.c +++ b/system/lib/libc/musl/src/complex/cacosl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex cacosl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/carg.c b/system/lib/libc/musl/src/complex/carg.c index d2d1b4623a7fc..dfe9b97a09e10 100644 --- a/system/lib/libc/musl/src/complex/carg.c +++ b/system/lib/libc/musl/src/complex/carg.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" double carg(double complex z) { diff --git a/system/lib/libc/musl/src/complex/cargf.c b/system/lib/libc/musl/src/complex/cargf.c index ce183c4b335be..9a6c19b638dde 100644 --- a/system/lib/libc/musl/src/complex/cargf.c +++ b/system/lib/libc/musl/src/complex/cargf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float cargf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/cargl.c b/system/lib/libc/musl/src/complex/cargl.c index e0d504782f1fc..88f95f96e9c02 100644 --- a/system/lib/libc/musl/src/complex/cargl.c +++ b/system/lib/libc/musl/src/complex/cargl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double cargl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/casin.c b/system/lib/libc/musl/src/complex/casin.c index dfdda988bafcd..3244bebb16934 100644 --- a/system/lib/libc/musl/src/complex/casin.c +++ b/system/lib/libc/musl/src/complex/casin.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME @@ -12,5 +12,6 @@ double complex casin(double complex z) x = creal(z); y = cimag(z); w = CMPLX(1.0 - (x - y)*(x + y), -2.0*x*y); - return clog(CMPLX(-y, x) + csqrt(w)); + double complex r = clog(CMPLX(-y, x) + csqrt(w)); + return CMPLX(cimag(r), -creal(r)); } diff --git a/system/lib/libc/musl/src/complex/casinf.c b/system/lib/libc/musl/src/complex/casinf.c index 93f0e335092b0..2cda2f086b252 100644 --- a/system/lib/libc/musl/src/complex/casinf.c +++ b/system/lib/libc/musl/src/complex/casinf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME @@ -10,5 +10,6 @@ float complex casinf(float complex z) x = crealf(z); y = cimagf(z); w = CMPLXF(1.0 - (x - y)*(x + y), -2.0*x*y); - return clogf(CMPLXF(-y, x) + csqrtf(w)); + float complex r = clogf(CMPLXF(-y, x) + csqrtf(w)); + return CMPLXF(cimagf(r), -crealf(r)); } diff --git a/system/lib/libc/musl/src/complex/casinh.c b/system/lib/libc/musl/src/complex/casinh.c index b57fe8c40ba3b..50bf27ce88ea4 100644 --- a/system/lib/libc/musl/src/complex/casinh.c +++ b/system/lib/libc/musl/src/complex/casinh.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* asinh(z) = -i asin(i z) */ diff --git a/system/lib/libc/musl/src/complex/casinhf.c b/system/lib/libc/musl/src/complex/casinhf.c index a11bf902d86f9..93d82e5f4f11f 100644 --- a/system/lib/libc/musl/src/complex/casinhf.c +++ b/system/lib/libc/musl/src/complex/casinhf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex casinhf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/casinhl.c b/system/lib/libc/musl/src/complex/casinhl.c index 714f189359071..68ba3ddfce16b 100644 --- a/system/lib/libc/musl/src/complex/casinhl.c +++ b/system/lib/libc/musl/src/complex/casinhl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex casinhl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/casinl.c b/system/lib/libc/musl/src/complex/casinl.c index 0916c60f2a6b3..072adc450d2b0 100644 --- a/system/lib/libc/musl/src/complex/casinl.c +++ b/system/lib/libc/musl/src/complex/casinl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex casinl(long double complex z) @@ -15,6 +15,7 @@ long double complex casinl(long double complex z) x = creall(z); y = cimagl(z); w = CMPLXL(1.0 - (x - y)*(x + y), -2.0*x*y); - return clogl(CMPLXL(-y, x) + csqrtl(w)); + long double complex r = clogl(CMPLXL(-y, x) + csqrtl(w)); + return CMPLXL(cimagl(r), -creall(r)); } #endif diff --git a/system/lib/libc/musl/src/complex/catan.c b/system/lib/libc/musl/src/complex/catan.c index 39ce6cf2ff6fc..ccc2fb539af79 100644 --- a/system/lib/libc/musl/src/complex/catan.c +++ b/system/lib/libc/musl/src/complex/catan.c @@ -58,7 +58,7 @@ * 2.9e-17. See also clog(). */ -#include "libm.h" +#include "complex_impl.h" #define MAXNUM 1.0e308 @@ -91,29 +91,17 @@ double complex catan(double complex z) x = creal(z); y = cimag(z); - if (x == 0.0 && y > 1.0) - goto ovrf; - x2 = x * x; a = 1.0 - x2 - (y * y); - if (a == 0.0) - goto ovrf; t = 0.5 * atan2(2.0 * x, a); w = _redupi(t); t = y - 1.0; a = x2 + (t * t); - if (a == 0.0) - goto ovrf; t = y + 1.0; a = (x2 + t * t)/a; - w = w + (0.25 * log(a)) * I; - return w; - -ovrf: - // FIXME - w = MAXNUM + MAXNUM * I; + w = CMPLX(w, 0.25 * log(a)); return w; } diff --git a/system/lib/libc/musl/src/complex/catanf.c b/system/lib/libc/musl/src/complex/catanf.c index 8533bde397fba..ef3907a5069e2 100644 --- a/system/lib/libc/musl/src/complex/catanf.c +++ b/system/lib/libc/musl/src/complex/catanf.c @@ -53,7 +53,7 @@ * IEEE -10,+10 30000 2.3e-6 5.2e-8 */ -#include "libm.h" +#include "complex_impl.h" #define MAXNUMF 1.0e38F @@ -87,29 +87,17 @@ float complex catanf(float complex z) x = crealf(z); y = cimagf(z); - if ((x == 0.0f) && (y > 1.0f)) - goto ovrf; - x2 = x * x; a = 1.0f - x2 - (y * y); - if (a == 0.0f) - goto ovrf; t = 0.5f * atan2f(2.0f * x, a); w = _redupif(t); t = y - 1.0f; a = x2 + (t * t); - if (a == 0.0f) - goto ovrf; t = y + 1.0f; a = (x2 + (t * t))/a; - w = w + (0.25f * logf (a)) * I; - return w; - -ovrf: - // FIXME - w = MAXNUMF + MAXNUMF * I; + w = CMPLXF(w, 0.25f * logf(a)); return w; } diff --git a/system/lib/libc/musl/src/complex/catanh.c b/system/lib/libc/musl/src/complex/catanh.c index e248d9b934135..c324c7f2bca80 100644 --- a/system/lib/libc/musl/src/complex/catanh.c +++ b/system/lib/libc/musl/src/complex/catanh.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* atanh = -i atan(i z) */ diff --git a/system/lib/libc/musl/src/complex/catanhf.c b/system/lib/libc/musl/src/complex/catanhf.c index 4a5eb04079b9d..b0505f6054053 100644 --- a/system/lib/libc/musl/src/complex/catanhf.c +++ b/system/lib/libc/musl/src/complex/catanhf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex catanhf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/catanhl.c b/system/lib/libc/musl/src/complex/catanhl.c index a5dd538e44535..6025c414053c0 100644 --- a/system/lib/libc/musl/src/complex/catanhl.c +++ b/system/lib/libc/musl/src/complex/catanhl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex catanhl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/catanl.c b/system/lib/libc/musl/src/complex/catanl.c index 5ace7704fdc08..e62526c00672b 100644 --- a/system/lib/libc/musl/src/complex/catanl.c +++ b/system/lib/libc/musl/src/complex/catanl.c @@ -59,7 +59,7 @@ #include #include -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex catanl(long double complex z) @@ -97,30 +97,18 @@ long double complex catanl(long double complex z) x = creall(z); y = cimagl(z); - if ((x == 0.0L) && (y > 1.0L)) - goto ovrf; - x2 = x * x; a = 1.0L - x2 - (y * y); - if (a == 0.0L) - goto ovrf; t = atan2l(2.0L * x, a) * 0.5L; w = redupil(t); t = y - 1.0L; a = x2 + (t * t); - if (a == 0.0L) - goto ovrf; t = y + 1.0L; a = (x2 + (t * t)) / a; - w = w + (0.25L * logl(a)) * I; - return w; - -ovrf: - // FIXME - w = LDBL_MAX + LDBL_MAX * I; + w = CMPLXF(w, 0.25L * logl(a)); return w; } #endif diff --git a/system/lib/libc/musl/src/complex/ccos.c b/system/lib/libc/musl/src/complex/ccos.c index 645aec29a9dc0..f32e1fadfbf34 100644 --- a/system/lib/libc/musl/src/complex/ccos.c +++ b/system/lib/libc/musl/src/complex/ccos.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* cos(z) = cosh(i z) */ diff --git a/system/lib/libc/musl/src/complex/ccosf.c b/system/lib/libc/musl/src/complex/ccosf.c index 9a67241f1cfb4..490be9b3f218b 100644 --- a/system/lib/libc/musl/src/complex/ccosf.c +++ b/system/lib/libc/musl/src/complex/ccosf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex ccosf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/ccosh.c b/system/lib/libc/musl/src/complex/ccosh.c index 401f3c604237c..c995da7bb2247 100644 --- a/system/lib/libc/musl/src/complex/ccosh.c +++ b/system/lib/libc/musl/src/complex/ccosh.c @@ -34,7 +34,7 @@ * These values and the return value were taken from n1124.pdf. */ -#include "libm.h" +#include "complex_impl.h" static const double huge = 0x1p1023; diff --git a/system/lib/libc/musl/src/complex/ccoshf.c b/system/lib/libc/musl/src/complex/ccoshf.c index 90acfe05829f3..189ce946dd476 100644 --- a/system/lib/libc/musl/src/complex/ccoshf.c +++ b/system/lib/libc/musl/src/complex/ccoshf.c @@ -28,7 +28,7 @@ * Hyperbolic cosine of a complex argument. See s_ccosh.c for details. */ -#include "libm.h" +#include "complex_impl.h" static const float huge = 0x1p127; diff --git a/system/lib/libc/musl/src/complex/ccoshl.c b/system/lib/libc/musl/src/complex/ccoshl.c index 9b2aed9ef16c4..ffb4d8a1465f4 100644 --- a/system/lib/libc/musl/src/complex/ccoshl.c +++ b/system/lib/libc/musl/src/complex/ccoshl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" //FIXME long double complex ccoshl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/ccosl.c b/system/lib/libc/musl/src/complex/ccosl.c index d787047fec8d5..2530006bfc426 100644 --- a/system/lib/libc/musl/src/complex/ccosl.c +++ b/system/lib/libc/musl/src/complex/ccosl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex ccosl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/cexp.c b/system/lib/libc/musl/src/complex/cexp.c index 5118e00ea5b74..7fb489bb930c4 100644 --- a/system/lib/libc/musl/src/complex/cexp.c +++ b/system/lib/libc/musl/src/complex/cexp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" static const uint32_t exp_ovfl = 0x40862e42, /* high bits of MAX_EXP * ln2 ~= 710 */ diff --git a/system/lib/libc/musl/src/complex/cexpf.c b/system/lib/libc/musl/src/complex/cexpf.c index 1a09964cbb52d..00d258f3fcea4 100644 --- a/system/lib/libc/musl/src/complex/cexpf.c +++ b/system/lib/libc/musl/src/complex/cexpf.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" static const uint32_t exp_ovfl = 0x42b17218, /* MAX_EXP * ln2 ~= 88.722839355 */ diff --git a/system/lib/libc/musl/src/complex/cexpl.c b/system/lib/libc/musl/src/complex/cexpl.c index a27f85c052c1b..d4df950e335cb 100644 --- a/system/lib/libc/musl/src/complex/cexpl.c +++ b/system/lib/libc/musl/src/complex/cexpl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" //FIXME long double complex cexpl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/cimag.c b/system/lib/libc/musl/src/complex/cimag.c index 00955641b14a9..d6b0e6838c82a 100644 --- a/system/lib/libc/musl/src/complex/cimag.c +++ b/system/lib/libc/musl/src/complex/cimag.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" double (cimag)(double complex z) { diff --git a/system/lib/libc/musl/src/complex/cimagf.c b/system/lib/libc/musl/src/complex/cimagf.c index f7bcd76e439fe..b7166dcfa940d 100644 --- a/system/lib/libc/musl/src/complex/cimagf.c +++ b/system/lib/libc/musl/src/complex/cimagf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float (cimagf)(float complex z) { diff --git a/system/lib/libc/musl/src/complex/cimagl.c b/system/lib/libc/musl/src/complex/cimagl.c index 9ec24eeeafc56..4db77f201e0d2 100644 --- a/system/lib/libc/musl/src/complex/cimagl.c +++ b/system/lib/libc/musl/src/complex/cimagl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" long double (cimagl)(long double complex z) { diff --git a/system/lib/libc/musl/src/complex/clog.c b/system/lib/libc/musl/src/complex/clog.c index 12aae9c7e9a02..b587c2915a002 100644 --- a/system/lib/libc/musl/src/complex/clog.c +++ b/system/lib/libc/musl/src/complex/clog.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME diff --git a/system/lib/libc/musl/src/complex/clogf.c b/system/lib/libc/musl/src/complex/clogf.c index e9b32e6087bf2..0389d4723082b 100644 --- a/system/lib/libc/musl/src/complex/clogf.c +++ b/system/lib/libc/musl/src/complex/clogf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" // FIXME diff --git a/system/lib/libc/musl/src/complex/clogl.c b/system/lib/libc/musl/src/complex/clogl.c index 18f16088d7a31..88e83e87c9259 100644 --- a/system/lib/libc/musl/src/complex/clogl.c +++ b/system/lib/libc/musl/src/complex/clogl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex clogl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/conj.c b/system/lib/libc/musl/src/complex/conj.c index 0b3f5f46306c7..a3b19a4aa979a 100644 --- a/system/lib/libc/musl/src/complex/conj.c +++ b/system/lib/libc/musl/src/complex/conj.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" double complex conj(double complex z) { diff --git a/system/lib/libc/musl/src/complex/conjf.c b/system/lib/libc/musl/src/complex/conjf.c index 9af6b2c3b4549..b2195c84019a9 100644 --- a/system/lib/libc/musl/src/complex/conjf.c +++ b/system/lib/libc/musl/src/complex/conjf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex conjf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/conjl.c b/system/lib/libc/musl/src/complex/conjl.c index 67f11b9dde8ee..87a4ebecc3653 100644 --- a/system/lib/libc/musl/src/complex/conjl.c +++ b/system/lib/libc/musl/src/complex/conjl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" long double complex conjl(long double complex z) { diff --git a/system/lib/libc/musl/src/complex/cpow.c b/system/lib/libc/musl/src/complex/cpow.c index f863588fe7881..1137d3911724c 100644 --- a/system/lib/libc/musl/src/complex/cpow.c +++ b/system/lib/libc/musl/src/complex/cpow.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* pow(z, c) = exp(c log(z)), See C99 G.6.4.1 */ diff --git a/system/lib/libc/musl/src/complex/cpowf.c b/system/lib/libc/musl/src/complex/cpowf.c index 53c65dcb1112a..f3fd4b7b771be 100644 --- a/system/lib/libc/musl/src/complex/cpowf.c +++ b/system/lib/libc/musl/src/complex/cpowf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex cpowf(float complex z, float complex c) { diff --git a/system/lib/libc/musl/src/complex/cpowl.c b/system/lib/libc/musl/src/complex/cpowl.c index c1a80a7b255bd..be36f046134aa 100644 --- a/system/lib/libc/musl/src/complex/cpowl.c +++ b/system/lib/libc/musl/src/complex/cpowl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex cpowl(long double complex z, long double complex c) diff --git a/system/lib/libc/musl/src/complex/cproj.c b/system/lib/libc/musl/src/complex/cproj.c index 15f358a14f045..9ae1e17c0d8e2 100644 --- a/system/lib/libc/musl/src/complex/cproj.c +++ b/system/lib/libc/musl/src/complex/cproj.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" double complex cproj(double complex z) { diff --git a/system/lib/libc/musl/src/complex/cprojf.c b/system/lib/libc/musl/src/complex/cprojf.c index 653be5e87cfcb..03fab339d9215 100644 --- a/system/lib/libc/musl/src/complex/cprojf.c +++ b/system/lib/libc/musl/src/complex/cprojf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex cprojf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/cprojl.c b/system/lib/libc/musl/src/complex/cprojl.c index 6731aaa2aaaeb..38a494c5c4b9c 100644 --- a/system/lib/libc/musl/src/complex/cprojl.c +++ b/system/lib/libc/musl/src/complex/cprojl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex cprojl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/csin.c b/system/lib/libc/musl/src/complex/csin.c index ad8ae67ad99a5..535c4bf8b0b0c 100644 --- a/system/lib/libc/musl/src/complex/csin.c +++ b/system/lib/libc/musl/src/complex/csin.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* sin(z) = -i sinh(i z) */ diff --git a/system/lib/libc/musl/src/complex/csinf.c b/system/lib/libc/musl/src/complex/csinf.c index 60b3cbaa8681a..69f5164eb9982 100644 --- a/system/lib/libc/musl/src/complex/csinf.c +++ b/system/lib/libc/musl/src/complex/csinf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex csinf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/csinh.c b/system/lib/libc/musl/src/complex/csinh.c index 0f8035d1ca41f..eda0ab59f445d 100644 --- a/system/lib/libc/musl/src/complex/csinh.c +++ b/system/lib/libc/musl/src/complex/csinh.c @@ -34,7 +34,7 @@ * These values and the return value were taken from n1124.pdf. */ -#include "libm.h" +#include "complex_impl.h" static const double huge = 0x1p1023; diff --git a/system/lib/libc/musl/src/complex/csinhf.c b/system/lib/libc/musl/src/complex/csinhf.c index 49697f02f4a35..eb1d98c524a7d 100644 --- a/system/lib/libc/musl/src/complex/csinhf.c +++ b/system/lib/libc/musl/src/complex/csinhf.c @@ -28,7 +28,7 @@ * Hyperbolic sine of a complex argument z. See s_csinh.c for details. */ -#include "libm.h" +#include "complex_impl.h" static const float huge = 0x1p127; diff --git a/system/lib/libc/musl/src/complex/csinhl.c b/system/lib/libc/musl/src/complex/csinhl.c index c566653b3356f..09fd18f931126 100644 --- a/system/lib/libc/musl/src/complex/csinhl.c +++ b/system/lib/libc/musl/src/complex/csinhl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" //FIXME long double complex csinhl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/csinl.c b/system/lib/libc/musl/src/complex/csinl.c index 4e9f86c3ae4dc..90a4eb377777d 100644 --- a/system/lib/libc/musl/src/complex/csinl.c +++ b/system/lib/libc/musl/src/complex/csinl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex csinl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/csqrt.c b/system/lib/libc/musl/src/complex/csqrt.c index 8a2ba60801223..c36de00196cfe 100644 --- a/system/lib/libc/musl/src/complex/csqrt.c +++ b/system/lib/libc/musl/src/complex/csqrt.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" /* * gcc doesn't implement complex multiplication or division correctly, diff --git a/system/lib/libc/musl/src/complex/csqrtf.c b/system/lib/libc/musl/src/complex/csqrtf.c index ab5102f035b9e..a6163974da042 100644 --- a/system/lib/libc/musl/src/complex/csqrtf.c +++ b/system/lib/libc/musl/src/complex/csqrtf.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -#include "libm.h" +#include "complex_impl.h" /* * gcc doesn't implement complex multiplication or division correctly, diff --git a/system/lib/libc/musl/src/complex/csqrtl.c b/system/lib/libc/musl/src/complex/csqrtl.c index 0600ef3bebcd3..225393790420d 100644 --- a/system/lib/libc/musl/src/complex/csqrtl.c +++ b/system/lib/libc/musl/src/complex/csqrtl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" //FIXME long double complex csqrtl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/ctan.c b/system/lib/libc/musl/src/complex/ctan.c index c09263744b869..918717bfcc422 100644 --- a/system/lib/libc/musl/src/complex/ctan.c +++ b/system/lib/libc/musl/src/complex/ctan.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" /* tan(z) = -i tanh(i z) */ diff --git a/system/lib/libc/musl/src/complex/ctanf.c b/system/lib/libc/musl/src/complex/ctanf.c index 009b1921ba356..04c3ff198a24f 100644 --- a/system/lib/libc/musl/src/complex/ctanf.c +++ b/system/lib/libc/musl/src/complex/ctanf.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" float complex ctanf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/ctanh.c b/system/lib/libc/musl/src/complex/ctanh.c index 3ba3a8997d803..54004cd7dcd97 100644 --- a/system/lib/libc/musl/src/complex/ctanh.c +++ b/system/lib/libc/musl/src/complex/ctanh.c @@ -63,7 +63,7 @@ * precision. I also handle large x differently. */ -#include "libm.h" +#include "complex_impl.h" double complex ctanh(double complex z) { diff --git a/system/lib/libc/musl/src/complex/ctanhf.c b/system/lib/libc/musl/src/complex/ctanhf.c index 72b76da075cf8..7f422ba7fd3a5 100644 --- a/system/lib/libc/musl/src/complex/ctanhf.c +++ b/system/lib/libc/musl/src/complex/ctanhf.c @@ -28,7 +28,7 @@ * Hyperbolic tangent of a complex argument z. See s_ctanh.c for details. */ -#include "libm.h" +#include "complex_impl.h" float complex ctanhf(float complex z) { diff --git a/system/lib/libc/musl/src/complex/ctanhl.c b/system/lib/libc/musl/src/complex/ctanhl.c index 89a75d1334670..45d5862c8baca 100644 --- a/system/lib/libc/musl/src/complex/ctanhl.c +++ b/system/lib/libc/musl/src/complex/ctanhl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" //FIXME long double complex ctanhl(long double complex z) diff --git a/system/lib/libc/musl/src/complex/ctanl.c b/system/lib/libc/musl/src/complex/ctanl.c index ac1c3e0ad86d7..4b87420d8ac18 100644 --- a/system/lib/libc/musl/src/complex/ctanl.c +++ b/system/lib/libc/musl/src/complex/ctanl.c @@ -1,4 +1,4 @@ -#include "libm.h" +#include "complex_impl.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double complex ctanl(long double complex z) diff --git a/system/lib/libc/musl/src/conf/confstr.c b/system/lib/libc/musl/src/conf/confstr.c index 0cbd9d2b622d7..0dba71fca542d 100644 --- a/system/lib/libc/musl/src/conf/confstr.c +++ b/system/lib/libc/musl/src/conf/confstr.c @@ -26,7 +26,7 @@ size_t confstr(int name, char *buf, size_t len) } else if (name == _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS) { s = "-m32 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"; #endif - } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>31U) { + } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) { errno = EINVAL; return 0; } diff --git a/system/lib/libc/musl/src/conf/fpathconf.c b/system/lib/libc/musl/src/conf/fpathconf.c index 8eb037e6b1173..3161c76ffcab4 100644 --- a/system/lib/libc/musl/src/conf/fpathconf.c +++ b/system/lib/libc/musl/src/conf/fpathconf.c @@ -24,7 +24,7 @@ long fpathconf(int fd, int name) [_PC_REC_MIN_XFER_SIZE] = 4096, [_PC_REC_XFER_ALIGN] = 4096, [_PC_ALLOC_SIZE_MIN] = 4096, - [_PC_SYMLINK_MAX] = SYMLINK_MAX, + [_PC_SYMLINK_MAX] = 255, // XXX EMSCRIPTEN replace -1 [_PC_2_SYMLINKS] = 1 }; if (name >= sizeof(values)/sizeof(values[0])) { diff --git a/system/lib/libc/musl/src/conf/sysconf.c b/system/lib/libc/musl/src/conf/sysconf.c index f9dc80b8ea659..6465ef5d3074d 100644 --- a/system/lib/libc/musl/src/conf/sysconf.c +++ b/system/lib/libc/musl/src/conf/sysconf.c @@ -23,6 +23,7 @@ #define JT_PHYS_PAGES JT(8) #define JT_AVPHYS_PAGES JT(9) #define JT_ZERO JT(10) +#define JT_DELAYTIMER_MAX JT(11) #define RLIM(x) (-32768|(RLIMIT_ ## x)) @@ -158,8 +159,8 @@ long sysconf(int name) [_SC_IPV6] = VER, [_SC_RAW_SOCKETS] = VER, [_SC_V7_ILP32_OFF32] = -1, - [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : JT_ZERO, - [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : JT_ZERO, + [_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1, + [_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1, [_SC_V7_LPBIG_OFFBIG] = -1, [_SC_SS_REPL_MAX] = -1, [_SC_TRACE_EVENT_NAME_MAX] = -1, @@ -179,6 +180,8 @@ long sysconf(int name) } else if (values[name] < -256) { struct rlimit lim; getrlimit(values[name]&16383, &lim); + if (lim.rlim_cur == RLIM_INFINITY) + return -1; return lim.rlim_cur > LONG_MAX ? LONG_MAX : lim.rlim_cur; } @@ -193,6 +196,8 @@ long sysconf(int name) return PAGE_SIZE; case JT_SEM_VALUE_MAX & 255: return SEM_VALUE_MAX; + case JT_DELAYTIMER_MAX & 255: + return DELAYTIMER_MAX; case JT_NPROCESSORS_CONF & 255: case JT_NPROCESSORS_ONLN & 255: ; #ifdef __EMSCRIPTEN__ @@ -211,7 +216,6 @@ long sysconf(int name) return emscripten_get_heap_max() / PAGE_SIZE; #else unsigned long long mem; - int __lsysinfo(struct sysinfo *); struct sysinfo si; __lsysinfo(&si); if (!si.mem_unit) si.mem_unit = 1; diff --git a/system/lib/libc/musl/src/crypt/crypt.c b/system/lib/libc/musl/src/crypt/crypt.c index 46500737b6598..e6237e397fc75 100644 --- a/system/lib/libc/musl/src/crypt/crypt.c +++ b/system/lib/libc/musl/src/crypt/crypt.c @@ -1,8 +1,6 @@ #include #include -char *__crypt_r(const char *, const char *, struct crypt_data *); - char *crypt(const char *key, const char *salt) { /* This buffer is sufficiently large for all diff --git a/system/lib/libc/musl/src/crypt/crypt_blowfish.c b/system/lib/libc/musl/src/crypt/crypt_blowfish.c index d3f798517e872..d722607b02290 100644 --- a/system/lib/libc/musl/src/crypt/crypt_blowfish.c +++ b/system/lib/libc/musl/src/crypt/crypt_blowfish.c @@ -15,7 +15,7 @@ * No copyright is claimed, and the software is hereby placed in the public * domain. In case this attempt to disclaim copyright and place the software * in the public domain is deemed null and void, then the software is - * Copyright (c) 1998-2012 Solar Designer and it is hereby released to the + * Copyright (c) 1998-2014 Solar Designer and it is hereby released to the * general public under the following terms: * * Redistribution and use in source and binary forms, with or without @@ -31,12 +31,12 @@ * you place this code and any modifications you make under a license * of your choice. * - * This implementation is mostly compatible with OpenBSD's bcrypt.c (prefix - * "$2a$") by Niels Provos , and uses some of his - * ideas. The password hashing algorithm was designed by David Mazieres - * . For more information on the level of compatibility, - * please refer to the comments in BF_set_key() below and to the included - * crypt(3) man page. + * This implementation is fully compatible with OpenBSD's bcrypt.c for prefix + * "$2b$", originally by Niels Provos , and it uses + * some of his ideas. The password hashing algorithm was designed by David + * Mazieres . For information on the level of + * compatibility for bcrypt hash prefixes other than "$2b$", please refer to + * the comments in BF_set_key() below and to the included crypt(3) man page. * * There's a paper on the algorithm that explains its design decisions: * @@ -533,6 +533,7 @@ static void BF_set_key(const char *key, BF_key expanded, BF_key initial, * Valid combinations of settings are: * * Prefix "$2a$": bug = 0, safety = 0x10000 + * Prefix "$2b$": bug = 0, safety = 0 * Prefix "$2x$": bug = 1, safety = 0 * Prefix "$2y$": bug = 0, safety = 0 */ @@ -596,12 +597,14 @@ static void BF_set_key(const char *key, BF_key expanded, BF_key initial, initial[0] ^= sign; } +static const unsigned char flags_by_subtype[26] = { + 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0 +}; + static char *BF_crypt(const char *key, const char *setting, char *output, BF_word min) { - static const unsigned char flags_by_subtype[26] = - {2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0}; struct { BF_ctx ctx; BF_key expanded_key; @@ -746,9 +749,11 @@ char *__crypt_blowfish(const char *key, const char *setting, char *output) { const char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8"; const char *test_setting = "$2a$00$abcdefghijklmnopqrstuu"; - static const char test_hash[2][34] = - {"VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55", /* $2x$ */ - "i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55"}; /* $2a$, $2y$ */ + static const char test_hashes[2][34] = { + "i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55", /* 'a', 'b', 'y' */ + "VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55", /* 'x' */ + }; + const char *test_hash = test_hashes[0]; char *retval; const char *p; int ok; @@ -768,8 +773,11 @@ char *__crypt_blowfish(const char *key, const char *setting, char *output) * detected by the self-test. */ memcpy(buf.s, test_setting, sizeof(buf.s)); - if (retval) + if (retval) { + unsigned int flags = flags_by_subtype[setting[2] - 'a']; + test_hash = test_hashes[flags & 1]; buf.s[2] = setting[2]; + } memset(buf.o, 0x55, sizeof(buf.o)); buf.o[sizeof(buf.o) - 1] = 0; p = BF_crypt(test_key, buf.s, buf.o, 1); @@ -777,7 +785,7 @@ char *__crypt_blowfish(const char *key, const char *setting, char *output) ok = (p == buf.o && !memcmp(p, buf.s, 7 + 22) && !memcmp(p + (7 + 22), - test_hash[buf.s[2] & 1], + test_hash, 31 + 1 + 1 + 1)); { diff --git a/system/lib/libc/musl/src/crypt/crypt_des.c b/system/lib/libc/musl/src/crypt/crypt_des.c index d5766a7afced1..338a8f3715f2d 100644 --- a/system/lib/libc/musl/src/crypt/crypt_des.c +++ b/system/lib/libc/musl/src/crypt/crypt_des.c @@ -56,9 +56,7 @@ #include #include -struct expanded_key { - uint32_t l[16], r[16]; -}; +#include "crypt_des.h" #define _PASSWORD_EFMT1 '_' diff --git a/system/lib/libc/musl/src/crypt/crypt_des.h b/system/lib/libc/musl/src/crypt/crypt_des.h new file mode 100644 index 0000000000000..96748b56307ee --- /dev/null +++ b/system/lib/libc/musl/src/crypt/crypt_des.h @@ -0,0 +1,14 @@ +#ifndef CRYPT_DES_H +#define CRYPT_DES_H + +#include + +struct expanded_key { + uint32_t l[16], r[16]; +}; + +hidden void __des_setkey(const unsigned char *, struct expanded_key *); +hidden void __do_des(uint32_t, uint32_t, uint32_t *, uint32_t *, + uint32_t, uint32_t, const struct expanded_key *); + +#endif diff --git a/system/lib/libc/musl/src/crypt/crypt_r.c b/system/lib/libc/musl/src/crypt/crypt_r.c index 5982c4c9abc7d..db6015e236f63 100644 --- a/system/lib/libc/musl/src/crypt/crypt_r.c +++ b/system/lib/libc/musl/src/crypt/crypt_r.c @@ -1,13 +1,4 @@ #include -#include "libc.h" - -struct crypt_data; - -char *__crypt_des(const char *, const char *, char *); -char *__crypt_md5(const char *, const char *, char *); -char *__crypt_blowfish(const char *, const char *, char *); -char *__crypt_sha256(const char *, const char *, char *); -char *__crypt_sha512(const char *, const char *, char *); char *__crypt_r(const char *key, const char *salt, struct crypt_data *data) { diff --git a/system/lib/libc/musl/src/crypt/encrypt.c b/system/lib/libc/musl/src/crypt/encrypt.c index 9332a6dee10a5..216abc919b329 100644 --- a/system/lib/libc/musl/src/crypt/encrypt.c +++ b/system/lib/libc/musl/src/crypt/encrypt.c @@ -2,15 +2,7 @@ #include #include -struct expanded_key { - uint32_t l[16], r[16]; -}; - -void __des_setkey(const unsigned char *key, struct expanded_key *ekey); -void __do_des(uint32_t l_in, uint32_t r_in, - uint32_t *l_out, uint32_t *r_out, - uint32_t count, uint32_t saltbits, const struct expanded_key *ekey); - +#include "crypt_des.h" static struct expanded_key __encrypt_key; diff --git a/system/lib/libc/musl/src/ctype/alpha.h b/system/lib/libc/musl/src/ctype/alpha.h index b318c827f4d75..4167f3876c6cc 100644 --- a/system/lib/libc/musl/src/ctype/alpha.h +++ b/system/lib/libc/musl/src/ctype/alpha.h @@ -7,119 +7,166 @@ 17,17,17,55,17,17,17,17,56,17,57,58,59,60,61,62,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,63,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,64,65,17,66,67,68,69,70,71,72, -73,16,16,16,74,75,76,77,78,16,16,16,79,80,16,16,16,16,81,16,16,16,16,16,16,16, -16,16,17,17,17,82,83,16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,84,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,64,65,17,66,67, +68,69,70,71,72,73,74,17,75,76,77,78,79,80,81,16,82,83,84,85,86,87,88,89,90,91, +92,93,16,94,95,96,16,17,17,17,97,98,99,16,16,16,16,16,16,16,16,16,16,17,17,17, +17,100,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,101,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,85,16, -16,16,16,86,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,87,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -88,89,90,91,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -92,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255, +16,16,17,17,102,103,16,16,104,105,17,17,17,17,17,17,17,17,17,17,17,17,17,17, +17,17,17,17,17,17,17,17,17,106,17,17,107,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17, +108,109,16,16,16,16,16,16,16,16,16,110,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,111,112,113,114,16,16,16,16,16,16,16,16,115,116, +117,16,16,16,16,16,118,119,16,16,16,16,120,16,16,121,16,16,16,16,16,16,16,16, +16,16,16,16,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,254,255,255,7,254, +255,255,7,0,0,0,0,0,4,32,4,255,255,127,255,255,255,127,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,195,255,3,0,31,80,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,223,188,64,215,255,255, +251,255,255,255,255,255,255,255,255,255,191,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,3,252,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,254,255,255,255,127,2,255,255,255, +255,255,1,0,0,0,0,255,191,182,0,255,255,255,135,7,0,0,0,255,7,255,255,255,255, +255,255,255,254,255,195,255,255,255,255,255,255,255,255,255,255,255,255,239, +31,254,225,255, +159,0,0,255,255,255,255,255,255,0,224,255,255,255,255,255,255,255,255,255,255, +255,255,3,0,255,255,255,255,255,7,48,4,255,255,255,252,255,31,0,0,255,255,255, +1,255,7,0,0,0,0,0,0,255,255,223,63,0,0,240,255,248,3,255,255,255,255,255,255, +255,255,255,239,255,223,225,255,207,255,254,255,239,159,249,255,255,253,197, +227,159,89,128,176,207,255,3,16,238,135,249,255,255,253,109,195,135,25,2,94, +192,255,63,0,238,191,251,255,255,253,237,227,191,27,1,0,207,255,0,30,238,159, +249,255,255,253,237,227,159,25,192,176,207,255,2,0,236,199,61,214,24,199,255, +195,199,29,129,0,192,255,0,0,239,223,253,255,255,253,255,227,223,29,96,7,207, +255,0,0,239,223,253,255,255,253,239,227,223,29,96,64,207,255,6,0,239,223,253, +255,255,255,255,231,223,93,240,128,207,255,0,252,236,255,127,252,255,255,251, +47,127,128,95,255,192,255,12,0,254,255,255,255,255,127,255,7,63,32,255,3,0,0, +0,0,214,247,255,255,175,255,255,59,95,32,255,243,0,0,0, +0,1,0,0,0,255,3,0,0,255,254,255,255,255,31,254,255,3,255,255,254,255,255,255, +31,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,249,255,3,255,255,255,255,255, +255,255,255,255,63,255,255,255,255,191,32,255,255,255,255,255,247,255,255,255, +255,255,255,255,255,255,61,127,61,255,255,255,255,255,61,255,255,255,255,61, +127,61,255,127,255,255,255,255,255,255,255,61,255,255,255,255,255,255,255,255, +7,0,0,0,0,255,255,0,0,255,255,255,255,255,255,255,255,255,255,63,63,254,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,0,0,0,0,0,0,0,0,254,255,255,7,254,255,255,7,0,0,0,0,0,4,32,4, -255,255,127,255,255,255,127,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,195,255,3,0,31,80,0,0,0,0, -0,0,0,0,0,0,32,0,0,0,0,0,223,60,64,215,255,255,251,255,255,255,255,255,255, -255,255,255,191,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,3,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,0,254,255,255,255,127,2,254,255,255,255,255,0,0,0,0,0,255,191,182, -0,255,255,255,7,7,0,0,0,255,7,255,255,255,255,255,255,255,254,255,195,255,255, -255,255,255,255,255,255,255,255,255,255,239,31,254,225,255,159,0,0,255,255, -255,255,255,255,0,224,255,255,255,255,255,255,255,255,255,255,255,255,3,0,255, -255,255,255,255,7,48,4,255,255,255,252,255,31,0,0,255,255,255,1,0,0,0,0,0,0,0, -0,253,31,0,0,0,0,0,0,240,3,255,127,255,255,255,255,255,255,255,239,255,223, -225,255,207,255,254,254,238,159,249,255,255,253,197,227,159,89,128,176,207, -255,3,0,238,135,249,255,255,253,109,195,135,25,2,94,192,255,63,0,238,191,251, -255,255,253,237,227,191,27,1,0,207,255,0,0,238,159,249,255,255,253,237,227, -159,25,192,176,207,255,2,0,236,199,61,214,24,199,255,195,199,29,129,0,192,255, -0,0,238,223,253,255,255,253,239,227,223,29,96,3,207,255,0,0,236,223,253,255, -255,253,239,227,223,29,96,64,207,255,6,0,236,223,253,255,255,255,255,231,223, -93,128,0,207,255,0,252,236,255,127,252,255,255,251,47,127,128,95,255,0,0,12,0, -254,255,255,255,255,127,255,7,63,32,255,3,0,0,0,0,150,37,240,254,174,236,255, -59,95,32,255,243,0,0,0,0,1,0,0,0,255,3,0,0,255,254,255,255,255,31,254,255,3, -255,255,254,255,255,255,31,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,249, -255,3,255,255,231,193,255,255,127,64,255,51,255,255,255,255,191,32,255,255, -255,255,255,247,255,255,255,255,255,255,255,255,255,61,127,61,255,255,255,255, -255,61,255,255,255,255,61,127,61,255,127,255,255,255,255,255,255,255,61,255, -255,255,255,255,255,255,255,135,0,0,0,0,255,255,0,0,255,255,255,255,255,255, -255,255,255,255,31,0,254,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,159,255,255,254,255,255,7,255,255,255,255,255,255,255,255, +255,199,255,1,255,223,15,0,255,255,15,0,255,255,15,0,255,223,13,0,255,255,255, +255,255,255,207,255,255,1,128,16,255,3,0,0,0,0,255,3,255,255,255,255,255,255, +255,255,255,255,255,1,255,255,255,255,255,7,255,255,255,255,255,255,255,255, +63, +0,255,255,255,127,255,15,255,1,192,255,255,255,255,63,31,0,255,255,255,255, +255,15,255,255,255,3,255,3,0,0,0,0,255,255,255,15,255,255,255,255,255,255,255, +127,254,255,31,0,255,3,255,3,128,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255, +255,239,255,239,15,255,3,0,0,0,0,255,255,255,255,255,243,255,255,255,255,255, +255,191,255,3,0,255,255,255,255,255,255,127,0,255,227,255,255,255,255,255,63, +255,1,255,255,255,255,255,231,0,0,0,0,0,222,111,4,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0, +128,255,31,0,255,255,63,63,255,255,255,255,63,63,255,170,255,255,255,63,255, +255,255,255,255,255,223,95,220,31,207,15,255,31,220,31,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,2,128,0,0,255,31,0,0,0,0,0,0,0,0,0,0,0,0,132,252,47,62,80,189,255,243, +224,67,0,0,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,255,255,255,255,255,255,3,0, +0,255,255,255,255,255,127,255,255,255,255,255,127,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,31,120,12,0,255,255,255,255,191,32,255, +255,255,255,255,255,255,128,0,0,255,255,127,0,127,127,127,127,127,127,127,127, +255,255,255,255,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,224,0,0,0,254,3,62,31,254,255,255,255,255,255,255,255,255,255,127,224,254, +255,255,255,255,255,255,255,255,255,255,247,224,255,255,255,255,255,254,255, +255,255,255,255,255,255,255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,159,255,255,254,255,255,7,255, -255,255,255,255,255,255,255,255,199,1,0,255,223,15,0,255,255,15,0,255,255,15, -0,255,223,13,0,255,255,255,255,255,255,207,255,255,1,128,16,255,3,0,0,0,0,255, -3,255,255,255,255,255,255,255,255,255,255,255,0,255,255,255,255,255,7,255,255, -255,255,255,255,255,255,63,0,255,255,255,31,255,15,255,1,192,255,255,255,255, -63,31,0,255,255,255,255,255,15,255,255,255,3,255,3,0,0,0,0,255,255,255,15,255, -255,255,255,255,255,255,127,254,255,31,0,255,3,255,3,128,0,0,0,0,0,0,0,0,0,0, -0,255,255,255,255,255,255,239,255,239,15,255,3,0,0,0,0,255,255,255,255,255, -243,255,255,255,255,255,255,191,255,3,0,255,255,255,255,255,255,63,0,255,227, -255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,222,111,0,255,255,255,255, +255,255,255,63,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0, +0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0, +0,0,0,0,0,0,255,255,255,255,255,63,255,31,255,255,255,15,0,0,255,255,255,255, +255,127,240,143,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0, +0,128,255,252,255,255,255,255,255,255,255,255,255,255,255,255,249,255,255,255, +255,255,255,124,0,0,0,0,0,128,255,191,255,255,255,255,0,0,0,255,255,255,255, +255,255,15,0,255,255,255,255,255,255,255,255,47,0,255,3,0,0,252,232,255,255, +255,255,255,7,255,255,255,255,7,0,255,255,255,31,255,255,255,255,255,255,247, +255,0,128,255,3,255,255,255,127,255,255,255,255,255,255,127,0,255,63,255,3, +255,255,127,252,255,255,255,255,255,255,255,127,5,0,0,56,255,255,60,0,126,126, +126,0,127,127,255,255,255,255,255,247,255,0,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,7,255,3,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,15,0,255,255,127,248,255,255,255,255, +255, +15,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,255,255, +255,255,255,255,255,255,255,255,3,0,0,0,0,127,0,248,224,255,253,127,95,219, +255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0,0,248,255,255,255, +255,255,255,255,255,255,255,255,255,63,0,0,255,255,255,255,255,255,255,255, +252,255,255,255,255,255,255,0,0,0,0,0,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,223, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0,255,3, +254,255,255,7,254,255,255,7,192,255,255,255,255,255,255,255,255,255,255,127, +252,252,252,28,0,0,0,0,255,239,255,255,127,255,255,183,255,63,255,63,0,0,0,0, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0,0,0,0,0, +255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,255,255,255,31,255,255,255,255,255,255,1,0,0,0,0, +0,255,255,255,255,0,224,255,255,255,7,255,255,255,255,255,7,255,255,255,63, +255,255,255,255,15,255,62,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,63,255,3,255,255,255,255,15,255,255,255, +255,15,255,255,255,255,255,0,255,255,255,255,255,255,15,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,0,255,255,63,0,255,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,63,253,255,255,255,255,191,145,255,255,63,0,255,255, +127,0,255,255,255,127,0,0,0,0,0,0,0,0,255,255,55,0,255,255,63,0,255,255,255,3, +0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,192,0,0,0,0,0,0,0,0,111,240,239, +254,255,255,63,0,0,0,0,0,255,255,255,31,255,255,255,31,0,0,0,0,255,254,255, +255,31,0,0,0,255,255,255,255,255,255,63,0,255,255,63,0,255,255,7,0,255,255,3, +0,0,0,0,0,0,0,0,0,0,0,0, +0,255,255,255,255,255,255,255,255,255,1,0,0,0,0,0,0,255,255,255,255,255,255,7, +0,255,255,255,255,255,255,7,0,255,255,255,255,255,0,255,3,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,31,128,0,255,255,63,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,255,255,127,0,255,255,255,255,255,255,255,255,63,0,0,0, +192,255,0,0,252,255,255,255,255,255,255,1,0,0,255,255,255,1,255,3,255,255,255, +255,255,255,199,255,112,0,255,255,255,255,71,0,255,255,255,255,255,255,255, +255,30,0,255,23,0,0,0,0,255,255,251,255,255,255,159,64,0,0,0,0,0,0,0,0,127, +189,255,191,255,1,255,255,255,255,255,255,255,1,255,3,239,159,249,255,255,253, +237,227,159,25,129,224,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255, +255,255,255,255,255,187,7,255,131,0,0,0,0,255,255,255,255,255,255,255,255,179, +0,255,3,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,63,127,0,0,0,63,0,0, +0,0,255,255,255,255,255,255,255,127,17,0,255,3,0,0,0,0,255,255,255,255,255, +255,63,1,255,3,0,0,0,0,0,0,255,255,255,231,255,7,255,3,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0, +0,255,255,255,255,255,255,255,255,255,3,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,255,252,255,255,255,255,255,252,26,0,0,0,255,255,255,255,255,255,231, +127,0,0,255,255,255,255,255,255,255,255,255,32,0,0,0,0,255,255,255,255,255, +255,255,1,255,253,255,255,255,255,127,127,1,0,255,3,0,0,252,255,255,255,252, +255,255,254,127,0,0,0,0,0,0,0,0,0,127,251,255,255,255,255,127,180,203,0,255,3, +191,253,255,255,255,127,123,1,255,3,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,127,0,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0, +0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,127,0, +0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, +255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, +255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255, +255,255,255,255,255,255,1,255,255,255,127,255,3,0,0,0,0,0,0,0,0,0,0,0,0,255, +255,255,63,0,0,255,255,255,255,255,255,0,0,15,0,255,3,248,255,255,224,255,255, +0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,255,255,255,255,255,255,255,255,255,135,255,255,255,255,255,255,255,128, +255,255,0,0,0,0,0,0,0,0,11,0,0,0,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,0,0,0,0,0,0,0,0,255,255,63,63,255,255,255,255,63,63,255,170,255,255,255, -63,255,255,255,255,255,255,223,95,220,31,207,15,255,31,220,31,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,2,128,0,0,255,31,0,0,0,0,0,0,0,0,0,0,0,0,132,252,47,62,80,189,255, -243,224,67,0,0,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,255,255,255,255,255,255,3,0,0,255,255,255, -255,255,127,255,255,255,255,255,127,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,31,120,12,0,255,255,255,255,191,32,255,255,255,255, -255,255,255,128,0,0,255,255,127,0,127,127,127,127,127,127,127,127,255,255,255, -255,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0, -0,254,3,62,31,254,255,255,255,255,255,255,255,255,255,127,224,254,255,255,255, -255,255,255,255,255,255,255,247,224,255,255,255,255,63,254,255,255,255,255, -255,255,255,255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255,255,255,255, +255,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,7,0,255,255,255,127,0,0,0,0,0, +0,7,0,240,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -63,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,31,0,0,0,0,0,0,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,255, -255,255,255,255,63,255,31,255,255,255,15,0,0,255,255,255,255,255,127,240,143, -255,255,255,128,255,255,255,255,255,255,255,255,255,255,0,0,0,0,128,255,252, -255,255,255,255,255,255,255,255,255,255,255,255,121,15,0,255,7,0,0,0,0,0,0,0, -0,0,255,187,247,255,255,255,0,0,0,255,255,255,255,255,255,15,0,255,255,255, -255,255,255,255,255,15,0,255,3,0,0,252,8,255,255,255,255,255,7,255,255,255, -255,7,0,255,255,255,31,255,255,255,255,255,255,247,255,0,128,255,3,0,0,0,0, -255,255,255,255,255,255,127,0,255,63,255,3,255,255,127,4,255,255,255,255,255, -255,255,127,5,0,0,56,255,255,60,0,126,126,126,0,127,127,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,255,255,255,255,255,7,255,3,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,15,0,255,255,127,248,255,255,255, -255,255,15,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255, -255,255,255,255,255,255,255,255,255,255,3,0,0,0,0,127,0,248,224,255,253,127, -95,219,255,255,255,255,255,255,255,255,255,255,255,255,255,3,0,0,0,248,255, -255,255,255,255,255,255,255,255,255,255,255,63,0,0,255,255,255,255,255,255, -255,255,252,255,255,255,255,255,255,0,0,0,0,0,255,15,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,223,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,31,0, -0,255,3,254,255,255,7,254,255,255,7,192,255,255,255,255,255,255,255,255,255, -255,127,252,252,252,28,0,0,0,0,255,239,255,255,127,255,255,183,255,63,255,63, -0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0, -0,0,0,0,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,31,255,255,255,255,255,255,1,0,0,0,0,0, -255,255,255,127,0,0,255,255,255,7,0,0,0,0,0,0,255,255,255,63,255,255,255,255, -15,255,62,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,63,255,3,0,0,0,0,0,0,0,0,0,0,63,253,255,255,255,255,191, -145,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,63,0,255,255, -255,3,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,192,0,0,0,0,0,0,0,0,111,240, -239,254,255,255,15,0,0,0,0,0,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -255,255,255,255,255,255,63,0,255,255,63,0,255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,255,255,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,255,255,255,255,255,255,255,255,63,0,0,0,192,255,0,0,252,255,255, -255,255,255,255,1,0,0,255,255,255,1,255,3,255,255,255,255,255,255,199,255,0,0, -0,0,0,0,0,0,255,255,255,255,255,255,255,255,30,0,255,3,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,63,0,255,3,0,0,0,0,0,0,255,255,255, -255,255,255,255,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,255,255,255,255,255,255,255,255,255,255,255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,255,255,255,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,255,255,255,255,255,255,255,255,31,0,255,255,255,255,255,127,0,0, -248,255,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255, -255,255,255,255,223,100,222,255,235,239,255,255,255,255,255,255,255,191,231, -223,223,255,255,255,123,95,252,253,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,255,255,255,255, +255,255,255,255,255,255,255,255,255,7,255,31,255,1,255,67,0,0,0,0,0,0,0,0,0,0, +0,0,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255,255,255,255, +255,223,100,222,255,235,239,255,255,255,255,255,255, +255,191,231,223,223,255,255,255,123,95,252,253,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255,253,255,255, -247,255,255,255,247,255,255,223,255,255,255,223,255,255,127,255,255,255,127, -255,255,255,253,255,255,255,253,255,255,247,207,255,255,255,255,255,255,239, -255,255,255,150,254,247,10,132,234,150,170,150,247,247,94,255,251,255,15,238, -251,255,15,0,0,0,0,0,0,0,0, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,255,255,255, +253,255,255,247,255,255,255,247,255,255,223,255,255,255,223,255,255,127,255, +255,255,127,255,255,255,253,255,255,255,253,255,255,247,207,255,255,255,255, +255,255,127,255,255,249,219,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,255,255,255,255,255,31,128,63,255,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255, +15,255,3,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255, +143,8,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,239,255,255,255,150,254,247,10,132,234,150,170,150,247,247,94,255,251,255, +15,238,251,255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,3,255, +255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/system/lib/libc/musl/src/ctype/casemap.h b/system/lib/libc/musl/src/ctype/casemap.h new file mode 100644 index 0000000000000..6ee1209b96988 --- /dev/null +++ b/system/lib/libc/musl/src/ctype/casemap.h @@ -0,0 +1,297 @@ +static const unsigned char tab[] = { + 7, 8, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 13, 6, 6, 14, 6, 6, 6, 6, 6, 6, 6, 6, 15, 16, 17, 18, + 6, 19, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 20, 21, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 22, 23, 6, 6, 6, 24, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 25, + 6, 6, 6, 6, 26, 6, 6, 6, 6, 6, 6, 6, 27, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 28, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 29, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 30, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, + 43, 43, 43, 43, 43, 43, 43, 43, 1, 0, 84, 86, 86, 86, 86, 86, + 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 43, 43, 43, 43, 43, 43, + 43, 7, 43, 43, 91, 86, 86, 86, 86, 86, 86, 86, 74, 86, 86, 5, + 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, + 36, 80, 121, 49, 80, 49, 80, 49, 56, 80, 49, 80, 49, 80, 49, 80, + 49, 80, 49, 80, 49, 80, 49, 80, 78, 49, 2, 78, 13, 13, 78, 3, + 78, 0, 36, 110, 0, 78, 49, 38, 110, 81, 78, 36, 80, 78, 57, 20, + 129, 27, 29, 29, 83, 49, 80, 49, 80, 13, 49, 80, 49, 80, 49, 80, + 27, 83, 36, 80, 49, 2, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, + 20, 121, 92, 123, 92, 123, 92, 45, 43, 73, 3, 72, 3, 120, 92, 123, + 20, 0, 150, 10, 1, 43, 40, 6, 6, 0, 42, 6, 42, 42, 43, 7, + 187, 181, 43, 30, 0, 43, 7, 43, 43, 43, 1, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 205, 70, 205, 43, 0, 37, 43, 7, 1, 6, 1, 85, 86, 86, 86, + 86, 86, 85, 86, 86, 2, 36, 129, 129, 129, 129, 129, 21, 129, 129, 129, + 0, 0, 43, 0, 178, 209, 178, 209, 178, 209, 178, 209, 0, 0, 205, 204, + 1, 0, 215, 215, 215, 215, 215, 131, 129, 129, 129, 129, 129, 129, 129, 129, + 129, 129, 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, 28, 0, 0, 0, + 0, 0, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 2, 0, 0, + 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, + 49, 80, 78, 49, 80, 49, 80, 78, 49, 80, 49, 80, 49, 80, 49, 80, + 49, 80, 49, 80, 49, 80, 49, 2, 135, 166, 135, 166, 135, 166, 135, 166, + 135, 166, 135, 166, 135, 166, 135, 166, 42, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 84, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 12, 0, 12, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 7, 42, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 86, 86, 108, 129, 21, 0, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 7, 108, 3, 65, 43, 43, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 44, 86, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 12, 108, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, + 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, + 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, + 6, 37, 6, 37, 6, 37, 6, 37, 86, 122, 158, 38, 6, 37, 6, 37, + 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, + 6, 37, 6, 37, 6, 37, 6, 37, 6, 37, 6, 1, 43, 43, 79, 86, + 86, 44, 43, 127, 86, 86, 57, 43, 43, 85, 86, 86, 43, 43, 79, 86, + 86, 44, 43, 127, 86, 86, 129, 55, 117, 91, 123, 92, 43, 43, 79, 86, + 86, 2, 172, 4, 0, 0, 57, 43, 43, 85, 86, 86, 43, 43, 79, 86, + 86, 44, 43, 43, 86, 86, 50, 19, 129, 87, 0, 111, 129, 126, 201, 215, + 126, 45, 129, 129, 14, 126, 57, 127, 111, 87, 0, 129, 129, 126, 21, 0, + 126, 3, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 43, + 36, 43, 151, 43, 43, 43, 43, 43, 43, 43, 43, 43, 42, 43, 43, 43, + 43, 43, 86, 86, 86, 86, 86, 128, 129, 129, 129, 129, 57, 187, 42, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 1, 129, 129, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 201, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 208, 13, 0, 78, 49, 2, 180, 193, 193, + 215, 215, 36, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, + 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, 49, 80, + 49, 80, 49, 80, 215, 215, 83, 193, 71, 212, 215, 215, 215, 5, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 1, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 49, 80, 49, 80, 49, 80, + 49, 80, 49, 80, 49, 80, 49, 80, 13, 0, 0, 0, 0, 0, 36, 80, + 49, 80, 49, 80, 49, 80, 49, 80, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 121, 92, 123, 92, 123, 79, 123, 92, 123, 92, 123, + 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 123, 92, 45, + 43, 43, 121, 20, 92, 123, 92, 45, 121, 42, 92, 39, 92, 123, 92, 123, + 92, 123, 164, 0, 10, 180, 92, 123, 92, 123, 79, 3, 42, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 72, 86, 86, 86, 86, + 86, 86, 86, 86, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 85, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 36, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 7, 0, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 0, 0, + 0, 0, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 42, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 85, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 14, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +static const int rules[] = { + 0x0, 0x2001, -0x2000, 0x1dbf00, 0x2e700, 0x7900, + 0x2402, 0x101, -0x100, 0x0, 0x201, -0x200, + -0xc6ff, -0xe800, -0x78ff, -0x12c00, 0xc300, 0xd201, + 0xce01, 0xcd01, 0x4f01, 0xca01, 0xcb01, 0xcf01, + 0x6100, 0xd301, 0xd101, 0xa300, 0xd501, 0x8200, + 0xd601, 0xda01, 0xd901, 0xdb01, 0x3800, 0x3, + -0x4f00, -0x60ff, -0x37ff, 0x242802, 0x0, 0x101, + -0x100, -0xcd00, -0xda00, -0x81ff, 0x2a2b01, -0xa2ff, + 0x2a2801, 0x2a3f00, -0xc2ff, 0x4501, 0x4701, 0x2a1f00, + 0x2a1c00, 0x2a1e00, -0xd200, -0xce00, -0xca00, -0xcb00, + 0xa54f00, 0xa54b00, -0xcf00, 0xa52800, 0xa54400, -0xd100, + -0xd300, 0x29f700, 0xa54100, 0x29fd00, -0xd500, -0xd600, + 0x29e700, 0xa54300, 0xa52a00, -0x4500, -0xd900, -0x4700, + -0xdb00, 0xa51500, 0xa51200, 0x4c2402, 0x0, 0x2001, + -0x2000, 0x101, -0x100, 0x5400, 0x7401, 0x2601, + 0x2501, 0x4001, 0x3f01, -0x2600, -0x2500, -0x1f00, + -0x4000, -0x3f00, 0x801, -0x3e00, -0x3900, -0x2f00, + -0x3600, -0x800, -0x5600, -0x5000, 0x700, -0x7400, + -0x3bff, -0x6000, -0x6ff, 0x701a02, 0x101, -0x100, + 0x2001, -0x2000, 0x5001, 0xf01, -0xf00, 0x0, + 0x3001, -0x3000, 0x101, -0x100, 0x0, 0xbc000, + 0x1c6001, 0x0, 0x97d001, 0x801, -0x800, 0x8a0502, + 0x0, -0xbbfff, -0x186200, 0x89c200, -0x182500, -0x186e00, + -0x186d00, -0x186400, -0x186300, -0x185c00, 0x0, 0x8a3800, + 0x8a0400, 0xee600, 0x101, -0x100, 0x0, -0x3b00, + -0x1dbeff, 0x8f1d02, 0x800, -0x7ff, 0x0, 0x5600, + -0x55ff, 0x4a00, 0x6400, 0x8000, 0x7000, 0x7e00, + 0x900, -0x49ff, -0x8ff, -0x1c2500, -0x63ff, -0x6fff, + -0x7fff, -0x7dff, 0xac0502, 0x0, 0x1001, -0x1000, + 0x1c01, 0x101, -0x1d5cff, -0x20beff, -0x2045ff, -0x1c00, + 0xb10b02, 0x101, -0x100, 0x3001, -0x3000, 0x0, + -0x29f6ff, -0xee5ff, -0x29e6ff, -0x2a2b00, -0x2a2800, -0x2a1bff, + -0x29fcff, -0x2a1eff, -0x2a1dff, -0x2a3eff, 0x0, -0x1c6000, + 0x0, 0x101, -0x100, 0xbc0c02, 0x0, 0x101, + -0x100, -0xa543ff, 0x3a001, -0x8a03ff, -0xa527ff, 0x3000, + -0xa54eff, -0xa54aff, -0xa540ff, -0xa511ff, -0xa529ff, -0xa514ff, + -0x2fff, -0xa542ff, -0x8a37ff, 0x0, -0x97d000, -0x3a000, + 0x0, 0x2001, -0x2000, 0x0, 0x2801, -0x2800, + 0x0, 0x4001, -0x4000, 0x0, 0x2001, -0x2000, + 0x0, 0x2001, -0x2000, 0x0, 0x2201, -0x2200, +}; +static const unsigned char rulebases[] = { + 0, 6, 39, 81, 111, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 124, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 131, 142, 146, 151, + 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 196, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 198, 201, 0, 0, 0, 219, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, + 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 228, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +static const unsigned char exceptions[][2] = { + { 48, 12 }, { 49, 13 }, { 120, 14 }, { 127, 15 }, + { 128, 16 }, { 129, 17 }, { 134, 18 }, { 137, 19 }, + { 138, 19 }, { 142, 20 }, { 143, 21 }, { 144, 22 }, + { 147, 19 }, { 148, 23 }, { 149, 24 }, { 150, 25 }, + { 151, 26 }, { 154, 27 }, { 156, 25 }, { 157, 28 }, + { 158, 29 }, { 159, 30 }, { 166, 31 }, { 169, 31 }, + { 174, 31 }, { 177, 32 }, { 178, 32 }, { 183, 33 }, + { 191, 34 }, { 197, 35 }, { 200, 35 }, { 203, 35 }, + { 221, 36 }, { 242, 35 }, { 246, 37 }, { 247, 38 }, + { 32, 45 }, { 58, 46 }, { 61, 47 }, { 62, 48 }, + { 63, 49 }, { 64, 49 }, { 67, 50 }, { 68, 51 }, + { 69, 52 }, { 80, 53 }, { 81, 54 }, { 82, 55 }, + { 83, 56 }, { 84, 57 }, { 89, 58 }, { 91, 59 }, + { 92, 60 }, { 97, 61 }, { 99, 62 }, { 101, 63 }, + { 102, 64 }, { 104, 65 }, { 105, 66 }, { 106, 64 }, + { 107, 67 }, { 108, 68 }, { 111, 66 }, { 113, 69 }, + { 114, 70 }, { 117, 71 }, { 125, 72 }, { 130, 73 }, + { 135, 74 }, { 137, 75 }, { 138, 76 }, { 139, 76 }, + { 140, 77 }, { 146, 78 }, { 157, 79 }, { 158, 80 }, + { 69, 87 }, { 123, 29 }, { 124, 29 }, { 125, 29 }, + { 127, 88 }, { 134, 89 }, { 136, 90 }, { 137, 90 }, + { 138, 90 }, { 140, 91 }, { 142, 92 }, { 143, 92 }, + { 172, 93 }, { 173, 94 }, { 174, 94 }, { 175, 94 }, + { 194, 95 }, { 204, 96 }, { 205, 97 }, { 206, 97 }, + { 207, 98 }, { 208, 99 }, { 209, 100 }, { 213, 101 }, + { 214, 102 }, { 215, 103 }, { 240, 104 }, { 241, 105 }, + { 242, 106 }, { 243, 107 }, { 244, 108 }, { 245, 109 }, + { 249, 110 }, { 253, 45 }, { 254, 45 }, { 255, 45 }, + { 80, 105 }, { 81, 105 }, { 82, 105 }, { 83, 105 }, + { 84, 105 }, { 85, 105 }, { 86, 105 }, { 87, 105 }, + { 88, 105 }, { 89, 105 }, { 90, 105 }, { 91, 105 }, + { 92, 105 }, { 93, 105 }, { 94, 105 }, { 95, 105 }, + { 130, 0 }, { 131, 0 }, { 132, 0 }, { 133, 0 }, + { 134, 0 }, { 135, 0 }, { 136, 0 }, { 137, 0 }, + { 192, 117 }, { 207, 118 }, { 128, 137 }, { 129, 138 }, + { 130, 139 }, { 133, 140 }, { 134, 141 }, { 112, 157 }, + { 113, 157 }, { 118, 158 }, { 119, 158 }, { 120, 159 }, + { 121, 159 }, { 122, 160 }, { 123, 160 }, { 124, 161 }, + { 125, 161 }, { 179, 162 }, { 186, 163 }, { 187, 163 }, + { 188, 164 }, { 190, 165 }, { 195, 162 }, { 204, 164 }, + { 218, 166 }, { 219, 166 }, { 229, 106 }, { 234, 167 }, + { 235, 167 }, { 236, 110 }, { 243, 162 }, { 248, 168 }, + { 249, 168 }, { 250, 169 }, { 251, 169 }, { 252, 164 }, + { 38, 176 }, { 42, 177 }, { 43, 178 }, { 78, 179 }, + { 132, 8 }, { 98, 186 }, { 99, 187 }, { 100, 188 }, + { 101, 189 }, { 102, 190 }, { 109, 191 }, { 110, 192 }, + { 111, 193 }, { 112, 194 }, { 126, 195 }, { 127, 195 }, + { 125, 207 }, { 141, 208 }, { 148, 209 }, { 171, 210 }, + { 172, 211 }, { 173, 212 }, { 176, 213 }, { 177, 214 }, + { 178, 215 }, { 196, 216 }, { 197, 217 }, { 198, 218 }, +}; diff --git a/system/lib/libc/musl/src/ctype/isalnum.c b/system/lib/libc/musl/src/ctype/isalnum.c index 2214936f2bde5..8018a2bc7eb1f 100644 --- a/system/lib/libc/musl/src/ctype/isalnum.c +++ b/system/lib/libc/musl/src/ctype/isalnum.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int isalnum(int c) { diff --git a/system/lib/libc/musl/src/ctype/isalpha.c b/system/lib/libc/musl/src/ctype/isalpha.c index f155d3aa97048..a87a93759869d 100644 --- a/system/lib/libc/musl/src/ctype/isalpha.c +++ b/system/lib/libc/musl/src/ctype/isalpha.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isalpha int isalpha(int c) diff --git a/system/lib/libc/musl/src/ctype/isblank.c b/system/lib/libc/musl/src/ctype/isblank.c index 299120e96df19..716da23a56615 100644 --- a/system/lib/libc/musl/src/ctype/isblank.c +++ b/system/lib/libc/musl/src/ctype/isblank.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int isblank(int c) { diff --git a/system/lib/libc/musl/src/ctype/iscntrl.c b/system/lib/libc/musl/src/ctype/iscntrl.c index cb4114a060208..f27837ea53c8c 100644 --- a/system/lib/libc/musl/src/ctype/iscntrl.c +++ b/system/lib/libc/musl/src/ctype/iscntrl.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iscntrl(int c) { diff --git a/system/lib/libc/musl/src/ctype/isdigit.c b/system/lib/libc/musl/src/ctype/isdigit.c index 4d8a103e612e2..16beddb4ca6a9 100644 --- a/system/lib/libc/musl/src/ctype/isdigit.c +++ b/system/lib/libc/musl/src/ctype/isdigit.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isdigit int isdigit(int c) diff --git a/system/lib/libc/musl/src/ctype/isgraph.c b/system/lib/libc/musl/src/ctype/isgraph.c index a0aae08aabe69..292d1983ec5b7 100644 --- a/system/lib/libc/musl/src/ctype/isgraph.c +++ b/system/lib/libc/musl/src/ctype/isgraph.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isgraph int isgraph(int c) diff --git a/system/lib/libc/musl/src/ctype/islower.c b/system/lib/libc/musl/src/ctype/islower.c index 02640213e5f65..c3fa74c4cbd11 100644 --- a/system/lib/libc/musl/src/ctype/islower.c +++ b/system/lib/libc/musl/src/ctype/islower.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef islower int islower(int c) diff --git a/system/lib/libc/musl/src/ctype/isprint.c b/system/lib/libc/musl/src/ctype/isprint.c index 067275fa03e79..b950816bcb52d 100644 --- a/system/lib/libc/musl/src/ctype/isprint.c +++ b/system/lib/libc/musl/src/ctype/isprint.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isprint int isprint(int c) diff --git a/system/lib/libc/musl/src/ctype/ispunct.c b/system/lib/libc/musl/src/ctype/ispunct.c index e772d76a03f20..a491d5dc4b04d 100644 --- a/system/lib/libc/musl/src/ctype/ispunct.c +++ b/system/lib/libc/musl/src/ctype/ispunct.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int ispunct(int c) { diff --git a/system/lib/libc/musl/src/ctype/isspace.c b/system/lib/libc/musl/src/ctype/isspace.c index 231e90793ddd3..428813e79856c 100644 --- a/system/lib/libc/musl/src/ctype/isspace.c +++ b/system/lib/libc/musl/src/ctype/isspace.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isspace int isspace(int c) diff --git a/system/lib/libc/musl/src/ctype/isupper.c b/system/lib/libc/musl/src/ctype/isupper.c index 68c36f4a424f2..bfd15acdbe529 100644 --- a/system/lib/libc/musl/src/ctype/isupper.c +++ b/system/lib/libc/musl/src/ctype/isupper.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef isupper int isupper(int c) diff --git a/system/lib/libc/musl/src/ctype/iswalnum.c b/system/lib/libc/musl/src/ctype/iswalnum.c index a6082da437867..046c399c3775f 100644 --- a/system/lib/libc/musl/src/ctype/iswalnum.c +++ b/system/lib/libc/musl/src/ctype/iswalnum.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswalnum(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswalpha.c b/system/lib/libc/musl/src/ctype/iswalpha.c index 00f9d81f5a789..1c5485d2bfb41 100644 --- a/system/lib/libc/musl/src/ctype/iswalpha.c +++ b/system/lib/libc/musl/src/ctype/iswalpha.c @@ -1,5 +1,4 @@ #include -#include "libc.h" static const unsigned char table[] = { #include "alpha.h" diff --git a/system/lib/libc/musl/src/ctype/iswblank.c b/system/lib/libc/musl/src/ctype/iswblank.c index d9b33ef472d64..68c8800202979 100644 --- a/system/lib/libc/musl/src/ctype/iswblank.c +++ b/system/lib/libc/musl/src/ctype/iswblank.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int iswblank(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswcntrl.c b/system/lib/libc/musl/src/ctype/iswcntrl.c index daace82a375f4..feccfcd5bcc33 100644 --- a/system/lib/libc/musl/src/ctype/iswcntrl.c +++ b/system/lib/libc/musl/src/ctype/iswcntrl.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswcntrl(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswctype.c b/system/lib/libc/musl/src/ctype/iswctype.c index 3d9c2cc7c2d07..71b09b8d24ae5 100644 --- a/system/lib/libc/musl/src/ctype/iswctype.c +++ b/system/lib/libc/musl/src/ctype/iswctype.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" #define WCTYPE_ALNUM 1 #define WCTYPE_ALPHA 2 diff --git a/system/lib/libc/musl/src/ctype/iswdigit.c b/system/lib/libc/musl/src/ctype/iswdigit.c index ed9a88e740ad3..db817edf7dd73 100644 --- a/system/lib/libc/musl/src/ctype/iswdigit.c +++ b/system/lib/libc/musl/src/ctype/iswdigit.c @@ -1,5 +1,4 @@ #include -#include "libc.h" #undef iswdigit diff --git a/system/lib/libc/musl/src/ctype/iswgraph.c b/system/lib/libc/musl/src/ctype/iswgraph.c index 0ea5ca3a4d57e..ecdf466c657f9 100644 --- a/system/lib/libc/musl/src/ctype/iswgraph.c +++ b/system/lib/libc/musl/src/ctype/iswgraph.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswgraph(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswlower.c b/system/lib/libc/musl/src/ctype/iswlower.c index 79df44a3d64e5..f02a4362a8664 100644 --- a/system/lib/libc/musl/src/ctype/iswlower.c +++ b/system/lib/libc/musl/src/ctype/iswlower.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswlower(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswprint.c b/system/lib/libc/musl/src/ctype/iswprint.c index 69856e0d8e3a3..86f9d646ac9e1 100644 --- a/system/lib/libc/musl/src/ctype/iswprint.c +++ b/system/lib/libc/musl/src/ctype/iswprint.c @@ -1,5 +1,4 @@ #include -#include "libc.h" /* Consider all legal codepoints as printable except for: * - C0 and C1 control characters diff --git a/system/lib/libc/musl/src/ctype/iswpunct.c b/system/lib/libc/musl/src/ctype/iswpunct.c index d88010463c9f8..f0b9ea0a4bfc4 100644 --- a/system/lib/libc/musl/src/ctype/iswpunct.c +++ b/system/lib/libc/musl/src/ctype/iswpunct.c @@ -1,5 +1,4 @@ #include -#include "libc.h" static const unsigned char table[] = { #include "punct.h" diff --git a/system/lib/libc/musl/src/ctype/iswspace.c b/system/lib/libc/musl/src/ctype/iswspace.c index 75ae7e8ee3657..263afa15c5d74 100644 --- a/system/lib/libc/musl/src/ctype/iswspace.c +++ b/system/lib/libc/musl/src/ctype/iswspace.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" /* Our definition of whitespace is the Unicode White_Space property, * minus non-breaking spaces (U+00A0, U+2007, and U+202F) and script- diff --git a/system/lib/libc/musl/src/ctype/iswupper.c b/system/lib/libc/musl/src/ctype/iswupper.c index 6e1e029c49029..7e486665eef59 100644 --- a/system/lib/libc/musl/src/ctype/iswupper.c +++ b/system/lib/libc/musl/src/ctype/iswupper.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswupper(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/iswxdigit.c b/system/lib/libc/musl/src/ctype/iswxdigit.c index 1e27f1f0f9d82..62bc9e743953b 100644 --- a/system/lib/libc/musl/src/ctype/iswxdigit.c +++ b/system/lib/libc/musl/src/ctype/iswxdigit.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int iswxdigit(wint_t wc) { diff --git a/system/lib/libc/musl/src/ctype/isxdigit.c b/system/lib/libc/musl/src/ctype/isxdigit.c index 0e9152a7b0166..aab1a745b6cd5 100644 --- a/system/lib/libc/musl/src/ctype/isxdigit.c +++ b/system/lib/libc/musl/src/ctype/isxdigit.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int isxdigit(int c) { diff --git a/system/lib/libc/musl/src/ctype/nonspacing.h b/system/lib/libc/musl/src/ctype/nonspacing.h index 4c25ef51760b7..5d05a3d1a0647 100644 --- a/system/lib/libc/musl/src/ctype/nonspacing.h +++ b/system/lib/libc/musl/src/ctype/nonspacing.h @@ -7,56 +7,83 @@ 16,16,16,16,16,16,16,16,16,16,44,16,45,46,47,48,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,49,16,16,50,51,16,52,16,16, -16,16,16,16,16,16,53,16,16,16,16,16,54,55,16,16,16,16,56,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,49,16,16,50, +51,16,52,53,54,16,16,16,16,16,16,55,16,16,56,16,57,58,59,60,61,62,63,64,65,66, +67,68,16,69,70,71,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,72,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,73,74,16,16,16,75,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,57,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,58,59,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255, +16,16,16,16,16,16,16,76,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,77,78,16,16,16,16,16,16,16,79,16,16,16,16,16,80,81,82,16,16,16,16,16,83, +84,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,3,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,191, -182,0,0,0,0,0,0,0,31,0,255,7,0,0,0,0,0,248,255,255,0,0,1,0,0,0,0,0,0,0,0,0,0, -0,192,191,159,61,0,0,0,128,2,0,0,0,255,255,255,7,0,0,0,0,0,0,0,0,0,0,192,255, -1,0,0,0,0,0,0,248,15,0,0,0,192,251,239,62,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,240,255,255,127,7,0,0,0,0,0,0,20,254,33,254,0,12,0,0,0,2,0,0,0,0,0, -0,16,30,32,0,0,12,0,0,0,6,0,0,0,0,0,0,16,134,57,2,0,0,0,35,0,6,0,0,0,0,0,0,16, -190,33,0,0,12,0,0,0,2,0,0,0,0,0,0,144,30,32,64,0,12,0,0,0,4,0,0,0,0,0,0,0,1, -32,0,0,0,0,0,0,0,0,0,0,0,0,0,192,193,61,96,0,12,0,0,0,0,0,0,0,0,0,0,144,64,48, -0,0,12,0,0,0,0,0,0,0,0,0,0,0,30,32,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,4,92,0,0,0, -0,0,0,0,0,0,0,0,242,7,128,127,0,0,0,0,0,0,0,0,0,0,0,0,242,27,0,63,0,0,0,0,0,0, -0,0,0,3,0,0,160,2,0,0,0,0,0,0,254,127,223,224,255,254,255,255,255,31,64,0,0,0, -0,0,0,0,0,0,0,0,0,224,253,102,0,0,0,195,1,0,30,0,100,32,0,32,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -28,0,0,0,28,0,0,0,12,0,0,0,12,0,0,0,0,0,0,0,176,63,64,254,15,32,0,0,0,0,0,56, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,1,4, -14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,1,0,0,0,0,0,0,64, -127,229,31,248,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,208,23,4,0,0, -0,0,248,15,0,3,0,0,0,60,11,0,0,0,0,0,0,64,163,3,0,0,0,0,0,0,240,207,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,247,255,253,33,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,255,255,255,255,127,0,0,240,0,248,0,0,0,124,0,0,0,0,0,0,31, -252,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0, -0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,247,63,0,0,0,128,0,0,0,0,0, -0,0,0,0,0,3,0,68,8,0,0,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,255, -255,3,0,0,0,0,0,192,63,0,0,128,255,3,0,0,0,0,0,7,0,0,0,0,0,200,19,0,0,0,0,0,0, -0,0,0,0,0,0,0,126,102,0,8,16,0,0,0,0,0,0,0,0,0,0,0,0,157,193,2,0,0,0,0,48,64, +255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,248,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,254,255,255,255,255,191,182,0,0,0,0,0,0,0,63,0,255,23,0,0,0,0,0,248,255, +255,0,0,1,0,0,0,0,0,0,0,0,0,0,0,192,191,159,61,0,0,0,128,2,0,0,0,255,255,255, +7,0,0,0,0,0,0,0,0,0,0,192,255,1,0,0,0,0,0,0,248,15,32,0,0,192,251,239,62,0,0, +0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,255,255,255,255, +255,7,0,0,0,0,0,0,20,254,33,254,0,12,0,0,0,2,0,0,0,0,0,0,16,30,32,0,0,12,0,0, +64,6,0,0,0,0,0,0,16,134,57,2,0,0,0,35,0,6,0,0,0,0,0,0,16,190,33,0,0,12,0,0, +252,2,0,0,0,0,0,0,144,30,32,64,0,12,0,0,0,4,0,0,0,0,0,0,0,1,32,0,0,0,0,0,0,17, +0,0,0,0,0,0,192,193,61,96,0,12,0,0,0,2,0,0,0,0,0,0,144,64,48,0,0,12,0,0,0,3,0, +0,0,0,0,0,24,30,32,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,4,92,0,0,0,0,0,0,0,0,0,0,0, +242,7,128,127,0,0,0,0,0,0,0,0,0,0,0,0,242,31,0,63,0,0,0,0,0,0,0,0,0,3,0,0,160, +2,0,0,0,0,0,0,254,127,223,224,255,254,255,255,255,31,64,0,0,0,0,0,0,0,0,0,0,0, +0,224,253,102,0,0,0,195,1,0,30,0,100,32,0,32,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0, +0,0,28,0,0,0,12,0,0,0,12,0,0,0,0,0,0,0,176,63,64,254,15,32,0,0,0,0,0,120,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,1,4,14,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,9,0,0,0,0,0,0,64,127, +229,31,248,159,0,0,0,0,0,0,255,127,0,0,0,0,0,0,0,0,15,0,0,0,0,0,208,23,4,0,0, +0,0,248,15,0,3,0,0,0,60,59,0,0,0,0,0,0,64,163,3,0,0,0,0,0,0,240,207,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,247,255,253,33,16,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255, +251,0,248,0,0,0,124,0,0,0,0,0,0,223,255,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255, +255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0, +0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,128,247,63,0,0,0,192,0,0,0,0,0,0,0,0,0,0,3,0,68,8,0,0,96,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,255,255,3,128,0,0,0,0,192,63,0,0,128,255,3,0, +0,0,0,0,7,0,0,0,0,0,200,51,0,0,0,0,32,0,0,0,0,0,0,0,0,126,102,0,8,16,0,0,0,0, +0,16,0,0,0,0,0,0,157,193,2,0,0,0,0,48,64, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,33,0,0,0,0,0,64, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,0,0,127,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,32,110,240,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,255,127,0,0,0,0,0,0,0,3,0,0,0,0,0,120,38,0,0, -0,0,0,0,0,0,7,0,0,0,128,239,31,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,192,127,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,191,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,128,3,248,255,231,15,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,0,0,255,255,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,110,240,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0, +0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,192,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,255, +127,0,0,0,0,0,0,128,3,0,0,0,0,0,120,38,0,32,0,0,0,0,0,0,7,0,0,0,128,239,31,0, +0,0,0,0,0,0,8,0,3,0,0,0,0,0,192,127,0,30,0,0,0,0,0,0,0,0,0,0,0,128,211,64,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,248,7,0,0,3,0,0,0,0,0,0,24,1,0,0,0,192, +31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,92,0,0,64,0,0,0,0,0, +0,0,0,0,0,248,133,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,60,176,1,0,0,48,0,0,0, +0,0,0,0,0,0,0,248,167,1,0,0,0,0,0,0,0,0,0,0,0,0,40,191,0,0,0,0,0,0,0,0,0,0,0, +0,224,188,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +128,255,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,12,1,0,0,0,254,7,0,0,0,0,248,121,128,0, +126,14,0,0,0,0,0,252,127,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,191,0,0,0, +0,0,0,0,0,0,0,252,255,255,252,109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,126,180,191,0, +0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,24, +0,0,0,0,0,0,0,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,127,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0, +0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,15, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,3,248,255,231,15,0,0,0,60,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,255,255,255,255,255,255,127,248,255,255,255,255,255,31,32,0,16,0,0,248, +254,255,0,0,0,0,0,0,0,0,0, +0,127,255,255,249,219,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,240,7,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/system/lib/libc/musl/src/ctype/punct.h b/system/lib/libc/musl/src/ctype/punct.h index 466e6b3308a58..67929470c9e0e 100644 --- a/system/lib/libc/musl/src/ctype/punct.h +++ b/system/lib/libc/musl/src/ctype/punct.h @@ -1,109 +1,141 @@ 18,16,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,16,16,34,35,16,36,37,38,39, -40,41,42,43,16,44,45,46,17,47,48,17,17,49,17,17,17,50,51,52,53,54,55,56,57,17, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,58, +40,41,42,43,16,44,45,46,17,17,47,17,17,17,17,17,17,48,49,50,51,52,53,54,55,17, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,56, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,59,16,60,61,62,63,64,65,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,57,16,58,59,60,61,62,63,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,66,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,67,16,16,68,16,69,70,71,16,72,16,73, -16,16,16,16,74,75,76,77,16,16,78,16,79,80,16,16,16,16,81,16,16,16,16,16,16,16, -16,16,16,16,16,16,82,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,64,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,65,16,16,66,16,67,68, +69,16,70,71,72,16,73,16,16,74,75,76,77,78,16,79,80,81,82,83,84,85,86,87,88,89, +90,91,16,92,93,94,95,16,16,16,16,96,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,97,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,98,99,16,16,100,101,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,83,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,84,85,86,87, -16,16,88,89,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -90,16,91,92,93,94,95,96,97,98,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,0,0,0,0,254,255,0,252,1,0,0,248,1,0,0,120,0,0,0,0,255,251,223, -251,0,0,128,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0, -252,255,224,175,255,255,255,255,255,255,255,255,255,255,223,255,255,255,255, -255,32,64,176,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -252,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,134,254, -255,255,255,0,64,73,0,0,0,0,0,24,0,223,255,0,200,0,0,0,0,0,0,0,1,0,60,0,0,0,0, -0,0,0,0,0,0,0,0,16,224,1,30,0,96,255,191,0,0,0,0,0,0,255,7,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,248,207,3,0,0,0,3,0,32,255,127,0,0,0,78,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,0,0,0,16,0,32,30,0,48,0,1,0,0,0,0,0,0,0,0,16, -0,32,0,0,0,0,252,15,0,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,32,0, -0,0,0,3,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,253,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0, -255,7,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,255,0,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,32,0,0,0,0,63,2,0,0,0,0,0,0,0,0,0,4,0,0,0,0,16,0,0,0,0,0,0, -128,0,128,192,223,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,254,255,255, -255,0,252,255,255,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,192,255,223,255,7,0,0,0,0,0, -0,0,0,0,0,128,6,0,252,0,0,24,62,0,0,128,191,0,204,0,0,0,0,0,0,0,0,0,0,0,8,0,0, -0,0,0,0,0,0,0,0,0,96,255,255,255,31,0,0,255,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,96,0,0,1,0,0,24,0,0,0,0,0,0,0,0,0,56,0,0,0,0,16,0,0,0,112,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,48,0,0,254,127,47,0,0,255,3,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,49,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,196,255,255,255,255,0,0,0,192,0,0,0,0,0,0,0,0,1,0,224,159,0,0,0,0, -127,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,16,0,0,252,255,255,255,31,0,0,0,0, -0,12,0,0,0,0,0,0,64,0,12,240,0,0,0,0,0,0,192,248,0,0,0,0,0,0,0,192,0,0,0,0,0, -0,0,0,255,0,255,255,255,33,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,255,255,255,255,127,0,0,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -160,3,224,0,224,0,224,0,96,128,248,255,255,255,252,255,255,255,255,255,127,31, -252,241,127,255,127,0,0,255,255,255,3,0,0,255,255,255,255,1,0,123,3,208,193, -175,66,0,12,31,188,255,255,0,0,0,0,0,2,255,255,255,255,255,255,255,255,255, +16,16,16,16,16,16,16,16,102,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,103,104,105,106,16,16,107,108,17,17,109,16,16,16,16,16,16,110,111,16, +16,16,16,16,112,113,16,16,114,115,116,16,117,118,119,17,17,17,120,121,122,123, +124,16,16,16,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,255, -255,255,127,0,0,0,255,7,0,0,255,255,255,255,255,255,255,255,255,255,63,0,0,0, -0,0,0,252,255,255,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,254,255,0,252,1,0,0,248,1, +0,0,120,0,0,0,0,255,251,223,251,0,0,128,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,60,0,252,255,224,175,255,255,255,255,255,255,255,255, +255,255,223,255,255,255,255,255,32,64,176,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,252,0,0,0,0,0,230,254,255,255,255,0,64,73,0,0,0,0,0,24,0,255,255,0,216, +0,0,0,0,0,0,0,1,0,60,0,0,0,0,0,0,0,0,0,0,0,0,16,224,1,30,0, +96,255,191,0,0,0,0,0,0,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,207, +227,0,0,0,3,0,32,255,127,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,7,252,0,0,0, +0,0,0,0,0,0,16,0,32,30,0,48,0,1,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,252,111,0,0,0, +0,0,0,0,16,0,32,0,0,0,0,64,0,0,0,0,0,0,0,0,16,0,32,0,0,0,0,3,224,0,0,0,0,0,0, +0,16,0,32,0,0,0,0,253,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,255,7,16,0,0,0,0,0,0,0,0, +32,0,0,0,0,128,255,16,0,0,0,0,0,0,16,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,160, +0,127,0,0,255,3,0,0,0,0,0,0,0,0,0,4,0,0,0,0,16,0,0,0,0,0,0,128,0,128,192,223, +0,12,0,0,0,0,0,0,0,0,0,0,0,4,0,31,0,0,0,0,0, +0,254,255,255,255,0,252,255,255,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,192,255,223, +255,7,0,0,0,0,0,0,0,0,0,0,128,6,0,252,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,0, +0,0,8,0,0,0,0,0,0,0,0,0,0,0,224,255,255,255,31,0,0,255,3,0,0,0,0,0,0,0,0,0,0, +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,96,0,0,1,0,0,24,0,0,0,0,0,0,0,0,0,56,0,0,0,0,16,0,0,0,112,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,254,127,47,0,0,255,3,255,127,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,49,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,196,255,255,255, +255,0,0,0,192,0,0,0,0,0,0,0,0,1,0,224,159,0,0,0,0,127,63,255,127,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,16,0,16,0,0,252,255,255,255,31,0,0,0,0,0,12,0,0,0,0,0,0,64,0, +12,240,0,0,0,0,0,0,128,248,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0,255,0,255,255, +255,33,144,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255, +127,0,224,251,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,160,3,224,0,224,0, +224,0,96,128,248,255,255,255,252,255,255,255,255,255,127,223,255,241,127,255, +127,0,0,255,255,255,255,0,0,255,255,255,255,1,0,123,3,208,193,175,66,0,12,31, +188,255,255,0,0,0,0,0,14,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,127,0,0,0,255,7,0,0,255,255,255,255,255,255,255,255,255, +255,63,0,0,0,0,0,0,252,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,207,255,255,255, +63,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,135,3,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1, +128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,127,255,255,255,255,0, +0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255,255,255,255,15,0,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,31,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,135,3,254,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,1,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255, -127,255,15,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255,255, -255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15,30,255,255,255,1,252, -193,224,0,0,0,0,0,0,0,0,0,0,0,30,1,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,255,255,0,0,0,0,255,255,255,255,15,0,0,0,255,255,255,127,255, +255,255,255,255,255,255,63,0,0,0,255,15,30,255,255,255,1,252,193,224,0,0,0,0, +0,0,0,0,0,0,0,30,1,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +255,255,0,0,0,0,255,255,255,255,15,0,0,0,255,255,255,127,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, -255,255,255,255,127,0,0,0,0,0,0,192,0,224,0,0,0,0,0,0,0,0,0,0,0,128,15,112,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,255,255,127,0,3,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,68,8,0,0,0,15,255,3,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0, -16,192,0,0,255,255,3,7,0,0,0,0,0,248,0,0,0,0,8,128,0,0,0,0,0,0,0,0,0,0,8,0, -255,63,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,128,11,0,0,0,0,0,0,0,128,2, -0,0,192,0,0,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56, -0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,2,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,252,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,255,3,127,0,255,255,255,255,247, +255,255,255, +255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255, +255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,127,0,0,0, +0,0,0,192,0,224,0,0,0,0,0,0,0,0,0,0,0,128,15,112,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +255,0,255,255,127,0,3,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +64,0,0,0,0,15,255,3,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,16,192,0,0,255,255,3,23, +0,0,0,0,0,248,0,0,0,0,8,128,0,0,0,0,0,0,0,0,0,0,8,0,255,63,0,192,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,240,0,0,128,3,0,0,0,0,0,0,0,128,2,0,0,192,0,0,67,0,0,0,0,0, +0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,0, +0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,2,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,252,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,255,3,255,255,255,255,255,255,247, 255,127,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,254,255,0,252,1,0,0,248,1,0, 0,248,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,0,48,135,255,255,255,255,255, -143,255,0,0,0,0,0,0,224,255,255,7,255,15,0,0,0,0,0,0,255,255,255,255,255,63,0, -0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,128,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,143,0,0,0,128, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,255,0,255,1, -0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,0,0,0,255,0,0,0, -255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,127,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,63,252,255,63,0,0,0,3,0,0,0, -0,0,0,254,3,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -225,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,7,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,63,0,255,255,255,255,127,254,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,0, -255,255,255,255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,255,255,255,255,255,255,255,255,255,255,127,0,255,255,3,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,8,0,0,0, -8,0,0,32,0,0,0,32,0,0,128,0,0,0,128,0,0,0,2,0,0,0,2,0,0,8,0,0,0,0,0,0,0,0,0,0, +143,255,0,0,0,0,0,0,224,255,255,127,255,15,1,0,0,0,0,0,255,255,255,255,255,63, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255, +15,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +128,255,0,0,128,255,0,0,0,0,128,255,0,0,0,0,0,0,0,0,0,248,0,0,192,143,0,0,0, +128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,255,255,252,255,255,255,255,255,0,0,0,0, +0,0,0,135,255,1,255,1,0,0,0,224,0,0,0,224,0,0,0,0,0,1,0,0,96,248,127,0,0,0,0, +0,0,0,0,254,0,0,0,255,0,0,0,255,0,0,0,30,0,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,0,0,0,0,0,0, +0,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,224,127,0,0,0,192,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,192,63,252,255,63,0,0,128,3,0,0,0,0,0,0,254,3,32,0,0,0,0,0,0,0, +0,0,0,0,0,24,0,15,0,0,0,0,0,56,0,0,0,0,0,0,0,0,0,225,63,0,232,254,255,31,0,0, +0,0,0,0,0,96,63,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0, +24,0,32,0,0,192,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68, +248,0,104,0,0,0,0,0,0,0,0,0,0,0,0,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,128,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,128,14,0,0,0,255, +31,0,0,0,0,0,0,0,0,192,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,8,0,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,7,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,24,128,255,0,0,0,0,0, +0,0,0,0,0,223,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,62,0,0,252,255,31,3,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,128,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255, +255,3, +128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,0,0,0,0,0,0,0,255,255,48,0,0,248, +3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255, +255,255,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,15,0,0,0,0,0,0, +0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,63, +0,255,255,255,255,127,254,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,1,0,0,255,255,255,255,255,255,255,255, +63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,15,0,255,255,255,255,255,255, +255,255,255,255,127,0,255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,8,0,0,0,8,0,0,32,0,0,0,32,0,0,128, +0,0,0,128,0,0,0,2,0,0,0,2,0,0,8,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,15,0,248,254,255,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,127,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0, +128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,255,127,0,0,0,0,0,0,0, +0,0,0,0,0,0,112,7,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,31,0,0,0,0,0,0,0,0,0,254,255, +255,255,255,255,255,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,255,255,255,255,255, -15,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,127,254,127,254, -255,254,255,0,0,0,0,255,7,255,255,255,127,255,255,255,255,255,255,255,15,255, -255,255,255,255,7,0,0,0,0,0,0,0,0,192,255,255,255,7,0,255,255,255,255,255,7, -255,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,1,0,191,255, -255,255,255,255,255,255,255,31,255,255,15,0,255,255,255,255,223,7,0,0,255,255, -1,0,255,255,255,255,255,255,255,127,253,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,30,255,255,255,255,255, -255,255,63,15,0,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,255,255, -255,255,255,255,255,255,225,255,0,0,0,0,0,0,255,255,255,255,255,255,255,255, -63,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +15,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,127,254,255,254, +255,254,255,255,255,63,0,255,31,255,255,255,255,0,0,0,252,0,0,0,28,0,0,0,252, +255,255,255,31,0,0,0,0,0,0,192,255,255,255,7,0,255,255,255,255,255,15,255,1,3, +0,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,63,0,255,31,255,7,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,1, +255,15,0,0,255,15,255,255,255,255,255,255,255,0,255,3,255,255,255,255,255,0, +255,255,255,63,0,0,0,0,0,0,0,0,0,0,255,239,255,255,255,255,255,255,255,255, +255,255,255,255,123,252,255,255,255,255,231,199,255,255,255,231,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255,63,15,7,7,0,63,0, +0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/system/lib/libc/musl/src/ctype/tolower.c b/system/lib/libc/musl/src/ctype/tolower.c index 362d6b2becdeb..f10132ec2be2d 100644 --- a/system/lib/libc/musl/src/ctype/tolower.c +++ b/system/lib/libc/musl/src/ctype/tolower.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int tolower(int c) { diff --git a/system/lib/libc/musl/src/ctype/toupper.c b/system/lib/libc/musl/src/ctype/toupper.c index bbf4e06e815c6..4e74a55c60a62 100644 --- a/system/lib/libc/musl/src/ctype/toupper.c +++ b/system/lib/libc/musl/src/ctype/toupper.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int toupper(int c) { diff --git a/system/lib/libc/musl/src/ctype/towctrans.c b/system/lib/libc/musl/src/ctype/towctrans.c index 6af618758bcb8..76d137696ee9e 100644 --- a/system/lib/libc/musl/src/ctype/towctrans.c +++ b/system/lib/libc/musl/src/ctype/towctrans.c @@ -1,268 +1,73 @@ #include -#include "libc.h" -#define CASEMAP(u1,u2,l) { (u1), (l)-(u1), (u2)-(u1)+1 } -#define CASELACE(u1,u2) CASEMAP((u1),(u2),(u1)+1) +static const unsigned char tab[]; -static const struct { - unsigned short upper; - signed char lower; - unsigned char len; -} casemaps[] = { - CASEMAP('A','Z','a'), - CASEMAP(0xc0,0xde,0xe0), +static const unsigned char rulebases[512]; +static const int rules[]; - CASELACE(0x0100,0x012e), - CASELACE(0x0132,0x0136), - CASELACE(0x0139,0x0147), - CASELACE(0x014a,0x0176), - CASELACE(0x0179,0x017d), +static const unsigned char exceptions[][2]; - CASELACE(0x370,0x372), - CASEMAP(0x391,0x3a1,0x3b1), - CASEMAP(0x3a3,0x3ab,0x3c3), - CASEMAP(0x400,0x40f,0x450), - CASEMAP(0x410,0x42f,0x430), +#include "casemap.h" - CASELACE(0x460,0x480), - CASELACE(0x48a,0x4be), - CASELACE(0x4c1,0x4cd), - CASELACE(0x4d0,0x50e), - - CASELACE(0x514,0x526), - CASEMAP(0x531,0x556,0x561), - - CASELACE(0x01a0,0x01a4), - CASELACE(0x01b3,0x01b5), - CASELACE(0x01cd,0x01db), - CASELACE(0x01de,0x01ee), - CASELACE(0x01f8,0x021e), - CASELACE(0x0222,0x0232), - CASELACE(0x03d8,0x03ee), - - CASELACE(0x1e00,0x1e94), - CASELACE(0x1ea0,0x1efe), - - CASEMAP(0x1f08,0x1f0f,0x1f00), - CASEMAP(0x1f18,0x1f1d,0x1f10), - CASEMAP(0x1f28,0x1f2f,0x1f20), - CASEMAP(0x1f38,0x1f3f,0x1f30), - CASEMAP(0x1f48,0x1f4d,0x1f40), - - CASEMAP(0x1f68,0x1f6f,0x1f60), - CASEMAP(0x1f88,0x1f8f,0x1f80), - CASEMAP(0x1f98,0x1f9f,0x1f90), - CASEMAP(0x1fa8,0x1faf,0x1fa0), - CASEMAP(0x1fb8,0x1fb9,0x1fb0), - CASEMAP(0x1fba,0x1fbb,0x1f70), - CASEMAP(0x1fc8,0x1fcb,0x1f72), - CASEMAP(0x1fd8,0x1fd9,0x1fd0), - CASEMAP(0x1fda,0x1fdb,0x1f76), - CASEMAP(0x1fe8,0x1fe9,0x1fe0), - CASEMAP(0x1fea,0x1feb,0x1f7a), - CASEMAP(0x1ff8,0x1ff9,0x1f78), - CASEMAP(0x1ffa,0x1ffb,0x1f7c), - - CASELACE(0x246,0x24e), - CASELACE(0x510,0x512), - CASEMAP(0x2160,0x216f,0x2170), - CASEMAP(0x2c00,0x2c2e,0x2c30), - CASELACE(0x2c67,0x2c6b), - CASELACE(0x2c80,0x2ce2), - CASELACE(0x2ceb,0x2ced), - - CASELACE(0xa640,0xa66c), - CASELACE(0xa680,0xa696), - - CASELACE(0xa722,0xa72e), - CASELACE(0xa732,0xa76e), - CASELACE(0xa779,0xa77b), - CASELACE(0xa77e,0xa786), - - CASELACE(0xa790,0xa792), - CASELACE(0xa7a0,0xa7a8), - - CASEMAP(0xff21,0xff3a,0xff41), - { 0,0,0 } -}; - -static const unsigned short pairs[][2] = { - { 'I', 0x0131 }, - { 'S', 0x017f }, - { 0x0130, 'i' }, - { 0x0178, 0x00ff }, - { 0x0181, 0x0253 }, - { 0x0182, 0x0183 }, - { 0x0184, 0x0185 }, - { 0x0186, 0x0254 }, - { 0x0187, 0x0188 }, - { 0x0189, 0x0256 }, - { 0x018a, 0x0257 }, - { 0x018b, 0x018c }, - { 0x018e, 0x01dd }, - { 0x018f, 0x0259 }, - { 0x0190, 0x025b }, - { 0x0191, 0x0192 }, - { 0x0193, 0x0260 }, - { 0x0194, 0x0263 }, - { 0x0196, 0x0269 }, - { 0x0197, 0x0268 }, - { 0x0198, 0x0199 }, - { 0x019c, 0x026f }, - { 0x019d, 0x0272 }, - { 0x019f, 0x0275 }, - { 0x01a6, 0x0280 }, - { 0x01a7, 0x01a8 }, - { 0x01a9, 0x0283 }, - { 0x01ac, 0x01ad }, - { 0x01ae, 0x0288 }, - { 0x01af, 0x01b0 }, - { 0x01b1, 0x028a }, - { 0x01b2, 0x028b }, - { 0x01b7, 0x0292 }, - { 0x01b8, 0x01b9 }, - { 0x01bc, 0x01bd }, - { 0x01c4, 0x01c6 }, - { 0x01c4, 0x01c5 }, - { 0x01c5, 0x01c6 }, - { 0x01c7, 0x01c9 }, - { 0x01c7, 0x01c8 }, - { 0x01c8, 0x01c9 }, - { 0x01ca, 0x01cc }, - { 0x01ca, 0x01cb }, - { 0x01cb, 0x01cc }, - { 0x01f1, 0x01f3 }, - { 0x01f1, 0x01f2 }, - { 0x01f2, 0x01f3 }, - { 0x01f4, 0x01f5 }, - { 0x01f6, 0x0195 }, - { 0x01f7, 0x01bf }, - { 0x0220, 0x019e }, - { 0x0386, 0x03ac }, - { 0x0388, 0x03ad }, - { 0x0389, 0x03ae }, - { 0x038a, 0x03af }, - { 0x038c, 0x03cc }, - { 0x038e, 0x03cd }, - { 0x038f, 0x03ce }, - { 0x0399, 0x0345 }, - { 0x0399, 0x1fbe }, - { 0x03a3, 0x03c2 }, - { 0x03f7, 0x03f8 }, - { 0x03fa, 0x03fb }, - { 0x1e60, 0x1e9b }, - { 0x1e9e, 0xdf }, - - { 0x1f59, 0x1f51 }, - { 0x1f5b, 0x1f53 }, - { 0x1f5d, 0x1f55 }, - { 0x1f5f, 0x1f57 }, - { 0x1fbc, 0x1fb3 }, - { 0x1fcc, 0x1fc3 }, - { 0x1fec, 0x1fe5 }, - { 0x1ffc, 0x1ff3 }, - - { 0x23a, 0x2c65 }, - { 0x23b, 0x23c }, - { 0x23d, 0x19a }, - { 0x23e, 0x2c66 }, - { 0x241, 0x242 }, - { 0x243, 0x180 }, - { 0x244, 0x289 }, - { 0x245, 0x28c }, - { 0x3f4, 0x3b8 }, - { 0x3f9, 0x3f2 }, - { 0x3fd, 0x37b }, - { 0x3fe, 0x37c }, - { 0x3ff, 0x37d }, - { 0x4c0, 0x4cf }, - - { 0x2126, 0x3c9 }, - { 0x212a, 'k' }, - { 0x212b, 0xe5 }, - { 0x2132, 0x214e }, - { 0x2183, 0x2184 }, - { 0x2c60, 0x2c61 }, - { 0x2c62, 0x26b }, - { 0x2c63, 0x1d7d }, - { 0x2c64, 0x27d }, - { 0x2c6d, 0x251 }, - { 0x2c6e, 0x271 }, - { 0x2c6f, 0x250 }, - { 0x2c70, 0x252 }, - { 0x2c72, 0x2c73 }, - { 0x2c75, 0x2c76 }, - { 0x2c7e, 0x23f }, - { 0x2c7f, 0x240 }, - { 0x2cf2, 0x2cf3 }, - - { 0xa77d, 0x1d79 }, - { 0xa78b, 0xa78c }, - { 0xa78d, 0x265 }, - { 0xa7aa, 0x266 }, - - { 0x10c7, 0x2d27 }, - { 0x10cd, 0x2d2d }, - - /* bogus greek 'symbol' letters */ - { 0x376, 0x377 }, - { 0x39c, 0xb5 }, - { 0x392, 0x3d0 }, - { 0x398, 0x3d1 }, - { 0x3a6, 0x3d5 }, - { 0x3a0, 0x3d6 }, - { 0x39a, 0x3f0 }, - { 0x3a1, 0x3f1 }, - { 0x395, 0x3f5 }, - { 0x3cf, 0x3d7 }, - - { 0,0 } -}; - - -static wchar_t __towcase(wchar_t wc, int lower) +static int casemap(unsigned c, int dir) { - int i; - int lmul = 2*lower-1; - int lmask = lower-1; - /* no letters with case in these large ranges */ - if (!iswalpha(wc) - || (unsigned)wc - 0x0600 <= 0x0fff-0x0600 - || (unsigned)wc - 0x2e00 <= 0xa63f-0x2e00 - || (unsigned)wc - 0xa800 <= 0xfeff-0xa800) - return wc; - /* special case because the diff between upper/lower is too big */ - if (lower && (unsigned)wc - 0x10a0 < 0x2e) - if (wc>0x10c5 && wc != 0x10c7 && wc != 0x10cd) return wc; - else return wc + 0x2d00 - 0x10a0; - if (!lower && (unsigned)wc - 0x2d00 < 0x26) - if (wc>0x2d25 && wc != 0x2d27 && wc != 0x2d2d) return wc; - else return wc + 0x10a0 - 0x2d00; - for (i=0; casemaps[i].len; i++) { - int base = casemaps[i].upper + (lmask & casemaps[i].lower); - if ((unsigned)wc-base < casemaps[i].len) { - if (casemaps[i].lower == 1) - return wc + lower - ((wc-casemaps[i].upper)&1); - return wc + lmul*casemaps[i].lower; + unsigned b, x, y, v, rt, xb, xn; + int r, rd, c0 = c; + + if (c >= 0x20000) return c; + + b = c>>8; + c &= 255; + x = c/3; + y = c%3; + + /* lookup entry in two-level base-6 table */ + v = tab[tab[b]*86+x]; + static const int mt[] = { 2048, 342, 57 }; + v = (v*mt[y]>>11)%6; + + /* use the bit vector out of the tables as an index into + * a block-specific set of rules and decode the rule into + * a type and a case-mapping delta. */ + r = rules[rulebases[b]+v]; + rt = r & 255; + rd = r >> 8; + + /* rules 0/1 are simple lower/upper case with a delta. + * apply according to desired mapping direction. */ + if (rt < 2) return c0 + (rd & -(rt^dir)); + + /* binary search. endpoints of the binary search for + * this block are stored in the rule delta field. */ + xn = rd & 0xff; + xb = (unsigned)rd >> 8; + while (xn) { + unsigned try = exceptions[xb+xn/2][0]; + if (try == c) { + r = rules[exceptions[xb+xn/2][1]]; + rt = r & 255; + rd = r >> 8; + if (rt < 2) return c0 + (rd & -(rt^dir)); + /* Hard-coded for the four exceptional titlecase */ + return c0 + (dir ? -1 : 1); + } else if (try > c) { + xn /= 2; + } else { + xb += xn/2; + xn -= xn/2; } } - for (i=0; pairs[i][1-lower]; i++) { - if (pairs[i][1-lower] == wc) - return pairs[i][lower]; - } - if ((unsigned)wc - (0x10428 - 0x28*lower) < 0x28) - return wc - 0x28 + 0x50*lower; - return wc; + return c0; } -wint_t towupper(wint_t wc) +wint_t towlower(wint_t wc) { - return __towcase(wc, 0); + return casemap(wc, 0); } -wint_t towlower(wint_t wc) +wint_t towupper(wint_t wc) { - return __towcase(wc, 1); + return casemap(wc, 1); } wint_t __towupper_l(wint_t c, locale_t l) diff --git a/system/lib/libc/musl/src/ctype/wctrans.c b/system/lib/libc/musl/src/ctype/wctrans.c index b1b1265481c7d..d3eda5216740e 100644 --- a/system/lib/libc/musl/src/ctype/wctrans.c +++ b/system/lib/libc/musl/src/ctype/wctrans.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" wctrans_t wctrans(const char *class) { diff --git a/system/lib/libc/musl/src/ctype/wcwidth.c b/system/lib/libc/musl/src/ctype/wcwidth.c index 49c40eea8cabf..36256a538551b 100644 --- a/system/lib/libc/musl/src/ctype/wcwidth.c +++ b/system/lib/libc/musl/src/ctype/wcwidth.c @@ -23,7 +23,7 @@ int wcwidth(wchar_t wc) return -1; if (wc-0x20000U < 0x20000) return 2; - if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100 < 0xef) + if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100U < 0xef) return 0; return 1; } diff --git a/system/lib/libc/musl/src/ctype/wide.h b/system/lib/libc/musl/src/ctype/wide.h index 125d0ce398f16..e403c9a5a2fab 100644 --- a/system/lib/libc/musl/src/ctype/wide.h +++ b/system/lib/libc/musl/src/ctype/wide.h @@ -1,42 +1,65 @@ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,18,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,19,16,16,16,16,16,16,16,16,16,16,20,21,22,23,24,17, -17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,25, +16,16,16,16,16,16,16,16,16,19,16,20,21,22,16,16,16,23,16,16,24,25,26,27,28,17, +17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,29, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, -17,17,17,17,17,17,17,17,26,16,16,16,16,27,16,16,17,17,17,17,17,17,17,17,17,17, +17,17,17,17,17,17,17,17,30,16,16,16,16,31,16,16,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, -17,17,17,17,17,17,17,28,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,16,16,16,29,30,16,16,16,16, +17,17,17,17,17,17,17,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,16,16,16,33, +34,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,35,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, +17,17,17,17,17,17,36,17,17,37,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, +16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,38,39,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,31,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16, -16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255, +16,16,16,16,16,16,16,40,41,42,43,44,45,46,47,16,48,49,16,16,16,16, +16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,6,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,0,0,48,0,0,0,0,0,0,255,15,0,0,0,0,128,0,0,8, +0,2,12,0,96,48,64,16,0,0,4,44,36,32,12,0,0,0,1,0,0,0,80,184,0,0,0,0,0,0,0,224, +0,0,0,1,128,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255,255,255,255,255, +255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15,255,255,255,255, +255,255,255,127,254,255,255,255,255,255,255,255,255,255,127,254,255,255,255, +255,255,255,255,255,255,255,255,255,224,255,255,255,255,255,254,255,255,255, +255,255,255,255,255,255,255,127,255,255,255,255,255,7,255,255,255,255,15,0, +255,255,255,255,255,127,255,255,255,255,255,0,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0, +0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,31,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255, +255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,15,0,0,0,0,0,0,0,0,0,0,0,0,0,255,3,0,0,255,255,255,255,247,255,127,15,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,255,255,255, +255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +255,255,255,255,255,255,255,255,255,255,255,255,7,0,255,255,255,127,0,0,0,0,0, +0,7,0,240,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0, -0,248,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,251,255,255,255, -255,255,255,255,255,255,255,15,0,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,63,0,0,0,255,15, -255,255,255,255,255,255,255,127,254,255,255,255,255,255,255,255,255,255,127, -254,255,255,255,255,255,255,255,255,255,255,255,255,224,255,255,255,255,63, -254,255,255,255,255,255,255,255,255,255,255,127,255,255,255,255,255,7,255,255, -255,255,15,0,255,255,255,255,255,127,255,255,255,255,255,0,255,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127,255, +255,255,255,255,255,255,255,255,255,255,255,255,255,255, +15,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,64,254,7,0,0,0,0,0,0,0,0,0,0,0,0,7,0,255,255,255, +255,255,15,255,1,3,0,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255, +1,224,191,255,255,255,255,255,255,255,255,223,255,255,15,0,255,255,255,255, +255,135,15,0,255,255,17,255,255,255,255,255,255,255,255,127,253,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,31,255,255,255,255,255,255,127,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,255,255,255,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255, -255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,15,0,255, -255,127,248,255,255,255,255,255,15,0,0,255,3,0,0,255,255,255,255,247,255,127, -15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,254,255,255,255,255,255,255,255,255, -255,255,255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,127,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,255,255,255,255,255,7,255,1,3,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +159,255,255,255,255,255,255,255,63,0,120,255,255,255,0,0,4,0,0,96,0,16,0,0,0, +0,0,0,0,0,0,0,248,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,255,255, +255,255,255,255,255,255,63,16,39,0,0,24,240,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,255,15,0, +0,0,224,255,255,255,255,255,255,255,255,255,255,255,255,123,252,255,255,255, +255,231,199,255,255,255,231,255,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,15,7,7,0,63,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/system/lib/libc/musl/src/dirent/__dirent.h b/system/lib/libc/musl/src/dirent/__dirent.h index 32871baf51a1f..828a5f178917a 100644 --- a/system/lib/libc/musl/src/dirent/__dirent.h +++ b/system/lib/libc/musl/src/dirent/__dirent.h @@ -1,9 +1,11 @@ struct __dirstream { - int fd; off_t tell; + int fd; int buf_pos; int buf_end; - volatile int lock[2]; + volatile int lock[1]; + /* Any changes to this struct must preserve the property: + * offsetof(struct __dirent, buf) % sizeof(off_t) == 0 */ char buf[2048]; }; diff --git a/system/lib/libc/musl/src/dirent/__getdents.c b/system/lib/libc/musl/src/dirent/__getdents.c deleted file mode 100644 index 1acd5a696aa66..0000000000000 --- a/system/lib/libc/musl/src/dirent/__getdents.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include "syscall.h" -#include "libc.h" - -int __getdents(int fd, struct dirent *buf, size_t len) -{ - return syscall(SYS_getdents, fd, buf, len); -} - -weak_alias(__getdents, getdents); - -LFS64(getdents); diff --git a/system/lib/libc/musl/src/dirent/alphasort.c b/system/lib/libc/musl/src/dirent/alphasort.c index 42050fb7cb52e..bee672ebda0c5 100644 --- a/system/lib/libc/musl/src/dirent/alphasort.c +++ b/system/lib/libc/musl/src/dirent/alphasort.c @@ -1,10 +1,9 @@ #include #include -#include "libc.h" int alphasort(const struct dirent **a, const struct dirent **b) { return strcoll((*a)->d_name, (*b)->d_name); } -LFS64(alphasort); +weak_alias(alphasort, alphasort64); diff --git a/system/lib/libc/musl/src/dirent/closedir.c b/system/lib/libc/musl/src/dirent/closedir.c index 81e9591c60476..e794ae9ca44b4 100644 --- a/system/lib/libc/musl/src/dirent/closedir.c +++ b/system/lib/libc/musl/src/dirent/closedir.c @@ -1,7 +1,7 @@ #include #include +#include #include "__dirent.h" -#include "libc.h" int closedir(DIR *dir) { diff --git a/system/lib/libc/musl/src/dirent/fdopendir.c b/system/lib/libc/musl/src/dirent/fdopendir.c index c377271da5391..d78fb87f9bc90 100644 --- a/system/lib/libc/musl/src/dirent/fdopendir.c +++ b/system/lib/libc/musl/src/dirent/fdopendir.c @@ -13,6 +13,10 @@ DIR *fdopendir(int fd) if (fstat(fd, &st) < 0) { return 0; } + if (fcntl(fd, F_GETFL) & O_PATH) { + errno = EBADF; + return 0; + } if (!S_ISDIR(st.st_mode)) { errno = ENOTDIR; return 0; diff --git a/system/lib/libc/musl/src/dirent/readdir.c b/system/lib/libc/musl/src/dirent/readdir.c index 2cf0632c207ef..569fc70577378 100644 --- a/system/lib/libc/musl/src/dirent/readdir.c +++ b/system/lib/libc/musl/src/dirent/readdir.c @@ -1,10 +1,11 @@ #include #include +#include #include "__dirent.h" #include "syscall.h" -#include "libc.h" -int __getdents(int, struct dirent *, size_t); +typedef char dirstream_buf_alignment_check[1-2*(int)( + offsetof(struct __dirstream, buf) % sizeof(off_t))]; struct dirent *readdir(DIR *dir) { @@ -25,4 +26,4 @@ struct dirent *readdir(DIR *dir) return de; } -LFS64(readdir); +weak_alias(readdir, readdir64); diff --git a/system/lib/libc/musl/src/dirent/readdir_r.c b/system/lib/libc/musl/src/dirent/readdir_r.c index daa6c6ed60844..e2a818f36a0c6 100644 --- a/system/lib/libc/musl/src/dirent/readdir_r.c +++ b/system/lib/libc/musl/src/dirent/readdir_r.c @@ -2,7 +2,7 @@ #include #include #include "__dirent.h" -#include "libc.h" +#include "lock.h" int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **restrict result) { @@ -26,4 +26,4 @@ int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **re return 0; } -LFS64_2(readdir_r, readdir64_r); +weak_alias(readdir_r, readdir64_r); diff --git a/system/lib/libc/musl/src/dirent/rewinddir.c b/system/lib/libc/musl/src/dirent/rewinddir.c index f2053008b36c2..7ddda437213d1 100644 --- a/system/lib/libc/musl/src/dirent/rewinddir.c +++ b/system/lib/libc/musl/src/dirent/rewinddir.c @@ -1,7 +1,7 @@ #include #include #include "__dirent.h" -#include "libc.h" +#include "lock.h" void rewinddir(DIR *dir) { diff --git a/system/lib/libc/musl/src/dirent/scandir.c b/system/lib/libc/musl/src/dirent/scandir.c index 3af2b50f81920..7ee195dd8ab31 100644 --- a/system/lib/libc/musl/src/dirent/scandir.c +++ b/system/lib/libc/musl/src/dirent/scandir.c @@ -4,7 +4,6 @@ #include #include #include -#include "libc.h" int scandir(const char *path, struct dirent ***res, int (*sel)(const struct dirent *), @@ -45,4 +44,4 @@ int scandir(const char *path, struct dirent ***res, return cnt; } -LFS64(scandir); +weak_alias(scandir, scandir64); diff --git a/system/lib/libc/musl/src/dirent/seekdir.c b/system/lib/libc/musl/src/dirent/seekdir.c index 5be47d4a15564..bf6cc6ec40453 100644 --- a/system/lib/libc/musl/src/dirent/seekdir.c +++ b/system/lib/libc/musl/src/dirent/seekdir.c @@ -1,7 +1,7 @@ #include #include #include "__dirent.h" -#include "libc.h" +#include "lock.h" void seekdir(DIR *dir, long off) { diff --git a/system/lib/libc/musl/src/dirent/versionsort.c b/system/lib/libc/musl/src/dirent/versionsort.c index 410cb703456f3..d4c489230abb8 100644 --- a/system/lib/libc/musl/src/dirent/versionsort.c +++ b/system/lib/libc/musl/src/dirent/versionsort.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include -#include "libc.h" int versionsort(const struct dirent **a, const struct dirent **b) { @@ -9,4 +8,4 @@ int versionsort(const struct dirent **a, const struct dirent **b) } #undef versionsort64 -LFS64(versionsort); +weak_alias(versionsort, versionsort64); diff --git a/system/lib/libc/musl/src/env/__environ.c b/system/lib/libc/musl/src/env/__environ.c index 1a22ffc002620..4052db2de8205 100644 --- a/system/lib/libc/musl/src/env/__environ.c +++ b/system/lib/libc/musl/src/env/__environ.c @@ -1,4 +1,4 @@ -#include "libc.h" +#include char **__environ = 0; weak_alias(__environ, ___environ); diff --git a/system/lib/libc/musl/src/env/__init_tls.c b/system/lib/libc/musl/src/env/__init_tls.c index 0107a545f282a..a93141ed36a8d 100644 --- a/system/lib/libc/musl/src/env/__init_tls.c +++ b/system/lib/libc/musl/src/env/__init_tls.c @@ -1,3 +1,4 @@ +#define SYSCALL_NO_TLS 1 #include #include #include @@ -8,6 +9,8 @@ #include "atomic.h" #include "syscall.h" +volatile int __thread_list_lock; + int __init_tp(void *p) { pthread_t td = p; @@ -15,9 +18,12 @@ int __init_tp(void *p) int r = __set_thread_area(TP_ADJ(p)); if (r < 0) return -1; if (!r) libc.can_do_threads = 1; - td->tid = __syscall(SYS_set_tid_address, &td->tid); + td->detach_state = DT_JOINABLE; + td->tid = __syscall(SYS_set_tid_address, &__thread_list_lock); td->locale = &libc.global_locale; td->robust_list.head = &td->robust_list.head; + td->sysinfo = __sysinfo; + td->next = td->prev = td; return 0; } @@ -35,33 +41,33 @@ void *__copy_tls(unsigned char *mem) pthread_t td; struct tls_module *p; size_t i; - void **dtv; + uintptr_t *dtv; #ifdef TLS_ABOVE_TP - dtv = (void **)(mem + libc.tls_size) - (libc.tls_cnt + 1); + dtv = (uintptr_t*)(mem + libc.tls_size) - (libc.tls_cnt + 1); mem += -((uintptr_t)mem + sizeof(struct pthread)) & (libc.tls_align-1); td = (pthread_t)mem; mem += sizeof(struct pthread); for (i=1, p=libc.tls_head; p; i++, p=p->next) { - dtv[i] = mem + p->offset; - memcpy(dtv[i], p->image, p->len); + dtv[i] = (uintptr_t)(mem + p->offset) + DTP_OFFSET; + memcpy(mem + p->offset, p->image, p->len); } #else - dtv = (void **)mem; + dtv = (uintptr_t *)mem; mem += libc.tls_size - sizeof(struct pthread); mem -= (uintptr_t)mem & (libc.tls_align-1); td = (pthread_t)mem; for (i=1, p=libc.tls_head; p; i++, p=p->next) { - dtv[i] = mem - p->offset; - memcpy(dtv[i], p->image, p->len); + dtv[i] = (uintptr_t)(mem - p->offset) + DTP_OFFSET; + memcpy(mem - p->offset, p->image, p->len); } #endif - dtv[0] = (void *)libc.tls_cnt; - td->dtv = td->dtv_copy = dtv; + dtv[0] = libc.tls_cnt; + td->dtv = dtv; return td; } @@ -71,6 +77,8 @@ typedef Elf32_Phdr Phdr; typedef Elf64_Phdr Phdr; #endif +extern weak hidden const size_t _DYNAMIC[]; + static void static_init_tls(size_t *aux) { unsigned char *p; @@ -83,8 +91,15 @@ static void static_init_tls(size_t *aux) phdr = (void *)p; if (phdr->p_type == PT_PHDR) base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; if (phdr->p_type == PT_TLS) tls_phdr = phdr; + if (phdr->p_type == PT_GNU_STACK && + phdr->p_memsz > __default_stacksize) + __default_stacksize = + phdr->p_memsz < DEFAULT_STACK_MAX ? + phdr->p_memsz : DEFAULT_STACK_MAX; } if (tls_phdr) { @@ -98,13 +113,20 @@ static void static_init_tls(size_t *aux) main_tls.size += (-main_tls.size - (uintptr_t)main_tls.image) & (main_tls.align-1); - if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN; -#ifndef TLS_ABOVE_TP +#ifdef TLS_ABOVE_TP + main_tls.offset = GAP_ABOVE_TP; + main_tls.offset += (-GAP_ABOVE_TP + (uintptr_t)main_tls.image) + & (main_tls.align-1); +#else main_tls.offset = main_tls.size; #endif + if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN; libc.tls_align = main_tls.align; libc.tls_size = 2*sizeof(void *) + sizeof(struct pthread) +#ifdef TLS_ABOVE_TP + + main_tls.offset +#endif + main_tls.size + main_tls.align + MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN; diff --git a/system/lib/libc/musl/src/env/__libc_start_main.c b/system/lib/libc/musl/src/env/__libc_start_main.c index 5c79be28f0b5c..8fbe526271d81 100644 --- a/system/lib/libc/musl/src/env/__libc_start_main.c +++ b/system/lib/libc/musl/src/env/__libc_start_main.c @@ -2,23 +2,24 @@ #include #include #include +#include #include "syscall.h" #include "atomic.h" #include "libc.h" -void __init_tls(size_t *); - static void dummy(void) {} weak_alias(dummy, _init); -__attribute__((__weak__, __visibility__("hidden"))) -extern void (*const __init_array_start)(void), (*const __init_array_end)(void); +extern weak hidden void (*const __init_array_start)(void), (*const __init_array_end)(void); static void dummy1(void *p) {} weak_alias(dummy1, __init_ssp); #define AUX_CNT 38 +#ifdef __GNUC__ +__attribute__((__noinline__)) +#endif void __init_libc(char **envp, char *pn) { size_t i, *auxv, aux[AUX_CNT] = { 0 }; @@ -27,13 +28,13 @@ void __init_libc(char **envp, char *pn) libc.auxv = auxv = (void *)(envp+i+1); for (i=0; auxv[i]; i+=2) if (auxv[i]dtv[0]; + size_t i, n = self->dtv[0]; if (n) for (p=libc.tls_head, i=1; i<=n; i++, p=p->next) { - if (!self->dtv[i]) continue; - memcpy(self->dtv[i], p->image, p->len); - memset((char *)self->dtv[i]+p->len, 0, - p->size - p->len); + char *mem = (char *)(self->dtv[i] - DTP_OFFSET); + memcpy(mem, p->image, p->len); + memset(mem+p->len, 0, p->size - p->len); } } diff --git a/system/lib/libc/musl/src/env/__stack_chk_fail.c b/system/lib/libc/musl/src/env/__stack_chk_fail.c index 4de82fd9d2f39..bf5a280ad95b6 100644 --- a/system/lib/libc/musl/src/env/__stack_chk_fail.c +++ b/system/lib/libc/musl/src/env/__stack_chk_fail.c @@ -9,7 +9,7 @@ void __init_ssp(void *entropy) if (entropy) memcpy(&__stack_chk_guard, entropy, sizeof(uintptr_t)); else __stack_chk_guard = (uintptr_t)&__stack_chk_guard * 1103515245; - __pthread_self()->CANARY = __stack_chk_guard; + __pthread_self()->canary = __stack_chk_guard; } void __stack_chk_fail(void) @@ -17,7 +17,6 @@ void __stack_chk_fail(void) a_crash(); } -__attribute__((__visibility__("hidden"))) -void __stack_chk_fail_local(void); +hidden void __stack_chk_fail_local(void); weak_alias(__stack_chk_fail, __stack_chk_fail_local); diff --git a/system/lib/libc/musl/src/env/clearenv.c b/system/lib/libc/musl/src/env/clearenv.c index 62d50952dabff..db8e8e94b8e0c 100644 --- a/system/lib/libc/musl/src/env/clearenv.c +++ b/system/lib/libc/musl/src/env/clearenv.c @@ -1,10 +1,14 @@ #define _GNU_SOURCE #include +#include -extern char **__environ; +static void dummy(char *old, char *new) {} +weak_alias(dummy, __env_rm_add); int clearenv() { - __environ[0] = 0; + char **e = __environ; + __environ = 0; + if (e) while (*e) __env_rm_add(*e++, 0); return 0; } diff --git a/system/lib/libc/musl/src/env/getenv.c b/system/lib/libc/musl/src/env/getenv.c index 00c1bce03725b..a90d39cf74f35 100644 --- a/system/lib/libc/musl/src/env/getenv.c +++ b/system/lib/libc/musl/src/env/getenv.c @@ -1,14 +1,13 @@ #include #include -#include "libc.h" +#include char *getenv(const char *name) { - int i; - size_t l = strlen(name); - if (!__environ || !*name || strchr(name, '=')) return NULL; - for (i=0; __environ[i] && (strncmp(name, __environ[i], l) - || __environ[i][l] != '='); i++); - if (__environ[i]) return __environ[i] + l+1; - return NULL; + size_t l = __strchrnul(name, '=') - name; + if (l && !name[l] && __environ) + for (char **e = __environ; *e; e++) + if (!strncmp(name, *e, l) && l[*e] == '=') + return *e + l+1; + return 0; } diff --git a/system/lib/libc/musl/src/env/putenv.c b/system/lib/libc/musl/src/env/putenv.c index 7153042669da8..dce8c8288aeb3 100644 --- a/system/lib/libc/musl/src/env/putenv.c +++ b/system/lib/libc/musl/src/env/putenv.c @@ -1,58 +1,46 @@ #include #include +#include -extern char **__environ; -char **__env_map; +static void dummy(char *old, char *new) {} +weak_alias(dummy, __env_rm_add); -int __putenv(char *s, int a) +int __putenv(char *s, size_t l, char *r) { - int i=0, j=0; - char *z = strchr(s, '='); - char **newenv = 0; - char **newmap = 0; - static char **oldenv; - - if (!z) return unsetenv(s); - if (z==s) return -1; - for (; __environ[i] && memcmp(s, __environ[i], z-s+1); i++); - if (a) { - if (!__env_map) { - __env_map = calloc(2, sizeof(char *)); - if (__env_map) __env_map[0] = s; - } else { - for (; __env_map[j] && __env_map[j] != __environ[i]; j++); - if (!__env_map[j]) { - newmap = realloc(__env_map, sizeof(char *)*(j+2)); - if (newmap) { - __env_map = newmap; - __env_map[j] = s; - __env_map[j+1] = NULL; - } - } else { - free(__env_map[j]); - __env_map[j] = s; + size_t i=0; + if (__environ) { + for (char **e = __environ; *e; e++, i++) + if (!strncmp(s, *e, l+1)) { + char *tmp = *e; + *e = s; + __env_rm_add(tmp, r); + return 0; } - } } - if (!__environ[i]) { - newenv = malloc(sizeof(char *)*(i+2)); - if (!newenv) { - if (a && __env_map) __env_map[j] = 0; - return -1; - } - memcpy(newenv, __environ, sizeof(char *)*i); - newenv[i] = s; - newenv[i+1] = 0; - __environ = newenv; + static char **oldenv; + char **newenv; + if (__environ == oldenv) { + newenv = realloc(oldenv, sizeof *newenv * (i+2)); + if (!newenv) goto oom; + } else { + newenv = malloc(sizeof *newenv * (i+2)); + if (!newenv) goto oom; + if (i) memcpy(newenv, __environ, sizeof *newenv * i); free(oldenv); - oldenv = __environ; } - - __environ[i] = s; + newenv[i] = s; + newenv[i+1] = 0; + __environ = oldenv = newenv; + if (r) __env_rm_add(0, r); return 0; +oom: + free(r); + return -1; } int putenv(char *s) { - return __putenv(s, 0); + size_t l = __strchrnul(s, '=') - s; + if (!l || !s[l]) return unsetenv(s); + return __putenv(s, l, 0); } diff --git a/system/lib/libc/musl/src/env/secure_getenv.c b/system/lib/libc/musl/src/env/secure_getenv.c new file mode 100644 index 0000000000000..72322f811baac --- /dev/null +++ b/system/lib/libc/musl/src/env/secure_getenv.c @@ -0,0 +1,8 @@ +#define _GNU_SOURCE +#include +#include "libc.h" + +char *secure_getenv(const char *name) +{ + return libc.secure ? NULL : getenv(name); +} diff --git a/system/lib/libc/musl/src/env/setenv.c b/system/lib/libc/musl/src/env/setenv.c index 76e8ee1206e5b..c5226b6d3c52f 100644 --- a/system/lib/libc/musl/src/env/setenv.c +++ b/system/lib/libc/musl/src/env/setenv.c @@ -2,29 +2,41 @@ #include #include -int __putenv(char *s, int a); +void __env_rm_add(char *old, char *new) +{ + static char **env_alloced; + static size_t env_alloced_n; + for (size_t i=0; i < env_alloced_n; i++) + if (env_alloced[i] == old) { + env_alloced[i] = new; + free(old); + return; + } else if (!env_alloced[i] && new) { + env_alloced[i] = new; + new = 0; + } + if (!new) return; + char **t = realloc(env_alloced, sizeof *t * (env_alloced_n+1)); + if (!t) return; + (env_alloced = t)[env_alloced_n++] = new; +} int setenv(const char *var, const char *value, int overwrite) { char *s; - int l1, l2; + size_t l1, l2; - if (!var || !*var || strchr(var, '=')) { + if (!var || !(l1 = __strchrnul(var, '=') - var) || var[l1]) { errno = EINVAL; return -1; } if (!overwrite && getenv(var)) return 0; - l1 = strlen(var); l2 = strlen(value); s = malloc(l1+l2+2); - if (s) { - memcpy(s, var, l1); - s[l1] = '='; - memcpy(s+l1+1, value, l2); - s[l1+l2+1] = 0; - if (!__putenv(s, 1)) return 0; - } - free(s); - return -1; + if (!s) return -1; + memcpy(s, var, l1); + s[l1] = '='; + memcpy(s+l1+1, value, l2+1); + return __putenv(s, l1, s); } diff --git a/system/lib/libc/musl/src/env/unsetenv.c b/system/lib/libc/musl/src/env/unsetenv.c index 356933546a31a..b14c4c929b1f1 100644 --- a/system/lib/libc/musl/src/env/unsetenv.c +++ b/system/lib/libc/musl/src/env/unsetenv.c @@ -1,31 +1,28 @@ #include #include #include +#include -extern char **__environ; -extern char **__env_map; +static void dummy(char *old, char *new) {} +weak_alias(dummy, __env_rm_add); int unsetenv(const char *name) { - int i, j; - size_t l = strlen(name); - - if (!*name || strchr(name, '=')) { + size_t l = __strchrnul(name, '=') - name; + if (!l || name[l]) { errno = EINVAL; return -1; } -again: - for (i=0; __environ[i] && (memcmp(name, __environ[i], l) || __environ[i][l] != '='); i++); - if (__environ[i]) { - if (__env_map) { - for (j=0; __env_map[j] && __env_map[j] != __environ[i]; j++); - free (__env_map[j]); - for (; __env_map[j]; j++) - __env_map[j] = __env_map[j+1]; - } - for (; __environ[i]; i++) - __environ[i] = __environ[i+1]; - goto again; + if (__environ) { + char **e = __environ, **eo = e; + for (; *e; e++) + if (!strncmp(name, *e, l) && l[*e] == '=') + __env_rm_add(*e, 0); + else if (eo != e) + *eo++ = *e; + else + eo++; + if (eo != e) *eo = 0; } return 0; } diff --git a/system/lib/libc/musl/src/errno/__errno_location.c b/system/lib/libc/musl/src/errno/__errno_location.c index 5a67442045d31..dc153bce7c6df 100644 --- a/system/lib/libc/musl/src/errno/__errno_location.c +++ b/system/lib/libc/musl/src/errno/__errno_location.c @@ -1,3 +1,4 @@ +#include #include "pthread_impl.h" #if __EMSCRIPTEN_PTHREADS__ @@ -17,3 +18,5 @@ int *__errno_location(void) return &__errno_storage; } #endif + +weak_alias(__errno_location, ___errno_location); diff --git a/system/lib/libc/musl/src/errno/__strerror.h b/system/lib/libc/musl/src/errno/__strerror.h index 915044b5ca380..2d992da554089 100644 --- a/system/lib/libc/musl/src/errno/__strerror.h +++ b/system/lib/libc/musl/src/errno/__strerror.h @@ -1,8 +1,9 @@ -/* This file is sorted such that 'errors' which represent exceptional - * conditions under which a correct program may fail come first, followed - * by messages that indicate an incorrect program or system failure. The - * macro E() along with double-inclusion is used to ensure that ordering - * of the strings remains synchronized. */ +/* The first entry is a catch-all for codes not enumerated here. + * This file is included multiple times to declare and define a structure + * with these messages, and then to define a lookup table translating + * error codes to offsets of corresponding fields in the structure. */ + +E(0, "No error information") E(EILSEQ, "Illegal byte sequence") E(EDOM, "Domain error") @@ -100,5 +101,4 @@ E(EREMOTEIO, "Remote I/O error") E(EDQUOT, "Quota exceeded") E(ENOMEDIUM, "No medium found") E(EMEDIUMTYPE, "Wrong medium type") - -E(0, "No error information") +E(EMULTIHOP, "Multihop attempted") diff --git a/system/lib/libc/musl/src/errno/strerror.c b/system/lib/libc/musl/src/errno/strerror.c index 24c94d3742d4e..7f926432b3090 100644 --- a/system/lib/libc/musl/src/errno/strerror.c +++ b/system/lib/libc/musl/src/errno/strerror.c @@ -1,31 +1,41 @@ #include +#include #include #include "locale_impl.h" -#include "libc.h" -#define E(a,b) ((unsigned char)a), -static const unsigned char errid[] = { +/* mips has one error code outside of the 8-bit range due to a + * historical typo, so we just remap it. */ +#if EDQUOT==1133 +#define EDQUOT_ORIG 1133 +#undef EDQUOT +#define EDQUOT 109 +#endif + +static const struct errmsgstr_t { +#define E(n, s) char str##n[sizeof(s)]; +#include "__strerror.h" +#undef E +} errmsgstr = { +#define E(n, s) s, #include "__strerror.h" +#undef E }; -#undef E -#define E(a,b) b "\0" -static const char errmsg[] = +static const unsigned short errmsgidx[] = { +#define E(n, s) [n] = offsetof(struct errmsgstr_t, str##n), #include "__strerror.h" -; +#undef E +}; char *__strerror_l(int e, locale_t loc) { const char *s; - int i; - /* mips has one error code outside of the 8-bit range due to a - * historical typo, so we just remap it. */ - if (EDQUOT==1133) { - if (e==109) e=-1; - else if (e==EDQUOT) e=109; - } - for (i=0; errid[i] && errid[i] != e; i++); - for (s=errmsg; i; s++, i--) for (; *s; s++); +#ifdef EDQUOT_ORIG + if (e==EDQUOT) e=0; + else if (e==EDQUOT_ORIG) e=EDQUOT; +#endif + if (e >= sizeof errmsgidx / sizeof *errmsgidx) e = 0; + s = (char *)&errmsgstr + errmsgidx[e]; return (char *)LCTRANS(s, LC_MESSAGES, loc); } diff --git a/system/lib/libc/musl/src/exit/abort.c b/system/lib/libc/musl/src/exit/abort.c index ecc0f735aaee7..f21f458eca149 100644 --- a/system/lib/libc/musl/src/exit/abort.c +++ b/system/lib/libc/musl/src/exit/abort.c @@ -3,11 +3,27 @@ #include "syscall.h" #include "pthread_impl.h" #include "atomic.h" +#include "lock.h" +#include "ksigaction.h" _Noreturn void abort(void) { raise(SIGABRT); + + /* If there was a SIGABRT handler installed and it returned, or if + * SIGABRT was blocked or ignored, take an AS-safe lock to prevent + * sigaction from installing a new SIGABRT handler, uninstall any + * handler that may be present, and re-raise the signal to generate + * the default action of abnormal termination. */ __block_all_sigs(0); + LOCK(__abort_lock); + __syscall(SYS_rt_sigaction, SIGABRT, + &(struct k_sigaction){.handler = SIG_DFL}, 0, _NSIG/8); + __syscall(SYS_tkill, __pthread_self()->tid, SIGABRT); + __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, + &(long[_NSIG/(8*sizeof(long))]){1UL<<(SIGABRT-1)}, 0, _NSIG/8); + + /* Beyond this point should be unreachable. */ a_crash(); raise(SIGKILL); _Exit(127); diff --git a/system/lib/libc/musl/src/exit/abort_lock.c b/system/lib/libc/musl/src/exit/abort_lock.c new file mode 100644 index 0000000000000..3af72c7b6ae12 --- /dev/null +++ b/system/lib/libc/musl/src/exit/abort_lock.c @@ -0,0 +1,3 @@ +#include "pthread_impl.h" + +volatile int __abort_lock[1]; diff --git a/system/lib/libc/musl/src/exit/assert.c b/system/lib/libc/musl/src/exit/assert.c index e87442a7c50d9..94edd8272792e 100644 --- a/system/lib/libc/musl/src/exit/assert.c +++ b/system/lib/libc/musl/src/exit/assert.c @@ -1,9 +1,8 @@ #include #include -void __assert_fail(const char *expr, const char *file, int line, const char *func) +_Noreturn void __assert_fail(const char *expr, const char *file, int line, const char *func) { fprintf(stderr, "Assertion failed: %s (%s: %s: %d)\n", expr, file, func, line); - fflush(NULL); abort(); } diff --git a/system/lib/libc/musl/src/exit/at_quick_exit.c b/system/lib/libc/musl/src/exit/at_quick_exit.c index 34541badad445..e4b5d78dbb709 100644 --- a/system/lib/libc/musl/src/exit/at_quick_exit.c +++ b/system/lib/libc/musl/src/exit/at_quick_exit.c @@ -1,11 +1,14 @@ #include #include "libc.h" +#include "lock.h" +#include "fork_impl.h" #define COUNT 32 static void (*funcs[COUNT])(void); static int count; -static volatile int lock[2]; +static volatile int lock[1]; +volatile int *const __at_quick_exit_lockptr = lock; void __funcs_on_quick_exit() { @@ -21,9 +24,10 @@ void __funcs_on_quick_exit() int at_quick_exit(void (*func)(void)) { - if (count == 32) return -1; + int r = 0; LOCK(lock); - funcs[count++] = func; + if (count == 32) r = -1; + else funcs[count++] = func; UNLOCK(lock); - return 0; + return r; } diff --git a/system/lib/libc/musl/src/exit/atexit.c b/system/lib/libc/musl/src/exit/atexit.c index 2b58b8bbf7416..854e9fddbe559 100644 --- a/system/lib/libc/musl/src/exit/atexit.c +++ b/system/lib/libc/musl/src/exit/atexit.c @@ -1,6 +1,13 @@ #include #include #include "libc.h" +#include "lock.h" +#include "fork_impl.h" + +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc undef +#define free undef /* Ensure that at least 32 atexit handlers can be registered without malloc */ #define COUNT 32 @@ -13,7 +20,8 @@ static struct fl } builtin, *head; static int slot; -static volatile int lock[2]; +static volatile int lock[1]; +volatile int *const __atexit_lockptr = lock; void __funcs_on_exit() { diff --git a/system/lib/libc/musl/src/exit/exit.c b/system/lib/libc/musl/src/exit/exit.c index bf7835a15cd2d..a6869b37594ea 100644 --- a/system/lib/libc/musl/src/exit/exit.c +++ b/system/lib/libc/musl/src/exit/exit.c @@ -12,8 +12,7 @@ weak_alias(dummy, __funcs_on_exit); weak_alias(dummy, __stdio_exit); weak_alias(dummy, _fini); -__attribute__((__weak__, __visibility__("hidden"))) -extern void (*const __fini_array_start)(void), (*const __fini_array_end)(void); +extern weak hidden void (*const __fini_array_start)(void), (*const __fini_array_end)(void); static void libc_exit_fini(void) { diff --git a/system/lib/libc/musl/src/fcntl/creat.c b/system/lib/libc/musl/src/fcntl/creat.c index be05faae96cc6..8f8aab64631cf 100644 --- a/system/lib/libc/musl/src/fcntl/creat.c +++ b/system/lib/libc/musl/src/fcntl/creat.c @@ -1,9 +1,8 @@ #include -#include "libc.h" int creat(const char *filename, mode_t mode) { return open(filename, O_CREAT|O_WRONLY|O_TRUNC, mode); } -LFS64(creat); +weak_alias(creat, creat64); diff --git a/system/lib/libc/musl/src/fcntl/fcntl.c b/system/lib/libc/musl/src/fcntl/fcntl.c index 5f7a1571ba3f5..6c43bdaab02ed 100644 --- a/system/lib/libc/musl/src/fcntl/fcntl.c +++ b/system/lib/libc/musl/src/fcntl/fcntl.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" #ifdef __EMSCRIPTEN__ __attribute__((no_sanitize("address"))) diff --git a/system/lib/libc/musl/src/fcntl/open.c b/system/lib/libc/musl/src/fcntl/open.c index fd42585697a13..3bf96fd11535f 100644 --- a/system/lib/libc/musl/src/fcntl/open.c +++ b/system/lib/libc/musl/src/fcntl/open.c @@ -1,7 +1,6 @@ #include #include #include "syscall.h" -#include "libc.h" int open(const char *filename, int flags, ...) { @@ -23,4 +22,4 @@ int open(const char *filename, int flags, ...) return __syscall_ret(fd); } -LFS64(open); +weak_alias(open, open64); diff --git a/system/lib/libc/musl/src/fcntl/openat.c b/system/lib/libc/musl/src/fcntl/openat.c index e741336c6f558..ad165ec323f77 100644 --- a/system/lib/libc/musl/src/fcntl/openat.c +++ b/system/lib/libc/musl/src/fcntl/openat.c @@ -1,7 +1,6 @@ #include #include #include "syscall.h" -#include "libc.h" int openat(int fd, const char *filename, int flags, ...) { @@ -17,4 +16,4 @@ int openat(int fd, const char *filename, int flags, ...) return syscall_cp(SYS_openat, fd, filename, flags|O_LARGEFILE, mode); } -LFS64(openat); +weak_alias(openat, openat64); diff --git a/system/lib/libc/musl/src/fcntl/posix_fadvise.c b/system/lib/libc/musl/src/fcntl/posix_fadvise.c index c1a0ef5a2079d..75b8e1aed87f7 100644 --- a/system/lib/libc/musl/src/fcntl/posix_fadvise.c +++ b/system/lib/libc/musl/src/fcntl/posix_fadvise.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int posix_fadvise(int fd, off_t base, off_t len, int advice) { @@ -16,4 +15,4 @@ int posix_fadvise(int fd, off_t base, off_t len, int advice) #endif } -LFS64(posix_fadvise); +weak_alias(posix_fadvise, posix_fadvise64); diff --git a/system/lib/libc/musl/src/fcntl/posix_fallocate.c b/system/lib/libc/musl/src/fcntl/posix_fallocate.c index 91d8063ca4581..c57a24aef4d9a 100644 --- a/system/lib/libc/musl/src/fcntl/posix_fallocate.c +++ b/system/lib/libc/musl/src/fcntl/posix_fallocate.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int posix_fallocate(int fd, off_t base, off_t len) { @@ -8,4 +7,4 @@ int posix_fallocate(int fd, off_t base, off_t len) __SYSCALL_LL_E(len)); } -LFS64(posix_fallocate); +weak_alias(posix_fallocate, posix_fallocate64); diff --git a/system/lib/libc/musl/src/fenv/fesetround.c b/system/lib/libc/musl/src/fenv/fesetround.c index 9bbd4ade8d1fa..4e2f164dd5e12 100644 --- a/system/lib/libc/musl/src/fenv/fesetround.c +++ b/system/lib/libc/musl/src/fenv/fesetround.c @@ -1,23 +1,23 @@ #include +#include /* __fesetround wrapper for arch independent argument check */ -int __fesetround(int); +hidden int __fesetround(int); int fesetround(int r) { - if (r & ~( - FE_TONEAREST + if (r != FE_TONEAREST #ifdef FE_DOWNWARD - |FE_DOWNWARD + && r != FE_DOWNWARD #endif #ifdef FE_UPWARD - |FE_UPWARD + && r != FE_UPWARD #endif #ifdef FE_TOWARDZERO - |FE_TOWARDZERO + && r != FE_TOWARDZERO #endif - )) + ) return -1; return __fesetround(r); } diff --git a/system/lib/libc/musl/src/include/arpa/inet.h b/system/lib/libc/musl/src/include/arpa/inet.h new file mode 100644 index 0000000000000..1e6debf49669a --- /dev/null +++ b/system/lib/libc/musl/src/include/arpa/inet.h @@ -0,0 +1,8 @@ +#ifndef ARPA_INET_H +#define ARPA_INET_H + +#include "../../../include/arpa/inet.h" + +hidden int __inet_aton(const char *, struct in_addr *); + +#endif diff --git a/system/lib/libc/musl/src/include/crypt.h b/system/lib/libc/musl/src/include/crypt.h new file mode 100644 index 0000000000000..f6c630953371f --- /dev/null +++ b/system/lib/libc/musl/src/include/crypt.h @@ -0,0 +1,16 @@ +#ifndef CRYPT_H +#define CRYPT_H + +#include "../../include/crypt.h" + +#include + +hidden char *__crypt_r(const char *, const char *, struct crypt_data *); + +hidden char *__crypt_des(const char *, const char *, char *); +hidden char *__crypt_md5(const char *, const char *, char *); +hidden char *__crypt_blowfish(const char *, const char *, char *); +hidden char *__crypt_sha256(const char *, const char *, char *); +hidden char *__crypt_sha512(const char *, const char *, char *); + +#endif diff --git a/system/lib/libc/musl/src/include/errno.h b/system/lib/libc/musl/src/include/errno.h new file mode 100644 index 0000000000000..8ec493777da94 --- /dev/null +++ b/system/lib/libc/musl/src/include/errno.h @@ -0,0 +1,14 @@ +#ifndef ERRNO_H +#define ERRNO_H + +#include "../../include/errno.h" + +#ifdef __GNUC__ +__attribute__((const)) +#endif +hidden int *___errno_location(void); + +#undef errno +#define errno (*___errno_location()) + +#endif diff --git a/system/lib/libc/musl/src/include/features.h b/system/lib/libc/musl/src/include/features.h new file mode 100644 index 0000000000000..f17bd1516ca00 --- /dev/null +++ b/system/lib/libc/musl/src/include/features.h @@ -0,0 +1,11 @@ +#ifndef FEATURES_H +#define FEATURES_H + +#include "../../include/features.h" + +#define weak __attribute__((__weak__)) +#define hidden __attribute__((__visibility__("hidden"))) +#define weak_alias(old, new) \ + extern __typeof(old) new __attribute__((__weak__, __alias__(#old))) + +#endif diff --git a/system/lib/libc/musl/src/include/langinfo.h b/system/lib/libc/musl/src/include/langinfo.h new file mode 100644 index 0000000000000..ab32b880fbc92 --- /dev/null +++ b/system/lib/libc/musl/src/include/langinfo.h @@ -0,0 +1,8 @@ +#ifndef LANGINFO_H +#define LANGINFO_H + +#include "../../include/langinfo.h" + +char *__nl_langinfo_l(nl_item, locale_t); + +#endif diff --git a/system/lib/libc/musl/src/include/pthread.h b/system/lib/libc/musl/src/include/pthread.h new file mode 100644 index 0000000000000..7167d3e11a11e --- /dev/null +++ b/system/lib/libc/musl/src/include/pthread.h @@ -0,0 +1,29 @@ +#ifndef PTHREAD_H +#define PTHREAD_H + +#include "../../include/pthread.h" + +hidden int __pthread_once(pthread_once_t *, void (*)(void)); +hidden void __pthread_testcancel(void); +hidden int __pthread_setcancelstate(int, int *); +hidden int __pthread_create(pthread_t *restrict, const pthread_attr_t *restrict, void *(*)(void *), void *restrict); +hidden _Noreturn void __pthread_exit(void *); +hidden int __pthread_join(pthread_t, void **); +hidden int __pthread_mutex_lock(pthread_mutex_t *); +hidden int __pthread_mutex_trylock(pthread_mutex_t *); +hidden int __pthread_mutex_trylock_owner(pthread_mutex_t *); +hidden int __pthread_mutex_timedlock(pthread_mutex_t *restrict, const struct timespec *restrict); +hidden int __pthread_mutex_unlock(pthread_mutex_t *); +hidden int __private_cond_signal(pthread_cond_t *, int); +hidden int __pthread_cond_timedwait(pthread_cond_t *restrict, pthread_mutex_t *restrict, const struct timespec *restrict); +hidden int __pthread_key_create(pthread_key_t *, void (*)(void *)); +hidden int __pthread_key_delete(pthread_key_t); +hidden int __pthread_rwlock_rdlock(pthread_rwlock_t *); +hidden int __pthread_rwlock_tryrdlock(pthread_rwlock_t *); +hidden int __pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict); +hidden int __pthread_rwlock_wrlock(pthread_rwlock_t *); +hidden int __pthread_rwlock_trywrlock(pthread_rwlock_t *); +hidden int __pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict); +hidden int __pthread_rwlock_unlock(pthread_rwlock_t *); + +#endif diff --git a/system/lib/libc/musl/src/include/resolv.h b/system/lib/libc/musl/src/include/resolv.h new file mode 100644 index 0000000000000..945e89e6354e1 --- /dev/null +++ b/system/lib/libc/musl/src/include/resolv.h @@ -0,0 +1,12 @@ +#ifndef RESOLV_H +#define RESOLV_H + +#include "../../include/resolv.h" + +hidden int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int); + +hidden int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int); +hidden int __res_send(const unsigned char *, int, unsigned char *, int); +hidden int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int); + +#endif diff --git a/system/lib/libc/musl/src/include/signal.h b/system/lib/libc/musl/src/include/signal.h new file mode 100644 index 0000000000000..bb5667841a660 --- /dev/null +++ b/system/lib/libc/musl/src/include/signal.h @@ -0,0 +1,14 @@ +#ifndef SIGNAL_H +#define SIGNAL_H + +#include "../../include/signal.h" + +hidden int __sigaction(int, const struct sigaction *, struct sigaction *); + +hidden void __block_all_sigs(void *); +hidden void __block_app_sigs(void *); +hidden void __restore_sigs(void *); + +hidden void __get_handler_set(sigset_t *); + +#endif diff --git a/system/lib/libc/musl/src/include/stdio.h b/system/lib/libc/musl/src/include/stdio.h new file mode 100644 index 0000000000000..fae3755b4a15b --- /dev/null +++ b/system/lib/libc/musl/src/include/stdio.h @@ -0,0 +1,20 @@ +#ifndef STDIO_H +#define STDIO_H + +#define __DEFINED_struct__IO_FILE + +#include "../../include/stdio.h" + +#undef stdin +#undef stdout +#undef stderr + +extern hidden FILE __stdin_FILE; +extern hidden FILE __stdout_FILE; +extern hidden FILE __stderr_FILE; + +#define stdin (&__stdin_FILE) +#define stdout (&__stdout_FILE) +#define stderr (&__stderr_FILE) + +#endif diff --git a/system/lib/libc/musl/src/include/stdlib.h b/system/lib/libc/musl/src/include/stdlib.h new file mode 100644 index 0000000000000..e9da20158c157 --- /dev/null +++ b/system/lib/libc/musl/src/include/stdlib.h @@ -0,0 +1,18 @@ +#ifndef STDLIB_H +#define STDLIB_H + +#include "../../include/stdlib.h" + +hidden int __putenv(char *, size_t, char *); +hidden void __env_rm_add(char *, char *); +hidden int __mkostemps(char *, int, int); +hidden int __ptsname_r(int, char *, size_t); +hidden char *__randname(char *); + +hidden void *__libc_malloc(size_t); +hidden void *__libc_malloc_impl(size_t); +hidden void *__libc_calloc(size_t, size_t); +hidden void *__libc_realloc(void *, size_t); +hidden void __libc_free(void *); + +#endif diff --git a/system/lib/libc/musl/src/include/string.h b/system/lib/libc/musl/src/include/string.h new file mode 100644 index 0000000000000..2133b5c1eead4 --- /dev/null +++ b/system/lib/libc/musl/src/include/string.h @@ -0,0 +1,11 @@ +#ifndef STRING_H +#define STRING_H + +#include "../../include/string.h" + +hidden void *__memrchr(const void *, int, size_t); +hidden char *__stpcpy(char *, const char *); +hidden char *__stpncpy(char *, const char *, size_t); +hidden char *__strchrnul(const char *, int); + +#endif diff --git a/system/lib/libc/musl/src/include/sys/auxv.h b/system/lib/libc/musl/src/include/sys/auxv.h new file mode 100644 index 0000000000000..9358a4a5d8c58 --- /dev/null +++ b/system/lib/libc/musl/src/include/sys/auxv.h @@ -0,0 +1,10 @@ +#ifndef SYS_AUXV_H +#define SYS_AUXV_H + +#include "../../../include/sys/auxv.h" + +#include + +hidden unsigned long __getauxval(unsigned long); + +#endif diff --git a/system/lib/libc/musl/src/include/sys/membarrier.h b/system/lib/libc/musl/src/include/sys/membarrier.h new file mode 100644 index 0000000000000..3654491c2d46b --- /dev/null +++ b/system/lib/libc/musl/src/include/sys/membarrier.h @@ -0,0 +1,9 @@ +#ifndef SYS_MEMBARRIER_H +#define SYS_MEMBARRIER_H + +#include "../../../include/sys/membarrier.h" +#include + +hidden int __membarrier(int, int); + +#endif diff --git a/system/lib/libc/musl/src/include/sys/mman.h b/system/lib/libc/musl/src/include/sys/mman.h new file mode 100644 index 0000000000000..57c5bd3d9621d --- /dev/null +++ b/system/lib/libc/musl/src/include/sys/mman.h @@ -0,0 +1,20 @@ +#ifndef SYS_MMAN_H +#define SYS_MMAN_H + +#include "../../../include/sys/mman.h" + +hidden void __vm_wait(void); +hidden void __vm_lock(void); +hidden void __vm_unlock(void); + +hidden void *__mmap(void *, size_t, int, int, int, off_t); +hidden int __munmap(void *, size_t); +hidden void *__mremap(void *, size_t, size_t, int, ...); +hidden int __madvise(void *, size_t, int); +hidden int __mprotect(void *, size_t, int); + +hidden const unsigned char *__map_file(const char *, size_t *); + +hidden char *__shm_mapname(const char *, char *); + +#endif diff --git a/system/lib/libc/musl/src/include/sys/sysinfo.h b/system/lib/libc/musl/src/include/sys/sysinfo.h new file mode 100644 index 0000000000000..10be8a48f79da --- /dev/null +++ b/system/lib/libc/musl/src/include/sys/sysinfo.h @@ -0,0 +1,9 @@ +#ifndef SYS_SYSINFO_H +#define SYS_SYSINFO_H + +#include "../../../include/sys/sysinfo.h" +#include + +hidden int __lsysinfo(struct sysinfo *); + +#endif diff --git a/system/lib/libc/musl/src/include/sys/time.h b/system/lib/libc/musl/src/include/sys/time.h new file mode 100644 index 0000000000000..fb9622e51fcf9 --- /dev/null +++ b/system/lib/libc/musl/src/include/sys/time.h @@ -0,0 +1,8 @@ +#ifndef SYS_TIME_H +#define SYS_TIME_H + +#include "../../../include/sys/time.h" + +hidden int __futimesat(int, const char *, const struct timeval [2]); + +#endif diff --git a/system/lib/libc/musl/src/include/time.h b/system/lib/libc/musl/src/include/time.h new file mode 100644 index 0000000000000..cbabde476790e --- /dev/null +++ b/system/lib/libc/musl/src/include/time.h @@ -0,0 +1,15 @@ +#ifndef TIME_H +#define TIME_H + +#include "../../include/time.h" + +hidden int __clock_gettime(clockid_t, struct timespec *); +hidden int __clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *); + +hidden char *__asctime_r(const struct tm *, char *); +hidden struct tm *__gmtime_r(const time_t *restrict, struct tm *restrict); +hidden struct tm *__localtime_r(const time_t *restrict, struct tm *restrict); + +hidden size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t); + +#endif diff --git a/system/lib/libc/musl/src/include/unistd.h b/system/lib/libc/musl/src/include/unistd.h new file mode 100644 index 0000000000000..7b52a9249e424 --- /dev/null +++ b/system/lib/libc/musl/src/include/unistd.h @@ -0,0 +1,13 @@ +#ifndef UNISTD_H +#define UNISTD_H + +#include "../../include/unistd.h" + +extern char **__environ; + +hidden int __dup3(int, int, int); +hidden int __mkostemps(char *, int, int); +hidden int __execvpe(const char *, char *const *, char *const *); +hidden off_t __lseek(int, off_t, int); + +#endif diff --git a/system/lib/libc/musl/src/include/wchar.h b/system/lib/libc/musl/src/include/wchar.h new file mode 100644 index 0000000000000..79f5d0e711f24 --- /dev/null +++ b/system/lib/libc/musl/src/include/wchar.h @@ -0,0 +1,9 @@ +#ifndef WCHAR_H +#define WCHAR_H + +#define __DEFINED_struct__IO_FILE + +#include "../../include/wchar.h" + +#endif + diff --git a/system/lib/libc/musl/src/internal/aio_impl.h b/system/lib/libc/musl/src/internal/aio_impl.h new file mode 100644 index 0000000000000..a8657665441a9 --- /dev/null +++ b/system/lib/libc/musl/src/internal/aio_impl.h @@ -0,0 +1,9 @@ +#ifndef AIO_IMPL_H +#define AIO_IMPL_H + +extern hidden volatile int __aio_fut; + +extern hidden int __aio_close(int); +extern hidden void __aio_atfork(int); + +#endif diff --git a/system/lib/libc/musl/src/internal/atomic.h b/system/lib/libc/musl/src/internal/atomic.h index 6f37d252cfec3..96c1552d6eda6 100644 --- a/system/lib/libc/musl/src/internal/atomic.h +++ b/system/lib/libc/musl/src/internal/atomic.h @@ -251,6 +251,22 @@ static inline void a_crash() } #endif +#ifndef a_ctz_32 +#define a_ctz_32 a_ctz_32 +static inline int a_ctz_32(uint32_t x) +{ +#ifdef a_clz_32 + return 31-a_clz_32(x&-x); +#else + static const char debruijn32[32] = { + 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, + 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 + }; + return debruijn32[(x&-x)*0x076be629 >> 27]; +#endif +} +#endif + #ifndef a_ctz_64 #define a_ctz_64 a_ctz_64 static inline int a_ctz_64(uint64_t x) @@ -261,32 +277,56 @@ static inline int a_ctz_64(uint64_t x) 63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, 51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 }; - static const char debruijn32[32] = { - 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, - 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 - }; if (sizeof(long) < 8) { uint32_t y = x; if (!y) { y = x>>32; - return 32 + debruijn32[(y&-y)*0x076be629 >> 27]; + return 32 + a_ctz_32(y); } - return debruijn32[(y&-y)*0x076be629 >> 27]; + return a_ctz_32(y); } return debruijn64[(x&-x)*0x022fdd63cc95386dull >> 58]; } #endif -#ifndef a_ctz_l -#define a_ctz_l a_ctz_l static inline int a_ctz_l(unsigned long x) { - static const char debruijn32[32] = { - 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, - 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 - }; - if (sizeof(long) == 8) return a_ctz_64(x); - return debruijn32[(x&-x)*0x076be629 >> 27]; + return (sizeof(long) < 8) ? a_ctz_32(x) : a_ctz_64(x); +} + +#ifndef a_clz_64 +#define a_clz_64 a_clz_64 +static inline int a_clz_64(uint64_t x) +{ +#ifdef a_clz_32 + if (x>>32) + return a_clz_32(x>>32); + return a_clz_32(x) + 32; +#else + uint32_t y; + int r; + if (x>>32) y=x>>32, r=0; else y=x, r=32; + if (y>>16) y>>=16; else r |= 16; + if (y>>8) y>>=8; else r |= 8; + if (y>>4) y>>=4; else r |= 4; + if (y>>2) y>>=2; else r |= 2; + return r | !(y>>1); +#endif +} +#endif + +#ifndef a_clz_32 +#define a_clz_32 a_clz_32 +static inline int a_clz_32(uint32_t x) +{ + x >>= 1; + x |= x >> 1; + x |= x >> 2; + x |= x >> 4; + x |= x >> 8; + x |= x >> 16; + x++; + return 31-a_ctz_32(x); } #endif diff --git a/system/lib/libc/musl/src/internal/complex_impl.h b/system/lib/libc/musl/src/internal/complex_impl.h new file mode 100644 index 0000000000000..51fb298acd4d4 --- /dev/null +++ b/system/lib/libc/musl/src/internal/complex_impl.h @@ -0,0 +1,22 @@ +#ifndef _COMPLEX_IMPL_H +#define _COMPLEX_IMPL_H + +#include +#include "libm.h" + +#undef __CMPLX +#undef CMPLX +#undef CMPLXF +#undef CMPLXL + +#define __CMPLX(x, y, t) \ + ((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z) + +#define CMPLX(x, y) __CMPLX(x, y, double) +#define CMPLXF(x, y) __CMPLX(x, y, float) +#define CMPLXL(x, y) __CMPLX(x, y, long double) + +hidden double complex __ldexp_cexp(double complex,int); +hidden float complex __ldexp_cexpf(float complex,int); + +#endif diff --git a/system/lib/libc/musl/src/internal/defsysinfo.c b/system/lib/libc/musl/src/internal/defsysinfo.c new file mode 100644 index 0000000000000..6d4117dbfa8d3 --- /dev/null +++ b/system/lib/libc/musl/src/internal/defsysinfo.c @@ -0,0 +1,3 @@ +#include "libc.h" + +size_t __sysinfo; diff --git a/system/lib/libc/musl/src/internal/dynlink.h b/system/lib/libc/musl/src/internal/dynlink.h index 5f60bda7d2095..23f852f4df179 100644 --- a/system/lib/libc/musl/src/internal/dynlink.h +++ b/system/lib/libc/musl/src/internal/dynlink.h @@ -1,11 +1,15 @@ #ifndef _INTERNAL_RELOC_H #define _INTERNAL_RELOC_H +#include +#include +#include +#include +#include + #ifdef __EMSCRIPTEN__ // Declare `struct dso` in this header so that it is visible to gen_struct_info. -#pragma once - #include struct dso { @@ -35,10 +39,6 @@ struct dso { #else -#include -#include -#include - #if UINTPTR_MAX == 0xffffffff typedef Elf32_Ehdr Ehdr; typedef Elf32_Phdr Phdr; @@ -60,6 +60,7 @@ typedef Elf64_Sym Sym; enum { REL_NONE = 0, REL_SYMBOLIC = -100, + REL_USYMBOLIC, REL_GOT, REL_PLT, REL_RELATIVE, @@ -127,8 +128,20 @@ struct fdpic_dummy_loadmap { #define DYN_CNT 32 typedef void (*stage2_func)(unsigned char *, size_t *); -typedef _Noreturn void (*stage3_func)(size_t *); #endif // __EMSCRIPTEN__ +hidden void *__dlsym(void *restrict, const char *restrict, void *restrict); + +hidden void __dl_seterr(const char *, ...); +hidden int __dl_invalid_handle(void *); +hidden void __dl_vseterr(const char *, va_list); + +hidden ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic(); + +hidden extern int __malloc_replaced; +hidden extern int __aligned_alloc_replaced; +hidden void __malloc_donate(char *, char *); +hidden int __malloc_allzerop(void *); + #endif diff --git a/system/lib/libc/musl/src/internal/fdpic_crt.h b/system/lib/libc/musl/src/internal/fdpic_crt.h index 7eb50c6bd12a3..7e9632bb7fcf0 100644 --- a/system/lib/libc/musl/src/internal/fdpic_crt.h +++ b/system/lib/libc/musl/src/internal/fdpic_crt.h @@ -1,7 +1,7 @@ #include +#include -__attribute__((__visibility__("hidden"))) -void *__fdpic_fixup(void *map, uintptr_t *a, uintptr_t *z) +hidden void *__fdpic_fixup(void *map, uintptr_t *a, uintptr_t *z) { /* If map is a null pointer, the program was loaded by a * non-FDPIC-aware ELF loader, and fixups are not needed, diff --git a/system/lib/libc/musl/src/internal/floatscan.h b/system/lib/libc/musl/src/internal/floatscan.h index e027fa08f107b..f2b1dcf45938d 100644 --- a/system/lib/libc/musl/src/internal/floatscan.h +++ b/system/lib/libc/musl/src/internal/floatscan.h @@ -3,6 +3,6 @@ #include -long double __floatscan(FILE *, int, int); +hidden long double __floatscan(FILE *, int, int); #endif diff --git a/system/lib/libc/musl/src/internal/fork_impl.h b/system/lib/libc/musl/src/internal/fork_impl.h new file mode 100644 index 0000000000000..5892c13bf90a5 --- /dev/null +++ b/system/lib/libc/musl/src/internal/fork_impl.h @@ -0,0 +1,19 @@ +#include + +extern hidden volatile int *const __at_quick_exit_lockptr; +extern hidden volatile int *const __atexit_lockptr; +extern hidden volatile int *const __dlerror_lockptr; +extern hidden volatile int *const __gettext_lockptr; +extern hidden volatile int *const __locale_lockptr; +extern hidden volatile int *const __random_lockptr; +extern hidden volatile int *const __sem_open_lockptr; +extern hidden volatile int *const __stdio_ofl_lockptr; +extern hidden volatile int *const __syslog_lockptr; +extern hidden volatile int *const __timezone_lockptr; + +extern hidden volatile int *const __bump_lockptr; + +extern hidden volatile int *const __vmlock_lockptr; + +hidden void __malloc_atfork(int); +hidden void __ldso_atfork(int); diff --git a/system/lib/libc/musl/src/internal/futex.h b/system/lib/libc/musl/src/internal/futex.h index cf4c79513e240..dafbc24dbdb9c 100644 --- a/system/lib/libc/musl/src/internal/futex.h +++ b/system/lib/libc/musl/src/internal/futex.h @@ -16,6 +16,4 @@ #define FUTEX_CLOCK_REALTIME 256 -int __futex(volatile int *, int, int, void *); - #endif diff --git a/system/lib/libc/musl/src/internal/intscan.c b/system/lib/libc/musl/src/internal/intscan.c index 65d497ec8a6fb..a4a5ae8612828 100644 --- a/system/lib/libc/musl/src/internal/intscan.c +++ b/system/lib/libc/musl/src/internal/intscan.c @@ -29,7 +29,7 @@ unsigned long long __intscan(FILE *f, unsigned base, int pok, unsigned long long int c, neg=0; unsigned x; unsigned long long y; - if (base > 36) { + if (base > 36 || base == 1) { errno = EINVAL; return 0; } diff --git a/system/lib/libc/musl/src/internal/intscan.h b/system/lib/libc/musl/src/internal/intscan.h index 994c5e7deece9..ccf9f112a9c3b 100644 --- a/system/lib/libc/musl/src/internal/intscan.h +++ b/system/lib/libc/musl/src/internal/intscan.h @@ -3,6 +3,6 @@ #include -unsigned long long __intscan(FILE *, unsigned, int, unsigned long long); +hidden unsigned long long __intscan(FILE *, unsigned, int, unsigned long long); #endif diff --git a/system/lib/libc/musl/src/internal/ksigaction.h b/system/lib/libc/musl/src/internal/ksigaction.h index 1d8d9646149b6..8ebd5938352e7 100644 --- a/system/lib/libc/musl/src/internal/ksigaction.h +++ b/system/lib/libc/musl/src/internal/ksigaction.h @@ -1,3 +1,5 @@ +#include + /* This is the structure used for the rt_sigaction syscall on most archs, * but it can be overridden by a file with the same name in the top-level * arch dir for a given arch, if necessary. */ @@ -8,4 +10,4 @@ struct k_sigaction { unsigned mask[2]; }; -void __restore(), __restore_rt(); +hidden void __restore(), __restore_rt(); diff --git a/system/lib/libc/musl/src/internal/libc.c b/system/lib/libc/musl/src/internal/libc.c index 6e4f04687ed73..4b626320600e3 100644 --- a/system/lib/libc/musl/src/internal/libc.c +++ b/system/lib/libc/musl/src/internal/libc.c @@ -3,7 +3,6 @@ struct __libc __libc; size_t __hwcap; -size_t __sysinfo; char *__progname=0, *__progname_full=0; weak_alias(__progname, program_invocation_short_name); diff --git a/system/lib/libc/musl/src/internal/libc.h b/system/lib/libc/musl/src/internal/libc.h index ad3ebdea8ab26..b0b3f20cf6a4c 100644 --- a/system/lib/libc/musl/src/internal/libc.h +++ b/system/lib/libc/musl/src/internal/libc.h @@ -9,7 +9,7 @@ struct __locale_map; struct __locale_struct { - const struct __locale_map *volatile cat[6]; + const struct __locale_map *cat[6]; }; struct tls_module { @@ -19,10 +19,11 @@ struct tls_module { }; struct __libc { - int can_do_threads; - int threaded; - int secure; - volatile int threads_minus_1; + char can_do_threads; + char threaded; + char secure; + volatile signed char need_locks; + int threads_minus_1; size_t *auxv; struct tls_module *tls_head; size_t tls_size, tls_align, tls_cnt; @@ -34,45 +35,30 @@ struct __libc { #define PAGE_SIZE libc.page_size #endif -#ifdef __PIC__ -#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) -#else -#define ATTR_LIBC_VISIBILITY -#endif - -extern struct __libc __libc ATTR_LIBC_VISIBILITY; +extern hidden struct __libc __libc; #define libc __libc -extern size_t __hwcap ATTR_LIBC_VISIBILITY; -extern size_t __sysinfo ATTR_LIBC_VISIBILITY; +hidden void __init_libc(char **, char *); +hidden void __init_tls(size_t *); +hidden void __init_ssp(void *); +hidden void __libc_start_init(void); +hidden void __funcs_on_exit(void); +hidden void __funcs_on_quick_exit(void); +hidden void __libc_exit_fini(void); +hidden void __fork_handler(int); + +extern hidden size_t __hwcap; +extern hidden size_t __sysinfo; extern char *__progname, *__progname_full; -/* Designed to avoid any overhead in non-threaded processes */ -void __lock(volatile int *) ATTR_LIBC_VISIBILITY; -void __unlock(volatile int *) ATTR_LIBC_VISIBILITY; -int __lockfile(FILE *) ATTR_LIBC_VISIBILITY; -void __unlockfile(FILE *) ATTR_LIBC_VISIBILITY; -#define LOCK(x) __lock(x) -#define UNLOCK(x) __unlock(x) +extern hidden const char __libc_version[]; -void __synccall(void (*)(void *), void *); +hidden void __synccall(void (*)(void *), void *); #ifdef __EMSCRIPTEN__ -int __setxid_emscripten(); +hidden int __setxid_emscripten(); #define __setxid(a, b, c, d) __setxid_emscripten() #else -int __setxid(int, int, int, int); +hidden int __setxid(int, int, int, int); #endif -extern char **__environ; - -#undef weak_alias -#define weak_alias(old, new) \ - extern __typeof(old) new __attribute__((weak, alias(#old))) - -#undef LFS64_2 -#define LFS64_2(x, y) weak_alias(x, y) - -#undef LFS64 -#define LFS64(x) LFS64_2(x, x##64) - #endif diff --git a/system/lib/libc/musl/src/internal/libm.h b/system/lib/libc/musl/src/internal/libm.h index 6a3aaed5610ed..a47208aa6ad3c 100644 --- a/system/lib/libc/musl/src/internal/libm.h +++ b/system/lib/libc/musl/src/internal/libm.h @@ -1,23 +1,11 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/math_private.h */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - #ifndef _LIBM_H #define _LIBM_H #include #include #include -#include #include +#include "fp_arch.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 #elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN @@ -28,6 +16,17 @@ union ldshape { uint16_t se; } i; }; +#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __BIG_ENDIAN +/* This is the m68k variant of 80-bit long double, and this definition only works + * on archs where the alignment requirement of uint64_t is <= 4. */ +union ldshape { + long double f; + struct { + uint16_t se; + uint16_t pad; + uint64_t m; + } i; +}; #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 && __BYTE_ORDER == __LITTLE_ENDIAN union ldshape { long double f; @@ -60,6 +59,124 @@ union ldshape { #error Unsupported long double representation #endif +/* Support non-nearest rounding mode. */ +#define WANT_ROUNDING 1 +/* Support signaling NaNs. */ +#define WANT_SNAN 0 + +#if WANT_SNAN +#error SNaN is unsupported +#else +#define issignalingf_inline(x) 0 +#define issignaling_inline(x) 0 +#endif + +#ifndef TOINT_INTRINSICS +#define TOINT_INTRINSICS 0 +#endif + +#if TOINT_INTRINSICS +/* Round x to nearest int in all rounding modes, ties have to be rounded + consistently with converttoint so the results match. If the result + would be outside of [-2^31, 2^31-1] then the semantics is unspecified. */ +static double_t roundtoint(double_t); + +/* Convert x to nearest int in all rounding modes, ties have to be rounded + consistently with roundtoint. If the result is not representible in an + int32_t then the semantics is unspecified. */ +static int32_t converttoint(double_t); +#endif + +/* Helps static branch prediction so hot path can be better optimized. */ +#ifdef __GNUC__ +#define predict_true(x) __builtin_expect(!!(x), 1) +#define predict_false(x) __builtin_expect(x, 0) +#else +#define predict_true(x) (x) +#define predict_false(x) (x) +#endif + +/* Evaluate an expression as the specified type. With standard excess + precision handling a type cast or assignment is enough (with + -ffloat-store an assignment is required, in old compilers argument + passing and return statement may not drop excess precision). */ + +static inline float eval_as_float(float x) +{ + float y = x; + return y; +} + +static inline double eval_as_double(double x) +{ + double y = x; + return y; +} + +/* fp_barrier returns its input, but limits code transformations + as if it had a side-effect (e.g. observable io) and returned + an arbitrary value. */ + +#ifndef fp_barrierf +#define fp_barrierf fp_barrierf +static inline float fp_barrierf(float x) +{ + volatile float y = x; + return y; +} +#endif + +#ifndef fp_barrier +#define fp_barrier fp_barrier +static inline double fp_barrier(double x) +{ + volatile double y = x; + return y; +} +#endif + +#ifndef fp_barrierl +#define fp_barrierl fp_barrierl +static inline long double fp_barrierl(long double x) +{ + volatile long double y = x; + return y; +} +#endif + +/* fp_force_eval ensures that the input value is computed when that's + otherwise unused. To prevent the constant folding of the input + expression, an additional fp_barrier may be needed or a compilation + mode that does so (e.g. -frounding-math in gcc). Then it can be + used to evaluate an expression for its fenv side-effects only. */ + +#ifndef fp_force_evalf +#define fp_force_evalf fp_force_evalf +static inline void fp_force_evalf(float x) +{ + volatile float y; + y = x; +} +#endif + +#ifndef fp_force_eval +#define fp_force_eval fp_force_eval +static inline void fp_force_eval(double x) +{ + volatile double y; + y = x; +} +#endif + +#ifndef fp_force_evall +#define fp_force_evall fp_force_evall +static inline void fp_force_evall(long double x) +{ + volatile long double y; + y = x; +} +#endif + #ifdef __EMSCRIPTEN__ /* * asm.js doesn't have user-accessible floating point exceptions, so there's @@ -69,124 +186,97 @@ union ldshape { #else #define FORCE_EVAL(x) do { \ if (sizeof(x) == sizeof(float)) { \ - volatile float __x; \ - __x = (x); \ + fp_force_evalf(x); \ } else if (sizeof(x) == sizeof(double)) { \ - volatile double __x; \ - __x = (x); \ + fp_force_eval(x); \ } else { \ - volatile long double __x; \ - __x = (x); \ + fp_force_evall(x); \ } \ } while(0) #endif -/* Get two 32 bit ints from a double. */ +#define asuint(f) ((union{float _f; uint32_t _i;}){f})._i +#define asfloat(i) ((union{uint32_t _i; float _f;}){i})._f +#define asuint64(f) ((union{double _f; uint64_t _i;}){f})._i +#define asdouble(i) ((union{uint64_t _i; double _f;}){i})._f + #define EXTRACT_WORDS(hi,lo,d) \ do { \ - union {double f; uint64_t i;} __u; \ - __u.f = (d); \ - (hi) = __u.i >> 32; \ - (lo) = (uint32_t)__u.i; \ + uint64_t __u = asuint64(d); \ + (hi) = __u >> 32; \ + (lo) = (uint32_t)__u; \ } while (0) -/* Get the more significant 32 bit int from a double. */ #define GET_HIGH_WORD(hi,d) \ do { \ - union {double f; uint64_t i;} __u; \ - __u.f = (d); \ - (hi) = __u.i >> 32; \ + (hi) = asuint64(d) >> 32; \ } while (0) -/* Get the less significant 32 bit int from a double. */ #define GET_LOW_WORD(lo,d) \ do { \ - union {double f; uint64_t i;} __u; \ - __u.f = (d); \ - (lo) = (uint32_t)__u.i; \ + (lo) = (uint32_t)asuint64(d); \ } while (0) -/* Set a double from two 32 bit ints. */ #define INSERT_WORDS(d,hi,lo) \ do { \ - union {double f; uint64_t i;} __u; \ - __u.i = ((uint64_t)(hi)<<32) | (uint32_t)(lo); \ - (d) = __u.f; \ + (d) = asdouble(((uint64_t)(hi)<<32) | (uint32_t)(lo)); \ } while (0) -/* Set the more significant 32 bits of a double from an int. */ #define SET_HIGH_WORD(d,hi) \ -do { \ - union {double f; uint64_t i;} __u; \ - __u.f = (d); \ - __u.i &= 0xffffffff; \ - __u.i |= (uint64_t)(hi) << 32; \ - (d) = __u.f; \ -} while (0) + INSERT_WORDS(d, hi, (uint32_t)asuint64(d)) -/* Set the less significant 32 bits of a double from an int. */ #define SET_LOW_WORD(d,lo) \ -do { \ - union {double f; uint64_t i;} __u; \ - __u.f = (d); \ - __u.i &= 0xffffffff00000000ull; \ - __u.i |= (uint32_t)(lo); \ - (d) = __u.f; \ -} while (0) + INSERT_WORDS(d, asuint64(d)>>32, lo) -/* Get a 32 bit int from a float. */ #define GET_FLOAT_WORD(w,d) \ do { \ - union {float f; uint32_t i;} __u; \ - __u.f = (d); \ - (w) = __u.i; \ + (w) = asuint(d); \ } while (0) -/* Set a float from a 32 bit int. */ #define SET_FLOAT_WORD(d,w) \ do { \ - union {float f; uint32_t i;} __u; \ - __u.i = (w); \ - (d) = __u.f; \ + (d) = asfloat(w); \ } while (0) -#undef __CMPLX -#undef CMPLX -#undef CMPLXF -#undef CMPLXL - -#define __CMPLX(x, y, t) \ - ((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z) +hidden int __rem_pio2_large(double*,double*,int,int,int); -#define CMPLX(x, y) __CMPLX(x, y, double) -#define CMPLXF(x, y) __CMPLX(x, y, float) -#define CMPLXL(x, y) __CMPLX(x, y, long double) +hidden int __rem_pio2(double,double*); +hidden double __sin(double,double,int); +hidden double __cos(double,double); +hidden double __tan(double,double,int); +hidden double __expo2(double,double); -/* fdlibm kernel functions */ +hidden int __rem_pio2f(float,double*); +hidden float __sindf(double); +hidden float __cosdf(double); +hidden float __tandf(double,int); +hidden float __expo2f(float,float); -int __rem_pio2_large(double*,double*,int,int,int); +hidden int __rem_pio2l(long double, long double *); +hidden long double __sinl(long double, long double, int); +hidden long double __cosl(long double, long double); +hidden long double __tanl(long double, long double, int); -int __rem_pio2(double,double*); -double __sin(double,double,int); -double __cos(double,double); -double __tan(double,double,int); -double __expo2(double); -double complex __ldexp_cexp(double complex,int); +hidden long double __polevll(long double, const long double *, int); +hidden long double __p1evll(long double, const long double *, int); -int __rem_pio2f(float,double*); -float __sindf(double); -float __cosdf(double); -float __tandf(double,int); -float __expo2f(float); -float complex __ldexp_cexpf(float complex,int); +extern int __signgam; +hidden double __lgamma_r(double, int *); +hidden float __lgammaf_r(float, int *); -int __rem_pio2l(long double, long double *); -long double __sinl(long double, long double, int); -long double __cosl(long double, long double); -long double __tanl(long double, long double, int); - -/* polynomial evaluation */ -long double __polevll(long double, const long double *, int); -long double __p1evll(long double, const long double *, int); +/* error handling functions */ +hidden float __math_xflowf(uint32_t, float); +hidden float __math_uflowf(uint32_t); +hidden float __math_oflowf(uint32_t); +hidden float __math_divzerof(uint32_t); +hidden float __math_invalidf(float); +hidden double __math_xflow(uint32_t, double); +hidden double __math_uflow(uint32_t); +hidden double __math_oflow(uint32_t); +hidden double __math_divzero(uint32_t); +hidden double __math_invalid(double); +#if LDBL_MANT_DIG != DBL_MANT_DIG +hidden long double __math_invalidl(long double); +#endif #endif diff --git a/system/lib/libc/musl/src/internal/locale_impl.h b/system/lib/libc/musl/src/internal/locale_impl.h index f5e4d9b4ae003..4431a92eb7112 100644 --- a/system/lib/libc/musl/src/internal/locale_impl.h +++ b/system/lib/libc/musl/src/internal/locale_impl.h @@ -6,7 +6,7 @@ #include "libc.h" #include "pthread_impl.h" -#define LOCALE_NAME_MAX 15 +#define LOCALE_NAME_MAX 23 struct __locale_map { const void *map; @@ -15,14 +15,21 @@ struct __locale_map { const struct __locale_map *next; }; -extern const struct __locale_map __c_dot_utf8; -extern const struct __locale_struct __c_locale; -extern const struct __locale_struct __c_dot_utf8_locale; +extern hidden volatile int __locale_lock[1]; -const struct __locale_map *__get_locale(int, const char *); -const char *__mo_lookup(const void *, size_t, const char *); -const char *__lctrans(const char *, const struct __locale_map *); -const char *__lctrans_cur(const char *); +extern hidden const struct __locale_map __c_dot_utf8; +extern hidden const struct __locale_struct __c_locale; +extern hidden const struct __locale_struct __c_dot_utf8_locale; + +hidden const struct __locale_map *__get_locale(int, const char *); +hidden const char *__mo_lookup(const void *, size_t, const char *); +hidden const char *__lctrans(const char *, const struct __locale_map *); +hidden const char *__lctrans_cur(const char *); +hidden const char *__lctrans_impl(const char *, const struct __locale_map *); +hidden int __loc_is_allocated(locale_t); +hidden char *__gettextdomain(void); + +#define LOC_MAP_FAILED ((const struct __locale_map *)-1) #define LCTRANS(msg, lc, loc) __lctrans(msg, (loc)->cat[(lc)]) #define LCTRANS_CUR(msg) __lctrans_cur(msg) diff --git a/system/lib/libc/musl/src/internal/lock.h b/system/lib/libc/musl/src/internal/lock.h new file mode 100644 index 0000000000000..c77db6f7be813 --- /dev/null +++ b/system/lib/libc/musl/src/internal/lock.h @@ -0,0 +1,9 @@ +#ifndef LOCK_H +#define LOCK_H + +hidden void __lock(volatile int *); +hidden void __unlock(volatile int *); +#define LOCK(x) __lock(x) +#define UNLOCK(x) __unlock(x) + +#endif diff --git a/system/lib/libc/musl/src/internal/procfdname.c b/system/lib/libc/musl/src/internal/procfdname.c index 697e0bdc2e1f6..fd7306ab69a82 100644 --- a/system/lib/libc/musl/src/internal/procfdname.c +++ b/system/lib/libc/musl/src/internal/procfdname.c @@ -1,3 +1,5 @@ +#include "syscall.h" + void __procfdname(char *buf, unsigned fd) { unsigned i, j; diff --git a/system/lib/libc/musl/src/internal/pthread_impl.h b/system/lib/libc/musl/src/internal/pthread_impl.h index 5d673f4c4a11c..3146faa3f91e1 100644 --- a/system/lib/libc/musl/src/internal/pthread_impl.h +++ b/system/lib/libc/musl/src/internal/pthread_impl.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "libc.h" #include "syscall.h" #include "atomic.h" @@ -13,6 +14,8 @@ #endif #include "futex.h" +#include "pthread_arch.h" + #define pthread __pthread #ifdef __EMSCRIPTEN__ @@ -20,7 +23,7 @@ typedef struct thread_profiler_block { // One of THREAD_STATUS_* - int threadStatus; + _Atomic int threadStatus; // Wallclock time denoting when the current thread state was entered in. double currentStatusStartTime; // Accumulated duration times denoting how much time has been spent in each @@ -32,55 +35,70 @@ typedef struct thread_profiler_block { #endif struct pthread { -// XXX Emscripten: Need some custom thread control structures. -#ifdef __EMSCRIPTEN__ - // Note: The specific order of these fields is important, since these are accessed - // by direct pointer arithmetic in worker.js. - _Atomic int threadStatus; // 0: thread not exited, 1: exited. - thread_profiler_block * _Atomic profilerBlock; // If --threadprofiler is enabled, this pointer is allocated to contain internal information about the thread state for profiling purposes. -#endif - + /* Part 1 -- these fields may be external or + * internal (accessed via asm) ABI. Do not change. */ struct pthread *self; - void **dtv, *unused1, *unused2; +#ifndef TLS_ABOVE_TP + uintptr_t *dtv; +#endif + // TODO(sbc): Implement circular list of threads + //struct pthread *prev, *next; /* non-ABI */ uintptr_t sysinfo; - uintptr_t canary, canary2; - pid_t tid; - int tsd_used, errno_val; - volatile int cancel, canceldisable, cancelasync; - int detached; +#ifndef TLS_ABOVE_TP +#ifdef CANARY_PAD + uintptr_t canary_pad; +#endif + uintptr_t canary; +#endif + + /* Part 2 -- implementation details, non-ABI. */ + int tid; + int errno_val; + volatile int detach_state; + volatile int cancel; + volatile unsigned char canceldisable, cancelasync; + unsigned char tsd_used:1; + unsigned char dlerror_flag:1; unsigned char *map_base; size_t map_size; void *stack; size_t stack_size; - void *start_arg; - void *(*start)(void *); + size_t guard_size; void *result; struct __ptcb *cancelbuf; void **tsd; - pthread_attr_t attr; - volatile int dead; struct { volatile void *volatile head; long off; volatile void *volatile pending; } robust_list; - int unblock_cancel; + int h_errno_val; volatile int timer_id; locale_t locale; - volatile int killlock[2]; - volatile int exitlock[2]; - volatile int startlock[2]; - unsigned long sigmask[_NSIG/8/sizeof(long)]; + volatile int killlock[1]; char *dlerror_buf; - int dlerror_flag; void *stdio_locks; - uintptr_t canary_at_end; - void **dtv_copy; + + /* Part 3 -- the positions of these fields relative to + * the end of the structure is external and internal ABI. */ +#ifdef TLS_ABOVE_TP + uintptr_t canary; + uintptr_t *dtv; +#endif + +// XXX Emscripten: Need some custom thread control structures. +#ifdef __EMSCRIPTEN__ + // If --threadprofiler is enabled, this pointer is allocated to contain + // internal information about the thread state for profiling purposes. + thread_profiler_block * _Atomic profilerBlock; +#endif }; -struct __timer { - int timerid; - pthread_t thread; +enum { + DT_EXITED, + DT_EXITING, + DT_JOINABLE, + DT_DETACHED, }; #define __SU (sizeof(size_t)/sizeof(int)) @@ -121,16 +139,26 @@ struct __timer { #define _b_waiters2 __u.__vi[4] #define _b_inst __u.__p[3] -#include "pthread_arch.h" - -#ifndef CANARY -#define CANARY canary +#ifndef TP_OFFSET +#define TP_OFFSET 0 #endif #ifndef DTP_OFFSET #define DTP_OFFSET 0 #endif +#ifdef TLS_ABOVE_TP +#define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) + TP_OFFSET) +#define __pthread_self() ((pthread_t)(__get_tp() - sizeof(struct __pthread) - TP_OFFSET)) +#else +#define TP_ADJ(p) (p) +#define __pthread_self() ((pthread_t)__get_tp()) +#endif + +#ifndef tls_mod_off_t +#define tls_mod_off_t size_t +#endif + #define SIGTIMER 32 #define SIGCANCEL 33 #define SIGSYNCCALL 34 @@ -143,25 +171,36 @@ struct __timer { ((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \ 0x80000000 }) -pthread_t __pthread_self_init(void); - -int __clone(int (*)(void *), void *, int, void *, ...); -int __set_thread_area(void *); -int __libc_sigaction(int, const struct sigaction *, struct sigaction *); -int __libc_sigprocmask(int, const sigset_t *, sigset_t *); -void __lock(volatile int *); -void __unmapself(void *, size_t); - -void __vm_wait(void); -void __vm_lock(void); -void __vm_unlock(void); - -int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int); -int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int); -void __wait(volatile int *, volatile int *, int, int); +void *__tls_get_addr(tls_mod_off_t *); +hidden int __init_tp(void *); +hidden void *__copy_tls(unsigned char *); +hidden void __reset_tls(); + +hidden void __membarrier_init(void); +hidden void __dl_thread_cleanup(void); +hidden void __testcancel(); +hidden void __do_cleanup_push(struct __ptcb *); +hidden void __do_cleanup_pop(struct __ptcb *); +hidden void __pthread_tsd_run_dtors(); + +hidden void __pthread_key_delete_synccall(void (*)(void *), void *); +hidden int __pthread_key_delete_impl(pthread_key_t); + +extern hidden volatile size_t __pthread_tsd_size; +extern hidden void *__pthread_tsd_main[]; +extern hidden volatile int __eintr_valid_flag; + +hidden int __clone(int (*)(void *), void *, int, void *, ...); +hidden int __set_thread_area(void *); +hidden int __libc_sigaction(int, const struct sigaction *, struct sigaction *); +hidden void __unmapself(void *, size_t); + +hidden int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int); +hidden int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int); +hidden void __wait(volatile int *, volatile int *, int, int); static inline void __wake(volatile void *addr, int cnt, int priv) { - if (priv) priv = 128; + if (priv) priv = FUTEX_PRIVATE; if (cnt<0) cnt = INT_MAX; #ifdef __EMSCRIPTEN__ emscripten_futex_wake(addr, (cnt)<0?INT_MAX:(cnt)); @@ -170,22 +209,43 @@ static inline void __wake(volatile void *addr, int cnt, int priv) __syscall(SYS_futex, addr, FUTEX_WAKE, cnt); #endif } +static inline void __futexwait(volatile void *addr, int val, int priv) +{ +#ifdef __EMSCRIPTEN__ + __wait(addr, NULL, val, priv); +#else + if (priv) priv = FUTEX_PRIVATE; + __syscall(SYS_futex, addr, FUTEX_WAIT|priv, val, 0) != -ENOSYS || + __syscall(SYS_futex, addr, FUTEX_WAIT, val, 0); +#endif +} + +hidden void __acquire_ptc(void); +hidden void __release_ptc(void); +hidden void __inhibit_ptc(void); -void __acquire_ptc(void); -void __release_ptc(void); -void __inhibit_ptc(void); +hidden void __tl_lock(void); +hidden void __tl_unlock(void); +hidden void __tl_sync(pthread_t); + +extern hidden volatile int __thread_list_lock; + +extern hidden volatile int __abort_lock[1]; + +extern hidden unsigned __default_stacksize; +extern hidden unsigned __default_guardsize; -void __block_all_sigs(void *); -void __block_app_sigs(void *); -void __restore_sigs(void *); #ifdef __EMSCRIPTEN__ // Keep in sync with DEFAULT_PTHREAD_STACK_SIZE in settings.js #define DEFAULT_STACK_SIZE (2*1024*1024) #else -#define DEFAULT_STACK_SIZE 81920 +#define DEFAULT_STACK_SIZE 131072 #endif -#define DEFAULT_GUARD_SIZE PAGE_SIZE +#define DEFAULT_GUARD_SIZE 8192 + +#define DEFAULT_STACK_MAX (8<<20) +#define DEFAULT_GUARD_MAX (1<<20) #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1) diff --git a/system/lib/libc/musl/src/internal/shgetc.c b/system/lib/libc/musl/src/internal/shgetc.c index e878b00ad50ac..7455d2f00a04e 100644 --- a/system/lib/libc/musl/src/internal/shgetc.c +++ b/system/lib/libc/musl/src/internal/shgetc.c @@ -1,10 +1,16 @@ #include "shgetc.h" +/* The shcnt field stores the number of bytes read so far, offset by + * the value of buf-rpos at the last function call (__shlim or __shgetc), + * so that between calls the inline shcnt macro can add rpos-buf to get + * the actual count. */ + void __shlim(FILE *f, off_t lim) { f->shlim = lim; - f->shcnt = f->rend - f->rpos; - if (lim && f->shcnt > lim) + f->shcnt = f->buf - f->rpos; + /* If lim is nonzero, rend must be a valid pointer. */ + if (lim && f->rend - f->rpos > lim) f->shend = f->rpos + lim; else f->shend = f->rend; @@ -13,15 +19,19 @@ void __shlim(FILE *f, off_t lim) int __shgetc(FILE *f) { int c; - if (f->shlim && f->shcnt >= f->shlim || (c=__uflow(f)) < 0) { - f->shend = 0; + off_t cnt = shcnt(f); + if (f->shlim && cnt >= f->shlim || (c=__uflow(f)) < 0) { + f->shcnt = f->buf - f->rpos + cnt; + f->shend = f->rpos; + f->shlim = -1; return EOF; } - if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1) - f->shend = f->rpos + (f->shlim - f->shcnt - 1); + cnt++; + if (f->shlim && f->rend - f->rpos > f->shlim - cnt) + f->shend = f->rpos + (f->shlim - cnt); else f->shend = f->rend; - if (f->rend) f->shcnt += f->rend - f->rpos + 1; - if (f->rpos[-1] != c) f->rpos[-1] = c; + f->shcnt = f->buf - f->rpos + cnt; + if (f->rpos <= f->buf) f->rpos[-1] = c; return c; } diff --git a/system/lib/libc/musl/src/internal/shgetc.h b/system/lib/libc/musl/src/internal/shgetc.h index 7beb8ce62182b..9435381a61d1e 100644 --- a/system/lib/libc/musl/src/internal/shgetc.h +++ b/system/lib/libc/musl/src/internal/shgetc.h @@ -1,9 +1,32 @@ #include "stdio_impl.h" -void __shlim(FILE *, off_t); -int __shgetc(FILE *); +/* Scan helper "stdio" functions for use by scanf-family and strto*-family + * functions. These accept either a valid stdio FILE, or a minimal pseudo + * FILE whose buffer pointers point into a null-terminated string. In the + * latter case, the sh_fromstring macro should be used to setup the FILE; + * the rest of the structure can be left uninitialized. + * + * To begin using these functions, shlim must first be called on the FILE + * to set a field width limit, or 0 for no limit. For string pseudo-FILEs, + * a nonzero limit is not valid and produces undefined behavior. After that, + * shgetc, shunget, and shcnt are valid as long as no other stdio functions + * are called on the stream. + * + * When used with a real FILE object, shunget has only one byte of pushback + * available. Further shunget (up to a limit of the stdio UNGET buffer size) + * will adjust the position but will not restore the data to be read again. + * This functionality is needed for the wcsto*-family functions, where it's + * okay because the FILE will be discarded immediately anyway. When used + * with string pseudo-FILEs, shunget has unlimited pushback, back to the + * beginning of the string. */ -#define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->rend)) +hidden void __shlim(FILE *, off_t); +hidden int __shgetc(FILE *); + +#define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->buf)) #define shlim(f, lim) __shlim((f), (lim)) -#define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : __shgetc(f)) -#define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0) +#define shgetc(f) (((f)->rpos != (f)->shend) ? *(f)->rpos++ : __shgetc(f)) +#define shunget(f) ((f)->shlim>=0 ? (void)(f)->rpos-- : (void)0) + +#define sh_fromstring(f, s) \ + ((f)->buf = (f)->rpos = (void *)(s), (f)->rend = (void*)-1) diff --git a/system/lib/libc/musl/src/internal/stdio_impl.h b/system/lib/libc/musl/src/internal/stdio_impl.h index 7abd62e20fa98..18900fe110584 100644 --- a/system/lib/libc/musl/src/internal/stdio_impl.h +++ b/system/lib/libc/musl/src/internal/stdio_impl.h @@ -3,13 +3,12 @@ #include #include "syscall.h" -#include "libc.h" #define UNGET 8 #define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0) #define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0) -#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else +#define FUNLOCK(f) do { if (__need_unlock) __unlockfile((f)); } while (0) #define F_PERM 1 #define F_NORD 4 @@ -35,11 +34,9 @@ struct _IO_FILE { int fd; int pipe_pid; long lockcount; - short dummy3; - signed char mode; - signed char lbf; + int mode; volatile int lock; - volatile int waiters; + int lbf; void *cookie; off_t off; char *getln_buf; @@ -50,49 +47,67 @@ struct _IO_FILE { struct __locale_struct *locale; }; -size_t __stdio_read(FILE *, unsigned char *, size_t); -size_t __stdio_write(FILE *, const unsigned char *, size_t); -size_t __stdout_write(FILE *, const unsigned char *, size_t); -off_t __stdio_seek(FILE *, off_t, int); -int __stdio_close(FILE *); +extern hidden FILE *volatile __stdin_used; +extern hidden FILE *volatile __stdout_used; +extern hidden FILE *volatile __stderr_used; -size_t __string_read(FILE *, unsigned char *, size_t); +hidden int __lockfile(FILE *); +hidden void __unlockfile(FILE *); -int __toread(FILE *); -int __towrite(FILE *); +hidden size_t __stdio_read(FILE *, unsigned char *, size_t); +hidden size_t __stdio_write(FILE *, const unsigned char *, size_t); +hidden size_t __stdout_write(FILE *, const unsigned char *, size_t); +hidden off_t __stdio_seek(FILE *, off_t, int); +hidden int __stdio_close(FILE *); + +hidden int __toread(FILE *); +hidden int __towrite(FILE *); + +hidden void __stdio_exit(void); +hidden void __stdio_exit_needed(void); #if defined(__PIC__) && (100*__GNUC__+__GNUC_MINOR__ >= 303) && !defined(__EMSCRIPTEN__) __attribute__((visibility("protected"))) #endif int __overflow(FILE *, int), __uflow(FILE *); -int __fseeko(FILE *, off_t, int); -int __fseeko_unlocked(FILE *, off_t, int); -off_t __ftello(FILE *); -off_t __ftello_unlocked(FILE *); -size_t __fwritex(const unsigned char *, size_t, FILE *); -int __putc_unlocked(int, FILE *); +hidden int __fseeko(FILE *, off_t, int); +hidden int __fseeko_unlocked(FILE *, off_t, int); +hidden off_t __ftello(FILE *); +hidden off_t __ftello_unlocked(FILE *); +hidden size_t __fwritex(const unsigned char *, size_t, FILE *); +hidden int __putc_unlocked(int, FILE *); + +hidden FILE *__fdopen(int, const char *); +hidden int __fmodeflags(const char *); + +hidden FILE *__ofl_add(FILE *f); +hidden FILE **__ofl_lock(void); +hidden void __ofl_unlock(void); + +struct __pthread; +hidden void __register_locked_file(FILE *, struct __pthread *); +hidden void __unlist_locked_file(FILE *); +hidden void __do_orphaned_stdio_locks(void); -FILE *__fdopen(int, const char *); -int __fmodeflags(const char *); +#define MAYBE_WAITERS 0x40000000 -FILE *__ofl_add(FILE *f); -FILE **__ofl_lock(void); -void __ofl_unlock(void); +hidden void __getopt_msg(const char *, const char *, const char *, size_t); #define feof(f) ((f)->flags & F_EOF) #define ferror(f) ((f)->flags & F_ERR) #define getc_unlocked(f) \ - ( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) ) + ( ((f)->rpos != (f)->rend) ? *(f)->rpos++ : __uflow((f)) ) #define putc_unlocked(c, f) \ - ( ((unsigned char)(c)!=(f)->lbf && (f)->wpos<(f)->wend) \ - ? *(f)->wpos++ = (c) : __overflow((f),(c)) ) + ( (((unsigned char)(c)!=(f)->lbf && (f)->wpos!=(f)->wend)) \ + ? *(f)->wpos++ = (unsigned char)(c) \ + : __overflow((f),(unsigned char)(c)) ) /* Caller-allocated FILE * operations */ -FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t); -int __fclose_ca(FILE *); +hidden FILE *__fopen_rb_ca(const char *, FILE *, unsigned char *, size_t); +hidden int __fclose_ca(FILE *); // XXX EMSCRIPTEN extern int vfiprintf(FILE *restrict f, const char *restrict fmt, va_list ap); diff --git a/system/lib/libc/musl/src/internal/syscall.h b/system/lib/libc/musl/src/internal/syscall.h index 3ee67e9ee27c9..3951f7a012949 100644 --- a/system/lib/libc/musl/src/internal/syscall.h +++ b/system/lib/libc/musl/src/internal/syscall.h @@ -1,6 +1,8 @@ #ifndef _INTERNAL_SYSCALL_H #define _INTERNAL_SYSCALL_H +#include +#include #include #include "syscall_arch.h" @@ -12,6 +14,10 @@ #define SYSCALL_MMAP2_UNIT 4096ULL #endif +#ifndef __SYSCALL_LL_PRW +#define __SYSCALL_LL_PRW(x) __SYSCALL_LL_O(x) +#endif + #ifndef __scc #define __scc(X) ((long) (X)) typedef long syscall_arg_t; @@ -20,8 +26,7 @@ typedef long syscall_arg_t; #ifdef __cplusplus extern "C" { #endif -__attribute__((visibility("hidden"))) -long __syscall_ret(unsigned long), +hidden long __syscall_ret(unsigned long), __syscall_cp(syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t, syscall_arg_t); #ifdef __cplusplus @@ -60,8 +65,8 @@ long __syscall_ret(unsigned long), #define syscall(...) __syscall_ret(__syscall(__VA_ARGS__)) -#define socketcall __socketcall -#define socketcall_cp __socketcall_cp +#define socketcall(nm,a,b,c,d,e,f) __syscall_ret(__socketcall(nm,a,b,c,d,e,f)) +#define socketcall_cp(nm,a,b,c,d,e,f) __syscall_ret(__socketcall_cp(nm,a,b,c,d,e,f)) #ifndef __EMSCRIPTEN__ #define __syscall_cp0(n) (__syscall_cp)(n,0,0,0,0,0,0) @@ -79,14 +84,26 @@ long __syscall_ret(unsigned long), #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__)) -#ifndef SYSCALL_USE_SOCKETCALL -#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_##nm, a, b, c, d, e, f) -#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_##nm, a, b, c, d, e, f) +#ifdef __EMSCRIPTEN__ +#define __socketcall(nm,a,b,c,d,e,f) __syscall(SYS_##nm, a, b, c, d, e, f) +#define __socketcall_cp(nm,a,b,c,d,e,f) __syscall_cp(SYS_##nm, a, b, c, d, e, f) #else -#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_socketcall, __SC_##nm, \ - ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f })) -#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_socketcall, __SC_##nm, \ - ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f })) +static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, long c, long d, long e, long f) +{ + long r; + if (cp) r = __syscall_cp(sys, a, b, c, d, e, f); + else r = __syscall(sys, a, b, c, d, e, f); + if (r != -ENOSYS) return r; +#ifdef SYS_socketcall + if (cp) r = __syscall_cp(SYS_socketcall, sock, ((long[6]){a, b, c, d, e, f})); + else r = __syscall(SYS_socketcall, sock, ((long[6]){a, b, c, d, e, f})); +#endif + return r; +} +#define __socketcall(nm, a, b, c, d, e, f) __alt_socketcall(SYS_##nm, __SC_##nm, 0, \ + (long)(a), (long)(b), (long)(c), (long)(d), (long)(e), (long)(f)) +#define __socketcall_cp(nm, a, b, c, d, e, f) __alt_socketcall(SYS_##nm, __SC_##nm, 1, \ + (long)(a), (long)(b), (long)(c), (long)(d), (long)(e), (long)(f)) #endif /* fixup legacy 16-bit junk */ @@ -215,6 +232,128 @@ long __syscall_ret(unsigned long), #define SYS_sendfile SYS_sendfile64 #endif +#ifndef SYS_timer_settime +#define SYS_timer_settime SYS_timer_settime32 +#endif + +#ifndef SYS_timer_gettime +#define SYS_timer_gettime SYS_timer_gettime32 +#endif + +#ifndef SYS_timerfd_settime +#define SYS_timerfd_settime SYS_timerfd_settime32 +#endif + +#ifndef SYS_timerfd_gettime +#define SYS_timerfd_gettime SYS_timerfd_gettime32 +#endif + +#ifndef SYS_clock_settime +#define SYS_clock_settime SYS_clock_settime32 +#endif + +#ifndef SYS_clock_gettime +#define SYS_clock_gettime SYS_clock_gettime32 +#endif + +#ifndef SYS_clock_getres +#define SYS_clock_getres SYS_clock_getres_time32 +#endif + +#ifndef SYS_clock_nanosleep +#define SYS_clock_nanosleep SYS_clock_nanosleep_time32 +#endif + +#ifndef SYS_gettimeofday +#define SYS_gettimeofday SYS_gettimeofday_time32 +#endif + +#ifndef SYS_settimeofday +#define SYS_settimeofday SYS_settimeofday_time32 +#endif + +/* Ensure that the plain syscall names are defined even for "time64-only" + * archs. These facilitate callers passing null time arguments, and make + * tests for establishing which to use/fallback-to more consistent when + * they do need to be called with time arguments. */ + +#ifndef SYS_clock_gettime +#define SYS_clock_gettime SYS_clock_gettime64 +#endif + +#ifndef SYS_clock_settime +#define SYS_clock_settime SYS_clock_settime64 +#endif + +#ifndef SYS_clock_adjtime +#define SYS_clock_adjtime SYS_clock_adjtime64 +#endif + +#ifndef SYS_clock_getres +#define SYS_clock_getres SYS_clock_getres_time64 +#endif + +#ifndef SYS_clock_nanosleep +#define SYS_clock_nanosleep SYS_clock_nanosleep_time64 +#endif + +#ifndef SYS_timer_gettime +#define SYS_timer_gettime SYS_timer_gettime64 +#endif + +#ifndef SYS_timer_settime +#define SYS_timer_settime SYS_timer_settime64 +#endif + +#ifndef SYS_timerfd_gettime +#define SYS_timerfd_gettime SYS_timerfd_gettime64 +#endif + +#ifndef SYS_timerfd_settime +#define SYS_timerfd_settime SYS_timerfd_settime64 +#endif + +#ifndef SYS_utimensat +#define SYS_utimensat SYS_utimensat_time64 +#endif + +#ifndef SYS_pselect6 +#define SYS_pselect6 SYS_pselect6_time64 +#endif + +#ifndef SYS_ppoll +#define SYS_ppoll SYS_ppoll_time64 +#endif + +#ifndef SYS_recvmmsg +#define SYS_recvmmsg SYS_recvmmsg_time64 +#endif + +#ifndef SYS_mq_timedsend +#define SYS_mq_timedsend SYS_mq_timedsend_time64 +#endif + +#ifndef SYS_mq_timedreceive +#define SYS_mq_timedreceive SYS_mq_timedreceive_time64 +#endif + +/* SYS_semtimedop omitted because SYS_ipc may provide it */ + +#ifndef SYS_rt_sigtimedwait +#define SYS_rt_sigtimedwait SYS_rt_sigtimedwait_time64 +#endif + +#ifndef SYS_futex +#define SYS_futex SYS_futex_time64 +#endif + +#ifndef SYS_sched_rr_get_interval +#define SYS_sched_rr_get_interval SYS_sched_rr_get_interval_time64 +#endif + + + + /* socketcall calls */ #define __SC_socket 1 @@ -239,11 +378,32 @@ long __syscall_ret(unsigned long), #define __SC_sendmmsg 20 /* This is valid only because all socket syscalls are made via - * socketcall, which always fills unused argument slots with zeros. */ + * socketcall, which always fills unused argument slots with zeros. */ #ifndef SYS_accept #define SYS_accept SYS_accept4 #endif +#ifndef SO_RCVTIMEO_OLD +#define SO_RCVTIMEO_OLD 20 +#endif +#ifndef SO_SNDTIMEO_OLD +#define SO_SNDTIMEO_OLD 21 +#endif + +#define SO_TIMESTAMP_OLD 29 +#define SO_TIMESTAMPNS_OLD 35 +#define SO_TIMESTAMPING_OLD 37 +#define SCM_TIMESTAMP_OLD SO_TIMESTAMP_OLD +#define SCM_TIMESTAMPNS_OLD SO_TIMESTAMPNS_OLD +#define SCM_TIMESTAMPING_OLD SO_TIMESTAMPING_OLD + +#ifndef SIOCGSTAMP_OLD +#define SIOCGSTAMP_OLD 0x8906 +#endif +#ifndef SIOCGSTAMPNS_OLD +#define SIOCGSTAMPNS_OLD 0x8907 +#endif + #ifndef __EMSCRIPTEN__ #ifdef SYS_open #define __sys_open2(x,pn,fl) __syscall2(SYS_open, pn, (fl)|O_LARGEFILE) @@ -262,10 +422,19 @@ long __syscall_ret(unsigned long), #define __sys_open_cp2(x,pn,fl) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE)) #define __sys_open_cp3(x,pn,fl,mo) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE), __scc(mo)) #endif + #define __sys_open(...) __SYSCALL_DISP(__sys_open,,__VA_ARGS__) #define sys_open(...) __syscall_ret(__sys_open(__VA_ARGS__)) #define __sys_open_cp(...) __SYSCALL_DISP(__sys_open_cp,,__VA_ARGS__) #define sys_open_cp(...) __syscall_ret(__sys_open_cp(__VA_ARGS__)) +#ifdef __cplusplus +hidden void __procfdname(char __buf[], unsigned); +#else +hidden void __procfdname(char __buf[static 15+3*sizeof(int)], unsigned); +#endif + +hidden void *__vdsosym(const char *, const char *); + #endif diff --git a/system/lib/libc/musl/src/internal/vdso.c b/system/lib/libc/musl/src/internal/vdso.c index 6ae0212e5c1ee..d46d32281e649 100644 --- a/system/lib/libc/musl/src/internal/vdso.c +++ b/system/lib/libc/musl/src/internal/vdso.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -44,6 +45,7 @@ void *__vdsosym(const char *vername, const char *name) size_t i; for (i=0; libc.auxv[i] != AT_SYSINFO_EHDR; i+=2) if (!libc.auxv[i]) return 0; + if (!libc.auxv[i+1]) return 0; Ehdr *eh = (void *)libc.auxv[i+1]; Phdr *ph = (void *)((char *)eh + eh->e_phoff); size_t *dynv=0, base=-1; @@ -57,7 +59,7 @@ void *__vdsosym(const char *vername, const char *name) char *strings = 0; Sym *syms = 0; - uint32_t *hashtab = 0; + Elf_Symndx *hashtab = 0; uint16_t *versym = 0; Verdef *verdef = 0; diff --git a/system/lib/libc/musl/src/internal/version.c b/system/lib/libc/musl/src/internal/version.c index dc044ec4129fb..08bbf5b2b76ad 100644 --- a/system/lib/libc/musl/src/internal/version.c +++ b/system/lib/libc/musl/src/internal/version.c @@ -1,9 +1,4 @@ #include "version.h" +#include "libc.h" -static const char version[] = VERSION; - -__attribute__((__visibility__("hidden"))) -const char *__libc_get_version() -{ - return version; -} +const char __libc_version[] = VERSION; diff --git a/system/lib/libc/musl/src/internal/version.h b/system/lib/libc/musl/src/internal/version.h index adb0653cec045..b23e8e2963b94 100644 --- a/system/lib/libc/musl/src/internal/version.h +++ b/system/lib/libc/musl/src/internal/version.h @@ -1 +1 @@ -#define VERSION "1.1.15" +#define VERSION "1.2.2" diff --git a/system/lib/libc/musl/src/internal/vis.h b/system/lib/libc/musl/src/internal/vis.h deleted file mode 100644 index 35855fc8ab9fb..0000000000000 --- a/system/lib/libc/musl/src/internal/vis.h +++ /dev/null @@ -1,27 +0,0 @@ -/* This file is only used if enabled in the build system, in which case it is - * included automatically via command line options. It is not included - * explicitly by any source files or other headers. Its purpose is to - * override default visibilities to reduce the size and performance costs - * of position-independent code. */ - -#if !defined(CRT) && !defined(__ASSEMBLER__) - -/* Conceptually, all symbols should be protected, but some toolchains - * fail to support copy relocations for protected data, so exclude all - * exported data symbols. */ - -__attribute__((__visibility__("default"))) -extern struct _IO_FILE *const stdin, *const stdout, *const stderr; - -__attribute__((__visibility__("default"))) -extern int optind, opterr, optopt, optreset, __optreset, getdate_err, h_errno, daylight, __daylight, signgam, __signgam; - -__attribute__((__visibility__("default"))) -extern long timezone, __timezone; - -__attribute__((__visibility__("default"))) -extern char *optarg, **environ, **__environ, *tzname[2], *__tzname[2], *__progname, *__progname_full; - -#pragma GCC visibility push(protected) - -#endif diff --git a/system/lib/libc/musl/src/ipc/ftok.c b/system/lib/libc/musl/src/ipc/ftok.c index cd6002ed18ec2..c36b4b6003af5 100644 --- a/system/lib/libc/musl/src/ipc/ftok.c +++ b/system/lib/libc/musl/src/ipc/ftok.c @@ -6,5 +6,5 @@ key_t ftok(const char *path, int id) struct stat st; if (stat(path, &st) < 0) return -1; - return ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | ((id & 0xff) << 24)); + return ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | ((id & 0xffu) << 24)); } diff --git a/system/lib/libc/musl/src/ipc/ipc.h b/system/lib/libc/musl/src/ipc/ipc.h index 30ab939ad6b9a..746a905c986a0 100644 --- a/system/lib/libc/musl/src/ipc/ipc.h +++ b/system/lib/libc/musl/src/ipc/ipc.h @@ -1,3 +1,5 @@ +#include "syscall.h" + #define IPCOP_semop 1 #define IPCOP_semget 2 #define IPCOP_semctl 3 @@ -10,3 +12,13 @@ #define IPCOP_shmdt 22 #define IPCOP_shmget 23 #define IPCOP_shmctl 24 + +#ifndef IPC_64 +#define IPC_64 0x100 +#endif + +#define IPC_TIME64 (IPC_STAT & 0x100) + +#define IPC_CMD(cmd) (((cmd) & ~IPC_TIME64) | IPC_64) + +#define IPC_HILO(b,t) ((b)->t = (b)->__##t##_lo | 0LL+(b)->__##t##_hi<<32) diff --git a/system/lib/libc/musl/src/ipc/msgctl.c b/system/lib/libc/musl/src/ipc/msgctl.c index 4372c71939cad..9c11440641a99 100644 --- a/system/lib/libc/musl/src/ipc/msgctl.c +++ b/system/lib/libc/musl/src/ipc/msgctl.c @@ -1,12 +1,51 @@ #include +#include #include "syscall.h" #include "ipc.h" +#if __BYTE_ORDER != __BIG_ENDIAN +#undef SYSCALL_IPC_BROKEN_MODE +#endif + int msgctl(int q, int cmd, struct msqid_ds *buf) { -#ifdef SYS_msgctl - return syscall(SYS_msgctl, q, cmd | IPC_64, buf); +#if IPC_TIME64 + struct msqid_ds out, *orig; + if (cmd&IPC_TIME64) { + out = (struct msqid_ds){0}; + orig = buf; + buf = &out; + } +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + struct msqid_ds tmp; + if (cmd == IPC_SET) { + tmp = *buf; + tmp.msg_perm.mode *= 0x10000U; + buf = &tmp; + } +#endif +#ifndef SYS_ipc + int r = __syscall(SYS_msgctl, q, IPC_CMD(cmd), buf); #else - return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0); + int r = __syscall(SYS_ipc, IPCOP_msgctl, q, IPC_CMD(cmd), 0, buf, 0); +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + if (r >= 0) switch (cmd | IPC_TIME64) { + case IPC_STAT: + case MSG_STAT: + case MSG_STAT_ANY: + buf->msg_perm.mode >>= 16; + } +#endif +#if IPC_TIME64 + if (r >= 0 && (cmd&IPC_TIME64)) { + buf = orig; + *buf = out; + IPC_HILO(buf, msg_stime); + IPC_HILO(buf, msg_rtime); + IPC_HILO(buf, msg_ctime); + } #endif + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/ipc/msgget.c b/system/lib/libc/musl/src/ipc/msgget.c index 9dfbc4eabc4b9..30a4b42b854c2 100644 --- a/system/lib/libc/musl/src/ipc/msgget.c +++ b/system/lib/libc/musl/src/ipc/msgget.c @@ -4,7 +4,7 @@ int msgget(key_t k, int flag) { -#ifdef SYS_msgget +#ifndef SYS_ipc return syscall(SYS_msgget, k, flag); #else return syscall(SYS_ipc, IPCOP_msgget, k, flag); diff --git a/system/lib/libc/musl/src/ipc/msgrcv.c b/system/lib/libc/musl/src/ipc/msgrcv.c index ed4a448a7e5e4..9d1034b145012 100644 --- a/system/lib/libc/musl/src/ipc/msgrcv.c +++ b/system/lib/libc/musl/src/ipc/msgrcv.c @@ -1,11 +1,10 @@ #include #include "syscall.h" #include "ipc.h" -#include "libc.h" ssize_t msgrcv(int q, void *m, size_t len, long type, int flag) { -#ifdef SYS_msgrcv +#ifndef SYS_ipc return syscall_cp(SYS_msgrcv, q, m, len, type, flag); #else return syscall_cp(SYS_ipc, IPCOP_msgrcv, q, len, flag, ((long[]){ (long)m, type })); diff --git a/system/lib/libc/musl/src/ipc/msgsnd.c b/system/lib/libc/musl/src/ipc/msgsnd.c index 23f4a4cbf58cc..99bb17e94acab 100644 --- a/system/lib/libc/musl/src/ipc/msgsnd.c +++ b/system/lib/libc/musl/src/ipc/msgsnd.c @@ -1,11 +1,10 @@ #include #include "syscall.h" #include "ipc.h" -#include "libc.h" int msgsnd(int q, const void *m, size_t len, int flag) { -#ifdef SYS_msgsnd +#ifndef SYS_ipc return syscall_cp(SYS_msgsnd, q, m, len, flag); #else return syscall_cp(SYS_ipc, IPCOP_msgsnd, q, len, flag, m); diff --git a/system/lib/libc/musl/src/ipc/semctl.c b/system/lib/libc/musl/src/ipc/semctl.c index 673a9a8c996b2..bbb97d7aed063 100644 --- a/system/lib/libc/musl/src/ipc/semctl.c +++ b/system/lib/libc/musl/src/ipc/semctl.c @@ -1,8 +1,13 @@ #include #include +#include #include "syscall.h" #include "ipc.h" +#if __BYTE_ORDER != __BIG_ENDIAN +#undef SYSCALL_IPC_BROKEN_MODE +#endif + union semun { int val; struct semid_ds *buf; @@ -13,16 +18,52 @@ int semctl(int id, int num, int cmd, ...) { union semun arg = {0}; va_list ap; - switch (cmd) { - case SETVAL: case GETALL: case SETALL: case IPC_STAT: case IPC_SET: - case IPC_INFO: case SEM_INFO: case SEM_STAT: + switch (cmd & ~IPC_TIME64) { + case SETVAL: case GETALL: case SETALL: case IPC_SET: + case IPC_INFO: case SEM_INFO: + case IPC_STAT & ~IPC_TIME64: + case SEM_STAT & ~IPC_TIME64: + case SEM_STAT_ANY & ~IPC_TIME64: va_start(ap, cmd); arg = va_arg(ap, union semun); va_end(ap); } -#ifdef SYS_semctl - return syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf); +#if IPC_TIME64 + struct semid_ds out, *orig; + if (cmd&IPC_TIME64) { + out = (struct semid_ds){0}; + orig = arg.buf; + arg.buf = &out; + } +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + struct semid_ds tmp; + if (cmd == IPC_SET) { + tmp = *arg.buf; + tmp.sem_perm.mode *= 0x10000U; + arg.buf = &tmp; + } +#endif +#ifndef SYS_ipc + int r = __syscall(SYS_semctl, id, num, IPC_CMD(cmd), arg.buf); #else - return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf); + int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, IPC_CMD(cmd), &arg.buf); +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + if (r >= 0) switch (cmd | IPC_TIME64) { + case IPC_STAT: + case SEM_STAT: + case SEM_STAT_ANY: + arg.buf->sem_perm.mode >>= 16; + } +#endif +#if IPC_TIME64 + if (r >= 0 && (cmd&IPC_TIME64)) { + arg.buf = orig; + *arg.buf = out; + IPC_HILO(arg.buf, sem_otime); + IPC_HILO(arg.buf, sem_ctime); + } #endif + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/ipc/semget.c b/system/lib/libc/musl/src/ipc/semget.c index c4a559db1b0ec..2cdf626b50023 100644 --- a/system/lib/libc/musl/src/ipc/semget.c +++ b/system/lib/libc/musl/src/ipc/semget.c @@ -11,7 +11,7 @@ int semget(key_t key, int n, int fl) * n fits in the correct (per POSIX) userspace type, so * we have to check here. */ if (n > USHRT_MAX) return __syscall_ret(-EINVAL); -#ifdef SYS_semget +#ifndef SYS_ipc return syscall(SYS_semget, key, n, fl); #else return syscall(SYS_ipc, IPCOP_semget, key, n, fl); diff --git a/system/lib/libc/musl/src/ipc/semop.c b/system/lib/libc/musl/src/ipc/semop.c index 8046e43714d08..5f0c7deaf308a 100644 --- a/system/lib/libc/musl/src/ipc/semop.c +++ b/system/lib/libc/musl/src/ipc/semop.c @@ -4,7 +4,7 @@ int semop(int id, struct sembuf *buf, size_t n) { -#ifdef SYS_semop +#ifndef SYS_ipc return syscall(SYS_semop, id, buf, n); #else return syscall(SYS_ipc, IPCOP_semop, id, n, 0, buf); diff --git a/system/lib/libc/musl/src/ipc/semtimedop.c b/system/lib/libc/musl/src/ipc/semtimedop.c index b0c4cf9f82a79..1632e7b03f38a 100644 --- a/system/lib/libc/musl/src/ipc/semtimedop.c +++ b/system/lib/libc/musl/src/ipc/semtimedop.c @@ -1,13 +1,35 @@ #define _GNU_SOURCE #include +#include #include "syscall.h" #include "ipc.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +#if !defined(SYS_semtimedop) && !defined(SYS_ipc) +#define NO_TIME32 1 +#else +#define NO_TIME32 0 +#endif + int semtimedop(int id, struct sembuf *buf, size_t n, const struct timespec *ts) { -#ifdef SYS_semtimedop +#ifdef SYS_semtimedop_time64 + time_t s = ts ? ts->tv_sec : 0; + long ns = ts ? ts->tv_nsec : 0; + int r = -ENOSYS; + if (NO_TIME32 || !IS32BIT(s)) + r = __syscall(SYS_semtimedop_time64, id, buf, n, + ts ? ((long long[]){s, ns}) : 0); + if (NO_TIME32 || r!=-ENOSYS) return __syscall_ret(r); + ts = ts ? (void *)(long[]){CLAMP(s), ns} : 0; +#endif +#if defined(SYS_ipc) + return syscall(SYS_ipc, IPCOP_semtimedop, id, n, 0, buf, ts); +#elif defined(SYS_semtimedop) return syscall(SYS_semtimedop, id, buf, n, ts); #else - return syscall(SYS_ipc, IPCOP_semtimedop, id, n, 0, buf, ts); + return __syscall_ret(-ENOSYS); #endif } diff --git a/system/lib/libc/musl/src/ipc/shmat.c b/system/lib/libc/musl/src/ipc/shmat.c index 38db92f951148..8c7407d13f6d8 100644 --- a/system/lib/libc/musl/src/ipc/shmat.c +++ b/system/lib/libc/musl/src/ipc/shmat.c @@ -2,7 +2,7 @@ #include "syscall.h" #include "ipc.h" -#ifdef SYS_shmat +#ifndef SYS_ipc void *shmat(int id, const void *addr, int flag) { return (void *)syscall(SYS_shmat, id, addr, flag); diff --git a/system/lib/libc/musl/src/ipc/shmctl.c b/system/lib/libc/musl/src/ipc/shmctl.c index e2879f20aa800..1c9f78c2f11f5 100644 --- a/system/lib/libc/musl/src/ipc/shmctl.c +++ b/system/lib/libc/musl/src/ipc/shmctl.c @@ -1,12 +1,51 @@ #include +#include #include "syscall.h" #include "ipc.h" +#if __BYTE_ORDER != __BIG_ENDIAN +#undef SYSCALL_IPC_BROKEN_MODE +#endif + int shmctl(int id, int cmd, struct shmid_ds *buf) { -#ifdef SYS_shmctl - return syscall(SYS_shmctl, id, cmd | IPC_64, buf); +#if IPC_TIME64 + struct shmid_ds out, *orig; + if (cmd&IPC_TIME64) { + out = (struct shmid_ds){0}; + orig = buf; + buf = &out; + } +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + struct shmid_ds tmp; + if (cmd == IPC_SET) { + tmp = *buf; + tmp.shm_perm.mode *= 0x10000U; + buf = &tmp; + } +#endif +#ifndef SYS_ipc + int r = __syscall(SYS_shmctl, id, IPC_CMD(cmd), buf); #else - return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0); + int r = __syscall(SYS_ipc, IPCOP_shmctl, id, IPC_CMD(cmd), 0, buf, 0); +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + if (r >= 0) switch (cmd | IPC_TIME64) { + case IPC_STAT: + case SHM_STAT: + case SHM_STAT_ANY: + buf->shm_perm.mode >>= 16; + } +#endif +#if IPC_TIME64 + if (r >= 0 && (cmd&IPC_TIME64)) { + buf = orig; + *buf = out; + IPC_HILO(buf, shm_atime); + IPC_HILO(buf, shm_dtime); + IPC_HILO(buf, shm_ctime); + } #endif + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/ipc/shmdt.c b/system/lib/libc/musl/src/ipc/shmdt.c index d4fac8f183a12..572381378e1d4 100644 --- a/system/lib/libc/musl/src/ipc/shmdt.c +++ b/system/lib/libc/musl/src/ipc/shmdt.c @@ -4,7 +4,7 @@ int shmdt(const void *addr) { -#ifdef SYS_shmdt +#ifndef SYS_ipc return syscall(SYS_shmdt, addr); #else return syscall(SYS_ipc, IPCOP_shmdt, 0, 0, 0, addr); diff --git a/system/lib/libc/musl/src/ipc/shmget.c b/system/lib/libc/musl/src/ipc/shmget.c index b44f9d680a75a..7521b5fa3fcab 100644 --- a/system/lib/libc/musl/src/ipc/shmget.c +++ b/system/lib/libc/musl/src/ipc/shmget.c @@ -6,7 +6,7 @@ int shmget(key_t key, size_t size, int flag) { if (size > PTRDIFF_MAX) size = SIZE_MAX; -#ifdef SYS_shmget +#ifndef SYS_ipc return syscall(SYS_shmget, key, size, flag); #else return syscall(SYS_ipc, IPCOP_shmget, key, size, flag); diff --git a/system/lib/libc/musl/src/ldso/__dlsym.c b/system/lib/libc/musl/src/ldso/__dlsym.c index 99aafdf91b95c..0384f97e96099 100644 --- a/system/lib/libc/musl/src/ldso/__dlsym.c +++ b/system/lib/libc/musl/src/ldso/__dlsym.c @@ -1,8 +1,5 @@ #include -#include "libc.h" - -__attribute__((__visibility__("hidden"))) -void __dl_seterr(const char *, ...); +#include "dynlink.h" static void *stub_dlsym(void *restrict p, const char *restrict s, void *restrict ra) { @@ -11,3 +8,7 @@ static void *stub_dlsym(void *restrict p, const char *restrict s, void *restrict } weak_alias(stub_dlsym, __dlsym); + +#if _REDIR_TIME64 +weak_alias(stub_dlsym, __dlsym_redir_time64); +#endif diff --git a/system/lib/libc/musl/src/ldso/dl_iterate_phdr.c b/system/lib/libc/musl/src/ldso/dl_iterate_phdr.c index c141fd9b4f27f..86c87ef8358c8 100644 --- a/system/lib/libc/musl/src/ldso/dl_iterate_phdr.c +++ b/system/lib/libc/musl/src/ldso/dl_iterate_phdr.c @@ -4,6 +4,8 @@ #define AUX_CNT 38 +extern weak hidden const size_t _DYNAMIC[]; + static int static_dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data) { unsigned char *p; @@ -11,7 +13,7 @@ static int static_dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size size_t base = 0; size_t n; struct dl_phdr_info info; - size_t i, aux[AUX_CNT]; + size_t i, aux[AUX_CNT] = {0}; for (i=0; libc.auxv[i]; i+=2) if (libc.auxv[i]p_type == PT_PHDR) base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; if (phdr->p_type == PT_TLS) tls_phdr = phdr; } diff --git a/system/lib/libc/musl/src/ldso/dladdr.c b/system/lib/libc/musl/src/ldso/dladdr.c index 659ab91e8a679..e5c80206a8c34 100644 --- a/system/lib/libc/musl/src/ldso/dladdr.c +++ b/system/lib/libc/musl/src/ldso/dladdr.c @@ -1,6 +1,5 @@ #define _GNU_SOURCE #include -#include "libc.h" static int stub_dladdr(const void *addr, Dl_info *info) { diff --git a/system/lib/libc/musl/src/ldso/dlclose.c b/system/lib/libc/musl/src/ldso/dlclose.c index 0ef22319decea..e437422a675ae 100644 --- a/system/lib/libc/musl/src/ldso/dlclose.c +++ b/system/lib/libc/musl/src/ldso/dlclose.c @@ -1,7 +1,5 @@ #include - -__attribute__((__visibility__("hidden"))) -int __dl_invalid_handle(void *); +#include "dynlink.h" int dlclose(void *p) { diff --git a/system/lib/libc/musl/src/ldso/dlerror.c b/system/lib/libc/musl/src/ldso/dlerror.c index 378f035647c52..afe59253ea0ee 100644 --- a/system/lib/libc/musl/src/ldso/dlerror.c +++ b/system/lib/libc/musl/src/ldso/dlerror.c @@ -2,7 +2,14 @@ #include #include #include "pthread_impl.h" -#include "libc.h" +#include "dynlink.h" +#include "lock.h" +#include "fork_impl.h" + +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc __libc_realloc +#define free __libc_free char *dlerror() { @@ -16,22 +23,42 @@ char *dlerror() return s; } +static volatile int freebuf_queue_lock[1]; +static void **freebuf_queue; +volatile int *const __dlerror_lockptr = freebuf_queue_lock; + void __dl_thread_cleanup(void) { pthread_t self = __pthread_self(); - if (self->dlerror_buf != (void *)-1) - free(self->dlerror_buf); + if (self->dlerror_buf && self->dlerror_buf != (void *)-1) { + LOCK(freebuf_queue_lock); + void **p = (void **)self->dlerror_buf; + *p = freebuf_queue; + freebuf_queue = p; + UNLOCK(freebuf_queue_lock); + } } -__attribute__((__visibility__("hidden"))) -void __dl_vseterr(const char *fmt, va_list ap) +hidden void __dl_vseterr(const char *fmt, va_list ap) { + LOCK(freebuf_queue_lock); + void **q = freebuf_queue; + freebuf_queue = 0; + UNLOCK(freebuf_queue_lock); + + while (q) { + void **p = *q; + free(q); + q = p; + } + va_list ap2; va_copy(ap2, ap); pthread_t self = __pthread_self(); if (self->dlerror_buf != (void *)-1) free(self->dlerror_buf); size_t len = vsnprintf(0, 0, fmt, ap2); + if (len < sizeof(void *)) len = sizeof(void *); va_end(ap2); char *buf = malloc(len+1); if (buf) { @@ -43,8 +70,7 @@ void __dl_vseterr(const char *fmt, va_list ap) self->dlerror_flag = 1; } -__attribute__((__visibility__("hidden"))) -void __dl_seterr(const char *fmt, ...) +hidden void __dl_seterr(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -52,9 +78,6 @@ void __dl_seterr(const char *fmt, ...) va_end(ap); } -__attribute__((__visibility__("hidden"))) -int __dl_invalid_handle(void *); - static int stub_invalid_handle(void *h) { __dl_seterr("Invalid library handle %p", (void *)h); diff --git a/system/lib/libc/musl/src/ldso/dlinfo.c b/system/lib/libc/musl/src/ldso/dlinfo.c index a173d1ac63ef1..b55f5fe6cfef9 100644 --- a/system/lib/libc/musl/src/ldso/dlinfo.c +++ b/system/lib/libc/musl/src/ldso/dlinfo.c @@ -1,11 +1,6 @@ #define _GNU_SOURCE #include - -__attribute__((__visibility__("hidden"))) -int __dl_invalid_handle(void *); - -__attribute__((__visibility__("hidden"))) -void __dl_seterr(const char *, ...); +#include "dynlink.h" int dlinfo(void *dso, int req, void *res) { diff --git a/system/lib/libc/musl/src/ldso/dlopen.c b/system/lib/libc/musl/src/ldso/dlopen.c index dcdb439847d93..69372a220bb1c 100644 --- a/system/lib/libc/musl/src/ldso/dlopen.c +++ b/system/lib/libc/musl/src/ldso/dlopen.c @@ -1,8 +1,5 @@ #include -#include "libc.h" - -__attribute__((__visibility__("hidden"))) -void __dl_seterr(const char *, ...); +#include "dynlink.h" static void *stub_dlopen(const char *file, int mode) { diff --git a/system/lib/libc/musl/src/ldso/dlsym.c b/system/lib/libc/musl/src/ldso/dlsym.c index c0f50e923b857..65eb27659f7b6 100644 --- a/system/lib/libc/musl/src/ldso/dlsym.c +++ b/system/lib/libc/musl/src/ldso/dlsym.c @@ -1,6 +1,5 @@ #include - -void *__dlsym(void *restrict, const char *restrict, void *restrict); +#include "dynlink.h" void *dlsym(void *restrict p, const char *restrict s) { diff --git a/system/lib/libc/musl/src/ldso/tlsdesc.c b/system/lib/libc/musl/src/ldso/tlsdesc.c index a2985cb64a20a..49a1f18c03b66 100644 --- a/system/lib/libc/musl/src/ldso/tlsdesc.c +++ b/system/lib/libc/musl/src/ldso/tlsdesc.c @@ -1,8 +1,5 @@ #include -#include "libc.h" - -__attribute__((__visibility__("hidden"))) -ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic(); +#include ptrdiff_t __tlsdesc_static() { diff --git a/system/lib/libc/musl/src/legacy/euidaccess.c b/system/lib/libc/musl/src/legacy/euidaccess.c index 73072513a8fac..6e1f39855e89e 100644 --- a/system/lib/libc/musl/src/legacy/euidaccess.c +++ b/system/lib/libc/musl/src/legacy/euidaccess.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include -#include "libc.h" int euidaccess(const char *filename, int amode) { diff --git a/system/lib/libc/musl/src/legacy/ftw.c b/system/lib/libc/musl/src/legacy/ftw.c index 0429aba495d0d..506bd29cedf3b 100644 --- a/system/lib/libc/musl/src/legacy/ftw.c +++ b/system/lib/libc/musl/src/legacy/ftw.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int fd_limit) { @@ -9,4 +8,4 @@ int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int return nftw(path, (int (*)())fn, fd_limit, FTW_PHYS); } -LFS64(ftw); +weak_alias(ftw, ftw64); diff --git a/system/lib/libc/musl/src/legacy/getdtablesize.c b/system/lib/libc/musl/src/legacy/getdtablesize.c index 682da6d067583..b30c1933a272d 100644 --- a/system/lib/libc/musl/src/legacy/getdtablesize.c +++ b/system/lib/libc/musl/src/legacy/getdtablesize.c @@ -7,5 +7,5 @@ int getdtablesize(void) { struct rlimit rl; getrlimit(RLIMIT_NOFILE, &rl); - return rl.rlim_max < INT_MAX ? rl.rlim_max : INT_MAX; + return rl.rlim_cur < INT_MAX ? rl.rlim_cur : INT_MAX; } diff --git a/system/lib/libc/musl/src/legacy/getpass.c b/system/lib/libc/musl/src/legacy/getpass.c index 15ab9851e8f88..d51286c0b03b3 100644 --- a/system/lib/libc/musl/src/legacy/getpass.c +++ b/system/lib/libc/musl/src/legacy/getpass.c @@ -27,7 +27,7 @@ char *getpass(const char *prompt) l = read(fd, password, sizeof password); if (l >= 0) { - if (l > 0 && password[l-1] == '\n') l--; + if (l > 0 && password[l-1] == '\n' || l==sizeof password) l--; password[l] = 0; } diff --git a/system/lib/libc/musl/src/legacy/lutimes.c b/system/lib/libc/musl/src/legacy/lutimes.c index 2e5502d1e38f4..dd465923adf42 100644 --- a/system/lib/libc/musl/src/legacy/lutimes.c +++ b/system/lib/libc/musl/src/legacy/lutimes.c @@ -6,9 +6,11 @@ int lutimes(const char *filename, const struct timeval tv[2]) { struct timespec times[2]; - times[0].tv_sec = tv[0].tv_sec; - times[0].tv_nsec = tv[0].tv_usec * 1000; - times[1].tv_sec = tv[1].tv_sec; - times[1].tv_nsec = tv[1].tv_usec * 1000; - return utimensat(AT_FDCWD, filename, times, AT_SYMLINK_NOFOLLOW); + if (tv) { + times[0].tv_sec = tv[0].tv_sec; + times[0].tv_nsec = tv[0].tv_usec * 1000; + times[1].tv_sec = tv[1].tv_sec; + times[1].tv_nsec = tv[1].tv_usec * 1000; + } + return utimensat(AT_FDCWD, filename, tv ? times : 0, AT_SYMLINK_NOFOLLOW); } diff --git a/system/lib/libc/musl/src/legacy/utmpx.c b/system/lib/libc/musl/src/legacy/utmpx.c index e2843c94af412..7aa65da335b5e 100644 --- a/system/lib/libc/musl/src/legacy/utmpx.c +++ b/system/lib/libc/musl/src/legacy/utmpx.c @@ -1,7 +1,7 @@ +#define _GNU_SOURCE #include #include #include -#include "libc.h" void endutxent(void) { @@ -35,7 +35,7 @@ void updwtmpx(const char *f, const struct utmpx *u) { } -int __utmpxname(const char *f) +static int __utmpxname(const char *f) { errno = ENOTSUP; return -1; diff --git a/system/lib/libc/musl/src/linux/adjtime.c b/system/lib/libc/musl/src/linux/adjtime.c index fa8af9f021773..5a707f2f217e8 100644 --- a/system/lib/libc/musl/src/linux/adjtime.c +++ b/system/lib/libc/musl/src/linux/adjtime.c @@ -15,7 +15,7 @@ int adjtime(const struct timeval *in, struct timeval *out) tx.offset = in->tv_sec*1000000 + in->tv_usec; tx.modes = ADJ_OFFSET_SINGLESHOT; } - if (syscall(SYS_adjtimex, &tx) < 0) return -1; + if (adjtimex(&tx) < 0) return -1; if (out) { out->tv_sec = tx.offset / 1000000; if ((out->tv_usec = tx.offset % 1000000) < 0) { diff --git a/system/lib/libc/musl/src/linux/adjtimex.c b/system/lib/libc/musl/src/linux/adjtimex.c index 91de6824c32b8..e9d727cf3af40 100644 --- a/system/lib/libc/musl/src/linux/adjtimex.c +++ b/system/lib/libc/musl/src/linux/adjtimex.c @@ -1,7 +1,7 @@ #include -#include "syscall.h" +#include int adjtimex(struct timex *tx) { - return syscall(SYS_adjtimex, tx); + return clock_adjtime(CLOCK_REALTIME, tx); } diff --git a/system/lib/libc/musl/src/linux/brk.c b/system/lib/libc/musl/src/linux/brk.c index ffdbbd5297757..a6173e07f30d8 100644 --- a/system/lib/libc/musl/src/linux/brk.c +++ b/system/lib/libc/musl/src/linux/brk.c @@ -1,3 +1,5 @@ +#define _BSD_SOURCE +#include #include #include "syscall.h" diff --git a/system/lib/libc/musl/src/linux/cache.c b/system/lib/libc/musl/src/linux/cache.c index 3f0abc7caf16e..0eb051c2d4ace 100644 --- a/system/lib/libc/musl/src/linux/cache.c +++ b/system/lib/libc/musl/src/linux/cache.c @@ -1,5 +1,6 @@ +#include #include "syscall.h" -#include "libc.h" +#include "atomic.h" #ifdef SYS_cacheflush int _flush_cache(void *addr, int len, int op) @@ -16,3 +17,34 @@ int __cachectl(void *addr, int len, int op) } weak_alias(__cachectl, cachectl); #endif + +#ifdef SYS_riscv_flush_icache + +#define VDSO_FLUSH_ICACHE_SYM "__vdso_flush_icache" +#define VDSO_FLUSH_ICACHE_VER "LINUX_4.5" + +static void *volatile vdso_func; + +static int flush_icache_init(void *start, void *end, unsigned long int flags) +{ + void *p = __vdsosym(VDSO_FLUSH_ICACHE_VER, VDSO_FLUSH_ICACHE_SYM); + int (*f)(void *, void *, unsigned long int) = + (int (*)(void *, void *, unsigned long int))p; + a_cas_p(&vdso_func, (void *)flush_icache_init, p); + return f ? f(start, end, flags) : -ENOSYS; +} + +static void *volatile vdso_func = (void *)flush_icache_init; + +int __riscv_flush_icache(void *start, void *end, unsigned long int flags) +{ + int (*f)(void *, void *, unsigned long int) = + (int (*)(void *, void *, unsigned long int))vdso_func; + if (f) { + int r = f(start, end, flags); + if (!r) return r; + if (r != -ENOSYS) return __syscall_ret(r); + } +} +weak_alias(__riscv_flush_icache, riscv_flush_icache); +#endif diff --git a/system/lib/libc/musl/src/linux/clock_adjtime.c b/system/lib/libc/musl/src/linux/clock_adjtime.c index 056ad6d34104c..d4d03d24df401 100644 --- a/system/lib/libc/musl/src/linux/clock_adjtime.c +++ b/system/lib/libc/musl/src/linux/clock_adjtime.c @@ -1,7 +1,151 @@ #include +#include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) + +struct ktimex64 { + unsigned modes; + int :32; + long long offset, freq, maxerror, esterror; + int status; + int :32; + long long constant, precision, tolerance; + long long time_sec, time_usec; + long long tick, ppsfreq, jitter; + int shift; + int :32; + long long stabil, jitcnt, calcnt, errcnt, stbcnt; + int tai; + int __padding[11]; +}; + +struct ktimex { + unsigned modes; + long offset, freq, maxerror, esterror; + int status; + long constant, precision, tolerance; + long time_sec, time_usec; + long tick, ppsfreq, jitter; + int shift; + long stabil, jitcnt, calcnt, errcnt, stbcnt; + int tai; + int __padding[11]; +}; + int clock_adjtime (clockid_t clock_id, struct timex *utx) { + int r = -ENOSYS; +#ifdef SYS_clock_adjtime64 + struct ktimex64 ktx = { + .modes = utx->modes, + .offset = utx->offset, + .freq = utx->freq, + .maxerror = utx->maxerror, + .esterror = utx->esterror, + .status = utx->status, + .constant = utx->constant, + .precision = utx->precision, + .tolerance = utx->tolerance, + .time_sec = utx->time.tv_sec, + .time_usec = utx->time.tv_usec, + .tick = utx->tick, + .ppsfreq = utx->ppsfreq, + .jitter = utx->jitter, + .shift = utx->shift, + .stabil = utx->stabil, + .jitcnt = utx->jitcnt, + .calcnt = utx->calcnt, + .errcnt = utx->errcnt, + .stbcnt = utx->stbcnt, + .tai = utx->tai, + }; + r = __syscall(SYS_clock_adjtime64, clock_id, &ktx); + if (r>=0) { + utx->modes = ktx.modes; + utx->offset = ktx.offset; + utx->freq = ktx.freq; + utx->maxerror = ktx.maxerror; + utx->esterror = ktx.esterror; + utx->status = ktx.status; + utx->constant = ktx.constant; + utx->precision = ktx.precision; + utx->tolerance = ktx.tolerance; + utx->time.tv_sec = ktx.time_sec; + utx->time.tv_usec = ktx.time_usec; + utx->tick = ktx.tick; + utx->ppsfreq = ktx.ppsfreq; + utx->jitter = ktx.jitter; + utx->shift = ktx.shift; + utx->stabil = ktx.stabil; + utx->jitcnt = ktx.jitcnt; + utx->calcnt = ktx.calcnt; + utx->errcnt = ktx.errcnt; + utx->stbcnt = ktx.stbcnt; + utx->tai = ktx.tai; + } + if (SYS_clock_adjtime == SYS_clock_adjtime64 || r!=-ENOSYS) + return __syscall_ret(r); + if ((utx->modes & ADJ_SETOFFSET) && !IS32BIT(utx->time.tv_sec)) + return __syscall_ret(-ENOTSUP); +#endif + if (sizeof(time_t) > sizeof(long)) { + struct ktimex ktx = { + .modes = utx->modes, + .offset = utx->offset, + .freq = utx->freq, + .maxerror = utx->maxerror, + .esterror = utx->esterror, + .status = utx->status, + .constant = utx->constant, + .precision = utx->precision, + .tolerance = utx->tolerance, + .time_sec = utx->time.tv_sec, + .time_usec = utx->time.tv_usec, + .tick = utx->tick, + .ppsfreq = utx->ppsfreq, + .jitter = utx->jitter, + .shift = utx->shift, + .stabil = utx->stabil, + .jitcnt = utx->jitcnt, + .calcnt = utx->calcnt, + .errcnt = utx->errcnt, + .stbcnt = utx->stbcnt, + .tai = utx->tai, + }; +#ifdef SYS_adjtimex + if (clock_id==CLOCK_REALTIME) r = __syscall(SYS_adjtimex, &ktx); + else +#endif + r = __syscall(SYS_clock_adjtime, clock_id, &ktx); + if (r>=0) { + utx->modes = ktx.modes; + utx->offset = ktx.offset; + utx->freq = ktx.freq; + utx->maxerror = ktx.maxerror; + utx->esterror = ktx.esterror; + utx->status = ktx.status; + utx->constant = ktx.constant; + utx->precision = ktx.precision; + utx->tolerance = ktx.tolerance; + utx->time.tv_sec = ktx.time_sec; + utx->time.tv_usec = ktx.time_usec; + utx->tick = ktx.tick; + utx->ppsfreq = ktx.ppsfreq; + utx->jitter = ktx.jitter; + utx->shift = ktx.shift; + utx->stabil = ktx.stabil; + utx->jitcnt = ktx.jitcnt; + utx->calcnt = ktx.calcnt; + utx->errcnt = ktx.errcnt; + utx->stbcnt = ktx.stbcnt; + utx->tai = ktx.tai; + } + return __syscall_ret(r); + } +#ifdef SYS_adjtimex + if (clock_id==CLOCK_REALTIME) return syscall(SYS_adjtimex, utx); +#endif return syscall(SYS_clock_adjtime, clock_id, utx); } diff --git a/system/lib/libc/musl/src/linux/clone.c b/system/lib/libc/musl/src/linux/clone.c index b9e5594530474..8c1af7d3dc83e 100644 --- a/system/lib/libc/musl/src/linux/clone.c +++ b/system/lib/libc/musl/src/linux/clone.c @@ -1,5 +1,7 @@ +#define _GNU_SOURCE #include #include +#include #include "pthread_impl.h" #include "syscall.h" diff --git a/system/lib/libc/musl/src/linux/copy_file_range.c b/system/lib/libc/musl/src/linux/copy_file_range.c new file mode 100644 index 0000000000000..dd4b133336226 --- /dev/null +++ b/system/lib/libc/musl/src/linux/copy_file_range.c @@ -0,0 +1,8 @@ +#define _GNU_SOURCE +#include +#include "syscall.h" + +ssize_t copy_file_range(int fd_in, off_t *off_in, int fd_out, off_t *off_out, size_t len, unsigned flags) +{ + return syscall(SYS_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags); +} diff --git a/system/lib/libc/musl/src/linux/fallocate.c b/system/lib/libc/musl/src/linux/fallocate.c index ae766d5e5fa4e..7d68bc8f64f6e 100644 --- a/system/lib/libc/musl/src/linux/fallocate.c +++ b/system/lib/libc/musl/src/linux/fallocate.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include "syscall.h" -#include "libc.h" int fallocate(int fd, int mode, off_t base, off_t len) { @@ -10,4 +9,4 @@ int fallocate(int fd, int mode, off_t base, off_t len) } #undef fallocate64 -LFS64(fallocate); +weak_alias(fallocate, fallocate64); diff --git a/system/lib/libc/musl/src/linux/getdents.c b/system/lib/libc/musl/src/linux/getdents.c new file mode 100644 index 0000000000000..796c1e5c92499 --- /dev/null +++ b/system/lib/libc/musl/src/linux/getdents.c @@ -0,0 +1,12 @@ +#define _BSD_SOURCE +#include +#include +#include "syscall.h" + +int getdents(int fd, struct dirent *buf, size_t len) +{ + if (len>INT_MAX) len = INT_MAX; + return syscall(SYS_getdents, fd, buf, len); +} + +weak_alias(getdents, getdents64); diff --git a/system/lib/libc/musl/src/linux/getrandom.c b/system/lib/libc/musl/src/linux/getrandom.c new file mode 100644 index 0000000000000..6cc6f6b047c18 --- /dev/null +++ b/system/lib/libc/musl/src/linux/getrandom.c @@ -0,0 +1,7 @@ +#include +#include "syscall.h" + +ssize_t getrandom(void *buf, size_t buflen, unsigned flags) +{ + return syscall_cp(SYS_getrandom, buf, buflen, flags); +} diff --git a/system/lib/libc/musl/src/linux/membarrier.c b/system/lib/libc/musl/src/linux/membarrier.c new file mode 100644 index 0000000000000..343f7360ee119 --- /dev/null +++ b/system/lib/libc/musl/src/linux/membarrier.c @@ -0,0 +1,72 @@ +#include +#include +#include +#include +#include "pthread_impl.h" +#include "syscall.h" + +static void dummy_0(void) +{ +} + +weak_alias(dummy_0, __tl_lock); +weak_alias(dummy_0, __tl_unlock); + +static sem_t barrier_sem; + +static void bcast_barrier(int s) +{ + sem_post(&barrier_sem); +} + +int __membarrier(int cmd, int flags) +{ + int r = __syscall(SYS_membarrier, cmd, flags); + /* Emulate the private expedited command, which is needed by the + * dynamic linker for installation of dynamic TLS, for older + * kernels that lack the syscall. Unlike the syscall, this only + * synchronizes with threads of the process, not other processes + * sharing the VM, but such sharing is not a supported usage + * anyway. */ + if (r && cmd == MEMBARRIER_CMD_PRIVATE_EXPEDITED && !flags) { + pthread_t self=__pthread_self(), td; + sigset_t set; + __block_app_sigs(&set); + __tl_lock(); + sem_init(&barrier_sem, 0, 0); + struct sigaction sa = { + .sa_flags = SA_RESTART, + .sa_handler = bcast_barrier + }; + memset(&sa.sa_mask, -1, sizeof sa.sa_mask); + if (!__libc_sigaction(SIGSYNCCALL, &sa, 0)) { + for (td=self->next; td!=self; td=td->next) + __syscall(SYS_tkill, td->tid, SIGSYNCCALL); + for (td=self->next; td!=self; td=td->next) + sem_wait(&barrier_sem); + r = 0; + sa.sa_handler = SIG_IGN; + __libc_sigaction(SIGSYNCCALL, &sa, 0); + } + sem_destroy(&barrier_sem); + __tl_unlock(); + __restore_sigs(&set); + } + return __syscall_ret(r); +} + +void __membarrier_init(void) +{ + /* If membarrier is linked, attempt to pre-register to be able to use + * the private expedited command before the process becomes multi- + * threaded, since registering later has bad, potentially unbounded + * latency. This syscall should be essentially free, and it's arguably + * a mistake in the API design that registration was even required. + * For other commands, registration may impose some cost, so it's left + * to the application to do so if desired. Unfortunately this means + * library code initialized after the process becomes multi-threaded + * cannot use these features without accepting registration latency. */ + __syscall(SYS_membarrier, MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, 0); +} + +weak_alias(__membarrier, membarrier); diff --git a/system/lib/libc/musl/src/linux/memfd_create.c b/system/lib/libc/musl/src/linux/memfd_create.c new file mode 100644 index 0000000000000..1649fe5548a07 --- /dev/null +++ b/system/lib/libc/musl/src/linux/memfd_create.c @@ -0,0 +1,8 @@ +#define _GNU_SOURCE 1 +#include +#include "syscall.h" + +int memfd_create(const char *name, unsigned flags) +{ + return syscall(SYS_memfd_create, name, flags); +} diff --git a/system/lib/libc/musl/src/linux/mlock2.c b/system/lib/libc/musl/src/linux/mlock2.c new file mode 100644 index 0000000000000..10132742d0605 --- /dev/null +++ b/system/lib/libc/musl/src/linux/mlock2.c @@ -0,0 +1,10 @@ +#define _GNU_SOURCE 1 +#include +#include "syscall.h" + +int mlock2(const void *addr, size_t len, unsigned flags) +{ + if (flags == 0) + return mlock(addr, len); + return syscall(SYS_mlock2, addr, len, flags); +} diff --git a/system/lib/libc/musl/src/linux/name_to_handle_at.c b/system/lib/libc/musl/src/linux/name_to_handle_at.c new file mode 100644 index 0000000000000..cd4075bd7ebf8 --- /dev/null +++ b/system/lib/libc/musl/src/linux/name_to_handle_at.c @@ -0,0 +1,10 @@ +#define _GNU_SOURCE +#include +#include "syscall.h" + +int name_to_handle_at(int dirfd, const char *pathname, + struct file_handle *handle, int *mount_id, int flags) +{ + return syscall(SYS_name_to_handle_at, dirfd, + pathname, handle, mount_id, flags); +} diff --git a/system/lib/libc/musl/src/linux/open_by_handle_at.c b/system/lib/libc/musl/src/linux/open_by_handle_at.c new file mode 100644 index 0000000000000..1c9b6a2be4df8 --- /dev/null +++ b/system/lib/libc/musl/src/linux/open_by_handle_at.c @@ -0,0 +1,8 @@ +#define _GNU_SOURCE +#include +#include "syscall.h" + +int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags) +{ + return syscall(SYS_open_by_handle_at, mount_fd, handle, flags); +} diff --git a/system/lib/libc/musl/src/linux/ppoll.c b/system/lib/libc/musl/src/linux/ppoll.c index 9e262477ba93d..e614600ab8b72 100644 --- a/system/lib/libc/musl/src/linux/ppoll.c +++ b/system/lib/libc/musl/src/linux/ppoll.c @@ -1,10 +1,26 @@ #define _GNU_SOURCE #include #include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask) { + time_t s = to ? to->tv_sec : 0; + long ns = to ? to->tv_nsec : 0; +#ifdef SYS_ppoll_time64 + int r = -ENOSYS; + if (SYS_ppoll == SYS_ppoll_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_ppoll_time64, fds, n, + to ? ((long long[]){s, ns}) : 0, + mask, _NSIG/8); + if (SYS_ppoll == SYS_ppoll_time64 || r != -ENOSYS) + return __syscall_ret(r); + s = CLAMP(s); +#endif return syscall_cp(SYS_ppoll, fds, n, - to ? (struct timespec []){*to} : 0, mask, _NSIG/8); + to ? ((long[]){s, ns}) : 0, mask, _NSIG/8); } diff --git a/system/lib/libc/musl/src/linux/prlimit.c b/system/lib/libc/musl/src/linux/prlimit.c index 0fe28e10664e9..3df9ffba7af84 100644 --- a/system/lib/libc/musl/src/linux/prlimit.c +++ b/system/lib/libc/musl/src/linux/prlimit.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include "syscall.h" -#include "libc.h" #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0) @@ -24,4 +23,4 @@ int prlimit(pid_t pid, int resource, const struct rlimit *new_limit, struct rlim } #undef prlimit64 -LFS64(prlimit); +weak_alias(prlimit, prlimit64); diff --git a/system/lib/libc/musl/src/linux/ptrace.c b/system/lib/libc/musl/src/linux/ptrace.c index 83b8022beefa8..a3f393d956b3c 100644 --- a/system/lib/libc/musl/src/linux/ptrace.c +++ b/system/lib/libc/musl/src/linux/ptrace.c @@ -7,14 +7,18 @@ long ptrace(int req, ...) { va_list ap; pid_t pid; - void *addr, *data, *addr2; + void *addr, *data, *addr2 = 0; long ret, result; va_start(ap, req); pid = va_arg(ap, pid_t); addr = va_arg(ap, void *); data = va_arg(ap, void *); - addr2 = va_arg(ap, void *); + /* PTRACE_{READ,WRITE}{DATA,TEXT} (16...19) are specific to SPARC. */ +#ifdef PTRACE_READDATA + if ((unsigned)req - PTRACE_READDATA < 4) + addr2 = va_arg(ap, void *); +#endif va_end(ap); if (req-1U < 3) data = &result; diff --git a/system/lib/libc/musl/src/linux/sbrk.c b/system/lib/libc/musl/src/linux/sbrk.c index 909d825b88dee..8e3a9b6645d68 100644 --- a/system/lib/libc/musl/src/linux/sbrk.c +++ b/system/lib/libc/musl/src/linux/sbrk.c @@ -1,4 +1,6 @@ #if !__EMSCRIPTEN__ /* Emscripten controls sbrk itself */ +#define _BSD_SOURCE +#include #include #include #include "syscall.h" diff --git a/system/lib/libc/musl/src/linux/sendfile.c b/system/lib/libc/musl/src/linux/sendfile.c index d63f4197bb8b8..9afe6dd61c203 100644 --- a/system/lib/libc/musl/src/linux/sendfile.c +++ b/system/lib/libc/musl/src/linux/sendfile.c @@ -1,10 +1,9 @@ #include #include "syscall.h" -#include "libc.h" ssize_t sendfile(int out_fd, int in_fd, off_t *ofs, size_t count) { return syscall(SYS_sendfile, out_fd, in_fd, ofs, count); } -LFS64(sendfile); +weak_alias(sendfile, sendfile64); diff --git a/system/lib/libc/musl/src/linux/setfsgid.c b/system/lib/libc/musl/src/linux/setfsgid.c index ad8042250360c..e29d9c006906e 100644 --- a/system/lib/libc/musl/src/linux/setfsgid.c +++ b/system/lib/libc/musl/src/linux/setfsgid.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int setfsgid(gid_t gid) { diff --git a/system/lib/libc/musl/src/linux/setfsuid.c b/system/lib/libc/musl/src/linux/setfsuid.c index 86358731dc9c1..1bae44186fdb7 100644 --- a/system/lib/libc/musl/src/linux/setfsuid.c +++ b/system/lib/libc/musl/src/linux/setfsuid.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int setfsuid(uid_t uid) { diff --git a/system/lib/libc/musl/src/linux/setgroups.c b/system/lib/libc/musl/src/linux/setgroups.c index 1248fdbfdc83c..47142f141ff57 100644 --- a/system/lib/libc/musl/src/linux/setgroups.c +++ b/system/lib/libc/musl/src/linux/setgroups.c @@ -1,8 +1,36 @@ #define _GNU_SOURCE #include +#include #include "syscall.h" +#include "libc.h" + +struct ctx { + size_t count; + const gid_t *list; + int ret; +}; + +static void do_setgroups(void *p) +{ + struct ctx *c = p; + if (c->ret<0) return; + int ret = __syscall(SYS_setgroups, c->count, c->list); + if (ret && !c->ret) { + /* If one thread fails to set groups after another has already + * succeeded, forcibly killing the process is the only safe + * thing to do. State is inconsistent and dangerous. Use + * SIGKILL because it is uncatchable. */ + __block_all_sigs(0); + __syscall(SYS_kill, __syscall(SYS_getpid), SIGKILL); + } + c->ret = ret; +} int setgroups(size_t count, const gid_t list[]) { - return syscall(SYS_setgroups, count, list); + /* ret is initially nonzero so that failure of the first thread does not + * trigger the safety kill above. */ + struct ctx c = { .count = count, .list = list, .ret = 1 }; + __synccall(do_setgroups, &c); + return __syscall_ret(c.ret); } diff --git a/system/lib/libc/musl/src/linux/settimeofday.c b/system/lib/libc/musl/src/linux/settimeofday.c index 15c18c637972f..860fb5de97b00 100644 --- a/system/lib/libc/musl/src/linux/settimeofday.c +++ b/system/lib/libc/musl/src/linux/settimeofday.c @@ -1,8 +1,13 @@ #define _BSD_SOURCE #include +#include +#include #include "syscall.h" int settimeofday(const struct timeval *tv, const struct timezone *tz) { - return syscall(SYS_settimeofday, tv, 0); + if (!tv) return 0; + if (tv->tv_usec >= 1000000ULL) return __syscall_ret(-EINVAL); + return clock_settime(CLOCK_REALTIME, &((struct timespec){ + .tv_sec = tv->tv_sec, .tv_nsec = tv->tv_usec * 1000})); } diff --git a/system/lib/libc/musl/src/linux/sysinfo.c b/system/lib/libc/musl/src/linux/sysinfo.c index 4b5a798d0683e..db86476d0f263 100644 --- a/system/lib/libc/musl/src/linux/sysinfo.c +++ b/system/lib/libc/musl/src/linux/sysinfo.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int __lsysinfo(struct sysinfo *info) { diff --git a/system/lib/libc/musl/src/linux/timerfd.c b/system/lib/libc/musl/src/linux/timerfd.c index 62cc277365fbe..5bdfaf1656919 100644 --- a/system/lib/libc/musl/src/linux/timerfd.c +++ b/system/lib/libc/musl/src/linux/timerfd.c @@ -1,6 +1,9 @@ #include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) + int timerfd_create(int clockid, int flags) { return syscall(SYS_timerfd_create, clockid, flags); @@ -8,10 +11,49 @@ int timerfd_create(int clockid, int flags) int timerfd_settime(int fd, int flags, const struct itimerspec *new, struct itimerspec *old) { +#ifdef SYS_timerfd_settime64 + time_t is = new->it_interval.tv_sec, vs = new->it_value.tv_sec; + long ins = new->it_interval.tv_nsec, vns = new->it_value.tv_nsec; + int r = -ENOSYS; + if (SYS_timerfd_settime == SYS_timerfd_settime64 + || !IS32BIT(is) || !IS32BIT(vs) || (sizeof(time_t)>4 && old)) + r = __syscall(SYS_timerfd_settime64, fd, flags, + ((long long[]){is, ins, vs, vns}), old); + if (SYS_timerfd_settime == SYS_timerfd_settime64 || r!=-ENOSYS) + return __syscall_ret(r); + if (!IS32BIT(is) || !IS32BIT(vs)) + return __syscall_ret(-ENOTSUP); + long old32[4]; + r = __syscall(SYS_timerfd_settime, fd, flags, + ((long[]){is, ins, vs, vns}), old32); + if (!r && old) { + old->it_interval.tv_sec = old32[0]; + old->it_interval.tv_nsec = old32[1]; + old->it_value.tv_sec = old32[2]; + old->it_value.tv_nsec = old32[3]; + } + return __syscall_ret(r); +#endif return syscall(SYS_timerfd_settime, fd, flags, new, old); } int timerfd_gettime(int fd, struct itimerspec *cur) { +#ifdef SYS_timerfd_gettime64 + int r = -ENOSYS; + if (sizeof(time_t) > 4) + r = __syscall(SYS_timerfd_gettime64, fd, cur); + if (SYS_timerfd_gettime == SYS_timerfd_gettime64 || r!=-ENOSYS) + return __syscall_ret(r); + long cur32[4]; + r = __syscall(SYS_timerfd_gettime, fd, cur32); + if (!r) { + cur->it_interval.tv_sec = cur32[0]; + cur->it_interval.tv_nsec = cur32[1]; + cur->it_value.tv_sec = cur32[2]; + cur->it_value.tv_nsec = cur32[3]; + } + return __syscall_ret(r); +#endif return syscall(SYS_timerfd_gettime, fd, cur); } diff --git a/system/lib/libc/musl/src/linux/utimes.c b/system/lib/libc/musl/src/linux/utimes.c index b814c88b2fdef..6ca025d95a325 100644 --- a/system/lib/libc/musl/src/linux/utimes.c +++ b/system/lib/libc/musl/src/linux/utimes.c @@ -2,8 +2,6 @@ #include "fcntl.h" #include "syscall.h" -int __futimesat(int, const char *, const struct timeval [2]); - int utimes(const char *path, const struct timeval times[2]) { return __futimesat(AT_FDCWD, path, times); diff --git a/system/lib/libc/musl/src/linux/wait4.c b/system/lib/libc/musl/src/linux/wait4.c index 97f12cc524685..83650e34a860c 100644 --- a/system/lib/libc/musl/src/linux/wait4.c +++ b/system/lib/libc/musl/src/linux/wait4.c @@ -1,9 +1,39 @@ #define _GNU_SOURCE #include #include +#include +#include #include "syscall.h" -pid_t wait4(pid_t pid, int *status, int options, struct rusage *usage) +pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru) { - return syscall(SYS_wait4, pid, status, options, usage); + int r; +#ifdef SYS_wait4_time64 + if (ru) { + long long kru64[18]; + r = __syscall(SYS_wait4_time64, pid, status, options, kru64); + if (!r) { + ru->ru_utime = (struct timeval) + { .tv_sec = kru64[0], .tv_usec = kru64[1] }; + ru->ru_stime = (struct timeval) + { .tv_sec = kru64[2], .tv_usec = kru64[3] }; + char *slots = (char *)&ru->ru_maxrss; + for (int i=0; i<14; i++) + *(long *)(slots + i*sizeof(long)) = kru64[4+i]; + } + if (SYS_wait4_time64 == SYS_wait4 || r != -ENOSYS) + return __syscall_ret(r); + } +#endif + char *dest = ru ? (char *)&ru->ru_maxrss - 4*sizeof(long) : 0; + r = __syscall(SYS_wait4, pid, status, options, dest); + if (r>0 && ru && sizeof(time_t) > sizeof(long)) { + long kru[4]; + memcpy(kru, dest, 4*sizeof(long)); + ru->ru_utime = (struct timeval) + { .tv_sec = kru[0], .tv_usec = kru[1] }; + ru->ru_stime = (struct timeval) + { .tv_sec = kru[2], .tv_usec = kru[3] }; + } + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/locale/__lctrans.c b/system/lib/libc/musl/src/locale/__lctrans.c index 107fe14a3a36d..9fbe762ad020f 100644 --- a/system/lib/libc/musl/src/locale/__lctrans.c +++ b/system/lib/libc/musl/src/locale/__lctrans.c @@ -1,6 +1,5 @@ #include #include "locale_impl.h" -#include "libc.h" static const char *dummy(const char *msg, const struct __locale_map *lm) { diff --git a/system/lib/libc/musl/src/locale/catclose.c b/system/lib/libc/musl/src/locale/catclose.c index 02cd3e5c9c7a7..6f4f77037d2f1 100644 --- a/system/lib/libc/musl/src/locale/catclose.c +++ b/system/lib/libc/musl/src/locale/catclose.c @@ -1,6 +1,16 @@ +#define _BSD_SOURCE #include +#include +#include +#include + +#define V(p) be32toh(*(uint32_t *)(p)) int catclose (nl_catd catd) { +#ifndef __EMSCRIPTEN__ + char *map = (char *)catd; + munmap(map, V(map+8)+20); +#endif return 0; } diff --git a/system/lib/libc/musl/src/locale/catgets.c b/system/lib/libc/musl/src/locale/catgets.c index bbee8986fc581..b7caaf01e3c7b 100644 --- a/system/lib/libc/musl/src/locale/catgets.c +++ b/system/lib/libc/musl/src/locale/catgets.c @@ -1,6 +1,44 @@ +#define _BSD_SOURCE #include +#include +#include +#include +#include + +#ifndef __EMSCRIPTEN__ +#define V(p) be32toh(*(uint32_t *)(p)) + +static int cmp(const void *a, const void *b) +{ + uint32_t x = V(a), y = V(b); + return xy ? 1 : 0; +} +#endif char *catgets (nl_catd catd, int set_id, int msg_id, const char *s) { +#ifdef __EMSCRIPTEN__ return (char *)s; +#else + const char *map = (const char *)catd; + uint32_t nsets = V(map+4); + const char *sets = map+20; + const char *msgs = map+20+V(map+12); + const char *strings = map+20+V(map+16); + uint32_t set_id_be = htobe32(set_id); + uint32_t msg_id_be = htobe32(msg_id); + const char *set = bsearch(&set_id_be, sets, nsets, 12, cmp); + if (!set) { + errno = ENOMSG; + return (char *)s; + } + uint32_t nmsgs = V(set+4); + msgs += 12*V(set+8); + const char *msg = bsearch(&msg_id_be, msgs, nmsgs, 12, cmp); + if (!msg) { + errno = ENOMSG; + return (char *)s; + } + return (char *)(strings + V(msg+8)); +#endif } diff --git a/system/lib/libc/musl/src/locale/catopen.c b/system/lib/libc/musl/src/locale/catopen.c index 4423c4d9e8720..5bf2e9031dadf 100644 --- a/system/lib/libc/musl/src/locale/catopen.c +++ b/system/lib/libc/musl/src/locale/catopen.c @@ -1,6 +1,83 @@ +#define _BSD_SOURCE #include +#include +#include +#include +#include +#include +#include +#include +#include "libc.h" -nl_catd catopen (const char *name, int oflag) +#ifndef __EMSCRIPTEN__ +#define V(p) be32toh(*(uint32_t *)(p)) + +static nl_catd do_catopen(const char *name) +{ + size_t size; + const unsigned char *map = __map_file(name, &size); + /* Size recorded in the file must match file size; otherwise + * the information needed to unmap the file will be lost. */ + if (!map || V(map) != 0xff88ff89 || 20+V(map+8) != size) { + if(map) munmap((void *)map, size); + errno = ENOENT; + return (nl_catd)-1; + } + return (nl_catd)map; +} +#endif + +nl_catd catopen(const char *name, int oflag) { +#ifndef __EMSCRIPTEN__ + nl_catd catd; + + if (strchr(name, '/')) return do_catopen(name); + + char buf[PATH_MAX]; + size_t i; + const char *path, *lang, *p, *z; + if (libc.secure || !(path = getenv("NLSPATH"))) { + errno = ENOENT; + return (nl_catd)-1; + } + lang = oflag ? nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)) : getenv("LANG"); + if (!lang) lang = ""; + for (p=path; *p; p=z) { + i = 0; + z = __strchrnul(p, ':'); + for (; p= sizeof buf - i) { + break; + } + memcpy(buf+i, v, l); + i += l; + } + if (!*z && (p #include #include +#include #include #include "locale_impl.h" -#include "libc.h" #include "atomic.h" +#include "pleval.h" +#include "lock.h" +#include "fork_impl.h" + +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc undef +#define free undef struct binding { struct binding *next; @@ -32,16 +40,18 @@ static char *gettextdir(const char *domainname, size_t *dirlen) return 0; } +static volatile int lock[1]; +volatile int *const __gettext_lockptr = lock; + char *bindtextdomain(const char *domainname, const char *dirname) { - static volatile int lock[2]; struct binding *p, *q; if (!domainname) return 0; if (!dirname) return gettextdir(domainname, &(size_t){0}); - size_t domlen = strlen(domainname); - size_t dirlen = strlen(dirname); + size_t domlen = strnlen(domainname, NAME_MAX+1); + size_t dirlen = strnlen(dirname, PATH_MAX); if (domlen > NAME_MAX || dirlen >= PATH_MAX) { errno = EINVAL; return 0; @@ -57,7 +67,7 @@ char *bindtextdomain(const char *domainname, const char *dirname) } if (!p) { - p = malloc(sizeof *p + domlen + dirlen + 2); + p = calloc(sizeof *p + domlen + dirlen + 2, 1); if (!p) { UNLOCK(lock); return 0; @@ -74,7 +84,7 @@ char *bindtextdomain(const char *domainname, const char *dirname) a_store(&p->active, 1); for (q=bindings; q; q=q->next) { - if (!strcmp(p->domainname, domainname) && q != p) + if (!strcmp(q->domainname, domainname) && q != p) a_store(&q->active, 0); } @@ -98,9 +108,11 @@ struct msgcat { struct msgcat *next; const void *map; size_t map_size; - void *volatile plural_rule; - volatile int nplurals; - char name[]; + const char *plural_rule; + int nplurals; + struct binding *binding; + const struct __locale_map *lm; + int cat; }; static char *dummy_gettextdomain() @@ -110,89 +122,95 @@ static char *dummy_gettextdomain() weak_alias(dummy_gettextdomain, __gettextdomain); -const unsigned char *__map_file(const char *, size_t *); -int __munmap(void *, size_t); -unsigned long __pleval(const char *, unsigned long); - char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n, int category) { static struct msgcat *volatile cats; struct msgcat *p; struct __locale_struct *loc = CURRENT_LOCALE; const struct __locale_map *lm; - const char *dirname, *locname, *catname; - size_t dirlen, loclen, catlen, domlen; + size_t domlen; + struct binding *q; + int old_errno = errno; if ((unsigned)category >= LC_ALL) goto notrans; if (!domainname) domainname = __gettextdomain(); - domlen = strlen(domainname); + domlen = strnlen(domainname, NAME_MAX+1); if (domlen > NAME_MAX) goto notrans; - dirname = gettextdir(domainname, &dirlen); - if (!dirname) goto notrans; + for (q=bindings; q; q=q->next) + if (!strcmp(q->domainname, domainname) && q->active) + break; + if (!q) goto notrans; lm = loc->cat[category]; if (!lm) { notrans: + errno = old_errno; return (char *) ((n == 1) ? msgid1 : msgid2); } - locname = lm->name; - - catname = catnames[category]; - catlen = catlens[category]; - loclen = strlen(locname); - - size_t namelen = dirlen+1 + loclen+1 + catlen+1 + domlen+3; - char name[namelen+1], *s = name; - - memcpy(s, dirname, dirlen); - s[dirlen] = '/'; - s += dirlen + 1; - memcpy(s, locname, loclen); - s[loclen] = '/'; - s += loclen + 1; - memcpy(s, catname, catlen); - s[catlen] = '/'; - s += catlen + 1; - memcpy(s, domainname, domlen); - s[domlen] = '.'; - s[domlen+1] = 'm'; - s[domlen+2] = 'o'; - s[domlen+3] = 0; for (p=cats; p; p=p->next) - if (!strcmp(p->name, name)) + if (p->binding == q && p->lm == lm && p->cat == category) break; if (!p) { + const char *dirname, *locname, *catname, *modname, *locp; + size_t dirlen, loclen, catlen, modlen, alt_modlen; void *old_cats; size_t map_size; - const void *map = __map_file(name, &map_size); + + dirname = q->dirname; + locname = lm->name; + catname = catnames[category]; + + dirlen = q->dirlen; + loclen = strlen(locname); + catlen = catlens[category]; + + /* Logically split @mod suffix from locale name. */ + modname = memchr(locname, '@', loclen); + if (!modname) modname = locname + loclen; + alt_modlen = modlen = loclen - (modname-locname); + loclen = modname-locname; + + /* Drop .charset identifier; it is not used. */ + const char *csp = memchr(locname, '.', loclen); + if (csp) loclen = csp-locname; + + char name[dirlen+1 + loclen+modlen+1 + catlen+1 + domlen+3 + 1]; + const void *map; + + for (;;) { + snprintf(name, sizeof name, "%s/%.*s%.*s/%s/%s.mo\0", + dirname, (int)loclen, locname, + (int)alt_modlen, modname, catname, domainname); + if ((map = __map_file(name, &map_size))) break; + + /* Try dropping @mod, _YY, then both. */ + if (alt_modlen) { + alt_modlen = 0; + } else if ((locp = memchr(locname, '_', loclen))) { + loclen = locp-locname; + alt_modlen = modlen; + } else { + break; + } + } if (!map) goto notrans; - p = malloc(sizeof *p + namelen + 1); + + p = calloc(sizeof *p, 1); if (!p) { __munmap((void *)map, map_size); goto notrans; } + p->cat = category; + p->binding = q; + p->lm = lm; p->map = map; p->map_size = map_size; - memcpy(p->name, name, namelen+1); - do { - old_cats = cats; - p->next = old_cats; - } while (a_cas_p(&cats, old_cats, p) != old_cats); - } - - const char *trans = __mo_lookup(p->map, p->map_size, msgid1); - if (!trans) goto notrans; - - /* Non-plural-processing gettext forms pass a null pointer as - * msgid2 to request that dcngettext suppress plural processing. */ - if (!msgid2) return (char *)trans; - if (!p->plural_rule) { const char *rule = "n!=1;"; unsigned long np = 2; const char *r = __mo_lookup(p->map, p->map_size, ""); @@ -216,10 +234,22 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, rule = r+7; } } - a_store(&p->nplurals, np); - a_cas_p(&p->plural_rule, 0, (void *)rule); + p->nplurals = np; + p->plural_rule = rule; + + do { + old_cats = cats; + p->next = old_cats; + } while (a_cas_p(&cats, old_cats, p) != old_cats); } - if (p->nplurals) { + + const char *trans = __mo_lookup(p->map, p->map_size, msgid1); + if (!trans) goto notrans; + + /* Non-plural-processing gettext forms pass a null pointer as + * msgid2 to request that dcngettext suppress plural processing. */ + + if (msgid2 && p->nplurals) { unsigned long plural = __pleval(p->plural_rule, n); if (plural > p->nplurals) goto notrans; while (plural--) { @@ -230,6 +260,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, trans += l+1; } } + errno = old_errno; return (char *)trans; } diff --git a/system/lib/libc/musl/src/locale/freelocale.c b/system/lib/libc/musl/src/locale/freelocale.c index c2ae1a3180693..385d12069d573 100644 --- a/system/lib/libc/musl/src/locale/freelocale.c +++ b/system/lib/libc/musl/src/locale/freelocale.c @@ -1,8 +1,10 @@ #include #include "locale_impl.h" -#include "libc.h" -int __loc_is_allocated(locale_t); +#define malloc undef +#define calloc undef +#define realloc undef +#define free __libc_free void freelocale(locale_t l) { diff --git a/system/lib/libc/musl/src/locale/gb18030.h b/system/lib/libc/musl/src/locale/gb18030.h index 5aceb32900c0e..8f300e9b69817 100644 --- a/system/lib/libc/musl/src/locale/gb18030.h +++ b/system/lib/libc/musl/src/locale/gb18030.h @@ -17,46 +17,47 @@ 20417,20418,20422,20423,20424,20425,20427,20428,20429,20434,20435,20436,20437, 20438,20441,20443,20448,20450,20452,20453,20455,20459,20460,20464,20466,20468, 20469,20470,20471,20473,20475,20476,20477,20479,20480,20481,20482,20483,20484, -20485,20486,20487,20488,20489,20490,20491,20494,20496,20497,20499,20501,20502, -20503,20507,20509,20510,20512,20514,20515,20516,20519,20523,20527,20528,20529, -20530,20531,20532,20533,20534,20535,20536,20537,20539,20541,20543,20544,20545, -20546,20548,20549,20550,20553,20554,20555,20557,20560,20561,20562,20563,20564, -20566,20567,20568,20569,20571,20573,20574,20575,20576,20577,20578,20579,20580, -20582,20583,20584,20585,20586,20587,20589,20590,20591,20592,20593,20594,20595, -20596,20597,20600,20601,20602,20604,20605,20609,20610,20611,20612,20614,20615, -20617,20618,20619,20620,20622,20623,20624,20625,20626,20627,20628,20629,20630, -20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,20642,20644, -20646,20650,20651,20653,20654,20655,20656,20657,20659,20660,20661,20662,20663, -20664,20665,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,20678, -20679,20680,20681,20682,20683,20684,20685,20686,20688,20689,20690,20691,20692, -20693,20695,20696,20697,20699,20700,20701,20702,20703,20704,20705,20706,20707, -20708,20709,20712,20713,20714,20715,20719,20720,20721,20722,20724,20726,20727, -20728,20729,20730,20732,20733,20734,20735,20736,20737,20738,20739,20740,20741, -20744,20745,20746,20748,20749,20750,20751,20752,20753,20755,20756,20757,20758, -20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20770,20771,20772, -20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785, -20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,20798, -20802,20807,20810,20812,20814,20815,20816,20818,20819,20823,20824,20825,20827, -20829,20830,20831,20832,20833,20835,20836,20838,20839,20841,20842,20847,20850, -20858,20862,20863,20867,20868,20870,20871,20874,20875,20878,20879,20880,20881, -20883,20884,20888,20890,20893,20894,20895,20897,20899,20902,20903,20904,20905, -20906,20909,20910,20916,20920,20921,20922,20926,20927,20929,20930,20931,20933, -20936,20938,20941,20942,20944,20946,20947,20948,20949,20950,20951,20952,20953, -20954,20956,20958,20959,20962,20963,20965,20966,20967,20968,20969,20970,20972, -20974,20977,20978,20980,20983,20990,20996,20997,21001,21003,21004,21007,21008, -21011,21012,21013,21020,21022,21023,21025,21026,21027,21029,21030,21031,21034, -21036,21039,21041,21042,21044,21045,21052,21054,21060,21061,21062,21063,21064, -21065,21067,21070,21071,21074,21075,21077,21079,21080,21081,21082,21083,21085, -21087,21088,21090,21091,21092,21094,21096,21099,21100,21101,21102,21104,21105, -21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21118,21120,21123, -21124,21125,21126,21127,21129,21130,21131,21132,21133,21134,21135,21137,21138, -21140,21141,21142,21143,21144,21145,21146,21148,21156,21157,21158,21159,21166, -21167,21168,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,21184, -21185,21186,21188,21189,21190,21192,21194,21196,21197,21198,21199,21201,21203, -21204,21205,21207,21209,21210,21211,21212,21213,21214,21216,21217,21218,21219, -21221,21222,21223,21224,21225,21226,21227,21228,21229,21230,21231,21233,21234, -21235,21236,21237,21238,21239,21240,21243,21244,21245,21249,21250,21251,21252, -21255,21257,21258,21259,21260,21262,21265,21266,21267,21268,21272,21275,21276, +20485,20486,20487,20488,20489,20490,20491,20494, +20496,20497,20499,20501,20502,20503,20507,20509,20510,20512,20514,20515,20516, +20519,20523,20527,20528,20529,20530,20531,20532,20533,20534,20535,20536,20537, +20539,20541,20543,20544,20545,20546,20548,20549,20550,20553,20554,20555,20557, +20560,20561,20562,20563,20564,20566,20567,20568,20569,20571,20573,20574,20575, +20576,20577,20578,20579,20580,20582,20583,20584,20585,20586,20587,20589,20590, +20591,20592,20593,20594,20595,20596,20597,20600,20601,20602,20604,20605,20609, +20610,20611,20612,20614,20615,20617,20618,20619,20620,20622,20623,20624,20625, +20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638, +20639,20640,20641,20642,20644,20646,20650,20651,20653,20654,20655,20656,20657, +20659,20660,20661,20662,20663,20664,20665,20668,20669,20670,20671,20672,20673, +20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686, +20688,20689,20690,20691,20692,20693,20695,20696,20697,20699,20700,20701,20702, +20703,20704,20705,20706,20707,20708,20709,20712,20713,20714,20715,20719,20720, +20721,20722,20724,20726,20727,20728,20729,20730,20732,20733,20734,20735,20736, +20737,20738,20739,20740,20741,20744,20745,20746,20748,20749,20750,20751,20752, +20753,20755,20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766, +20767,20768,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,20780, +20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793, +20794,20795,20796,20797,20798,20802,20807,20810,20812,20814,20815,20816,20818, +20819,20823,20824,20825,20827,20829,20830,20831,20832, +20833,20835,20836,20838,20839,20841,20842,20847,20850,20858,20862,20863,20867, +20868,20870,20871,20874,20875,20878,20879,20880,20881,20883,20884,20888,20890, +20893,20894,20895,20897,20899,20902,20903,20904,20905,20906,20909,20910,20916, +20920,20921,20922,20926,20927,20929,20930,20931,20933,20936,20938,20941,20942, +20944,20946,20947,20948,20949,20950,20951,20952,20953,20954,20956,20958,20959, +20962,20963,20965,20966,20967,20968,20969,20970,20972,20974,20977,20978,20980, +20983,20990,20996,20997,21001,21003,21004,21007,21008,21011,21012,21013,21020, +21022,21023,21025,21026,21027,21029,21030,21031,21034,21036,21039,21041,21042, +21044,21045,21052,21054,21060,21061,21062,21063,21064,21065,21067,21070,21071, +21074,21075,21077,21079,21080,21081,21082,21083,21085,21087,21088,21090,21091, +21092,21094,21096,21099,21100,21101,21102,21104,21105,21107,21108,21109,21110, +21111,21112,21113,21114,21115,21116,21118,21120,21123,21124,21125,21126,21127, +21129,21130,21131,21132,21133,21134,21135,21137,21138,21140,21141,21142,21143, +21144,21145,21146,21148,21156,21157,21158,21159,21166,21167,21168,21172,21173, +21174,21175,21176,21177,21178,21179,21180,21181,21184,21185,21186,21188,21189, +21190,21192,21194,21196,21197,21198,21199,21201,21203,21204,21205,21207,21209, +21210,21211,21212,21213,21214,21216,21217,21218,21219,21221,21222,21223,21224, +21225,21226,21227,21228,21229,21230,21231,21233,21234,21235,21236,21237,21238, +21239,21240,21243,21244,21245,21249,21250,21251,21252,21255,21257,21258,21259, +21260,21262,21265,21266,21267,21268,21272,21275,21276, 21278,21279,21282,21284,21285,21287,21288,21289,21291,21292,21293,21295,21296, 21297,21298,21299,21300,21301,21302,21303,21304,21308,21309,21312,21314,21316, 21318,21323,21324,21325,21328,21332,21336,21337,21339,21341,21349,21352,21354, @@ -76,243 +77,247 @@ 21740,21743,21744,21745,21748,21749,21750,21751,21752,21753,21755,21758,21760, 21762,21763,21764,21765,21768,21770,21771,21772,21773,21774,21778,21779,21781, 21782,21783,21784,21785,21786,21788,21789,21790,21791,21793,21797,21798,21800, -21801,21803,21805,21810,21812,21813,21814,21816,21817,21818,21819,21821,21824, -21826,21829,21831,21832,21835,21836,21837,21838,21839,21841,21842,21843,21844, -21847,21848,21849,21850,21851,21853,21854,21855,21856,21858,21859,21864,21865, -21867,21871,21872,21873,21874,21875,21876,21881,21882,21885,21887,21893,21894, -21900,21901,21902,21904,21906,21907,21909,21910,21911,21914,21915,21918,21920, -21921,21922,21923,21924,21925,21926,21928,21929,21930,21931,21932,21933,21934, -21935,21936,21938,21940,21942,21944,21946,21948,21951,21952,21953,21954,21955, -21958,21959,21960,21962,21963,21966,21967,21968,21973,21975,21976,21977,21978, -21979,21982,21984,21986,21991,21993,21997,21998,22000,22001,22004,22006,22008, -22009,22010,22011,22012,22015,22018,22019,22020,22021,22022,22023,22026,22027, -22029,22032,22033,22034,22035,22036,22037,22038,22039,22041,22042,22044,22045, -22048,22049,22050,22053,22054,22056,22057,22058,22059,22062,22063,22064,22067, -22069,22071,22072,22074,22076,22077,22078,22080,22081,22082,22083,22084,22085, -22086,22087,22088,22089,22090,22091,22095,22096,22097,22098,22099,22101,22102, -22106,22107,22109,22110,22111,22112,22113,22115,22117,22118,22119,22125,22126, -22127,22128,22130,22131,22132,22133,22135,22136,22137,22138,22141,22142,22143, -22144,22145,22146,22147,22148,22151,22152,22153,22154,22155,22156,22157,22160, -22161,22162,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174, -22175,22176,22177,22178,22180,22181,22182,22183,22184,22185,22186,22187,22188, -22189,22190,22192,22193,22194,22195,22196,22197,22198,22200,22201,22202,22203, -22205,22206,22207,22208,22209,22210,22211,22212,22213,22214,22215,22216,22217, -22219,22220,22221,22222,22223,22224,22225,22226,22227,22229,22230,22232,22233, -22236,22243,22245,22246,22247,22248,22249,22250,22252,22254,22255,22258,22259, -22262,22263,22264,22267,22268,22272,22273,22274,22277,22279,22283,22284,22285, -22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,22298, -22299,22301,22302,22304,22305,22306,22308,22309,22310,22311,22315,22321,22322, -22324,22325,22326,22327,22328,22332,22333,22335,22337,22339,22340,22341,22342, -22344,22345,22347,22354,22355,22356,22357,22358,22360,22361,22370,22371,22373, -22375,22380,22382,22384,22385,22386,22388,22389,22392,22393,22394,22397,22398, -22399,22400,22401,22407,22408,22409,22410,22413,22414,22415,22416,22417,22420, -22421,22422,22423,22424,22425,22426,22428,22429,22430,22431,22437,22440,22442, -22444,22447,22448,22449,22451,22453,22454,22455,22457,22458,22459,22460,22461, -22462,22463,22464,22465,22468,22469,22470,22471,22472,22473,22474,22476,22477, -22480,22481,22483,22486,22487,22491,22492,22494,22497,22498,22499,22501,22502, -22503,22504,22505,22506,22507,22508,22510,22512,22513,22514,22515,22517,22518, -22519,22523,22524,22526,22527,22529,22531,22532,22533,22536,22537,22538,22540, -22542,22543,22544,22546,22547,22548,22550,22551,22552,22554,22555,22556,22557, -22559,22562,22563,22565,22566,22567,22568,22569,22571,22572,22573,22574,22575, -22577,22578,22579,22580,22582,22583,22584,22585,22586,22587,22588,22589,22590, -22591,22592,22593,22594,22595,22597,22598,22599,22600,22601,22602,22603,22606, -22607,22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623, -22624,22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639, -22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652, -22653,22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671, -22672,22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690, -22691,22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705, -22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719, -22720,22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734, -22735,22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749, -22750,22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765, -22767,22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783, -22784,22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801, -22802,22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824, -22828,22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853, -22854,22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879, -22881,22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895, -22896,22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921, -22923,22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941, -22943,22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965, -22966,22967,22968,22970,22972,22973,22975,22976,22977,22978,22979,22980,22981, -22983,22984,22985,22988,22989,22990,22991,22997,22998,23001,23003,23006,23007, -23008,23009,23010,23012,23014,23015,23017,23018,23019,23021,23022,23023,23024, -23025,23026,23027,23028,23029,23030,23031,23032,23034,23036,23037,23038,23040, -23042,23050,23051,23053,23054,23055,23056,23058,23060,23061,23062,23063,23065, -23066,23067,23069,23070,23073,23074,23076,23078,23079,23080,23082,23083,23084, -23085,23086,23087,23088,23091,23093,23095,23096,23097,23098,23099,23101,23102, -23103,23105,23106,23107,23108,23109,23111,23112,23115,23116,23117,23118,23119, -23120,23121,23122,23123,23124,23126,23127,23128,23129,23131,23132,23133,23134, -23135,23136,23137,23139,23140,23141,23142,23144,23145,23147,23148,23149,23150, -23151,23152,23153,23154,23155,23160,23161,23163,23164,23165,23166,23168,23169, -23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182, -23183,23184,23185,23187,23188,23189,23190,23191,23192,23193,23196,23197,23198, -23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,23211,23212, -23213,23214,23215,23216,23217,23220,23222,23223,23225,23226,23227,23228,23229, -23231,23232,23235,23236,23237,23238,23239,23240,23242,23243,23245,23246,23247, -23248,23249,23251,23253,23255,23257,23258,23259,23261,23262,23263,23266,23268, -23269,23271,23272,23274,23276,23277,23278,23279,23280,23282,23283,23284,23285, -23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298, -23299,23300,23301,23302,23303,23304,23306,23307,23308,23309,23310,23311,23312, -23313,23314,23315,23316,23317,23320,23321,23322,23323,23324,23325,23326,23327, -23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340, -23341,23342,23343,23344,23345,23347,23349,23350,23352,23353,23354,23355,23356, -23357,23358,23359,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370, -23371,23372,23373,23374,23375,23378,23382,23390,23392,23393,23399,23400,23403, -23405,23406,23407,23410,23412,23414,23415,23416,23417,23419,23420,23422,23423, -23426,23430,23434,23437,23438,23440,23441,23442,23444,23446,23455,23463,23464, -23465,23468,23469,23470,23471,23473,23474,23479,23482,23483,23484,23488,23489, -23491,23496,23497,23498,23499,23501,23502,23503,23505,23508,23509,23510,23511, -23512,23513,23514,23515,23516,23520,23522,23523,23526,23527,23529,23530,23531, -23532,23533,23535,23537,23538,23539,23540,23541,23542,23543,23549,23550,23552, -23554,23555,23557,23559,23560,23563,23564,23565,23566,23568,23570,23571,23575, -23577,23579,23582,23583,23584,23585,23587,23590,23592,23593,23594,23595,23597, -23598,23599,23600,23602,23603,23605,23606,23607,23619,23620,23622,23623,23628, -23629,23634,23635,23636,23638,23639,23640,23642,23643,23644,23645,23647,23650, -23652,23655,23656,23657,23658,23659,23660,23661,23664,23666,23667,23668,23669, -23670,23671,23672,23675,23676,23677,23678,23680,23683,23684,23685,23686,23687, -23689,23690,23691,23694,23695,23698,23699,23701,23709,23710,23711,23712,23713, -23716,23717,23718,23719,23720,23722,23726,23727,23728,23730,23732,23734,23737, -23738,23739,23740,23742,23744,23746,23747,23749,23750,23751,23752,23753,23754, -23756,23757,23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770, -23771,23772,23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790, -23791,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805, -23806,23807,23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823, -23824,23825,23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840, -23841,23842,23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859, -23861,23862,23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875, -23876,23877,23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892, -23893,23894,23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908, -23909,23910,23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926, -23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940, -23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953, -23954,23955,23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968, -23969,23970,23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981, -23982,23983,23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995, -23996,23997,23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009, -24010,24011,24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023, -24024,24025,24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053, -24054,24056,24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075, -24077,24078,24082,24083,24087,24094,24095,24096,24097,24098,24099,24100,24101, -24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117,24118,24121, -24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138,24139,24141, -24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154,24156,24157, -24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171,24172,24173, -24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195,24197,24200, -24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227,24228,24232, -24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250,24251,24252, -24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24267,24268, -24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284,24285,24286, -24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299,24300,24301, -24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316,24317,24325, -24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345,24346,24348, -24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368,24370,24371, -24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386,24387,24388, -24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,24401,24404, -24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424,24427,24430, -24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451,24454,24461, -24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479,24480,24482, -24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497,24498,24499, -24500,24502,24504,24505,24506,24507,24510,24511,24512,24513,24514,24519,24520, -24522,24523,24526,24531,24532,24533,24538,24539,24540,24542,24543,24546,24547, -24549,24550,24552,24553,24556,24559,24560,24562,24563,24564,24566,24567,24569, -24570,24572,24583,24584,24585,24587,24588,24592,24593,24595,24599,24600,24602, -24606,24607,24610,24611,24612,24620,24621,24622,24624,24625,24626,24627,24628, -24630,24631,24632,24633,24634,24637,24638,24640,24644,24645,24646,24647,24648, -24649,24650,24652,24654,24655,24657,24659,24660,24662,24663,24664,24667,24668, -24670,24671,24672,24673,24677,24678,24686,24689,24690,24692,24693,24695,24702, -24704,24705,24706,24709,24710,24711,24712,24714,24715,24718,24719,24720,24721, -24723,24725,24727,24728,24729,24732,24734,24737,24738,24740,24741,24743,24745, -24746,24750,24752,24755,24757,24758,24759,24761,24762,24765,24766,24767,24768, -24769,24770,24771,24772,24775,24776,24777,24780,24781,24782,24783,24784,24786, -24787,24788,24790,24791,24793,24795,24798,24801,24802,24803,24804,24805,24810, -24817,24818,24821,24823,24824,24827,24828,24829,24830,24831,24834,24835,24836, -24837,24839,24842,24843,24844,24848,24849,24850,24851,24852,24854,24855,24856, -24857,24859,24860,24861,24862,24865,24866,24869,24872,24873,24874,24876,24877, -24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,24890, -24891,24892,24893,24894,24896,24897,24898,24899,24900,24901,24902,24903,24905, -24907,24909,24911,24912,24914,24915,24916,24918,24919,24920,24921,24922,24923, -24924,24926,24927,24928,24929,24931,24932,24933,24934,24937,24938,24939,24940, -24941,24942,24943,24945,24946,24947,24948,24950,24952,24953,24954,24955,24956, -24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969, -24970,24972,24973,24975,24976,24977,24978,24979,24981,24982,24983,24984,24985, -24986,24987,24988,24990,24991,24992,24993,24994,24995,24996,24997,24998,25002, -25003,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25016,25017, -25018,25019,25020,25021,25023,25024,25025,25027,25028,25029,25030,25031,25033, -25036,25037,25038,25039,25040,25043,25045,25046,25047,25048,25049,25050,25051, -25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25063,25064,25065, -25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25078,25079, -25080,25081,25082,25083,25084,25085,25086,25088,25089,25090,25091,25092,25093, -25095,25097,25107,25108,25113,25116,25117,25118,25120,25123,25126,25127,25128, -25129,25131,25133,25135,25136,25137,25138,25141,25142,25144,25145,25146,25147, -25148,25154,25156,25157,25158,25162,25167,25168,25173,25174,25175,25177,25178, -25180,25181,25182,25183,25184,25185,25186,25188,25189,25192,25201,25202,25204, -25205,25207,25208,25210,25211,25213,25217,25218,25219,25221,25222,25223,25224, -25227,25228,25229,25230,25231,25232,25236,25241,25244,25245,25246,25251,25254, -25255,25257,25258,25261,25262,25263,25264,25266,25267,25268,25270,25271,25272, -25274,25278,25280,25281,25283,25291,25295,25297,25301,25309,25310,25312,25313, -25316,25322,25323,25328,25330,25333,25336,25337,25338,25339,25344,25347,25348, -25349,25350,25354,25355,25356,25357,25359,25360,25362,25363,25364,25365,25367, -25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395,25396, -25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415,25416, -25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436,25437, -25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459,25460, -25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478,25483, -25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502,25503, -25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533,25535, -25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555,25556, -25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573,25574, -25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593,25594, -25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614,25617, -25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636,25637, -25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654,25655, -25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677,25678, -25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693,25695, -25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710,25711, -25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726,25727, -25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743,25744, -25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762,25763, -25765,25766,25767,25768,25770,25771,25775,25777,25778,25779,25780,25782,25785, -25787,25789,25790,25791,25793,25795,25796,25798,25799,25800,25801,25802,25803, -25804,25807,25809,25811,25812,25813,25814,25817,25818,25819,25820,25821,25823, -25824,25825,25827,25829,25831,25832,25833,25834,25835,25836,25837,25838,25839, -25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,25850,25851,25852, -25853,25854,25855,25857,25858,25859,25860,25861,25862,25863,25864,25866,25867, -25868,25869,25870,25871,25872,25873,25875,25876,25877,25878,25879,25881,25882, -25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25894,25895,25896, -25897,25898,25900,25901,25904,25905,25906,25907,25911,25914,25916,25917,25920, -25921,25922,25923,25924,25926,25927,25930,25931,25933,25934,25936,25938,25939, -25940,25943,25944,25946,25948,25951,25952,25953,25956,25957,25959,25960,25961, -25962,25965,25966,25967,25969,25971,25973,25974,25976,25977,25978,25979,25980, -25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,25992,25993,25994, -25997,25998,25999,26002,26004,26005,26006,26008,26010,26013,26014,26016,26018, -26019,26022,26024,26026,26028,26030,26033,26034,26035,26036,26037,26038,26039, -26040,26042,26043,26046,26047,26048,26050,26055,26056,26057,26058,26061,26064, -26065,26067,26068,26069,26072,26073,26074,26075,26076,26077,26078,26079,26081, -26083,26084,26090,26091,26098,26099,26100,26101,26104,26105,26107,26108,26109, -26110,26111,26113,26116,26117,26119,26120,26121,26123,26125,26128,26129,26130, -26134,26135,26136,26138,26139,26140,26142,26145,26146,26147,26148,26150,26153, -26154,26155,26156,26158,26160,26162,26163,26167,26168,26169,26170,26171,26173, -26175,26176,26178,26180,26181,26182,26183,26184,26185,26186,26189,26190,26192, -26193,26200,26201,26203,26204,26205,26206,26208,26210,26211,26213,26215,26217, -26218,26219,26220,26221,26225,26226,26227,26229,26232,26233,26235,26236,26237, -26239,26240,26241,26243,26245,26246,26248,26249,26250,26251,26253,26254,26255, -26256,26258,26259,26260,26261,26264,26265,26266,26267,26268,26270,26271,26272, -26273,26274,26275,26276,26277,26278,26281,26282,26283,26284,26285,26287,26288, -26289,26290,26291,26293,26294,26295,26296,26298,26299,26300,26301,26303,26304, -26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317, -26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26330,26334, -26335,26336,26337,26338,26339,26340,26341,26343,26344,26346,26347,26348,26349, -26350,26351,26353,26357,26358,26360,26362,26363,26365,26369,26370,26371,26372, -26373,26374,26375,26380,26382,26383,26385,26386,26387,26390,26392,26393,26394, -26396,26398,26400,26401,26402,26403,26404,26405,26407,26409,26414,26416,26418, -26419,26422,26423,26424,26425,26427,26428,26430,26431,26433,26436,26437,26439, -26442,26443,26445,26450,26452,26453,26455,26456,26457,26458,26459,26461,26466, -26467,26468,26470,26471,26475,26476,26478,26481,26484,26486,26488,26489,26490, -26491,26493,26496,26498,26499,26501,26502,26504,26506,26508,26509,26510,26511, -26513,26514,26515,26516,26518,26521,26523,26527,26528,26529,26532,26534,26537, -26540,26542,26545,26546,26548,26553,26554,26555,26556,26557,26558,26559,26560, +21801,21803,21805,21810,21812,21813,21814,21816,21817, +21818,21819,21821,21824,21826,21829,21831,21832,21835,21836,21837,21838,21839, +21841,21842,21843,21844,21847,21848,21849,21850,21851,21853,21854,21855,21856, +21858,21859,21864,21865,21867,21871,21872,21873,21874,21875,21876,21881,21882, +21885,21887,21893,21894,21900,21901,21902,21904,21906,21907,21909,21910,21911, +21914,21915,21918,21920,21921,21922,21923,21924,21925,21926,21928,21929,21930, +21931,21932,21933,21934,21935,21936,21938,21940,21942,21944,21946,21948,21951, +21952,21953,21954,21955,21958,21959,21960,21962,21963,21966,21967,21968,21973, +21975,21976,21977,21978,21979,21982,21984,21986,21991,21993,21997,21998,22000, +22001,22004,22006,22008,22009,22010,22011,22012,22015,22018,22019,22020,22021, +22022,22023,22026,22027,22029,22032,22033,22034,22035,22036,22037,22038,22039, +22041,22042,22044,22045,22048,22049,22050,22053,22054,22056,22057,22058,22059, +22062,22063,22064,22067,22069,22071,22072,22074,22076,22077,22078,22080,22081, +22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22095,22096,22097, +22098,22099,22101,22102,22106,22107,22109,22110,22111,22112,22113,22115,22117, +22118,22119,22125,22126,22127,22128,22130,22131,22132,22133,22135,22136,22137, +22138,22141,22142,22143,22144,22145,22146,22147,22148,22151,22152,22153,22154, +22155,22156,22157,22160,22161,22162,22164,22165,22166,22167,22168,22169,22170, +22171,22172,22173,22174,22175,22176,22177,22178,22180,22181,22182,22183,22184, +22185,22186,22187,22188,22189,22190,22192,22193,22194,22195,22196,22197,22198, +22200,22201,22202,22203,22205,22206,22207,22208,22209, +22210,22211,22212,22213,22214,22215,22216,22217,22219,22220,22221,22222,22223, +22224,22225,22226,22227,22229,22230,22232,22233,22236,22243,22245,22246,22247, +22248,22249,22250,22252,22254,22255,22258,22259,22262,22263,22264,22267,22268, +22272,22273,22274,22277,22279,22283,22284,22285,22286,22287,22288,22289,22290, +22291,22292,22293,22294,22295,22296,22297,22298,22299,22301,22302,22304,22305, +22306,22308,22309,22310,22311,22315,22321,22322,22324,22325,22326,22327,22328, +22332,22333,22335,22337,22339,22340,22341,22342,22344,22345,22347,22354,22355, +22356,22357,22358,22360,22361,22370,22371,22373,22375,22380,22382,22384,22385, +22386,22388,22389,22392,22393,22394,22397,22398,22399,22400,22401,22407,22408, +22409,22410,22413,22414,22415,22416,22417,22420,22421,22422,22423,22424,22425, +22426,22428,22429,22430,22431,22437,22440,22442,22444,22447,22448,22449,22451, +22453,22454,22455,22457,22458,22459,22460,22461,22462,22463,22464,22465,22468, +22469,22470,22471,22472,22473,22474,22476,22477,22480,22481,22483,22486,22487, +22491,22492,22494,22497,22498,22499,22501,22502,22503,22504,22505,22506,22507, +22508,22510,22512,22513,22514,22515,22517,22518,22519,22523,22524,22526,22527, +22529,22531,22532,22533,22536,22537,22538,22540,22542,22543,22544,22546,22547, +22548,22550,22551,22552,22554,22555,22556,22557,22559,22562,22563,22565,22566, +22567,22568,22569,22571,22572,22573,22574,22575,22577,22578,22579,22580,22582, +22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,22595, +22597,22598,22599,22600,22601,22602,22603,22606,22607, +22608,22610,22611,22613,22614,22615,22617,22618,22619,22620,22621,22623,22624, +22625,22626,22627,22628,22630,22631,22632,22633,22634,22637,22638,22639,22640, +22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653, +22655,22658,22660,22662,22663,22664,22666,22667,22668,22669,22670,22671,22672, +22673,22676,22677,22678,22679,22680,22683,22684,22685,22688,22689,22690,22691, +22692,22693,22694,22695,22698,22699,22700,22701,22702,22703,22704,22705,22706, +22707,22708,22709,22710,22711,22712,22713,22714,22715,22717,22718,22719,22720, +22722,22723,22724,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735, +22736,22738,22739,22740,22742,22743,22744,22745,22746,22747,22748,22749,22750, +22751,22752,22753,22754,22755,22757,22758,22759,22760,22761,22762,22765,22767, +22769,22770,22772,22773,22775,22776,22778,22779,22780,22781,22782,22783,22784, +22785,22787,22789,22790,22792,22793,22794,22795,22796,22798,22800,22801,22802, +22803,22807,22808,22811,22813,22814,22816,22817,22818,22819,22822,22824,22828, +22832,22834,22835,22837,22838,22843,22845,22846,22847,22848,22851,22853,22854, +22858,22860,22861,22864,22866,22867,22873,22875,22876,22877,22878,22879,22881, +22883,22884,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896, +22897,22898,22901,22903,22906,22907,22908,22910,22911,22912,22917,22921,22923, +22924,22926,22927,22928,22929,22932,22933,22936,22938,22939,22940,22941,22943, +22944,22945,22946,22950,22951,22956,22957,22960,22961,22963,22964,22965,22966, +22967,22968,22970,22972,22973,22975,22976,22977,22978, +22979,22980,22981,22983,22984,22985,22988,22989,22990,22991,22997,22998,23001, +23003,23006,23007,23008,23009,23010,23012,23014,23015,23017,23018,23019,23021, +23022,23023,23024,23025,23026,23027,23028,23029,23030,23031,23032,23034,23036, +23037,23038,23040,23042,23050,23051,23053,23054,23055,23056,23058,23060,23061, +23062,23063,23065,23066,23067,23069,23070,23073,23074,23076,23078,23079,23080, +23082,23083,23084,23085,23086,23087,23088,23091,23093,23095,23096,23097,23098, +23099,23101,23102,23103,23105,23106,23107,23108,23109,23111,23112,23115,23116, +23117,23118,23119,23120,23121,23122,23123,23124,23126,23127,23128,23129,23131, +23132,23133,23134,23135,23136,23137,23139,23140,23141,23142,23144,23145,23147, +23148,23149,23150,23151,23152,23153,23154,23155,23160,23161,23163,23164,23165, +23166,23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179, +23180,23181,23182,23183,23184,23185,23187,23188,23189,23190,23191,23192,23193, +23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208, +23209,23211,23212,23213,23214,23215,23216,23217,23220,23222,23223,23225,23226, +23227,23228,23229,23231,23232,23235,23236,23237,23238,23239,23240,23242,23243, +23245,23246,23247,23248,23249,23251,23253,23255,23257,23258,23259,23261,23262, +23263,23266,23268,23269,23271,23272,23274,23276,23277,23278,23279,23280,23282, +23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,23294,23295, +23296,23297,23298,23299,23300,23301,23302,23303,23304,23306,23307,23308,23309, +23310,23311,23312,23313,23314,23315,23316,23317,23320, +23321,23322,23323,23324,23325,23326,23327,23328,23329,23330,23331,23332,23333, +23334,23335,23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23347, +23349,23350,23352,23353,23354,23355,23356,23357,23358,23359,23361,23362,23363, +23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23378, +23382,23390,23392,23393,23399,23400,23403,23405,23406,23407,23410,23412,23414, +23415,23416,23417,23419,23420,23422,23423,23426,23430,23434,23437,23438,23440, +23441,23442,23444,23446,23455,23463,23464,23465,23468,23469,23470,23471,23473, +23474,23479,23482,23483,23484,23488,23489,23491,23496,23497,23498,23499,23501, +23502,23503,23505,23508,23509,23510,23511,23512,23513,23514,23515,23516,23520, +23522,23523,23526,23527,23529,23530,23531,23532,23533,23535,23537,23538,23539, +23540,23541,23542,23543,23549,23550,23552,23554,23555,23557,23559,23560,23563, +23564,23565,23566,23568,23570,23571,23575,23577,23579,23582,23583,23584,23585, +23587,23590,23592,23593,23594,23595,23597,23598,23599,23600,23602,23603,23605, +23606,23607,23619,23620,23622,23623,23628,23629,23634,23635,23636,23638,23639, +23640,23642,23643,23644,23645,23647,23650,23652,23655,23656,23657,23658,23659, +23660,23661,23664,23666,23667,23668,23669,23670,23671,23672,23675,23676,23677, +23678,23680,23683,23684,23685,23686,23687,23689,23690,23691,23694,23695,23698, +23699,23701,23709,23710,23711,23712,23713,23716,23717,23718,23719,23720,23722, +23726,23727,23728,23730,23732,23734,23737,23738,23739,23740,23742,23744,23746, +23747,23749,23750,23751,23752,23753,23754,23756,23757, +23758,23759,23760,23761,23763,23764,23765,23766,23767,23768,23770,23771,23772, +23773,23774,23775,23776,23778,23779,23783,23785,23787,23788,23790,23791,23793, +23794,23795,23796,23797,23798,23799,23800,23801,23802,23804,23805,23806,23807, +23808,23809,23812,23813,23816,23817,23818,23819,23820,23821,23823,23824,23825, +23826,23827,23829,23831,23832,23833,23834,23836,23837,23839,23840,23841,23842, +23843,23845,23848,23850,23851,23852,23855,23856,23857,23858,23859,23861,23862, +23863,23864,23865,23866,23867,23868,23871,23872,23873,23874,23875,23876,23877, +23878,23880,23881,23885,23886,23887,23888,23889,23890,23891,23892,23893,23894, +23895,23897,23898,23900,23902,23903,23904,23905,23906,23907,23908,23909,23910, +23911,23912,23914,23917,23918,23920,23921,23922,23923,23925,23926,23927,23928, +23929,23930,23931,23932,23933,23934,23935,23936,23937,23939,23940,23941,23942, +23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,23954,23955, +23956,23957,23958,23959,23960,23962,23963,23964,23966,23967,23968,23969,23970, +23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983, +23984,23985,23986,23987,23988,23989,23990,23992,23993,23994,23995,23996,23997, +23998,23999,24000,24001,24002,24003,24004,24006,24007,24008,24009,24010,24011, +24012,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025, +24026,24028,24031,24032,24035,24036,24042,24044,24045,24048,24053,24054,24056, +24057,24058,24059,24060,24063,24064,24068,24071,24073,24074,24075,24077,24078, +24082,24083,24087,24094,24095,24096,24097,24098,24099, +24100,24101,24104,24105,24106,24107,24108,24111,24112,24114,24115,24116,24117, +24118,24121,24122,24126,24127,24128,24129,24131,24134,24135,24136,24137,24138, +24139,24141,24142,24143,24144,24145,24146,24147,24150,24151,24152,24153,24154, +24156,24157,24159,24160,24163,24164,24165,24166,24167,24168,24169,24170,24171, +24172,24173,24174,24175,24176,24177,24181,24183,24185,24190,24193,24194,24195, +24197,24200,24201,24204,24205,24206,24210,24216,24219,24221,24225,24226,24227, +24228,24232,24233,24234,24235,24236,24238,24239,24240,24241,24242,24244,24250, +24251,24252,24253,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264, +24267,24268,24269,24270,24271,24272,24276,24277,24279,24280,24281,24282,24284, +24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,24297,24299, +24300,24301,24302,24303,24304,24305,24306,24307,24309,24312,24313,24315,24316, +24317,24325,24326,24327,24329,24332,24333,24334,24336,24338,24340,24342,24345, +24346,24348,24349,24350,24353,24354,24355,24356,24360,24363,24364,24366,24368, +24370,24371,24372,24373,24374,24375,24376,24379,24381,24382,24383,24385,24386, +24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399, +24401,24404,24409,24410,24411,24412,24414,24415,24416,24419,24421,24423,24424, +24427,24430,24431,24434,24436,24437,24438,24440,24442,24445,24446,24447,24451, +24454,24461,24462,24463,24465,24467,24468,24470,24474,24475,24477,24478,24479, +24480,24482,24483,24484,24485,24486,24487,24489,24491,24492,24495,24496,24497, +24498,24499,24500,24502,24504,24505,24506,24507,24510, +24511,24512,24513,24514,24519,24520,24522,24523,24526,24531,24532,24533,24538, +24539,24540,24542,24543,24546,24547,24549,24550,24552,24553,24556,24559,24560, +24562,24563,24564,24566,24567,24569,24570,24572,24583,24584,24585,24587,24588, +24592,24593,24595,24599,24600,24602,24606,24607,24610,24611,24612,24620,24621, +24622,24624,24625,24626,24627,24628,24630,24631,24632,24633,24634,24637,24638, +24640,24644,24645,24646,24647,24648,24649,24650,24652,24654,24655,24657,24659, +24660,24662,24663,24664,24667,24668,24670,24671,24672,24673,24677,24678,24686, +24689,24690,24692,24693,24695,24702,24704,24705,24706,24709,24710,24711,24712, +24714,24715,24718,24719,24720,24721,24723,24725,24727,24728,24729,24732,24734, +24737,24738,24740,24741,24743,24745,24746,24750,24752,24755,24757,24758,24759, +24761,24762,24765,24766,24767,24768,24769,24770,24771,24772,24775,24776,24777, +24780,24781,24782,24783,24784,24786,24787,24788,24790,24791,24793,24795,24798, +24801,24802,24803,24804,24805,24810,24817,24818,24821,24823,24824,24827,24828, +24829,24830,24831,24834,24835,24836,24837,24839,24842,24843,24844,24848,24849, +24850,24851,24852,24854,24855,24856,24857,24859,24860,24861,24862,24865,24866, +24869,24872,24873,24874,24876,24877,24878,24879,24880,24881,24882,24883,24884, +24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24896,24897,24898, +24899,24900,24901,24902,24903,24905,24907,24909,24911,24912,24914,24915,24916, +24918,24919,24920,24921,24922,24923,24924,24926,24927,24928,24929,24931,24932, +24933,24934,24937,24938,24939,24940,24941,24942,24943, +24945,24946,24947,24948,24950,24952,24953,24954,24955,24956,24957,24958,24959, +24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,24972,24973, +24975,24976,24977,24978,24979,24981,24982,24983,24984,24985,24986,24987,24988, +24990,24991,24992,24993,24994,24995,24996,24997,24998,25002,25003,25005,25006, +25007,25008,25009,25010,25011,25012,25013,25014,25016,25017,25018,25019,25020, +25021,25023,25024,25025,25027,25028,25029,25030,25031,25033,25036,25037,25038, +25039,25040,25043,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054, +25055,25056,25057,25058,25059,25060,25061,25063,25064,25065,25066,25067,25068, +25069,25070,25071,25072,25073,25074,25075,25076,25078,25079,25080,25081,25082, +25083,25084,25085,25086,25088,25089,25090,25091,25092,25093,25095,25097,25107, +25108,25113,25116,25117,25118,25120,25123,25126,25127,25128,25129,25131,25133, +25135,25136,25137,25138,25141,25142,25144,25145,25146,25147,25148,25154,25156, +25157,25158,25162,25167,25168,25173,25174,25175,25177,25178,25180,25181,25182, +25183,25184,25185,25186,25188,25189,25192,25201,25202,25204,25205,25207,25208, +25210,25211,25213,25217,25218,25219,25221,25222,25223,25224,25227,25228,25229, +25230,25231,25232,25236,25241,25244,25245,25246,25251,25254,25255,25257,25258, +25261,25262,25263,25264,25266,25267,25268,25270,25271,25272,25274,25278,25280, +25281,25283,25291,25295,25297,25301,25309,25310,25312,25313,25316,25322,25323, +25328,25330,25333,25336,25337,25338,25339,25344,25347,25348,25349,25350,25354, +25355,25356,25357,25359,25360,25362,25363,25364,25365, +25367,25368,25369,25372,25382,25383,25385,25388,25389,25390,25392,25393,25395, +25396,25397,25398,25399,25400,25403,25404,25406,25407,25408,25409,25412,25415, +25416,25418,25425,25426,25427,25428,25430,25431,25432,25433,25434,25435,25436, +25437,25440,25444,25445,25446,25448,25450,25451,25452,25455,25456,25458,25459, +25460,25461,25464,25465,25468,25469,25470,25471,25473,25475,25476,25477,25478, +25483,25485,25489,25491,25492,25493,25495,25497,25498,25499,25500,25501,25502, +25503,25505,25508,25510,25515,25519,25521,25522,25525,25526,25529,25531,25533, +25535,25536,25537,25538,25539,25541,25543,25544,25546,25547,25548,25553,25555, +25556,25557,25559,25560,25561,25562,25563,25564,25565,25567,25570,25572,25573, +25574,25575,25576,25579,25580,25582,25583,25584,25585,25587,25589,25591,25593, +25594,25595,25596,25598,25603,25604,25606,25607,25608,25609,25610,25613,25614, +25617,25618,25621,25622,25623,25624,25625,25626,25629,25631,25634,25635,25636, +25637,25639,25640,25641,25643,25646,25647,25648,25649,25650,25651,25653,25654, +25655,25656,25657,25659,25660,25662,25664,25666,25667,25673,25675,25676,25677, +25678,25679,25680,25681,25683,25685,25686,25687,25689,25690,25691,25692,25693, +25695,25696,25697,25698,25699,25700,25701,25702,25704,25706,25707,25708,25710, +25711,25712,25713,25714,25715,25716,25717,25718,25719,25723,25724,25725,25726, +25727,25728,25729,25731,25734,25736,25737,25738,25739,25740,25741,25742,25743, +25744,25747,25748,25751,25752,25754,25755,25756,25757,25759,25760,25761,25762, +25763,25765,25766,25767,25768,25770,25771,25775,25777, +25778,25779,25780,25782,25785,25787,25789,25790,25791,25793,25795,25796,25798, +25799,25800,25801,25802,25803,25804,25807,25809,25811,25812,25813,25814,25817, +25818,25819,25820,25821,25823,25824,25825,25827,25829,25831,25832,25833,25834, +25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,25847, +25848,25849,25850,25851,25852,25853,25854,25855,25857,25858,25859,25860,25861, +25862,25863,25864,25866,25867,25868,25869,25870,25871,25872,25873,25875,25876, +25877,25878,25879,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890, +25891,25892,25894,25895,25896,25897,25898,25900,25901,25904,25905,25906,25907, +25911,25914,25916,25917,25920,25921,25922,25923,25924,25926,25927,25930,25931, +25933,25934,25936,25938,25939,25940,25943,25944,25946,25948,25951,25952,25953, +25956,25957,25959,25960,25961,25962,25965,25966,25967,25969,25971,25973,25974, +25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,25988, +25989,25990,25992,25993,25994,25997,25998,25999,26002,26004,26005,26006,26008, +26010,26013,26014,26016,26018,26019,26022,26024,26026,26028,26030,26033,26034, +26035,26036,26037,26038,26039,26040,26042,26043,26046,26047,26048,26050,26055, +26056,26057,26058,26061,26064,26065,26067,26068,26069,26072,26073,26074,26075, +26076,26077,26078,26079,26081,26083,26084,26090,26091,26098,26099,26100,26101, +26104,26105,26107,26108,26109,26110,26111,26113,26116,26117,26119,26120,26121, +26123,26125,26128,26129,26130,26134,26135,26136,26138,26139,26140,26142,26145, +26146,26147,26148,26150,26153,26154,26155,26156,26158, +26160,26162,26163,26167,26168,26169,26170,26171,26173,26175,26176,26178,26180, +26181,26182,26183,26184,26185,26186,26189,26190,26192,26193,26200,26201,26203, +26204,26205,26206,26208,26210,26211,26213,26215,26217,26218,26219,26220,26221, +26225,26226,26227,26229,26232,26233,26235,26236,26237,26239,26240,26241,26243, +26245,26246,26248,26249,26250,26251,26253,26254,26255,26256,26258,26259,26260, +26261,26264,26265,26266,26267,26268,26270,26271,26272,26273,26274,26275,26276, +26277,26278,26281,26282,26283,26284,26285,26287,26288,26289,26290,26291,26293, +26294,26295,26296,26298,26299,26300,26301,26303,26304,26305,26306,26307,26308, +26309,26310,26311,26312,26313,26314,26315,26316,26317,26318,26319,26320,26321, +26322,26323,26324,26325,26326,26327,26328,26330,26334,26335,26336,26337,26338, +26339,26340,26341,26343,26344,26346,26347,26348,26349,26350,26351,26353,26357, +26358,26360,26362,26363,26365,26369,26370,26371,26372,26373,26374,26375,26380, +26382,26383,26385,26386,26387,26390,26392,26393,26394,26396,26398,26400,26401, +26402,26403,26404,26405,26407,26409,26414,26416,26418,26419,26422,26423,26424, +26425,26427,26428,26430,26431,26433,26436,26437,26439,26442,26443,26445,26450, +26452,26453,26455,26456,26457,26458,26459,26461,26466,26467,26468,26470,26471, +26475,26476,26478,26481,26484,26486,26488,26489,26490,26491,26493,26496,26498, +26499,26501,26502,26504,26506,26508,26509,26510,26511,26513,26514,26515,26516, +26518,26521,26523,26527,26528,26529,26532,26534,26537,26540,26542,26545,26546, +26548,26553,26554,26555,26556,26557,26558,26559,26560, 26562,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26581,26582, 26583,26587,26591,26593,26595,26596,26598,26599,26600,26602,26603,26605,26606, 26610,26613,26614,26615,26616,26617,26618,26619,26620,26622,26625,26626,26627, @@ -332,221 +337,225 @@ 26889,26890,26892,26895,26897,26899,26900,26901,26902,26903,26904,26905,26906, 26907,26908,26909,26910,26913,26914,26915,26917,26918,26919,26920,26921,26922, 26923,26924,26926,26927,26929,26930,26931,26933,26934,26935,26936,26938,26939, -26940,26942,26944,26945,26947,26948,26949,26950,26951,26952,26953,26954,26955, -26956,26957,26958,26959,26960,26961,26962,26963,26965,26966,26968,26969,26971, -26972,26975,26977,26978,26980,26981,26983,26984,26985,26986,26988,26989,26991, -26992,26994,26995,26996,26997,26998,27002,27003,27005,27006,27007,27009,27011, -27013,27018,27019,27020,27022,27023,27024,27025,27026,27027,27030,27031,27033, -27034,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,27049,27050, -27052,27054,27055,27056,27058,27059,27061,27062,27064,27065,27066,27068,27069, -27070,27071,27072,27074,27075,27076,27077,27078,27079,27080,27081,27083,27085, -27087,27089,27090,27091,27093,27094,27095,27096,27097,27098,27100,27101,27102, -27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27118, -27119,27120,27121,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132, -27134,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,27147,27148, -27149,27150,27151,27152,27153,27154,27155,27156,27157,27158,27161,27162,27163, -27164,27165,27166,27168,27170,27171,27172,27173,27174,27175,27177,27179,27180, -27181,27182,27184,27186,27187,27188,27190,27191,27192,27193,27194,27195,27196, -27199,27200,27201,27202,27203,27205,27206,27208,27209,27210,27211,27212,27213, -27214,27215,27217,27218,27219,27220,27221,27222,27223,27226,27228,27229,27230, -27231,27232,27234,27235,27236,27238,27239,27240,27241,27242,27243,27244,27245, -27246,27247,27248,27250,27251,27252,27253,27254,27255,27256,27258,27259,27261, -27262,27263,27265,27266,27267,27269,27270,27271,27272,27273,27274,27275,27276, -27277,27279,27282,27283,27284,27285,27286,27288,27289,27290,27291,27292,27293, -27294,27295,27297,27298,27299,27300,27301,27302,27303,27304,27306,27309,27310, -27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,27323, -27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336, -27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349, -27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,27362, -27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,27374,27375, -27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,27386,27387,27388, -27389,27390,27391,27392,27393,27394,27395,27396,27397,27398,27399,27400,27401, -27402,27403,27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414, -27415,27416,27417,27418,27419,27420,27421,27422,27423,27429,27430,27432,27433, -27434,27435,27436,27437,27438,27439,27440,27441,27443,27444,27445,27446,27448, -27451,27452,27453,27455,27456,27457,27458,27460,27461,27464,27466,27467,27469, -27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27482,27483, -27484,27485,27486,27487,27488,27489,27496,27497,27499,27500,27501,27502,27503, -27504,27505,27506,27507,27508,27509,27510,27511,27512,27514,27517,27518,27519, -27520,27525,27528,27532,27534,27535,27536,27537,27540,27541,27543,27544,27545, -27548,27549,27550,27551,27552,27554,27555,27556,27557,27558,27559,27560,27561, -27563,27564,27565,27566,27567,27568,27569,27570,27574,27576,27577,27578,27579, -27580,27581,27582,27584,27587,27588,27590,27591,27592,27593,27594,27596,27598, -27600,27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621, -27622,27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639, -27640,27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657, -27658,27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691, -27692,27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715, -27716,27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736, -27737,27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761, -27763,27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787, -27789,27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808, -27810,27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842, -27843,27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866, -27868,27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903, -27904,27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923, -27924,27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942, -27944,27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968, -27970,27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001, -28002,28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021, -28022,28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039, -28042,28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066, -28069,28076,28077,28080,28081,28083,28084,28086,28087,28089,28090,28091,28092, -28093,28094,28097,28098,28099,28104,28105,28106,28109,28110,28111,28112,28114, -28115,28116,28117,28119,28122,28123,28124,28127,28130,28131,28133,28135,28136, -28137,28138,28141,28143,28144,28146,28148,28149,28150,28152,28154,28157,28158, -28159,28160,28161,28162,28163,28164,28166,28167,28168,28169,28171,28175,28178, -28179,28181,28184,28185,28187,28188,28190,28191,28194,28198,28199,28200,28202, -28204,28206,28208,28209,28211,28213,28214,28215,28217,28219,28220,28221,28222, -28223,28224,28225,28226,28229,28230,28231,28232,28233,28234,28235,28236,28239, -28240,28241,28242,28245,28247,28249,28250,28252,28253,28254,28256,28257,28258, -28259,28260,28261,28262,28263,28264,28265,28266,28268,28269,28271,28272,28273, -28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,28288, -28289,28290,28292,28295,28296,28298,28299,28300,28301,28302,28305,28306,28307, -28308,28309,28310,28311,28313,28314,28315,28317,28318,28320,28321,28323,28324, -28326,28328,28329,28331,28332,28333,28334,28336,28339,28341,28344,28345,28348, -28350,28351,28352,28355,28356,28357,28358,28360,28361,28362,28364,28365,28366, -28368,28370,28374,28376,28377,28379,28380,28381,28387,28391,28394,28395,28396, -28397,28398,28399,28400,28401,28402,28403,28405,28406,28407,28408,28410,28411, -28412,28413,28414,28415,28416,28417,28419,28420,28421,28423,28424,28426,28427, -28428,28429,28430,28432,28433,28434,28438,28439,28440,28441,28442,28443,28444, -28445,28446,28447,28449,28450,28451,28453,28454,28455,28456,28460,28462,28464, -28466,28468,28469,28471,28472,28473,28474,28475,28476,28477,28479,28480,28481, -28482,28483,28484,28485,28488,28489,28490,28492,28494,28495,28496,28497,28498, -28499,28500,28501,28502,28503,28505,28506,28507,28509,28511,28512,28513,28515, -28516,28517,28519,28520,28521,28522,28523,28524,28527,28528,28529,28531,28533, -28534,28535,28537,28539,28541,28542,28543,28544,28545,28546,28547,28549,28550, -28551,28554,28555,28559,28560,28561,28562,28563,28564,28565,28566,28567,28568, -28569,28570,28571,28573,28574,28575,28576,28578,28579,28580,28581,28582,28584, -28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,28596,28597,28599, -28600,28602,28603,28604,28605,28606,28607,28609,28611,28612,28613,28614,28615, -28616,28618,28619,28620,28621,28622,28623,28624,28627,28628,28629,28630,28631, -28632,28633,28634,28635,28636,28637,28639,28642,28643,28644,28645,28646,28647, -28648,28649,28650,28651,28652,28653,28656,28657,28658,28659,28660,28661,28662, -28663,28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675, -28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,28688, -28690,28691,28692,28693,28694,28695,28696,28697,28700,28701,28702,28703,28704, -28705,28706,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,28718, -28719,28720,28721,28722,28723,28724,28726,28727,28728,28730,28731,28732,28733, -28734,28735,28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746, -28747,28749,28750,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761, -28762,28763,28764,28765,28767,28768,28769,28770,28771,28772,28773,28774,28775, -28776,28777,28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797, -28801,28802,28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817, -28819,28823,28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837, -28838,28839,28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863, -28868,28869,28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882, -28883,28884,28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899, -28901,28906,28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923, -28924,28926,28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939, -28940,28941,28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959, -28960,28961,28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973, -28974,28978,28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990, -28991,28992,28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007, -29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021, -29023,29024,29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040, -29041,29044,29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058, -29059,29061,29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074, -29075,29077,29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092, -29093,29094,29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108, -29110,29111,29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124, -29125,29126,29127,29128,29129,29130,29131,29132,29133,29135,29136,29137,29138, -29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,29153,29154, -29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168,29169,29170, -29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182,29183,29184, -29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196,29197,29198, -29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,29210,29211, -29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,29225,29227, -29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249,29250,29251, -29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267,29268,29269, -29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290,29291,29292, -29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309,29314,29315, -29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332,29333,29334, -29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346,29347,29348, -29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363,29365,29370, -29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386,29387,29388, -29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567,58568,58569, -58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580,58581,58582, -58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593,58594,58595, -58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606,58607,58608, -58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619,58620,58621, -58622,58623,58624,58625,58626,58627,58628,58629,58630,58631,58632,58633,58634, -58635,58636,58637,58638,58639,58640,58641,58642,58643,58644,58645,58646,58647, -58648,58649,58650,58651,58652,58653,58654,58655,58656,58657,58658,58659,58660, -58661,12288,12289,12290,183,713,711,168,12291,12293,8212,65374,8214,8230,8216, -8217,8220,8221,12308,12309,12296,12297,12298,12299,12300,12301,12302,12303, -12310,12311,12304,12305,177,215,247,8758,8743,8744,8721,8719,8746,8745,8712, -8759,8730,8869,8741,8736,8978,8857,8747,8750,8801,8780,8776,8765,8733,8800, -8814,8815,8804,8805,8734,8757,8756,9794,9792,176,8242,8243,8451,65284,164, -65504,65505,8240,167,8470,9734,9733,9675,9679,9678,9671,9670,9633,9632,9651, -9650,8251,8594,8592,8593,8595,12307,58662,58663,58664,58665,58666,58667,58668, -58669,58670,58671,58672,58673,58674,58675,58676,58677,58678,58679,58680,58681, -58682,58683,58684,58685,58686,58687,58688,58689,58690,58691,58692,58693,58694, -58695,58696,58697,58698,58699,58700,58701,58702,58703,58704,58705,58706,58707, -58708,58709,58710,58711,58712,58713,58714,58715,58716,58717,58718,58719,58720, -58721,58722,58723,58724,58725,58726,58727,58728,58729,58730,58731,58732,58733, -58734,58735,58736,58737,58738,58739,58740,58741,58742,58743,58744,58745,58746, -58747,58748,58749,58750,58751,58752,58753,58754,58755,58756,58757,8560,8561, -8562,8563,8564,8565,8566,8567,8568,8569,59238,59239,59240,59241,59242,59243, -9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366, -9367,9368,9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341, -9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316, -9317,9318,9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838, -12839,12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552, -8553,8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765, -58766,58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778, -58779,58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791, -58792,58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804, -58805,58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817, -58818,58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830, -58831,58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843, -58844,58845,58846,58847,58848,58849,58850,58851,58852,58853,65281,65282,65283, -65509,65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296, -65297,65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309, -65310,65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322, -65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335, -65336,65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348, -65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361, -65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507, -58854,58855,58856,58857,58858,58859,58860,58861,58862,58863,58864,58865,58866, -58867,58868,58869,58870,58871,58872,58873,58874,58875,58876,58877,58878,58879, -58880,58881,58882,58883,58884,58885,58886,58887,58888,58889,58890,58891,58892, -58893,58894,58895,58896,58897,58898,58899,58900,58901,58902,58903,58904,58905, -58906,58907,58908,58909,58910,58911,58912,58913,58914,58915,58916,58917,58918, -58919,58920,58921,58922,58923,58924,58925,58926,58927,58928,58929,58930,58931, -58932,58933,58934,58935,58936,58937,58938,58939,58940,58941,58942,58943,58944, -58945,58946,58947,58948,58949,12353,12354,12355,12356,12357,12358,12359,12360, -12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373, -12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386, -12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399, -12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412, -12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425, -12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,59250,59251,59252, -59253,59254,59255,59256,59257,59258,59259,59260,58950,58951,58952,58953,58954, -58955,58956,58957,58958,58959,58960,58961,58962,58963,58964,58965,58966,58967, -58968,58969,58970,58971,58972,58973,58974,58975,58976,58977,58978,58979,58980, -58981,58982,58983,58984,58985,58986,58987,58988,58989,58990,58991,58992,58993, -58994,58995,58996,58997,58998,58999,59000,59001,59002,59003,59004,59005,59006, -59007,59008,59009,59010,59011,59012,59013,59014,59015,59016,59017,59018,59019, -59020,59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032, -59033,59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045, -12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461, -12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474, -12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487, -12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500, -12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513, -12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526, -12527,12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265, -59266,59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055, -59056,59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068, -59069,59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081, -59082,59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094, -59095,59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107, -59108,59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120, -59121,59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133, -59134,59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919, -920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269, -59270,59271,59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953, +26940,26942,26944,26945,26947,26948,26949,26950,26951, +26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26965, +26966,26968,26969,26971,26972,26975,26977,26978,26980,26981,26983,26984,26985, +26986,26988,26989,26991,26992,26994,26995,26996,26997,26998,27002,27003,27005, +27006,27007,27009,27011,27013,27018,27019,27020,27022,27023,27024,27025,27026, +27027,27030,27031,27033,27034,27037,27038,27039,27040,27041,27042,27043,27044, +27045,27046,27049,27050,27052,27054,27055,27056,27058,27059,27061,27062,27064, +27065,27066,27068,27069,27070,27071,27072,27074,27075,27076,27077,27078,27079, +27080,27081,27083,27085,27087,27089,27090,27091,27093,27094,27095,27096,27097, +27098,27100,27101,27102,27105,27106,27107,27108,27109,27110,27111,27112,27113, +27114,27115,27116,27118,27119,27120,27121,27123,27124,27125,27126,27127,27128, +27129,27130,27131,27132,27134,27136,27137,27138,27139,27140,27141,27142,27143, +27144,27145,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157, +27158,27161,27162,27163,27164,27165,27166,27168,27170,27171,27172,27173,27174, +27175,27177,27179,27180,27181,27182,27184,27186,27187,27188,27190,27191,27192, +27193,27194,27195,27196,27199,27200,27201,27202,27203,27205,27206,27208,27209, +27210,27211,27212,27213,27214,27215,27217,27218,27219,27220,27221,27222,27223, +27226,27228,27229,27230,27231,27232,27234,27235,27236,27238,27239,27240,27241, +27242,27243,27244,27245,27246,27247,27248,27250,27251,27252,27253,27254,27255, +27256,27258,27259,27261,27262,27263,27265,27266,27267,27269,27270,27271,27272, +27273,27274,27275,27276,27277,27279,27282,27283,27284, +27285,27286,27288,27289,27290,27291,27292,27293,27294,27295,27297,27298,27299, +27300,27301,27302,27303,27304,27306,27309,27310,27311,27312,27313,27314,27315, +27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,27326,27327,27328, +27329,27330,27331,27332,27333,27334,27335,27336,27337,27338,27339,27340,27341, +27342,27343,27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354, +27355,27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367, +27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,27380, +27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393, +27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406, +27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,27419, +27420,27421,27422,27423,27429,27430,27432,27433,27434,27435,27436,27437,27438, +27439,27440,27441,27443,27444,27445,27446,27448,27451,27452,27453,27455,27456, +27457,27458,27460,27461,27464,27466,27467,27469,27470,27471,27472,27473,27474, +27475,27476,27477,27478,27479,27480,27482,27483,27484,27485,27486,27487,27488, +27489,27496,27497,27499,27500,27501,27502,27503,27504,27505,27506,27507,27508, +27509,27510,27511,27512,27514,27517,27518,27519,27520,27525,27528,27532,27534, +27535,27536,27537,27540,27541,27543,27544,27545,27548,27549,27550,27551,27552, +27554,27555,27556,27557,27558,27559,27560,27561,27563,27564,27565,27566,27567, +27568,27569,27570,27574,27576,27577,27578,27579,27580,27581,27582,27584,27587, +27588,27590,27591,27592,27593,27594,27596,27598,27600, +27601,27608,27610,27612,27613,27614,27615,27616,27618,27619,27620,27621,27622, +27623,27624,27625,27628,27629,27630,27632,27633,27634,27636,27638,27639,27640, +27642,27643,27644,27646,27647,27648,27649,27650,27651,27652,27656,27657,27658, +27659,27660,27662,27666,27671,27676,27677,27678,27680,27683,27685,27691,27692, +27693,27697,27699,27702,27703,27705,27706,27707,27708,27710,27711,27715,27716, +27717,27720,27723,27724,27725,27726,27727,27729,27730,27731,27734,27736,27737, +27738,27746,27747,27749,27750,27751,27755,27756,27757,27758,27759,27761,27763, +27765,27767,27768,27770,27771,27772,27775,27776,27780,27783,27786,27787,27789, +27790,27793,27794,27797,27798,27799,27800,27802,27804,27805,27806,27808,27810, +27816,27820,27823,27824,27828,27829,27830,27831,27834,27840,27841,27842,27843, +27846,27847,27848,27851,27853,27854,27855,27857,27858,27864,27865,27866,27868, +27869,27871,27876,27878,27879,27881,27884,27885,27890,27892,27897,27903,27904, +27906,27907,27909,27910,27912,27913,27914,27917,27919,27920,27921,27923,27924, +27925,27926,27928,27932,27933,27935,27936,27937,27938,27939,27940,27942,27944, +27945,27948,27949,27951,27952,27956,27958,27959,27960,27962,27967,27968,27970, +27972,27977,27980,27984,27989,27990,27991,27992,27995,27997,27999,28001,28002, +28004,28005,28007,28008,28011,28012,28013,28016,28017,28018,28019,28021,28022, +28025,28026,28027,28029,28030,28031,28032,28033,28035,28036,28038,28039,28042, +28043,28045,28047,28048,28050,28054,28055,28056,28057,28058,28060,28066,28069, +28076,28077,28080,28081,28083,28084,28086,28087,28089, +28090,28091,28092,28093,28094,28097,28098,28099,28104,28105,28106,28109,28110, +28111,28112,28114,28115,28116,28117,28119,28122,28123,28124,28127,28130,28131, +28133,28135,28136,28137,28138,28141,28143,28144,28146,28148,28149,28150,28152, +28154,28157,28158,28159,28160,28161,28162,28163,28164,28166,28167,28168,28169, +28171,28175,28178,28179,28181,28184,28185,28187,28188,28190,28191,28194,28198, +28199,28200,28202,28204,28206,28208,28209,28211,28213,28214,28215,28217,28219, +28220,28221,28222,28223,28224,28225,28226,28229,28230,28231,28232,28233,28234, +28235,28236,28239,28240,28241,28242,28245,28247,28249,28250,28252,28253,28254, +28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28268,28269, +28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,28283, +28284,28285,28288,28289,28290,28292,28295,28296,28298,28299,28300,28301,28302, +28305,28306,28307,28308,28309,28310,28311,28313,28314,28315,28317,28318,28320, +28321,28323,28324,28326,28328,28329,28331,28332,28333,28334,28336,28339,28341, +28344,28345,28348,28350,28351,28352,28355,28356,28357,28358,28360,28361,28362, +28364,28365,28366,28368,28370,28374,28376,28377,28379,28380,28381,28387,28391, +28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28405,28406,28407, +28408,28410,28411,28412,28413,28414,28415,28416,28417,28419,28420,28421,28423, +28424,28426,28427,28428,28429,28430,28432,28433,28434,28438,28439,28440,28441, +28442,28443,28444,28445,28446,28447,28449,28450,28451,28453,28454,28455,28456, +28460,28462,28464,28466,28468,28469,28471,28472,28473, +28474,28475,28476,28477,28479,28480,28481,28482,28483,28484,28485,28488,28489, +28490,28492,28494,28495,28496,28497,28498,28499,28500,28501,28502,28503,28505, +28506,28507,28509,28511,28512,28513,28515,28516,28517,28519,28520,28521,28522, +28523,28524,28527,28528,28529,28531,28533,28534,28535,28537,28539,28541,28542, +28543,28544,28545,28546,28547,28549,28550,28551,28554,28555,28559,28560,28561, +28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28573,28574,28575, +28576,28578,28579,28580,28581,28582,28584,28585,28586,28587,28588,28589,28590, +28591,28592,28593,28594,28596,28597,28599,28600,28602,28603,28604,28605,28606, +28607,28609,28611,28612,28613,28614,28615,28616,28618,28619,28620,28621,28622, +28623,28624,28627,28628,28629,28630,28631,28632,28633,28634,28635,28636,28637, +28639,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653, +28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668, +28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681, +28682,28683,28684,28685,28686,28687,28688,28690,28691,28692,28693,28694,28695, +28696,28697,28700,28701,28702,28703,28704,28705,28706,28708,28709,28710,28711, +28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,28724, +28726,28727,28728,28730,28731,28732,28733,28734,28735,28736,28737,28738,28739, +28740,28741,28742,28743,28744,28745,28746,28747,28749,28750,28752,28753,28754, +28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,28767,28768, +28769,28770,28771,28772,28773,28774,28775,28776,28777, +28778,28782,28785,28786,28787,28788,28791,28793,28794,28795,28797,28801,28802, +28803,28804,28806,28807,28808,28811,28812,28813,28815,28816,28817,28819,28823, +28824,28826,28827,28830,28831,28832,28833,28834,28835,28836,28837,28838,28839, +28840,28841,28842,28848,28850,28852,28853,28854,28858,28862,28863,28868,28869, +28870,28871,28873,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884, +28885,28886,28887,28890,28892,28893,28894,28896,28897,28898,28899,28901,28906, +28910,28912,28913,28914,28915,28916,28917,28918,28920,28922,28923,28924,28926, +28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28939,28940,28941, +28942,28943,28945,28946,28948,28951,28955,28956,28957,28958,28959,28960,28961, +28962,28963,28964,28965,28967,28968,28969,28970,28971,28972,28973,28974,28978, +28979,28980,28981,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992, +28993,28994,28995,28996,28998,28999,29000,29001,29003,29005,29007,29008,29009, +29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29021,29023,29024, +29025,29026,29027,29029,29033,29034,29035,29036,29037,29039,29040,29041,29044, +29045,29046,29047,29049,29051,29052,29054,29055,29056,29057,29058,29059,29061, +29062,29063,29064,29065,29067,29068,29069,29070,29072,29073,29074,29075,29077, +29078,29079,29082,29083,29084,29085,29086,29089,29090,29091,29092,29093,29094, +29095,29097,29098,29099,29101,29102,29103,29104,29105,29106,29108,29110,29111, +29112,29114,29115,29116,29117,29118,29119,29120,29121,29122,29124,29125,29126, +29127,29128,29129,29130,29131,29132,29133,29135,29136, +29137,29138,29139,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151, +29153,29154,29155,29156,29158,29160,29161,29162,29163,29164,29165,29167,29168, +29169,29170,29171,29172,29173,29174,29175,29176,29178,29179,29180,29181,29182, +29183,29184,29185,29186,29187,29188,29189,29191,29192,29193,29194,29195,29196, +29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209, +29210,29211,29212,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223, +29225,29227,29229,29230,29231,29234,29235,29236,29242,29244,29246,29248,29249, +29250,29251,29252,29253,29254,29257,29258,29259,29262,29263,29264,29265,29267, +29268,29269,29271,29272,29274,29276,29278,29280,29283,29284,29285,29288,29290, +29291,29292,29293,29296,29297,29299,29300,29302,29303,29304,29307,29308,29309, +29314,29315,29317,29318,29319,29320,29321,29324,29326,29328,29329,29331,29332, +29333,29334,29335,29336,29337,29338,29339,29340,29341,29342,29344,29345,29346, +29347,29348,29349,29350,29351,29352,29353,29354,29355,29358,29361,29362,29363, +29365,29370,29371,29372,29373,29374,29375,29376,29381,29382,29383,29385,29386, +29387,29388,29391,29393,29395,29396,29397,29398,29400,29402,29403,58566,58567, +58568,58569,58570,58571,58572,58573,58574,58575,58576,58577,58578,58579,58580, +58581,58582,58583,58584,58585,58586,58587,58588,58589,58590,58591,58592,58593, +58594,58595,58596,58597,58598,58599,58600,58601,58602,58603,58604,58605,58606, +58607,58608,58609,58610,58611,58612,58613,58614,58615,58616,58617,58618,58619, +58620,58621,58622,58623,58624,58625,58626,58627,58628, +58629,58630,58631,58632,58633,58634,58635,58636,58637,58638,58639,58640,58641, +58642,58643,58644,58645,58646,58647,58648,58649,58650,58651,58652,58653,58654, +58655,58656,58657,58658,58659,58660,58661,12288,12289,12290,183,713,711,168, +12291,12293,8212,65374,8214,8230,8216,8217,8220,8221,12308,12309,12296,12297, +12298,12299,12300,12301,12302,12303,12310,12311,12304,12305,177,215,247,8758, +8743,8744,8721,8719,8746,8745,8712,8759,8730,8869,8741,8736,8978,8857,8747, +8750,8801,8780,8776,8765,8733,8800,8814,8815,8804,8805,8734,8757,8756,9794, +9792,176,8242,8243,8451,65284,164,65504,65505,8240,167,8470,9734,9733,9675, +9679,9678,9671,9670,9633,9632,9651,9650,8251,8594,8592,8593,8595,12307,58662, +58663,58664,58665,58666,58667,58668,58669,58670,58671,58672,58673,58674,58675, +58676,58677,58678,58679,58680,58681,58682,58683,58684,58685,58686,58687,58688, +58689,58690,58691,58692,58693,58694,58695,58696,58697,58698,58699,58700,58701, +58702,58703,58704,58705,58706,58707,58708,58709,58710,58711,58712,58713,58714, +58715,58716,58717,58718,58719,58720,58721,58722,58723,58724,58725,58726,58727, +58728,58729,58730,58731,58732,58733,58734,58735,58736,58737,58738,58739,58740, +58741,58742,58743,58744,58745,58746,58747,58748,58749,58750,58751,58752,58753, +58754,58755,58756,58757,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569, +59238,59239,59240,59241,59242,59243,9352,9353,9354,9355,9356,9357,9358,9359, +9360,9361,9362,9363,9364,9365,9366,9367,9368, +9369,9370,9371,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343, +9344,9345,9346,9347,9348,9349,9350,9351,9312,9313,9314,9315,9316,9317,9318, +9319,9320,9321,8364,59245,12832,12833,12834,12835,12836,12837,12838,12839, +12840,12841,59246,59247,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553, +8554,8555,59248,59249,58758,58759,58760,58761,58762,58763,58764,58765,58766, +58767,58768,58769,58770,58771,58772,58773,58774,58775,58776,58777,58778,58779, +58780,58781,58782,58783,58784,58785,58786,58787,58788,58789,58790,58791,58792, +58793,58794,58795,58796,58797,58798,58799,58800,58801,58802,58803,58804,58805, +58806,58807,58808,58809,58810,58811,58812,58813,58814,58815,58816,58817,58818, +58819,58820,58821,58822,58823,58824,58825,58826,58827,58828,58829,58830,58831, +58832,58833,58834,58835,58836,58837,58838,58839,58840,58841,58842,58843,58844, +58845,58846,58847,58848,58849,58850,58851,58852,58853,65281,65282,65283,65509, +65285,65286,65287,65288,65289,65290,65291,65292,65293,65294,65295,65296,65297, +65298,65299,65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310, +65311,65312,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323, +65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336, +65337,65338,65339,65340,65341,65342,65343,65344,65345,65346,65347,65348,65349, +65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362, +65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,58854, +58855,58856,58857,58858, +58859,58860,58861,58862,58863,58864,58865,58866,58867,58868,58869,58870,58871, +58872,58873,58874,58875,58876,58877,58878,58879,58880,58881,58882,58883,58884, +58885,58886,58887,58888,58889,58890,58891,58892,58893,58894,58895,58896,58897, +58898,58899,58900,58901,58902,58903,58904,58905,58906,58907,58908,58909,58910, +58911,58912,58913,58914,58915,58916,58917,58918,58919,58920,58921,58922,58923, +58924,58925,58926,58927,58928,58929,58930,58931,58932,58933,58934,58935,58936, +58937,58938,58939,58940,58941,58942,58943,58944,58945,58946,58947,58948,58949, +12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365, +12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378, +12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391, +12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404, +12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417, +12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430, +12431,12432,12433,12434,12435,59250,59251,59252,59253,59254,59255,59256,59257, +59258,59259,59260,58950,58951,58952,58953,58954,58955,58956,58957,58958,58959, +58960,58961,58962,58963,58964,58965,58966,58967,58968,58969,58970,58971,58972, +58973,58974,58975,58976,58977,58978,58979,58980,58981,58982,58983,58984,58985, +58986,58987,58988,58989,58990,58991,58992,58993,58994,58995,58996,58997,58998, +58999,59000,59001,59002,59003,59004,59005,59006,59007,59008,59009,59010,59011, +59012,59013,59014,59015,59016,59017,59018,59019,59020, +59021,59022,59023,59024,59025,59026,59027,59028,59029,59030,59031,59032,59033, +59034,59035,59036,59037,59038,59039,59040,59041,59042,59043,59044,59045,12449, +12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, +12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475, +12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488, +12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501, +12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514, +12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527, +12528,12529,12530,12531,12532,12533,12534,59261,59262,59263,59264,59265,59266, +59267,59268,59046,59047,59048,59049,59050,59051,59052,59053,59054,59055,59056, +59057,59058,59059,59060,59061,59062,59063,59064,59065,59066,59067,59068,59069, +59070,59071,59072,59073,59074,59075,59076,59077,59078,59079,59080,59081,59082, +59083,59084,59085,59086,59087,59088,59089,59090,59091,59092,59093,59094,59095, +59096,59097,59098,59099,59100,59101,59102,59103,59104,59105,59106,59107,59108, +59109,59110,59111,59112,59113,59114,59115,59116,59117,59118,59119,59120,59121, +59122,59123,59124,59125,59126,59127,59128,59129,59130,59131,59132,59133,59134, +59135,59136,59137,59138,59139,59140,59141,913,914,915,916,917,918,919,920,921, +922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,59269,59270,59271, +59272,59273,59274,59275,59276,945,946,947,948,949,950,951,952,953, 954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,59277,59278,59279, 59280,59281,59282,59283,65077,65078,65081,65082,65087,65088,65085,65086,65089, 65090,65091,65092,59284,59285,65083,65084,65079,65080,65073,59286,65075,65076, @@ -565,280 +574,285 @@ 1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093, 1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,59311,59312,59313,59314, 59315,59316,59317,59318,59319,59320,59321,59322,59323,714,715,729,8211,8213, -8229,8245,8453,8457,8598,8599,8600,8601,8725,8735,8739,8786,8806,8807,8895, -9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566, -9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581, -9582,9583,9584,9585,9586,9587,9601,9602,9603,9604,9605,9606,9607,9608,9609, -9610,9611,9612,9613,9614,9615,9619,9620,9621,9660,9661,9698,9699,9700,9701, -9737,8853,12306,12317,12318,59324,59325,59326,59327,59328,59329,59330,59331, -59332,59333,59334,257,225,462,224,275,233,283,232,299,237,464,236,333,243,466, -242,363,250,468,249,470,472,474,476,252,234,593,59335,324,328,505,609,59337, -59338,59339,59340,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558, -12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571, -12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584, -12585,59341,59342,59343,59344,59345,59346,59347,59348,59349,59350,59351,59352, -59353,59354,59355,59356,59357,59358,59359,59360,59361,12321,12322,12323,12324, -12325,12326,12327,12328,12329,12963,13198,13199,13212,13213,13214,13217,13252, -13262,13265,13266,13269,65072,65506,65508,59362,8481,12849,59363,8208,59364, -59365,59366,12540,12443,12444,12541,12542,12294,12445,12446,65097,65098,65099, -65100,65101,65102,65103,65104,65105,65106,65108,65109,65110,65111,65113,65114, -65115,65116,65117,65118,65119,65120,65121,65122,65123,65124,65125,65126,65128, -65129,65130,65131,12350,12272,12273,12274,12275,12276,12277,12278,12279,12280, -12281,12282,12283,12295,59380,59381,59382,59383,59384,59385,59386,59387,59388, -59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478,9479,9480,9481, -9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493,9494,9495,9496, -9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,9510,9511, -9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523,9524,9525,9526, -9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538,9539,9540,9541, -9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397,59398,59399,59400, -59401,59402,59403,59404,59405,59406,59407,29404,29405,29407,29410,29411,29412, -29413,29414,29415,29418,29419,29429,29430,29433,29437,29438,29439,29440,29442, -29444,29445,29446,29447,29448,29449,29451,29452,29453,29455,29456,29457,29458, -29460,29464,29465,29466,29471,29472,29475,29476,29478,29479,29480,29485,29487, -29488,29490,29491,29493,29494,29498,29499,29500,29501,29504,29505,29506,29507, -29508,29509,29510,29511,29512,29513,29514,29515,29516,29518,29519,29521,29523, -29524,29525,29526,29528,29529,29530,29531,29532,29533,29534,29535,29537,29538, -29539,29540,29541,29542,29543,29544,29545,29546,29547,29550,29552,29553,57344, -57345,57346,57347,57348,57349,57350,57351,57352,57353,57354,57355,57356,57357, -57358,57359,57360,57361,57362,57363,57364,57365,57366,57367,57368,57369,57370, -57371,57372,57373,57374,57375,57376,57377,57378,57379,57380,57381,57382,57383, -57384,57385,57386,57387,57388,57389,57390,57391,57392,57393,57394,57395,57396, -57397,57398,57399,57400,57401,57402,57403,57404,57405,57406,57407,57408,57409, -57410,57411,57412,57413,57414,57415,57416,57417,57418,57419,57420,57421,57422, -57423,57424,57425,57426,57427,57428,57429,57430,57431,57432,57433,57434,57435, -57436,57437,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,29564, -29565,29567,29568,29569,29570,29571,29573,29574,29576,29578,29580,29581,29583, -29584,29586,29587,29588,29589,29591,29592,29593,29594,29596,29597,29598,29600, -29601,29603,29604,29605,29606,29607,29608,29610,29612,29613,29617,29620,29621, -29622,29624,29625,29628,29629,29630,29631,29633,29635,29636,29637,29638,29639, -29643,29644,29646,29650,29651,29652,29653,29654,29655,29656,29658,29659,29660, -29661,29663,29665,29666,29667,29668,29670,29672,29674,29675,29676,29678,29679, -29680,29681,29683,29684,29685,29686,29687,57438,57439,57440,57441,57442,57443, -57444,57445,57446,57447,57448,57449,57450,57451,57452,57453,57454,57455,57456, -57457,57458,57459,57460,57461,57462,57463,57464,57465,57466,57467,57468,57469, -57470,57471,57472,57473,57474,57475,57476,57477,57478,57479,57480,57481,57482, -57483,57484,57485,57486,57487,57488,57489,57490,57491,57492,57493,57494,57495, -57496,57497,57498,57499,57500,57501,57502,57503,57504,57505,57506,57507,57508, -57509,57510,57511,57512,57513,57514,57515,57516,57517,57518,57519,57520,57521, -57522,57523,57524,57525,57526,57527,57528,57529,57530,57531,29688,29689,29690, -29691,29692,29693,29694,29695,29696,29697,29698,29700,29703,29704,29707,29708, -29709,29710,29713,29714,29715,29716,29717,29718,29719,29720,29721,29724,29725, -29726,29727,29728,29729,29731,29732,29735,29737,29739,29741,29743,29745,29746, -29751,29752,29753,29754,29755,29757,29758,29759,29760,29762,29763,29764,29765, -29766,29767,29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778, -29779,29780,29782,29784,29789,29792,29793,29794,29795,29796,29797,29798,29799, -29800,29801,29802,29803,29804,29806,29807,29809,29810,29811,29812,29813,29816, -29817,29818,57532,57533,57534,57535,57536,57537,57538,57539,57540,57541,57542, -57543,57544,57545,57546,57547,57548,57549,57550,57551,57552,57553,57554,57555, -57556,57557,57558,57559,57560,57561,57562,57563,57564,57565,57566,57567,57568, -57569,57570,57571,57572,57573,57574,57575,57576,57577,57578,57579,57580,57581, -57582,57583,57584,57585,57586,57587,57588,57589,57590,57591,57592,57593,57594, -57595,57596,57597,57598,57599,57600,57601,57602,57603,57604,57605,57606,57607, -57608,57609,57610,57611,57612,57613,57614,57615,57616,57617,57618,57619,57620, -57621,57622,57623,57624,57625,29819,29820,29821,29823,29826,29828,29829,29830, -29832,29833,29834,29836,29837,29839,29841,29842,29843,29844,29845,29846,29847, -29848,29849,29850,29851,29853,29855,29856,29857,29858,29859,29860,29861,29862, -29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878, -29879,29880,29881,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892, -29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905, -29907,29908,29909,29910,29911,29912,29913,29914,29915,29917,29919,29921,29925, -29927,29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628, -57629,57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641, -57642,57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654, -57655,57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667, -57668,57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680, -57681,57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693, -57694,57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706, -57707,57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719, -29939,29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955, -29957,29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973, -29974,29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994, -29998,30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023, -30025,30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046, -30047,30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062, -30063,30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080, -30081,30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727, -57728,57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740, -57741,57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753, -57754,57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766, -57767,57768,57769,57770,57771,57772,57773,57774,57775,57776,57777,57778,57779, -57780,57781,57782,57783,57784,57785,57786,57787,57788,57789,57790,57791,57792, -57793,57794,57795,57796,57797,57798,57799,57800,57801,57802,57803,57804,57805, -57806,57807,57808,57809,57810,57811,57812,57813,30088,30089,30090,30092,30093, -30094,30096,30099,30101,30104,30107,30108,30110,30114,30118,30119,30120,30121, -30122,30125,30134,30135,30138,30139,30143,30144,30145,30150,30155,30156,30158, -30159,30160,30161,30163,30167,30169,30170,30172,30173,30175,30176,30177,30181, -30185,30188,30189,30190,30191,30194,30195,30197,30198,30199,30200,30202,30203, -30205,30206,30210,30212,30214,30215,30216,30217,30219,30221,30222,30223,30225, -30226,30227,30228,30230,30234,30236,30237,30238,30241,30243,30247,30248,30252, -30254,30255,30257,30258,30262,30263,30265,30266,30267,30269,30273,30274,30276, -57814,57815,57816,57817,57818,57819,57820,57821,57822,57823,57824,57825,57826, -57827,57828,57829,57830,57831,57832,57833,57834,57835,57836,57837,57838,57839, -57840,57841,57842,57843,57844,57845,57846,57847,57848,57849,57850,57851,57852, -57853,57854,57855,57856,57857,57858,57859,57860,57861,57862,57863,57864,57865, -57866,57867,57868,57869,57870,57871,57872,57873,57874,57875,57876,57877,57878, -57879,57880,57881,57882,57883,57884,57885,57886,57887,57888,57889,57890,57891, -57892,57893,57894,57895,57896,57897,57898,57899,57900,57901,57902,57903,57904, -57905,57906,57907,30277,30278,30279,30280,30281,30282,30283,30286,30287,30288, -30289,30290,30291,30293,30295,30296,30297,30298,30299,30301,30303,30304,30305, -30306,30308,30309,30310,30311,30312,30313,30314,30316,30317,30318,30320,30321, -30322,30323,30324,30325,30326,30327,30329,30330,30332,30335,30336,30337,30339, -30341,30345,30346,30348,30349,30351,30352,30354,30356,30357,30359,30360,30362, -30363,30364,30365,30366,30367,30368,30369,30370,30371,30373,30374,30375,30376, -30377,30378,30379,30380,30381,30383,30384,30387,30389,30390,30391,30392,30393, -30394,30395,30396,30397,30398,30400,30401,30403,21834,38463,22467,25384,21710, -21769,21696,30353,30284,34108,30702,33406,30861,29233,38552,38797,27688,23433, -20474,25353,26263,23736,33018,26696,32942,26114,30414,20985,25942,29100,32753, -34948,20658,22885,25034,28595,33453,25420,25170,21485,21543,31494,20843,30116, -24052,25300,36299,38774,25226,32793,22365,38712,32610,29240,30333,26575,30334, -25670,20336,36133,25308,31255,26001,29677,25644,25203,33324,39041,26495,29256, -25198,25292,20276,29923,21322,21150,32458,37030,24110,26758,27036,33152,32465, -26834,30917,34444,38225,20621,35876,33502,32990,21253,35090,21093,30404,30407, -30409,30411,30412,30419,30421,30425,30426,30428,30429,30430,30432,30433,30434, -30435,30436,30438,30439,30440,30441,30442,30443,30444,30445,30448,30451,30453, -30454,30455,30458,30459,30461,30463,30464,30466,30467,30469,30470,30474,30476, -30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30491,30492, -30493,30494,30497,30499,30500,30501,30503,30506,30507,30508,30510,30512,30513, -30514,30515,30516,30521,30523,30525,30526,30527,30530,30532,30533,30534,30536, -30537,30538,30539,30540,30541,30542,30543,30546,30547,30548,30549,30550,30551, -30552,30553,30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961, -40077,29190,26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384, -22791,24811,28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454, -36856,36924,40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606, -24065,24199,30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829, -36793,32534,36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426, -33176,34920,40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853, -20912,26564,19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569, -30570,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584, -30586,30587,30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607, -30608,30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622, -30625,30627,30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646, -30647,30648,30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662, -30663,30664,30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676, -30677,30678,30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182, -29627,33760,25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091, -33334,33046,33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067, -27493,31807,37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319, -24425,33756,34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179, -27815,34255,25805,31961,27133,26361,33609,21397,31574,20391,20876,27979,23618, -36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046,35815,25286, -26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416,39076,26124, -29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711,30713,30714, -30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734,30735,30736, -30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762,30763,30766, -30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787,30788,30790, -30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809,30810,30811, -30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825, -30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842,30843,30845, -30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607,32928,21378, -25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034,21557,28818, -36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216,24561,27785, -38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243,24809,28548, -35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831,24347,39536, -32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411,23815,23456, -25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985,33261,21021, -20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853,30854,30856, -30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878,30880,30882, -30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901,30902,30903, -30904,30906,30907,30908,30909,30911,30912,30914,30915,30916,30918,30919,30920, -30924,30925,30926,30927,30929,30930,30931,30934,30935,30936,30938,30939,30940, -30941,30942,30943,30944,30945,30946,30947,30948,30949,30950,30951,30953,30954, -30955,30957,30958,30959,30960,30961,30963,30965,30966,30968,30969,30971,30972, -30973,30974,30975,30976,30978,30979,30980,30982,30983,30984,30985,30986,30987, -30988,30784,20648,30679,25616,35302,22788,25571,24029,31359,26941,20256,33337, -21912,20018,30126,31383,24162,24202,38383,21019,21561,28810,25462,38180,22402, -26149,26943,37255,21767,28147,32431,34850,25139,32496,30133,33576,30913,38604, -36766,24904,29943,35789,27492,21050,36176,27425,32874,33905,22257,21254,20174, -19995,20945,31895,37259,31751,20419,36479,31713,31388,25703,23828,20652,33030, -30209,31929,28140,32736,26449,23384,23544,30923,25774,25619,25514,25387,38169, -25645,36798,31572,30249,25171,22823,21574,27513,20643,25140,24102,27526,20195, -36151,34955,24453,36910,30989,30990,30991,30992,30993,30994,30996,30997,30998, -30999,31000,31001,31002,31003,31004,31005,31007,31008,31009,31010,31011,31013, -31014,31015,31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026, -31027,31029,31030,31031,31032,31033,31037,31039,31042,31043,31044,31045,31047, -31050,31051,31052,31053,31054,31055,31056,31057,31058,31060,31061,31064,31065, -31073,31075,31076,31078,31081,31082,31083,31084,31086,31088,31089,31090,31091, -31092,31093,31094,31097,31099,31100,31101,31102,31103,31106,31107,31110,31111, -31112,31113,31115,31116,31117,31118,31120,31121,31122,24608,32829,25285,20025, -21333,37112,25528,32966,26086,27694,20294,24814,28129,35806,24377,34507,24403, -25377,20826,33633,26723,20992,25443,36424,20498,23707,31095,23548,21040,31291, -24764,36947,30423,24503,24471,30340,36460,28783,30331,31561,30634,20979,37011, -22564,20302,28404,36842,25932,31515,29380,28068,32735,23265,25269,24213,22320, -33922,31532,24093,24351,36882,32532,39072,25474,28359,30872,28857,20856,38747, -22443,30005,20291,30008,24215,24806,22880,28096,27583,30857,21500,38613,20939, -20993,25481,21514,38035,35843,36300,29241,30879,34678,36845,35853,21472,31123, -31124,31125,31126,31127,31128,31129,31131,31132,31133,31134,31135,31136,31137, -31138,31139,31140,31141,31142,31144,31145,31146,31147,31148,31149,31150,31151, -31152,31153,31154,31156,31157,31158,31159,31160,31164,31167,31170,31172,31173, -31175,31176,31178,31180,31182,31183,31184,31187,31188,31190,31191,31193,31194, -31195,31196,31197,31198,31200,31201,31202,31205,31208,31210,31212,31214,31217, -31218,31219,31220,31221,31222,31223,31225,31226,31228,31230,31231,31233,31236, -31237,31239,31240,31241,31242,31244,31247,31248,31249,31250,31251,31253,31254, -31256,31257,31259,31260,19969,30447,21486,38025,39030,40718,38189,23450,35746, -20002,19996,20908,33891,25026,21160,26635,20375,24683,20923,27934,20828,25238, -26007,38497,35910,36887,30168,37117,30563,27602,29322,29420,35835,22581,30585, -36172,26460,38208,32922,24230,28193,22930,31471,30701,38203,27573,26029,32526, -22534,20817,38431,23545,22697,21544,36466,25958,39039,22244,38045,30462,36929, -25479,21702,22810,22842,22427,36530,26421,36346,33333,21057,24816,22549,34558, -23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295,24681, -32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268,31269, -31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282, -31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301,31303, -31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316,31317, -31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,31331, -31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31345, -31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370,31371, -31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394,36144, -21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763,27146, -30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867,22346, -33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750,21857, -39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545,27675, -20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016,23553, -26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857,20964, -20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526,20239, -20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409,31410, -31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424,31425, -31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438,31439, -31440,31441,31442,31443,31444,31445,31447,31448,31450,31451,31452,31453,31457, -31458,31460,31463,31464,31465,31466,31467,31468,31470,31472,31473,31474,31475, -31476,31477,31478,31479,31480,31483,31484,31486,31488,31489,31490,31493,31495, -31497,31500,31501,31502,31504,31506,31507,31510,31511,31512,31514,31516,31517, -31519,31521,31522,31523,31527,31529,31533,28014,28074,31119,34993,24343,29995, -25242,36741,20463,37340,26023,33071,33105,24220,33104,36212,21103,35206,36171, -22797,20613,20184,38428,29238,33145,36127,23500,35747,38468,22919,32538,21648, -22134,22030,35813,25913,27010,38041,30422,28297,24178,29976,26438,26577,31487, -32925,36214,24863,31174,25954,36195,20872,21018,38050,32568,32923,32434,23703, -28207,26464,31705,30347,39640,33167,32660,31957,25630,38224,31295,21578,21733, -27468,25601,25096,40509,33011,30105,21106,38761,33883,26684,34532,38401,38548, -38124,20010,21508,32473,26681,36319,32789,26356,24218,32697,31535,31536,31538, -31540,31541,31542,31543,31545,31547,31549,31551,31552,31553,31554,31555,31556, -31558,31560,31562,31565,31566,31571,31573,31575,31577,31580,31582,31583,31585, -31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,31599,31600, -31603,31604,31606,31608,31610,31612,31613,31615,31617,31618,31619,31620,31622, -31623,31624,31625,31626,31627,31628,31630,31631,31633,31634,31635,31638,31640, -31641,31642,31643,31646,31647,31648,31651,31652,31653,31662,31663,31664,31666, -31667,31669,31670,31671,31673,31674,31675,31676,31677,31678,31679,31680,31682, -31683,31684,22466,32831,26775,24037,25915,21151,24685,40858,20379,36524,20844, -23467,24339,24041,27742,25329,36129,20849,38057,21246,27807,33503,29399,22434, -26500,36141,22815,36764,33735,21653,31629,20272,27837,23396,22993,40723,21476, -34506,39592,35895,32929,25925,39038,22266,38599,21038,29916,21072,23521,25346, -35074,20054,25296,24618,26874,20851,23448,20896,35266,31649,39302,32592,24815, -28748,36143,20809,24191,36891,29808,35268,22317,30789,24402,40863,38394,36712, -39740,35809,30328,26690,26588,36330,36149,21053,36746,28378,26829,38149,37101, -22269,26524,35065,36807,21704,31685,31688,31689,31690,31691,31693,31694,31695, -31696,31698,31700,31701,31702,31703,31704,31707,31708,31710,31711,31712,31714, -31715,31716,31719,31720,31721,31723,31724,31725,31727,31728,31730,31731,31732, -31733,31734,31736,31737,31738,31739,31741,31743,31744,31745,31746,31747,31748, -31749,31750,31752,31753,31754,31757,31758,31760,31761,31762,31763,31764,31765, -31767,31768,31769,31770,31771,31772,31773,31774,31776,31777,31778,31779,31780, -31781,31784,31785,31787,31788,31789,31790,31791,31792,31793,31794,31795,31796, -31797,31798,31799,31801,31802,31803,31804,31805,31806,31810,39608,23401,28023, -27686,20133,23475,39559,37219,25000,37039,38889,21547,28085,23506,20989,21898, -32597,32752,25788,25421,26097,25022,24717,28938,27735,27721,22831,26477,33322, -22741,22158,35946,27627,37085,22909,32791,21495,28009,21621,21917,33655,33743, -26680,31166,21644,20309,21512,30418,35977,38402,27827,28088,36203,35088,40548, -36154,22079,40657,30165,24456,29408,24680,21756,20136,27178,34913,24658,36720, -21700,28888,34425,40511,27946,23439,24344,32418,21897,20399,29492,21564,21402, +8229,8245,8453,8457,8598,8599,8600,8601, +8725,8735,8739,8786,8806,8807,8895,9552,9553,9554,9555,9556,9557,9558,9559, +9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574, +9575,9576,9577,9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9601,9602, +9603,9604,9605,9606,9607,9608,9609,9610,9611,9612,9613,9614,9615,9619,9620, +9621,9660,9661,9698,9699,9700,9701,9737,8853,12306,12317,12318,59324,59325, +59326,59327,59328,59329,59330,59331,59332,59333,59334,257,225,462,224,275,233, +283,232,299,237,464,236,333,243,466,242,363,250,468,249,470,472,474,476,252, +234,593,59335,324,328,505,609,59337,59338,59339,59340,12549,12550,12551,12552, +12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565, +12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578, +12579,12580,12581,12582,12583,12584,12585,59341,59342,59343,59344,59345,59346, +59347,59348,59349,59350,59351,59352,59353,59354,59355,59356,59357,59358,59359, +59360,59361,12321,12322,12323,12324,12325,12326,12327,12328,12329,12963,13198, +13199,13212,13213,13214,13217,13252,13262,13265,13266,13269,65072,65506,65508, +59362,8481,12849,59363,8208,59364,59365,59366,12540,12443,12444,12541,12542, +12294,12445,12446,65097,65098,65099,65100,65101,65102,65103,65104,65105,65106, +65108,65109,65110,65111,65113,65114,65115,65116,65117,65118,65119,65120,65121, +65122,65123,65124,65125,65126,65128,65129,65130,65131,12350,12272,12273,12274, +12275,12276,12277, +12278,12279,12280,12281,12282,12283,12295,59380,59381,59382,59383,59384,59385, +59386,59387,59388,59389,59390,59391,59392,9472,9473,9474,9475,9476,9477,9478, +9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,9489,9490,9491,9492,9493, +9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506,9507,9508, +9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,9521,9522,9523, +9524,9525,9526,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536,9537,9538, +9539,9540,9541,9542,9543,9544,9545,9546,9547,59393,59394,59395,59396,59397, +59398,59399,59400,59401,59402,59403,59404,59405,59406,59407,29404,29405,29407, +29410,29411,29412,29413,29414,29415,29418,29419,29429,29430,29433,29437,29438, +29439,29440,29442,29444,29445,29446,29447,29448,29449,29451,29452,29453,29455, +29456,29457,29458,29460,29464,29465,29466,29471,29472,29475,29476,29478,29479, +29480,29485,29487,29488,29490,29491,29493,29494,29498,29499,29500,29501,29504, +29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29518, +29519,29521,29523,29524,29525,29526,29528,29529,29530,29531,29532,29533,29534, +29535,29537,29538,29539,29540,29541,29542,29543,29544,29545,29546,29547,29550, +29552,29553,57344,57345,57346,57347,57348,57349,57350,57351,57352,57353,57354, +57355,57356,57357,57358,57359,57360,57361,57362,57363,57364,57365,57366,57367, +57368,57369,57370,57371,57372,57373,57374,57375,57376,57377,57378,57379,57380, +57381,57382,57383,57384,57385,57386,57387,57388,57389,57390,57391,57392, +57393,57394,57395,57396,57397,57398,57399,57400,57401,57402,57403,57404,57405, +57406,57407,57408,57409,57410,57411,57412,57413,57414,57415,57416,57417,57418, +57419,57420,57421,57422,57423,57424,57425,57426,57427,57428,57429,57430,57431, +57432,57433,57434,57435,57436,57437,29554,29555,29556,29557,29558,29559,29560, +29561,29562,29563,29564,29565,29567,29568,29569,29570,29571,29573,29574,29576, +29578,29580,29581,29583,29584,29586,29587,29588,29589,29591,29592,29593,29594, +29596,29597,29598,29600,29601,29603,29604,29605,29606,29607,29608,29610,29612, +29613,29617,29620,29621,29622,29624,29625,29628,29629,29630,29631,29633,29635, +29636,29637,29638,29639,29643,29644,29646,29650,29651,29652,29653,29654,29655, +29656,29658,29659,29660,29661,29663,29665,29666,29667,29668,29670,29672,29674, +29675,29676,29678,29679,29680,29681,29683,29684,29685,29686,29687,57438,57439, +57440,57441,57442,57443,57444,57445,57446,57447,57448,57449,57450,57451,57452, +57453,57454,57455,57456,57457,57458,57459,57460,57461,57462,57463,57464,57465, +57466,57467,57468,57469,57470,57471,57472,57473,57474,57475,57476,57477,57478, +57479,57480,57481,57482,57483,57484,57485,57486,57487,57488,57489,57490,57491, +57492,57493,57494,57495,57496,57497,57498,57499,57500,57501,57502,57503,57504, +57505,57506,57507,57508,57509,57510,57511,57512,57513,57514,57515,57516,57517, +57518,57519,57520,57521,57522,57523,57524,57525,57526,57527,57528,57529,57530, +57531,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,29700, +29703,29704,29707,29708,29709,29710,29713,29714,29715, +29716,29717,29718,29719,29720,29721,29724,29725,29726,29727,29728,29729,29731, +29732,29735,29737,29739,29741,29743,29745,29746,29751,29752,29753,29754,29755, +29757,29758,29759,29760,29762,29763,29764,29765,29766,29767,29768,29769,29770, +29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29782,29784,29789, +29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,29804, +29806,29807,29809,29810,29811,29812,29813,29816,29817,29818,57532,57533,57534, +57535,57536,57537,57538,57539,57540,57541,57542,57543,57544,57545,57546,57547, +57548,57549,57550,57551,57552,57553,57554,57555,57556,57557,57558,57559,57560, +57561,57562,57563,57564,57565,57566,57567,57568,57569,57570,57571,57572,57573, +57574,57575,57576,57577,57578,57579,57580,57581,57582,57583,57584,57585,57586, +57587,57588,57589,57590,57591,57592,57593,57594,57595,57596,57597,57598,57599, +57600,57601,57602,57603,57604,57605,57606,57607,57608,57609,57610,57611,57612, +57613,57614,57615,57616,57617,57618,57619,57620,57621,57622,57623,57624,57625, +29819,29820,29821,29823,29826,29828,29829,29830,29832,29833,29834,29836,29837, +29839,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,29853, +29855,29856,29857,29858,29859,29860,29861,29862,29866,29867,29868,29869,29870, +29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,29883,29884, +29885,29886,29887,29888,29889,29890,29891,29892,29893,29894,29895,29896,29897, +29898,29899,29900,29901,29902,29903,29904,29905,29907,29908,29909,29910,29911, +29912,29913,29914,29915,29917,29919,29921,29925,29927, +29928,29929,29930,29931,29932,29933,29936,29937,29938,57626,57627,57628,57629, +57630,57631,57632,57633,57634,57635,57636,57637,57638,57639,57640,57641,57642, +57643,57644,57645,57646,57647,57648,57649,57650,57651,57652,57653,57654,57655, +57656,57657,57658,57659,57660,57661,57662,57663,57664,57665,57666,57667,57668, +57669,57670,57671,57672,57673,57674,57675,57676,57677,57678,57679,57680,57681, +57682,57683,57684,57685,57686,57687,57688,57689,57690,57691,57692,57693,57694, +57695,57696,57697,57698,57699,57700,57701,57702,57703,57704,57705,57706,57707, +57708,57709,57710,57711,57712,57713,57714,57715,57716,57717,57718,57719,29939, +29941,29944,29945,29946,29947,29948,29949,29950,29952,29953,29954,29955,29957, +29958,29959,29960,29961,29962,29963,29964,29966,29968,29970,29972,29973,29974, +29975,29979,29981,29982,29984,29985,29986,29987,29988,29990,29991,29994,29998, +30004,30006,30009,30012,30013,30015,30017,30018,30019,30020,30022,30023,30025, +30026,30029,30032,30033,30034,30035,30037,30038,30039,30040,30045,30046,30047, +30048,30049,30050,30051,30052,30055,30056,30057,30059,30060,30061,30062,30063, +30064,30065,30067,30069,30070,30071,30074,30075,30076,30077,30078,30080,30081, +30082,30084,30085,30087,57720,57721,57722,57723,57724,57725,57726,57727,57728, +57729,57730,57731,57732,57733,57734,57735,57736,57737,57738,57739,57740,57741, +57742,57743,57744,57745,57746,57747,57748,57749,57750,57751,57752,57753,57754, +57755,57756,57757,57758,57759,57760,57761,57762,57763,57764,57765,57766,57767, +57768,57769,57770,57771,57772,57773,57774,57775,57776, +57777,57778,57779,57780,57781,57782,57783,57784,57785,57786,57787,57788,57789, +57790,57791,57792,57793,57794,57795,57796,57797,57798,57799,57800,57801,57802, +57803,57804,57805,57806,57807,57808,57809,57810,57811,57812,57813,30088,30089, +30090,30092,30093,30094,30096,30099,30101,30104,30107,30108,30110,30114,30118, +30119,30120,30121,30122,30125,30134,30135,30138,30139,30143,30144,30145,30150, +30155,30156,30158,30159,30160,30161,30163,30167,30169,30170,30172,30173,30175, +30176,30177,30181,30185,30188,30189,30190,30191,30194,30195,30197,30198,30199, +30200,30202,30203,30205,30206,30210,30212,30214,30215,30216,30217,30219,30221, +30222,30223,30225,30226,30227,30228,30230,30234,30236,30237,30238,30241,30243, +30247,30248,30252,30254,30255,30257,30258,30262,30263,30265,30266,30267,30269, +30273,30274,30276,57814,57815,57816,57817,57818,57819,57820,57821,57822,57823, +57824,57825,57826,57827,57828,57829,57830,57831,57832,57833,57834,57835,57836, +57837,57838,57839,57840,57841,57842,57843,57844,57845,57846,57847,57848,57849, +57850,57851,57852,57853,57854,57855,57856,57857,57858,57859,57860,57861,57862, +57863,57864,57865,57866,57867,57868,57869,57870,57871,57872,57873,57874,57875, +57876,57877,57878,57879,57880,57881,57882,57883,57884,57885,57886,57887,57888, +57889,57890,57891,57892,57893,57894,57895,57896,57897,57898,57899,57900,57901, +57902,57903,57904,57905,57906,57907,30277,30278,30279,30280,30281,30282,30283, +30286,30287,30288,30289,30290,30291,30293,30295,30296,30297,30298,30299,30301, +30303,30304,30305,30306,30308,30309,30310,30311,30312, +30313,30314,30316,30317,30318,30320,30321,30322,30323,30324,30325,30326,30327, +30329,30330,30332,30335,30336,30337,30339,30341,30345,30346,30348,30349,30351, +30352,30354,30356,30357,30359,30360,30362,30363,30364,30365,30366,30367,30368, +30369,30370,30371,30373,30374,30375,30376,30377,30378,30379,30380,30381,30383, +30384,30387,30389,30390,30391,30392,30393,30394,30395,30396,30397,30398,30400, +30401,30403,21834,38463,22467,25384,21710,21769,21696,30353,30284,34108,30702, +33406,30861,29233,38552,38797,27688,23433,20474,25353,26263,23736,33018,26696, +32942,26114,30414,20985,25942,29100,32753,34948,20658,22885,25034,28595,33453, +25420,25170,21485,21543,31494,20843,30116,24052,25300,36299,38774,25226,32793, +22365,38712,32610,29240,30333,26575,30334,25670,20336,36133,25308,31255,26001, +29677,25644,25203,33324,39041,26495,29256,25198,25292,20276,29923,21322,21150, +32458,37030,24110,26758,27036,33152,32465,26834,30917,34444,38225,20621,35876, +33502,32990,21253,35090,21093,30404,30407,30409,30411,30412,30419,30421,30425, +30426,30428,30429,30430,30432,30433,30434,30435,30436,30438,30439,30440,30441, +30442,30443,30444,30445,30448,30451,30453,30454,30455,30458,30459,30461,30463, +30464,30466,30467,30469,30470,30474,30476,30478,30479,30480,30481,30482,30483, +30484,30485,30486,30487,30488,30491,30492,30493,30494,30497,30499,30500,30501, +30503,30506,30507,30508,30510,30512,30513,30514,30515,30516,30521,30523,30525, +30526,30527,30530,30532,30533,30534,30536,30537,30538,30539,30540,30541,30542, +30543,30546,30547,30548,30549,30550,30551,30552,30553, +30556,34180,38649,20445,22561,39281,23453,25265,25253,26292,35961,40077,29190, +26479,30865,24754,21329,21271,36744,32972,36125,38049,20493,29384,22791,24811, +28953,34987,22868,33519,26412,31528,23849,32503,29997,27893,36454,36856,36924, +40763,27604,37145,31508,24444,30887,34006,34109,27605,27609,27606,24065,24199, +30201,38381,25949,24330,24517,36767,22721,33218,36991,38491,38829,36793,32534, +36140,25153,20415,21464,21342,36776,36777,36779,36941,26631,24426,33176,34920, +40150,24971,21035,30250,24428,25996,28626,28392,23486,25672,20853,20912,26564, +19993,31177,39292,28851,30557,30558,30559,30560,30564,30567,30569,30570,30573, +30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30586,30587, +30588,30593,30594,30595,30598,30599,30600,30601,30602,30603,30607,30608,30611, +30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,30625,30627, +30628,30630,30632,30635,30637,30638,30639,30641,30642,30644,30646,30647,30648, +30649,30650,30652,30654,30656,30657,30658,30659,30660,30661,30662,30663,30664, +30665,30666,30667,30668,30670,30671,30672,30673,30674,30675,30676,30677,30678, +30680,30681,30682,30685,30686,30687,30688,30689,30692,30149,24182,29627,33760, +25773,25320,38069,27874,21338,21187,25615,38082,31636,20271,24091,33334,33046, +33162,28196,27850,39539,25429,21340,21754,34917,22496,19981,24067,27493,31807, +37096,24598,25830,29468,35009,26448,25165,36130,30572,36393,37319,24425,33756, +34081,39184,21442,34453,27531,24813,24808,28799,33485,33329,20179,27815,34255, +25805,31961,27133,26361,33609,21397,31574,20391,20876, +27979,23618,36461,25554,21449,33580,33590,26597,30900,25661,23519,23700,24046, +35815,25286,26612,35962,25600,25530,34633,39307,35863,32544,38130,20135,38416, +39076,26124,29462,30694,30696,30698,30703,30704,30705,30706,30708,30709,30711, +30713,30714,30715,30716,30723,30724,30725,30726,30727,30728,30730,30731,30734, +30735,30736,30739,30741,30745,30747,30750,30752,30753,30754,30756,30760,30762, +30763,30766,30767,30769,30770,30771,30773,30774,30781,30783,30785,30786,30787, +30788,30790,30792,30793,30794,30795,30797,30799,30801,30803,30804,30808,30809, +30810,30811,30812,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823, +30824,30825,30831,30832,30833,30834,30835,30836,30837,30838,30840,30841,30842, +30843,30845,30846,30847,30848,30849,30850,30851,22330,23581,24120,38271,20607, +32928,21378,25950,30021,21809,20513,36229,25220,38046,26397,22066,28526,24034, +21557,28818,36710,25199,25764,25507,24443,28552,37108,33251,36784,23576,26216, +24561,27785,38472,36225,34924,25745,31216,22478,27225,25104,21576,20056,31243, +24809,28548,35802,25215,36894,39563,31204,21507,30196,25345,21273,27744,36831, +24347,39536,32827,40831,20360,23610,36196,32709,26021,28861,20805,20914,34411, +23815,23456,25277,37228,30068,36364,31264,24833,31609,20167,32504,30597,19985, +33261,21021,20986,27249,21416,36487,38148,38607,28353,38500,26970,30852,30853, +30854,30856,30858,30859,30863,30864,30866,30868,30869,30870,30873,30877,30878, +30880,30882,30884,30886,30888,30889,30890,30891,30892,30893,30894,30895,30901, +30902,30903,30904,30906,30907,30908,30909,30911,30912, +30914,30915,30916,30918,30919,30920,30924,30925,30926,30927,30929,30930,30931, +30934,30935,30936,30938,30939,30940,30941,30942,30943,30944,30945,30946,30947, +30948,30949,30950,30951,30953,30954,30955,30957,30958,30959,30960,30961,30963, +30965,30966,30968,30969,30971,30972,30973,30974,30975,30976,30978,30979,30980, +30982,30983,30984,30985,30986,30987,30988,30784,20648,30679,25616,35302,22788, +25571,24029,31359,26941,20256,33337,21912,20018,30126,31383,24162,24202,38383, +21019,21561,28810,25462,38180,22402,26149,26943,37255,21767,28147,32431,34850, +25139,32496,30133,33576,30913,38604,36766,24904,29943,35789,27492,21050,36176, +27425,32874,33905,22257,21254,20174,19995,20945,31895,37259,31751,20419,36479, +31713,31388,25703,23828,20652,33030,30209,31929,28140,32736,26449,23384,23544, +30923,25774,25619,25514,25387,38169,25645,36798,31572,30249,25171,22823,21574, +27513,20643,25140,24102,27526,20195,36151,34955,24453,36910,30989,30990,30991, +30992,30993,30994,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005, +31007,31008,31009,31010,31011,31013,31014,31015,31016,31017,31018,31019,31020, +31021,31022,31023,31024,31025,31026,31027,31029,31030,31031,31032,31033,31037, +31039,31042,31043,31044,31045,31047,31050,31051,31052,31053,31054,31055,31056, +31057,31058,31060,31061,31064,31065,31073,31075,31076,31078,31081,31082,31083, +31084,31086,31088,31089,31090,31091,31092,31093,31094,31097,31099,31100,31101, +31102,31103,31106,31107,31110,31111,31112,31113,31115,31116,31117,31118,31120, +31121,31122,24608,32829,25285,20025,21333,37112,25528, +32966,26086,27694,20294,24814,28129,35806,24377,34507,24403,25377,20826,33633, +26723,20992,25443,36424,20498,23707,31095,23548,21040,31291,24764,36947,30423, +24503,24471,30340,36460,28783,30331,31561,30634,20979,37011,22564,20302,28404, +36842,25932,31515,29380,28068,32735,23265,25269,24213,22320,33922,31532,24093, +24351,36882,32532,39072,25474,28359,30872,28857,20856,38747,22443,30005,20291, +30008,24215,24806,22880,28096,27583,30857,21500,38613,20939,20993,25481,21514, +38035,35843,36300,29241,30879,34678,36845,35853,21472,31123,31124,31125,31126, +31127,31128,31129,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140, +31141,31142,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,31154, +31156,31157,31158,31159,31160,31164,31167,31170,31172,31173,31175,31176,31178, +31180,31182,31183,31184,31187,31188,31190,31191,31193,31194,31195,31196,31197, +31198,31200,31201,31202,31205,31208,31210,31212,31214,31217,31218,31219,31220, +31221,31222,31223,31225,31226,31228,31230,31231,31233,31236,31237,31239,31240, +31241,31242,31244,31247,31248,31249,31250,31251,31253,31254,31256,31257,31259, +31260,19969,30447,21486,38025,39030,40718,38189,23450,35746,20002,19996,20908, +33891,25026,21160,26635,20375,24683,20923,27934,20828,25238,26007,38497,35910, +36887,30168,37117,30563,27602,29322,29420,35835,22581,30585,36172,26460,38208, +32922,24230,28193,22930,31471,30701,38203,27573,26029,32526,22534,20817,38431, +23545,22697,21544,36466,25958,39039,22244,38045,30462,36929,25479,21702,22810, +22842,22427,36530,26421,36346,33333,21057,24816,22549, +34558,23784,40517,20420,39069,35769,23077,24694,21380,25212,36943,37122,39295, +24681,32780,20799,32819,23572,39285,27953,20108,31261,31263,31265,31266,31268, +31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281, +31282,31284,31285,31286,31288,31290,31294,31296,31297,31298,31299,31300,31301, +31303,31304,31305,31306,31307,31308,31309,31310,31311,31312,31314,31315,31316, +31317,31318,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330, +31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343, +31345,31346,31347,31349,31355,31356,31357,31358,31362,31365,31367,31369,31370, +31371,31372,31374,31375,31376,31379,31380,31385,31386,31387,31390,31393,31394, +36144,21457,32602,31567,20240,20047,38400,27861,29648,34281,24070,30058,32763, +27146,30718,38034,32321,20961,28902,21453,36820,33539,36137,29359,39277,27867, +22346,33459,26041,32938,25151,38450,22952,20223,35775,32442,25918,33778,38750, +21857,39134,32933,21290,35837,21536,32954,24223,27832,36153,33452,37210,21545, +27675,20998,32439,22367,28954,27774,31881,22859,20221,24575,24868,31914,20016, +23553,26539,34562,23792,38155,39118,30127,28925,36898,20911,32541,35773,22857, +20964,20315,21542,22827,25975,32932,23413,25206,25282,36752,24133,27679,31526, +20239,20440,26381,31395,31396,31399,31401,31402,31403,31406,31407,31408,31409, +31410,31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31424, +31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31436,31437,31438, +31439,31440,31441,31442,31443,31444,31445,31447,31448, +31450,31451,31452,31453,31457,31458,31460,31463,31464,31465,31466,31467,31468, +31470,31472,31473,31474,31475,31476,31477,31478,31479,31480,31483,31484,31486, +31488,31489,31490,31493,31495,31497,31500,31501,31502,31504,31506,31507,31510, +31511,31512,31514,31516,31517,31519,31521,31522,31523,31527,31529,31533,28014, +28074,31119,34993,24343,29995,25242,36741,20463,37340,26023,33071,33105,24220, +33104,36212,21103,35206,36171,22797,20613,20184,38428,29238,33145,36127,23500, +35747,38468,22919,32538,21648,22134,22030,35813,25913,27010,38041,30422,28297, +24178,29976,26438,26577,31487,32925,36214,24863,31174,25954,36195,20872,21018, +38050,32568,32923,32434,23703,28207,26464,31705,30347,39640,33167,32660,31957, +25630,38224,31295,21578,21733,27468,25601,25096,40509,33011,30105,21106,38761, +33883,26684,34532,38401,38548,38124,20010,21508,32473,26681,36319,32789,26356, +24218,32697,31535,31536,31538,31540,31541,31542,31543,31545,31547,31549,31551, +31552,31553,31554,31555,31556,31558,31560,31562,31565,31566,31571,31573,31575, +31577,31580,31582,31583,31585,31587,31588,31589,31590,31591,31592,31593,31594, +31595,31596,31597,31599,31600,31603,31604,31606,31608,31610,31612,31613,31615, +31617,31618,31619,31620,31622,31623,31624,31625,31626,31627,31628,31630,31631, +31633,31634,31635,31638,31640,31641,31642,31643,31646,31647,31648,31651,31652, +31653,31662,31663,31664,31666,31667,31669,31670,31671,31673,31674,31675,31676, +31677,31678,31679,31680,31682,31683,31684,22466,32831,26775,24037,25915,21151, +24685,40858,20379,36524,20844,23467,24339,24041,27742, +25329,36129,20849,38057,21246,27807,33503,29399,22434,26500,36141,22815,36764, +33735,21653,31629,20272,27837,23396,22993,40723,21476,34506,39592,35895,32929, +25925,39038,22266,38599,21038,29916,21072,23521,25346,35074,20054,25296,24618, +26874,20851,23448,20896,35266,31649,39302,32592,24815,28748,36143,20809,24191, +36891,29808,35268,22317,30789,24402,40863,38394,36712,39740,35809,30328,26690, +26588,36330,36149,21053,36746,28378,26829,38149,37101,22269,26524,35065,36807, +21704,31685,31688,31689,31690,31691,31693,31694,31695,31696,31698,31700,31701, +31702,31703,31704,31707,31708,31710,31711,31712,31714,31715,31716,31719,31720, +31721,31723,31724,31725,31727,31728,31730,31731,31732,31733,31734,31736,31737, +31738,31739,31741,31743,31744,31745,31746,31747,31748,31749,31750,31752,31753, +31754,31757,31758,31760,31761,31762,31763,31764,31765,31767,31768,31769,31770, +31771,31772,31773,31774,31776,31777,31778,31779,31780,31781,31784,31785,31787, +31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31801, +31802,31803,31804,31805,31806,31810,39608,23401,28023,27686,20133,23475,39559, +37219,25000,37039,38889,21547,28085,23506,20989,21898,32597,32752,25788,25421, +26097,25022,24717,28938,27735,27721,22831,26477,33322,22741,22158,35946,27627, +37085,22909,32791,21495,28009,21621,21917,33655,33743,26680,31166,21644,20309, +21512,30418,35977,38402,27827,28088,36203,35088,40548,36154,22079,40657,30165, +24456,29408,24680,21756,20136,27178,34913,24658,36720,21700,28888,34425,40511, +27946,23439,24344,32418,21897,20399,29492,21564,21402, 20505,21518,21628,20046,24573,29786,22774,33899,32993,34676,29392,31946,28246, 31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31822,31823,31824, 31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837, @@ -858,243 +872,247 @@ 31942,31945,31947,31950,31951,31952,31953,31954,31955,31956,31960,31962,31963, 31965,31966,31969,31970,31971,31972,31973,31974,31975,31977,31978,31979,31980, 31981,31982,31984,31985,31986,31987,31988,31989,31990,31991,31993,31994,31996, -31997,31998,31999,32000,32001,32002,32003,32004,32005,32006,32007,32008,32009, -32011,32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023, -32024,32025,32026,32027,32028,32029,32030,32031,32033,32035,32036,32037,32038, -32040,32041,32042,32044,32045,32046,32048,32049,32050,32051,32052,32053,32054, -32908,39269,36857,28608,35749,40481,23020,32489,32521,21513,26497,26840,36753, -31821,38598,21450,24613,30142,27762,21363,23241,32423,25380,20960,33034,24049, -34015,25216,20864,23395,20238,31085,21058,24760,27982,23492,23490,35745,35760, -26082,24524,38469,22931,32487,32426,22025,26551,22841,20339,23478,21152,33626, -39050,36158,30002,38078,20551,31292,20215,26550,39550,23233,27516,30417,22362, -23574,31546,38388,29006,20860,32937,33392,22904,32516,33575,26816,26604,30897, -30839,25315,25441,31616,20461,21098,20943,33616,27099,37492,36341,36145,35265, -38190,31661,20214,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064, -32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077, -32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,32090, -32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,32102,32103, -32104,32105,32106,32107,32108,32109,32111,32112,32113,32114,32115,32116,32117, -32118,32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131, -32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,32144, -32145,32146,32147,32148,32149,32150,32151,32152,20581,33328,21073,39279,28176, -28293,28071,24314,20725,23004,23558,27974,27743,30086,33931,26728,22870,35762, -21280,37233,38477,34121,26898,30977,28966,33014,20132,37066,27975,39556,23047, -22204,25605,38128,30699,20389,33050,29409,35282,39290,32564,32478,21119,25945, -37237,36735,36739,21483,31382,25581,25509,30342,31224,34903,38454,25130,21163, -33410,26708,26480,25463,30571,31469,27905,32467,35299,22992,25106,34249,33445, -30028,20511,20171,30117,35819,23626,24062,31563,26020,37329,20170,27941,35167, -32039,38182,20165,35880,36827,38771,26187,31105,36817,28908,28024,32153,32154, -32155,32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32167,32168, -32169,32170,32171,32172,32173,32175,32176,32177,32178,32179,32180,32181,32182, -32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,32195, -32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208, -32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221, -32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,32234, -32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,32246,32247, -32248,32249,32250,23613,21170,33606,20834,33550,30555,26230,40120,20140,24778, -31934,31923,32463,20117,35686,26223,39048,38745,22659,25964,38236,24452,30153, -38742,31455,31454,20928,28847,31384,25578,31350,32416,29590,38893,20037,28792, -20061,37202,21417,25937,26087,33276,33285,21646,23601,30106,38816,25304,29401, -30141,23621,39545,33738,23616,21632,30697,20030,27822,32858,25298,25454,24040, -20855,36317,36382,38191,20465,21477,24807,28844,21095,25424,40515,23071,20518, -30519,21367,32482,25733,25899,25225,25496,20500,29237,35273,20915,35776,32477, -22343,33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257, -32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270, -32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283, -32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296, -32297,32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309, -32310,32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324, -32325,32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338, -32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459, -27994,37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002, -22570,21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771, -25335,28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487, -28212,20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656, -23380,25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044, -22840,22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568, -29378,26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745, -20608,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361, -32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374, -32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388, -32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401, -32402,32403,32404,32405,32406,32407,32408,32409,32410,32412,32413,32414,32430, -32436,32443,32444,32470,32484,32492,32505,32522,32528,32542,32567,32569,32571, -32572,32573,32574,32575,32576,32577,32579,32582,32583,32584,32585,32586,32587, -32588,32589,32590,32591,32594,32595,39304,24871,28291,22372,26118,25414,22256, -25324,25193,24275,38420,22403,25289,21895,34593,33098,36771,21862,33713,26469, -36182,34013,23146,26639,25318,31726,38417,20848,28572,35888,25597,35272,25042, -32518,28866,28389,29701,27028,29436,24266,37070,26391,28010,25438,21171,29282, -32769,20332,23013,37226,28889,28061,21202,20048,38647,38253,34174,30922,32047, -20769,22418,25794,32907,31867,27882,26865,26974,20919,21400,26792,29313,40654, -31729,29432,31163,28435,29702,26446,37324,40100,31036,33673,33620,21519,26647, -20029,21385,21169,30782,21382,21033,20616,20363,20432,32598,32601,32603,32604, -32605,32606,32608,32611,32612,32613,32614,32615,32619,32620,32621,32623,32624, -32627,32629,32630,32631,32632,32634,32635,32636,32637,32639,32640,32642,32643, -32644,32645,32646,32647,32648,32649,32651,32653,32655,32656,32657,32658,32659, -32661,32662,32663,32664,32665,32667,32668,32672,32674,32675,32677,32678,32680, -32681,32682,32683,32684,32685,32686,32689,32691,32692,32693,32694,32695,32698, -32699,32702,32704,32706,32707,32708,32710,32711,32712,32713,32715,32717,32719, -32720,32721,32722,32723,32726,32727,32729,32730,32731,32732,32733,32734,32738, -32739,30178,31435,31890,27813,38582,21147,29827,21737,20457,32852,33714,36830, -38256,24265,24604,28063,24088,25947,33080,38142,24651,28860,32451,31918,20937, -26753,31921,33391,20004,36742,37327,26238,20142,35845,25769,32842,20698,30103, -29134,23525,36797,28518,20102,25730,38243,24278,26009,21015,35010,28872,21155, -29454,29747,26519,30967,38678,20020,37051,40158,28107,20955,36161,21533,25294, -29618,33777,38646,40836,38083,20278,32666,20940,28789,38517,23725,39046,21478, -20196,28316,29705,27060,30827,39311,30041,21016,30244,27969,26611,20845,40857, -32843,21657,31548,31423,32740,32743,32744,32746,32747,32748,32749,32751,32754, -32756,32757,32758,32759,32760,32761,32762,32765,32766,32767,32770,32775,32776, -32777,32778,32782,32783,32785,32787,32794,32795,32797,32798,32799,32801,32803, -32804,32811,32812,32813,32814,32815,32816,32818,32820,32825,32826,32828,32830, -32832,32833,32836,32837,32839,32840,32841,32846,32847,32848,32849,32851,32853, -32854,32855,32857,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868, -32869,32870,32871,32872,32875,32876,32877,32878,32879,32880,32882,32883,32884, -32885,32886,32887,32888,32889,32890,32891,32892,32893,38534,22404,25314,38471, -27004,23044,25602,31699,28431,38475,33446,21346,39045,24208,28809,25523,21348, -34383,40065,40595,30860,38706,36335,36162,40575,28510,31108,24405,38470,25134, -39540,21525,38109,20387,26053,23653,23649,32533,34385,27695,24459,29575,28388, -32511,23782,25371,23402,28390,21365,20081,25504,30053,25249,36718,20262,20177, -27814,32438,35770,33821,34746,32599,36923,38179,31657,39585,35064,33853,27931, -39558,32476,22920,40635,29595,30721,34434,39532,39554,22043,21527,22475,20080, -40614,21334,36808,33033,30610,39314,34542,28385,34067,26364,24930,28459,32894, -32897,32898,32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917, -32919,32921,32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952, -32953,32955,32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979, -32980,32981,32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019, -33022,33023,33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047, -33049,33051,33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063, -33064,33065,33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082, -33083,33084,33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541, -38170,27611,30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522, -26757,37238,38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969, -23194,38376,38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511, -37274,38753,31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130, -26825,30496,32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256, -31186,28218,24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126, -34719,40483,38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093, -33095,33097,33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118, -33119,33121,33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139, -33141,33142,33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164, -33165,33166,33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183, -33184,33185,33186,33188,33189,33191,33193,33195,33196,33197,33198,33199,33200, -33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214,33215,33220, -33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234,33235,25721, -34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664,27819,28448, -23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675,26286,24149, -21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048,37027,23068, -32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376,33041,24700, -38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877,23612,25311, -20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467,24565,23064, -37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744,26592,29406, -20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244,33245,33246, -33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262,33263,33264, -33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283,33287,33288, -33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304,33305,33306, -33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340,33341,33343, -33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358,33360,33361, -33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374,33376,33377, -33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197,38062,32445, -33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111,25386,25062, -31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866,36276,29228, -24085,24597,29750,25293,25490,29260,24472,28227,27966,25856,28504,30424,30928, -30460,30036,21028,21467,20051,24222,26049,32810,32982,25243,21638,21032,28846, -34957,36305,27873,21624,32986,22521,35060,36180,38506,37197,20329,27803,21943, -30406,30768,25256,28921,28558,24429,34028,26842,30844,31735,33192,26379,40527, -25447,30896,22383,30738,38713,25209,25259,21128,29749,27607,33386,33387,33388, -33389,33393,33397,33398,33399,33400,33403,33404,33408,33409,33411,33413,33414, -33415,33417,33420,33424,33427,33428,33429,33430,33434,33435,33438,33440,33442, -33443,33447,33458,33461,33462,33466,33467,33468,33471,33472,33474,33475,33477, -33478,33481,33488,33494,33497,33498,33501,33506,33511,33512,33513,33514,33516, -33517,33518,33520,33522,33523,33525,33526,33528,33530,33532,33533,33534,33535, -33536,33546,33547,33549,33552,33554,33555,33558,33560,33561,33565,33566,33567, -33568,33569,33570,33571,33572,33573,33574,33577,33578,33582,33584,33586,33591, -33595,33597,21860,33086,30130,30382,21305,30174,20731,23617,35692,31687,20559, -29255,39575,39128,28418,29922,31080,25735,30629,25340,39057,36139,21697,32856, -20050,22378,33529,33805,24179,20973,29942,35780,23631,22369,27900,39047,23110, -30772,39748,36843,31893,21078,25169,38138,20166,33670,33889,33769,33970,22484, -26420,22275,26222,28006,35889,26333,28689,26399,27450,26646,25114,22971,19971, -20932,28422,26578,27791,20854,26827,22855,27495,30054,23822,33040,40784,26071, -31048,31041,39569,36215,23682,20062,20225,21551,22865,30732,22120,27668,36804, -24323,27773,27875,35755,25488,33598,33599,33601,33602,33604,33605,33608,33610, -33611,33612,33613,33614,33619,33621,33622,33623,33624,33625,33629,33634,33648, -33649,33650,33651,33652,33653,33654,33657,33658,33662,33663,33664,33665,33666, -33667,33668,33671,33672,33674,33675,33676,33677,33679,33680,33681,33684,33685, -33686,33687,33689,33690,33693,33695,33697,33698,33699,33700,33701,33702,33703, -33708,33709,33710,33711,33717,33723,33726,33727,33730,33731,33732,33734,33736, -33737,33739,33741,33742,33744,33745,33746,33747,33749,33751,33753,33754,33755, -33758,33762,33763,33764,33766,33767,33768,33771,33772,33773,24688,27965,29301, -25190,38030,38085,21315,36801,31614,20191,35878,20094,40660,38065,38067,21069, -28508,36963,27973,35892,22545,23884,27424,27465,26538,21595,33108,32652,22681, -34103,24378,25250,27207,38201,25970,24708,26725,30631,20052,20392,24039,38808, -25772,32728,23789,20431,31373,20999,33540,19988,24623,31363,38054,20405,20146, -31206,29748,21220,33465,25810,31165,23517,27777,38738,36731,27682,20542,21375, -28165,25806,26228,27696,24773,39031,35831,24198,29756,31351,31179,19992,37041, -29699,27714,22234,37195,27845,36235,21306,34502,26354,36527,23624,39537,28192, -33774,33775,33779,33780,33781,33782,33783,33786,33787,33788,33790,33791,33792, -33794,33797,33799,33800,33801,33802,33808,33810,33811,33812,33813,33814,33815, -33817,33818,33819,33822,33823,33824,33825,33826,33827,33833,33834,33835,33836, -33837,33838,33839,33840,33842,33843,33844,33845,33846,33847,33849,33850,33851, -33854,33855,33856,33857,33858,33859,33860,33861,33863,33864,33865,33866,33867, -33868,33869,33870,33871,33872,33874,33875,33876,33877,33878,33880,33885,33886, -33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904,33906, -33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079,26435, -37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364,40522, -27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880,22199, -35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219,35748, -20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076,28342, -23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785,20083, -27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369,25746, -27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920,33921, -33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940,33941, -33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957,33958, -33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973,33974, -33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995,33996, -33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014,34017, -34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034,34035, -34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049,34050, -20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073,26862, -20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194,29642, -33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892,27733, -25159,32558,22674,20260,21830,36175,26188,19978,23578,35059,26786,25422,31245, -28903,33421,21242,38902,23569,21736,37045,32461,22882,36170,34503,33292,33293, -36198,25668,23556,24913,28041,31038,35774,30775,30003,21627,20280,36523,28145, -23072,32453,31070,27784,23457,23158,29978,32958,24910,28183,22768,29983,29989, -29298,21319,32499,34051,34052,34053,34054,34055,34056,34057,34058,34059,34061, -34062,34063,34064,34066,34068,34069,34070,34072,34073,34075,34076,34077,34078, -34080,34082,34083,34084,34085,34086,34087,34088,34089,34090,34093,34094,34095, -34096,34097,34098,34099,34100,34101,34102,34110,34111,34112,34113,34114,34116, -34117,34118,34119,34123,34124,34125,34126,34127,34128,34129,34130,34131,34132, -34133,34135,34136,34138,34139,34140,34141,34143,34144,34145,34146,34147,34149, -34150,34151,34153,34154,34155,34156,34157,34158,34159,34160,34161,34163,34165, -34166,34167,34168,34172,34173,34175,34176,34177,30465,30427,21097,32988,22307, -24072,22833,29422,26045,28287,35799,23608,34417,21313,30707,25342,26102,20160, -39135,34432,23454,35782,21490,30690,20351,23630,39542,22987,24335,31034,22763, -19990,26623,20107,25325,35475,36893,21183,26159,21980,22124,36866,20181,20365, -37322,39280,27663,24066,24643,23460,35270,35797,25910,25163,39318,23432,23551, -25480,21806,21463,30246,20861,34092,26530,26803,27530,25234,36755,21460,33298, -28113,30095,20070,36174,23408,29087,34223,26257,26329,32626,34560,40653,40736, -23646,26415,36848,26641,26463,25101,31446,22661,24246,25968,28465,34178,34179, -34182,34184,34185,34186,34187,34188,34189,34190,34192,34193,34194,34195,34196, -34197,34198,34199,34200,34201,34202,34205,34206,34207,34208,34209,34210,34211, -34213,34214,34215,34217,34219,34220,34221,34225,34226,34227,34228,34229,34230, -34232,34234,34235,34236,34237,34238,34239,34240,34242,34243,34244,34245,34246, -34247,34248,34250,34251,34252,34253,34254,34257,34258,34260,34262,34263,34264, -34265,34266,34267,34269,34270,34271,34272,34273,34274,34275,34277,34278,34279, -34280,34282,34283,34284,34285,34286,34287,34288,34289,34290,34291,34292,34293, -34294,34295,34296,24661,21047,32781,25684,34928,29993,24069,26643,25332,38684, -21452,29245,35841,27700,30561,31246,21550,30636,39034,33308,35828,30805,26388, -28865,26031,25749,22070,24605,31169,21496,19997,27515,32902,23546,21987,22235, -20282,20284,39282,24051,26494,32824,24578,39042,36865,23435,35772,35829,25628, -33368,25822,22013,33487,37221,20439,32032,36895,31903,20723,22609,28335,23487, -35785,32899,37240,33948,31639,34429,38539,38543,32485,39635,30862,23681,31319, -36930,38567,31071,23385,25439,31499,34001,26797,21766,32553,29712,32034,38145, -25152,22604,20182,23427,22905,22612,34297,34298,34300,34301,34302,34304,34305, -34306,34307,34308,34310,34311,34312,34313,34314,34315,34316,34317,34318,34319, -34320,34322,34323,34324,34325,34327,34328,34329,34330,34331,34332,34333,34334, -34335,34336,34337,34338,34339,34340,34341,34342,34344,34346,34347,34348,34349, -34350,34351,34352,34353,34354,34355,34356,34357,34358,34359,34361,34362,34363, -34365,34366,34367,34368,34369,34370,34371,34372,34373,34374,34375,34376,34377, -34378,34379,34380,34386,34387,34389,34390,34391,34392,34393,34395,34396,34397, +31997,31998,31999,32000,32001,32002,32003,32004,32005, +32006,32007,32008,32009,32011,32012,32013,32014,32015,32016,32017,32018,32019, +32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,32030,32031,32033, +32035,32036,32037,32038,32040,32041,32042,32044,32045,32046,32048,32049,32050, +32051,32052,32053,32054,32908,39269,36857,28608,35749,40481,23020,32489,32521, +21513,26497,26840,36753,31821,38598,21450,24613,30142,27762,21363,23241,32423, +25380,20960,33034,24049,34015,25216,20864,23395,20238,31085,21058,24760,27982, +23492,23490,35745,35760,26082,24524,38469,22931,32487,32426,22025,26551,22841, +20339,23478,21152,33626,39050,36158,30002,38078,20551,31292,20215,26550,39550, +23233,27516,30417,22362,23574,31546,38388,29006,20860,32937,33392,22904,32516, +33575,26816,26604,30897,30839,25315,25441,31616,20461,21098,20943,33616,27099, +37492,36341,36145,35265,38190,31661,20214,32055,32056,32057,32058,32059,32060, +32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073, +32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086, +32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,32099, +32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32111,32112,32113, +32114,32115,32116,32117,32118,32120,32121,32122,32123,32124,32125,32126,32127, +32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,32138,32139,32140, +32141,32142,32143,32144,32145,32146,32147,32148,32149,32150,32151,32152,20581, +33328,21073,39279,28176,28293,28071,24314,20725,23004,23558,27974,27743,30086, +33931,26728,22870,35762,21280,37233,38477,34121,26898, +30977,28966,33014,20132,37066,27975,39556,23047,22204,25605,38128,30699,20389, +33050,29409,35282,39290,32564,32478,21119,25945,37237,36735,36739,21483,31382, +25581,25509,30342,31224,34903,38454,25130,21163,33410,26708,26480,25463,30571, +31469,27905,32467,35299,22992,25106,34249,33445,30028,20511,20171,30117,35819, +23626,24062,31563,26020,37329,20170,27941,35167,32039,38182,20165,35880,36827, +38771,26187,31105,36817,28908,28024,32153,32154,32155,32156,32157,32158,32159, +32160,32161,32162,32163,32164,32165,32167,32168,32169,32170,32171,32172,32173, +32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,32186,32187, +32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,32198,32199,32200, +32201,32202,32203,32204,32205,32206,32207,32208,32209,32210,32211,32212,32213, +32214,32215,32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226, +32227,32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239, +32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,23613,21170, +33606,20834,33550,30555,26230,40120,20140,24778,31934,31923,32463,20117,35686, +26223,39048,38745,22659,25964,38236,24452,30153,38742,31455,31454,20928,28847, +31384,25578,31350,32416,29590,38893,20037,28792,20061,37202,21417,25937,26087, +33276,33285,21646,23601,30106,38816,25304,29401,30141,23621,39545,33738,23616, +21632,30697,20030,27822,32858,25298,25454,24040,20855,36317,36382,38191,20465, +21477,24807,28844,21095,25424,40515,23071,20518,30519,21367,32482,25733,25899, +25225,25496,20500,29237,35273,20915,35776,32477,22343, +33740,38055,20891,21531,23803,32251,32252,32253,32254,32255,32256,32257,32258, +32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,32271, +32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,32284, +32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,32297, +32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310, +32311,32312,32313,32314,32316,32317,32318,32319,32320,32322,32323,32324,32325, +32326,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,32339, +32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,20426,31459,27994, +37089,39567,21888,21654,21345,21679,24320,25577,26999,20975,24936,21002,22570, +21208,22350,30733,30475,24247,24951,31968,25179,25239,20130,28821,32771,25335, +28900,38752,22391,33499,26607,26869,30933,39063,31185,22771,21683,21487,28212, +20811,21051,23458,35838,32943,21827,22438,24691,22353,21549,31354,24656,23380, +25511,25248,21475,25187,23495,26543,21741,31391,33510,37239,24211,35044,22840, +22446,25358,36328,33007,22359,31607,20393,24555,23485,27454,21281,31568,29378, +26694,30719,30518,26103,20917,20111,30420,23743,31397,33909,22862,39745,20608, +32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362, +32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,32375, +32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32387,32388,32389, +32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,32402, +32403,32404,32405,32406,32407,32408,32409,32410,32412, +32413,32414,32430,32436,32443,32444,32470,32484,32492,32505,32522,32528,32542, +32567,32569,32571,32572,32573,32574,32575,32576,32577,32579,32582,32583,32584, +32585,32586,32587,32588,32589,32590,32591,32594,32595,39304,24871,28291,22372, +26118,25414,22256,25324,25193,24275,38420,22403,25289,21895,34593,33098,36771, +21862,33713,26469,36182,34013,23146,26639,25318,31726,38417,20848,28572,35888, +25597,35272,25042,32518,28866,28389,29701,27028,29436,24266,37070,26391,28010, +25438,21171,29282,32769,20332,23013,37226,28889,28061,21202,20048,38647,38253, +34174,30922,32047,20769,22418,25794,32907,31867,27882,26865,26974,20919,21400, +26792,29313,40654,31729,29432,31163,28435,29702,26446,37324,40100,31036,33673, +33620,21519,26647,20029,21385,21169,30782,21382,21033,20616,20363,20432,32598, +32601,32603,32604,32605,32606,32608,32611,32612,32613,32614,32615,32619,32620, +32621,32623,32624,32627,32629,32630,32631,32632,32634,32635,32636,32637,32639, +32640,32642,32643,32644,32645,32646,32647,32648,32649,32651,32653,32655,32656, +32657,32658,32659,32661,32662,32663,32664,32665,32667,32668,32672,32674,32675, +32677,32678,32680,32681,32682,32683,32684,32685,32686,32689,32691,32692,32693, +32694,32695,32698,32699,32702,32704,32706,32707,32708,32710,32711,32712,32713, +32715,32717,32719,32720,32721,32722,32723,32726,32727,32729,32730,32731,32732, +32733,32734,32738,32739,30178,31435,31890,27813,38582,21147,29827,21737,20457, +32852,33714,36830,38256,24265,24604,28063,24088,25947,33080,38142,24651,28860, +32451,31918,20937,26753,31921,33391,20004,36742,37327, +26238,20142,35845,25769,32842,20698,30103,29134,23525,36797,28518,20102,25730, +38243,24278,26009,21015,35010,28872,21155,29454,29747,26519,30967,38678,20020, +37051,40158,28107,20955,36161,21533,25294,29618,33777,38646,40836,38083,20278, +32666,20940,28789,38517,23725,39046,21478,20196,28316,29705,27060,30827,39311, +30041,21016,30244,27969,26611,20845,40857,32843,21657,31548,31423,32740,32743, +32744,32746,32747,32748,32749,32751,32754,32756,32757,32758,32759,32760,32761, +32762,32765,32766,32767,32770,32775,32776,32777,32778,32782,32783,32785,32787, +32794,32795,32797,32798,32799,32801,32803,32804,32811,32812,32813,32814,32815, +32816,32818,32820,32825,32826,32828,32830,32832,32833,32836,32837,32839,32840, +32841,32846,32847,32848,32849,32851,32853,32854,32855,32857,32859,32860,32861, +32862,32863,32864,32865,32866,32867,32868,32869,32870,32871,32872,32875,32876, +32877,32878,32879,32880,32882,32883,32884,32885,32886,32887,32888,32889,32890, +32891,32892,32893,38534,22404,25314,38471,27004,23044,25602,31699,28431,38475, +33446,21346,39045,24208,28809,25523,21348,34383,40065,40595,30860,38706,36335, +36162,40575,28510,31108,24405,38470,25134,39540,21525,38109,20387,26053,23653, +23649,32533,34385,27695,24459,29575,28388,32511,23782,25371,23402,28390,21365, +20081,25504,30053,25249,36718,20262,20177,27814,32438,35770,33821,34746,32599, +36923,38179,31657,39585,35064,33853,27931,39558,32476,22920,40635,29595,30721, +34434,39532,39554,22043,21527,22475,20080,40614,21334,36808,33033,30610,39314, +34542,28385,34067,26364,24930,28459,32894,32897,32898, +32901,32904,32906,32909,32910,32911,32912,32913,32914,32916,32917,32919,32921, +32926,32931,32934,32935,32936,32940,32944,32947,32949,32950,32952,32953,32955, +32965,32967,32968,32969,32970,32971,32975,32976,32977,32978,32979,32980,32981, +32984,32991,32992,32994,32995,32998,33006,33013,33015,33017,33019,33022,33023, +33024,33025,33027,33028,33029,33031,33032,33035,33036,33045,33047,33049,33051, +33052,33053,33055,33056,33057,33058,33059,33060,33061,33062,33063,33064,33065, +33066,33067,33069,33070,33072,33075,33076,33077,33079,33081,33082,33083,33084, +33085,33087,35881,33426,33579,30450,27667,24537,33725,29483,33541,38170,27611, +30683,38086,21359,33538,20882,24125,35980,36152,20040,29611,26522,26757,37238, +38665,29028,27809,30473,23186,38209,27599,32654,26151,23504,22969,23194,38376, +38391,20204,33804,33945,27308,30431,38192,29467,26790,23391,30511,37274,38753, +31964,36855,35868,24357,31859,31192,35269,27852,34588,23494,24130,26825,30496, +32501,20885,20813,21193,23081,32517,38754,33495,25551,30596,34256,31186,28218, +24217,22937,34065,28781,27665,25279,30399,25935,24751,38397,26126,34719,40483, +38125,21517,21629,35884,25720,33088,33089,33090,33091,33092,33093,33095,33097, +33101,33102,33103,33106,33110,33111,33112,33115,33116,33117,33118,33119,33121, +33122,33123,33124,33126,33128,33130,33131,33132,33135,33138,33139,33141,33142, +33143,33144,33153,33155,33156,33157,33158,33159,33161,33163,33164,33165,33166, +33168,33170,33171,33172,33173,33174,33175,33177,33178,33182,33183,33184,33185, +33186,33188,33189,33191,33193,33195,33196,33197,33198, +33199,33200,33201,33202,33204,33205,33206,33207,33208,33209,33212,33213,33214, +33215,33220,33221,33223,33224,33225,33227,33229,33230,33231,33232,33233,33234, +33235,25721,34321,27169,33180,30952,25705,39764,25273,26411,33707,22696,40664, +27819,28448,23518,38476,35851,29279,26576,25287,29281,20137,22982,27597,22675, +26286,24149,21215,24917,26408,30446,30566,29287,31302,25343,21738,21584,38048, +37027,23068,32435,27670,20035,22902,32784,22856,21335,30007,38590,22218,25376, +33041,24700,38393,28118,21602,39297,20869,23273,33021,22958,38675,20522,27877, +23612,25311,20320,21311,33147,36870,28346,34091,25288,24180,30910,25781,25467, +24565,23064,37247,40479,23615,25423,32834,23421,21870,38218,38221,28037,24744, +26592,29406,20957,23425,33236,33237,33238,33239,33240,33241,33242,33243,33244, +33245,33246,33247,33248,33249,33250,33252,33253,33254,33256,33257,33259,33262, +33263,33264,33265,33266,33269,33270,33271,33272,33273,33274,33277,33279,33283, +33287,33288,33289,33290,33291,33294,33295,33297,33299,33301,33302,33303,33304, +33305,33306,33309,33312,33316,33317,33318,33319,33321,33326,33330,33338,33340, +33341,33343,33344,33345,33346,33347,33349,33350,33352,33354,33356,33357,33358, +33360,33361,33362,33363,33364,33365,33366,33367,33369,33371,33372,33373,33374, +33376,33377,33378,33379,33380,33381,33382,33383,33385,25319,27870,29275,25197, +38062,32445,33043,27987,20892,24324,22900,21162,24594,22899,26262,34384,30111, +25386,25062,31983,35834,21734,27431,40485,27572,34261,21589,20598,27812,21866, +36276,29228,24085,24597,29750,25293,25490,29260,24472, +28227,27966,25856,28504,30424,30928,30460,30036,21028,21467,20051,24222,26049, +32810,32982,25243,21638,21032,28846,34957,36305,27873,21624,32986,22521,35060, +36180,38506,37197,20329,27803,21943,30406,30768,25256,28921,28558,24429,34028, +26842,30844,31735,33192,26379,40527,25447,30896,22383,30738,38713,25209,25259, +21128,29749,27607,33386,33387,33388,33389,33393,33397,33398,33399,33400,33403, +33404,33408,33409,33411,33413,33414,33415,33417,33420,33424,33427,33428,33429, +33430,33434,33435,33438,33440,33442,33443,33447,33458,33461,33462,33466,33467, +33468,33471,33472,33474,33475,33477,33478,33481,33488,33494,33497,33498,33501, +33506,33511,33512,33513,33514,33516,33517,33518,33520,33522,33523,33525,33526, +33528,33530,33532,33533,33534,33535,33536,33546,33547,33549,33552,33554,33555, +33558,33560,33561,33565,33566,33567,33568,33569,33570,33571,33572,33573,33574, +33577,33578,33582,33584,33586,33591,33595,33597,21860,33086,30130,30382,21305, +30174,20731,23617,35692,31687,20559,29255,39575,39128,28418,29922,31080,25735, +30629,25340,39057,36139,21697,32856,20050,22378,33529,33805,24179,20973,29942, +35780,23631,22369,27900,39047,23110,30772,39748,36843,31893,21078,25169,38138, +20166,33670,33889,33769,33970,22484,26420,22275,26222,28006,35889,26333,28689, +26399,27450,26646,25114,22971,19971,20932,28422,26578,27791,20854,26827,22855, +27495,30054,23822,33040,40784,26071,31048,31041,39569,36215,23682,20062,20225, +21551,22865,30732,22120,27668,36804,24323,27773,27875,35755,25488,33598,33599, +33601,33602,33604,33605,33608,33610,33611,33612,33613, +33614,33619,33621,33622,33623,33624,33625,33629,33634,33648,33649,33650,33651, +33652,33653,33654,33657,33658,33662,33663,33664,33665,33666,33667,33668,33671, +33672,33674,33675,33676,33677,33679,33680,33681,33684,33685,33686,33687,33689, +33690,33693,33695,33697,33698,33699,33700,33701,33702,33703,33708,33709,33710, +33711,33717,33723,33726,33727,33730,33731,33732,33734,33736,33737,33739,33741, +33742,33744,33745,33746,33747,33749,33751,33753,33754,33755,33758,33762,33763, +33764,33766,33767,33768,33771,33772,33773,24688,27965,29301,25190,38030,38085, +21315,36801,31614,20191,35878,20094,40660,38065,38067,21069,28508,36963,27973, +35892,22545,23884,27424,27465,26538,21595,33108,32652,22681,34103,24378,25250, +27207,38201,25970,24708,26725,30631,20052,20392,24039,38808,25772,32728,23789, +20431,31373,20999,33540,19988,24623,31363,38054,20405,20146,31206,29748,21220, +33465,25810,31165,23517,27777,38738,36731,27682,20542,21375,28165,25806,26228, +27696,24773,39031,35831,24198,29756,31351,31179,19992,37041,29699,27714,22234, +37195,27845,36235,21306,34502,26354,36527,23624,39537,28192,33774,33775,33779, +33780,33781,33782,33783,33786,33787,33788,33790,33791,33792,33794,33797,33799, +33800,33801,33802,33808,33810,33811,33812,33813,33814,33815,33817,33818,33819, +33822,33823,33824,33825,33826,33827,33833,33834,33835,33836,33837,33838,33839, +33840,33842,33843,33844,33845,33846,33847,33849,33850,33851,33854,33855,33856, +33857,33858,33859,33860,33861,33863,33864,33865,33866,33867,33868,33869,33870, +33871,33872,33874,33875,33876,33877,33878,33880,33885, +33886,33887,33888,33890,33892,33893,33894,33895,33896,33898,33902,33903,33904, +33906,33908,33911,33913,33915,33916,21462,23094,40843,36259,21435,22280,39079, +26435,37275,27849,20840,30154,25331,29356,21048,21149,32570,28820,30264,21364, +40522,27063,30830,38592,35033,32676,28982,29123,20873,26579,29924,22756,25880, +22199,35753,39286,25200,32469,24825,28909,22764,20161,20154,24525,38887,20219, +35748,20995,22922,32427,25172,20173,26085,25102,33592,33993,33635,34701,29076, +28342,23481,32466,20887,25545,26580,32905,33593,34837,20754,23418,22914,36785, +20083,27741,20837,35109,36719,38446,34122,29790,38160,38384,28070,33509,24369, +25746,27922,33832,33134,40131,22622,36187,19977,21441,33917,33918,33919,33920, +33921,33923,33924,33925,33926,33930,33933,33935,33936,33937,33938,33939,33940, +33941,33942,33944,33946,33947,33949,33950,33951,33952,33954,33955,33956,33957, +33958,33959,33960,33961,33962,33963,33964,33965,33966,33968,33969,33971,33973, +33974,33975,33979,33980,33982,33984,33986,33987,33989,33990,33991,33992,33995, +33996,33998,33999,34002,34004,34005,34007,34008,34009,34010,34011,34012,34014, +34017,34018,34020,34023,34024,34025,34026,34027,34029,34030,34031,34033,34034, +34035,34036,34037,34038,34039,34040,34041,34042,34043,34045,34046,34048,34049, +34050,20254,25955,26705,21971,20007,25620,39578,25195,23234,29791,33394,28073, +26862,20711,33678,30722,26432,21049,27801,32433,20667,21861,29022,31579,26194, +29642,33515,26441,23665,21024,29053,34923,38378,38485,25797,36193,33203,21892, +27733,25159,32558,22674,20260,21830,36175,26188,19978, +23578,35059,26786,25422,31245,28903,33421,21242,38902,23569,21736,37045,32461, +22882,36170,34503,33292,33293,36198,25668,23556,24913,28041,31038,35774,30775, +30003,21627,20280,36523,28145,23072,32453,31070,27784,23457,23158,29978,32958, +24910,28183,22768,29983,29989,29298,21319,32499,34051,34052,34053,34054,34055, +34056,34057,34058,34059,34061,34062,34063,34064,34066,34068,34069,34070,34072, +34073,34075,34076,34077,34078,34080,34082,34083,34084,34085,34086,34087,34088, +34089,34090,34093,34094,34095,34096,34097,34098,34099,34100,34101,34102,34110, +34111,34112,34113,34114,34116,34117,34118,34119,34123,34124,34125,34126,34127, +34128,34129,34130,34131,34132,34133,34135,34136,34138,34139,34140,34141,34143, +34144,34145,34146,34147,34149,34150,34151,34153,34154,34155,34156,34157,34158, +34159,34160,34161,34163,34165,34166,34167,34168,34172,34173,34175,34176,34177, +30465,30427,21097,32988,22307,24072,22833,29422,26045,28287,35799,23608,34417, +21313,30707,25342,26102,20160,39135,34432,23454,35782,21490,30690,20351,23630, +39542,22987,24335,31034,22763,19990,26623,20107,25325,35475,36893,21183,26159, +21980,22124,36866,20181,20365,37322,39280,27663,24066,24643,23460,35270,35797, +25910,25163,39318,23432,23551,25480,21806,21463,30246,20861,34092,26530,26803, +27530,25234,36755,21460,33298,28113,30095,20070,36174,23408,29087,34223,26257, +26329,32626,34560,40653,40736,23646,26415,36848,26641,26463,25101,31446,22661, +24246,25968,28465,34178,34179,34182,34184,34185,34186,34187,34188,34189,34190, +34192,34193,34194,34195,34196,34197,34198,34199,34200, +34201,34202,34205,34206,34207,34208,34209,34210,34211,34213,34214,34215,34217, +34219,34220,34221,34225,34226,34227,34228,34229,34230,34232,34234,34235,34236, +34237,34238,34239,34240,34242,34243,34244,34245,34246,34247,34248,34250,34251, +34252,34253,34254,34257,34258,34260,34262,34263,34264,34265,34266,34267,34269, +34270,34271,34272,34273,34274,34275,34277,34278,34279,34280,34282,34283,34284, +34285,34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,24661, +21047,32781,25684,34928,29993,24069,26643,25332,38684,21452,29245,35841,27700, +30561,31246,21550,30636,39034,33308,35828,30805,26388,28865,26031,25749,22070, +24605,31169,21496,19997,27515,32902,23546,21987,22235,20282,20284,39282,24051, +26494,32824,24578,39042,36865,23435,35772,35829,25628,33368,25822,22013,33487, +37221,20439,32032,36895,31903,20723,22609,28335,23487,35785,32899,37240,33948, +31639,34429,38539,38543,32485,39635,30862,23681,31319,36930,38567,31071,23385, +25439,31499,34001,26797,21766,32553,29712,32034,38145,25152,22604,20182,23427, +22905,22612,34297,34298,34300,34301,34302,34304,34305,34306,34307,34308,34310, +34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34322,34323,34324, +34325,34327,34328,34329,34330,34331,34332,34333,34334,34335,34336,34337,34338, +34339,34340,34341,34342,34344,34346,34347,34348,34349,34350,34351,34352,34353, +34354,34355,34356,34357,34358,34359,34361,34362,34363,34365,34366,34367,34368, +34369,34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34386, +34387,34389,34390,34391,34392,34393,34395,34396,34397, 34399,34400,34401,34403,34404,34405,34406,34407,34408,34409,34410,29549,25374, 36427,36367,32974,33492,25260,21488,27888,37214,22826,24577,27760,22349,25674, 36138,30251,28393,22363,27264,30192,28525,35885,35848,22374,27631,34962,30899, @@ -1114,243 +1132,247 @@ 36890,26704,37230,30643,21516,38108,24420,31461,26742,25413,31570,32479,30171, 20599,25237,22836,36879,20984,31171,31361,22270,24466,36884,28034,23648,22303, 21520,20820,28237,22242,25512,39059,33151,34581,35114,36864,21534,23663,33216, -25302,25176,33073,40501,38464,39534,39548,26925,22949,25299,21822,25366,21703, -34521,27964,23043,29926,34972,27498,22806,35916,24367,28286,29609,39037,20024, -28919,23436,30871,25405,26202,30358,24779,23451,23113,19975,33109,27754,29579, -20129,26505,32593,24448,26106,26395,24536,22916,23041,34585,34587,34589,34591, -34592,34596,34598,34599,34600,34602,34603,34604,34605,34607,34608,34610,34611, -34613,34614,34616,34617,34618,34620,34621,34624,34625,34626,34627,34628,34629, -34630,34634,34635,34637,34639,34640,34641,34642,34644,34645,34646,34648,34650, -34651,34652,34653,34654,34655,34657,34658,34662,34663,34664,34665,34666,34667, -34668,34669,34671,34673,34674,34675,34677,34679,34680,34681,34682,34687,34688, -34689,34692,34694,34695,34697,34698,34700,34702,34703,34704,34705,34706,34708, -34709,34710,34712,34713,34714,34715,34716,34717,34718,34720,34721,34722,34723, -34724,24013,24494,21361,38886,36829,26693,22260,21807,24799,20026,28493,32500, -33479,33806,22996,20255,20266,23614,32428,26410,34074,21619,30031,32963,21890, -39759,20301,28205,35859,23561,24944,21355,30239,28201,34442,25991,38395,32441, -21563,31283,32010,38382,21985,32705,29934,25373,34583,28065,31389,25105,26017, -21351,25569,27779,24043,21596,38056,20044,27745,35820,23627,26080,33436,26791, -21566,21556,27595,27494,20116,25410,21320,33310,20237,20398,22366,25098,38654, -26212,29289,21247,21153,24735,35823,26132,29081,26512,35199,30802,30717,26224, -22075,21560,38177,29306,34725,34726,34727,34729,34730,34734,34736,34737,34738, -34740,34742,34743,34744,34745,34747,34748,34750,34751,34753,34754,34755,34756, -34757,34759,34760,34761,34764,34765,34766,34767,34768,34772,34773,34774,34775, -34776,34777,34778,34780,34781,34782,34783,34785,34786,34787,34788,34790,34791, -34792,34793,34795,34796,34797,34799,34800,34801,34802,34803,34804,34805,34806, -34807,34808,34810,34811,34812,34813,34815,34816,34817,34818,34820,34821,34822, -34823,34824,34825,34827,34828,34829,34830,34831,34832,34833,34834,34836,34839, -34840,34841,34842,34844,34845,34846,34847,34848,34851,31232,24687,24076,24713, -33181,22805,24796,29060,28911,28330,27728,29312,27268,34989,24109,20064,23219, -21916,38115,27927,31995,38553,25103,32454,30606,34430,21283,38686,36758,26247, -23777,20384,29421,19979,21414,22799,21523,25472,38184,20808,20185,40092,32420, -21688,36132,34900,33335,38386,28046,24358,23244,26174,38505,29616,29486,21439, -33146,39301,32673,23466,38519,38480,32447,30456,21410,38262,39321,31665,35140, -28248,20065,32724,31077,35814,24819,21709,20139,39033,24055,27233,20687,21521, -35937,33831,30813,38660,21066,21742,22179,38144,28040,23477,28102,26195,34852, -34853,34854,34855,34856,34857,34858,34859,34860,34861,34862,34863,34864,34865, -34867,34868,34869,34870,34871,34872,34874,34875,34877,34878,34879,34881,34882, -34883,34886,34887,34888,34889,34890,34891,34894,34895,34896,34897,34898,34899, -34901,34902,34904,34906,34907,34908,34909,34910,34911,34912,34918,34919,34922, -34925,34927,34929,34931,34932,34933,34934,34936,34937,34938,34939,34940,34944, -34947,34950,34951,34953,34954,34956,34958,34959,34960,34961,34963,34964,34965, -34967,34968,34969,34970,34971,34973,34974,34975,34976,34977,34979,34981,34982, -34983,34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123, -27463,34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368, -34809,25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571, -24515,20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892, -37266,24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241, -20462,32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040, -39035,24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490, -32493,36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995, -34996,34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012, -35015,35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034, -35035,35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053, -35054,35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075, -35076,35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092, -35093,35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110, -35111,35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873, -30307,30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092, -35810,23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486, -40493,21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766, -28937,21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068, -38414,28814,27839,22852,25513,30524,34893,28436,33395,22576,29141,21388,30746, -38593,21761,24422,28976,23476,35866,39564,27523,22830,40495,31207,26472,25196, -20335,30113,32650,27915,38451,27687,20208,30162,20859,26679,28478,36992,33136, -22934,29814,35128,35129,35130,35131,35132,35133,35134,35135,35136,35138,35139, -35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,35151,35152,35153, -35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,35164,35165,35168, -35169,35170,35171,35172,35173,35175,35176,35177,35178,35179,35180,35181,35182, -35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,35193,35194,35196, -35197,35198,35200,35202,35204,35205,35207,35208,35209,35210,35211,35212,35213, -35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,35224,35225,35226, -35227,35228,35229,35230,35231,35232,35233,25671,23591,36965,31377,35875,23002, -21676,33280,33647,35201,32768,26928,22094,32822,29239,37326,20918,20063,39029, -25494,19994,21494,26355,33099,22812,28082,19968,22777,21307,25558,38129,20381, -20234,34915,39056,22839,36951,31227,20202,33008,30097,27778,23452,23016,24413, -26885,34433,20506,24050,20057,30691,20197,33402,25233,26131,37009,23673,20159, -24441,33222,36920,32900,30123,20134,35028,24847,27589,24518,20041,30410,28322, -35811,35758,35850,35793,24322,32764,32716,32462,33589,33643,22240,27575,38899, -38452,23035,21535,38134,28139,23493,39278,23609,24341,38544,35234,35235,35236, -35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,35247,35248,35249, -35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,35260,35261,35262, -35263,35264,35267,35277,35283,35284,35285,35287,35288,35289,35291,35293,35295, -35296,35297,35298,35300,35303,35304,35305,35306,35308,35309,35310,35312,35313, -35314,35316,35317,35318,35319,35320,35321,35322,35323,35324,35325,35326,35327, -35329,35330,35331,35332,35333,35334,35336,35337,35338,35339,35340,35341,35342, -35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,35354,35355, -35356,35357,21360,33521,27185,23156,40560,24212,32552,33721,33828,33829,33639, -34631,36814,36194,30408,24433,39062,30828,26144,21727,25317,20323,33219,30152, -24248,38605,36362,34553,21647,27891,28044,27704,24703,21191,29992,24189,20248, -24736,24551,23588,30001,37038,38080,29369,27833,28216,37193,26377,21451,21491, -20305,37321,35825,21448,24188,36802,28132,20110,30402,27014,34398,24858,33286, -20313,20446,36926,40060,24841,28189,28180,38533,20104,23089,38632,19982,23679, -31161,23431,35821,32701,29577,22495,33419,37057,21505,36935,21947,23786,24481, -24840,27442,29425,32946,35465,35358,35359,35360,35361,35362,35363,35364,35365, -35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,35378, -35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,35391,35392, -35393,35394,35395,35396,35397,35398,35399,35401,35402,35403,35404,35405,35406, -35407,35408,35409,35410,35411,35412,35413,35414,35415,35416,35417,35418,35419, -35420,35421,35422,35423,35424,35425,35426,35427,35428,35429,35430,35431,35432, -35433,35434,35435,35436,35437,35438,35439,35440,35441,35442,35443,35444,35445, -35446,35447,35448,35450,35451,35452,35453,35454,35455,35456,28020,23507,35029, -39044,35947,39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253, -21592,22278,29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234, -36291,38053,23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801, -36816,34164,37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472, -36733,20877,22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991, -34299,26531,26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321, -21017,27901,36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711, -35457,35458,35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471, -35472,35473,35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485, -35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498, -35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511, -35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524, -35525,35526,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537, -35538,35539,35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550, -35551,35552,35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856, -35784,25688,25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415, -26025,36759,23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456, -24432,28467,24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556, -25307,26157,25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746, -34544,36761,32773,38167,34071,36825,27993,29645,26015,30495,29956,30759,33275, -36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976,25379,30529, -24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558,35559,35560, -35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,35572,35573, -35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586, -35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598,35599,35600, -35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,35612,35613, -35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625,35626,35627, -35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640, -35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653, -24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930,33026,27713, -20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351,27490,36286, -21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769,21046,26234, -31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544,38047,34935, -32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788,31909,36724, -32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417,29482,35832, -35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609,21161,34496, -36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661,35662,35663, -35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676, -35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688,35689,35690, -35691,35693,35694,35695,35696,35697,35698,35699,35700,35701,35702,35703,35704, -35705,35706,35707,35708,35709,35710,35711,35712,35713,35714,35715,35716,35717, -35718,35719,35720,35721,35722,35723,35724,35725,35726,35727,35728,35729,35730, -35731,35732,35733,35734,35735,35736,35737,35738,35739,35740,35741,35742,35743, -35756,35761,35771,35783,35792,35818,35849,35870,20303,27880,31069,39547,25235, -29226,25341,19987,30742,36716,25776,36186,31686,26729,24196,35013,22918,25758, -22766,29366,26894,38181,36861,36184,22368,32512,35846,20934,25417,25305,21331, -26700,29730,33537,37196,21828,30528,28796,27978,20857,21672,36164,23039,28363, -28100,23388,32043,20180,31869,28371,23376,33258,28173,23383,39683,26837,36394, -23447,32508,24635,32437,37049,36208,22863,25549,31199,36275,21330,26063,31062, -35781,38459,32452,38075,32386,22068,37257,26368,32618,23562,36981,26152,24038, -20304,26590,20570,20316,22352,24231,59408,59409,59410,59411,59412,35896,35897, -35898,35899,35900,35901,35902,35903,35904,35906,35907,35908,35909,35912,35914, -35915,35917,35918,35919,35920,35921,35922,35923,35924,35926,35927,35928,35929, -35931,35932,35933,35934,35935,35936,35939,35940,35941,35942,35943,35944,35945, -35948,35949,35950,35951,35952,35953,35954,35956,35957,35958,35959,35963,35964, -35965,35966,35967,35968,35969,35971,35972,35974,35975,35976,35979,35981,35982, -35983,35984,35985,35986,35987,35989,35990,35991,35993,35994,35995,35996,35997, -35998,35999,36000,36001,36002,36003,36004,36005,36006,36007,36008,36009,36010, -36011,36012,36013,20109,19980,20800,19984,24319,21317,19989,20120,19998,39730, -23404,22121,20008,31162,20031,21269,20039,22829,29243,21358,27664,22239,32996, -39319,27603,30590,40727,20022,20127,40720,20060,20073,20115,33416,23387,21868, -22031,20164,21389,21405,21411,21413,21422,38757,36189,21274,21493,21286,21294, -21310,36188,21350,21347,20994,21000,21006,21037,21043,21055,21056,21068,21086, -21089,21084,33967,21117,21122,21121,21136,21139,20866,32596,20155,20163,20169, -20162,20200,20193,20203,20190,20251,20211,20258,20324,20213,20261,20263,20233, -20267,20318,20327,25912,20314,20317,36014,36015,36016,36017,36018,36019,36020, -36021,36022,36023,36024,36025,36026,36027,36028,36029,36030,36031,36032,36033, -36034,36035,36036,36037,36038,36039,36040,36041,36042,36043,36044,36045,36046, -36047,36048,36049,36050,36051,36052,36053,36054,36055,36056,36057,36058,36059, -36060,36061,36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072, -36073,36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085, -36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,36098, -36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,20319,20311, -20274,20285,20342,20340,20369,20361,20355,20367,20350,20347,20394,20348,20396, -20372,20454,20456,20458,20421,20442,20451,20444,20433,20447,20472,20521,20556, -20467,20524,20495,20526,20525,20478,20508,20492,20517,20520,20606,20547,20565, -20552,20558,20588,20603,20645,20647,20649,20666,20694,20742,20717,20716,20710, -20718,20743,20747,20189,27709,20312,20325,20430,40864,27718,31860,20846,24061, -40649,39320,20865,22804,21241,21261,35335,21264,20971,22809,20821,20128,20822, -20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913,20925, -20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121, -36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202,36204, -36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223,36224, -36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242,36243, -36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257,36258, -36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,36272, -36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296,36297, -36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750,35751, -35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796,35798, -35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830,35833, -35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861,35862, -35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886,35887, -35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461,38460, -38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576,37015, -37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313,36316, -36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338,36340, -36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360,36363, -36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378,36379, -36380,36384,36385,36388,36389,36390,36391,36392,36395,36397,36400,36402,36403, -36404,36406,36407,36408,36411,36412,36414,36415,36419,36421,36422,36428,36429, -36430,36431,36432,36435,36436,36437,36438,36439,36440,36442,36443,36444,36445, -36446,36447,36448,36449,36450,36451,36452,36453,36455,36456,36458,36459,36462, -36465,37048,37040,37071,37061,37054,37072,37060,37063,37075,37094,37090,37084, -37079,37083,37099,37103,37118,37124,37154,37150,37155,37169,37167,37177,37187, -37190,21005,22850,21154,21164,21165,21182,21759,21200,21206,21232,21471,29166, -30669,24308,20981,20988,39727,21430,24321,30042,24047,22348,22441,22433,22654, -22716,22725,22737,22313,22316,22314,22323,22329,22318,22319,22364,22331,22338, -22377,22405,22379,22406,22396,22395,22376,22381,22390,22387,22445,22436,22412, -22450,22479,22439,22452,22419,22432,22485,22488,22490,22489,22482,22456,22516, -22511,22520,22500,22493,36467,36469,36471,36472,36473,36474,36475,36477,36478, -36480,36482,36483,36484,36486,36488,36489,36490,36491,36492,36493,36494,36497, -36498,36499,36501,36502,36503,36504,36505,36506,36507,36509,36511,36512,36513, -36514,36515,36516,36517,36518,36519,36520,36521,36522,36525,36526,36528,36529, -36531,36532,36533,36534,36535,36536,36537,36539,36540,36541,36542,36543,36544, -36545,36546,36547,36548,36549,36550,36551,36552,36553,36554,36555,36556,36557, -36559,36560,36561,36562,36563,36564,36565,36566,36567,36568,36569,36570,36571, -36572,36573,36574,36575,36576,36577,36578,36579,36580,22539,22541,22525,22509, -22528,22558,22553,22596,22560,22629,22636,22657,22665,22682,22656,39336,40729, -25087,33401,33405,33407,33423,33418,33448,33412,33422,33425,33431,33433,33451, -33464,33470,33456,33480,33482,33507,33432,33463,33454,33483,33484,33473,33449, -33460,33441,33450,33439,33476,33486,33444,33505,33545,33527,33508,33551,33543, -33500,33524,33490,33496,33548,33531,33491,33553,33562,33542,33556,33557,33504, -33493,33564,33617,33627,33628,33544,33682,33596,33588,33585,33691,33630,33583, -33615,33607,33603,33631,33600,33559,33632,33581,33594,33587,33638,33637,36581, -36582,36583,36584,36585,36586,36587,36588,36589,36590,36591,36592,36593,36594, -36595,36596,36597,36598,36599,36600,36601,36602,36603,36604,36605,36606,36607, -36608,36609,36610,36611,36612,36613,36614,36615,36616,36617,36618,36619,36620, -36621,36622,36623,36624,36625,36626,36627,36628,36629,36630,36631,36632,36633, -36634,36635,36636,36637,36638,36639,36640,36641,36642,36643,36644,36645,36646, -36647,36648,36649,36650,36651,36652,36653,36654,36655,36656,36657,36658,36659, -36660,36661,36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672, -36673,36674,36675,36676,33640,33563,33641,33644,33642,33645,33646,33712,33656, -33715,33716,33696,33706,33683,33692,33669,33660,33718,33705,33661,33720,33659, -33688,33694,33704,33722,33724,33729,33793,33765,33752,22535,33816,33803,33757, -33789,33750,33820,33848,33809,33798,33748,33759,33807,33795,33784,33785,33770, -33733,33728,33830,33776,33761,33884,33873,33882,33881,33907,33927,33928,33914, -33929,33912,33852,33862,33897,33910,33932,33934,33841,33901,33985,33997,34000, -34022,33981,34003,33994,33983,33978,34016,33953,33977,33972,33943,34021,34019, +25302,25176,33073,40501,38464,39534,39548,26925,22949, +25299,21822,25366,21703,34521,27964,23043,29926,34972,27498,22806,35916,24367, +28286,29609,39037,20024,28919,23436,30871,25405,26202,30358,24779,23451,23113, +19975,33109,27754,29579,20129,26505,32593,24448,26106,26395,24536,22916,23041, +34585,34587,34589,34591,34592,34596,34598,34599,34600,34602,34603,34604,34605, +34607,34608,34610,34611,34613,34614,34616,34617,34618,34620,34621,34624,34625, +34626,34627,34628,34629,34630,34634,34635,34637,34639,34640,34641,34642,34644, +34645,34646,34648,34650,34651,34652,34653,34654,34655,34657,34658,34662,34663, +34664,34665,34666,34667,34668,34669,34671,34673,34674,34675,34677,34679,34680, +34681,34682,34687,34688,34689,34692,34694,34695,34697,34698,34700,34702,34703, +34704,34705,34706,34708,34709,34710,34712,34713,34714,34715,34716,34717,34718, +34720,34721,34722,34723,34724,24013,24494,21361,38886,36829,26693,22260,21807, +24799,20026,28493,32500,33479,33806,22996,20255,20266,23614,32428,26410,34074, +21619,30031,32963,21890,39759,20301,28205,35859,23561,24944,21355,30239,28201, +34442,25991,38395,32441,21563,31283,32010,38382,21985,32705,29934,25373,34583, +28065,31389,25105,26017,21351,25569,27779,24043,21596,38056,20044,27745,35820, +23627,26080,33436,26791,21566,21556,27595,27494,20116,25410,21320,33310,20237, +20398,22366,25098,38654,26212,29289,21247,21153,24735,35823,26132,29081,26512, +35199,30802,30717,26224,22075,21560,38177,29306,34725,34726,34727,34729,34730, +34734,34736,34737,34738,34740,34742,34743,34744,34745,34747,34748,34750,34751, +34753,34754,34755,34756,34757,34759,34760,34761,34764, +34765,34766,34767,34768,34772,34773,34774,34775,34776,34777,34778,34780,34781, +34782,34783,34785,34786,34787,34788,34790,34791,34792,34793,34795,34796,34797, +34799,34800,34801,34802,34803,34804,34805,34806,34807,34808,34810,34811,34812, +34813,34815,34816,34817,34818,34820,34821,34822,34823,34824,34825,34827,34828, +34829,34830,34831,34832,34833,34834,34836,34839,34840,34841,34842,34844,34845, +34846,34847,34848,34851,31232,24687,24076,24713,33181,22805,24796,29060,28911, +28330,27728,29312,27268,34989,24109,20064,23219,21916,38115,27927,31995,38553, +25103,32454,30606,34430,21283,38686,36758,26247,23777,20384,29421,19979,21414, +22799,21523,25472,38184,20808,20185,40092,32420,21688,36132,34900,33335,38386, +28046,24358,23244,26174,38505,29616,29486,21439,33146,39301,32673,23466,38519, +38480,32447,30456,21410,38262,39321,31665,35140,28248,20065,32724,31077,35814, +24819,21709,20139,39033,24055,27233,20687,21521,35937,33831,30813,38660,21066, +21742,22179,38144,28040,23477,28102,26195,34852,34853,34854,34855,34856,34857, +34858,34859,34860,34861,34862,34863,34864,34865,34867,34868,34869,34870,34871, +34872,34874,34875,34877,34878,34879,34881,34882,34883,34886,34887,34888,34889, +34890,34891,34894,34895,34896,34897,34898,34899,34901,34902,34904,34906,34907, +34908,34909,34910,34911,34912,34918,34919,34922,34925,34927,34929,34931,34932, +34933,34934,34936,34937,34938,34939,34940,34944,34947,34950,34951,34953,34954, +34956,34958,34959,34960,34961,34963,34964,34965,34967,34968,34969,34970,34971, +34973,34974,34975,34976,34977,34979,34981,34982,34983, +34984,34985,34986,23567,23389,26657,32918,21880,31505,25928,26964,20123,27463, +34638,38795,21327,25375,25658,37034,26012,32961,35856,20889,26800,21368,34809, +25032,27844,27899,35874,23633,34218,33455,38156,27427,36763,26032,24571,24515, +20449,34885,26143,33125,29481,24826,20852,21009,22411,24418,37026,34892,37266, +24184,26447,24615,22995,20804,20982,33016,21256,27769,38596,29066,20241,20462, +32670,26429,21957,38152,31168,34966,32483,22687,25100,38656,34394,22040,39035, +24464,35768,33988,37207,21465,26093,24207,30044,24676,32110,23167,32490,32493, +36713,21927,23459,24748,26059,29572,34988,34990,34991,34992,34994,34995,34996, +34997,34998,35000,35001,35002,35003,35005,35006,35007,35008,35011,35012,35015, +35016,35018,35019,35020,35021,35023,35024,35025,35027,35030,35031,35034,35035, +35036,35037,35038,35040,35041,35046,35047,35049,35050,35051,35052,35053,35054, +35055,35058,35061,35062,35063,35066,35067,35069,35071,35072,35073,35075,35076, +35077,35078,35079,35080,35081,35083,35084,35085,35086,35087,35089,35092,35093, +35094,35095,35096,35100,35101,35102,35103,35104,35106,35107,35108,35110,35111, +35112,35113,35116,35117,35118,35119,35121,35122,35123,35125,35127,36873,30307, +30505,32474,38772,34203,23398,31348,38634,34880,21195,29071,24490,26092,35810, +23547,39535,24033,27529,27739,35757,35759,36874,36805,21387,25276,40486,40493, +21568,20011,33469,29273,34460,23830,34905,28079,38597,21713,20122,35766,28937, +21693,38409,28895,28153,30416,20005,30740,34578,23721,24310,35328,39068,38414, +28814,27839,22852,25513,30524,34893,28436,33395,22576, +29141,21388,30746,38593,21761,24422,28976,23476,35866,39564,27523,22830,40495, +31207,26472,25196,20335,30113,32650,27915,38451,27687,20208,30162,20859,26679, +28478,36992,33136,22934,29814,35128,35129,35130,35131,35132,35133,35134,35135, +35136,35138,35139,35141,35142,35143,35144,35145,35146,35147,35148,35149,35150, +35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,35162,35163, +35164,35165,35168,35169,35170,35171,35172,35173,35175,35176,35177,35178,35179, +35180,35181,35182,35183,35184,35185,35186,35187,35188,35189,35190,35191,35192, +35193,35194,35196,35197,35198,35200,35202,35204,35205,35207,35208,35209,35210, +35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,35222,35223, +35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,25671,23591,36965, +31377,35875,23002,21676,33280,33647,35201,32768,26928,22094,32822,29239,37326, +20918,20063,39029,25494,19994,21494,26355,33099,22812,28082,19968,22777,21307, +25558,38129,20381,20234,34915,39056,22839,36951,31227,20202,33008,30097,27778, +23452,23016,24413,26885,34433,20506,24050,20057,30691,20197,33402,25233,26131, +37009,23673,20159,24441,33222,36920,32900,30123,20134,35028,24847,27589,24518, +20041,30410,28322,35811,35758,35850,35793,24322,32764,32716,32462,33589,33643, +22240,27575,38899,38452,23035,21535,38134,28139,23493,39278,23609,24341,38544, +35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,35246, +35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,35258,35259, +35260,35261,35262,35263,35264,35267,35277,35283,35284, +35285,35287,35288,35289,35291,35293,35295,35296,35297,35298,35300,35303,35304, +35305,35306,35308,35309,35310,35312,35313,35314,35316,35317,35318,35319,35320, +35321,35322,35323,35324,35325,35326,35327,35329,35330,35331,35332,35333,35334, +35336,35337,35338,35339,35340,35341,35342,35343,35344,35345,35346,35347,35348, +35349,35350,35351,35352,35353,35354,35355,35356,35357,21360,33521,27185,23156, +40560,24212,32552,33721,33828,33829,33639,34631,36814,36194,30408,24433,39062, +30828,26144,21727,25317,20323,33219,30152,24248,38605,36362,34553,21647,27891, +28044,27704,24703,21191,29992,24189,20248,24736,24551,23588,30001,37038,38080, +29369,27833,28216,37193,26377,21451,21491,20305,37321,35825,21448,24188,36802, +28132,20110,30402,27014,34398,24858,33286,20313,20446,36926,40060,24841,28189, +28180,38533,20104,23089,38632,19982,23679,31161,23431,35821,32701,29577,22495, +33419,37057,21505,36935,21947,23786,24481,24840,27442,29425,32946,35465,35358, +35359,35360,35361,35362,35363,35364,35365,35366,35367,35368,35369,35370,35371, +35372,35373,35374,35375,35376,35377,35378,35379,35380,35381,35382,35383,35384, +35385,35386,35387,35388,35389,35391,35392,35393,35394,35395,35396,35397,35398, +35399,35401,35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412, +35413,35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425, +35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,35438, +35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35450,35451,35452, +35453,35454,35455,35456,28020,23507,35029,39044,35947, +39533,40499,28170,20900,20803,22435,34945,21407,25588,36757,22253,21592,22278, +29503,28304,32536,36828,33489,24895,24616,38498,26352,32422,36234,36291,38053, +23731,31908,26376,24742,38405,32792,20113,37095,21248,38504,20801,36816,34164, +37213,26197,38901,23381,21277,30776,26434,26685,21705,28798,23472,36733,20877, +22312,21681,25874,26242,36190,36163,33039,33900,36973,31967,20991,34299,26531, +26089,28577,34468,36481,22122,36896,30338,28790,29157,36131,25321,21017,27901, +36156,24590,22686,24974,26366,36192,25166,21939,28195,26413,36711,35457,35458, +35459,35460,35461,35462,35463,35464,35467,35468,35469,35470,35471,35472,35473, +35474,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,35486,35487, +35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,35499,35500, +35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,35512,35513, +35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,35525,35526, +35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539, +35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,35551,35552, +35553,35554,35555,38113,38392,30504,26629,27048,21643,20045,28856,35784,25688, +25995,23429,31364,20538,23528,30651,27617,35449,31896,27838,30415,26025,36759, +23853,23637,34360,26632,21344,25112,31449,28251,32509,27167,31456,24432,28467, +24352,25484,28072,26454,19976,24080,36134,20183,32960,30260,38556,25307,26157, +25214,27836,36213,29031,32617,20806,32903,21484,36974,25240,21746,34544,36761, +32773,38167,34071,36825,27993,29645,26015,30495,29956, +30759,33275,36126,38024,20390,26517,30137,35786,38663,25391,38215,38453,33976, +25379,30529,24449,29424,20105,24596,25972,25327,27491,25919,35556,35557,35558, +35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571, +35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584, +35585,35586,35587,35588,35589,35590,35592,35593,35594,35595,35596,35597,35598, +35599,35600,35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611, +35612,35613,35614,35615,35616,35617,35618,35619,35620,35621,35623,35624,35625, +35626,35627,35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638, +35639,35640,35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651, +35652,35653,24103,30151,37073,35777,33437,26525,25903,21553,34584,30693,32930, +33026,27713,20043,32455,32844,30452,26893,27542,25191,20540,20356,22336,25351, +27490,36286,21482,26088,32440,24535,25370,25527,33267,33268,32622,24092,23769, +21046,26234,31209,31258,36136,28825,30164,28382,27835,31378,20013,30405,24544, +38047,34935,32456,31181,32959,37325,20210,20247,33311,21608,24030,27954,35788, +31909,36724,32920,24090,21650,30385,23449,26172,39588,29664,26666,34523,26417, +29482,35832,35803,36880,31481,28891,29038,25284,30633,22065,20027,33879,26609, +21161,34496,36142,38136,31569,35654,35655,35656,35657,35658,35659,35660,35661, +35662,35663,35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674, +35675,35676,35677,35678,35679,35680,35681,35682,35683,35684,35685,35687,35688, +35689,35690,35691,35693,35694,35695,35696,35697,35698, +35699,35700,35701,35702,35703,35704,35705,35706,35707,35708,35709,35710,35711, +35712,35713,35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724, +35725,35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737, +35738,35739,35740,35741,35742,35743,35756,35761,35771,35783,35792,35818,35849, +35870,20303,27880,31069,39547,25235,29226,25341,19987,30742,36716,25776,36186, +31686,26729,24196,35013,22918,25758,22766,29366,26894,38181,36861,36184,22368, +32512,35846,20934,25417,25305,21331,26700,29730,33537,37196,21828,30528,28796, +27978,20857,21672,36164,23039,28363,28100,23388,32043,20180,31869,28371,23376, +33258,28173,23383,39683,26837,36394,23447,32508,24635,32437,37049,36208,22863, +25549,31199,36275,21330,26063,31062,35781,38459,32452,38075,32386,22068,37257, +26368,32618,23562,36981,26152,24038,20304,26590,20570,20316,22352,24231,59408, +59409,59410,59411,59412,35896,35897,35898,35899,35900,35901,35902,35903,35904, +35906,35907,35908,35909,35912,35914,35915,35917,35918,35919,35920,35921,35922, +35923,35924,35926,35927,35928,35929,35931,35932,35933,35934,35935,35936,35939, +35940,35941,35942,35943,35944,35945,35948,35949,35950,35951,35952,35953,35954, +35956,35957,35958,35959,35963,35964,35965,35966,35967,35968,35969,35971,35972, +35974,35975,35976,35979,35981,35982,35983,35984,35985,35986,35987,35989,35990, +35991,35993,35994,35995,35996,35997,35998,35999,36000,36001,36002,36003,36004, +36005,36006,36007,36008,36009,36010,36011,36012,36013,20109,19980,20800,19984, +24319,21317,19989,20120,19998,39730,23404,22121,20008, +31162,20031,21269,20039,22829,29243,21358,27664,22239,32996,39319,27603,30590, +40727,20022,20127,40720,20060,20073,20115,33416,23387,21868,22031,20164,21389, +21405,21411,21413,21422,38757,36189,21274,21493,21286,21294,21310,36188,21350, +21347,20994,21000,21006,21037,21043,21055,21056,21068,21086,21089,21084,33967, +21117,21122,21121,21136,21139,20866,32596,20155,20163,20169,20162,20200,20193, +20203,20190,20251,20211,20258,20324,20213,20261,20263,20233,20267,20318,20327, +25912,20314,20317,36014,36015,36016,36017,36018,36019,36020,36021,36022,36023, +36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036, +36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049, +36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,36062, +36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,36074,36075, +36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,36086,36087,36088, +36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,36099,36100,36101, +36102,36103,36104,36105,36106,36107,36108,36109,20319,20311,20274,20285,20342, +20340,20369,20361,20355,20367,20350,20347,20394,20348,20396,20372,20454,20456, +20458,20421,20442,20451,20444,20433,20447,20472,20521,20556,20467,20524,20495, +20526,20525,20478,20508,20492,20517,20520,20606,20547,20565,20552,20558,20588, +20603,20645,20647,20649,20666,20694,20742,20717,20716,20710,20718,20743,20747, +20189,27709,20312,20325,20430,40864,27718,31860,20846,24061,40649,39320,20865, +22804,21241,21261,35335,21264,20971,22809,20821,20128, +20822,20147,34926,34980,20149,33044,35026,31104,23348,34819,32696,20907,20913, +20925,20924,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120, +36121,36122,36123,36124,36128,36177,36178,36183,36191,36197,36200,36201,36202, +36204,36206,36207,36209,36210,36216,36217,36218,36219,36220,36221,36222,36223, +36224,36226,36227,36230,36231,36232,36233,36236,36237,36238,36239,36240,36242, +36243,36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36256,36257, +36258,36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271, +36272,36274,36278,36279,36281,36283,36285,36288,36289,36290,36293,36295,36296, +36297,36298,36301,36304,36306,36307,36308,20935,20886,20898,20901,35744,35750, +35751,35754,35764,35765,35767,35778,35779,35787,35791,35790,35794,35795,35796, +35798,35800,35801,35804,35807,35808,35812,35816,35817,35822,35824,35827,35830, +35833,35836,35839,35840,35842,35844,35847,35852,35855,35857,35858,35860,35861, +35862,35865,35867,35864,35869,35871,35872,35873,35877,35879,35882,35883,35886, +35887,35890,35891,35893,35894,21353,21370,38429,38434,38433,38449,38442,38461, +38460,38466,38473,38484,38495,38503,38508,38514,38516,38536,38541,38551,38576, +37015,37019,37021,37017,37036,37025,37044,37043,37046,37050,36309,36312,36313, +36316,36320,36321,36322,36325,36326,36327,36329,36333,36334,36336,36337,36338, +36340,36342,36348,36350,36351,36352,36353,36354,36355,36356,36358,36359,36360, +36363,36365,36366,36368,36369,36370,36371,36373,36374,36375,36376,36377,36378, +36379,36380,36384,36385,36388,36389,36390,36391,36392, +36395,36397,36400,36402,36403,36404,36406,36407,36408,36411,36412,36414,36415, +36419,36421,36422,36428,36429,36430,36431,36432,36435,36436,36437,36438,36439, +36440,36442,36443,36444,36445,36446,36447,36448,36449,36450,36451,36452,36453, +36455,36456,36458,36459,36462,36465,37048,37040,37071,37061,37054,37072,37060, +37063,37075,37094,37090,37084,37079,37083,37099,37103,37118,37124,37154,37150, +37155,37169,37167,37177,37187,37190,21005,22850,21154,21164,21165,21182,21759, +21200,21206,21232,21471,29166,30669,24308,20981,20988,39727,21430,24321,30042, +24047,22348,22441,22433,22654,22716,22725,22737,22313,22316,22314,22323,22329, +22318,22319,22364,22331,22338,22377,22405,22379,22406,22396,22395,22376,22381, +22390,22387,22445,22436,22412,22450,22479,22439,22452,22419,22432,22485,22488, +22490,22489,22482,22456,22516,22511,22520,22500,22493,36467,36469,36471,36472, +36473,36474,36475,36477,36478,36480,36482,36483,36484,36486,36488,36489,36490, +36491,36492,36493,36494,36497,36498,36499,36501,36502,36503,36504,36505,36506, +36507,36509,36511,36512,36513,36514,36515,36516,36517,36518,36519,36520,36521, +36522,36525,36526,36528,36529,36531,36532,36533,36534,36535,36536,36537,36539, +36540,36541,36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552, +36553,36554,36555,36556,36557,36559,36560,36561,36562,36563,36564,36565,36566, +36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,36578,36579, +36580,22539,22541,22525,22509,22528,22558,22553,22596,22560,22629,22636,22657, +22665,22682,22656,39336,40729,25087,33401,33405,33407, +33423,33418,33448,33412,33422,33425,33431,33433,33451,33464,33470,33456,33480, +33482,33507,33432,33463,33454,33483,33484,33473,33449,33460,33441,33450,33439, +33476,33486,33444,33505,33545,33527,33508,33551,33543,33500,33524,33490,33496, +33548,33531,33491,33553,33562,33542,33556,33557,33504,33493,33564,33617,33627, +33628,33544,33682,33596,33588,33585,33691,33630,33583,33615,33607,33603,33631, +33600,33559,33632,33581,33594,33587,33638,33637,36581,36582,36583,36584,36585, +36586,36587,36588,36589,36590,36591,36592,36593,36594,36595,36596,36597,36598, +36599,36600,36601,36602,36603,36604,36605,36606,36607,36608,36609,36610,36611, +36612,36613,36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624, +36625,36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637, +36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,36650, +36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,36662,36663, +36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,36674,36675,36676, +33640,33563,33641,33644,33642,33645,33646,33712,33656,33715,33716,33696,33706, +33683,33692,33669,33660,33718,33705,33661,33720,33659,33688,33694,33704,33722, +33724,33729,33793,33765,33752,22535,33816,33803,33757,33789,33750,33820,33848, +33809,33798,33748,33759,33807,33795,33784,33785,33770,33733,33728,33830,33776, +33761,33884,33873,33882,33881,33907,33927,33928,33914,33929,33912,33852,33862, +33897,33910,33932,33934,33841,33901,33985,33997,34000,34022,33981,34003,33994, +33983,33978,34016,33953,33977,33972,33943,34021,34019, 34060,29965,34104,34032,34105,34079,34106,36677,36678,36679,36680,36681,36682, 36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695, 36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708, @@ -1370,243 +1392,247 @@ 36912,36913,36914,36915,36916,36919,36921,36922,36925,36927,36928,36931,36933, 36934,36936,36937,36938,36939,36940,36942,36948,36949,36950,36953,36954,36956, 36957,36958,36959,36960,36961,36964,36966,36967,36969,36970,36971,36972,36975, -36976,36977,36978,36979,36982,36983,36984,36985,36986,36987,36988,36990,36993, -36996,36997,36998,36999,37001,37002,37004,37005,37006,37007,37008,37010,37012, -37014,37016,37018,37020,37022,37023,37024,37028,37029,37031,37032,37033,37035, -37037,37042,37047,37052,37053,37055,37056,25722,25783,25784,25753,25786,25792, -25808,25815,25828,25826,25865,25893,25902,24331,24530,29977,24337,21343,21489, -21501,21481,21480,21499,21522,21526,21510,21579,21586,21587,21588,21590,21571, -21537,21591,21593,21539,21554,21634,21652,21623,21617,21604,21658,21659,21636, -21622,21606,21661,21712,21677,21698,21684,21714,21671,21670,21715,21716,21618, -21667,21717,21691,21695,21708,21721,21722,21724,21673,21674,21668,21725,21711, -21726,21787,21735,21792,21757,21780,21747,21794,21795,21775,21777,21799,21802, -21863,21903,21941,21833,21869,21825,21845,21823,21840,21820,37058,37059,37062, -37064,37065,37067,37068,37069,37074,37076,37077,37078,37080,37081,37082,37086, -37087,37088,37091,37092,37093,37097,37098,37100,37102,37104,37105,37106,37107, -37109,37110,37111,37113,37114,37115,37116,37119,37120,37121,37123,37125,37126, -37127,37128,37129,37130,37131,37132,37133,37134,37135,37136,37137,37138,37139, -37140,37141,37142,37143,37144,37146,37147,37148,37149,37151,37152,37153,37156, -37157,37158,37159,37160,37161,37162,37163,37164,37165,37166,37168,37170,37171, -37172,37173,37174,37175,37176,37178,37179,37180,37181,37182,37183,37184,37185, -37186,37188,21815,21846,21877,21878,21879,21811,21808,21852,21899,21970,21891, -21937,21945,21896,21889,21919,21886,21974,21905,21883,21983,21949,21950,21908, -21913,21994,22007,21961,22047,21969,21995,21996,21972,21990,21981,21956,21999, -21989,22002,22003,21964,21965,21992,22005,21988,36756,22046,22024,22028,22017, -22052,22051,22014,22016,22055,22061,22104,22073,22103,22060,22093,22114,22105, -22108,22092,22100,22150,22116,22129,22123,22139,22140,22149,22163,22191,22228, -22231,22237,22241,22261,22251,22265,22271,22276,22282,22281,22300,24079,24089, -24084,24081,24113,24123,24124,37189,37191,37192,37201,37203,37204,37205,37206, -37208,37209,37211,37212,37215,37216,37222,37223,37224,37227,37229,37235,37242, -37243,37244,37248,37249,37250,37251,37252,37254,37256,37258,37262,37263,37267, -37268,37269,37270,37271,37272,37273,37276,37277,37278,37279,37280,37281,37284, -37285,37286,37287,37288,37289,37291,37292,37296,37297,37298,37299,37302,37303, -37304,37305,37307,37308,37309,37310,37311,37312,37313,37314,37315,37316,37317, -37318,37320,37323,37328,37330,37331,37332,37333,37334,37335,37336,37337,37338, -37339,37341,37342,37343,37344,37345,37346,37347,37348,37349,24119,24132,24148, -24155,24158,24161,23692,23674,23693,23696,23702,23688,23704,23705,23697,23706, -23708,23733,23714,23741,23724,23723,23729,23715,23745,23735,23748,23762,23780, -23755,23781,23810,23811,23847,23846,23854,23844,23838,23814,23835,23896,23870, -23860,23869,23916,23899,23919,23901,23915,23883,23882,23913,23924,23938,23961, -23965,35955,23991,24005,24435,24439,24450,24455,24457,24460,24469,24473,24476, -24488,24493,24501,24508,34914,24417,29357,29360,29364,29367,29368,29379,29377, -29390,29389,29394,29416,29423,29417,29426,29428,29431,29441,29427,29443,29434, -37350,37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362, -37363,37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375, -37376,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388, -37389,37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401, -37402,37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414, -37415,37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427, -37428,37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440, -37441,37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461, -29474,29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566, -33307,22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284, -39287,39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192, -24209,24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283, -24296,24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574, -24581,24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619, -24586,24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450, -37451,37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463, -37464,37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476, -37477,37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489, -37490,37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503, -37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,37514,37515,37516, -37517,37519,37520,37521,37522,37523,37524,37525,37526,37527,37528,37529,37530, -37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,37541,37542,37543, -24682,24701,24726,24730,24749,24733,24707,24722,24716,24731,24812,24763,24753, -24797,24792,24774,24794,24756,24864,24870,24853,24867,24820,24832,24846,24875, -24906,24949,25004,24980,24999,25015,25044,25077,24541,38579,38377,38379,38385, -38387,38389,38390,38396,38398,38403,38404,38406,38408,38410,38411,38412,38413, -38415,38418,38421,38422,38423,38425,38426,20012,29247,25109,27701,27732,27740, -27722,27811,27781,27792,27796,27788,27752,27753,27764,27766,27782,27817,27856, -27860,27821,27895,27896,27889,27863,27826,27872,27862,27898,27883,27886,27825, -27859,27887,27902,37544,37545,37546,37547,37548,37549,37551,37552,37553,37554, -37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,37565,37566,37567, -37568,37569,37570,37571,37572,37573,37574,37575,37577,37578,37579,37580,37581, -37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,37592,37593,37594, -37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,37605,37606,37607, -37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620, -37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633, -37634,37635,37636,37637,37638,37639,37640,37641,27961,27943,27916,27971,27976, -27911,27908,27929,27918,27947,27981,27950,27957,27930,27983,27986,27988,27955, -28049,28015,28062,28064,27998,28051,28052,27996,28000,28028,28003,28186,28103, -28101,28126,28174,28095,28128,28177,28134,28125,28121,28182,28075,28172,28078, -28203,28270,28238,28267,28338,28255,28294,28243,28244,28210,28197,28228,28383, -28337,28312,28384,28461,28386,28325,28327,28349,28347,28343,28375,28340,28367, -28303,28354,28319,28514,28486,28487,28452,28437,28409,28463,28470,28491,28532, -28458,28425,28457,28553,28557,28556,28536,28530,28540,28538,28625,37642,37643, -37644,37645,37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656, -37657,37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669, -37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,37682, -37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,37695,37696, -37697,37698,37699,37700,37701,37702,37703,37704,37705,37706,37707,37708,37709, -37710,37711,37712,37713,37714,37715,37716,37717,37718,37719,37720,37721,37722, -37723,37724,37725,37726,37727,37728,37729,37730,37731,37732,37733,37734,37735, -37736,37737,37739,28617,28583,28601,28598,28610,28641,28654,28638,28640,28655, -28698,28707,28699,28729,28725,28751,28766,23424,23428,23445,23443,23461,23480, -29999,39582,25652,23524,23534,35120,23536,36423,35591,36790,36819,36821,36837, -36846,36836,36841,36838,36851,36840,36869,36868,36875,36902,36881,36877,36886, -36897,36917,36918,36909,36911,36932,36945,36946,36944,36968,36952,36962,36955, -26297,36980,36989,36994,37000,36995,37003,24400,24407,24406,24408,23611,21675, -23632,23641,23409,23651,23654,32700,24362,24361,24365,33396,24380,39739,23662, -22913,22915,22925,22953,22954,22947,37740,37741,37742,37743,37744,37745,37746, -37747,37748,37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759, -37760,37761,37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772, -37773,37774,37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786, -37787,37788,37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799, -37800,37801,37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812, -37813,37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825, -37826,37827,37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986, -22955,22942,22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011, -23000,23033,23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125, -23100,23138,23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252, -23224,23264,23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351, -23360,23573,23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546, -39551,39549,39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579, -39580,39581,39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424, -32425,37838,37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850, -37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863, -37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876, -37877,37878,37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889, -37890,37891,37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902, -37903,37904,37905,37906,37907,37908,37909,37910,37911,37912,37913,37914,37915, -37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,37927,37928, -37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449,32450,32457, -32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494,32495,32497, -32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520,32523,32524, -32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547,32548,32549, -32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563,32565,24186, -30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634,29649,29623, -29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662,29626,29682, -29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936,37937,37938, -37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,37951,37952, -37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,37964,37965, -37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,37977,37978, -37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,37990,37991, -37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005, -38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,38018, -38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118,38139,38172, -38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822,29852,29838, -29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882,38890,38891, -38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520,26535,26485, -26536,26526,26541,26507,26487,26492,26608,26633,26584,26634,26601,26544,26636, -26585,26549,26586,26547,26589,26624,26563,26552,26594,26638,26561,26621,26674, -26675,26720,26721,26702,26722,26692,26724,26755,26653,26709,26726,26689,26727, -26688,26686,26698,26697,26665,26805,26767,26740,26743,26771,26731,26818,26990, -26876,26911,26912,26873,38183,38195,38205,38211,38216,38219,38229,38234,38240, -38254,38260,38261,38263,38264,38265,38266,38267,38268,38269,38270,38272,38273, -38274,38275,38276,38277,38278,38279,38280,38281,38282,38283,38284,38285,38286, -38287,38288,38289,38290,38291,38292,38293,38294,38295,38296,38297,38298,38299, -38300,38301,38302,38303,38304,38305,38306,38307,38308,38309,38310,38311,38312, -38313,38314,38315,38316,38317,38318,38319,38320,38321,38322,38323,38324,38325, -38326,38327,38328,38329,38330,38331,38332,38333,38334,38335,38336,38337,38338, -38339,38340,38341,38342,38343,38344,38345,38346,38347,26916,26864,26891,26881, -26967,26851,26896,26993,26937,26976,26946,26973,27012,26987,27008,27032,27000, -26932,27084,27015,27016,27086,27017,26982,26979,27001,27035,27047,27067,27051, -27053,27092,27057,27073,27082,27103,27029,27104,27021,27135,27183,27117,27159, -27160,27237,27122,27204,27198,27296,27216,27227,27189,27278,27257,27197,27176, -27224,27260,27281,27280,27305,27287,27307,29495,29522,27521,27522,27527,27524, -27538,27539,27533,27546,27547,27553,27562,36715,36717,36721,36722,36723,36725, -36726,36728,36727,36729,36730,36732,36734,36737,36738,36740,36743,36747,38348, -38349,38350,38351,38352,38353,38354,38355,38356,38357,38358,38359,38360,38361, -38362,38363,38364,38365,38366,38367,38368,38369,38370,38371,38372,38373,38374, -38375,38380,38399,38407,38419,38424,38427,38430,38432,38435,38436,38437,38438, -38439,38440,38441,38443,38444,38445,38447,38448,38455,38456,38457,38458,38462, -38465,38467,38474,38478,38479,38481,38482,38483,38486,38487,38488,38489,38490, -38492,38493,38494,38496,38499,38501,38502,38507,38509,38510,38511,38512,38513, -38515,38520,38521,38522,38523,38524,38525,38526,38527,38528,38529,38530,38531, -38532,38535,38537,38538,36749,36750,36751,36760,36762,36558,25099,25111,25115, -25119,25122,25121,25125,25124,25132,33255,29935,29940,29951,29967,29969,29971, -25908,26094,26095,26096,26122,26137,26482,26115,26133,26112,28805,26359,26141, -26164,26161,26166,26165,32774,26207,26196,26177,26191,26198,26209,26199,26231, -26244,26252,26279,26269,26302,26331,26332,26342,26345,36146,36147,36150,36155, -36157,36160,36165,36166,36168,36169,36167,36173,36181,36185,35271,35274,35275, -35276,35278,35279,35280,35281,29294,29343,29277,29286,29295,29310,29311,29316, -29323,29325,29327,29330,25352,25394,25520,38540,38542,38545,38546,38547,38549, -38550,38554,38555,38557,38558,38559,38560,38561,38562,38563,38564,38565,38566, -38568,38569,38570,38571,38572,38573,38574,38575,38577,38578,38580,38581,38583, -38584,38586,38587,38591,38594,38595,38600,38602,38603,38608,38609,38611,38612, -38614,38615,38616,38617,38618,38619,38620,38621,38622,38623,38625,38626,38627, -38628,38629,38630,38631,38635,38636,38637,38638,38640,38641,38642,38644,38645, -38648,38650,38651,38652,38653,38655,38658,38659,38661,38666,38667,38668,38672, -38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688,25663, -25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669,27672, -27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266,29270, -29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941,32948, -32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384,32989, -33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078,33054, -33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129,33148, -33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228,26406, -33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699,38700, -38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717,38719, -38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,38732, -38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749,38751, -38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768,38769, -38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785,38786, -38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803,38805, -38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449,27459, -27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315,26000, -40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828,28822, -28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975,28977, -29043,29020,29032,28997,29042,29002,29048,29050,29080,29107,29109,29096,29088, -29152,29140,29159,29177,29213,29224,28780,28952,29030,29113,25150,25149,25155, -25160,25161,31035,31040,31046,31049,31067,31068,31059,31066,31074,31063,31072, -31087,31079,31098,31109,31114,31130,31143,31155,24529,24528,38814,38815,38817, -38818,38820,38821,38822,38823,38824,38825,38826,38828,38830,38832,38833,38835, -38837,38838,38839,38840,38841,38842,38843,38844,38845,38846,38847,38848,38849, -38850,38851,38852,38853,38854,38855,38856,38857,38858,38859,38860,38861,38862, -38863,38864,38865,38866,38867,38868,38869,38870,38871,38872,38873,38874,38875, -38876,38877,38878,38879,38880,38881,38882,38883,38884,38885,38888,38894,38895, -38896,38897,38898,38900,38903,38904,38905,38906,38907,38908,38909,38910,38911, -38912,38913,38914,38915,38916,38917,38918,38919,38920,38921,38922,38923,38924, -38925,38926,24636,24669,24666,24679,24641,24665,24675,24747,24838,24845,24925, -25001,24989,25035,25041,25094,32896,32895,27795,27894,28156,30710,30712,30720, -30729,30743,30744,30737,26027,30765,30748,30749,30777,30778,30779,30751,30780, -30757,30764,30755,30761,30798,30829,30806,30807,30758,30800,30791,30796,30826, -30875,30867,30874,30855,30876,30881,30883,30898,30905,30885,30932,30937,30921, -30956,30962,30981,30964,30995,31012,31006,31028,40859,40697,40699,40700,30449, -30468,30477,30457,30471,30472,30490,30498,30489,30509,30502,30517,30520,30544, -30545,30535,30531,30554,30568,38927,38928,38929,38930,38931,38932,38933,38934, -38935,38936,38937,38938,38939,38940,38941,38942,38943,38944,38945,38946,38947, -38948,38949,38950,38951,38952,38953,38954,38955,38956,38957,38958,38959,38960, -38961,38962,38963,38964,38965,38966,38967,38968,38969,38970,38971,38972,38973, -38974,38975,38976,38977,38978,38979,38980,38981,38982,38983,38984,38985,38986, -38987,38988,38989,38990,38991,38992,38993,38994,38995,38996,38997,38998,38999, -39000,39001,39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012, -39013,39014,39015,39016,39017,39018,39019,39020,39021,39022,30562,30565,30591, -30605,30589,30592,30604,30609,30623,30624,30640,30645,30653,30010,30016,30030, -30027,30024,30043,30066,30073,30083,32600,32609,32607,35400,32616,32628,32625, -32633,32641,32638,30413,30437,34866,38021,38022,38023,38027,38026,38028,38029, -38031,38032,38036,38039,38037,38042,38043,38044,38051,38052,38059,38058,38061, -38060,38063,38064,38066,38068,38070,38071,38072,38073,38074,38076,38077,38079, -38084,38088,38089,38090,38091,38092,38093,38094,38096,38097,38098,38101,38102, -38103,38105,38104,38107,38110,38111,38112,38114,38116,38117,38119,38120,38122, -39023,39024,39025,39026,39027,39028,39051,39054,39058,39061,39065,39075,39080, -39081,39082,39083,39084,39085,39086,39087,39088,39089,39090,39091,39092,39093, -39094,39095,39096,39097,39098,39099,39100,39101,39102,39103,39104,39105,39106, -39107,39108,39109,39110,39111,39112,39113,39114,39115,39116,39117,39119,39120, -39124,39126,39127,39131,39132,39133,39136,39137,39138,39139,39140,39141,39142, -39145,39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157, -39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,39170, +36976,36977,36978,36979,36982,36983,36984,36985,36986, +36987,36988,36990,36993,36996,36997,36998,36999,37001,37002,37004,37005,37006, +37007,37008,37010,37012,37014,37016,37018,37020,37022,37023,37024,37028,37029, +37031,37032,37033,37035,37037,37042,37047,37052,37053,37055,37056,25722,25783, +25784,25753,25786,25792,25808,25815,25828,25826,25865,25893,25902,24331,24530, +29977,24337,21343,21489,21501,21481,21480,21499,21522,21526,21510,21579,21586, +21587,21588,21590,21571,21537,21591,21593,21539,21554,21634,21652,21623,21617, +21604,21658,21659,21636,21622,21606,21661,21712,21677,21698,21684,21714,21671, +21670,21715,21716,21618,21667,21717,21691,21695,21708,21721,21722,21724,21673, +21674,21668,21725,21711,21726,21787,21735,21792,21757,21780,21747,21794,21795, +21775,21777,21799,21802,21863,21903,21941,21833,21869,21825,21845,21823,21840, +21820,37058,37059,37062,37064,37065,37067,37068,37069,37074,37076,37077,37078, +37080,37081,37082,37086,37087,37088,37091,37092,37093,37097,37098,37100,37102, +37104,37105,37106,37107,37109,37110,37111,37113,37114,37115,37116,37119,37120, +37121,37123,37125,37126,37127,37128,37129,37130,37131,37132,37133,37134,37135, +37136,37137,37138,37139,37140,37141,37142,37143,37144,37146,37147,37148,37149, +37151,37152,37153,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165, +37166,37168,37170,37171,37172,37173,37174,37175,37176,37178,37179,37180,37181, +37182,37183,37184,37185,37186,37188,21815,21846,21877,21878,21879,21811,21808, +21852,21899,21970,21891,21937,21945,21896,21889,21919,21886,21974,21905,21883, +21983,21949,21950,21908,21913,21994,22007,21961,22047, +21969,21995,21996,21972,21990,21981,21956,21999,21989,22002,22003,21964,21965, +21992,22005,21988,36756,22046,22024,22028,22017,22052,22051,22014,22016,22055, +22061,22104,22073,22103,22060,22093,22114,22105,22108,22092,22100,22150,22116, +22129,22123,22139,22140,22149,22163,22191,22228,22231,22237,22241,22261,22251, +22265,22271,22276,22282,22281,22300,24079,24089,24084,24081,24113,24123,24124, +37189,37191,37192,37201,37203,37204,37205,37206,37208,37209,37211,37212,37215, +37216,37222,37223,37224,37227,37229,37235,37242,37243,37244,37248,37249,37250, +37251,37252,37254,37256,37258,37262,37263,37267,37268,37269,37270,37271,37272, +37273,37276,37277,37278,37279,37280,37281,37284,37285,37286,37287,37288,37289, +37291,37292,37296,37297,37298,37299,37302,37303,37304,37305,37307,37308,37309, +37310,37311,37312,37313,37314,37315,37316,37317,37318,37320,37323,37328,37330, +37331,37332,37333,37334,37335,37336,37337,37338,37339,37341,37342,37343,37344, +37345,37346,37347,37348,37349,24119,24132,24148,24155,24158,24161,23692,23674, +23693,23696,23702,23688,23704,23705,23697,23706,23708,23733,23714,23741,23724, +23723,23729,23715,23745,23735,23748,23762,23780,23755,23781,23810,23811,23847, +23846,23854,23844,23838,23814,23835,23896,23870,23860,23869,23916,23899,23919, +23901,23915,23883,23882,23913,23924,23938,23961,23965,35955,23991,24005,24435, +24439,24450,24455,24457,24460,24469,24473,24476,24488,24493,24501,24508,34914, +24417,29357,29360,29364,29367,29368,29379,29377,29390,29389,29394,29416,29423, +29417,29426,29428,29431,29441,29427,29443,29434,37350, +37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,37363, +37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,37376, +37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,37389, +37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,37402, +37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,37415, +37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428, +37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441, +37442,37443,37444,37445,29435,29463,29459,29473,29450,29470,29469,29461,29474, +29497,29477,29484,29496,29489,29520,29517,29527,29536,29548,29551,29566,33307, +22821,39143,22820,22786,39267,39271,39272,39273,39274,39275,39276,39284,39287, +39293,39296,39300,39303,39306,39309,39312,39313,39315,39316,39317,24192,24209, +24203,24214,24229,24224,24249,24245,24254,24243,36179,24274,24273,24283,24296, +24298,33210,24516,24521,24534,24527,24579,24558,24580,24545,24548,24574,24581, +24582,24554,24557,24568,24601,24629,24614,24603,24591,24589,24617,24619,24586, +24639,24609,24696,24697,24699,24698,24642,37446,37447,37448,37449,37450,37451, +37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464, +37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477, +37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,37490, +37491,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,37504, +37505,37506,37507,37508,37509,37510,37511,37512,37513, +37514,37515,37516,37517,37519,37520,37521,37522,37523,37524,37525,37526,37527, +37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,37538,37539,37540, +37541,37542,37543,24682,24701,24726,24730,24749,24733,24707,24722,24716,24731, +24812,24763,24753,24797,24792,24774,24794,24756,24864,24870,24853,24867,24820, +24832,24846,24875,24906,24949,25004,24980,24999,25015,25044,25077,24541,38579, +38377,38379,38385,38387,38389,38390,38396,38398,38403,38404,38406,38408,38410, +38411,38412,38413,38415,38418,38421,38422,38423,38425,38426,20012,29247,25109, +27701,27732,27740,27722,27811,27781,27792,27796,27788,27752,27753,27764,27766, +27782,27817,27856,27860,27821,27895,27896,27889,27863,27826,27872,27862,27898, +27883,27886,27825,27859,27887,27902,37544,37545,37546,37547,37548,37549,37551, +37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,37562,37563,37564, +37565,37566,37567,37568,37569,37570,37571,37572,37573,37574,37575,37577,37578, +37579,37580,37581,37582,37583,37584,37585,37586,37587,37588,37589,37590,37591, +37592,37593,37594,37595,37596,37597,37598,37599,37600,37601,37602,37603,37604, +37605,37606,37607,37608,37609,37610,37611,37612,37613,37614,37615,37616,37617, +37618,37619,37620,37621,37622,37623,37624,37625,37626,37627,37628,37629,37630, +37631,37632,37633,37634,37635,37636,37637,37638,37639,37640,37641,27961,27943, +27916,27971,27976,27911,27908,27929,27918,27947,27981,27950,27957,27930,27983, +27986,27988,27955,28049,28015,28062,28064,27998,28051,28052,27996,28000,28028, +28003,28186,28103,28101,28126,28174,28095,28128,28177, +28134,28125,28121,28182,28075,28172,28078,28203,28270,28238,28267,28338,28255, +28294,28243,28244,28210,28197,28228,28383,28337,28312,28384,28461,28386,28325, +28327,28349,28347,28343,28375,28340,28367,28303,28354,28319,28514,28486,28487, +28452,28437,28409,28463,28470,28491,28532,28458,28425,28457,28553,28557,28556, +28536,28530,28540,28538,28625,37642,37643,37644,37645,37646,37647,37648,37649, +37650,37651,37652,37653,37654,37655,37656,37657,37658,37659,37660,37661,37662, +37663,37664,37665,37666,37667,37668,37669,37670,37671,37672,37673,37674,37675, +37676,37677,37678,37679,37680,37681,37682,37683,37684,37685,37686,37687,37688, +37689,37690,37691,37692,37693,37695,37696,37697,37698,37699,37700,37701,37702, +37703,37704,37705,37706,37707,37708,37709,37710,37711,37712,37713,37714,37715, +37716,37717,37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728, +37729,37730,37731,37732,37733,37734,37735,37736,37737,37739,28617,28583,28601, +28598,28610,28641,28654,28638,28640,28655,28698,28707,28699,28729,28725,28751, +28766,23424,23428,23445,23443,23461,23480,29999,39582,25652,23524,23534,35120, +23536,36423,35591,36790,36819,36821,36837,36846,36836,36841,36838,36851,36840, +36869,36868,36875,36902,36881,36877,36886,36897,36917,36918,36909,36911,36932, +36945,36946,36944,36968,36952,36962,36955,26297,36980,36989,36994,37000,36995, +37003,24400,24407,24406,24408,23611,21675,23632,23641,23409,23651,23654,32700, +24362,24361,24365,33396,24380,39739,23662,22913,22915,22925,22953,22954,22947, +37740,37741,37742,37743,37744,37745,37746,37747,37748, +37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,37760,37761, +37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,37773,37774, +37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788, +37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801, +37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,37814, +37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,37826,37827, +37828,37829,37830,37831,37832,37833,37835,37836,37837,22935,22986,22955,22942, +22948,22994,22962,22959,22999,22974,23045,23046,23005,23048,23011,23000,23033, +23052,23049,23090,23092,23057,23075,23059,23104,23143,23114,23125,23100,23138, +23157,33004,23210,23195,23159,23162,23230,23275,23218,23250,23252,23224,23264, +23267,23281,23254,23270,23256,23260,23305,23319,23318,23346,23351,23360,23573, +23580,23386,23397,23411,23377,23379,23394,39541,39543,39544,39546,39551,39549, +39552,39553,39557,39560,39562,39568,39570,39571,39574,39576,39579,39580,39581, +39583,39584,39586,39587,39589,39591,32415,32417,32419,32421,32424,32425,37838, +37839,37840,37841,37842,37843,37844,37845,37847,37848,37849,37850,37851,37852, +37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,37864,37865, +37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,37877,37878, +37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,37890,37891, +37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,37903,37904, +37905,37906,37907,37908,37909,37910,37911,37912,37913, +37914,37915,37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926, +37927,37928,37929,37930,37931,37932,37933,37934,32429,32432,32446,32448,32449, +32450,32457,32459,32460,32464,32468,32471,32475,32480,32481,32488,32491,32494, +32495,32497,32498,32525,32502,32506,32507,32510,32513,32514,32515,32519,32520, +32523,32524,32527,32529,32530,32535,32537,32540,32539,32543,32545,32546,32547, +32548,32549,32550,32551,32554,32555,32556,32557,32559,32560,32561,32562,32563, +32565,24186,30079,24027,30014,37013,29582,29585,29614,29602,29599,29647,29634, +29649,29623,29619,29632,29641,29640,29669,29657,39036,29706,29673,29671,29662, +29626,29682,29711,29738,29787,29734,29733,29736,29744,29742,29740,37935,37936, +37937,37938,37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949, +37951,37952,37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963, +37964,37965,37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976, +37977,37978,37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989, +37990,37991,37992,37993,37994,37996,37997,37998,37999,38000,38001,38002,38003, +38004,38005,38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016, +38017,38018,38019,38020,38033,38038,38040,38087,38095,38099,38100,38106,38118, +38139,38172,38176,29723,29722,29761,29788,29783,29781,29785,29815,29805,29822, +29852,29838,29824,29825,29831,29835,29854,29864,29865,29840,29863,29906,29882, +38890,38891,38892,26444,26451,26462,26440,26473,26533,26503,26474,26483,26520, +26535,26485,26536,26526,26541,26507,26487,26492,26608, +26633,26584,26634,26601,26544,26636,26585,26549,26586,26547,26589,26624,26563, +26552,26594,26638,26561,26621,26674,26675,26720,26721,26702,26722,26692,26724, +26755,26653,26709,26726,26689,26727,26688,26686,26698,26697,26665,26805,26767, +26740,26743,26771,26731,26818,26990,26876,26911,26912,26873,38183,38195,38205, +38211,38216,38219,38229,38234,38240,38254,38260,38261,38263,38264,38265,38266, +38267,38268,38269,38270,38272,38273,38274,38275,38276,38277,38278,38279,38280, +38281,38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293, +38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,38306, +38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,38318,38319, +38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,38330,38331,38332, +38333,38334,38335,38336,38337,38338,38339,38340,38341,38342,38343,38344,38345, +38346,38347,26916,26864,26891,26881,26967,26851,26896,26993,26937,26976,26946, +26973,27012,26987,27008,27032,27000,26932,27084,27015,27016,27086,27017,26982, +26979,27001,27035,27047,27067,27051,27053,27092,27057,27073,27082,27103,27029, +27104,27021,27135,27183,27117,27159,27160,27237,27122,27204,27198,27296,27216, +27227,27189,27278,27257,27197,27176,27224,27260,27281,27280,27305,27287,27307, +29495,29522,27521,27522,27527,27524,27538,27539,27533,27546,27547,27553,27562, +36715,36717,36721,36722,36723,36725,36726,36728,36727,36729,36730,36732,36734, +36737,36738,36740,36743,36747,38348,38349,38350,38351,38352,38353,38354,38355, +38356,38357,38358,38359,38360,38361,38362,38363,38364, +38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38380,38399, +38407,38419,38424,38427,38430,38432,38435,38436,38437,38438,38439,38440,38441, +38443,38444,38445,38447,38448,38455,38456,38457,38458,38462,38465,38467,38474, +38478,38479,38481,38482,38483,38486,38487,38488,38489,38490,38492,38493,38494, +38496,38499,38501,38502,38507,38509,38510,38511,38512,38513,38515,38520,38521, +38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38535,38537, +38538,36749,36750,36751,36760,36762,36558,25099,25111,25115,25119,25122,25121, +25125,25124,25132,33255,29935,29940,29951,29967,29969,29971,25908,26094,26095, +26096,26122,26137,26482,26115,26133,26112,28805,26359,26141,26164,26161,26166, +26165,32774,26207,26196,26177,26191,26198,26209,26199,26231,26244,26252,26279, +26269,26302,26331,26332,26342,26345,36146,36147,36150,36155,36157,36160,36165, +36166,36168,36169,36167,36173,36181,36185,35271,35274,35275,35276,35278,35279, +35280,35281,29294,29343,29277,29286,29295,29310,29311,29316,29323,29325,29327, +29330,25352,25394,25520,38540,38542,38545,38546,38547,38549,38550,38554,38555, +38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,38568,38569,38570, +38571,38572,38573,38574,38575,38577,38578,38580,38581,38583,38584,38586,38587, +38591,38594,38595,38600,38602,38603,38608,38609,38611,38612,38614,38615,38616, +38617,38618,38619,38620,38621,38622,38623,38625,38626,38627,38628,38629,38630, +38631,38635,38636,38637,38638,38640,38641,38642,38644,38645,38648,38650,38651, +38652,38653,38655,38658,38659,38661,38666,38667,38668, +38672,38673,38674,38676,38677,38679,38680,38681,38682,38683,38685,38687,38688, +25663,25816,32772,27626,27635,27645,27637,27641,27653,27655,27654,27661,27669, +27672,27673,27674,27681,27689,27684,27690,27698,25909,25941,25963,29261,29266, +29270,29232,34402,21014,32927,32924,32915,32956,26378,32957,32945,32939,32941, +32948,32951,32999,33000,33001,33002,32987,32962,32964,32985,32973,32983,26384, +32989,33003,33009,33012,33005,33037,33038,33010,33020,26389,33042,35930,33078, +33054,33068,33048,33074,33096,33100,33107,33140,33113,33114,33137,33120,33129, +33148,33149,33133,33127,22605,23221,33160,33154,33169,28373,33187,33194,33228, +26406,33226,33211,38689,38690,38691,38692,38693,38694,38695,38696,38697,38699, +38700,38702,38703,38705,38707,38708,38709,38710,38711,38714,38715,38716,38717, +38719,38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731, +38732,38733,38734,38735,38736,38737,38740,38741,38743,38744,38746,38748,38749, +38751,38755,38756,38758,38759,38760,38762,38763,38764,38765,38766,38767,38768, +38769,38770,38773,38775,38776,38777,38778,38779,38781,38782,38783,38784,38785, +38786,38787,38788,38790,38791,38792,38793,38794,38796,38798,38799,38800,38803, +38805,38806,38807,38809,38810,38811,38812,38813,33217,33190,27428,27447,27449, +27459,27462,27481,39121,39122,39123,39125,39129,39130,27571,24384,27586,35315, +26000,40785,26003,26044,26054,26052,26051,26060,26062,26066,26070,28800,28828, +28822,28829,28859,28864,28855,28843,28849,28904,28874,28944,28947,28950,28975, +28977,29043,29020,29032,28997,29042,29002,29048,29050, +29080,29107,29109,29096,29088,29152,29140,29159,29177,29213,29224,28780,28952, +29030,29113,25150,25149,25155,25160,25161,31035,31040,31046,31049,31067,31068, +31059,31066,31074,31063,31072,31087,31079,31098,31109,31114,31130,31143,31155, +24529,24528,38814,38815,38817,38818,38820,38821,38822,38823,38824,38825,38826, +38828,38830,38832,38833,38835,38837,38838,38839,38840,38841,38842,38843,38844, +38845,38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857, +38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,38870, +38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,38882,38883, +38884,38885,38888,38894,38895,38896,38897,38898,38900,38903,38904,38905,38906, +38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,38918,38919, +38920,38921,38922,38923,38924,38925,38926,24636,24669,24666,24679,24641,24665, +24675,24747,24838,24845,24925,25001,24989,25035,25041,25094,32896,32895,27795, +27894,28156,30710,30712,30720,30729,30743,30744,30737,26027,30765,30748,30749, +30777,30778,30779,30751,30780,30757,30764,30755,30761,30798,30829,30806,30807, +30758,30800,30791,30796,30826,30875,30867,30874,30855,30876,30881,30883,30898, +30905,30885,30932,30937,30921,30956,30962,30981,30964,30995,31012,31006,31028, +40859,40697,40699,40700,30449,30468,30477,30457,30471,30472,30490,30498,30489, +30509,30502,30517,30520,30544,30545,30535,30531,30554,30568,38927,38928,38929, +38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,38942, +38943,38944,38945,38946,38947,38948,38949,38950,38951, +38952,38953,38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964, +38965,38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977, +38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,38990, +38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,39002,39003, +39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,39014,39015,39016, +39017,39018,39019,39020,39021,39022,30562,30565,30591,30605,30589,30592,30604, +30609,30623,30624,30640,30645,30653,30010,30016,30030,30027,30024,30043,30066, +30073,30083,32600,32609,32607,35400,32616,32628,32625,32633,32641,32638,30413, +30437,34866,38021,38022,38023,38027,38026,38028,38029,38031,38032,38036,38039, +38037,38042,38043,38044,38051,38052,38059,38058,38061,38060,38063,38064,38066, +38068,38070,38071,38072,38073,38074,38076,38077,38079,38084,38088,38089,38090, +38091,38092,38093,38094,38096,38097,38098,38101,38102,38103,38105,38104,38107, +38110,38111,38112,38114,38116,38117,38119,38120,38122,39023,39024,39025,39026, +39027,39028,39051,39054,39058,39061,39065,39075,39080,39081,39082,39083,39084, +39085,39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097, +39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,39110, +39111,39112,39113,39114,39115,39116,39117,39119,39120,39124,39126,39127,39131, +39132,39133,39136,39137,39138,39139,39140,39141,39142,39145,39146,39147,39148, +39149,39150,39151,39152,39153,39154,39155,39156,39157,39158,39159,39160,39161, +39162,39163,39164,39165,39166,39167,39168,39169,39170, 39171,39172,39173,39174,39175,38121,38123,38126,38127,38131,38132,38133,38135, 38137,38140,38141,38143,38147,38146,38150,38151,38153,38154,38157,38158,38159, 38162,38163,38164,38165,38166,38168,38171,38173,38174,38175,38178,38186,38187, @@ -1626,211 +1652,215 @@ 29996,40480,40482,40488,40489,40490,40491,40492,40498,40497,40502,40504,40503, 40505,40506,40510,40513,40514,40516,40518,40519,40520,40521,40523,40524,40526, 40529,40533,40535,40538,40539,40540,40542,40547,40550,40551,40552,40553,40554, -40555,40556,40561,40557,40563,30098,30100,30102,30112,30109,30124,30115,30131, -30132,30136,30148,30129,30128,30147,30146,30166,30157,30179,30184,30182,30180, -30187,30183,30211,30193,30204,30207,30224,30208,30213,30220,30231,30218,30245, -30232,30229,30233,39308,39310,39322,39323,39324,39325,39326,39327,39328,39329, -39330,39331,39332,39334,39335,39337,39338,39339,39340,39341,39342,39343,39344, -39345,39346,39347,39348,39349,39350,39351,39352,39353,39354,39355,39356,39357, -39358,39359,39360,39361,39362,39363,39364,39365,39366,39367,39368,39369,39370, -39371,39372,39373,39374,39375,39376,39377,39378,39379,39380,39381,39382,39383, -39384,39385,39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396, -39397,39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409, -39410,39411,39412,39413,39414,39415,39416,39417,30235,30268,30242,30240,30272, -30253,30256,30271,30261,30275,30270,30259,30285,30302,30292,30300,30294,30315, -30319,32714,31462,31352,31353,31360,31366,31368,31381,31398,31392,31404,31400, -31405,31411,34916,34921,34930,34941,34943,34946,34978,35014,34999,35004,35017, -35042,35022,35043,35045,35057,35098,35068,35048,35070,35056,35105,35097,35091, -35099,35082,35124,35115,35126,35137,35174,35195,30091,32997,30386,30388,30684, -32786,32788,32790,32796,32800,32802,32805,32806,32807,32809,32808,32817,32779, -32821,32835,32838,32845,32850,32873,32881,35203,39032,39040,39043,39418,39419, -39420,39421,39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432, -39433,39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445, -39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,39458, -39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,39470,39471, -39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,39482,39483,39484, -39485,39486,39487,39488,39489,39490,39491,39492,39493,39494,39495,39496,39497, -39498,39499,39500,39501,39502,39503,39504,39505,39506,39507,39508,39509,39510, -39511,39512,39513,39049,39052,39053,39055,39060,39066,39067,39070,39071,39073, -39074,39077,39078,34381,34388,34412,34414,34431,34426,34428,34427,34472,34445, -34443,34476,34461,34471,34467,34474,34451,34473,34486,34500,34485,34510,34480, -34490,34481,34479,34505,34511,34484,34537,34545,34546,34541,34547,34512,34579, -34526,34548,34527,34520,34513,34563,34567,34552,34568,34570,34573,34569,34595, -34619,34590,34597,34606,34586,34622,34632,34612,34609,34601,34615,34623,34690, -34594,34685,34686,34683,34656,34672,34636,34670,34699,34643,34659,34684,34660, -34649,34661,34707,34735,34728,34770,39514,39515,39516,39517,39518,39519,39520, -39521,39522,39523,39524,39525,39526,39527,39528,39529,39530,39531,39538,39555, -39561,39565,39566,39572,39573,39577,39590,39593,39594,39595,39596,39597,39598, -39599,39602,39603,39604,39605,39609,39611,39613,39614,39615,39619,39620,39622, -39623,39624,39625,39626,39629,39630,39631,39632,39634,39636,39637,39638,39639, -39641,39642,39643,39644,39645,39646,39648,39650,39651,39652,39653,39655,39656, -39657,39658,39660,39662,39664,39665,39666,39667,39668,39669,39670,39671,39672, -39674,39676,39677,39678,39679,39680,39681,39682,39684,39685,39686,34758,34696, -34693,34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769, -34752,34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873, -34876,32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498, -31531,31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550, -31518,31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601, -31632,31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668, -31697,31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766, -31755,39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701, -39702,39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716, -39717,39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731, -39732,39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754, -39755,39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771, -39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784, -39785,39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797, -39798,39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278, -33281,33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336, -33339,33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949, -34952,35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889, -31901,31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941, -31959,31976,33390,26280,32703,32718,32725,32741,32737,32742,32745,32750,32755, -31992,32119,32166,32174,32327,32411,40632,40628,36211,36228,36244,36241,36273, -36199,36205,35911,35913,37194,37200,37198,37199,37220,39804,39805,39806,39807, -39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,39818,39819,39820, -39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,39831,39832,39833, -39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,39844,39845,39846, -39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,39857,39858,39859, -39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,39870,39871,39872, -39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,39883,39884,39885, -39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897,39898, -39899,37218,37217,37232,37225,37231,37245,37246,37234,37236,37241,37260,37253, -37264,37261,37265,37282,37283,37290,37293,37294,37295,37301,37300,37306,35925, -40574,36280,36331,36357,36441,36457,36277,36287,36284,36282,36292,36310,36311, -36314,36318,36302,36303,36315,36294,36332,36343,36344,36323,36345,36347,36324, -36361,36349,36372,36381,36383,36396,36398,36387,36399,36410,36416,36409,36405, -36413,36401,36425,36417,36418,36433,36434,36426,36464,36470,36476,36463,36468, -36485,36495,36500,36496,36508,36510,35960,35970,35978,35973,35992,35988,26011, -35286,35294,35290,35292,39900,39901,39902,39903,39904,39905,39906,39907,39908, -39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,39919,39920,39921, -39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,39932,39933,39934, -39935,39936,39937,39938,39939,39940,39941,39942,39943,39944,39945,39946,39947, -39948,39949,39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960, -39961,39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973, -39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,39986, -39987,39988,39989,39990,39991,39992,39993,39994,39995,35301,35307,35311,35390, -35622,38739,38633,38643,38639,38662,38657,38664,38671,38670,38698,38701,38704, -38718,40832,40835,40837,40838,40839,40840,40841,40842,40844,40702,40715,40717, -38585,38588,38589,38606,38610,30655,38624,37518,37550,37576,37694,37738,37834, -37775,37950,37995,40063,40066,40069,40070,40071,40072,31267,40075,40078,40080, -40081,40082,40084,40085,40090,40091,40094,40095,40096,40097,40098,40099,40101, -40102,40103,40104,40105,40107,40109,40110,40112,40113,40114,40115,40116,40117, -40118,40119,40122,40123,40124,40125,40132,40133,40134,40135,40138,40139,39996, -39997,39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009, -40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022, -40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035, -40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048, -40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40061,40062, -40064,40067,40068,40073,40074,40076,40079,40083,40086,40087,40088,40089,40093, -40106,40108,40111,40121,40126,40127,40128,40129,40130,40136,40137,40145,40146, -40154,40155,40160,40161,40140,40141,40142,40143,40144,40147,40148,40149,40151, -40152,40153,40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827, -38819,38834,38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621, -39618,39627,39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181, -39214,39253,39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695, -39699,39711,39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605, -40607,40667,40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738, -40748,40751,40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168, -40169,40170,40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181, -40182,40183,40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194, -40195,40196,40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207, -40208,40209,40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220, -40221,40222,40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233, -40234,40235,40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246, -40247,40248,40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908, -57909,57910,57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921, -57922,57923,57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934, -57935,57936,57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947, -57948,57949,57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960, -57961,57962,57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973, -57974,57975,57976,57977,57978,57979,57980,57981,57982,57983,57984,57985,57986, -57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997,57998,57999, -58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267,40268,40269, -40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,40281,40282, -40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,40294,40295, -40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308, -40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321, -40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,40334, -40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,40346,40347, -40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005,58006,58007, -58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018,58019,58020, -58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031,58032,58033, -58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044,58045,58046, -58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057,58058,58059, -58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070,58071,58072, -58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083,58084,58085, -58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355,40356,40357, -40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,40370, -40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,40382,40383, -40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,40395,40396, -40397,40398,40399,40400,40401,40402,40403,40404,40405,40406,40407,40408,40409, -40410,40411,40412,40413,40414,40415,40416,40417,40418,40419,40420,40421,40422, -40423,40424,40425,40426,40427,40428,40429,40430,40431,40432,40433,40434,40435, -40436,40437,40438,40439,40440,40441,40442,40443,40444,40445,40446,40447,40448, -40449,40450,58096,58097,58098,58099,58100,58101,58102,58103,58104,58105,58106, -58107,58108,58109,58110,58111,58112,58113,58114,58115,58116,58117,58118,58119, -58120,58121,58122,58123,58124,58125,58126,58127,58128,58129,58130,58131,58132, -58133,58134,58135,58136,58137,58138,58139,58140,58141,58142,58143,58144,58145, -58146,58147,58148,58149,58150,58151,58152,58153,58154,58155,58156,58157,58158, -58159,58160,58161,58162,58163,58164,58165,58166,58167,58168,58169,58170,58171, -58172,58173,58174,58175,58176,58177,58178,58179,58180,58181,58182,58183,58184, -58185,58186,58187,58188,58189,40451,40452,40453,40454,40455,40456,40457,40458, -40459,40460,40461,40462,40463,40464,40465,40466,40467,40468,40469,40470,40471, -40472,40473,40474,40475,40476,40477,40478,40484,40487,40494,40496,40500,40507, -40508,40512,40525,40528,40530,40531,40532,40534,40537,40541,40543,40544,40545, -40546,40549,40558,40559,40562,40564,40565,40566,40567,40568,40569,40570,40571, -40572,40573,40576,40577,40579,40580,40581,40582,40585,40586,40588,40589,40590, -40591,40592,40593,40596,40597,40598,40599,40600,40601,40602,40603,40604,40606, -40608,40609,40610,40611,40612,40613,40615,40616,40617,40618,58190,58191,58192, -58193,58194,58195,58196,58197,58198,58199,58200,58201,58202,58203,58204,58205, -58206,58207,58208,58209,58210,58211,58212,58213,58214,58215,58216,58217,58218, -58219,58220,58221,58222,58223,58224,58225,58226,58227,58228,58229,58230,58231, -58232,58233,58234,58235,58236,58237,58238,58239,58240,58241,58242,58243,58244, -58245,58246,58247,58248,58249,58250,58251,58252,58253,58254,58255,58256,58257, -58258,58259,58260,58261,58262,58263,58264,58265,58266,58267,58268,58269,58270, -58271,58272,58273,58274,58275,58276,58277,58278,58279,58280,58281,58282,58283, -40619,40620,40621,40622,40623,40624,40625,40626,40627,40629,40630,40631,40633, -40634,40636,40639,40640,40641,40642,40643,40645,40646,40647,40648,40650,40651, -40652,40656,40658,40659,40661,40662,40663,40665,40666,40670,40673,40675,40676, -40678,40680,40683,40684,40685,40686,40688,40689,40690,40691,40692,40693,40694, -40695,40696,40698,40701,40703,40704,40705,40706,40707,40708,40709,40710,40711, -40712,40713,40714,40716,40719,40721,40722,40724,40725,40726,40728,40730,40731, -40732,40733,40734,40735,40737,40739,40740,40741,40742,40743,40744,40745,40746, -40747,40749,40750,40752,40753,58284,58285,58286,58287,58288,58289,58290,58291, -58292,58293,58294,58295,58296,58297,58298,58299,58300,58301,58302,58303,58304, -58305,58306,58307,58308,58309,58310,58311,58312,58313,58314,58315,58316,58317, -58318,58319,58320,58321,58322,58323,58324,58325,58326,58327,58328,58329,58330, -58331,58332,58333,58334,58335,58336,58337,58338,58339,58340,58341,58342,58343, -58344,58345,58346,58347,58348,58349,58350,58351,58352,58353,58354,58355,58356, -58357,58358,58359,58360,58361,58362,58363,58364,58365,58366,58367,58368,58369, -58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757,40758, -40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776,40777, -40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791,40792, -40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,40805, -40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,40818, -40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,40833, -40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,40856, -40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975,63985, -58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389,58390, -58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402,58403, -58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415,58416, -58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428,58429, -58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441,58442, -58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454,58455, -58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467,58468, -58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031,64032, -64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427,13383, -11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799,14815, -14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470,16735, -11950,17207,11955,11958,11959,59451,17329,17324,11963,17373,17622,18017,17996, -59459,18211,18217,18300,18317,11978,18759,18810,18813,18818,18819,18821,18822, -18847,18843,18871,18870,59476,59477,19619,19615,19616,19617,19575,19618,19731, -19732,19733,19734,19735,19736,19737,19886,59492,58472,58473,58474,58475,58476, -58477,58478,58479,58480,58481,58482,58483,58484,58485,58486,58487,58488,58489, -58490,58491,58492,58493,58494,58495,58496,58497,58498,58499,58500,58501,58502, -58503,58504,58505,58506,58507,58508,58509,58510,58511,58512,58513,58514,58515, -58516,58517,58518,58519,58520,58521,58522,58523,58524,58525,58526,58527,58528, -58529,58530,58531,58532,58533,58534,58535,58536,58537,58538,58539,58540,58541, -58542,58543,58544,58545,58546,58547,58548,58549,58550,58551,58552,58553,58554, -58555,58556,58557,58558,58559,58560,58561,58562,58563,58564,58565, +40555,40556,40561,40557,40563,30098,30100,30102,30112, +30109,30124,30115,30131,30132,30136,30148,30129,30128,30147,30146,30166,30157, +30179,30184,30182,30180,30187,30183,30211,30193,30204,30207,30224,30208,30213, +30220,30231,30218,30245,30232,30229,30233,39308,39310,39322,39323,39324,39325, +39326,39327,39328,39329,39330,39331,39332,39334,39335,39337,39338,39339,39340, +39341,39342,39343,39344,39345,39346,39347,39348,39349,39350,39351,39352,39353, +39354,39355,39356,39357,39358,39359,39360,39361,39362,39363,39364,39365,39366, +39367,39368,39369,39370,39371,39372,39373,39374,39375,39376,39377,39378,39379, +39380,39381,39382,39383,39384,39385,39386,39387,39388,39389,39390,39391,39392, +39393,39394,39395,39396,39397,39398,39399,39400,39401,39402,39403,39404,39405, +39406,39407,39408,39409,39410,39411,39412,39413,39414,39415,39416,39417,30235, +30268,30242,30240,30272,30253,30256,30271,30261,30275,30270,30259,30285,30302, +30292,30300,30294,30315,30319,32714,31462,31352,31353,31360,31366,31368,31381, +31398,31392,31404,31400,31405,31411,34916,34921,34930,34941,34943,34946,34978, +35014,34999,35004,35017,35042,35022,35043,35045,35057,35098,35068,35048,35070, +35056,35105,35097,35091,35099,35082,35124,35115,35126,35137,35174,35195,30091, +32997,30386,30388,30684,32786,32788,32790,32796,32800,32802,32805,32806,32807, +32809,32808,32817,32779,32821,32835,32838,32845,32850,32873,32881,35203,39032, +39040,39043,39418,39419,39420,39421,39422,39423,39424,39425,39426,39427,39428, +39429,39430,39431,39432,39433,39434,39435,39436,39437,39438,39439,39440,39441, +39442,39443,39444,39445,39446,39447,39448,39449,39450, +39451,39452,39453,39454,39455,39456,39457,39458,39459,39460,39461,39462,39463, +39464,39465,39466,39467,39468,39469,39470,39471,39472,39473,39474,39475,39476, +39477,39478,39479,39480,39481,39482,39483,39484,39485,39486,39487,39488,39489, +39490,39491,39492,39493,39494,39495,39496,39497,39498,39499,39500,39501,39502, +39503,39504,39505,39506,39507,39508,39509,39510,39511,39512,39513,39049,39052, +39053,39055,39060,39066,39067,39070,39071,39073,39074,39077,39078,34381,34388, +34412,34414,34431,34426,34428,34427,34472,34445,34443,34476,34461,34471,34467, +34474,34451,34473,34486,34500,34485,34510,34480,34490,34481,34479,34505,34511, +34484,34537,34545,34546,34541,34547,34512,34579,34526,34548,34527,34520,34513, +34563,34567,34552,34568,34570,34573,34569,34595,34619,34590,34597,34606,34586, +34622,34632,34612,34609,34601,34615,34623,34690,34594,34685,34686,34683,34656, +34672,34636,34670,34699,34643,34659,34684,34660,34649,34661,34707,34735,34728, +34770,39514,39515,39516,39517,39518,39519,39520,39521,39522,39523,39524,39525, +39526,39527,39528,39529,39530,39531,39538,39555,39561,39565,39566,39572,39573, +39577,39590,39593,39594,39595,39596,39597,39598,39599,39602,39603,39604,39605, +39609,39611,39613,39614,39615,39619,39620,39622,39623,39624,39625,39626,39629, +39630,39631,39632,39634,39636,39637,39638,39639,39641,39642,39643,39644,39645, +39646,39648,39650,39651,39652,39653,39655,39656,39657,39658,39660,39662,39664, +39665,39666,39667,39668,39669,39670,39671,39672,39674,39676,39677,39678,39679, +39680,39681,39682,39684,39685,39686,34758,34696,34693, +34733,34711,34691,34731,34789,34732,34741,34739,34763,34771,34749,34769,34752, +34762,34779,34794,34784,34798,34838,34835,34814,34826,34843,34849,34873,34876, +32566,32578,32580,32581,33296,31482,31485,31496,31491,31492,31509,31498,31531, +31503,31559,31544,31530,31513,31534,31537,31520,31525,31524,31539,31550,31518, +31576,31578,31557,31605,31564,31581,31584,31598,31611,31586,31602,31601,31632, +31654,31655,31672,31660,31645,31656,31621,31658,31644,31650,31659,31668,31697, +31681,31692,31709,31706,31717,31718,31722,31756,31742,31740,31759,31766,31755, +39687,39689,39690,39691,39692,39693,39694,39696,39697,39698,39700,39701,39702, +39703,39704,39705,39706,39707,39708,39709,39710,39712,39713,39714,39716,39717, +39718,39719,39720,39721,39722,39723,39724,39725,39726,39728,39729,39731,39732, +39733,39734,39735,39736,39737,39738,39741,39742,39743,39744,39750,39754,39755, +39756,39758,39760,39762,39763,39765,39766,39767,39768,39769,39770,39771,39772, +39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,39785, +39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,39798, +39799,39800,39801,39802,39803,31775,31786,31782,31800,31809,31808,33278,33281, +33282,33284,33260,34884,33313,33314,33315,33325,33327,33320,33323,33336,33339, +33331,33332,33342,33348,33353,33355,33359,33370,33375,33384,34942,34949,34952, +35032,35039,35166,32669,32671,32679,32687,32688,32690,31868,25929,31889,31901, +31900,31902,31906,31922,31932,31933,31937,31943,31948,31949,31944,31941,31959, +31976,33390,26280,32703,32718,32725,32741,32737,32742, +32745,32750,32755,31992,32119,32166,32174,32327,32411,40632,40628,36211,36228, +36244,36241,36273,36199,36205,35911,35913,37194,37200,37198,37199,37220,39804, +39805,39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817, +39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,39830, +39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,39842,39843, +39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,39854,39855,39856, +39857,39858,39859,39860,39861,39862,39863,39864,39865,39866,39867,39868,39869, +39870,39871,39872,39873,39874,39875,39876,39877,39878,39879,39880,39881,39882, +39883,39884,39885,39886,39887,39888,39889,39890,39891,39892,39893,39894,39895, +39896,39897,39898,39899,37218,37217,37232,37225,37231,37245,37246,37234,37236, +37241,37260,37253,37264,37261,37265,37282,37283,37290,37293,37294,37295,37301, +37300,37306,35925,40574,36280,36331,36357,36441,36457,36277,36287,36284,36282, +36292,36310,36311,36314,36318,36302,36303,36315,36294,36332,36343,36344,36323, +36345,36347,36324,36361,36349,36372,36381,36383,36396,36398,36387,36399,36410, +36416,36409,36405,36413,36401,36425,36417,36418,36433,36434,36426,36464,36470, +36476,36463,36468,36485,36495,36500,36496,36508,36510,35960,35970,35978,35973, +35992,35988,26011,35286,35294,35290,35292,39900,39901,39902,39903,39904,39905, +39906,39907,39908,39909,39910,39911,39912,39913,39914,39915,39916,39917,39918, +39919,39920,39921,39922,39923,39924,39925,39926,39927,39928,39929,39930,39931, +39932,39933,39934,39935,39936,39937,39938,39939,39940, +39941,39942,39943,39944,39945,39946,39947,39948,39949,39950,39951,39952,39953, +39954,39955,39956,39957,39958,39959,39960,39961,39962,39963,39964,39965,39966, +39967,39968,39969,39970,39971,39972,39973,39974,39975,39976,39977,39978,39979, +39980,39981,39982,39983,39984,39985,39986,39987,39988,39989,39990,39991,39992, +39993,39994,39995,35301,35307,35311,35390,35622,38739,38633,38643,38639,38662, +38657,38664,38671,38670,38698,38701,38704,38718,40832,40835,40837,40838,40839, +40840,40841,40842,40844,40702,40715,40717,38585,38588,38589,38606,38610,30655, +38624,37518,37550,37576,37694,37738,37834,37775,37950,37995,40063,40066,40069, +40070,40071,40072,31267,40075,40078,40080,40081,40082,40084,40085,40090,40091, +40094,40095,40096,40097,40098,40099,40101,40102,40103,40104,40105,40107,40109, +40110,40112,40113,40114,40115,40116,40117,40118,40119,40122,40123,40124,40125, +40132,40133,40134,40135,40138,40139,39996,39997,39998,39999,40000,40001,40002, +40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015, +40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028, +40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041, +40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054, +40055,40056,40057,40058,40059,40061,40062,40064,40067,40068,40073,40074,40076, +40079,40083,40086,40087,40088,40089,40093,40106,40108,40111,40121,40126,40127, +40128,40129,40130,40136,40137,40145,40146,40154,40155,40160,40161,40140,40141, +40142,40143,40144,40147,40148,40149,40151,40152,40153, +40156,40157,40159,40162,38780,38789,38801,38802,38804,38831,38827,38819,38834, +38836,39601,39600,39607,40536,39606,39610,39612,39617,39616,39621,39618,39627, +39628,39633,39749,39747,39751,39753,39752,39757,39761,39144,39181,39214,39253, +39252,39647,39649,39654,39663,39659,39675,39661,39673,39688,39695,39699,39711, +39715,40637,40638,32315,40578,40583,40584,40587,40594,37846,40605,40607,40667, +40668,40669,40672,40671,40674,40681,40679,40677,40682,40687,40738,40748,40751, +40761,40759,40765,40766,40772,40163,40164,40165,40166,40167,40168,40169,40170, +40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,40182,40183, +40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,40195,40196, +40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,40208,40209, +40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,40221,40222, +40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,40234,40235, +40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248, +40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,57908,57909,57910, +57911,57912,57913,57914,57915,57916,57917,57918,57919,57920,57921,57922,57923, +57924,57925,57926,57927,57928,57929,57930,57931,57932,57933,57934,57935,57936, +57937,57938,57939,57940,57941,57942,57943,57944,57945,57946,57947,57948,57949, +57950,57951,57952,57953,57954,57955,57956,57957,57958,57959,57960,57961,57962, +57963,57964,57965,57966,57967,57968,57969,57970,57971,57972,57973,57974,57975, +57976,57977,57978,57979,57980,57981,57982,57983,57984, +57985,57986,57987,57988,57989,57990,57991,57992,57993,57994,57995,57996,57997, +57998,57999,58000,58001,40259,40260,40261,40262,40263,40264,40265,40266,40267, +40268,40269,40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280, +40281,40282,40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293, +40294,40295,40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306, +40307,40308,40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319, +40320,40321,40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332, +40333,40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345, +40346,40347,40348,40349,40350,40351,40352,40353,40354,58002,58003,58004,58005, +58006,58007,58008,58009,58010,58011,58012,58013,58014,58015,58016,58017,58018, +58019,58020,58021,58022,58023,58024,58025,58026,58027,58028,58029,58030,58031, +58032,58033,58034,58035,58036,58037,58038,58039,58040,58041,58042,58043,58044, +58045,58046,58047,58048,58049,58050,58051,58052,58053,58054,58055,58056,58057, +58058,58059,58060,58061,58062,58063,58064,58065,58066,58067,58068,58069,58070, +58071,58072,58073,58074,58075,58076,58077,58078,58079,58080,58081,58082,58083, +58084,58085,58086,58087,58088,58089,58090,58091,58092,58093,58094,58095,40355, +40356,40357,40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368, +40369,40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381, +40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394, +40395,40396,40397,40398,40399,40400,40401,40402,40403, +40404,40405,40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416, +40417,40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429, +40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,40442, +40443,40444,40445,40446,40447,40448,40449,40450,58096,58097,58098,58099,58100, +58101,58102,58103,58104,58105,58106,58107,58108,58109,58110,58111,58112,58113, +58114,58115,58116,58117,58118,58119,58120,58121,58122,58123,58124,58125,58126, +58127,58128,58129,58130,58131,58132,58133,58134,58135,58136,58137,58138,58139, +58140,58141,58142,58143,58144,58145,58146,58147,58148,58149,58150,58151,58152, +58153,58154,58155,58156,58157,58158,58159,58160,58161,58162,58163,58164,58165, +58166,58167,58168,58169,58170,58171,58172,58173,58174,58175,58176,58177,58178, +58179,58180,58181,58182,58183,58184,58185,58186,58187,58188,58189,40451,40452, +40453,40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465, +40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,40478, +40484,40487,40494,40496,40500,40507,40508,40512,40525,40528,40530,40531,40532, +40534,40537,40541,40543,40544,40545,40546,40549,40558,40559,40562,40564,40565, +40566,40567,40568,40569,40570,40571,40572,40573,40576,40577,40579,40580,40581, +40582,40585,40586,40588,40589,40590,40591,40592,40593,40596,40597,40598,40599, +40600,40601,40602,40603,40604,40606,40608,40609,40610,40611,40612,40613,40615, +40616,40617,40618,58190,58191,58192,58193,58194,58195,58196,58197,58198,58199, +58200,58201,58202,58203,58204,58205,58206,58207,58208, +58209,58210,58211,58212,58213,58214,58215,58216,58217,58218,58219,58220,58221, +58222,58223,58224,58225,58226,58227,58228,58229,58230,58231,58232,58233,58234, +58235,58236,58237,58238,58239,58240,58241,58242,58243,58244,58245,58246,58247, +58248,58249,58250,58251,58252,58253,58254,58255,58256,58257,58258,58259,58260, +58261,58262,58263,58264,58265,58266,58267,58268,58269,58270,58271,58272,58273, +58274,58275,58276,58277,58278,58279,58280,58281,58282,58283,40619,40620,40621, +40622,40623,40624,40625,40626,40627,40629,40630,40631,40633,40634,40636,40639, +40640,40641,40642,40643,40645,40646,40647,40648,40650,40651,40652,40656,40658, +40659,40661,40662,40663,40665,40666,40670,40673,40675,40676,40678,40680,40683, +40684,40685,40686,40688,40689,40690,40691,40692,40693,40694,40695,40696,40698, +40701,40703,40704,40705,40706,40707,40708,40709,40710,40711,40712,40713,40714, +40716,40719,40721,40722,40724,40725,40726,40728,40730,40731,40732,40733,40734, +40735,40737,40739,40740,40741,40742,40743,40744,40745,40746,40747,40749,40750, +40752,40753,58284,58285,58286,58287,58288,58289,58290,58291,58292,58293,58294, +58295,58296,58297,58298,58299,58300,58301,58302,58303,58304,58305,58306,58307, +58308,58309,58310,58311,58312,58313,58314,58315,58316,58317,58318,58319,58320, +58321,58322,58323,58324,58325,58326,58327,58328,58329,58330,58331,58332,58333, +58334,58335,58336,58337,58338,58339,58340,58341,58342,58343,58344,58345,58346, +58347,58348,58349,58350,58351,58352,58353,58354,58355,58356,58357,58358,58359, +58360,58361,58362,58363,58364,58365,58366,58367,58368, +58369,58370,58371,58372,58373,58374,58375,58376,58377,40754,40755,40756,40757, +40758,40760,40762,40764,40767,40768,40769,40770,40771,40773,40774,40775,40776, +40777,40778,40779,40780,40781,40782,40783,40786,40787,40788,40789,40790,40791, +40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804, +40805,40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817, +40818,40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830, +40833,40834,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855, +40856,40860,40861,40862,40865,40866,40867,40868,40869,63788,63865,63893,63975, +63985,58378,58379,58380,58381,58382,58383,58384,58385,58386,58387,58388,58389, +58390,58391,58392,58393,58394,58395,58396,58397,58398,58399,58400,58401,58402, +58403,58404,58405,58406,58407,58408,58409,58410,58411,58412,58413,58414,58415, +58416,58417,58418,58419,58420,58421,58422,58423,58424,58425,58426,58427,58428, +58429,58430,58431,58432,58433,58434,58435,58436,58437,58438,58439,58440,58441, +58442,58443,58444,58445,58446,58447,58448,58449,58450,58451,58452,58453,58454, +58455,58456,58457,58458,58459,58460,58461,58462,58463,58464,58465,58466,58467, +58468,58469,58470,58471,64012,64013,64014,64015,64017,64019,64020,64024,64031, +64032,64033,64035,64036,64039,64040,64041,11905,59414,59415,59416,11908,13427, +13383,11912,11915,59422,13726,13850,13838,11916,11927,14702,14616,59430,14799, +14815,14963,14800,59435,59436,15182,15470,15584,11943,59441,59442,11946,16470, +16735,11950,17207,11955,11958,11959,59451,17329,17324, +11963,17373,17622,18017,17996,59459,18211,18217,18300,18317,11978,18759,18810, +18813,18818,18819,18821,18822,18847,18843,18871,18870,59476,59477,19619,19615, +19616,19617,19575,19618,19731,19732,19733,19734,19735,19736,19737,19886,59492, +58472,58473,58474,58475,58476,58477,58478,58479,58480,58481,58482,58483,58484, +58485,58486,58487,58488,58489,58490,58491,58492,58493,58494,58495,58496,58497, +58498,58499,58500,58501,58502,58503,58504,58505,58506,58507,58508,58509,58510, +58511,58512,58513,58514,58515,58516,58517,58518,58519,58520,58521,58522,58523, +58524,58525,58526,58527,58528,58529,58530,58531,58532,58533,58534,58535,58536, +58537,58538,58539,58540,58541,58542,58543,58544,58545,58546,58547,58548,58549, +58550,58551,58552,58553,58554,58555,58556,58557,58558,58559,58560,58561,58562, +58563,58564,58565, diff --git a/system/lib/libc/musl/src/locale/iconv.c b/system/lib/libc/musl/src/locale/iconv.c index 1eeea94e0a387..3047c27b2e8b3 100644 --- a/system/lib/libc/musl/src/locale/iconv.c +++ b/system/lib/libc/musl/src/locale/iconv.c @@ -16,8 +16,12 @@ #define WCHAR_T 0306 #define US_ASCII 0307 #define UTF_8 0310 +#define UTF_16 0312 +#define UTF_32 0313 +#define UCS2 0314 #define EUC_JP 0320 #define SHIFT_JIS 0321 +#define ISO2022_JP 0322 #define GB18030 0330 #define GBK 0331 #define GB2312 0332 @@ -26,21 +30,27 @@ /* Definitions of charmaps. Each charmap consists of: * 1. Empty-string-terminated list of null-terminated aliases. - * 2. Special type code or number of elided entries. - * 3. Character table (size determined by field 2). */ + * 2. Special type code or number of elided quads of entries. + * 3. Character table (size determined by field 2), consisting + * of 5 bytes for every 4 characters, interpreted as 10-bit + * indices into the legacy_chars table. */ static const unsigned char charmaps[] = "utf8\0char\0\0\310" "wchart\0\0\306" -"ucs2\0ucs2be\0\0\304" +"ucs2be\0\0\304" "ucs2le\0\0\305" -"utf16\0utf16be\0\0\302" +"utf16be\0\0\302" "utf16le\0\0\301" -"ucs4\0ucs4be\0utf32\0utf32be\0\0\300" +"ucs4be\0utf32be\0\0\300" "ucs4le\0utf32le\0\0\303" "ascii\0usascii\0iso646\0iso646us\0\0\307" +"utf16\0\0\312" +"ucs4\0utf32\0\0\313" +"ucs2\0\0\314" "eucjp\0\0\320" "shiftjis\0sjis\0\0\321" +"iso2022jp\0\0\322" "gb18030\0\0\330" "gbk\0\0\331" "gb2312\0\0\332" @@ -49,6 +59,9 @@ static const unsigned char charmaps[] = #include "codepages.h" ; +/* Table of characters that appear in legacy 8-bit codepages, + * limited to 1024 slots (10 bit indices). The first 256 entries + * are elided since those characters are obviously all included. */ static const unsigned short legacy_chars[] = { #include "legacychars.h" }; @@ -73,6 +86,10 @@ static const unsigned short ksc[93][94] = { #include "ksc.h" }; +static const unsigned short rev_jis[] = { +#include "revjis.h" +}; + static int fuzzycmp(const unsigned char *a, const unsigned char *b) { for (; *a && *b; a++, b++) { @@ -94,29 +111,58 @@ static size_t find_charmap(const void *name) s += strlen((void *)s)+1; if (!*s) { if (s[1] > 0200) s+=2; - else s+=2+(128U-s[1])/4*5; + else s+=2+(64U-s[1])*5; } } return -1; } +struct stateful_cd { + iconv_t base_cd; + unsigned state; +}; + +static iconv_t combine_to_from(size_t t, size_t f) +{ + return (void *)(f<<16 | t<<1 | 1); +} + +static size_t extract_from(iconv_t cd) +{ + return (size_t)cd >> 16; +} + +static size_t extract_to(iconv_t cd) +{ + return (size_t)cd >> 1 & 0x7fff; +} + iconv_t iconv_open(const char *to, const char *from) { size_t f, t; + struct stateful_cd *scd; if ((t = find_charmap(to))==-1 || (f = find_charmap(from))==-1 - || (charmaps[t] >= 0320)) { + || (charmaps[t] >= 0330)) { errno = EINVAL; return (iconv_t)-1; } + iconv_t cd = combine_to_from(t, f); - return (void *)(f<<16 | t); -} + switch (charmaps[f]) { + case UTF_16: + case UTF_32: + case UCS2: + case ISO2022_JP: + scd = malloc(sizeof *scd); + if (!scd) return (iconv_t)-1; + scd->base_cd = cd; + scd->state = 0; + cd = (iconv_t)scd; + } -int iconv_close(iconv_t cd) -{ - return 0; + return cd; } static unsigned get_16(const unsigned char *s, int e) @@ -151,12 +197,43 @@ static void put_32(unsigned char *s, unsigned c, int e) #define mbrtowc_utf8 mbrtowc #define wctomb_utf8 wctomb -size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restrict out, size_t *restrict outb) +static unsigned legacy_map(const unsigned char *map, unsigned c) +{ + if (c < 4*map[-1]) return c; + unsigned x = c - 4*map[-1]; + x = map[x*5/4]>>2*x%8 | map[x*5/4+1]<<8-2*x%8 & 1023; + return x < 256 ? x : legacy_chars[x-256]; +} + +static unsigned uni_to_jis(unsigned c) +{ + unsigned nel = sizeof rev_jis / sizeof *rev_jis; + unsigned d, j, i, b = 0; + for (;;) { + i = nel/2; + j = rev_jis[b+i]; + d = jis0208[j/256][j%256]; + if (d==c) return j + 0x2121; + else if (nel == 1) return 0; + else if (c < d) + nel /= 2; + else { + b += i; + nel -= nel/2; + } + } +} + +size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restrict out, size_t *restrict outb) { size_t x=0; - unsigned long cd = (unsigned long)cd0; - unsigned to = cd & 0xffff; - unsigned from = cd >> 16; + struct stateful_cd *scd=0; + if (!((size_t)cd & 1)) { + scd = (void *)cd; + cd = scd->base_cd; + } + unsigned to = extract_to(cd); + unsigned from = extract_from(cd); const unsigned char *map = charmaps+from+1; const unsigned char *tomap = charmaps+to+1; mbstate_t st = {0}; @@ -176,16 +253,17 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr c = *(unsigned char *)*in; l = 1; - if (c >= 128 || type-UTF_32BE < 7U) switch (type) { + switch (type) { case UTF_8: + if (c < 128) break; l = mbrtowc_utf8(&wc, *in, *inb, &st); - if (!l) l++; - else if (l == (size_t)-1) goto ilseq; - else if (l == (size_t)-2) goto starved; + if (l == (size_t)-1) goto ilseq; + if (l == (size_t)-2) goto starved; c = wc; break; case US_ASCII: - goto ilseq; + if (c >= 128) goto ilseq; + break; case WCHAR_T: l = sizeof(wchar_t); if (*inb < l) goto starved; @@ -216,7 +294,33 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr c = ((c-0xd7c0)<<10) + (d-0xdc00); } break; + case UCS2: + case UTF_16: + l = 0; + if (!scd->state) { + if (*inb < 2) goto starved; + c = get_16((void *)*in, 0); + scd->state = type==UCS2 + ? c==0xfffe ? UCS2LE : UCS2BE + : c==0xfffe ? UTF_16LE : UTF_16BE; + if (c == 0xfffe || c == 0xfeff) + l = 2; + } + type = scd->state; + continue; + case UTF_32: + l = 0; + if (!scd->state) { + if (*inb < 4) goto starved; + c = get_32((void *)*in, 0); + scd->state = c==0xfffe0000 ? UTF_32LE : UTF_32BE; + if (c == 0xfffe0000 || c == 0xfeff) + l = 4; + } + type = scd->state; + continue; case SHIFT_JIS: + if (c < 128) break; if (c-0xa1 <= 0xdf-0xa1) { c += 0xff61-0xa1; break; @@ -240,6 +344,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr if (!c) goto ilseq; break; case EUC_JP: + if (c < 128) break; l = 2; if (*inb < 2) goto starved; d = *((unsigned char *)*in + 1); @@ -255,10 +360,51 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr c = jis0208[c][d]; if (!c) goto ilseq; break; + case ISO2022_JP: + if (c >= 128) goto ilseq; + if (c == '\033') { + l = 3; + if (*inb < 3) goto starved; + c = *((unsigned char *)*in + 1); + d = *((unsigned char *)*in + 2); + if (c != '(' && c != '$') goto ilseq; + switch (128*(c=='$') + d) { + case 'B': scd->state=0; continue; + case 'J': scd->state=1; continue; + case 'I': scd->state=4; continue; + case 128+'@': scd->state=2; continue; + case 128+'B': scd->state=3; continue; + } + goto ilseq; + } + switch (scd->state) { + case 1: + if (c=='\\') c = 0xa5; + if (c=='~') c = 0x203e; + break; + case 2: + case 3: + l = 2; + if (*inb < 2) goto starved; + d = *((unsigned char *)*in + 1); + c -= 0x21; + d -= 0x21; + if (c >= 84 || d >= 94) goto ilseq; + c = jis0208[c][d]; + if (!c) goto ilseq; + break; + case 4: + if (c-0x60 < 0x1f) goto ilseq; + if (c-0x21 < 0x5e) c += 0xff61-0x21; + break; + } + break; case GB2312: + if (c < 128) break; if (c < 0xa1) goto ilseq; case GBK: case GB18030: + if (c < 128) break; c -= 0x81; if (c >= 126) goto ilseq; l = 2; @@ -294,6 +440,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr c = gb18030[c][d]; break; case BIG5: + if (c < 128) break; l = 2; if (*inb < 2) goto starved; d = *((unsigned char *)*in + 1); @@ -311,16 +458,24 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr * range in the hkscs table then hard-coded * here. Ugly, yes. */ if (c/256 == 0xdc) { - if (totype-0300U > 8) k = 2; - else k = "\10\4\4\10\4\4\10\2\4"[totype-0300]; - if (k > *outb) goto toobig; - x += iconv((iconv_t)(uintptr_t)to, + union { + char c[8]; + wchar_t wc[2]; + } tmp; + char *ptmp = tmp.c; + size_t tmpx = iconv(combine_to_from(to, find_charmap("utf8")), &(char *){"\303\212\314\204" "\303\212\314\214" "\303\252\314\204" "\303\252\314\214" +c%256}, &(size_t){4}, - out, outb); + &ptmp, &(size_t){sizeof tmp}); + size_t tmplen = ptmp - tmp.c; + if (tmplen > *outb) goto toobig; + if (tmpx) x++; + memcpy(*out, &tmp, tmplen); + *out += tmplen; + *outb -= tmplen; continue; } if (!c) goto ilseq; @@ -331,6 +486,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr if (!c) goto ilseq; break; case EUC_KR: + if (c < 128) break; l = 2; if (*inb < 2) goto starved; d = *((unsigned char *)*in + 1); @@ -363,12 +519,9 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr if (!c) goto ilseq; break; default: - if (c < 128+type) break; - c -= 128+type; - c = legacy_chars[ map[c*5/4]>>2*c%8 | - map[c*5/4+1]<<8-2*c%8 & 1023 ]; - if (!c) c = *(unsigned char *)*in; - if (c==1) goto ilseq; + if (!c) break; + c = legacy_map(map, c); + if (!c) goto ilseq; } switch (totype) { @@ -392,26 +545,101 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr if (c > 0x7f) subst: x++, c='*'; default: if (*outb < 1) goto toobig; - if (c < 128+totype) { + if (c<256 && c==legacy_map(tomap, c)) { revout: + if (*outb < 1) goto toobig; *(*out)++ = c; *outb -= 1; break; } d = c; - for (c=0; c<128-totype; c++) { - if (d == legacy_chars[ tomap[c*5/4]>>2*c%8 | - tomap[c*5/4+1]<<8-2*c%8 & 1023 ]) { - c += 128; + for (c=4*totype; c<256; c++) { + if (d == legacy_map(tomap, c)) { goto revout; } } goto subst; + case SHIFT_JIS: + if (c < 128) goto revout; + if (c == 0xa5) { + x++; + c = '\\'; + goto revout; + } + if (c == 0x203e) { + x++; + c = '~'; + goto revout; + } + if (c-0xff61 <= 0xdf-0xa1) { + c += 0xa1 - 0xff61; + goto revout; + } + c = uni_to_jis(c); + if (!c) goto subst; + if (*outb < 2) goto toobig; + d = c%256; + c = c/256; + *(*out)++ = (c+1)/2 + (c<95 ? 112 : 176); + *(*out)++ = c%2 ? d + 31 + d/96 : d + 126; + *outb -= 2; + break; + case EUC_JP: + if (c < 128) goto revout; + if (c-0xff61 <= 0xdf-0xa1) { + c += 0x0e00 + 0x21 - 0xff61; + } else { + c = uni_to_jis(c); + } + if (!c) goto subst; + if (*outb < 2) goto toobig; + *(*out)++ = c/256 + 0x80; + *(*out)++ = c%256 + 0x80; + *outb -= 2; + break; + case ISO2022_JP: + if (c < 128) goto revout; + if (c-0xff61 <= 0xdf-0xa1 || c==0xa5 || c==0x203e) { + if (*outb < 7) goto toobig; + *(*out)++ = '\033'; + *(*out)++ = '('; + if (c==0xa5) { + *(*out)++ = 'J'; + *(*out)++ = '\\'; + } else if (c==0x203e) { + *(*out)++ = 'J'; + *(*out)++ = '~'; + } else { + *(*out)++ = 'I'; + *(*out)++ = c-0xff61+0x21; + } + *(*out)++ = '\033'; + *(*out)++ = '('; + *(*out)++ = 'B'; + *outb -= 7; + break; + } + c = uni_to_jis(c); + if (!c) goto subst; + if (*outb < 8) goto toobig; + *(*out)++ = '\033'; + *(*out)++ = '$'; + *(*out)++ = 'B'; + *(*out)++ = c/256; + *(*out)++ = c%256; + *(*out)++ = '\033'; + *(*out)++ = '('; + *(*out)++ = 'B'; + *outb -= 8; + break; + case UCS2: + totype = UCS2BE; case UCS2BE: case UCS2LE: + case UTF_16: case UTF_16BE: case UTF_16LE: - if (c < 0x10000 || type-UCS2BE < 2U) { + if (c < 0x10000 || totype-UCS2BE < 2U) { if (c >= 0x10000) c = 0xFFFD; if (*outb < 2) goto toobig; put_16((void *)*out, c, totype); @@ -426,6 +654,8 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr *out += 4; *outb -= 4; break; + case UTF_32: + totype = UTF_32BE; case UTF_32BE: case UTF_32LE: if (*outb < 4) goto toobig; diff --git a/system/lib/libc/musl/src/locale/iconv_close.c b/system/lib/libc/musl/src/locale/iconv_close.c new file mode 100644 index 0000000000000..28b29565942f3 --- /dev/null +++ b/system/lib/libc/musl/src/locale/iconv_close.c @@ -0,0 +1,8 @@ +#include +#include + +int iconv_close(iconv_t cd) +{ + if (!((size_t)cd & 1)) free((void *)cd); + return 0; +} diff --git a/system/lib/libc/musl/src/locale/jis0208.h b/system/lib/libc/musl/src/locale/jis0208.h index f465b9d854b7c..de9c5f26a6a85 100644 --- a/system/lib/libc/musl/src/locale/jis0208.h +++ b/system/lib/libc/musl/src/locale/jis0208.h @@ -13,159 +13,163 @@ 65299,65300,65301,65302,65303,65304,65305,0,0,0,0,0,0,0,65313,65314,65315, 65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328, 65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,0,0,0,0,0,0,65345, -65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358, -65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,0,0,0, -0,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364, -12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377, -12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390, -12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403, -12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416, -12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429, -12430,12431,12432,12433,12434,12435,0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451, -12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464, -12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, -12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490, -12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503, -12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516, -12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529, -12530,12531,12532,12533,12534,0,0,0,0,0,0,0,0,913,914,915,916,917,918,919,920, -921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0,0,0, -0,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963,964, -965,966,967,968,969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050, -1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065, -1066,1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074, -1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088, -1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,0, -0,0,0,0,0,0,0,0,0,0,0,0,9472,9474,9484,9488,9496,9492,9500,9516,9508,9524, -9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504,9519,9512, -9527,9535,9501,9520,9509,9528,9538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +65346,65347, +65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360, +65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,0,0,0,0,12353, +12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366, +12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379, +12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392, +12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405, +12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418, +12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, +12432,12433,12434,12435,0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451,12452,12453, +12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466, +12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479, +12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492, +12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505, +12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518, +12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531, +12532,12533,12534,0,0,0,0,0,0,0,0,913,914,915,916,917,918,919,920,921,922,923, +924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0,0,0,0,945,946, +947,948,949,950,951,952,953, +954,955,956,957,958,959,960,961,963,964,965,966,967,968,969,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1040,1041,1042,1043, +1044,1045,1025,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057, +1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081, +1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096, +1097,1098,1099,1100,1101,1102,1103,0,0,0,0,0,0,0,0,0,0,0,0,0,9472,9474,9484, +9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507, +9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20124, -21782,23043,38463,21696,24859,25384,23030,36898,33909,33564,31312,24746,25569, -28197,26093,33894,33446,39925,26771,22311,26017,25201,23451,22992,34427,39156, -32098,32190,39822,25110,31903,34999,23433,24245,25353,26263,26696,38343,38797, -26447,20197,20234,20301,20381,20553,22258,22839,22996,23041,23561,24799,24847, -24944,26131,26885,28858,30031,30064,31227,32173,32239,32963,33806,34915,35586, -36949,36986,21307,20117,20133,22495,32946,37057,30959,19968,22769,28322,36920, -31282,33576,33419,39983,20801,21360,21693,21729,22240,23035,24341,39154,28139, -32996,34093,38498,38512,38560,38907,21515,21491,23431,28879,32701,36802,38632, -21359,40284,31418,19985,30867,33276,28198,22040,21764,27421,34074,39995,23013, -21417,28006,29916,38287,22082,20113,36939,38642,33615,39180,21473,21942,23344, -24433,26144,26355,26628,27704,27891,27945,29787,30408,31310,38964,33521,34907, -35424,37613,28082,30123,30410,39365,24742,35585,36234,38322,27022,21421,20870, -22290,22576,22852,23476,24310,24616,25513,25588,27839,28436,28814,28948,29017, -29141,29503,32257,33398,33489,34199,36960,37467,40219,22633,26044,27738,29989, -20985,22830,22885,24448,24540,25276,26106,27178,27431,27572,29579,32705,35158, -40236,40206,40644,23713,27798,33659,20740,23627,25014,33222,26742,29281,20057, -20474,21368,24681,28201,31311,38899,19979,21270,20206,20309,20285,20385,20339, -21152,21487,22025,22799,23233,23478,23521,31185,26247,26524,26550,27468,27827, -28779,29634,31117,31166,31292,31623,33457,33499,33540,33655,33775,33747,34662, -35506,22057,36008,36838,36942,38686,34442,20420,23784,25105,29273,30011,33253, -33469,34558,36032,38597,39187,39381,20171,20250,35299,22238,22602,22730,24315, -24555,24618,24724,24674,25040,25106,25296,25913,39745,26214,26800,28023,28784, -30028,30342,32117,33445,34809,38283,38542,35997,20977,21182,22806,21683,23475, -23830,24936,27010,28079,30861,33995,34903,35442,37799,39608,28012,39336,34521, -22435,26623,34510,37390,21123,22151,21508,24275,25313,25785,26684,26680,27579, -29554,30906,31339,35226,35282,36203,36611,37101,38307,38548,38761,23398,23731, -27005,38989,38990,25499,31520,27179,27263,26806,39949,28511,21106,21917,24688, -25324,27963,28167,28369,33883,35088,36676,19988,39993,21494,26907,27194,38788, -26666,20828,31427,33970,37340,37772,22107,40232,26658,33541,33841,31909,21000, -33477,29926,20094,20355,20896,23506,21002,21208,21223,24059,21914,22570,23014, -23436,23448,23515,24178,24185,24739,24863,24931,25022,25563,25954,26577,26707, -26874,27454,27475,27735,28450,28567,28485,29872,29976,30435,30475,31487,31649, -31777,32233,32566,32752,32925,33382,33694,35251,35532,36011,36996,37969,38291, -38289,38306,38501,38867,39208,33304,20024,21547,23736,24012,29609,30284,30524, -23721,32747,36107,38593,38929,38996,39000,20225,20238,21361,21916,22120,22522, -22855,23305,23492,23696,24076,24190,24524,25582,26426,26071,26082,26399,26827, -26820,27231,24112,27589,27671,27773,30079,31048,23395,31232,32000,24509,35215, -35352,36020,36215,36556,36637,39138,39438,39740,20096,20605,20736,22931,23452, -25135,25216,25836,27450,29344,30097,31047,32681,34811,35516,35696,25516,33738, -38816,21513,21507,21931,26708,27224,35440,30759,26485,40653,21364,23458,33050, -34384,36870,19992,20037,20167,20241,21450,21560,23470,24339,24613,25937,26429, -27714,27762,27875,28792,29699,31350,31406,31496,32026,31998,32102,26087,29275, -21435,23621,24040,25298,25312,25369,28192,34394,35377,36317,37624,28417,31142, -39770,20136,20139,20140,20379,20384,20689,20807,31478,20849,20982,21332,21281, -21375,21483,21932,22659,23777,24375,24394,24623,24656,24685,25375,25945,27211, -27841,29378,29421,30703,33016,33029,33288,34126,37111,37857,38911,39255,39514, -20208,20957,23597,26241,26989,23616,26354,26997,29577,26704,31873,20677,21220, -22343,24062,37670,26020,27427,27453,29748,31105,31165,31563,32202,33465,33740, -34943,35167,35641,36817,37329,21535,37504,20061,20534,21477,21306,29399,29590, -30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598,23507, -36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705,31402, -29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676,36557, -37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411,22865, -24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179,30054, -31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686,36605, -38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625,27424, -27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860,21048, -21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177,29309, -29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963,37749, -38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572,29694, -32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396,24049, -24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776,34382, -35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566,23087, -24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062,39881, -20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475,21521, -21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184,24195, -24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356,26477, -26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295,31968, -32005,32024,32094,32177,32789,32771,32943,32945,33108,33167,33322,33618,34892, -34913,35611,36002,36092,37066,37237,37489,30783,37628,38308,38477,38917,39321, -39640,40251,21083,21163,21495,21512,22741,25335,28640,35946,36703,40633,20811, -21051,21578,22269,31296,37239,40288,40658,29508,28425,33136,29969,24573,24794, -39592,29403,36796,27492,38915,20170,22256,22372,22718,23130,24680,25031,26127, -26118,26681,26801,28151,30165,32058,33390,39746,20123,20304,21449,21766,23919, -24038,24046,26619,27801,29811,30722,35408,37782,35039,22352,24231,25387,20661, -20652,20877,26368,21705,22622,22971,23472,24425,25165,25505,26685,27507,28168, -28797,37319,29312,30741,30758,31085,25998,32048,33756,35009,36617,38555,21092, -22312,26448,32618,36001,20916,22338,38442,22586,27018,32948,21682,23822,22524, -30869,40442,20316,21066,21643,25662,26152,26388,26613,31364,31574,32034,37679, -26716,39853,31545,21273,20874,21047,23519,25334,25774,25830,26413,27578,34217, -38609,30352,39894,25420,37638,39851,30399,26194,19977,20632,21442,23665,24808, -25746,25955,26719,29158,29642,29987,31639,32386,34453,35715,36059,37240,39184, -26028,26283,27531,20181,20180,20282,20351,21050,21496,21490,21987,22235,22763, -22987,22985,23039,23376,23629,24066,24107,24535,24605,25351,25903,23388,26031, -26045,26088,26525,27490,27515,27663,29509,31049,31169,31992,32025,32043,32930, -33026,33267,35222,35422,35433,35430,35468,35566,36039,36060,38604,39164,27503, -20107,20284,20365,20816,23383,23546,24904,25345,26178,27425,28363,27835,29246, -29885,30164,30913,31034,32780,32819,33258,33940,36766,27728,40575,24335,35672, -40235,31482,36600,23437,38635,19971,21489,22519,22833,23241,23460,24713,28287, -28422,30142,36074,23455,34048,31712,20594,26612,33437,23649,34122,32286,33294, -20889,23556,25448,36198,26012,29038,31038,32023,32773,35613,36554,36974,34503, -37034,20511,21242,23610,26451,28796,29237,37196,37320,37675,33509,23490,24369, -24825,20027,21462,23432,25163,26417,27530,29417,29664,31278,33131,36259,37202, -39318,20754,21463,21610,23551,25480,27193,32172,38656,22234,21454,21608,23447, -23601,24030,20462,24833,25342,27954,31168,31179,32066,32333,32722,33261,33311, -33936,34886,35186,35728,36468,36655,36913,37195,37228,38598,37276,20160,20303, -20805,21313,24467,25102,26580,27713,28171,29539,32294,37325,37507,21460,22809, -23487,28113,31069,32302,31899,22654,29087,20986,34899,36848,20426,23803,26149, -30636,31459,33308,39423,20934,24490,26092,26991,27529,28147,28310,28516,30462, -32020,24033,36981,37255,38918,20966,21021,25152,26257,26329,28186,24246,32210, -32626,26360,34223,34295,35576,21161,21465,22899,24207,24464,24661,37604,38500, -20663,20767,21213,21280,21319,21484,21736,21830,21809,22039,22888,22974,23100, -23477,23558,23567,23569,23578,24196,24202,24288,24432,25215,25220,25307,25484, -25463,26119,26124,26157,26230,26494,26786,27167,27189,27836,28040,28169,28248, -28988,28966,29031,30151,30465,30813,30977,31077,31216,31456,31505,31911,32057, -32918,33750,33931,34121,34909,35059,35359,35388,35412,35443,35937,36062,37284, -37478,37758,37912,38556,38808,19978,19976,19998,20055,20887,21104,22478,22580, -22732,23330,24120,24773,25854,26465,26454,27972,29366,30067,31331,33976,35698, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,20124,21782,23043,38463,21696,24859,25384,23030, +36898,33909,33564,31312,24746,25569,28197,26093,33894,33446,39925,26771,22311, +26017,25201,23451,22992,34427,39156,32098,32190,39822,25110,31903,34999,23433, +24245,25353,26263,26696,38343,38797,26447,20197,20234,20301,20381,20553,22258, +22839,22996,23041,23561,24799,24847,24944,26131,26885,28858,30031,30064,31227, +32173,32239,32963,33806,34915,35586,36949,36986,21307,20117,20133,22495,32946, +37057,30959,19968,22769,28322,36920,31282,33576,33419,39983,20801,21360,21693, +21729,22240,23035,24341,39154,28139,32996,34093,38498,38512,38560,38907,21515, +21491,23431,28879,32701,36802,38632,21359,40284,31418,19985,30867,33276,28198, +22040,21764,27421,34074,39995,23013,21417,28006,29916,38287,22082,20113,36939, +38642,33615,39180,21473,21942,23344,24433,26144,26355,26628,27704,27891,27945, +29787,30408,31310,38964,33521,34907,35424,37613,28082,30123,30410,39365,24742, +35585,36234,38322,27022,21421,20870,22290,22576,22852,23476,24310,24616,25513, +25588,27839,28436,28814,28948,29017,29141,29503,32257,33398,33489,34199,36960, +37467,40219,22633,26044,27738,29989,20985,22830,22885,24448,24540,25276,26106, +27178,27431,27572,29579,32705,35158,40236,40206,40644,23713,27798,33659,20740, +23627,25014,33222,26742,29281,20057,20474,21368,24681,28201,31311,38899,19979, +21270,20206,20309,20285,20385,20339,21152,21487,22025,22799,23233,23478,23521, +31185,26247,26524,26550,27468,27827,28779,29634,31117,31166,31292,31623,33457, +33499,33540,33655,33775,33747,34662,35506,22057,36008,36838,36942,38686,34442, +20420,23784,25105,29273,30011,33253,33469,34558,36032,38597,39187,39381,20171, +20250,35299,22238,22602,22730,24315,24555,24618,24724,24674,25040,25106,25296, +25913,39745,26214,26800,28023,28784,30028,30342,32117,33445,34809,38283,38542, +35997,20977,21182,22806,21683,23475,23830,24936,27010,28079,30861,33995,34903, +35442,37799,39608,28012,39336,34521,22435,26623,34510,37390,21123,22151,21508, +24275,25313,25785,26684,26680,27579,29554,30906,31339,35226,35282,36203,36611, +37101,38307,38548,38761,23398,23731,27005,38989,38990,25499,31520,27179,27263, +26806,39949,28511,21106,21917,24688,25324,27963,28167,28369,33883,35088,36676, +19988,39993,21494,26907,27194,38788,26666,20828,31427,33970,37340,37772,22107, +40232,26658,33541,33841,31909,21000,33477,29926,20094, +20355,20896,23506,21002,21208,21223,24059,21914,22570,23014,23436,23448,23515, +24178,24185,24739,24863,24931,25022,25563,25954,26577,26707,26874,27454,27475, +27735,28450,28567,28485,29872,29976,30435,30475,31487,31649,31777,32233,32566, +32752,32925,33382,33694,35251,35532,36011,36996,37969,38291,38289,38306,38501, +38867,39208,33304,20024,21547,23736,24012,29609,30284,30524,23721,32747,36107, +38593,38929,38996,39000,20225,20238,21361,21916,22120,22522,22855,23305,23492, +23696,24076,24190,24524,25582,26426,26071,26082,26399,26827,26820,27231,24112, +27589,27671,27773,30079,31048,23395,31232,32000,24509,35215,35352,36020,36215, +36556,36637,39138,39438,39740,20096,20605,20736,22931,23452,25135,25216,25836, +27450,29344,30097,31047,32681,34811,35516,35696,25516,33738,38816,21513,21507, +21931,26708,27224,35440,30759,26485,40653,21364,23458,33050,34384,36870,19992, +20037,20167,20241,21450,21560,23470,24339,24613,25937,26429,27714,27762,27875, +28792,29699,31350,31406,31496,32026,31998,32102,26087,29275,21435,23621,24040, +25298,25312,25369,28192,34394,35377,36317,37624,28417,31142,39770,20136,20139, +20140,20379,20384,20689,20807,31478,20849,20982,21332,21281,21375,21483,21932, +22659,23777,24375,24394,24623,24656,24685,25375,25945,27211,27841,29378,29421, +30703,33016,33029,33288,34126,37111,37857,38911,39255,39514,20208,20957,23597, +26241,26989,23616,26354,26997,29577,26704,31873,20677,21220,22343,24062,37670, +26020,27427,27453,29748,31105,31165,31563,32202,33465,33740,34943,35167,35641, +36817,37329,21535,37504,20061,20534,21477,21306,29399, +29590,30697,33510,36527,39366,39368,39378,20855,24858,34398,21936,31354,20598, +23507,36935,38533,20018,27355,37351,23633,23624,25496,31391,27795,38772,36705, +31402,29066,38536,31874,26647,32368,26705,37740,21234,21531,34219,35347,32676, +36557,37089,21350,34952,31041,20418,20670,21009,20804,21843,22317,29674,22411, +22865,24418,24452,24693,24950,24935,25001,25522,25658,25964,26223,26690,28179, +30054,31293,31995,32076,32153,32331,32619,33550,33610,34509,35336,35427,35686, +36605,38938,40335,33464,36814,39912,21127,25119,25731,28608,38553,26689,20625, +27424,27770,28500,31348,32080,34880,35363,26376,20214,20537,20518,20581,20860, +21048,21091,21927,22287,22533,23244,24314,25010,25080,25331,25458,26908,27177, +29309,29356,29486,30740,30831,32121,30476,32937,35211,35609,36066,36562,36963, +37749,38522,38997,39443,40568,20803,21407,21427,24187,24358,28187,28304,29572, +29694,32067,33335,35328,35578,38480,20046,20491,21476,21628,22266,22993,23396, +24049,24235,24359,25144,25925,26543,28246,29392,31946,34996,32929,32993,33776, +34382,35463,36328,37431,38599,39015,40723,20116,20114,20237,21320,21577,21566, +23087,24460,24481,24735,26791,27278,29786,30849,35486,35492,35703,37264,20062, +39881,20132,20348,20399,20505,20502,20809,20844,21151,21177,21246,21402,21475, +21521,21518,21897,22353,22434,22909,23380,23389,23439,24037,24039,24055,24184, +24195,24218,24247,24344,24658,24908,25239,25304,25511,25915,26114,26179,26356, +26477,26657,26775,27083,27743,27946,28009,28207,28317,30002,30343,30828,31295, +31968,32005,32024,32094,32177,32789,32771,32943,32945, +33108,33167,33322,33618,34892,34913,35611,36002,36092,37066,37237,37489,30783, +37628,38308,38477,38917,39321,39640,40251,21083,21163,21495,21512,22741,25335, +28640,35946,36703,40633,20811,21051,21578,22269,31296,37239,40288,40658,29508, +28425,33136,29969,24573,24794,39592,29403,36796,27492,38915,20170,22256,22372, +22718,23130,24680,25031,26127,26118,26681,26801,28151,30165,32058,33390,39746, +20123,20304,21449,21766,23919,24038,24046,26619,27801,29811,30722,35408,37782, +35039,22352,24231,25387,20661,20652,20877,26368,21705,22622,22971,23472,24425, +25165,25505,26685,27507,28168,28797,37319,29312,30741,30758,31085,25998,32048, +33756,35009,36617,38555,21092,22312,26448,32618,36001,20916,22338,38442,22586, +27018,32948,21682,23822,22524,30869,40442,20316,21066,21643,25662,26152,26388, +26613,31364,31574,32034,37679,26716,39853,31545,21273,20874,21047,23519,25334, +25774,25830,26413,27578,34217,38609,30352,39894,25420,37638,39851,30399,26194, +19977,20632,21442,23665,24808,25746,25955,26719,29158,29642,29987,31639,32386, +34453,35715,36059,37240,39184,26028,26283,27531,20181,20180,20282,20351,21050, +21496,21490,21987,22235,22763,22987,22985,23039,23376,23629,24066,24107,24535, +24605,25351,25903,23388,26031,26045,26088,26525,27490,27515,27663,29509,31049, +31169,31992,32025,32043,32930,33026,33267,35222,35422,35433,35430,35468,35566, +36039,36060,38604,39164,27503,20107,20284,20365,20816,23383,23546,24904,25345, +26178,27425,28363,27835,29246,29885,30164,30913,31034,32780,32819,33258,33940, +36766,27728,40575,24335,35672,40235,31482,36600,23437, +38635,19971,21489,22519,22833,23241,23460,24713,28287,28422,30142,36074,23455, +34048,31712,20594,26612,33437,23649,34122,32286,33294,20889,23556,25448,36198, +26012,29038,31038,32023,32773,35613,36554,36974,34503,37034,20511,21242,23610, +26451,28796,29237,37196,37320,37675,33509,23490,24369,24825,20027,21462,23432, +25163,26417,27530,29417,29664,31278,33131,36259,37202,39318,20754,21463,21610, +23551,25480,27193,32172,38656,22234,21454,21608,23447,23601,24030,20462,24833, +25342,27954,31168,31179,32066,32333,32722,33261,33311,33936,34886,35186,35728, +36468,36655,36913,37195,37228,38598,37276,20160,20303,20805,21313,24467,25102, +26580,27713,28171,29539,32294,37325,37507,21460,22809,23487,28113,31069,32302, +31899,22654,29087,20986,34899,36848,20426,23803,26149,30636,31459,33308,39423, +20934,24490,26092,26991,27529,28147,28310,28516,30462,32020,24033,36981,37255, +38918,20966,21021,25152,26257,26329,28186,24246,32210,32626,26360,34223,34295, +35576,21161,21465,22899,24207,24464,24661,37604,38500,20663,20767,21213,21280, +21319,21484,21736,21830,21809,22039,22888,22974,23100,23477,23558,23567,23569, +23578,24196,24202,24288,24432,25215,25220,25307,25484,25463,26119,26124,26157, +26230,26494,26786,27167,27189,27836,28040,28169,28248,28988,28966,29031,30151, +30465,30813,30977,31077,31216,31456,31505,31911,32057,32918,33750,33931,34121, +34909,35059,35359,35388,35412,35443,35937,36062,37284,37478,37758,37912,38556, +38808,19978,19976,19998,20055,20887,21104,22478,22580,22732,23330,24120,24773, +25854,26465,26454,27972,29366,30067,31331,33976,35698, 37304,37664,22065,22516,39166,25325,26893,27542,29165,32340,32887,33394,35302, 39135,34645,36785,23611,20280,20449,20405,21767,23072,23517,23529,24515,24910, 25391,26032,26187,26862,27035,28024,28145,30003,30137,30495,31070,31206,32051, @@ -185,359 +189,365 @@ 21069,21892,28472,28982,20840,31109,32341,33203,31950,22092,22609,23720,25514, 26366,26365,26970,29401,30095,30094,30990,31062,31199,31895,32032,32068,34311, 35380,38459,36961,40736,20711,21109,21452,21474,20489,21930,22766,22863,29245, -23435,23652,21277,24803,24819,25436,25475,25407,25531,25805,26089,26361,24035, -27085,27133,28437,29157,20105,30185,30456,31379,31967,32207,32156,32865,33609, -33624,33900,33980,34299,35013,36208,36865,36973,37783,38684,39442,20687,22679, -24974,33235,34101,36104,36896,20419,20596,21063,21363,24687,25417,26463,28204, -36275,36895,20439,23646,36042,26063,32154,21330,34966,20854,25539,23384,23403, -23562,25613,26449,36956,20182,22810,22826,27760,35409,21822,22549,22949,24816, -25171,26561,33333,26965,38464,39364,39464,20307,22534,23550,32784,23729,24111, -24453,24608,24907,25140,26367,27888,28382,32974,33151,33492,34955,36024,36864, -36910,38538,40667,39899,20195,21488,22823,31532,37261,38988,40441,28381,28711, -21331,21828,23429,25176,25246,25299,27810,28655,29730,35351,37944,28609,35582, -33592,20967,34552,21482,21481,20294,36948,36784,22890,33073,24061,31466,36799, -26842,35895,29432,40008,27197,35504,20025,21336,22022,22374,25285,25506,26086, -27470,28129,28251,28845,30701,31471,31658,32187,32829,32966,34507,35477,37723, -22243,22727,24382,26029,26262,27264,27573,30007,35527,20516,30693,22320,24347, -24677,26234,27744,30196,31258,32622,33268,34584,36933,39347,31689,30044,31481, -31569,33988,36880,31209,31378,33590,23265,30528,20013,20210,23449,24544,25277, -26172,26609,27880,34411,34935,35387,37198,37619,39376,27159,28710,29482,33511, -33879,36015,19969,20806,20939,21899,23541,24086,24115,24193,24340,24373,24427, -24500,25074,25361,26274,26397,28526,29266,30010,30522,32884,33081,33144,34678, -35519,35548,36229,36339,37530,38263,38914,40165,21189,25431,30452,26389,27784, -29645,36035,37806,38515,27941,22684,26894,27084,36861,37786,30171,36890,22618, -26626,25524,27131,20291,28460,26584,36795,34086,32180,37716,26943,28528,22378, -22775,23340,32044,29226,21514,37347,40372,20141,20302,20572,20597,21059,35998, -21576,22564,23450,24093,24213,24237,24311,24351,24716,25269,25402,25552,26799, -27712,30855,31118,31243,32224,33351,35330,35558,36420,36883,37048,37165,37336, -40718,27877,25688,25826,25973,28404,30340,31515,36969,37841,28346,21746,24505, -25764,36685,36845,37444,20856,22635,22825,23637,24215,28155,32399,29980,36028, -36578,39003,28857,20253,27583,28593,30000,38651,20814,21520,22581,22615,22956, -23648,24466,26007,26460,28193,30331,33759,36077,36884,37117,37709,30757,30778, -21162,24230,22303,22900,24594,20498,20826,20908,20941,20992,21776,22612,22616, -22871,23445,23798,23947,24764,25237,25645,26481,26691,26812,26847,30423,28120, -28271,28059,28783,29128,24403,30168,31095,31561,31572,31570,31958,32113,21040, -33891,34153,34276,35342,35588,35910,36367,36867,36879,37913,38518,38957,39472, -38360,20685,21205,21516,22530,23566,24999,25758,27934,30643,31461,33012,33796, -36947,37509,23776,40199,21311,24471,24499,28060,29305,30563,31167,31716,27602, -29420,35501,26627,27233,20984,31361,26932,23626,40182,33515,23493,37193,28702, -22136,23663,24775,25958,27788,35930,36929,38931,21585,26311,37389,22856,37027, -20869,20045,20970,34201,35598,28760,25466,37707,26978,39348,32260,30071,21335, -26976,36575,38627,27741,20108,23612,24336,36841,21250,36049,32905,34425,24319, -26085,20083,20837,22914,23615,38894,20219,22922,24525,35469,28641,31152,31074, -23527,33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043, -22492,22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226, -25773,35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259, -25309,25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186, -26757,26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833, -20271,21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333, -28448,29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368, -24161,32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244, -31567,38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070, -25644,26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009, -31684,37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290, -21329,21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130, -30382,30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147, -31800,20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305, -30091,39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019, -23195,32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413, -35961,24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428, -25996,27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142, -23500,20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104, -33178,33433,35676,36000,36070,36212,38428,38468,20398,25771,27494,33310,33889, -34154,37096,23553,26963,39080,33914,34135,20239,21103,24489,24133,26381,31119, -33145,35079,35206,28149,24343,25173,27832,20175,29289,39826,20998,21563,22132, -22707,24996,25198,28954,22894,31881,31966,32027,38640,25991,32862,19993,20341, -20853,22592,24163,24179,24330,26564,20006,34109,38281,38491,31859,38913,20731, -22721,30294,30887,21029,30629,34065,31622,20559,22793,29255,31687,32232,36794, -36820,36941,20415,21193,23081,24321,38829,20445,33303,37610,22275,25429,27497, -29995,35036,36628,31298,21215,22675,24917,25098,26286,27597,31807,33769,20515, -20472,21253,21574,22577,22857,23453,23792,23791,23849,24214,25265,25447,25918, -26041,26379,27861,27873,28921,30770,32299,32990,33459,33804,34028,34562,35090, -35370,35914,37030,37586,39165,40179,40300,20047,20129,20621,21078,22346,22952, -24125,24536,24537,25151,26292,26395,26576,26834,20882,32033,32938,33192,35584, -35980,36031,37502,38450,21536,38956,21271,20693,21340,22696,25778,26420,29287, -30566,31302,37350,21187,27809,27526,22528,24140,22868,26412,32763,20961,30406, -25705,30952,39764,40635,22475,22969,26151,26522,27598,21737,27097,24149,33180, -26517,39850,26622,40018,26717,20134,20451,21448,25273,26411,27819,36804,20397, -32365,40639,19975,24930,28288,28459,34067,21619,26410,39749,24051,31637,23724, -23494,34588,28234,34001,31252,33032,22937,31885,27665,30496,21209,22818,28961, -29279,30683,38695,40289,26891,23167,23064,20901,21517,21629,26126,30431,36855, -37528,40180,23018,29277,28357,20813,26825,32191,32236,38754,40634,25720,27169, -33538,22916,23391,27611,29467,30450,32178,32791,33945,20786,26408,40665,30446, -26466,21247,39173,23588,25147,31870,36016,21839,24758,32011,38272,21249,20063, -20918,22812,29242,32822,37326,24357,30690,21380,24441,32004,34220,35379,36493, -38742,26611,34222,37971,24841,24840,27833,30290,35565,36664,21807,20305,20778, -21191,21451,23461,24189,24736,24962,25558,26377,26586,28263,28044,29494,29495, -30001,31056,35029,35480,36938,37009,37109,38596,34701,22805,20104,20313,19982, -35465,36671,38928,20653,24188,22934,23481,24248,25562,25594,25793,26332,26954, -27096,27915,28342,29076,29992,31407,32650,32768,33865,33993,35201,35617,36362, -36965,38525,39178,24958,25233,27442,27779,28020,32716,32764,28096,32645,34746, -35064,26469,33713,38972,38647,27931,32097,33853,37226,20081,21365,23888,27396, -28651,34253,34349,35239,21033,21519,23653,26446,26792,29702,29827,30178,35023, -35041,37324,38626,38520,24459,29575,31435,33870,25504,30053,21129,27969,28316, -29705,30041,30827,31890,38534,31452,40845,20406,24942,26053,34396,20102,20142, -20698,20001,20940,23534,26009,26753,28092,29471,30274,30637,31260,31975,33391, -35538,36988,37327,38517,38936,21147,32209,20523,21400,26519,28107,29136,29747, -33256,36650,38563,40023,40607,29792,22593,28057,32047,39006,20196,20278,20363, -20919,21169,23994,24604,29618,31036,33491,37428,38583,38646,38666,40599,40802, -26278,27508,21015,21155,28872,35010,24265,24651,24976,28451,29001,31806,32244, -32879,34030,36899,37676,21570,39791,27347,28809,36034,36335,38706,21172,23105, -24266,24324,26391,27004,27028,28010,28431,29282,29436,31725,32769,32894,34635, -37070,20845,40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031, -24785,26528,40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056, -20098,20101,35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147, -20150,20174,20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314, -20272,20315,20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369, -20335,20358,20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452, -20453,20506,20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478, -20463,20497,20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600, -20608,20634,20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717, -20707,20718,20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794, -20791,20796,20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846, -20864,20866,22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898, -20905,20906,20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960, -34389,20969,20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038, -21043,21049,21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119, -21117,21133,21140,21138,21105,21128,21137,36776,36775,21164,21165,21180,21173, -21185,21197,21207,21214,21219,21222,39149,21216,21235,21237,21240,21241,21254, -21256,30008,21261,21264,21263,21269,21274,21283,21295,21297,21299,21304,21312, -21318,21317,19991,21321,21325,20950,21342,21353,21358,22808,21371,21367,21378, -21398,21408,21414,21413,21422,21424,21430,21443,31762,38617,21471,26364,29166, -21486,21480,21485,21498,21505,21565,21568,21548,21549,21564,21550,21558,21545, -21533,21582,21647,21621,21646,21599,21617,21623,21616,21650,21627,21632,21622, -21636,21648,21638,21703,21666,21688,21669,21676,21700,21704,21672,21675,21698, -21668,21694,21692,21720,21733,21734,21775,21780,21757,21742,21741,21754,21730, -21817,21824,21859,21836,21806,21852,21829,21846,21847,21816,21811,21853,21913, -21888,21679,21898,21919,21883,21886,21912,21918,21934,21884,21891,21929,21895, -21928,21978,21957,21983,21956,21980,21988,21972,22036,22007,22038,22014,22013, -22043,22009,22094,22096,29151,22068,22070,22066,22072,22123,22116,22063,22124, -22122,22150,22144,22154,22176,22164,22159,22181,22190,22198,22196,22210,22204, -22209,22211,22208,22216,22222,22225,22227,22231,22254,22265,22272,22271,22276, -22281,22280,22283,22285,22291,22296,22294,21959,22300,22310,22327,22328,22350, -22331,22336,22351,22377,22464,22408,22369,22399,22409,22419,22432,22451,22436, -22442,22448,22467,22470,22484,22482,22483,22538,22486,22499,22539,22553,22557, -22642,22561,22626,22603,22640,27584,22610,22589,22649,22661,22713,22687,22699, -22714,22750,22715,22712,22702,22725,22739,22737,22743,22745,22744,22757,22748, -22756,22751,22767,22778,22777,22779,22780,22781,22786,22794,22800,22811,26790, -22821,22828,22829,22834,22840,22846,31442,22869,22864,22862,22874,22872,22882, -22880,22887,22892,22889,22904,22913,22941,20318,20395,22947,22962,22982,23016, -23004,22925,23001,23002,23077,23071,23057,23068,23049,23066,23104,23148,23113, -23093,23094,23138,23146,23194,23228,23230,23243,23234,23229,23267,23255,23270, -23273,23254,23290,23291,23308,23307,23318,23346,23248,23338,23350,23358,23363, -23365,23360,23377,23381,23386,23387,23397,23401,23408,23411,23413,23416,25992, -23418,23424,23427,23462,23480,23491,23495,23497,23508,23504,23524,23526,23522, -23518,23525,23531,23536,23542,23539,23557,23559,23560,23565,23571,23584,23586, -23592,23608,23609,23617,23622,23630,23635,23632,23631,23409,23660,23662,20066, -23670,23673,23692,23697,23700,22939,23723,23739,23734,23740,23735,23749,23742, -23751,23769,23785,23805,23802,23789,23948,23786,23819,23829,23831,23900,23839, -23835,23825,23828,23842,23834,23833,23832,23884,23890,23886,23883,23916,23923, -23926,23943,23940,23938,23970,23965,23980,23982,23997,23952,23991,23996,24009, -24013,24019,24018,24022,24027,24043,24050,24053,24075,24090,24089,24081,24091, -24118,24119,24132,24131,24128,24142,24151,24148,24159,24162,24164,24135,24181, -24182,24186,40636,24191,24224,24257,24258,24264,24272,24271,24278,24291,24285, -24282,24283,24290,24289,24296,24297,24300,24305,24307,24304,24308,24312,24318, -24323,24329,24413,24412,24331,24337,24342,24361,24365,24376,24385,24392,24396, -24398,24367,24401,24406,24407,24409,24417,24429,24435,24439,24451,24450,24447, -24458,24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571, -24548,24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625, -24603,24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646, -24653,24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730, -24708,24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560, -24765,24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835, -24865,24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876, -24884,24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933, -24945,24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977, -25003,25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037, -25062,25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101, -25100,25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182, -25187,25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219, -25236,25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282, -25287,25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406, -25421,25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525, -25451,25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652, -25606,25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898, -25749,25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794, -25841,25831,33289,25824,25825,25260,25827,25839,25900,25846,25844,25842,25850, -25856,25853,25880,25884,25861,25892,25891,25899,25908,25909,25911,25910,25912, -30027,25928,25942,25941,25933,25944,25950,25949,25970,25976,25986,25987,35722, -26011,26015,26027,26039,26051,26054,26049,26052,26060,26066,26075,26073,26080, -26081,26097,26482,26122,26115,26107,26483,26165,26166,26164,26140,26191,26180, -26185,26177,26206,26205,26212,26215,26216,26207,26210,26224,26243,26248,26254, -26249,26244,26264,26269,26305,26297,26313,26302,26300,26308,26296,26326,26330, -26336,26175,26342,26345,26352,26357,26359,26383,26390,26398,26406,26407,38712, -26414,26431,26422,26433,26424,26423,26438,26462,26464,26457,26467,26468,26505, -26480,26537,26492,26474,26508,26507,26534,26529,26501,26551,26607,26548,26604, -26547,26601,26552,26596,26590,26589,26594,26606,26553,26574,26566,26599,27292, -26654,26694,26665,26688,26701,26674,26702,26803,26667,26713,26723,26743,26751, -26783,26767,26797,26772,26781,26779,26755,27310,26809,26740,26805,26784,26810, -26895,26765,26750,26881,26826,26888,26840,26914,26918,26849,26892,26829,26836, -26855,26837,26934,26898,26884,26839,26851,26917,26873,26848,26863,26920,26922, -26906,26915,26913,26822,27001,26999,26972,27000,26987,26964,27006,26990,26937, -26996,26941,26969,26928,26977,26974,26973,27009,26986,27058,27054,27088,27071, -27073,27091,27070,27086,23528,27082,27101,27067,27075,27047,27182,27025,27040, -27036,27029,27060,27102,27112,27138,27163,27135,27402,27129,27122,27111,27141, -27057,27166,27117,27156,27115,27146,27154,27329,27171,27155,27204,27148,27250, -27190,27256,27207,27234,27225,27238,27208,27192,27170,27280,27277,27296,27268, -27298,27299,27287,34327,27323,27331,27330,27320,27315,27308,27358,27345,27359, -27306,27354,27370,27387,27397,34326,27386,27410,27414,39729,27423,27448,27447, -30428,27449,39150,27463,27459,27465,27472,27481,27476,27483,27487,27489,27512, -27513,27519,27520,27524,27523,27533,27544,27541,27550,27556,27562,27563,27567, -27570,27569,27571,27575,27580,27590,27595,27603,27615,27628,27627,27635,27631, -40638,27656,27667,27668,27675,27684,27683,27742,27733,27746,27754,27778,27789, -27802,27777,27803,27774,27752,27763,27794,27792,27844,27889,27859,27837,27863, -27845,27869,27822,27825,27838,27834,27867,27887,27865,27882,27935,34893,27958, -27947,27965,27960,27929,27957,27955,27922,27916,28003,28051,28004,27994,28025, -27993,28046,28053,28644,28037,28153,28181,28170,28085,28103,28134,28088,28102, -28140,28126,28108,28136,28114,28101,28154,28121,28132,28117,28138,28142,28205, -28270,28206,28185,28274,28255,28222,28195,28267,28203,28278,28237,28191,28227, -28218,28238,28196,28415,28189,28216,28290,28330,28312,28361,28343,28371,28349, -28335,28356,28338,28372,28373,28303,28325,28354,28319,28481,28433,28748,28396, -28408,28414,28479,28402,28465,28399,28466,28364,28478,28435,28407,28550,28538, -28536,28545,28544,28527,28507,28659,28525,28546,28540,28504,28558,28561,28610, -28518,28595,28579,28577,28580,28601,28614,28586,28639,28629,28652,28628,28632, -28657,28654,28635,28681,28683,28666,28689,28673,28687,28670,28699,28698,28532, -28701,28696,28703,28720,28734,28722,28753,28771,28825,28818,28847,28913,28844, -28856,28851,28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013, -29064,29030,29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143, -29113,29118,29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183, -29197,29200,29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254, -29259,29272,29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362, -29379,29382,29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450, -29468,29462,29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546, -29544,29552,29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678, -29662,29858,29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761, -29788,29801,29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908, -29681,29920,29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955, -29957,29964,29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026, -30025,30043,30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087, -30068,30090,30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133, -30141,30136,30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204, -30209,30192,30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242, -30244,30260,30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313, -30314,30311,30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350, -30358,30355,30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418, -30430,30433,30437,30439,30442,34351,30459,30472,30471,30468,30505,30500,30494, -30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565,30591,30590, -30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652,30653,30651, -30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014,30752,31018, -30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895,30929,30918, -30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964,30983,30994, -30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059,31098,31103, -31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189,31207,31212, -31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291,31294,31287, -31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368,31383,31381, -31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431,31434,31437, -31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472,31490,31503, -31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610,31492,31565, -31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598,31645,31640, -31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681,31692,31695, -31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751,31763,31731, -31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805,31820,31811, -31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861,31875,31888, -31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929,31933,31936, -31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990,31994,32006, -32002,32028,32021,32010,32069,32075,32046,32050,32063,32053,32070,32115,32086, -32078,32114,32104,32110,32079,32099,32147,32137,32091,32143,32125,32155,32186, -32174,32163,32181,32199,32189,32171,32317,32162,32175,32220,32184,32159,32176, -32216,32221,32228,32222,32251,32242,32225,32261,32266,32291,32289,32274,32305, -32287,32265,32267,32290,32326,32358,32315,32309,32313,32323,32311,32306,32314, -32359,32349,32342,32350,32345,32346,32377,32362,32361,32380,32379,32387,32213, -32381,36782,32383,32392,32393,32396,32402,32400,32403,32404,32406,32398,32411, -32412,32568,32570,32581,32588,32589,32590,32592,32593,32597,32596,32600,32607, -32608,32616,32617,32615,32632,32642,32646,32643,32648,32647,32652,32660,32670, -32669,32666,32675,32687,32690,32697,32686,32694,32696,35697,32709,32710,32714, -32725,32724,32737,32742,32745,32755,32761,39132,32774,32772,32779,32786,32792, -32793,32796,32801,32808,32831,32827,32842,32838,32850,32856,32858,32863,32866, -32872,32883,32882,32880,32886,32889,32893,32895,32900,32902,32901,32923,32915, -32922,32941,20880,32940,32987,32997,32985,32989,32964,32986,32982,33033,33007, -33009,33051,33065,33059,33071,33099,38539,33094,33086,33107,33105,33020,33137, -33134,33125,33126,33140,33155,33160,33162,33152,33154,33184,33173,33188,33187, -33119,33171,33193,33200,33205,33214,33208,33213,33216,33218,33210,33225,33229, -33233,33241,33240,33224,33242,33247,33248,33255,33274,33275,33278,33281,33282, -33285,33287,33290,33293,33296,33302,33321,33323,33336,33331,33344,33369,33368, -33373,33370,33375,33380,33378,33384,33386,33387,33326,33393,33399,33400,33406, -33421,33426,33451,33439,33467,33452,33505,33507,33503,33490,33524,33523,33530, -33683,33539,33531,33529,33502,33542,33500,33545,33497,33589,33588,33558,33586, -33585,33600,33593,33616,33605,33583,33579,33559,33560,33669,33690,33706,33695, -33698,33686,33571,33678,33671,33674,33660,33717,33651,33653,33696,33673,33704, -33780,33811,33771,33742,33789,33795,33752,33803,33729,33783,33799,33760,33778, -33805,33826,33824,33725,33848,34054,33787,33901,33834,33852,34138,33924,33911, -33899,33965,33902,33922,33897,33862,33836,33903,33913,33845,33994,33890,33977, -33983,33951,34009,33997,33979,34010,34000,33985,33990,34006,33953,34081,34047, -34036,34071,34072,34092,34079,34069,34068,34044,34112,34147,34136,34120,34113, -34306,34123,34133,34176,34212,34184,34193,34186,34216,34157,34196,34203,34282, -34183,34204,34167,34174,34192,34249,34234,34255,34233,34256,34261,34269,34277, -34268,34297,34314,34323,34315,34302,34298,34310,34338,34330,34352,34367,34381, -20053,34388,34399,34407,34417,34451,34467,34473,34474,34443,34444,34486,34479, -34500,34502,34480,34505,34851,34475,34516,34526,34537,34540,34527,34523,34543, -34578,34566,34568,34560,34563,34555,34577,34569,34573,34553,34570,34612,34623, -34615,34619,34597,34601,34586,34656,34655,34680,34636,34638,34676,34647,34664, -34670,34649,34643,34659,34666,34821,34722,34719,34690,34735,34763,34749,34752, -34768,38614,34731,34756,34739,34759,34758,34747,34799,34802,34784,34831,34829, -34814,34806,34807,34830,34770,34833,34838,34837,34850,34849,34865,34870,34873, -34855,34875,34884,34882,34898,34905,34910,34914,34923,34945,34942,34974,34933, -34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992,35007, -34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048,35058, -35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131,35126, -35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191,35198, -35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258,35261, -35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340,35355, -35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426,35461, -35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522,35546, -35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596,35591, -35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624,35649, -35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700,35709, -35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912,35916, -35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981,35982, -35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040,36033, -36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109,36112, -40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290,36286, -36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348,36360, -36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423,36425, -36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476,36481, -36487,36485,36484,36491,36490,36499,36497,36500,36505,36522,36513,36524,36528, -36550,36529,36542,36549,36552,36555,36571,36579,36604,36603,36587,36606,36618, -36613,36629,36626,36633,36627,36636,36639,36635,36620,36646,36659,36667,36665, -36677,36674,36670,36684,36681,36678,36686,36695,36700,36706,36707,36708,36764, -36767,36771,36781,36783,36791,36826,36837,36834,36842,36847,36999,36852,36869, -36857,36858,36881,36885,36897,36877,36894,36886,36875,36903,36918,36917,36921, -36856,36943,36944,36945,36946,36878,36937,36926,36950,36952,36958,36968,36975, -36982,38568,36978,36994,36989,36993,36992,37002,37001,37007,37032,37039,37041, -37045,37090,37092,25160,37083,37122,37138,37145,37170,37168,37194,37206,37208, -37219,37221,37225,37235,37234,37259,37257,37250,37282,37291,37295,37290,37301, -37300,37306,37312,37313,37321,37323,37328,37334,37343,37345,37339,37372,37365, -37366,37406,37375,37396,37420,37397,37393,37470,37463,37445,37449,37476,37448, -37525,37439,37451,37456,37532,37526,37523,37531,37466,37583,37561,37559,37609, -37647,37626,37700,37678,37657,37666,37658,37667,37690,37685,37691,37724,37728, -37756,37742,37718,37808,37804,37805,37780,37817,37846,37847,37864,37861,37848, -37827,37853,37840,37832,37860,37914,37908,37907,37891,37895,37904,37942,37931, -37941,37921,37946,37953,37970,37956,37979,37984,37986,37982,37994,37417,38000, -38005,38007,38013,37978,38012,38014,38017,38015,38274,38279,38282,38292,38294, -38296,38297,38304,38312,38311,38317,38332,38331,38329,38334,38346,28662,38339, -38349,38348,38357,38356,38358,38364,38369,38373,38370,38433,38440,38446,38447, -38466,38476,38479,38475,38519,38492,38494,38493,38495,38502,38514,38508,38541, -38552,38549,38551,38570,38567,38577,38578,38576,38580,38582,38584,38585,38606, -38603,38601,38605,35149,38620,38669,38613,38649,38660,38662,38664,38675,38670, -38673,38671,38678,38681,38692,38698,38704,38713,38717,38718,38724,38726,38728, -38722,38729,38748,38752,38756,38758,38760,21202,38763,38769,38777,38789,38780, -38785,38778,38790,38795,38799,38800,38812,38824,38822,38819,38835,38836,38851, -38854,38856,38859,38876,38893,40783,38898,31455,38902,38901,38927,38924,38968, -38948,38945,38967,38973,38982,38991,38987,39019,39023,39024,39025,39028,39027, -39082,39087,39089,39094,39108,39107,39110,39145,39147,39171,39177,39186,39188, -39192,39201,39197,39198,39204,39200,39212,39214,39229,39230,39234,39241,39237, -39248,39243,39249,39250,39244,39253,39319,39320,39333,39341,39342,39356,39391, -39387,39389,39384,39377,39405,39406,39409,39410,39419,39416,39425,39439,39429, -39394,39449,39467,39479,39493,39490,39488,39491,39486,39509,39501,39515,39511, -39519,39522,39525,39524,39529,39531,39530,39597,39600,39612,39616,39631,39633, -39635,39636,39646,39647,39650,39651,39654,39663,39659,39662,39668,39665,39671, -39675,39686,39704,39706,39711,39714,39715,39717,39719,39720,39721,39722,39726, -39727,39730,39748,39747,39759,39757,39758,39761,39768,39796,39827,39811,39825, -39830,39831,39839,39840,39848,39860,39872,39882,39865,39878,39887,39889,39890, -39907,39906,39908,39892,39905,39994,39922,39921,39920,39957,39956,39945,39955, -39948,39942,39944,39954,39946,39940,39982,39963,39973,39972,39969,39984,40007, +23435,23652,21277,24803,24819,25436,25475,25407,25531, +25805,26089,26361,24035,27085,27133,28437,29157,20105,30185,30456,31379,31967, +32207,32156,32865,33609,33624,33900,33980,34299,35013,36208,36865,36973,37783, +38684,39442,20687,22679,24974,33235,34101,36104,36896,20419,20596,21063,21363, +24687,25417,26463,28204,36275,36895,20439,23646,36042,26063,32154,21330,34966, +20854,25539,23384,23403,23562,25613,26449,36956,20182,22810,22826,27760,35409, +21822,22549,22949,24816,25171,26561,33333,26965,38464,39364,39464,20307,22534, +23550,32784,23729,24111,24453,24608,24907,25140,26367,27888,28382,32974,33151, +33492,34955,36024,36864,36910,38538,40667,39899,20195,21488,22823,31532,37261, +38988,40441,28381,28711,21331,21828,23429,25176,25246,25299,27810,28655,29730, +35351,37944,28609,35582,33592,20967,34552,21482,21481,20294,36948,36784,22890, +33073,24061,31466,36799,26842,35895,29432,40008,27197,35504,20025,21336,22022, +22374,25285,25506,26086,27470,28129,28251,28845,30701,31471,31658,32187,32829, +32966,34507,35477,37723,22243,22727,24382,26029,26262,27264,27573,30007,35527, +20516,30693,22320,24347,24677,26234,27744,30196,31258,32622,33268,34584,36933, +39347,31689,30044,31481,31569,33988,36880,31209,31378,33590,23265,30528,20013, +20210,23449,24544,25277,26172,26609,27880,34411,34935,35387,37198,37619,39376, +27159,28710,29482,33511,33879,36015,19969,20806,20939,21899,23541,24086,24115, +24193,24340,24373,24427,24500,25074,25361,26274,26397,28526,29266,30010,30522, +32884,33081,33144,34678,35519,35548,36229,36339,37530,38263,38914,40165,21189, +25431,30452,26389,27784,29645,36035,37806,38515,27941, +22684,26894,27084,36861,37786,30171,36890,22618,26626,25524,27131,20291,28460, +26584,36795,34086,32180,37716,26943,28528,22378,22775,23340,32044,29226,21514, +37347,40372,20141,20302,20572,20597,21059,35998,21576,22564,23450,24093,24213, +24237,24311,24351,24716,25269,25402,25552,26799,27712,30855,31118,31243,32224, +33351,35330,35558,36420,36883,37048,37165,37336,40718,27877,25688,25826,25973, +28404,30340,31515,36969,37841,28346,21746,24505,25764,36685,36845,37444,20856, +22635,22825,23637,24215,28155,32399,29980,36028,36578,39003,28857,20253,27583, +28593,30000,38651,20814,21520,22581,22615,22956,23648,24466,26007,26460,28193, +30331,33759,36077,36884,37117,37709,30757,30778,21162,24230,22303,22900,24594, +20498,20826,20908,20941,20992,21776,22612,22616,22871,23445,23798,23947,24764, +25237,25645,26481,26691,26812,26847,30423,28120,28271,28059,28783,29128,24403, +30168,31095,31561,31572,31570,31958,32113,21040,33891,34153,34276,35342,35588, +35910,36367,36867,36879,37913,38518,38957,39472,38360,20685,21205,21516,22530, +23566,24999,25758,27934,30643,31461,33012,33796,36947,37509,23776,40199,21311, +24471,24499,28060,29305,30563,31167,31716,27602,29420,35501,26627,27233,20984, +31361,26932,23626,40182,33515,23493,37193,28702,22136,23663,24775,25958,27788, +35930,36929,38931,21585,26311,37389,22856,37027,20869,20045,20970,34201,35598, +28760,25466,37707,26978,39348,32260,30071,21335,26976,36575,38627,27741,20108, +23612,24336,36841,21250,36049,32905,34425,24319,26085,20083,20837,22914,23615, +38894,20219,22922,24525,35469,28641,31152,31074,23527, +33905,29483,29105,24180,24565,25467,25754,29123,31896,20035,24316,20043,22492, +22178,24745,28611,32013,33021,33075,33215,36786,35223,34468,24052,25226,25773, +35207,26487,27874,27966,29750,30772,23110,32629,33453,39340,20467,24259,25309, +25490,25943,26479,30403,29260,32972,32954,36649,37197,20493,22521,23186,26757, +26995,29028,29437,36023,22770,36064,38506,36889,34687,31204,30695,33833,20271, +21093,21338,25293,26575,27850,30333,31636,31893,33334,34180,36843,26333,28448, +29190,32283,33707,39361,40614,20989,31665,30834,31672,32903,31560,27368,24161, +32908,30033,30048,20843,37474,28300,30330,37271,39658,20240,32624,25244,31567, +38309,40169,22138,22617,34532,38588,20276,21028,21322,21453,21467,24070,25644, +26001,26495,27710,27726,29256,29359,29677,30036,32321,33324,34281,36009,31684, +37318,29033,38930,39151,25405,26217,30058,30436,30928,34115,34542,21290,21329, +21542,22915,24199,24444,24754,25161,25209,25259,26000,27604,27852,30130,30382, +30865,31192,32203,32631,32933,34987,35513,36027,36991,38750,39131,27147,31800, +20633,23614,24494,26503,27608,29749,30473,32654,40763,26570,31255,21305,30091, +39661,24422,33181,33777,32920,24380,24517,30050,31558,36924,26727,23019,23195, +32016,30334,35628,20469,24426,27161,27703,28418,29922,31080,34920,35413,35961, +24287,25551,30149,31186,33495,37672,37618,33948,34541,39981,21697,24428,25996, +27996,28693,36007,36051,38971,25935,29942,19981,20184,22496,22827,23142,23500, +20904,24067,24220,24598,25206,25975,26023,26222,28014,29238,31526,33104,33178, +33433,35676,36000,36070,36212,38428,38468,20398,25771, +27494,33310,33889,34154,37096,23553,26963,39080,33914,34135,20239,21103,24489, +24133,26381,31119,33145,35079,35206,28149,24343,25173,27832,20175,29289,39826, +20998,21563,22132,22707,24996,25198,28954,22894,31881,31966,32027,38640,25991, +32862,19993,20341,20853,22592,24163,24179,24330,26564,20006,34109,38281,38491, +31859,38913,20731,22721,30294,30887,21029,30629,34065,31622,20559,22793,29255, +31687,32232,36794,36820,36941,20415,21193,23081,24321,38829,20445,33303,37610, +22275,25429,27497,29995,35036,36628,31298,21215,22675,24917,25098,26286,27597, +31807,33769,20515,20472,21253,21574,22577,22857,23453,23792,23791,23849,24214, +25265,25447,25918,26041,26379,27861,27873,28921,30770,32299,32990,33459,33804, +34028,34562,35090,35370,35914,37030,37586,39165,40179,40300,20047,20129,20621, +21078,22346,22952,24125,24536,24537,25151,26292,26395,26576,26834,20882,32033, +32938,33192,35584,35980,36031,37502,38450,21536,38956,21271,20693,21340,22696, +25778,26420,29287,30566,31302,37350,21187,27809,27526,22528,24140,22868,26412, +32763,20961,30406,25705,30952,39764,40635,22475,22969,26151,26522,27598,21737, +27097,24149,33180,26517,39850,26622,40018,26717,20134,20451,21448,25273,26411, +27819,36804,20397,32365,40639,19975,24930,28288,28459,34067,21619,26410,39749, +24051,31637,23724,23494,34588,28234,34001,31252,33032,22937,31885,27665,30496, +21209,22818,28961,29279,30683,38695,40289,26891,23167,23064,20901,21517,21629, +26126,30431,36855,37528,40180,23018,29277,28357,20813,26825,32191,32236,38754, +40634,25720,27169,33538,22916,23391,27611,29467,30450, +32178,32791,33945,20786,26408,40665,30446,26466,21247,39173,23588,25147,31870, +36016,21839,24758,32011,38272,21249,20063,20918,22812,29242,32822,37326,24357, +30690,21380,24441,32004,34220,35379,36493,38742,26611,34222,37971,24841,24840, +27833,30290,35565,36664,21807,20305,20778,21191,21451,23461,24189,24736,24962, +25558,26377,26586,28263,28044,29494,29495,30001,31056,35029,35480,36938,37009, +37109,38596,34701,22805,20104,20313,19982,35465,36671,38928,20653,24188,22934, +23481,24248,25562,25594,25793,26332,26954,27096,27915,28342,29076,29992,31407, +32650,32768,33865,33993,35201,35617,36362,36965,38525,39178,24958,25233,27442, +27779,28020,32716,32764,28096,32645,34746,35064,26469,33713,38972,38647,27931, +32097,33853,37226,20081,21365,23888,27396,28651,34253,34349,35239,21033,21519, +23653,26446,26792,29702,29827,30178,35023,35041,37324,38626,38520,24459,29575, +31435,33870,25504,30053,21129,27969,28316,29705,30041,30827,31890,38534,31452, +40845,20406,24942,26053,34396,20102,20142,20698,20001,20940,23534,26009,26753, +28092,29471,30274,30637,31260,31975,33391,35538,36988,37327,38517,38936,21147, +32209,20523,21400,26519,28107,29136,29747,33256,36650,38563,40023,40607,29792, +22593,28057,32047,39006,20196,20278,20363,20919,21169,23994,24604,29618,31036, +33491,37428,38583,38646,38666,40599,40802,26278,27508,21015,21155,28872,35010, +24265,24651,24976,28451,29001,31806,32244,32879,34030,36899,37676,21570,39791, +27347,28809,36034,36335,38706,21172,23105,24266,24324,26391,27004,27028,28010, +28431,29282,29436,31725,32769,32894,34635,37070,20845, +40595,31108,32907,37682,35542,20525,21644,35441,27498,36036,33031,24785,26528, +40434,20121,20120,39952,35435,34241,34152,26880,28286,30871,33109,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +24332,19984,19989,20010,20017,20022,20028,20031,20034,20054,20056,20098,20101, +35947,20106,33298,24333,20110,20126,20127,20128,20130,20144,20147,20150,20174, +20173,20164,20166,20162,20183,20190,20205,20191,20215,20233,20314,20272,20315, +20317,20311,20295,20342,20360,20367,20376,20347,20329,20336,20369,20335,20358, +20374,20760,20436,20447,20430,20440,20443,20433,20442,20432,20452,20453,20506, +20520,20500,20522,20517,20485,20252,20470,20513,20521,20524,20478,20463,20497, +20486,20547,20551,26371,20565,20560,20552,20570,20566,20588,20600,20608,20634, +20613,20660,20658,20681,20682,20659,20674,20694,20702,20709,20717,20707,20718, +20729,20725,20745,20737,20738,20758,20757,20756,20762,20769,20794,20791,20796, +20795,20799,20800,20818,20812,20820,20834,31480,20841,20842,20846,20864,20866, +22232,20876,20873,20879,20881,20883,20885,20886,20900,20902,20898,20905,20906, +20907,20915,20913,20914,20912,20917,20925,20933,20937,20955,20960,34389,20969, +20973,20976,20981,20990,20996,21003,21012,21006,21031,21034,21038,21043,21049, +21071,21060,21067,21068,21086,21076,21098,21108,21097,21107,21119,21117,21133, +21140,21138,21105,21128,21137,36776,36775, +21164,21165,21180,21173,21185,21197,21207,21214,21219,21222,39149,21216,21235, +21237,21240,21241,21254,21256,30008,21261,21264,21263,21269,21274,21283,21295, +21297,21299,21304,21312,21318,21317,19991,21321,21325,20950,21342,21353,21358, +22808,21371,21367,21378,21398,21408,21414,21413,21422,21424,21430,21443,31762, +38617,21471,26364,29166,21486,21480,21485,21498,21505,21565,21568,21548,21549, +21564,21550,21558,21545,21533,21582,21647,21621,21646,21599,21617,21623,21616, +21650,21627,21632,21622,21636,21648,21638,21703,21666,21688,21669,21676,21700, +21704,21672,21675,21698,21668,21694,21692,21720,21733,21734,21775,21780,21757, +21742,21741,21754,21730,21817,21824,21859,21836,21806,21852,21829,21846,21847, +21816,21811,21853,21913,21888,21679,21898,21919,21883,21886,21912,21918,21934, +21884,21891,21929,21895,21928,21978,21957,21983,21956,21980,21988,21972,22036, +22007,22038,22014,22013,22043,22009,22094,22096,29151,22068,22070,22066,22072, +22123,22116,22063,22124,22122,22150,22144,22154,22176,22164,22159,22181,22190, +22198,22196,22210,22204,22209,22211,22208,22216,22222,22225,22227,22231,22254, +22265,22272,22271,22276,22281,22280,22283,22285,22291,22296,22294,21959,22300, +22310,22327,22328,22350,22331,22336,22351,22377,22464,22408,22369,22399,22409, +22419,22432,22451,22436,22442,22448,22467,22470,22484,22482,22483,22538,22486, +22499,22539,22553,22557,22642,22561,22626,22603,22640,27584,22610,22589,22649, +22661,22713,22687,22699,22714,22750,22715,22712,22702,22725,22739,22737,22743, +22745,22744,22757,22748,22756,22751,22767,22778,22777, +22779,22780,22781,22786,22794,22800,22811,26790,22821,22828,22829,22834,22840, +22846,31442,22869,22864,22862,22874,22872,22882,22880,22887,22892,22889,22904, +22913,22941,20318,20395,22947,22962,22982,23016,23004,22925,23001,23002,23077, +23071,23057,23068,23049,23066,23104,23148,23113,23093,23094,23138,23146,23194, +23228,23230,23243,23234,23229,23267,23255,23270,23273,23254,23290,23291,23308, +23307,23318,23346,23248,23338,23350,23358,23363,23365,23360,23377,23381,23386, +23387,23397,23401,23408,23411,23413,23416,25992,23418,23424,23427,23462,23480, +23491,23495,23497,23508,23504,23524,23526,23522,23518,23525,23531,23536,23542, +23539,23557,23559,23560,23565,23571,23584,23586,23592,23608,23609,23617,23622, +23630,23635,23632,23631,23409,23660,23662,20066,23670,23673,23692,23697,23700, +22939,23723,23739,23734,23740,23735,23749,23742,23751,23769,23785,23805,23802, +23789,23948,23786,23819,23829,23831,23900,23839,23835,23825,23828,23842,23834, +23833,23832,23884,23890,23886,23883,23916,23923,23926,23943,23940,23938,23970, +23965,23980,23982,23997,23952,23991,23996,24009,24013,24019,24018,24022,24027, +24043,24050,24053,24075,24090,24089,24081,24091,24118,24119,24132,24131,24128, +24142,24151,24148,24159,24162,24164,24135,24181,24182,24186,40636,24191,24224, +24257,24258,24264,24272,24271,24278,24291,24285,24282,24283,24290,24289,24296, +24297,24300,24305,24307,24304,24308,24312,24318,24323,24329,24413,24412,24331, +24337,24342,24361,24365,24376,24385,24392,24396,24398,24367,24401,24406,24407, +24409,24417,24429,24435,24439,24451,24450,24447,24458, +24456,24465,24455,24478,24473,24472,24480,24488,24493,24508,24534,24571,24548, +24568,24561,24541,24755,24575,24609,24672,24601,24592,24617,24590,24625,24603, +24597,24619,24614,24591,24634,24666,24641,24682,24695,24671,24650,24646,24653, +24675,24643,24676,24642,24684,24683,24665,24705,24717,24807,24707,24730,24708, +24731,24726,24727,24722,24743,24715,24801,24760,24800,24787,24756,24560,24765, +24774,24757,24792,24909,24853,24838,24822,24823,24832,24820,24826,24835,24865, +24827,24817,24845,24846,24903,24894,24872,24871,24906,24895,24892,24876,24884, +24893,24898,24900,24947,24951,24920,24921,24922,24939,24948,24943,24933,24945, +24927,24925,24915,24949,24985,24982,24967,25004,24980,24986,24970,24977,25003, +25006,25036,25034,25033,25079,25032,25027,25030,25018,25035,32633,25037,25062, +25059,25078,25082,25076,25087,25085,25084,25086,25088,25096,25097,25101,25100, +25108,25115,25118,25121,25130,25134,25136,25138,25139,25153,25166,25182,25187, +25179,25184,25192,25212,25218,25225,25214,25234,25235,25238,25300,25219,25236, +25303,25297,25275,25295,25343,25286,25812,25288,25308,25292,25290,25282,25287, +25243,25289,25356,25326,25329,25383,25346,25352,25327,25333,25424,25406,25421, +25628,25423,25494,25486,25472,25515,25462,25507,25487,25481,25503,25525,25451, +25449,25534,25577,25536,25542,25571,25545,25554,25590,25540,25622,25652,25606, +25619,25638,25654,25885,25623,25640,25615,25703,25711,25718,25678,25898,25749, +25747,25765,25769,25736,25788,25818,25810,25797,25799,25787,25816,25794,25841, +25831,33289,25824,25825,25260,25827,25839,25900,25846, +25844,25842,25850,25856,25853,25880,25884,25861,25892,25891,25899,25908,25909, +25911,25910,25912,30027,25928,25942,25941,25933,25944,25950,25949,25970,25976, +25986,25987,35722,26011,26015,26027,26039,26051,26054,26049,26052,26060,26066, +26075,26073,26080,26081,26097,26482,26122,26115,26107,26483,26165,26166,26164, +26140,26191,26180,26185,26177,26206,26205,26212,26215,26216,26207,26210,26224, +26243,26248,26254,26249,26244,26264,26269,26305,26297,26313,26302,26300,26308, +26296,26326,26330,26336,26175,26342,26345,26352,26357,26359,26383,26390,26398, +26406,26407,38712,26414,26431,26422,26433,26424,26423,26438,26462,26464,26457, +26467,26468,26505,26480,26537,26492,26474,26508,26507,26534,26529,26501,26551, +26607,26548,26604,26547,26601,26552,26596,26590,26589,26594,26606,26553,26574, +26566,26599,27292,26654,26694,26665,26688,26701,26674,26702,26803,26667,26713, +26723,26743,26751,26783,26767,26797,26772,26781,26779,26755,27310,26809,26740, +26805,26784,26810,26895,26765,26750,26881,26826,26888,26840,26914,26918,26849, +26892,26829,26836,26855,26837,26934,26898,26884,26839,26851,26917,26873,26848, +26863,26920,26922,26906,26915,26913,26822,27001,26999,26972,27000,26987,26964, +27006,26990,26937,26996,26941,26969,26928,26977,26974,26973,27009,26986,27058, +27054,27088,27071,27073,27091,27070,27086,23528,27082,27101,27067,27075,27047, +27182,27025,27040,27036,27029,27060,27102,27112,27138,27163,27135,27402,27129, +27122,27111,27141,27057,27166,27117,27156,27115,27146,27154,27329,27171,27155, +27204,27148,27250,27190,27256,27207,27234,27225,27238, +27208,27192,27170,27280,27277,27296,27268,27298,27299,27287,34327,27323,27331, +27330,27320,27315,27308,27358,27345,27359,27306,27354,27370,27387,27397,34326, +27386,27410,27414,39729,27423,27448,27447,30428,27449,39150,27463,27459,27465, +27472,27481,27476,27483,27487,27489,27512,27513,27519,27520,27524,27523,27533, +27544,27541,27550,27556,27562,27563,27567,27570,27569,27571,27575,27580,27590, +27595,27603,27615,27628,27627,27635,27631,40638,27656,27667,27668,27675,27684, +27683,27742,27733,27746,27754,27778,27789,27802,27777,27803,27774,27752,27763, +27794,27792,27844,27889,27859,27837,27863,27845,27869,27822,27825,27838,27834, +27867,27887,27865,27882,27935,34893,27958,27947,27965,27960,27929,27957,27955, +27922,27916,28003,28051,28004,27994,28025,27993,28046,28053,28644,28037,28153, +28181,28170,28085,28103,28134,28088,28102,28140,28126,28108,28136,28114,28101, +28154,28121,28132,28117,28138,28142,28205,28270,28206,28185,28274,28255,28222, +28195,28267,28203,28278,28237,28191,28227,28218,28238,28196,28415,28189,28216, +28290,28330,28312,28361,28343,28371,28349,28335,28356,28338,28372,28373,28303, +28325,28354,28319,28481,28433,28748,28396,28408,28414,28479,28402,28465,28399, +28466,28364,28478,28435,28407,28550,28538,28536,28545,28544,28527,28507,28659, +28525,28546,28540,28504,28558,28561,28610,28518,28595,28579,28577,28580,28601, +28614,28586,28639,28629,28652,28628,28632,28657,28654,28635,28681,28683,28666, +28689,28673,28687,28670,28699,28698,28532,28701,28696,28703,28720,28734,28722, +28753,28771,28825,28818,28847,28913,28844,28856,28851, +28846,28895,28875,28893,28889,28937,28925,28956,28953,29029,29013,29064,29030, +29026,29004,29014,29036,29071,29179,29060,29077,29096,29100,29143,29113,29118, +29138,29129,29140,29134,29152,29164,29159,29173,29180,29177,29183,29197,29200, +29211,29224,29229,29228,29232,29234,29243,29244,29247,29248,29254,29259,29272, +29300,29310,29314,29313,29319,29330,29334,29346,29351,29369,29362,29379,29382, +29380,29390,29394,29410,29408,29409,29433,29431,20495,29463,29450,29468,29462, +29469,29492,29487,29481,29477,29502,29518,29519,40664,29527,29546,29544,29552, +29560,29557,29563,29562,29640,29619,29646,29627,29632,29669,29678,29662,29858, +29701,29807,29733,29688,29746,29754,29781,29759,29791,29785,29761,29788,29801, +29808,29795,29802,29814,29822,29835,29854,29863,29898,29903,29908,29681,29920, +29923,29927,29929,29934,29938,29936,29937,29944,29943,29956,29955,29957,29964, +29966,29965,29973,29971,29982,29990,29996,30012,30020,30029,30026,30025,30043, +30022,30042,30057,30052,30055,30059,30061,30072,30070,30086,30087,30068,30090, +30089,30082,30100,30106,30109,30117,30115,30146,30131,30147,30133,30141,30136, +30140,30129,30157,30154,30162,30169,30179,30174,30206,30207,30204,30209,30192, +30202,30194,30195,30219,30221,30217,30239,30247,30240,30241,30242,30244,30260, +30256,30267,30279,30280,30278,30300,30296,30305,30306,30312,30313,30314,30311, +30316,30320,30322,30326,30328,30332,30336,30339,30344,30347,30350,30358,30355, +30361,30362,30384,30388,30392,30393,30394,30402,30413,30422,30418,30430,30433, +30437,30439,30442,34351,30459,30472,30471,30468,30505, +30500,30494,30501,30502,30491,30519,30520,30535,30554,30568,30571,30555,30565, +30591,30590,30585,30606,30603,30609,30624,30622,30640,30646,30649,30655,30652, +30653,30651,30663,30669,30679,30682,30684,30691,30702,30716,30732,30738,31014, +30752,31018,30789,30862,30836,30854,30844,30874,30860,30883,30901,30890,30895, +30929,30918,30923,30932,30910,30908,30917,30922,30956,30951,30938,30973,30964, +30983,30994,30993,31001,31020,31019,31040,31072,31063,31071,31066,31061,31059, +31098,31103,31114,31133,31143,40779,31146,31150,31155,31161,31162,31177,31189, +31207,31212,31201,31203,31240,31245,31256,31257,31264,31263,31104,31281,31291, +31294,31287,31299,31319,31305,31329,31330,31337,40861,31344,31353,31357,31368, +31383,31381,31384,31382,31401,31432,31408,31414,31429,31428,31423,36995,31431, +31434,31437,31439,31445,31443,31449,31450,31453,31457,31458,31462,31469,31472, +31490,31503,31498,31494,31539,31512,31513,31518,31541,31528,31542,31568,31610, +31492,31565,31499,31564,31557,31605,31589,31604,31591,31600,31601,31596,31598, +31645,31640,31647,31629,31644,31642,31627,31634,31631,31581,31641,31691,31681, +31692,31695,31668,31686,31709,31721,31761,31764,31718,31717,31840,31744,31751, +31763,31731,31735,31767,31757,31734,31779,31783,31786,31775,31799,31787,31805, +31820,31811,31828,31823,31808,31824,31832,31839,31844,31830,31845,31852,31861, +31875,31888,31908,31917,31906,31915,31905,31912,31923,31922,31921,31918,31929, +31933,31936,31941,31938,31960,31954,31964,31970,39739,31983,31986,31988,31990, +31994,32006,32002,32028,32021,32010,32069,32075,32046, +32050,32063,32053,32070,32115,32086,32078,32114,32104,32110,32079,32099,32147, +32137,32091,32143,32125,32155,32186,32174,32163,32181,32199,32189,32171,32317, +32162,32175,32220,32184,32159,32176,32216,32221,32228,32222,32251,32242,32225, +32261,32266,32291,32289,32274,32305,32287,32265,32267,32290,32326,32358,32315, +32309,32313,32323,32311,32306,32314,32359,32349,32342,32350,32345,32346,32377, +32362,32361,32380,32379,32387,32213,32381,36782,32383,32392,32393,32396,32402, +32400,32403,32404,32406,32398,32411,32412,32568,32570,32581,32588,32589,32590, +32592,32593,32597,32596,32600,32607,32608,32616,32617,32615,32632,32642,32646, +32643,32648,32647,32652,32660,32670,32669,32666,32675,32687,32690,32697,32686, +32694,32696,35697,32709,32710,32714,32725,32724,32737,32742,32745,32755,32761, +39132,32774,32772,32779,32786,32792,32793,32796,32801,32808,32831,32827,32842, +32838,32850,32856,32858,32863,32866,32872,32883,32882,32880,32886,32889,32893, +32895,32900,32902,32901,32923,32915,32922,32941,20880,32940,32987,32997,32985, +32989,32964,32986,32982,33033,33007,33009,33051,33065,33059,33071,33099,38539, +33094,33086,33107,33105,33020,33137,33134,33125,33126,33140,33155,33160,33162, +33152,33154,33184,33173,33188,33187,33119,33171,33193,33200,33205,33214,33208, +33213,33216,33218,33210,33225,33229,33233,33241,33240,33224,33242,33247,33248, +33255,33274,33275,33278,33281,33282,33285,33287,33290,33293,33296,33302,33321, +33323,33336,33331,33344,33369,33368,33373,33370,33375,33380,33378,33384,33386, +33387,33326,33393,33399,33400,33406,33421,33426,33451, +33439,33467,33452,33505,33507,33503,33490,33524,33523,33530,33683,33539,33531, +33529,33502,33542,33500,33545,33497,33589,33588,33558,33586,33585,33600,33593, +33616,33605,33583,33579,33559,33560,33669,33690,33706,33695,33698,33686,33571, +33678,33671,33674,33660,33717,33651,33653,33696,33673,33704,33780,33811,33771, +33742,33789,33795,33752,33803,33729,33783,33799,33760,33778,33805,33826,33824, +33725,33848,34054,33787,33901,33834,33852,34138,33924,33911,33899,33965,33902, +33922,33897,33862,33836,33903,33913,33845,33994,33890,33977,33983,33951,34009, +33997,33979,34010,34000,33985,33990,34006,33953,34081,34047,34036,34071,34072, +34092,34079,34069,34068,34044,34112,34147,34136,34120,34113,34306,34123,34133, +34176,34212,34184,34193,34186,34216,34157,34196,34203,34282,34183,34204,34167, +34174,34192,34249,34234,34255,34233,34256,34261,34269,34277,34268,34297,34314, +34323,34315,34302,34298,34310,34338,34330,34352,34367,34381,20053,34388,34399, +34407,34417,34451,34467,34473,34474,34443,34444,34486,34479,34500,34502,34480, +34505,34851,34475,34516,34526,34537,34540,34527,34523,34543,34578,34566,34568, +34560,34563,34555,34577,34569,34573,34553,34570,34612,34623,34615,34619,34597, +34601,34586,34656,34655,34680,34636,34638,34676,34647,34664,34670,34649,34643, +34659,34666,34821,34722,34719,34690,34735,34763,34749,34752,34768,38614,34731, +34756,34739,34759,34758,34747,34799,34802,34784,34831,34829,34814,34806,34807, +34830,34770,34833,34838,34837,34850,34849,34865,34870,34873,34855,34875,34884, +34882,34898,34905,34910,34914,34923,34945,34942,34974, +34933,34941,34997,34930,34946,34967,34962,34990,34969,34978,34957,34980,34992, +35007,34993,35011,35012,35028,35032,35033,35037,35065,35074,35068,35060,35048, +35058,35076,35084,35082,35091,35139,35102,35109,35114,35115,35137,35140,35131, +35126,35128,35148,35101,35168,35166,35174,35172,35181,35178,35183,35188,35191, +35198,35203,35208,35210,35219,35224,35233,35241,35238,35244,35247,35250,35258, +35261,35263,35264,35290,35292,35293,35303,35316,35320,35331,35350,35344,35340, +35355,35357,35365,35382,35393,35419,35410,35398,35400,35452,35437,35436,35426, +35461,35458,35460,35496,35489,35473,35493,35494,35482,35491,35524,35533,35522, +35546,35563,35571,35559,35556,35569,35604,35552,35554,35575,35550,35547,35596, +35591,35610,35553,35606,35600,35607,35616,35635,38827,35622,35627,35646,35624, +35649,35660,35663,35662,35657,35670,35675,35674,35691,35679,35692,35695,35700, +35709,35712,35724,35726,35730,35731,35734,35737,35738,35898,35905,35903,35912, +35916,35918,35920,35925,35938,35948,35960,35962,35970,35977,35973,35978,35981, +35982,35988,35964,35992,25117,36013,36010,36029,36018,36019,36014,36022,36040, +36033,36068,36067,36058,36093,36090,36091,36100,36101,36106,36103,36111,36109, +36112,40782,36115,36045,36116,36118,36199,36205,36209,36211,36225,36249,36290, +36286,36282,36303,36314,36310,36300,36315,36299,36330,36331,36319,36323,36348, +36360,36361,36351,36381,36382,36368,36383,36418,36405,36400,36404,36426,36423, +36425,36428,36432,36424,36441,36452,36448,36394,36451,36437,36470,36466,36476, +36481,36487,36485,36484,36491,36490,36499,36497,36500, +36505,36522,36513,36524,36528,36550,36529,36542,36549,36552,36555,36571,36579, +36604,36603,36587,36606,36618,36613,36629,36626,36633,36627,36636,36639,36635, +36620,36646,36659,36667,36665,36677,36674,36670,36684,36681,36678,36686,36695, +36700,36706,36707,36708,36764,36767,36771,36781,36783,36791,36826,36837,36834, +36842,36847,36999,36852,36869,36857,36858,36881,36885,36897,36877,36894,36886, +36875,36903,36918,36917,36921,36856,36943,36944,36945,36946,36878,36937,36926, +36950,36952,36958,36968,36975,36982,38568,36978,36994,36989,36993,36992,37002, +37001,37007,37032,37039,37041,37045,37090,37092,25160,37083,37122,37138,37145, +37170,37168,37194,37206,37208,37219,37221,37225,37235,37234,37259,37257,37250, +37282,37291,37295,37290,37301,37300,37306,37312,37313,37321,37323,37328,37334, +37343,37345,37339,37372,37365,37366,37406,37375,37396,37420,37397,37393,37470, +37463,37445,37449,37476,37448,37525,37439,37451,37456,37532,37526,37523,37531, +37466,37583,37561,37559,37609,37647,37626,37700,37678,37657,37666,37658,37667, +37690,37685,37691,37724,37728,37756,37742,37718,37808,37804,37805,37780,37817, +37846,37847,37864,37861,37848,37827,37853,37840,37832,37860,37914,37908,37907, +37891,37895,37904,37942,37931,37941,37921,37946,37953,37970,37956,37979,37984, +37986,37982,37994,37417,38000,38005,38007,38013,37978,38012,38014,38017,38015, +38274,38279,38282,38292,38294,38296,38297,38304,38312,38311,38317,38332,38331, +38329,38334,38346,28662,38339,38349,38348,38357,38356,38358,38364,38369,38373, +38370,38433,38440,38446,38447,38466,38476,38479,38475, +38519,38492,38494,38493,38495,38502,38514,38508,38541,38552,38549,38551,38570, +38567,38577,38578,38576,38580,38582,38584,38585,38606,38603,38601,38605,35149, +38620,38669,38613,38649,38660,38662,38664,38675,38670,38673,38671,38678,38681, +38692,38698,38704,38713,38717,38718,38724,38726,38728,38722,38729,38748,38752, +38756,38758,38760,21202,38763,38769,38777,38789,38780,38785,38778,38790,38795, +38799,38800,38812,38824,38822,38819,38835,38836,38851,38854,38856,38859,38876, +38893,40783,38898,31455,38902,38901,38927,38924,38968,38948,38945,38967,38973, +38982,38991,38987,39019,39023,39024,39025,39028,39027,39082,39087,39089,39094, +39108,39107,39110,39145,39147,39171,39177,39186,39188,39192,39201,39197,39198, +39204,39200,39212,39214,39229,39230,39234,39241,39237,39248,39243,39249,39250, +39244,39253,39319,39320,39333,39341,39342,39356,39391,39387,39389,39384,39377, +39405,39406,39409,39410,39419,39416,39425,39439,39429,39394,39449,39467,39479, +39493,39490,39488,39491,39486,39509,39501,39515,39511,39519,39522,39525,39524, +39529,39531,39530,39597,39600,39612,39616,39631,39633,39635,39636,39646,39647, +39650,39651,39654,39663,39659,39662,39668,39665,39671,39675,39686,39704,39706, +39711,39714,39715,39717,39719,39720,39721,39722,39726,39727,39730,39748,39747, +39759,39757,39758,39761,39768,39796,39827,39811,39825,39830,39831,39839,39840, +39848,39860,39872,39882,39865,39878,39887,39889,39890,39907,39906,39908,39892, +39905,39994,39922,39921,39920,39957,39956,39945,39955,39948,39942,39944,39954, +39946,39940,39982,39963,39973,39972,39969,39984,40007, 39986,40006,39998,40026,40032,40039,40054,40056,40167,40172,40176,40201,40200, 40171,40195,40198,40234,40230,40367,40227,40223,40260,40213,40210,40257,40255, 40254,40262,40264,40285,40286,40292,40273,40272,40281,40306,40329,40327,40363, @@ -547,4 +557,7 @@ 40621,38753,40652,40654,40655,40656,40660,40668,40670,40669,40672,40677,40680, 40687,40692,40694,40695,40697,40699,40700,40701,40711,40712,30391,40725,40737, 40748,40766,40778,40786,40788,40803,40799,40800,40801,40806,40807,40812,40810, -40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081, +40823,40818,40822,40853,40860,40864,22575,27079,36953,29796,20956,29081,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0, diff --git a/system/lib/libc/musl/src/locale/ksc.h b/system/lib/libc/musl/src/locale/ksc.h index 8f6eca4bde2f1..cf2ec68909f2b 100644 --- a/system/lib/libc/musl/src/locale/ksc.h +++ b/system/lib/libc/musl/src/locale/ksc.h @@ -14,351 +14,357 @@ 65300,65301,65302,65303,65304,65305,65306,65307,65308,65309,65310,65311,65312, 65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325, 65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338, -65339,65510,65341,65342,65343,65344,65345,65346,65347,65348,65349,65350,65351, -65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364, -65365,65366,65367,65368,65369,65370,65371,65372,65373,65507,12593,12594,12595, -12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608, -12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621, -12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634, -12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647, -12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660, -12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673, -12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686, -8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,0,0,0,0,0,8544,8545,8546, -8547,8548,8549,8550,8551,8552,8553,0,0,0,0,0,0,0,913,914,915,916,917,918,919, -920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,0,0,0,0,0, -0,0,0,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,963, -964,965,966,967,968,969,0,0,0,0,0,0,9472,9474,9484,9488,9496,9492,9500,9516, -9508,9524,9532,9473,9475,9487,9491,9499,9495,9507,9523,9515,9531,9547,9504, -9519,9512,9527,9535,9501,9520,9509,9528,9538,9490,9489,9498,9497,9494,9493, -9486,9485,9502,9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525, -9526,9529,9530,9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13205,13206,13207,8467, -13208,13252,13219,13220,13221,13222,13209,13210,13211,13212,13213,13214,13215, -13216,13217,13218,13258,13197,13198,13199,13263,13192,13193,13256,13223,13224, -13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13184,13185,13186, -13187,13188,13242,13243,13244,13245,13246,13247,13200,13201,13202,13203,13204, -8486,13248,13249,13194,13195,13196,13270,13253,13229,13230,13231,13275,13225, -13226,13227,13228,13277,13264,13267,13251,13257,13276,13254,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,198,208,170,294,0,306,0,319,321,216,338,186,222,358,330,0,12896, -12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909, -12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922, -12923,9424,9425,9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437, -9438,9439,9440,9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314, -9315,9316,9317,9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188, -190,8539,8540,8541,8542,230,273,240,295,305,307,312,320,322,248,339,223,254, -359,331,329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810, -12811,12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823, -12824,12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381, -9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396, -9397,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, -9346,185,178,179,8308,8319,8321,8322,8323,8324,12353,12354,12355,12356,12357, -12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370, -12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383, -12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396, -12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409, -12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422, -12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435, -0,0,0,0,0,0,0,0,0,0,0,12449,12450,12451,12452,12453,12454,12455,12456,12457, -12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470, -12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483, -12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496, -12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509, -12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522, -12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,0,0,0, -0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046,1047,1048,1049,1050,1051, -1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066, -1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1072,1073,1074,1075, -1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089, -1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,0,0,0,0, +65339,65510,65341,65342,65343,65344,65345,65346,65347, +65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360, +65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65371,65372,65373, +65507,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604, +12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617, +12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630, +12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643, +12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656, +12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669, +12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682, +12683,12684,12685,12686,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,0,0, +0,0,0,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,0,0,0,0,0,0,0,913,914, +915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934, +935,936,937,0,0,0,0,0,0,0,0,945,946,947,948,949,950,951,952,953,954,955,956, +957,958,959,960,961,963,964,965,966,967,968,969,0,0,0,0,0,0,9472,9474,9484, +9488,9496,9492,9500,9516,9508,9524,9532,9473,9475,9487,9491,9499,9495,9507, +9523,9515,9531,9547,9504,9519,9512,9527,9535,9501,9520,9509,9528,9538,9490, +9489,9498,9497,9494,9493,9486,9485,9502, +9503,9505,9506,9510,9511,9513,9514,9517,9518,9521,9522,9525,9526,9529,9530, +9533,9534,9536,9537,9539,9540,9541,9542,9543,9544,9545,9546,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13205,13206,13207,8467,13208,13252,13219, +13220,13221,13222,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218, +13258,13197,13198,13199,13263,13192,13193,13256,13223,13224,13232,13233,13234, +13235,13236,13237,13238,13239,13240,13241,13184,13185,13186,13187,13188,13242, +13243,13244,13245,13246,13247,13200,13201,13202,13203,13204,8486,13248,13249, +13194,13195,13196,13270,13253,13229,13230,13231,13275,13225,13226,13227,13228, +13277,13264,13267,13251,13257,13276,13254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,198, +208,170,294,0,306,0,319,321,216,338,186,222,358,330,0,12896,12897,12898,12899, +12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911,12912, +12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,9424,9425, +9426,9427,9428,9429,9430,9431,9432,9433,9434,9435,9436,9437,9438,9439,9440, +9441,9442,9443,9444,9445,9446,9447,9448,9449,9312,9313,9314,9315,9316,9317, +9318,9319,9320,9321,9322,9323,9324,9325,9326,189,8531,8532,188,190,8539,8540, +8541,8542,230,273,240,295,305,307,312,320,322,248,339,223,254,359,331, +329,12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811, +12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,12824, +12825,12826,12827,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,9383, +9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,9332, +9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,185,178, +179,8308,8319,8321,8322,8323,8324,12353,12354,12355,12356,12357,12358,12359, +12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372, +12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385, +12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398, +12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411, +12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424, +12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,0,0,0,0,0,0, +0,0,0,0,0,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459, +12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472, +12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485, +12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498, +12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511, +12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524, +12525,12526,12527,12528,12529,12530,12531, +12532,12533,12534,0,0,0,0,0,0,0,0,1040,1041,1042,1043,1044,1045,1025,1046, +1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061, +1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,1072,1073,1074,1075,1076,1077,1105,1078,1079,1080,1081,1082,1083,1084,1085, +1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100, +1101,1102,1103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,44032,44033,44036,44039,44040,44041,44042,44048, +44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061,44064, +44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109,44116, +44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164,44165, +44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193,44200, +44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228,44232, +44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272,44273, +44275,44277,44278,44284,44285,44288,44292,44294,44300,44301,44303,44305,44312, +44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359,44361, +44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406,44411, +44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452,44471, +44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537,44540, +44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599,44600, +44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628,44630, +44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,44665,44667, +44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749,44751, +44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807,44808, +44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866,44867, +44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944,44945, +44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006,45012, +45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072,45076, +45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141,45143, +45145,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209,45210, +45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231,45233, +45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265,45268, +45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337,45339, +45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369,45376, +45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433,45436, +45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480,45516, +45520,45524,45532,45533,45535,45544,45545,45548,45552, +45561,45563,45565,45572,45573,45576,45579,45580,45588,45589,45591,45593,45600, +45620,45628,45656,45660,45664,45672,45673,45684,45685,45692,45700,45701,45705, +45712,45713,45716,45720,45721,45722,45728,45729,45731,45733,45734,45738,45740, +45744,45748,45768,45769,45772,45776,45778,45784,45785,45787,45789,45794,45796, +45797,45798,45800,45803,45804,45805,45806,45807,45811,45812,45813,45815,45816, +45817,45818,45819,45823,45824,45825,45828,45832,45840,45841,45843,45844,45845, +45852,45908,45909,45910,45912,45915,45916,45918,45919,45924,45925,45927,45929, +45931,45934,45936,45937,45940,45944,45952,45953,45955,45956,45957,45964,45968, +45972,45984,45985,45992,45996,46020,46021,46024,46027,46028,46030,46032,46036, +46037,46039,46041,46043,46045,46048,46052,46056,46076,46096,46104,46108,46112, +46120,46121,46123,46132,46160,46161,46164,46168,46176,46177,46179,46181,46188, +46208,46216,46237,46244,46248,46252,46261,46263,46265,46272,46276,46280,46288, +46293,46300,46301,46304,46307,46308,46310,46316,46317,46319,46321,46328,46356, +46357,46360,46363,46364,46372,46373,46375,46376,46377,46378,46384,46385,46388, +46392,46400,46401,46403,46404,46405,46411,46412,46413,46416,46420,46428,46429, +46431,46432,46433,46496,46497,46500,46504,46506,46507,46512,46513,46515,46516, +46517,46523,46524,46525,46528,46532,46540,46541,46543,46544,46545,46552,46572, +46608,46609,46612,46616,46629,46636,46644,46664,46692,46696,46748,46749,46752, +46756,46763,46764,46769,46804,46832,46836,46840,46848,46849,46853,46888,46889, +46892,46895,46896,46904,46905,46907,46916,46920,46924, +46932,46933,46944,46948,46952,46960,46961,46963,46965,46972,46973,46976,46980, +46988,46989,46991,46992,46993,46994,46998,46999,47000,47001,47004,47008,47016, +47017,47019,47020,47021,47028,47029,47032,47047,47049,47084,47085,47088,47092, +47100,47101,47103,47104,47105,47111,47112,47113,47116,47120,47128,47129,47131, +47133,47140,47141,47144,47148,47156,47157,47159,47160,47161,47168,47172,47185, +47187,47196,47197,47200,47204,47212,47213,47215,47217,47224,47228,47245,47272, +47280,47284,47288,47296,47297,47299,47301,47308,47312,47316,47325,47327,47329, +47336,47337,47340,47344,47352,47353,47355,47357,47364,47384,47392,47420,47421, +47424,47428,47436,47439,47441,47448,47449,47452,47456,47464,47465,47467,47469, +47476,47477,47480,47484,47492,47493,47495,47497,47498,47501,47502,47532,47533, +47536,47540,47548,47549,47551,47553,47560,47561,47564,47566,47567,47568,47569, +47570,47576,47577,47579,47581,47582,47585,47587,47588,47589,47592,47596,47604, +47605,47607,47608,47609,47610,47616,47617,47624,47637,47672,47673,47676,47680, +47682,47688,47689,47691,47693,47694,47699,47700,47701,47704,47708,47716,47717, +47719,47720,47721,47728,47729,47732,47736,47747,47748,47749,47751,47756,47784, +47785,47787,47788,47792,47794,47800,47801,47803,47805,47812,47816,47832,47833, +47868,47872,47876,47885,47887,47889,47896,47900,47904,47913,47915,47924,47925, +47926,47928,47931,47932,47933,47934,47940,47941,47943,47945,47949,47951,47952, +47956,47960,47969,47971,47980,48008,48012,48016,48036,48040,48044,48052,48055, +48064,48068,48072,48080,48083,48120,48121,48124,48127, +48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149,48150,48151, +48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173,48176,48177, +48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208,48221,48260, +48261,48264,48267,48268,48270,48276,48277,48279,48281,48282,48288,48289,48292, +48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324,48333,48335, +48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388,48389,48391, +48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472,48473,48484, +48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531,48533,48537, +48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624,48628,48632, +48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708,48709,48712, +48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740,48744,48746, +48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780,48781,48783, +48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864,48867,48868, +48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960,48961,48964, +48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108,49116,49119, +49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300,49304,49312, +49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334,49340,49341, +49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371,49372,49373, +49380,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416,49424,49429, +49436,49437,49438,49439,49440,49443,49444,49446,49447, +49452,49453,49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483, +49484,49485,49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524, +49528,49541,49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573, +49576,49577,49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636, +49640,49648,49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688, +49689,49692,49695,49696,49704,49705,49707,49709,49711,49713,49714,49716,49736, +49744,49745,49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791, +49793,49800,49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844, +49845,49847,49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905, +49910,49912,49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941, +49944,49948,49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040, +50041,50044,50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146, +50152,50153,50157,50164,50165,50168,50184,50192,50212,50220,50224,50228,50236, +50237,50248,50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360, +50364,50409,50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452, +50460,50472,50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505, +50506,50508,50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528, +50529,50532,50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567, +50572,50573,50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616, +50617,50619,50620,50621,50622,50628,50629,50630,50631, +50632,50633,50634,50636,50638,50640,50641,50644,50648,50656,50657,50659,50661, +50668,50669,50670,50672,50676,50678,50679,50684,50685,50686,50687,50688,50689, +50693,50694,50695,50696,50700,50704,50712,50713,50715,50716,50724,50725,50728, +50732,50733,50734,50736,50739,50740,50741,50743,50745,50747,50752,50753,50756, +50760,50768,50769,50771,50772,50773,50780,50781,50784,50796,50799,50801,50808, +50809,50812,50816,50824,50825,50827,50829,50836,50837,50840,50844,50852,50853, +50855,50857,50864,50865,50868,50872,50873,50874,50880,50881,50883,50885,50892, +50893,50896,50900,50908,50909,50912,50913,50920,50921,50924,50928,50936,50937, +50941,50948,50949,50952,50956,50964,50965,50967,50969,50976,50977,50980,50984, +50992,50993,50995,50997,50999,51004,51005,51008,51012,51018,51020,51021,51023, +51025,51026,51027,51028,51029,51030,51031,51032,51036,51040,51048,51051,51060, +51061,51064,51068,51069,51070,51075,51076,51077,51079,51080,51081,51082,51086, +51088,51089,51092,51094,51095,51096,51098,51104,51105,51107,51108,51109,51110, +51116,51117,51120,51124,51132,51133,51135,51136,51137,51144,51145,51148,51150, +51152,51160,51165,51172,51176,51180,51200,51201,51204,51208,51210,51216,51217, +51219,51221,51222,51228,51229,51232,51236,51244,51245,51247,51249,51256,51260, +51264,51272,51273,51276,51277,51284,51312,51313,51316,51320,51322,51328,51329, +51331,51333,51334,51335,51339,51340,51341,51348,51357,51359,51361,51368,51388, +51389,51396,51400,51404,51412,51413,51415,51417,51424,51425,51428,51445,51452, +51453,51456,51460,51461,51462,51468,51469,51471,51473, +51480,51500,51508,51536,51537,51540,51544,51552,51553,51555,51564,51568,51572, +51580,51592,51593,51596,51600,51608,51609,51611,51613,51648,51649,51652,51655, +51656,51658,51664,51665,51667,51669,51670,51673,51674,51676,51677,51680,51682, +51684,51687,51692,51693,51695,51696,51697,51704,51705,51708,51712,51720,51721, +51723,51724,51725,51732,51736,51753,51788,51789,51792,51796,51804,51805,51807, +51808,51809,51816,51837,51844,51864,51900,51901,51904,51908,51916,51917,51919, +51921,51923,51928,51929,51936,51948,51956,51976,51984,51988,51992,52000,52001, +52033,52040,52041,52044,52048,52056,52057,52061,52068,52088,52089,52124,52152, +52180,52196,52199,52201,52236,52237,52240,52244,52252,52253,52257,52258,52263, +52264,52265,52268,52270,52272,52280,52281,52283,52284,52285,52286,52292,52293, +52296,52300,52308,52309,52311,52312,52313,52320,52324,52326,52328,52336,52341, +52376,52377,52380,52384,52392,52393,52395,52396,52397,52404,52405,52408,52412, +52420,52421,52423,52425,52432,52436,52452,52460,52464,52481,52488,52489,52492, +52496,52504,52505,52507,52509,52516,52520,52524,52537,52572,52576,52580,52588, +52589,52591,52593,52600,52616,52628,52629,52632,52636,52644,52645,52647,52649, +52656,52676,52684,52688,52712,52716,52720,52728,52729,52731,52733,52740,52744, +52748,52756,52761,52768,52769,52772,52776,52784,52785,52787,52789,52824,52825, +52828,52831,52832,52833,52840,52841,52843,52845,52852,52853,52856,52860,52868, +52869,52871,52873,52880,52881,52884,52888,52896,52897,52899,52900,52901,52908, +52909,52929,52964,52965,52968,52971,52972,52980,52981, +52983,52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024, +53028,53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093, +53095,53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188, +53216,53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272, +53293,53300,53301,53304,53308,53316,53317,53319,53321,53328,53332,53336,53344, +53356,53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429, +53431,53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468, +53469,53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556, +53560,53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597, +53599,53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681, +53683,53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805, +53808,53812,53820,53821,53823,53825,53832,53852,53860,53888,53889,53892,53896, +53904,53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952, +53954,53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008, +54016,54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047, +54048,54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084, +54085,54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172, +54176,54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224, +54232,54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,54280,54301, +54336,54340,54364,54368,54372,54381,54383,54392,54393, +54396,54399,54400,54402,54408,54409,54411,54413,54420,54441,54476,54480,54484, +54492,54495,54504,54508,54512,54520,54523,54525,54532,54536,54540,54548,54549, +54551,54588,54589,54592,54596,54604,54605,54607,54609,54616,54617,54620,54624, +54629,54632,54633,54635,54637,54644,54645,54648,54652,54660,54661,54663,54664, +54665,54672,54693,54728,54729,54732,54736,54738,54744,54745,54747,54749,54756, +54757,54760,54764,54772,54773,54775,54777,54784,54785,54788,54792,54800,54801, +54803,54804,54805,54812,54816,54820,54829,54840,54841,54844,54848,54853,54856, +54857,54859,54861,54865,54868,54869,54872,54876,54887,54889,54896,54897,54900, +54915,54917,54924,54925,54928,54932,54941,54943,54945,54952,54956,54960,54969, +54971,54980,54981,54984,54988,54993,54996,54999,55001,55008,55012,55016,55024, +55029,55036,55037,55040,55044,55057,55064,55065,55068,55072,55080,55081,55083, +55085,55092,55093,55096,55100,55108,55111,55113,55120,55121,55124,55126,55127, +55128,55129,55136,55137,55139,55141,55145,55148,55152,55156,55164,55165,55169, +55176,55177,55180,55184,55192,55193,55195,55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44032,44033,44036,44039,44040,44041,44042, -44048,44049,44050,44051,44052,44053,44054,44055,44057,44058,44059,44060,44061, -44064,44068,44076,44077,44079,44080,44081,44088,44089,44092,44096,44107,44109, -44116,44120,44124,44144,44145,44148,44151,44152,44154,44160,44161,44163,44164, -44165,44166,44169,44170,44171,44172,44176,44180,44188,44189,44191,44192,44193, -44200,44201,44202,44204,44207,44208,44216,44217,44219,44220,44221,44225,44228, -44232,44236,44245,44247,44256,44257,44260,44263,44264,44266,44268,44271,44272, -44273,44275,44277,44278,44284,44285,44288,44292,44294,44300,44301,44303,44305, -44312,44316,44320,44329,44332,44333,44340,44341,44344,44348,44356,44357,44359, -44361,44368,44372,44376,44385,44387,44396,44397,44400,44403,44404,44405,44406, -44411,44412,44413,44415,44417,44418,44424,44425,44428,44432,44444,44445,44452, -44471,44480,44481,44484,44488,44496,44497,44499,44508,44512,44516,44536,44537, -44540,44543,44544,44545,44552,44553,44555,44557,44564,44592,44593,44596,44599, -44600,44602,44608,44609,44611,44613,44614,44618,44620,44621,44622,44624,44628, -44630,44636,44637,44639,44640,44641,44645,44648,44649,44652,44656,44664,44665, -44667,44668,44669,44676,44677,44684,44732,44733,44734,44736,44740,44748,44749, -44751,44752,44753,44760,44761,44764,44776,44779,44781,44788,44792,44796,44807, -44808,44813,44816,44844,44845,44848,44850,44852,44860,44861,44863,44865,44866, -44867,44872,44873,44880,44892,44893,44900,44901,44921,44928,44932,44936,44944, -44945,44949,44956,44984,44985,44988,44992,44999,45000,45001,45003,45005,45006, -45012,45020,45032,45033,45040,45041,45044,45048,45056,45057,45060,45068,45072, -45076,45084,45085,45096,45124,45125,45128,45130,45132,45134,45139,45140,45141, -45143,45145,45149,45180,45181,45184,45188,45196,45197,45199,45201,45208,45209, -45210,45212,45215,45216,45217,45218,45224,45225,45227,45228,45229,45230,45231, -45233,45235,45236,45237,45240,45244,45252,45253,45255,45256,45257,45264,45265, -45268,45272,45280,45285,45320,45321,45323,45324,45328,45330,45331,45336,45337, -45339,45340,45341,45347,45348,45349,45352,45356,45364,45365,45367,45368,45369, -45376,45377,45380,45384,45392,45393,45396,45397,45400,45404,45408,45432,45433, -45436,45440,45442,45448,45449,45451,45453,45458,45459,45460,45464,45468,45480, -45516,45520,45524,45532,45533,45535,45544,45545,45548,45552,45561,45563,45565, -45572,45573,45576,45579,45580,45588,45589,45591,45593,45600,45620,45628,45656, -45660,45664,45672,45673,45684,45685,45692,45700,45701,45705,45712,45713,45716, -45720,45721,45722,45728,45729,45731,45733,45734,45738,45740,45744,45748,45768, -45769,45772,45776,45778,45784,45785,45787,45789,45794,45796,45797,45798,45800, -45803,45804,45805,45806,45807,45811,45812,45813,45815,45816,45817,45818,45819, -45823,45824,45825,45828,45832,45840,45841,45843,45844,45845,45852,45908,45909, -45910,45912,45915,45916,45918,45919,45924,45925,45927,45929,45931,45934,45936, -45937,45940,45944,45952,45953,45955,45956,45957,45964,45968,45972,45984,45985, -45992,45996,46020,46021,46024,46027,46028,46030,46032,46036,46037,46039,46041, -46043,46045,46048,46052,46056,46076,46096,46104,46108,46112,46120,46121,46123, -46132,46160,46161,46164,46168,46176,46177,46179,46181,46188,46208,46216,46237, -46244,46248,46252,46261,46263,46265,46272,46276,46280,46288,46293,46300,46301, -46304,46307,46308,46310,46316,46317,46319,46321,46328,46356,46357,46360,46363, -46364,46372,46373,46375,46376,46377,46378,46384,46385,46388,46392,46400,46401, -46403,46404,46405,46411,46412,46413,46416,46420,46428,46429,46431,46432,46433, -46496,46497,46500,46504,46506,46507,46512,46513,46515,46516,46517,46523,46524, -46525,46528,46532,46540,46541,46543,46544,46545,46552,46572,46608,46609,46612, -46616,46629,46636,46644,46664,46692,46696,46748,46749,46752,46756,46763,46764, -46769,46804,46832,46836,46840,46848,46849,46853,46888,46889,46892,46895,46896, -46904,46905,46907,46916,46920,46924,46932,46933,46944,46948,46952,46960,46961, -46963,46965,46972,46973,46976,46980,46988,46989,46991,46992,46993,46994,46998, -46999,47000,47001,47004,47008,47016,47017,47019,47020,47021,47028,47029,47032, -47047,47049,47084,47085,47088,47092,47100,47101,47103,47104,47105,47111,47112, -47113,47116,47120,47128,47129,47131,47133,47140,47141,47144,47148,47156,47157, -47159,47160,47161,47168,47172,47185,47187,47196,47197,47200,47204,47212,47213, -47215,47217,47224,47228,47245,47272,47280,47284,47288,47296,47297,47299,47301, -47308,47312,47316,47325,47327,47329,47336,47337,47340,47344,47352,47353,47355, -47357,47364,47384,47392,47420,47421,47424,47428,47436,47439,47441,47448,47449, -47452,47456,47464,47465,47467,47469,47476,47477,47480,47484,47492,47493,47495, -47497,47498,47501,47502,47532,47533,47536,47540,47548,47549,47551,47553,47560, -47561,47564,47566,47567,47568,47569,47570,47576,47577,47579,47581,47582,47585, -47587,47588,47589,47592,47596,47604,47605,47607,47608,47609,47610,47616,47617, -47624,47637,47672,47673,47676,47680,47682,47688,47689,47691,47693,47694,47699, -47700,47701,47704,47708,47716,47717,47719,47720,47721,47728,47729,47732,47736, -47747,47748,47749,47751,47756,47784,47785,47787,47788,47792,47794,47800,47801, -47803,47805,47812,47816,47832,47833,47868,47872,47876,47885,47887,47889,47896, -47900,47904,47913,47915,47924,47925,47926,47928,47931,47932,47933,47934,47940, -47941,47943,47945,47949,47951,47952,47956,47960,47969,47971,47980,48008,48012, -48016,48036,48040,48044,48052,48055,48064,48068,48072,48080,48083,48120,48121, -48124,48127,48128,48130,48136,48137,48139,48140,48141,48143,48145,48148,48149, -48150,48151,48152,48155,48156,48157,48158,48159,48164,48165,48167,48169,48173, -48176,48177,48180,48184,48192,48193,48195,48196,48197,48201,48204,48205,48208, -48221,48260,48261,48264,48267,48268,48270,48276,48277,48279,48281,48282,48288, -48289,48292,48295,48296,48304,48305,48307,48308,48309,48316,48317,48320,48324, -48333,48335,48336,48337,48341,48344,48348,48372,48373,48374,48376,48380,48388, -48389,48391,48393,48400,48404,48420,48428,48448,48456,48457,48460,48464,48472, -48473,48484,48488,48512,48513,48516,48519,48520,48521,48522,48528,48529,48531, -48533,48537,48538,48540,48548,48560,48568,48596,48597,48600,48604,48617,48624, -48628,48632,48640,48643,48645,48652,48653,48656,48660,48668,48669,48671,48708, -48709,48712,48716,48718,48724,48725,48727,48729,48730,48731,48736,48737,48740, -48744,48746,48752,48753,48755,48756,48757,48763,48764,48765,48768,48772,48780, -48781,48783,48784,48785,48792,48793,48808,48848,48849,48852,48855,48856,48864, -48867,48868,48869,48876,48897,48904,48905,48920,48921,48923,48924,48925,48960, -48961,48964,48968,48976,48977,48981,49044,49072,49093,49100,49101,49104,49108, -49116,49119,49121,49212,49233,49240,49244,49248,49256,49257,49296,49297,49300, -49304,49312,49313,49315,49317,49324,49325,49327,49328,49331,49332,49333,49334, -49340,49341,49343,49344,49345,49349,49352,49353,49356,49360,49368,49369,49371, -49372,49373,49380,49381,49384,49388,49396,49397,49399,49401,49408,49412,49416, -49424,49429,49436,49437,49438,49439,49440,49443,49444,49446,49447,49452,49453, -49455,49456,49457,49462,49464,49465,49468,49472,49480,49481,49483,49484,49485, -49492,49493,49496,49500,49508,49509,49511,49512,49513,49520,49524,49528,49541, -49548,49549,49550,49552,49556,49558,49564,49565,49567,49569,49573,49576,49577, -49580,49584,49597,49604,49608,49612,49620,49623,49624,49632,49636,49640,49648, -49649,49651,49660,49661,49664,49668,49676,49677,49679,49681,49688,49689,49692, -49695,49696,49704,49705,49707,49709,49711,49713,49714,49716,49736,49744,49745, -49748,49752,49760,49765,49772,49773,49776,49780,49788,49789,49791,49793,49800, -49801,49808,49816,49819,49821,49828,49829,49832,49836,49837,49844,49845,49847, -49849,49884,49885,49888,49891,49892,49899,49900,49901,49903,49905,49910,49912, -49913,49915,49916,49920,49928,49929,49932,49933,49939,49940,49941,49944,49948, -49956,49957,49960,49961,49989,50024,50025,50028,50032,50034,50040,50041,50044, -50045,50052,50056,50060,50112,50136,50137,50140,50143,50144,50146,50152,50153, -50157,50164,50165,50168,50184,50192,50212,50220,50224,50228,50236,50237,50248, -50276,50277,50280,50284,50292,50293,50297,50304,50324,50332,50360,50364,50409, -50416,50417,50420,50424,50426,50431,50432,50433,50444,50448,50452,50460,50472, -50473,50476,50480,50488,50489,50491,50493,50500,50501,50504,50505,50506,50508, -50509,50510,50515,50516,50517,50519,50520,50521,50525,50526,50528,50529,50532, -50536,50544,50545,50547,50548,50549,50556,50557,50560,50564,50567,50572,50573, -50575,50577,50581,50583,50584,50588,50592,50601,50612,50613,50616,50617,50619, -50620,50621,50622,50628,50629,50630,50631,50632,50633,50634,50636,50638,50640, -50641,50644,50648,50656,50657,50659,50661,50668,50669,50670,50672,50676,50678, -50679,50684,50685,50686,50687,50688,50689,50693,50694,50695,50696,50700,50704, -50712,50713,50715,50716,50724,50725,50728,50732,50733,50734,50736,50739,50740, -50741,50743,50745,50747,50752,50753,50756,50760,50768,50769,50771,50772,50773, -50780,50781,50784,50796,50799,50801,50808,50809,50812,50816,50824,50825,50827, -50829,50836,50837,50840,50844,50852,50853,50855,50857,50864,50865,50868,50872, -50873,50874,50880,50881,50883,50885,50892,50893,50896,50900,50908,50909,50912, -50913,50920,50921,50924,50928,50936,50937,50941,50948,50949,50952,50956,50964, -50965,50967,50969,50976,50977,50980,50984,50992,50993,50995,50997,50999,51004, -51005,51008,51012,51018,51020,51021,51023,51025,51026,51027,51028,51029,51030, -51031,51032,51036,51040,51048,51051,51060,51061,51064,51068,51069,51070,51075, -51076,51077,51079,51080,51081,51082,51086,51088,51089,51092,51094,51095,51096, -51098,51104,51105,51107,51108,51109,51110,51116,51117,51120,51124,51132,51133, -51135,51136,51137,51144,51145,51148,51150,51152,51160,51165,51172,51176,51180, -51200,51201,51204,51208,51210,51216,51217,51219,51221,51222,51228,51229,51232, -51236,51244,51245,51247,51249,51256,51260,51264,51272,51273,51276,51277,51284, -51312,51313,51316,51320,51322,51328,51329,51331,51333,51334,51335,51339,51340, -51341,51348,51357,51359,51361,51368,51388,51389,51396,51400,51404,51412,51413, -51415,51417,51424,51425,51428,51445,51452,51453,51456,51460,51461,51462,51468, -51469,51471,51473,51480,51500,51508,51536,51537,51540,51544,51552,51553,51555, -51564,51568,51572,51580,51592,51593,51596,51600,51608,51609,51611,51613,51648, -51649,51652,51655,51656,51658,51664,51665,51667,51669,51670,51673,51674,51676, -51677,51680,51682,51684,51687,51692,51693,51695,51696,51697,51704,51705,51708, -51712,51720,51721,51723,51724,51725,51732,51736,51753,51788,51789,51792,51796, -51804,51805,51807,51808,51809,51816,51837,51844,51864,51900,51901,51904,51908, -51916,51917,51919,51921,51923,51928,51929,51936,51948,51956,51976,51984,51988, -51992,52000,52001,52033,52040,52041,52044,52048,52056,52057,52061,52068,52088, -52089,52124,52152,52180,52196,52199,52201,52236,52237,52240,52244,52252,52253, -52257,52258,52263,52264,52265,52268,52270,52272,52280,52281,52283,52284,52285, -52286,52292,52293,52296,52300,52308,52309,52311,52312,52313,52320,52324,52326, -52328,52336,52341,52376,52377,52380,52384,52392,52393,52395,52396,52397,52404, -52405,52408,52412,52420,52421,52423,52425,52432,52436,52452,52460,52464,52481, -52488,52489,52492,52496,52504,52505,52507,52509,52516,52520,52524,52537,52572, -52576,52580,52588,52589,52591,52593,52600,52616,52628,52629,52632,52636,52644, -52645,52647,52649,52656,52676,52684,52688,52712,52716,52720,52728,52729,52731, -52733,52740,52744,52748,52756,52761,52768,52769,52772,52776,52784,52785,52787, -52789,52824,52825,52828,52831,52832,52833,52840,52841,52843,52845,52852,52853, -52856,52860,52868,52869,52871,52873,52880,52881,52884,52888,52896,52897,52899, -52900,52901,52908,52909,52929,52964,52965,52968,52971,52972,52980,52981,52983, -52984,52985,52992,52993,52996,53000,53008,53009,53011,53013,53020,53024,53028, -53036,53037,53039,53040,53041,53048,53076,53077,53080,53084,53092,53093,53095, -53097,53104,53105,53108,53112,53120,53125,53132,53153,53160,53168,53188,53216, -53217,53220,53224,53232,53233,53235,53237,53244,53248,53252,53265,53272,53293, -53300,53301,53304,53308,53316,53317,53319,53321,53328,53332,53336,53344,53356, -53357,53360,53364,53372,53373,53377,53412,53413,53416,53420,53428,53429,53431, -53433,53440,53441,53444,53448,53449,53456,53457,53459,53460,53461,53468,53469, -53472,53476,53484,53485,53487,53488,53489,53496,53517,53552,53553,53556,53560, -53562,53568,53569,53571,53572,53573,53580,53581,53584,53588,53596,53597,53599, -53601,53608,53612,53628,53636,53640,53664,53665,53668,53672,53680,53681,53683, -53685,53690,53692,53696,53720,53748,53752,53767,53769,53776,53804,53805,53808, -53812,53820,53821,53823,53825,53832,53852,53860,53888,53889,53892,53896,53904, -53905,53909,53916,53920,53924,53932,53937,53944,53945,53948,53951,53952,53954, -53960,53961,53963,53972,53976,53980,53988,53989,54000,54001,54004,54008,54016, -54017,54019,54021,54028,54029,54030,54032,54036,54038,54044,54045,54047,54048, -54049,54053,54056,54057,54060,54064,54072,54073,54075,54076,54077,54084,54085, -54140,54141,54144,54148,54156,54157,54159,54160,54161,54168,54169,54172,54176, -54184,54185,54187,54189,54196,54200,54204,54212,54213,54216,54217,54224,54232, -54241,54243,54252,54253,54256,54260,54268,54269,54271,54273,54280,54301,54336, -54340,54364,54368,54372,54381,54383,54392,54393,54396,54399,54400,54402,54408, -54409,54411,54413,54420,54441,54476,54480,54484,54492,54495,54504,54508,54512, -54520,54523,54525,54532,54536,54540,54548,54549,54551,54588,54589,54592,54596, -54604,54605,54607,54609,54616,54617,54620,54624,54629,54632,54633,54635,54637, -54644,54645,54648,54652,54660,54661,54663,54664,54665,54672,54693,54728,54729, -54732,54736,54738,54744,54745,54747,54749,54756,54757,54760,54764,54772,54773, -54775,54777,54784,54785,54788,54792,54800,54801,54803,54804,54805,54812,54816, -54820,54829,54840,54841,54844,54848,54853,54856,54857,54859,54861,54865,54868, -54869,54872,54876,54887,54889,54896,54897,54900,54915,54917,54924,54925,54928, -54932,54941,54943,54945,54952,54956,54960,54969,54971,54980,54981,54984,54988, -54993,54996,54999,55001,55008,55012,55016,55024,55029,55036,55037,55040,55044, -55057,55064,55065,55068,55072,55080,55081,55083,55085,55092,55093,55096,55100, -55108,55111,55113,55120,55121,55124,55126,55127,55128,55129,55136,55137,55139, -55141,55145,55148,55152,55156,55164,55165,55169,55176,55177,55180,55184,55192, -55193,55195,55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20285,20339,20551,20729, -21152,21487,21621,21733,22025,23233,23478,26247,26550,26551,26607,27468,29634, -30146,31292,33499,33540,34903,34952,35382,36040,36303,36603,36838,39381,21051, -21364,21508,24682,24932,27580,29647,33050,35258,35282,38307,20355,21002,22718, -22904,23014,24178,24185,25031,25536,26438,26604,26751,28567,30286,30475,30965, -31240,31487,31777,32925,33390,33393,35563,38291,20075,21917,26359,28212,30883, -31469,33883,35088,34638,38824,21208,22350,22570,23884,24863,25022,25121,25954, -26577,27204,28187,29976,30131,30435,30640,32058,37039,37969,37970,40853,21283, -23724,30002,32987,37440,38296,21083,22536,23004,23713,23831,24247,24378,24394, -24951,27743,30074,30086,31968,32115,32177,32652,33108,33313,34193,35137,35611, -37628,38477,40007,20171,20215,20491,20977,22607,24887,24894,24936,25913,27114, -28433,30117,30342,30422,31623,33445,33995,63744,37799,38283,21888,23458,22353, -63745,31923,32697,37301,20520,21435,23621,24040,25298,25454,25818,25831,28192, -28844,31067,36317,36382,63746,36989,37445,37624,20094,20214,20581,24062,24314, -24838,26967,33137,34388,36423,37749,39467,20062,20625,26480,26688,20745,21133, -21138,27298,30652,37392,40660,21163,24623,36850,20552,25001,25581,25802,26684, -27268,28608,33160,35233,38548,22533,29309,29356,29956,32121,32365,32937,35211, -35700,36963,40273,25225,27770,28500,32080,32570,35363,20860,24906,31645,35609, -37463,37772,20140,20435,20510,20670,20742,21185,21197,21375,22384,22659,24218, -24465,24950,25004,25806,25964,26223,26299,26356,26775,28039,28805,28913,29855, -29861,29898,30169,30828,30956,31455,31478,32069,32147,32789,32831,33051,33686, -35686,36629,36885,37857,38915,38968,39514,39912,20418,21843,22586,22865,23395, -23622,24760,25106,26690,26800,26856,28330,30028,30328,30926,31293,31995,32363, -32380,35336,35489,35903,38542,40388,21476,21481,21578,21617,22266,22993,23396, -23611,24235,25335,25911,25925,25970,26272,26543,27073,27837,30204,30352,30590, -31295,32660,32771,32929,33167,33510,33533,33776,34241,34865,34996,35493,63747, -36764,37678,38599,39015,39640,40723,21741,26011,26354,26767,31296,35895,40288, -22256,22372,23825,26118,26801,26829,28414,29736,34974,39908,27752,63748,39592, -20379,20844,20849,21151,23380,24037,24656,24685,25329,25511,25915,29657,31354, -34467,36002,38799,20018,23521,25096,26524,29916,31185,33747,35463,35506,36328, -36942,37707,38982,24275,27112,34303,37101,63749,20896,23448,23532,24931,26874, -27454,28748,29743,29912,31649,32592,33733,35264,36011,38364,39208,21038,24669, -25324,36866,20362,20809,21281,22745,24291,26336,27960,28826,29378,29654,31568, -33009,37979,21350,25499,32619,20054,20608,22602,22750,24618,24871,25296,27088, -39745,23439,32024,32945,36703,20132,20689,21676,21932,23308,23968,24039,25898, -25934,26657,27211,29409,30350,30703,32094,32761,33184,34126,34527,36611,36686, -37066,39171,39509,39851,19992,20037,20061,20167,20465,20855,21246,21312,21475, -21477,21646,22036,22389,22434,23495,23943,24272,25084,25304,25937,26552,26601, -27083,27472,27590,27628,27714,28317,28792,29399,29590,29699,30655,30697,31350, -32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041,37476, -37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628,21531, -31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353,31406, -33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519,21413, -29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231,27512, -36020,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429,31998, -33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752,27224, -20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020,26681, -27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935,25810, -26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235,21450, -24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854,20864, -21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049,24190, -24524,25216,26071,26083,26398,26399,26462,26827,26820,27231,27450,27683,27773, -27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041,31047, -31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912,36215, -37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326,26708, -37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759,63760, -63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770,63771, -63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777,26511, -26976,28275,63778,30007,63779,63780,63781,32013,63782,63783,34930,22218,23064, -63784,63785,63786,63787,63788,20035,63789,20839,22856,26608,32784,63790,22899, -24180,25754,31178,24565,24684,25288,25467,23527,23511,21162,63791,22900,24361, -24594,63792,63793,63794,29785,63795,63796,63797,63798,63799,63800,39377,63801, -63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,28611,63812,63813, -33215,36786,24817,63814,63815,33126,63816,63817,23615,63818,63819,63820,63821, -63822,63823,63824,63825,23273,35365,26491,32016,63826,63827,63828,63829,63830, -63831,33021,63832,63833,23612,27877,21311,28346,22810,33590,20025,20150,20294, -21934,22296,22727,24406,26039,26086,27264,27573,28237,30701,31471,31774,32222, -34507,34962,37170,37723,25787,28606,29562,30136,36948,21846,22349,25018,25812, -26311,28129,28251,28525,28601,30192,32835,33213,34113,35203,35527,35674,37663, -27795,30035,31572,36367,36957,21776,22530,22616,24162,25095,25758,26848,30070, -31958,34739,40680,20195,22408,22382,22823,23565,23729,24118,24453,25140,25825, -29619,33274,34955,36024,38538,40667,23429,24503,24755,20498,20992,21040,22294, -22581,22615,23566,23648,23798,23947,24230,24466,24764,25361,25481,25623,26691, -26873,27330,28120,28193,28372,28644,29182,30428,30585,31153,31291,33796,35241, -36077,36339,36424,36867,36884,36947,37117,37709,38518,38876,27602,28678,29272, -29346,29544,30563,31167,31716,32411,35712,22697,24775,25958,26109,26302,27788, -28958,29129,35930,38931,20077,31361,20189,20908,20941,21205,21516,24999,26481, -26704,26847,27934,28540,30140,30643,31461,33012,33891,37509,20828,26007,26460, -26515,30168,31431,33651,63834,35910,36887,38957,23663,33216,33434,36929,36975, -37389,24471,23965,27225,29128,30331,31561,34276,35588,37159,39472,21895,25078, -63835,30313,32645,34367,34746,35064,37007,63836,27931,28889,29662,32097,33853, -63837,37226,39409,63838,20098,21365,27396,27410,28734,29211,34349,40478,21068, -36771,23888,25829,25900,27414,28651,31811,32412,34253,35172,35261,25289,33240, -34847,24266,26391,28010,29436,29701,29807,34690,37086,20358,23821,24480,33802, -20919,25504,30053,20142,20486,20841,20937,26753,27153,31918,31921,31975,33391, -35538,36635,37327,20406,20791,21237,21570,24300,24942,25150,26053,27354,28670, -31018,34268,34851,38317,39522,39530,40599,40654,21147,26310,27511,28701,31019, -36706,38722,24976,25088,25891,28451,29001,29833,32244,32879,34030,36646,36899, -37706,20925,21015,21155,27916,28872,35010,24265,25986,27566,28610,31806,29557, -20196,20278,22265,63839,23738,23994,24604,29618,31533,32666,32718,32838,36894, -37428,38646,38728,38936,40801,20363,28583,31150,37300,38583,21214,63840,25736, -25796,27347,28510,28696,29200,30439,32769,34310,34396,36335,36613,38706,39791, -40442,40565,30860,31103,32160,33737,37636,40575,40595,35542,22751,24324,26407, -28711,29903,31840,32894,20769,28712,29282,30922,36034,36058,36084,38647,20102, -20698,23534,24278,26009,29134,30274,30637,32842,34044,36988,39719,40845,22744, -23105,23650,27155,28122,28431,30267,32047,32311,34078,35128,37860,38475,21129, -26066,26611,27060,27969,28316,28687,29705,29792,30041,30244,30827,35628,39006, -20845,25134,38520,20374,20523,23833,28138,32184,36650,24459,24900,26647,63841, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20285,20339,20551,20729,21152,21487,21621,21733, +22025,23233,23478,26247,26550,26551,26607,27468,29634,30146,31292,33499,33540, +34903,34952,35382,36040,36303,36603,36838,39381,21051,21364,21508,24682,24932, +27580,29647,33050,35258,35282,38307,20355,21002,22718,22904,23014,24178,24185, +25031,25536,26438,26604,26751,28567,30286,30475,30965,31240,31487,31777,32925, +33390,33393,35563,38291,20075,21917,26359,28212,30883,31469,33883,35088,34638, +38824,21208,22350,22570,23884,24863,25022,25121,25954,26577,27204,28187,29976, +30131,30435,30640,32058,37039,37969,37970,40853,21283,23724,30002,32987,37440, +38296,21083,22536,23004,23713,23831,24247,24378,24394,24951,27743,30074,30086, +31968,32115,32177,32652,33108,33313,34193,35137,35611,37628,38477,40007,20171, +20215,20491,20977,22607,24887,24894,24936,25913,27114,28433,30117,30342,30422, +31623,33445,33995,63744,37799,38283,21888,23458,22353,63745,31923,32697,37301, +20520,21435,23621,24040,25298,25454,25818,25831,28192,28844,31067,36317,36382, +63746,36989,37445,37624,20094,20214,20581,24062,24314,24838,26967,33137,34388, +36423,37749,39467,20062,20625,26480,26688,20745,21133,21138,27298,30652,37392, +40660,21163,24623,36850,20552,25001,25581,25802,26684,27268,28608,33160,35233, +38548,22533,29309,29356,29956,32121,32365,32937,35211,35700,36963,40273,25225, +27770,28500,32080,32570,35363,20860,24906,31645,35609,37463,37772,20140,20435, +20510,20670,20742,21185,21197,21375,22384,22659,24218,24465,24950,25004, +25806,25964,26223,26299,26356,26775,28039,28805,28913,29855,29861,29898,30169, +30828,30956,31455,31478,32069,32147,32789,32831,33051,33686,35686,36629,36885, +37857,38915,38968,39514,39912,20418,21843,22586,22865,23395,23622,24760,25106, +26690,26800,26856,28330,30028,30328,30926,31293,31995,32363,32380,35336,35489, +35903,38542,40388,21476,21481,21578,21617,22266,22993,23396,23611,24235,25335, +25911,25925,25970,26272,26543,27073,27837,30204,30352,30590,31295,32660,32771, +32929,33167,33510,33533,33776,34241,34865,34996,35493,63747,36764,37678,38599, +39015,39640,40723,21741,26011,26354,26767,31296,35895,40288,22256,22372,23825, +26118,26801,26829,28414,29736,34974,39908,27752,63748,39592,20379,20844,20849, +21151,23380,24037,24656,24685,25329,25511,25915,29657,31354,34467,36002,38799, +20018,23521,25096,26524,29916,31185,33747,35463,35506,36328,36942,37707,38982, +24275,27112,34303,37101,63749,20896,23448,23532,24931,26874,27454,28748,29743, +29912,31649,32592,33733,35264,36011,38364,39208,21038,24669,25324,36866,20362, +20809,21281,22745,24291,26336,27960,28826,29378,29654,31568,33009,37979,21350, +25499,32619,20054,20608,22602,22750,24618,24871,25296,27088,39745,23439,32024, +32945,36703,20132,20689,21676,21932,23308,23968,24039,25898,25934,26657,27211, +29409,30350,30703,32094,32761,33184,34126,34527,36611,36686,37066,39171,39509, +39851,19992,20037,20061,20167,20465,20855,21246,21312,21475,21477,21646,22036, +22389,22434,23495,23943,24272,25084,25304,25937,26552,26601,27083,27472,27590, +27628,27714,28317,28792,29399,29590,29699,30655,30697, +31350,32127,32777,33276,33285,33290,33503,34914,35635,36092,36544,36881,37041, +37476,37558,39378,39493,40169,40407,40860,22283,23616,33738,38816,38827,40628, +21531,31384,32676,35033,36557,37089,22528,23624,25496,31391,23470,24339,31353, +31406,33422,36524,20518,21048,21240,21367,22280,25331,25458,27402,28099,30519, +21413,29527,34152,36470,38357,26426,27331,28528,35437,36556,39243,63750,26231, +27512,36020,39740,63751,21483,22317,22862,25542,27131,29674,30789,31418,31429, +31998,33909,35215,36211,36917,38312,21243,22343,30023,31584,33740,37406,63752, +27224,20811,21067,21127,25119,26840,26997,38553,20677,21156,21220,25027,26020, +26681,27135,29822,31563,33465,33771,35250,35641,36817,39241,63753,20170,22935, +25810,26129,27278,29748,31105,31165,33449,34942,34943,35167,63754,37670,20235, +21450,24613,25201,27762,32026,32102,20120,20834,30684,32943,20225,20238,20854, +20864,21980,22120,22331,22522,22524,22804,22855,22931,23492,23696,23822,24049, +24190,24524,25216,26071,26083,26398,26399,26462,26827,26820,27231,27450,27683, +27773,27778,28103,29592,29734,29738,29826,29859,30072,30079,30849,30959,31041, +31047,31048,31098,31637,32000,32186,32648,32774,32813,32908,35352,35663,35912, +36215,37665,37668,39138,39249,39438,39439,39525,40594,32202,20342,21513,25326, +26708,37329,21931,20794,63755,63756,23068,25062,63757,25295,25343,63758,63759, +63760,63761,63762,63763,37027,63764,63765,63766,63767,63768,35582,63769,63770, +63771,63772,26262,63773,29014,63774,63775,38627,63776,25423,25466,21335,63777, +26511,26976,28275,63778,30007,63779,63780,63781,32013, +63782,63783,34930,22218,23064,63784,63785,63786,63787,63788,20035,63789,20839, +22856,26608,32784,63790,22899,24180,25754,31178,24565,24684,25288,25467,23527, +23511,21162,63791,22900,24361,24594,63792,63793,63794,29785,63795,63796,63797, +63798,63799,63800,39377,63801,63802,63803,63804,63805,63806,63807,63808,63809, +63810,63811,28611,63812,63813,33215,36786,24817,63814,63815,33126,63816,63817, +23615,63818,63819,63820,63821,63822,63823,63824,63825,23273,35365,26491,32016, +63826,63827,63828,63829,63830,63831,33021,63832,63833,23612,27877,21311,28346, +22810,33590,20025,20150,20294,21934,22296,22727,24406,26039,26086,27264,27573, +28237,30701,31471,31774,32222,34507,34962,37170,37723,25787,28606,29562,30136, +36948,21846,22349,25018,25812,26311,28129,28251,28525,28601,30192,32835,33213, +34113,35203,35527,35674,37663,27795,30035,31572,36367,36957,21776,22530,22616, +24162,25095,25758,26848,30070,31958,34739,40680,20195,22408,22382,22823,23565, +23729,24118,24453,25140,25825,29619,33274,34955,36024,38538,40667,23429,24503, +24755,20498,20992,21040,22294,22581,22615,23566,23648,23798,23947,24230,24466, +24764,25361,25481,25623,26691,26873,27330,28120,28193,28372,28644,29182,30428, +30585,31153,31291,33796,35241,36077,36339,36424,36867,36884,36947,37117,37709, +38518,38876,27602,28678,29272,29346,29544,30563,31167,31716,32411,35712,22697, +24775,25958,26109,26302,27788,28958,29129,35930,38931,20077,31361,20189,20908, +20941,21205,21516,24999,26481,26704,26847,27934,28540,30140,30643,31461,33012, +33891,37509,20828,26007,26460,26515,30168,31431,33651, +63834,35910,36887,38957,23663,33216,33434,36929,36975,37389,24471,23965,27225, +29128,30331,31561,34276,35588,37159,39472,21895,25078,63835,30313,32645,34367, +34746,35064,37007,63836,27931,28889,29662,32097,33853,63837,37226,39409,63838, +20098,21365,27396,27410,28734,29211,34349,40478,21068,36771,23888,25829,25900, +27414,28651,31811,32412,34253,35172,35261,25289,33240,34847,24266,26391,28010, +29436,29701,29807,34690,37086,20358,23821,24480,33802,20919,25504,30053,20142, +20486,20841,20937,26753,27153,31918,31921,31975,33391,35538,36635,37327,20406, +20791,21237,21570,24300,24942,25150,26053,27354,28670,31018,34268,34851,38317, +39522,39530,40599,40654,21147,26310,27511,28701,31019,36706,38722,24976,25088, +25891,28451,29001,29833,32244,32879,34030,36646,36899,37706,20925,21015,21155, +27916,28872,35010,24265,25986,27566,28610,31806,29557,20196,20278,22265,63839, +23738,23994,24604,29618,31533,32666,32718,32838,36894,37428,38646,38728,38936, +40801,20363,28583,31150,37300,38583,21214,63840,25736,25796,27347,28510,28696, +29200,30439,32769,34310,34396,36335,36613,38706,39791,40442,40565,30860,31103, +32160,33737,37636,40575,40595,35542,22751,24324,26407,28711,29903,31840,32894, +20769,28712,29282,30922,36034,36058,36084,38647,20102,20698,23534,24278,26009, +29134,30274,30637,32842,34044,36988,39719,40845,22744,23105,23650,27155,28122, +28431,30267,32047,32311,34078,35128,37860,38475,21129,26066,26611,27060,27969, +28316,28687,29705,29792,30041,30244,30827,35628,39006,20845,25134,38520,20374, +20523,23833,28138,32184,36650,24459,24900,26647,63841, 38534,21202,32907,20956,20940,26974,31260,32190,33777,38517,20442,21033,21400, 21519,21774,23653,24743,26446,26792,28012,29313,29432,29702,29827,63842,30178, 31852,32633,32696,33673,35023,35041,37324,37328,38626,39881,21533,28542,29136, @@ -378,243 +384,247 @@ 33495,37672,21209,24043,25006,25035,25098,25287,25771,26080,26969,27494,27595, 28961,29687,30045,32326,33310,33538,34154,35491,36031,38695,40289,22696,40664, 20497,21006,21563,21839,25991,27766,32010,32011,32862,34442,38272,38639,21247, -27797,29289,21619,23194,23614,23883,24396,24494,26410,26806,26979,28220,28228, -30473,31859,32654,34183,35598,36855,38753,40692,23735,24758,24845,25003,25935, -26107,26108,27665,27887,29599,29641,32225,38292,23494,34588,35600,21085,21338, -25293,25615,25778,26420,27192,27850,29632,29854,31636,31893,32283,33162,33334, -34180,36843,38649,39361,20276,21322,21453,21467,25292,25644,25856,26001,27075, -27886,28504,29677,30036,30242,30436,30460,30928,30971,31020,32070,33324,34784, -36820,38930,39151,21187,25300,25765,28196,28497,30332,36299,37297,37474,39662, -39747,20515,20621,22346,22952,23592,24135,24439,25151,25918,26041,26049,26121, -26507,27036,28354,30917,32033,32938,33152,33323,33459,33953,34444,35370,35607, -37030,38450,40848,20493,20467,63843,22521,24472,25308,25490,26479,28227,28953, -30403,32972,32986,35060,35061,35097,36064,36649,37197,38506,20271,20336,24091, -26575,26658,30333,30334,39748,24161,27146,29033,29140,30058,63844,32321,34115, -34281,39132,20240,31567,32624,38309,20961,24070,26805,27710,27726,27867,29359, -31684,33539,27861,29754,20731,21128,22721,25816,27287,29863,30294,30887,34327, -38370,38713,63845,21342,24321,35722,36776,36783,37002,21029,30629,40009,40712, -19993,20482,20853,23643,24183,26142,26170,26564,26821,28851,29953,30149,31177, -31453,36647,39200,39432,20445,22561,22577,23542,26222,27493,27921,28282,28541, -29668,29995,33769,35036,35091,35676,36628,20239,20693,21264,21340,23443,24489, -26381,31119,33145,33583,34068,35079,35206,36665,36667,39333,39954,26412,20086, -20472,22857,23553,23791,23792,25447,26834,28925,29090,29739,32299,34028,34562, -36898,37586,40179,19981,20184,20463,20613,21078,21103,21542,21648,22496,22827, -23142,23386,23413,23500,24220,63846,25206,25975,26023,28014,28325,29238,31526, -31807,32566,33104,33105,33178,33344,33433,33705,35331,36000,36070,36091,36212, -36282,37096,37340,38428,38468,39385,40167,21271,20998,21545,22132,22707,22868, -22894,24575,24996,25198,26128,27774,28954,30406,31881,31966,32027,33452,36033, -38640,63847,20315,24343,24447,25282,23849,26379,26842,30844,32323,40300,19989, -20633,21269,21290,21329,22915,23138,24199,24754,24970,25161,25209,26000,26503, -27047,27604,27606,27607,27608,27832,63848,29749,30202,30738,30865,31189,31192, -31875,32203,32737,32933,33086,33218,33778,34586,35048,35513,35692,36027,37145, -38750,39131,40763,22188,23338,24428,25996,27315,27567,27996,28657,28693,29277, -29613,36007,36051,38971,24977,27703,32856,39425,20045,20107,20123,20181,20282, -20284,20351,20447,20735,21490,21496,21766,21987,22235,22763,22882,23057,23531, -23546,23556,24051,24107,24473,24605,25448,26012,26031,26614,26619,26797,27515, -27801,27863,28195,28681,29509,30722,31038,31040,31072,31169,31721,32023,32114, -32902,33293,33678,34001,34503,35039,35408,35422,35613,36060,36198,36781,37034, -39164,39391,40605,21066,63849,26388,63850,20632,21034,23665,25955,27733,29642, -29987,30109,31639,33948,37240,38704,20087,25746,27578,29022,34217,19977,63851, -26441,26862,28183,33439,34072,34923,25591,28545,37394,39087,19978,20663,20687, -20767,21830,21930,22039,23360,23577,23776,24120,24202,24224,24258,24819,26705, -27233,28248,29245,29248,29376,30456,31077,31665,32724,35059,35316,35443,35937, -36062,38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989, -63853,31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257, -26329,26360,26646,26866,29312,29790,31598,32110,32214,32626,32997,33298,34223, -35199,35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512, -27728,28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307, -23459,25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218, -32341,32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245, -39854,21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634, -40807,21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854, -22478,22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596, -32854,32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855, -36016,21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803, -27836,28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787, -32032,32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439, -23660,26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956, -39137,29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753, -30862,37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723, -23744,24101,24833,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929, -28465,29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143, -32172,32353,32670,33065,33585,33936,34010,34282,34966,35504,35728,36664,36930, -36995,37228,37526,37561,38539,38567,38568,38614,38656,38920,39318,39635,39706, -21460,22654,22809,23408,23487,28113,28506,29087,29729,29881,32901,33789,24033, -24455,24490,24642,26092,26642,26991,27219,27529,27957,28147,29667,30462,30636, -31565,32020,33059,33308,33600,34036,34147,35426,35524,37255,37662,38918,39348, -25100,34899,36848,37477,23815,23847,23913,29791,33181,34664,28629,25342,32722, -35126,35186,19998,20056,20711,21213,21319,25215,26119,32361,34821,38494,20365, -21273,22070,22987,23204,23608,23630,23629,24066,24337,24643,26045,26159,26178, -26558,26612,29468,30690,31034,32709,33940,33997,35222,35430,35433,35553,35925, -35962,22516,23508,24335,24687,25325,26893,27542,28252,29060,31698,34645,35672, -36606,39135,39166,20280,20353,20449,21627,23072,23480,24892,26032,26216,29180, -30003,31070,32051,33102,33251,33688,34218,34254,34563,35338,36523,36763,63857, -36805,22833,23460,23526,24713,23529,23563,24515,27777,63858,28145,28683,29978, -33455,35574,20160,21313,63859,38617,27663,20126,20420,20818,21854,23077,23784, -25105,29273,33469,33706,34558,34905,35357,38463,38597,39187,40201,40285,22538, -23731,23997,24132,24801,24853,25569,27138,28197,37122,37716,38990,39952,40823, -23433,23736,25353,26191,26696,30524,38593,38797,38996,39839,26017,35585,36555, -38332,21813,23721,24022,24245,26263,30284,33780,38343,22739,25276,29390,40232, -20208,22830,24591,26171,27523,31207,40230,21395,21696,22467,23830,24859,26326, -28079,30861,33406,38552,38724,21380,25212,25494,28082,32266,33099,38989,27387, -32588,40367,40474,20063,20539,20918,22812,24825,25590,26928,29242,32822,63860, -37326,24369,63861,63862,32004,33509,33903,33979,34277,36493,63863,20335,63864, -63865,22756,23363,24665,25562,25880,25965,26264,63866,26954,27171,27915,28673, -29036,30162,30221,31155,31344,63867,32650,63868,35140,63869,35731,37312,38525, -63870,39178,22276,24481,26044,28417,30208,31142,35486,39341,39770,40812,20740, -25014,25233,27277,33222,20547,22576,24422,28937,35328,35578,23420,34326,20474, -20796,22196,22852,25513,28153,23978,26989,20870,20104,20313,63871,63872,63873, -22914,63874,63875,27487,27741,63876,29877,30998,63877,33287,33349,33593,36671, -36701,63878,39192,63879,63880,63881,20134,63882,22495,24441,26131,63883,63884, -30123,32377,35695,63885,36870,39515,22181,22567,23032,23071,23476,63886,24310, -63887,63888,25424,25403,63889,26941,27783,27839,28046,28051,28149,28436,63890, -28895,28982,29017,63891,29123,29141,63892,30799,30831,63893,31605,32227,63894, -32303,63895,34893,36575,63896,63897,63898,37467,63899,40182,63900,63901,63902, -24709,28037,63903,29105,63904,63905,38321,21421,63906,63907,63908,26579,63909, -28814,28976,29744,33398,33490,63910,38331,39653,40573,26308,63911,29121,33865, -63912,63913,22603,63914,63915,23992,24433,63916,26144,26254,27001,27054,27704, -27891,28214,28481,28634,28699,28719,29008,29151,29552,63917,29787,63918,29908, -30408,31310,32403,63919,63920,33521,35424,36814,63921,37704,63922,38681,63923, -63924,20034,20522,63925,21000,21473,26355,27757,28618,29450,30591,31330,33454, -34269,34306,63926,35028,35427,35709,35947,63927,37555,63928,38675,38928,20116, -20237,20425,20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735, -63929,25034,25942,26111,26212,26791,27738,28595,28879,29100,29522,31613,34568, -35492,39986,40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277, -34314,20800,22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926, -31401,31402,33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609, -29715,29740,30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448, -26106,26505,27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031, -63930,63931,20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303, -25622,25747,25854,63934,26332,63935,27208,63936,29183,29796,63937,31368,31407, -32327,32350,32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958, -27442,28020,32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248, -24898,27029,28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362, -37780,37854,63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588, -24858,24962,26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419, -34261,34398,36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161, -26671,29020,31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464, -34131,36939,38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729, -22291,22290,22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304, -29232,29503,29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234, -37470,20301,20553,20702,21361,22285,22996,23041,23561,24944,26256,28205,29234, -29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949,38859,39759, -20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189,24254,24736, -24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977,26978,27833, -27943,63946,28216,63947,28641,29494,29495,63948,29788,30001,63949,30290,63950, -63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938,36926,36986, -37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955,63956,20801, -22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287,63960,63961, -63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903,27575,35518, -37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875,37009,20957, -25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885,27589,30097, -30691,32681,33380,34191,34811,34915,35516,35696,37291,20108,20197,20234,63965, -63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970,63971,29246, -29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505,33617,63975, -63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727,30410,32714, -32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035,23493,24341, -24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765,38775,63986, -63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219,22764,22922, -23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,63991,63992,63993, -20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383,23388,24675, -24904,28363,28825,29038,29574,29943,30133,30913,32043,32773,33258,33576,34071, -34249,35566,36039,38604,20316,21242,22204,26027,26152,28796,28856,29237,32189, -33421,37196,38592,40306,23409,26855,27544,28538,30430,23697,26283,28507,31668, -31786,34870,38620,19976,20183,21280,22580,22715,22767,22892,23559,24115,24196, -24373,25484,26290,26454,27167,27299,27404,28479,29254,63994,29520,29835,31456, -31911,33144,33247,33255,33674,33900,34083,34196,34255,35037,36115,37292,38263, -38556,20877,21705,22312,23472,25165,26448,26685,26771,28221,28371,28797,32289, -35009,36001,36617,40779,40782,29229,31631,35533,37658,20295,20302,20786,21632, -22992,24213,25269,26485,26990,27159,27822,28186,29401,29482,30141,31672,32053, -33511,33785,33879,34295,35419,36015,36487,36889,37048,38606,40799,21219,21514, -23265,23490,25688,25973,28404,29380,63995,30340,31309,31515,31821,32318,32735, -33659,35627,36042,36196,36321,36447,36842,36857,36969,37841,20291,20346,20659, -20840,20856,21069,21098,22625,22652,22880,23560,23637,24283,24731,25136,26643, -27583,27656,28593,29006,29728,30000,30008,30033,30322,31564,31627,31661,31686, -32399,35438,36670,36681,37439,37523,37666,37931,38651,39002,39019,39198,20999, -25130,25240,27993,30308,31434,31680,32118,21344,23742,24215,28472,28857,31896, -38673,39822,40670,25509,25722,34678,19969,20117,20141,20572,20597,21576,22979, -23450,24128,24237,24311,24449,24773,25402,25919,25972,26060,26230,26232,26622, -26984,27273,27491,27712,28096,28136,28191,28254,28702,28833,29582,29693,30010, -30555,30855,31118,31243,31357,31934,32142,33351,35330,35562,35998,37165,37194, -37336,37478,37580,37664,38662,38742,38748,38914,40718,21046,21137,21884,22564, -24093,24351,24716,25552,26799,28639,31085,31532,33229,34234,35069,35576,36420, -37261,38500,38555,38717,38988,40778,20430,20806,20939,21161,22066,24340,24427, -25514,25805,26089,26177,26362,26361,26397,26781,26839,27133,28437,28526,29031, -29157,29226,29866,30522,31062,31066,31199,31264,31381,31895,31967,32068,32368, -32903,34299,34468,35412,35519,36249,36481,36896,36973,37347,38459,38613,40165, -26063,31751,36275,37827,23384,23562,21330,25305,29469,20519,23447,24478,24752, -24939,26837,28121,29742,31278,32066,32156,32305,33131,36394,36405,37758,37912, -20304,22352,24038,24231,25387,32618,20027,20303,20367,20570,23005,32964,21610, -21608,22014,22863,23449,24030,24282,26205,26417,26609,26666,27880,27954,28234, -28557,28855,29664,30087,31820,32002,32044,32162,33311,34523,35387,35461,36208, -36490,36659,36913,37198,37202,37956,39376,31481,31909,20426,20737,20934,22472, -23535,23803,26201,27197,27994,28310,28652,28940,30063,31459,34850,36897,36981, -38603,39423,33537,20013,20210,34886,37325,21373,27355,26987,27713,33914,22686, -24974,26366,25327,28893,29969,30151,32338,33976,35657,36104,20043,21482,21675, -22320,22336,24535,25345,25351,25711,25903,26088,26234,26525,26547,27490,27744, -27802,28460,30693,30757,31049,31063,32025,32930,33026,33267,33437,33463,34584, -35468,63996,36100,36286,36978,30452,31257,31287,32340,32887,21767,21972,22645, -25391,25634,26185,26187,26733,27035,27524,27941,28337,29645,29800,29857,30043, -30137,30433,30494,30603,31206,32265,32285,33275,34095,34967,35386,36049,36587, -36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702,29894, -30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519,28503, -32221,36655,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983,23919, -24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528,31364, -37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922,32408, -35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443,22649, -24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100,24288, -24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379,33081, -33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756,34081, -37319,37365,20874,26613,31574,36012,20932,22971,24765,34389,20508,63999,21076, -23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587,20191, -21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068,36368, -36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180,36639, -36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522,22558, -22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152,32893, -33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910,36958, -39636,21021,21119,21736,24980,25220,25307,26786,26898,26970,27189,28818,28966, -30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229,37218, -37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032,21474, -22618,23541,24740,24961,25696,32317,32880,34085,37507,25774,20652,23828,26368, -22684,25277,25512,26894,27000,27166,28267,30394,31179,33467,33833,35535,36264, -36861,37138,37195,37276,37648,37656,37786,38619,39478,39949,19985,30044,31069, -31482,31569,31689,32302,33988,36441,36468,36600,36880,26149,26943,29763,20986, -26414,40668,20805,24544,27798,34802,34909,34935,24756,33205,33795,36101,21462, -21561,22068,23094,23601,28810,32736,32858,33030,33261,36259,37257,39519,40434, -20596,20164,21408,24827,28204,23652,20360,20516,21988,23769,24159,24677,26772, -27835,28100,29118,30164,30196,30305,31258,31305,32199,32251,32622,33268,34473, -36636,38601,39347,40786,21063,21189,39149,35242,19971,26578,28422,20405,23522, -26517,27784,28024,29723,30759,37341,37756,34756,31204,31281,24555,20182,21668, -21822,22702,22949,24816,25171,25302,26422,26965,33333,38464,39345,39389,20524, -21331,21828,22396,64001,25176,64002,25826,26219,26589,28609,28655,29730,29752, -35351,37944,21585,22022,22374,24392,24986,27470,28760,28845,32187,35477,22890, -33067,25506,30472,32829,36010,22612,25645,27067,23445,24081,28271,64003,34153, -20812,21488,22826,24608,24907,27526,27760,27888,31518,32974,33492,36294,37040, -39089,64004,25799,28580,25745,25860,20814,21520,22303,35342,24927,26742,64005, -30171,31570,32113,36890,22534,27084,33151,35114,36864,38969,20600,22871,22956, -25237,36879,39722,24925,29305,38358,22369,23110,24052,25226,25773,25850,26487, -27874,27966,29228,29750,30772,32631,33453,36315,38935,21028,22338,26495,29256, -29923,36009,36774,37393,38442,20843,21485,25420,20329,21764,24726,25943,27803, -28031,29260,29437,31255,35207,35997,24429,28558,28921,33192,24846,20415,20559, -25153,29255,31687,32232,32745,36941,38829,39449,36022,22378,24179,26544,33805, -35413,21536,23318,24163,24290,24330,25987,32954,34109,38281,38491,20296,21253, -21261,21263,21638,21754,22275,24067,24598,25243,25265,25429,64006,27873,28006, -30129,30770,32990,33071,33502,33889,33970,34957,35090,36875,37610,39165,39825, -24133,26292,26333,28689,29190,64007,20469,21117,24426,24915,26451,27161,28418, -29922,31080,34920,35961,39111,39108,39491,21697,31263,26963,35575,35914,39080, -39342,24444,25259,30130,30382,34987,36991,38466,21305,24380,24517,27852,29644, -30050,30091,31558,33534,39325,20047,36924,19979,20309,21414,22799,24264,26160, -27827,29781,33655,34662,36032,36944,38686,39957,22737,23416,34384,35604,40372, -23506,24680,24717,26097,27735,28450,28579,28698,32597,32752,38289,38290,38480, -38867,21106,36676,20989,21547,21688,21859,21898,27323,28085,32216,33382,37532, -38519,40569,21512,21704,30418,34532,38308,38356,38492,20130,20233,23022,23270, -24055,24658,25239,26477,26689,27782,28207,32568,32923,33322,64008,64009,38917, -20133,20565,21683,22419,22874,23401,23475,25032,26999,28023,28707,34809,35299, -35442,35559,36994,39405,39608,21182,26680,20502,24184,26447,33607,34892,20139, -21521,22190,29670,37141,38911,39177,39255,39321,22099,22687,34395,35377,25010, -27382,29563,36562,27463,38570,39511,22869,29184,36203,38761,20436,23796,24358, -25080,26203,27883,28843,29572,29625,29694,30505,30541,32067,32098,32291,33335, -34898,64010,36066,37449,39023,23377,31348,34880,38913,23244,20448,21332,22846, +27797,29289,21619,23194,23614,23883,24396,24494,26410, +26806,26979,28220,28228,30473,31859,32654,34183,35598,36855,38753,40692,23735, +24758,24845,25003,25935,26107,26108,27665,27887,29599,29641,32225,38292,23494, +34588,35600,21085,21338,25293,25615,25778,26420,27192,27850,29632,29854,31636, +31893,32283,33162,33334,34180,36843,38649,39361,20276,21322,21453,21467,25292, +25644,25856,26001,27075,27886,28504,29677,30036,30242,30436,30460,30928,30971, +31020,32070,33324,34784,36820,38930,39151,21187,25300,25765,28196,28497,30332, +36299,37297,37474,39662,39747,20515,20621,22346,22952,23592,24135,24439,25151, +25918,26041,26049,26121,26507,27036,28354,30917,32033,32938,33152,33323,33459, +33953,34444,35370,35607,37030,38450,40848,20493,20467,63843,22521,24472,25308, +25490,26479,28227,28953,30403,32972,32986,35060,35061,35097,36064,36649,37197, +38506,20271,20336,24091,26575,26658,30333,30334,39748,24161,27146,29033,29140, +30058,63844,32321,34115,34281,39132,20240,31567,32624,38309,20961,24070,26805, +27710,27726,27867,29359,31684,33539,27861,29754,20731,21128,22721,25816,27287, +29863,30294,30887,34327,38370,38713,63845,21342,24321,35722,36776,36783,37002, +21029,30629,40009,40712,19993,20482,20853,23643,24183,26142,26170,26564,26821, +28851,29953,30149,31177,31453,36647,39200,39432,20445,22561,22577,23542,26222, +27493,27921,28282,28541,29668,29995,33769,35036,35091,35676,36628,20239,20693, +21264,21340,23443,24489,26381,31119,33145,33583,34068,35079,35206,36665,36667, +39333,39954,26412,20086,20472,22857,23553,23791,23792,25447,26834,28925,29090, +29739,32299,34028,34562,36898,37586,40179,19981,20184, +20463,20613,21078,21103,21542,21648,22496,22827,23142,23386,23413,23500,24220, +63846,25206,25975,26023,28014,28325,29238,31526,31807,32566,33104,33105,33178, +33344,33433,33705,35331,36000,36070,36091,36212,36282,37096,37340,38428,38468, +39385,40167,21271,20998,21545,22132,22707,22868,22894,24575,24996,25198,26128, +27774,28954,30406,31881,31966,32027,33452,36033,38640,63847,20315,24343,24447, +25282,23849,26379,26842,30844,32323,40300,19989,20633,21269,21290,21329,22915, +23138,24199,24754,24970,25161,25209,26000,26503,27047,27604,27606,27607,27608, +27832,63848,29749,30202,30738,30865,31189,31192,31875,32203,32737,32933,33086, +33218,33778,34586,35048,35513,35692,36027,37145,38750,39131,40763,22188,23338, +24428,25996,27315,27567,27996,28657,28693,29277,29613,36007,36051,38971,24977, +27703,32856,39425,20045,20107,20123,20181,20282,20284,20351,20447,20735,21490, +21496,21766,21987,22235,22763,22882,23057,23531,23546,23556,24051,24107,24473, +24605,25448,26012,26031,26614,26619,26797,27515,27801,27863,28195,28681,29509, +30722,31038,31040,31072,31169,31721,32023,32114,32902,33293,33678,34001,34503, +35039,35408,35422,35613,36060,36198,36781,37034,39164,39391,40605,21066,63849, +26388,63850,20632,21034,23665,25955,27733,29642,29987,30109,31639,33948,37240, +38704,20087,25746,27578,29022,34217,19977,63851,26441,26862,28183,33439,34072, +34923,25591,28545,37394,39087,19978,20663,20687,20767,21830,21930,22039,23360, +23577,23776,24120,24202,24224,24258,24819,26705,27233,28248,29245,29248,29376, +30456,31077,31665,32724,35059,35316,35443,35937,36062, +38684,22622,29885,36093,21959,63852,31329,32034,33394,29298,29983,29989,63853, +31513,22661,22779,23996,24207,24246,24464,24661,25234,25471,25933,26257,26329, +26360,26646,26866,29312,29790,31598,32110,32214,32626,32997,33298,34223,35199, +35475,36893,37604,40653,40736,22805,22893,24109,24796,26132,26227,26512,27728, +28101,28511,30707,30889,33990,37323,37675,20185,20682,20808,21892,23307,23459, +25159,25982,26059,28210,29053,29697,29764,29831,29887,30316,31146,32218,32341, +32680,33146,33203,33337,34330,34796,35445,36323,36984,37521,37925,39245,39854, +21352,23633,26964,27844,27945,28203,33292,34203,35131,35373,35498,38634,40807, +21089,26297,27570,32406,34814,36109,38275,38493,25885,28041,29166,63854,22478, +22995,23468,24615,24826,25104,26143,26207,29481,29689,30427,30465,31596,32854, +32882,33125,35488,37266,19990,21218,27506,27927,31237,31545,32048,63855,36016, +21484,22063,22609,23477,23567,23569,24034,25152,25475,25620,26157,26803,27836, +28040,28335,28703,28836,29138,29990,30095,30094,30233,31505,31712,31787,32032, +32057,34092,34157,34311,35380,36877,36961,37045,37559,38902,39479,20439,23660, +26463,28049,31903,32396,35606,36118,36895,23403,24061,25613,33984,36956,39137, +29575,23435,24730,26494,28126,35359,35494,36865,38924,21047,63856,28753,30862, +37782,34928,37335,20462,21463,22013,22234,22402,22781,23234,23432,23723,23744, +24101,24833,25101,25163,25480,25628,25910,25976,27193,27530,27700,27929,28465, +29159,29417,29560,29703,29874,30246,30561,31168,31319,31466,31929,32143,32172, +32353,32670,33065,33585,33936,34010,34282,34966,35504, +35728,36664,36930,36995,37228,37526,37561,38539,38567,38568,38614,38656,38920, +39318,39635,39706,21460,22654,22809,23408,23487,28113,28506,29087,29729,29881, +32901,33789,24033,24455,24490,24642,26092,26642,26991,27219,27529,27957,28147, +29667,30462,30636,31565,32020,33059,33308,33600,34036,34147,35426,35524,37255, +37662,38918,39348,25100,34899,36848,37477,23815,23847,23913,29791,33181,34664, +28629,25342,32722,35126,35186,19998,20056,20711,21213,21319,25215,26119,32361, +34821,38494,20365,21273,22070,22987,23204,23608,23630,23629,24066,24337,24643, +26045,26159,26178,26558,26612,29468,30690,31034,32709,33940,33997,35222,35430, +35433,35553,35925,35962,22516,23508,24335,24687,25325,26893,27542,28252,29060, +31698,34645,35672,36606,39135,39166,20280,20353,20449,21627,23072,23480,24892, +26032,26216,29180,30003,31070,32051,33102,33251,33688,34218,34254,34563,35338, +36523,36763,63857,36805,22833,23460,23526,24713,23529,23563,24515,27777,63858, +28145,28683,29978,33455,35574,20160,21313,63859,38617,27663,20126,20420,20818, +21854,23077,23784,25105,29273,33469,33706,34558,34905,35357,38463,38597,39187, +40201,40285,22538,23731,23997,24132,24801,24853,25569,27138,28197,37122,37716, +38990,39952,40823,23433,23736,25353,26191,26696,30524,38593,38797,38996,39839, +26017,35585,36555,38332,21813,23721,24022,24245,26263,30284,33780,38343,22739, +25276,29390,40232,20208,22830,24591,26171,27523,31207,40230,21395,21696,22467, +23830,24859,26326,28079,30861,33406,38552,38724,21380,25212,25494,28082,32266, +33099,38989,27387,32588,40367,40474,20063,20539,20918, +22812,24825,25590,26928,29242,32822,63860,37326,24369,63861,63862,32004,33509, +33903,33979,34277,36493,63863,20335,63864,63865,22756,23363,24665,25562,25880, +25965,26264,63866,26954,27171,27915,28673,29036,30162,30221,31155,31344,63867, +32650,63868,35140,63869,35731,37312,38525,63870,39178,22276,24481,26044,28417, +30208,31142,35486,39341,39770,40812,20740,25014,25233,27277,33222,20547,22576, +24422,28937,35328,35578,23420,34326,20474,20796,22196,22852,25513,28153,23978, +26989,20870,20104,20313,63871,63872,63873,22914,63874,63875,27487,27741,63876, +29877,30998,63877,33287,33349,33593,36671,36701,63878,39192,63879,63880,63881, +20134,63882,22495,24441,26131,63883,63884,30123,32377,35695,63885,36870,39515, +22181,22567,23032,23071,23476,63886,24310,63887,63888,25424,25403,63889,26941, +27783,27839,28046,28051,28149,28436,63890,28895,28982,29017,63891,29123,29141, +63892,30799,30831,63893,31605,32227,63894,32303,63895,34893,36575,63896,63897, +63898,37467,63899,40182,63900,63901,63902,24709,28037,63903,29105,63904,63905, +38321,21421,63906,63907,63908,26579,63909,28814,28976,29744,33398,33490,63910, +38331,39653,40573,26308,63911,29121,33865,63912,63913,22603,63914,63915,23992, +24433,63916,26144,26254,27001,27054,27704,27891,28214,28481,28634,28699,28719, +29008,29151,29552,63917,29787,63918,29908,30408,31310,32403,63919,63920,33521, +35424,36814,63921,37704,63922,38681,63923,63924,20034,20522,63925,21000,21473, +26355,27757,28618,29450,30591,31330,33454,34269,34306,63926,35028,35427,35709, +35947,63927,37555,63928,38675,38928,20116,20237,20425, +20658,21320,21566,21555,21978,22626,22714,22887,23067,23524,24735,63929,25034, +25942,26111,26212,26791,27738,28595,28879,29100,29522,31613,34568,35492,39986, +40711,23627,27779,29508,29577,37434,28331,29797,30239,31337,32277,34314,20800, +22725,25793,29934,29973,30320,32705,37013,38605,39252,28198,29926,31401,31402, +33253,34521,34680,35355,23113,23436,23451,26785,26880,28003,29609,29715,29740, +30871,32233,32747,33048,33109,33694,35916,38446,38929,26352,24448,26106,26505, +27754,29579,20525,23043,27498,30702,22806,23916,24013,29477,30031,63930,63931, +20709,20985,22575,22829,22934,23002,23525,63932,63933,23970,25303,25622,25747, +25854,63934,26332,63935,27208,63936,29183,29796,63937,31368,31407,32327,32350, +32768,33136,63938,34799,35201,35616,36953,63939,36992,39250,24958,27442,28020, +32287,35109,36785,20433,20653,20887,21191,22471,22665,23481,24248,24898,27029, +28044,28263,28342,29076,29794,29992,29996,32883,33592,33993,36362,37780,37854, +63940,20110,20305,20598,20778,21448,21451,21491,23431,23507,23588,24858,24962, +26100,29275,29591,29760,30402,31056,31121,31161,32006,32701,33419,34261,34398, +36802,36935,37109,37354,38533,38632,38633,21206,24423,26093,26161,26671,29020, +31286,37057,38922,20113,63941,27218,27550,28560,29065,32792,33464,34131,36939, +38549,38642,38907,34074,39729,20112,29066,38596,20803,21407,21729,22291,22290, +22435,23195,23236,23491,24616,24895,25588,27781,27961,28274,28304,29232,29503, +29783,33489,34945,36677,36960,63942,38498,39000,40219,26376,36234,37470,20301, +20553,20702,21361,22285,22996,23041,23561,24944,26256, +28205,29234,29771,32239,32963,33806,33894,34111,34655,34907,35096,35586,36949, +38859,39759,20083,20369,20754,20842,63943,21807,21929,23418,23461,24188,24189, +24254,24736,24799,24840,24841,25540,25912,26377,63944,26580,26586,63945,26977, +26978,27833,27943,63946,28216,63947,28641,29494,29495,63948,29788,30001,63949, +30290,63950,63951,32173,33278,33848,35029,35480,35547,35565,36400,36418,36938, +36926,36986,37193,37321,37742,63952,63953,22537,63954,27603,32905,32946,63955, +63956,20801,22891,23609,63957,63958,28516,29607,32996,36103,63959,37399,38287, +63960,63961,63962,63963,32895,25102,28700,32104,34701,63964,22432,24681,24903, +27575,35518,37504,38577,20057,21535,28139,34093,38512,38899,39150,25558,27875, +37009,20957,25033,33210,40441,20381,20506,20736,23452,24847,25087,25836,26885, +27589,30097,30691,32681,33380,34191,34811,34915,35516,35696,37291,20108,20197, +20234,63965,63966,22839,23016,63967,24050,24347,24411,24609,63968,63969,63970, +63971,29246,29669,63972,30064,30157,63973,31227,63974,32780,32819,32900,33505, +33617,63975,63976,36029,36019,36999,63977,63978,39156,39180,63979,63980,28727, +30410,32714,32716,32764,35610,20154,20161,20995,21360,63981,21693,22240,23035, +23493,24341,24525,28270,63982,63983,32106,33589,63984,34451,35469,63985,38765, +38775,63986,63987,19968,20314,20350,22777,26085,28322,36920,37808,39353,20219, +22764,22922,23001,24641,63988,63989,31252,63990,33615,36035,20837,21316,63991, +63992,63993,20173,21097,23381,33471,20180,21050,21672,22985,23039,23376,23383, +23388,24675,24904,28363,28825,29038,29574,29943,30133, +30913,32043,32773,33258,33576,34071,34249,35566,36039,38604,20316,21242,22204, +26027,26152,28796,28856,29237,32189,33421,37196,38592,40306,23409,26855,27544, +28538,30430,23697,26283,28507,31668,31786,34870,38620,19976,20183,21280,22580, +22715,22767,22892,23559,24115,24196,24373,25484,26290,26454,27167,27299,27404, +28479,29254,63994,29520,29835,31456,31911,33144,33247,33255,33674,33900,34083, +34196,34255,35037,36115,37292,38263,38556,20877,21705,22312,23472,25165,26448, +26685,26771,28221,28371,28797,32289,35009,36001,36617,40779,40782,29229,31631, +35533,37658,20295,20302,20786,21632,22992,24213,25269,26485,26990,27159,27822, +28186,29401,29482,30141,31672,32053,33511,33785,33879,34295,35419,36015,36487, +36889,37048,38606,40799,21219,21514,23265,23490,25688,25973,28404,29380,63995, +30340,31309,31515,31821,32318,32735,33659,35627,36042,36196,36321,36447,36842, +36857,36969,37841,20291,20346,20659,20840,20856,21069,21098,22625,22652,22880, +23560,23637,24283,24731,25136,26643,27583,27656,28593,29006,29728,30000,30008, +30033,30322,31564,31627,31661,31686,32399,35438,36670,36681,37439,37523,37666, +37931,38651,39002,39019,39198,20999,25130,25240,27993,30308,31434,31680,32118, +21344,23742,24215,28472,28857,31896,38673,39822,40670,25509,25722,34678,19969, +20117,20141,20572,20597,21576,22979,23450,24128,24237,24311,24449,24773,25402, +25919,25972,26060,26230,26232,26622,26984,27273,27491,27712,28096,28136,28191, +28254,28702,28833,29582,29693,30010,30555,30855,31118,31243,31357,31934,32142, +33351,35330,35562,35998,37165,37194,37336,37478,37580, +37664,38662,38742,38748,38914,40718,21046,21137,21884,22564,24093,24351,24716, +25552,26799,28639,31085,31532,33229,34234,35069,35576,36420,37261,38500,38555, +38717,38988,40778,20430,20806,20939,21161,22066,24340,24427,25514,25805,26089, +26177,26362,26361,26397,26781,26839,27133,28437,28526,29031,29157,29226,29866, +30522,31062,31066,31199,31264,31381,31895,31967,32068,32368,32903,34299,34468, +35412,35519,36249,36481,36896,36973,37347,38459,38613,40165,26063,31751,36275, +37827,23384,23562,21330,25305,29469,20519,23447,24478,24752,24939,26837,28121, +29742,31278,32066,32156,32305,33131,36394,36405,37758,37912,20304,22352,24038, +24231,25387,32618,20027,20303,20367,20570,23005,32964,21610,21608,22014,22863, +23449,24030,24282,26205,26417,26609,26666,27880,27954,28234,28557,28855,29664, +30087,31820,32002,32044,32162,33311,34523,35387,35461,36208,36490,36659,36913, +37198,37202,37956,39376,31481,31909,20426,20737,20934,22472,23535,23803,26201, +27197,27994,28310,28652,28940,30063,31459,34850,36897,36981,38603,39423,33537, +20013,20210,34886,37325,21373,27355,26987,27713,33914,22686,24974,26366,25327, +28893,29969,30151,32338,33976,35657,36104,20043,21482,21675,22320,22336,24535, +25345,25351,25711,25903,26088,26234,26525,26547,27490,27744,27802,28460,30693, +30757,31049,31063,32025,32930,33026,33267,33437,33463,34584,35468,63996,36100, +36286,36978,30452,31257,31287,32340,32887,21767,21972,22645,25391,25634,26185, +26187,26733,27035,27524,27941,28337,29645,29800,29857,30043,30137,30433,30494, +30603,31206,32265,32285,33275,34095,34967,35386,36049, +36587,36784,36914,37805,38499,38515,38663,20356,21489,23018,23241,24089,26702, +29894,30142,31209,31378,33187,34541,36074,36300,36845,26015,26389,63997,22519, +28503,32221,36655,37878,38598,24501,25074,28548,19988,20376,20511,21449,21983, +23919,24046,27425,27492,30923,31642,63998,36425,36554,36974,25417,25662,30528, +31364,37679,38015,40810,25776,28591,29158,29864,29914,31428,31762,32386,31922, +32408,35738,36106,38013,39184,39244,21049,23519,25830,26413,32046,20717,21443, +22649,24920,24921,25082,26028,31449,35730,35734,20489,20513,21109,21809,23100, +24288,24432,24884,25950,26124,26166,26274,27085,28356,28466,29462,30241,31379, +33081,33369,33750,33980,20661,22512,23488,23528,24425,25505,30758,32181,33756, +34081,37319,37365,20874,26613,31574,36012,20932,22971,24765,34389,20508,63999, +21076,23610,24957,25114,25299,25842,26021,28364,30240,33034,36448,38495,38587, +20191,21315,21912,22825,24029,25797,27849,28154,29588,31359,33307,34214,36068, +36368,36983,37351,38369,38433,38854,20984,21746,21894,24505,25764,28552,32180, +36639,36685,37941,20681,23574,27838,28155,29979,30651,31805,31844,35449,35522, +22558,22974,24086,25463,29266,30090,30571,35548,36028,36626,24307,26228,28152, +32893,33729,35531,38737,39894,64000,21059,26367,28053,28399,32224,35558,36910, +36958,39636,21021,21119,21736,24980,25220,25307,26786,26898,26970,27189,28818, +28966,30813,30977,30990,31186,31245,32918,33400,33493,33609,34121,35970,36229, +37218,37259,37294,20419,22225,29165,30679,34560,35320,23544,24534,26449,37032, +21474,22618,23541,24740,24961,25696,32317,32880,34085, +37507,25774,20652,23828,26368,22684,25277,25512,26894,27000,27166,28267,30394, +31179,33467,33833,35535,36264,36861,37138,37195,37276,37648,37656,37786,38619, +39478,39949,19985,30044,31069,31482,31569,31689,32302,33988,36441,36468,36600, +36880,26149,26943,29763,20986,26414,40668,20805,24544,27798,34802,34909,34935, +24756,33205,33795,36101,21462,21561,22068,23094,23601,28810,32736,32858,33030, +33261,36259,37257,39519,40434,20596,20164,21408,24827,28204,23652,20360,20516, +21988,23769,24159,24677,26772,27835,28100,29118,30164,30196,30305,31258,31305, +32199,32251,32622,33268,34473,36636,38601,39347,40786,21063,21189,39149,35242, +19971,26578,28422,20405,23522,26517,27784,28024,29723,30759,37341,37756,34756, +31204,31281,24555,20182,21668,21822,22702,22949,24816,25171,25302,26422,26965, +33333,38464,39345,39389,20524,21331,21828,22396,64001,25176,64002,25826,26219, +26589,28609,28655,29730,29752,35351,37944,21585,22022,22374,24392,24986,27470, +28760,28845,32187,35477,22890,33067,25506,30472,32829,36010,22612,25645,27067, +23445,24081,28271,64003,34153,20812,21488,22826,24608,24907,27526,27760,27888, +31518,32974,33492,36294,37040,39089,64004,25799,28580,25745,25860,20814,21520, +22303,35342,24927,26742,64005,30171,31570,32113,36890,22534,27084,33151,35114, +36864,38969,20600,22871,22956,25237,36879,39722,24925,29305,38358,22369,23110, +24052,25226,25773,25850,26487,27874,27966,29228,29750,30772,32631,33453,36315, +38935,21028,22338,26495,29256,29923,36009,36774,37393,38442,20843,21485,25420, +20329,21764,24726,25943,27803,28031,29260,29437,31255, +35207,35997,24429,28558,28921,33192,24846,20415,20559,25153,29255,31687,32232, +32745,36941,38829,39449,36022,22378,24179,26544,33805,35413,21536,23318,24163, +24290,24330,25987,32954,34109,38281,38491,20296,21253,21261,21263,21638,21754, +22275,24067,24598,25243,25265,25429,64006,27873,28006,30129,30770,32990,33071, +33502,33889,33970,34957,35090,36875,37610,39165,39825,24133,26292,26333,28689, +29190,64007,20469,21117,24426,24915,26451,27161,28418,29922,31080,34920,35961, +39111,39108,39491,21697,31263,26963,35575,35914,39080,39342,24444,25259,30130, +30382,34987,36991,38466,21305,24380,24517,27852,29644,30050,30091,31558,33534, +39325,20047,36924,19979,20309,21414,22799,24264,26160,27827,29781,33655,34662, +36032,36944,38686,39957,22737,23416,34384,35604,40372,23506,24680,24717,26097, +27735,28450,28579,28698,32597,32752,38289,38290,38480,38867,21106,36676,20989, +21547,21688,21859,21898,27323,28085,32216,33382,37532,38519,40569,21512,21704, +30418,34532,38308,38356,38492,20130,20233,23022,23270,24055,24658,25239,26477, +26689,27782,28207,32568,32923,33322,64008,64009,38917,20133,20565,21683,22419, +22874,23401,23475,25032,26999,28023,28707,34809,35299,35442,35559,36994,39405, +39608,21182,26680,20502,24184,26447,33607,34892,20139,21521,22190,29670,37141, +38911,39177,39255,39321,22099,22687,34395,35377,25010,27382,29563,36562,27463, +38570,39511,22869,29184,36203,38761,20436,23796,24358,25080,26203,27883,28843, +29572,29625,29694,30505,30541,32067,32098,32291,33335,34898,64010,36066,37449, +39023,23377,31348,34880,38913,23244,20448,21332,22846, 23805,25406,28025,29433,33029,33031,33698,37583,38960,20136,20804,21009,22411, 24418,27842,28366,28677,28752,28847,29074,29673,29801,33610,34722,34913,36872, 37026,37795,39336,20846,24407,24800,24935,26291,34137,36426,37295,38795,20046, @@ -634,7 +644,7 @@ 21518,21564,21897,21957,24127,24460,26429,29030,29661,36869,21211,21235,22628, 22734,28932,29071,29179,34224,35347,26248,34216,21927,26244,29002,33841,21321, 21913,27585,24409,24509,25582,26249,28999,35569,36637,40638,20241,25658,28875, -30054,34407,24676,35662,40440,20807,20982,21256,27958,33016,40657,26133,27427, -28824,30165,21507,23673,32007,35350,27424,27453,27462,21560,24688,27965,32725, -33288,20694,20958,21916,22123,22221,23020,23305,24076,24985,24984,25137,26206, -26342,29081,29113,29114,29351,31143,31232,32690,35440, +30054,34407,24676,35662,40440,20807,20982,21256,27958, +33016,40657,26133,27427,28824,30165,21507,23673,32007,35350,27424,27453,27462, +21560,24688,27965,32725,33288,20694,20958,21916,22123,22221,23020,23305,24076, +24985,24984,25137,26206,26342,29081,29113,29114,29351,31143,31232,32690,35440, diff --git a/system/lib/libc/musl/src/locale/langinfo.c b/system/lib/libc/musl/src/locale/langinfo.c index b2c8569e4d195..14773093b8b88 100644 --- a/system/lib/libc/musl/src/locale/langinfo.c +++ b/system/lib/libc/musl/src/locale/langinfo.c @@ -1,7 +1,6 @@ #include #include #include "locale_impl.h" -#include "libc.h" static const char c_time[] = "Sun\0" "Mon\0" "Tue\0" "Wed\0" "Thu\0" "Fri\0" "Sat\0" @@ -33,7 +32,11 @@ char *__nl_langinfo_l(nl_item item, locale_t loc) int idx = item & 65535; const char *str; - if (item == CODESET) return MB_CUR_MAX==1 ? "ASCII" : "UTF-8"; + if (item == CODESET) return loc->cat[LC_CTYPE] ? "UTF-8" : "ASCII"; + + /* _NL_LOCALE_NAME extension */ + if (idx == 65535 && cat < LC_ALL) + return loc->cat[cat] ? (char *)loc->cat[cat]->name : "C"; switch (cat) { case LC_NUMERIC: diff --git a/system/lib/libc/musl/src/locale/legacychars.h b/system/lib/libc/musl/src/locale/legacychars.h index 914ad0d5127b4..9639b4af9699c 100644 --- a/system/lib/libc/musl/src/locale/legacychars.h +++ b/system/lib/libc/musl/src/locale/legacychars.h @@ -1,41 +1,40 @@ -0,1,160,167,168,169,175,176,178,183,184,198,215,216,230,247,248,162,163,165, -196,197,198,199,201,214,215,216,220,224,226,228,229,230,231,232,233,234,235, -236,238,239,242,244,246,248,249,251,252,255,256,257,258,259,260,261,262,263, -264,265,266,267,268,269,270,271,272,273,274,275,278,279,280,281,282,283,284, -285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,303,304,305, -308,309,310,311,312,313,314,315,316,317,318,321,322,323,324,325,326,327,328, -330,331,332,333,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350, -351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369, -370,371,372,373,374,375,376,377,378,379,380,381,382,402,416,417,431,432,536, -537,538,539,710,711,728,729,731,732,733,768,769,771,777,803,890,900,901,902, -904,905,906,908,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924, -925,926,927,928,929,931,932,933,934,935,936,937,938,939,940,941,942,943,944, -945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963, -964,965,966,967,968,969,970, -971,972,973,974,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036, -1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052, -1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067, -1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082, -1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097, -1098,1099,1100,1101,1102,1103,1105,1106,1107,1108,1109,1110,1111,1112,1113, -1114,1115,1116,1118,1119,1168,1169,1456,1457,1458,1459,1460,1461,1462,1463, -1464,1465,1467,1468,1469,1470,1471,1472,1473,1474,1475,1488,1489,1490,1491, -1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506, -1507,1508,1509,1510,1511,1512,1513,1514,1520,1521,1522,1523,1524,1548,1563, -1567,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582, -1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1600,1601,1602, -1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617, -1618,1657,1662,1670,1672,1681,1688,1705,1711,1722,1726,1729,1746,3585,3586, -3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601, -3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616, -3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631, -3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3647,3648,3649,3650, -3651,3652,3653,3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665, -3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,7682,7683,7690,7691,7710, -7711,7744,7745,7766,7767,7776,7777,7786,7787,7808,7809,7810,7811,7812,7813, -7922,7923,8204,8205,8206,8207,8211,8212,8213,8215,8216,8217,8218,8220,8221, -8222,8224,8225,8226,8230,8240,8249,8250,8362,8363,8364,8367,8359,8470,8482, -8729,8730,8776,8804,8805,8992,8993,9472,9474,9484,9488,9492,9496,9500,9508, +256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274, +275,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295, +296,297,298,299,302,303,304,305,308,309,310,311,312,313,314,315,316,317,318, +321,322,323,324,325,326,327,328,330,331,332,333,336,337,338,339,340,341,342, +343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361, +362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380, +381,382,402,416,417,431,432,536,537,538,539,710,711,728,729,731,732,733,768, +769,771,777,803,890,900,901,902,904,905,906,908,910,911,912,913,914,915,916, +917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936, +937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955, +956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974, +1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1038,1039,1040, +1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055, +1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070, +1071, +1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086, +1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101, +1102,1103,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1118, +1119,1168,1169,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1467,1468, +1469,1470,1471,1472,1473,1474,1475,1488,1489,1490,1491,1492,1493,1494,1495, +1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510, +1511,1512,1513,1514,1520,1521,1522,1523,1524,1548,1563,1567,1569,1570,1571, +1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586, +1587,1588,1589,1590,1591,1592,1593,1594,1600,1601,1602,1603,1604,1605,1606, +1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,1657,1662,1670, +1672,1681,1688,1705,1711,1722,1726,1729,1746,3585,3586,3587,3588,3589,3590, +3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605, +3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620, +3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635, +3636,3637,3638,3639,3640,3641,3642,3647,3648,3649,3650,3651,3652,3653,3654, +3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669, +3670,3671,3672,3673,3674,3675,7682,7683,7690,7691,7710,7711,7744,7745,7766, +7767, +7776,7777,7786,7787,7808,7809,7810,7811,7812,7813,7922,7923,8204,8205,8206, +8207,8211,8212,8213,8215,8216,8217,8218,8220,8221,8222,8224,8225,8226,8230, +8240,8249,8250,8319,8359,8362,8363,8364,8367,8470,8482,8729,8730,8734,8745, +8776,8801,8804,8805,8976,8992,8993,9472,9474,9484,9488,9492,9496,9500,9508, 9516,9524,9532,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563, 9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,9578, 9579,9580,9600,9604,9608,9612,9616,9617,9618,9619,9632, diff --git a/system/lib/libc/musl/src/locale/locale_map.c b/system/lib/libc/musl/src/locale/locale_map.c index ad0c7e825d7e0..5b69356533cfa 100644 --- a/system/lib/libc/musl/src/locale/locale_map.c +++ b/system/lib/libc/musl/src/locale/locale_map.c @@ -1,8 +1,16 @@ #include #include +#include +#include #include "locale_impl.h" #include "libc.h" -#include "atomic.h" +#include "lock.h" +#include "fork_impl.h" + +#define malloc __libc_malloc +#define calloc undef +#define realloc undef +#define free undef const char *__lctrans_impl(const char *msg, const struct __locale_map *lm) { @@ -11,10 +19,6 @@ const char *__lctrans_impl(const char *msg, const struct __locale_map *lm) return trans ? trans : msg; } -const unsigned char *__map_file(const char *, size_t *); -int __munmap(void *, size_t); -char *__strchrnul(const char *, int); - static const char envvars[][12] = { "LC_CTYPE", "LC_NUMERIC", @@ -24,9 +28,11 @@ static const char envvars[][12] = { "LC_MESSAGES", }; +volatile int __locale_lock[1]; +volatile int *const __locale_lockptr = __locale_lock; + const struct __locale_map *__get_locale(int cat, const char *val) { - static int lock[2]; static void *volatile loc_head; const struct __locale_map *p; struct __locale_map *new = 0; @@ -57,21 +63,13 @@ const struct __locale_map *__get_locale(int cat, const char *val) for (p=loc_head; p; p=p->next) if (!strcmp(val, p->name)) return p; - LOCK(lock); - - for (p=loc_head; p; p=p->next) - if (!strcmp(val, p->name)) { - UNLOCK(lock); - return p; - } - #ifndef __EMSCRIPTEN__ // don't support MUSL_LOCPATH which uses mmap if (!libc.secure) path = getenv("MUSL_LOCPATH"); /* FIXME: add a default path? */ if (path) for (; *path; path=z+!!*z) { z = __strchrnul(path, ':'); - l = z - path - !!*z; + l = z - path; if (l >= sizeof buf - n - 2) continue; memcpy(buf, path, l); buf[l] = '/'; @@ -113,6 +111,5 @@ const struct __locale_map *__get_locale(int cat, const char *val) * requested name was "C" or "POSIX". */ if (!new && cat == LC_CTYPE) new = (void *)&__c_dot_utf8; - UNLOCK(lock); return new; } diff --git a/system/lib/libc/musl/src/locale/newlocale.c b/system/lib/libc/musl/src/locale/newlocale.c index f50bbe9132df3..9ac3cd386f99d 100644 --- a/system/lib/libc/musl/src/locale/newlocale.c +++ b/system/lib/libc/musl/src/locale/newlocale.c @@ -1,49 +1,70 @@ #include #include +#include #include "locale_impl.h" -#include "libc.h" +#include "lock.h" + +#define malloc __libc_malloc +#define calloc undef +#define realloc undef +#define free undef + +static int default_locale_init_done; +static struct __locale_struct default_locale, default_ctype_locale; int __loc_is_allocated(locale_t loc) { - return loc && loc != C_LOCALE && loc != UTF8_LOCALE; + return loc && loc != C_LOCALE && loc != UTF8_LOCALE + && loc != &default_locale && loc != &default_ctype_locale; } -locale_t __newlocale(int mask, const char *name, locale_t loc) +static locale_t do_newlocale(int mask, const char *name, locale_t loc) { - int i, j; struct __locale_struct tmp; - const struct __locale_map *lm; + + for (int i=0; icat[i] : + __get_locale(i, (mask & (1<cat[i] = __get_locale(i, name); + *loc = tmp; return loc; } - /* Otherwise, build a temporary locale object, which will only - * be instantiated in allocated storage if it does not match - * one of the built-in static locales. This makes the common - * usage case for newlocale, getting a C locale with predictable - * behavior, very fast, and more importantly, fail-safe. */ - for (j=i=0; icat[i]; - else - lm = __get_locale(i, mask & (1< #include +#include "pleval.h" /* grammar: diff --git a/system/lib/libc/musl/src/locale/pleval.h b/system/lib/libc/musl/src/locale/pleval.h new file mode 100644 index 0000000000000..cc515f42f435e --- /dev/null +++ b/system/lib/libc/musl/src/locale/pleval.h @@ -0,0 +1,8 @@ +#ifndef PLEVAL_H +#define PLEVAL_H + +#include + +hidden unsigned long __pleval(const char *, unsigned long); + +#endif diff --git a/system/lib/libc/musl/src/locale/revjis.h b/system/lib/libc/musl/src/locale/revjis.h new file mode 100644 index 0000000000000..3ab369f6ef5a4 --- /dev/null +++ b/system/lib/libc/musl/src/locale/revjis.h @@ -0,0 +1,515 @@ +31,80,81,87,14,299,74,61,12,344,62,63,1280,1281,1282,1283,1284,1285,1286,1287, +1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302, +1303,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325, +1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1542,1536,1537,1538,1539, +1540,1541,1543,1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,1554,1555, +1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1584,1585, +1586,1587,1588,1589,1591,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601, +1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616, +1590,29,28,33,37,38,39,40,342,343,36,35,338,75,76,263,77,337,266,267,265,268, +300,301,302,318,303,319,281,282,60,324,326,70,315,297,298,288,287,328,329,71, +327,325,321,65,320,68,69,322,323,285,286,283,284,316,317,1792,1803,1793,1804, +1794,1805,1795,1806,1797,1808,1796,1807,1798,1819,1814,1809,1800,1821,1816, +1811,1799,1815,1820,1810,1801,1817,1822,1812,1802,1818,1823,1813,258,257,260, +259,262,261,256,93,90,92,91,349,89,88,73,72,341,340,339,0,1,2,22,24,25,26,49, +50,51,52,53,54,55,56,57,58,264,269,43,44,32, +768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786, +787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805, +806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824, +825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843, +844,845,846,847,848,849,850,10,11,20,21,1024,1025,1026,1027,1028,1029,1030, +1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045, +1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060, +1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075, +1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090, +1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105, +1106,1107,1108,1109,5,27,18,19,3915,8793,6934,10843,7493,6671,7492,4379,10291, +11294,12033,4110,4685,12034,7939,12577,5173,10521,7494,11549,10529,12035,8773, +12036,5465,12037,4924,8719,6982,12038,12039,12040,9748,5174,9750,9538,5922, +10770,18472,12041,7495,12042,4372,5444,5967,11080,13573,11343,9564,4868,5140, +12043,12044,11546,11292,8263,12046,6741,9554,12049,4125,5950,5949,3909,11818, +11817,6418,3840,12050,12051,12052,10771,12053,5969,3910,10833,5211,5212,5213, +9025,11547,12054,12055,12056,7724,7193,7725,12061,12059,12060,5175,6402,4431, +12058,12057,10504,6693,6692,8477,12062,10292,8006,23,12063,12065,8516,11584, +3881,12064,4381,5411,8774,5710,12066,9731,4938,12067,3882,5951,4939,10329, +10001,5176,4432,12102,9248,9803,12069,10011,11585,7692,6694,6742,4383,9008, +8705,12073,3883,9026,7194,6419,11267,8493,4382,12072,11293,12068,12070,6477, +12071,13315,12079,12082,12080,4385,10522,12074,12078,5970,6695,4869,12083, +12075,11586,6743,12076,12081,12084,12077,5376,3884,5377,4384,13316,10840, +10317,5971,7694,11542,10551,5655,8452,4419,7218,12088,12093,12091,12086,8462, +12089,12092,12090,10556,12087,7693,10834,12094,12095,7171,12108,9775,10261, +12103,10575,4373,12107,12101,12110,8241,5923,9787,16166,12109,9276,12098,5973, +5972,12096,6969,12104,10574,8748,12100,5712,12097,12105,12099,11568,12106, +11808,5445,5711,12111,12112,12116,3885,10543,12115,12114,12118,12117,9027, +5713,12119,6948,8453,9028,5461,12120,5141,12121,12123,10772,5701,6672,10070, +12122,6436,11298,12125,12290,12124,6435,7260,5656,12291,5422,12288,12289,9486, +8283,5378,10796,12292,11548,12293,12296,12294,8237,12295,12297,12299,12298, +10535,5142,12301,12302,4366,12300,6995,12305,12304,12303,12085,12306,7261, +12307,11268,11064,12309,12308,12311,12310,12312,12313,3923,5908,5658,7195, +8794,5379,8007,5974,6221,12315,11047,9253,6744,12314,12316,9277,4692,12317, +9565,8211,12319,12320,9995,5975,11802,12321,5381,10523,8469,5456, +9236,5714,12322,12323,9537,4158,12326,6492,12325,6437,12327,17741,12328,10784, +12329,12330,12331,7496,6955,4870,12334,12332,11036,12333,10297,12335,12336, +12337,9278,12341,12339,12340,12338,6466,12342,11081,11587,12343,7943,12344, +7225,12345,8795,11550,9279,12580,12346,21252,5412,12347,10813,7239,8539,12349, +9539,12350,12351,4621,12352,5382,9515,4185,7215,9984,12353,9280,7726,12354, +10507,7993,4865,4872,12355,12357,5657,12356,11602,7240,10012,10539,12358, +11351,12359,12360,9309,12361,7944,6493,5715,12362,6696,6222,9029,12364,8454, +6478,12365,12366,8207,12363,12368,10773,6211,12367,5716,6461,9804,12371,12369, +10330,7497,12378,4675,12372,12370,8238,12374,12373,4643,5695,12379,11532, +12375,12380,12377,12376,11566,5976,4386,11603,7252,9271,6212,12545,12546, +11588,11786,12548,5977,12547,4622,12549,10805,8987,11269,10552,12550,20276, +9487,12551,4873,11026,7424,12552,10566,12556,7945,12553,5423,12554,4874,5645, +12557,12558,12559,12560,6970,5978,11069,11079,9558,10576,12561,12562,12564, +12566,12565,12567,4380,10795,6491,12568,8248,7425,5384,12569,10042,12570, +12571,12572,12573,10243,5447,3908,9502,12574,7196,8008,12576,12575,7426,5952, +12578,10013,12579,10043,8467,8525,5383,9549,8720,9805,10797,12581,8009,5652, +12582,12583,4107,3924,4940,8455,5168,11344,12586,4374,12585,5385,12587,11088, +12588,11569,5979,5909,12589,12591,12590,7742,4120,4157,12592,12593,5910,12594, +5197,6673,12595,10835,6420,5177,11270,8239,10014,7004,7206,6983, +6996,7253,10015,12598,4130,8240,5980,5924,5446,12602,8704,8541,5386,7427, +12603,12601,4387,8517,6935,6698,4101,4687,6213,6697,12604,12605,5160,4645, +6214,5159,9022,4100,9488,11037,6144,11352,9254,5981,5646,12614,5442,10793, +10044,12613,4925,12608,12609,12611,12612,5178,7744,10508,12610,12606,5954, +12607,11779,10577,9031,5953,6223,12615,9532,12619,7005,6997,12622,12620,11010, +12617,12626,12621,12624,5925,11038,12625,12627,12629,6479,11809,12618,12616, +12628,12623,12631,12802,12633,12637,12800,12634,12829,6472,4624,12632,12804, +3925,12803,3844,10281,12801,12635,12630,12636,6439,12805,3926,12814,12806, +12807,7428,10824,12812,12811,9230,12813,12810,4115,6421,7695,12808,9281,12809, +3841,12819,11266,7430,12825,12824,12815,8482,12816,8526,12821,7429,12818, +11075,5659,12822,12823,12820,12826,12817,12832,12837,12833,12828,12838,8208, +12840,6145,12830,8796,12834,12827,4876,4941,4676,12835,12831,5717,12841,12839, +8242,5161,5387,12836,5459,4131,12845,12843,13062,12848,12842,12846,12844,6699, +12847,12850,12855,12853,12852,8721,4388,12849,12851,7431,4114,12854,4413, +12865,7515,12861,12859,12860,12862,4124,8216,12856,12857,4697,12864,4942, +12867,12863,12866,10509,9524,10007,12869,12868,4644,12870,12873,12872,12871, +9752,12874,12875,12877,12876,12879,12882,12880,12878,12881,12883,12884,12885, +12886,12887,12324,7003,6700,4434,3927,8739,12888,6403,3886,7741,12889,5926, +6224,12891,12890,10559,12892,13056,12893,13057,13058,5718,4159,13059,13061, +13060, +13063,9273,13064,3860,6462,5660,8750,13065,13066,13068,13069,6467,5424,10774, +13067,13070,6432,6146,13074,6404,8722,13071,9017,13075,7745,13073,13076,5662, +13077,13078,6147,4639,13080,13081,13082,13079,13072,13083,13084,10819,7498, +13086,13087,13085,13089,9751,3911,10293,13090,7516,6936,9788,4943,6474,10808, +9489,5719,8494,13088,13091,8483,13092,13093,13095,9032,4877,21248,4160,10578, +7499,9255,6469,13101,10524,11580,4435,13097,8217,13100,9282,9256,9283,10008, +9004,6440,13096,4181,9237,13098,13094,7727,13102,7213,5388,13103,10567,8284, +8997,13105,10798,13106,13111,10510,13110,13104,13107,13109,6405,10536,13112, +8740,4436,7500,13114,13113,6215,13115,13117,13116,13119,13108,13121,13120, +13118,6701,7728,8243,13122,7963,3916,9795,9018,13124,13123,13125,13126,13127, +13128,10544,13129,4389,13130,11291,4623,12584,7207,8478,13131,11082,11027, +13133,8518,9238,8479,10294,13134,13135,4186,6937,13136,3887,13137,13138,4161, +4944,9535,10579,13142,8244,13141,5663,10810,13140,9284,13144,13143,13146, +13145,4187,13147,7432,13149,8708,13148,10514,7254,9274,13312,6148,13313,9728, +10045,11056,9732,13322,5143,11300,11022,13579,13314,13317,8484,10775,9257, +13318,10820,6441,7433,13319,6703,6702,3864,5927,7946,3888,13323,13324,13321, +4119,4878,13320,11044,10256,3847,3928,6704,3889,3842,13329,13327,11035,13330, +13328,13326,7696,13325,10553,5955,13334,13335,7434,13331,11787,9771,13333, +6406,13336,10295,13337,13332,11034,9789,13338,10257,13339,13343, +13340,4390,13342,6938,13341,5720,13355,13348,13345,8771,13344,13346,13347, +13349,13350,4945,13352,13351,13353,7501,13356,9019,4132,13354,13357,13358, +13361,13359,13360,6705,13362,6149,13363,6745,8471,13364,13365,6713,6150,11057, +5127,5928,13366,4663,13367,8472,13368,13570,13369,13370,13371,13373,13374, +13375,8527,4102,6984,3873,8246,4879,6932,6151,9285,7168,4880,8775,9033,3863, +5144,10580,6945,5169,8010,6939,11271,13376,5179,6442,4625,4162,7435,4391, +13377,11301,7208,6979,13378,4946,9521,11016,13379,13380,10296,13382,4871,5462, +13381,4881,7697,13386,6656,4392,13385,13383,13387,13384,9738,15148,7698,13388, +11551,13389,13391,8797,13390,7938,6746,8495,6998,10324,8011,6956,13392,7436, +13393,13394,3890,8473,7729,13395,9490,7437,7438,13396,8012,7439,13397,13398, +11071,13399,5413,7169,13400,13401,6971,7691,9555,7731,10071,9729,5416,13402, +5198,13403,5469,9518,4367,6706,13404,13569,13568,5468,13405,9239,8463,9258, +6951,8247,11353,13571,13572,9525,6674,13574,13575,13576,4947,13577,13578,4363, +8218,4931,13580,11015,8497,4664,13582,13584,4926,13581,13583,13586,13585, +13587,13588,9500,5389,4420,13589,13594,13592,10582,10581,9286,13591,7219, +13590,7761,13595,6473,13601,13602,13596,4626,13597,13606,13605,13604,13600, +13599,13603,10583,13610,13607,13609,11345,13608,13598,7762,13611,6422,13612, +13613,13616,13615,13614,9287,13593,13622,13618,13617,13619,13620,13623,11589, +13624,13621,13625,4927,13626,13628,13627,13629,13630,8013,7170, +7235,8258,6152,6423,6153,5199,13631,6424,5929,13632,11013,9762,13633,6154, +4875,8710,5425,6707,10298,10016,13634,4948,13637,8960,13636,13635,13638,9034, +7746,6708,7977,8498,5121,8961,13639,13640,7502,10776,13643,13642,13641,10332, +13650,10809,13644,13646,10826,13645,13647,9991,13648,10525,13649,4882,10526, +9742,13651,13652,6155,4883,13653,5911,11299,11272,4949,13655,8962,6156,7440, +10046,7441,7255,9035,10584,9240,6157,10299,13656,9272,6433,5930,9036,3874, +7245,6158,11302,13657,13658,9776,13659,11606,11788,13661,13660,4646,13824, +13827,13828,13826,10271,7442,13830,13829,13825,13831,13832,13833,13836,13834, +13835,13837,4163,9037,13838,5721,4437,9749,13839,9562,10554,13840,11789,13841, +10527,13844,12032,12048,6927,9556,13845,5180,8963,3929,13846,10501,6159,8751, +9038,11086,5912,5931,13847,13848,13854,6980,8964,5390,13849,10250,8741,13850, +13851,5391,13852,13853,13855,9301,13856,13857,13858,13843,13842,13859,5664, +10246,6443,10262,8965,10282,13860,7443,4133,13861,13862,11089,10047,13865, +4188,7947,13864,13863,5665,8499,13869,13867,13866,11526,5956,7256,13868,9259, +7197,9503,13872,13871,13870,13873,5957,13874,10331,7226,13875,10072,9504,8966, +9231,13876,5130,7699,10251,4950,9733,13877,6709,10777,10778,4189,13882,8776, +13879,4438,14092,13881,9743,13880,13878,6233,13884,13890,13896,13888,9275, +13893,10300,13887,13892,11590,6710,8500,13885,5181,13895,7948,4164,13889,4439, +13894,5392,13891,13897,13899,13909,13907,13904,13903,11607, +13905,5393,6160,7257,13912,13898,13902,13886,4441,13906,13908,8752,6407,4375, +13900,13911,13910,5394,8456,4677,5666,13901,13913,13916,14080,6940,14086,9039, +13914,14084,4440,14082,14083,13917,14081,5958,11273,4884,4152,14085,9753,3852, +10048,13883,14091,14095,11076,14088,9288,14093,7503,14094,9526,11814,14090, +14096,6234,7978,3891,14089,14087,8249,13915,6675,8485,14108,8250,14103,14100, +14101,6981,14104,14107,14102,7172,14105,14099,11099,11098,14109,14110,3892, +14098,5457,3845,4885,14106,14114,14113,14118,14119,14117,14120,14112,14116, +14121,14122,14111,6747,14115,8501,6161,14097,7700,14135,10568,14125,14126, +14127,14134,14133,10844,4886,14131,5668,4627,14128,11543,14130,3893,14132, +14123,14129,14136,5667,14124,11324,11274,14139,14143,8285,11608,14144,14141, +14138,14137,14142,10511,9491,5669,14145,14140,14146,5722,4368,14154,4887, +14152,14153,6408,14151,14149,14148,14155,14147,14157,4442,14159,14158,8967, +14162,14160,14150,5723,14161,14165,14164,14166,14163,14167,14168,14169,10569, +14171,14170,7198,7949,4421,4443,14172,3870,7979,14173,19234,14336,5696,14337, +8014,14338,14339,5145,14340,14341,14342,8502,5932,11072,10779,7241,14343,8015, +19740,10049,6985,6444,14344,8486,10502,8528,14347,14345,14348,14346,14349, +10512,3862,10301,10050,14350,14353,7444,5146,14351,14358,7445,14352,9763, +11325,14354,14355,14359,9289,14356,6162,7997,14373,10003,8529,10051,14604, +10585,9040,10836,14362,4352,8777,14371,8723,14365,14372,14367,14374,14370, +14369,9806,14363, +4444,14361,5200,8530,14357,14360,6163,7994,7446,14368,9777,5201,4647,4678, +7680,14376,14381,14377,5724,14382,6657,6216,7173,14364,6748,14379,6711,14380, +3875,14375,8968,5202,5395,14378,3846,6434,7701,9041,10035,14384,8253,8457, +6666,14385,14387,14383,10560,8988,8251,10586,6957,14399,14398,7767,5725,14392, +7448,9543,9744,14390,8252,6999,14395,7447,14389,14394,9778,14388,5632,4668, +14396,11530,6445,8724,14393,7995,6164,7747,4165,8219,14391,5156,5670,9006, +14397,8254,14400,14402,8470,14408,14403,14405,10272,9042,14406,11275,11303, +4888,3853,14404,14401,4951,4166,14407,11304,14411,8474,14418,14412,14409, +14416,14386,14413,14417,10017,9290,14410,14414,5671,6480,7996,14422,9221, +14419,10815,14420,14421,11053,7937,5697,14428,6676,14425,14424,9745,9492,9232, +14426,14427,10318,9764,6658,8016,10799,4648,14596,14429,11305,14598,14594, +14595,8255,14593,14366,14597,14592,14602,14603,9222,14605,6659,14600,5147, +14606,14599,14610,14609,14608,14611,14613,7504,14612,14616,14614,14615,14415, +14618,14617,14423,14619,14607,6712,14620,14621,14623,14622,14624,4445,6165, +10587,7950,5933,14626,14629,10289,5182,14628,14627,9779,14630,5396,14632, +14631,4889,6677,9527,5672,7763,14633,7951,9223,10302,14634,14635,14636,10519, +13372,7973,10283,6455,10052,10018,9260,11552,14638,6959,14639,3861,5427,7980, +10303,14640,6689,8742,6714,7702,14641,10588,4182,6715,14644,14642,14645,11544, +14643,8026,14646,8465,14647,4953,14649,14648,14650,14651,4954,9563, +8725,5195,6716,8256,7227,3855,14652,4353,14656,6166,14655,6410,7449,14654, +7450,11039,6409,3894,7981,14661,7952,4134,7220,10821,6481,7451,7942,14660, +14658,14659,8778,14853,14665,6749,6167,14663,14664,7703,14662,6670,14667, +14666,14671,14672,14668,4609,14669,14670,10036,10304,5673,14673,7953,7452, +8753,5414,14674,14678,4394,14675,14677,14676,7242,8743,3876,14679,14680,8969, +11600,6690,10570,10780,14849,14682,14685,14684,14681,14848,9533,14683,14850, +7243,14851,11306,9815,14852,14854,14855,14856,5417,4135,6168,14857,14858,7248, +8257,12599,8221,8220,8503,6438,12113,5709,11276,10589,10333,14859,6482,8990, +14860,11790,10781,8970,14861,4955,14862,14863,11065,11011,10837,10811,6660, +14865,6986,10800,14867,14870,14869,4952,5183,14866,14868,14871,7768,11354, +3880,6463,8475,6972,7506,14874,9261,14872,8458,14873,7505,11068,14875,14876, +11335,14881,6169,9780,14878,9291,14653,14657,5166,9766,14880,7453,10019,14886, +10073,14877,14883,14882,7982,10828,11570,10822,4395,6717,11815,14885,7764, +14884,14879,5934,14891,14889,4396,14887,14893,14899,8487,10528,14901,10241, +14900,9807,10782,4890,8022,7199,9010,11277,14896,14895,14897,14894,14902, +14892,14890,14898,14888,8779,11095,6949,6483,6425,10830,4640,9005,9513,4136, +8017,7955,5641,14904,6170,4699,14906,4691,14912,14909,8018,4650,6411,4649, +6446,14907,5700,5674,9292,14905,3877,14908,14910,5420,5643,4891,5162,14913, +6488,10832,6678,14914,10255,14926,4370,14915,14932,14916,11553,14923, +9790,14931,14918,3859,14920,6171,14922,14921,14917,14928,7454,13132,5959, +11355,14919,9043,4610,6412,14911,14927,4672,14925,14929,9293,4957,15121,11048, +14934,4956,14941,10783,15104,15106,15110,14936,8713,9294,15114,14939,15111, +15105,7704,15115,7954,15113,4892,11823,14933,15109,3895,14935,11033,14940, +7681,8998,14930,15108,7769,15118,4688,5888,15120,14937,15119,15112,14938, +15116,15117,15134,9517,15107,15130,15132,9015,11307,10325,15127,8489,15133, +8222,15124,15137,15136,9550,15135,9545,15139,15126,5415,15129,7228,9791,15131, +5418,15123,15125,15122,11791,4665,15128,15138,4628,6470,4156,15155,11792, +15158,7705,15157,15156,15153,15141,15170,15140,15159,15151,15146,15143,15144, +15152,21249,15149,6172,8999,8259,15147,15142,15145,11308,10825,15150,15160, +15168,15161,15174,15172,15167,15166,9007,8260,15164,15162,15169,15175,10068, +15181,15176,15179,15173,8787,10263,15163,15171,7455,11054,15191,15178,5889, +4354,4670,15154,7456,15183,15190,7000,4689,8717,15180,15185,15189,5397,5163, +15187,5120,9514,15186,15188,15182,15184,4671,8744,15195,15193,5960,15192, +15360,14903,15194,15196,15197,15371,15367,14924,15366,15365,15362,15177,15364, +15363,15369,11781,15372,5466,15368,15370,9990,15373,15377,15374,11346,15375, +15165,15378,15379,4116,15381,5702,6912,5428,4355,11326,15383,15382,15385,5148, +5429,4893,15388,15387,15389,4397,8726,15390,4894,15392,15391,15393,15394, +15395,6718,7956,6400,10319,10561,11811,6740,6447,11601,15396,15397,6719,15398, +15399,15401,15400,10807, +7229,6987,6691,15402,15404,7682,15403,15405,15406,15407,15408,15409,15411, +15410,15412,4356,8745,15413,6661,4651,15414,9249,13099,5122,15415,15416,10571, +10823,9510,15417,10053,10074,11058,15418,15420,15419,15422,15421,15424,6720, +11024,15425,15426,5123,15427,15429,15428,7748,10264,4137,10020,9044,7200,5184, +10021,6925,15431,4895,4183,9553,15430,6173,8754,15432,15440,15433,8480,5185, +15441,5703,5124,15439,15437,15434,11327,8991,9528,15435,15443,15442,5634,4364, +6426,15436,15438,10806,8531,10838,15451,15452,4398,10503,11100,15616,6914, +7457,15447,15453,4167,5398,15444,15449,8019,9808,10054,15446,10752,15448, +15619,15617,15450,10753,9767,5186,9220,8780,15620,15618,8504,15445,4138,11309, +15631,15630,8021,15627,11339,9493,15621,8996,4139,6174,15624,7174,15629,15628, +15623,15626,4679,15625,9768,11533,7507,8020,15637,15635,10284,15632,15634, +4121,6175,11793,4636,10305,11328,4611,7706,15636,15641,7458,11279,15638,15633, +15639,11581,9298,9505,4629,4148,15645,15648,11554,11331,15655,15649,15646, +11571,15652,7209,15654,15659,9296,15657,15651,8727,15658,15647,15653,15660, +3931,15650,15661,7707,7230,10500,6413,15642,15656,9241,7957,4680,6448,7459, +15644,7201,5675,15643,15665,7244,5913,15680,15674,5203,9262,15669,15678,3854, +4113,4376,15671,8459,15662,15664,6176,15681,15676,15668,15675,11018,15673, +15677,5935,7460,8728,15667,11278,15670,15663,9297,15666,15672,11824,6941, +10845,15682,9997,15694,5914,7231,15684,11534,6177,15697,3917,15695,15683, +15689,15691,11310,15686,9229,15688,15696,15690,11046,15685,6913,15709,4681, +15687,15692,15693,8523,8505,15701,15707,15705,9224,15874,15702,15703,15679, +5208,10265,6942,6230,11794,15699,15873,4168,8261,9816,4896,11609,11008,9009, +15706,15708,8209,15872,15704,15698,4898,5704,15886,15881,8023,4674,7232,15890, +15883,8971,15880,9016,15915,15877,15876,15885,15879,15878,15884,7936,15875, +15887,15888,4897,15893,15892,15894,15897,9250,15891,15895,5698,8536,15889, +9754,15896,15901,15899,15902,15905,15898,6217,9735,15640,11347,15900,15904, +8532,15903,15882,20040,15908,15912,15910,15906,15907,15911,15909,10285,15917, +15914,15913,15916,9523,15918,8788,8524,7940,15919,15921,15920,15700,15922, +9542,15923,4399,9299,4612,5187,6973,6449,11782,7749,4169,15925,15924,15928, +8729,15931,15926,15930,15929,9247,3896,11604,15933,4103,15935,15934,15932, +15927,10754,15937,15936,4170,15939,10513,15938,11028,7462,8210,7461,11610, +15945,8024,15941,15946,4171,15944,9792,15940,15943,7463,10032,15947,6960,8025, +15950,15942,5638,15948,11311,15951,21253,7214,15952,15953,9741,15955,15956, +9746,9300,15958,15960,11572,15957,15959,4172,15954,12858,15961,8262,6679, +15963,15962,7683,12600,15964,16128,15949,15965,16129,9817,16130,16131,16132, +16133,9021,16135,16134,16136,16137,6974,10306,11083,16138,16139,8245,6915, +16140,16141,16142,10545,10022,16143,9782,8972,16144,4422,5196,11045,11029, +4371,11795,10801,10505,7958,16145,9506,5890,16146,6451,16148,16147,16149, +16150,16151,5149,16152,16153, +5891,10023,16155,7508,16154,5399,16156,16158,16157,16159,5936,16160,5448,8223, +6236,16162,16163,16161,6988,9511,5400,16165,8715,16164,11796,9793,16168,16170, +16167,11059,16169,16171,11555,16175,16174,8789,9740,5892,16173,16172,11280, +11281,16176,4173,6229,6721,16177,16178,16180,7202,16182,16181,16183,4652, +16185,16184,16187,16186,5915,11527,5419,4357,5449,4928,11591,16189,16191, +16192,4400,16188,6680,8992,16190,16195,6989,16193,5661,10024,16194,16221, +16200,5916,5188,16197,11356,11535,8533,16199,16201,11573,5430,10075,9769, +16202,16204,16207,16203,16206,5961,4140,16208,7759,16205,11579,16211,21251, +16209,16212,16198,16210,6427,16213,16214,11357,16215,16216,16196,16217,4899, +6916,16218,16219,16220,4122,16384,10266,16385,4867,16386,16387,16388,16390, +16391,16389,10290,16393,16392,16395,16394,16396,16397,16399,16398,6232,16401, +16400,4900,7730,9243,16402,7959,6681,4184,16403,11312,10562,16404,9251,11282, +6178,7708,8746,12563,8973,4423,16405,16406,16411,16409,16408,14625,4613,16407, +3897,9993,10025,11536,16412,16410,8763,7941,9994,10252,16414,11531,5676,16415, +16413,10037,16416,16417,3898,7509,16422,16419,9548,16418,5125,16425,16420, +16421,16424,16423,10244,8225,8224,5150,16426,16427,16428,16430,16429,4149, +16438,10055,16432,16434,16436,7709,16437,16435,6943,16431,16433,10273,7464, +16440,16439,16441,6917,6414,9302,16442,9002,16444,11520,16443,8264,16449, +16451,16452,8755,16450,16447,16445,16446,16448,16455,16453,16454,16456,16458, +16459,16460,16461,16457, +16463,16462,16464,11556,16467,16465,16466,4929,11101,10537,16469,16468,16470, +16471,16475,16472,16473,16474,16476,16477,16640,16641,16642,9998,9263,16643, +9809,10259,16644,16645,9225,4614,6179,16646,16647,16648,6664,16650,16649, +16651,16652,10056,16653,16654,21064,16655,16656,16657,6669,16658,9781,10814, +4141,4150,16659,16661,16660,9295,7960,15384,16662,11040,16663,4901,10038, +16664,16665,16666,11067,11060,8989,8265,16668,7233,7465,16671,16670,16669, +10076,4902,5896,16677,16674,7710,11025,16673,16675,16676,16672,16678,16679, +8974,4930,8772,16680,16681,16684,7750,9507,16685,10802,16682,16683,16688, +16687,16686,16690,16689,16691,16693,16692,10540,7221,11557,16694,9494,16695, +16696,16700,16698,16699,16697,16701,16702,16703,16704,11030,16705,11087,16706, +8749,9801,5450,8730,16707,5401,7983,16708,6428,16709,16710,5893,6452,16712, +9269,6453,5165,10755,9770,9270,6203,16714,7466,11537,6180,5894,9986,16716, +16718,5962,16717,9045,16720,4630,16715,10057,4111,6475,11825,16719,16721, +10538,7992,16723,16724,16722,4653,16730,16729,6918,16731,16726,16732,16727, +10039,16725,16728,16897,16896,10816,16733,3914,16899,16898,7467,16900,8226, +16902,16901,16903,16711,16713,16905,16904,6919,11592,6961,16906,5654,5151, +5126,6722,11283,16912,16911,8227,16908,16910,7210,7711,16909,16907,9737,7468, +10267,6454,9303,16913,16914,16936,5431,11804,8212,16915,4401,9046,10496,16916, +5209,16917,16919,16920,9736,16921,16922,16923,5432,4402,9508,7175,6723,16924, +7176,4393,10274,16925, +10058,8228,16928,16929,9800,7712,16926,8768,16927,7469,3899,5128,16930,9047, +16931,7974,11020,10242,16932,16933,8756,11558,16935,16934,6990,16937,3919, +16940,16938,4403,5677,16939,6181,6225,10565,16941,10803,16943,7984,4142,4377, +3851,16942,16944,16945,7510,16946,4654,16948,5705,5189,16949,5460,16950,8027, +9516,7999,6484,16951,8769,8266,16953,16955,16952,16954,5633,16956,5637,5190, +11313,16958,16959,4109,16962,4693,16961,16960,16964,16957,16965,11528,16966, +16967,13139,16969,16968,16970,16971,11540,16972,20302,7470,16973,16974,7222, +9495,16975,8711,16976,8731,16977,5380,12318,8764,6930,4903,16978,17153,16981, +5191,16980,17155,16979,7471,16983,16984,9226,16985,4669,7737,10307,16987,8519, +16982,16986,16988,6490,17157,10253,9989,9304,5433,17156,17154,10004,16989, +8765,9306,9305,6485,17175,17159,17161,17164,17165,17162,17163,17160,17158, +17152,10542,4404,17172,17169,17174,17173,9810,11014,6682,17167,17176,17171, +17170,17166,17168,4904,8732,8028,9985,17181,9987,8000,17178,10030,17182,10546, +8762,17177,17179,17180,17183,6947,9509,17188,17187,17184,11797,17193,17197, +17194,17190,17191,17196,17185,12596,17192,17186,17195,17201,4905,17198,17199, +17200,17203,17202,10069,17204,11611,10572,17209,17206,17205,7985,17208,17210, +17207,17214,17211,17212,17189,17213,17215,17216,10533,17217,11073,5421,5640, +17218,10515,7751,11023,17219,11538,9811,8229,9747,7212,3871,17224,17222,17220, +4864,7472,17225,17223,17221,17229,17228,17227,17226,17230,17231,7961,17232, +17234, +17233,5937,8215,17236,9307,17235,17237,10516,8267,6182,17238,11559,17240, +17241,17242,17243,6724,17244,5678,5193,5129,17408,11090,6183,17245,17411, +11077,9755,10258,7234,17410,6962,6184,6725,5192,10517,17409,8230,10785,6486, +6726,9020,17414,11582,6456,17415,7713,17417,7473,6415,17416,7177,5917,8231, +17412,17418,17413,5679,17421,17425,5706,17420,17429,6185,11340,3867,17426, +5194,17423,17424,9308,17422,17419,4615,8003,5895,17431,17428,17430,17427,5680, +8466,17432,8269,17445,17441,17435,17439,7001,3900,17434,17442,17446,6186, +11061,9013,17436,17444,17433,8733,17438,3868,11049,17437,5434,10059,8268, +11567,7246,17485,17447,8029,17443,17448,17450,9048,17453,17449,10547,4906, +11050,3901,17452,11612,17451,4174,9547,17454,17461,17455,17462,17458,9818, +6953,17460,17457,17463,17456,7203,10756,7211,17459,17471,17467,17470,17468, +17472,17466,17440,7986,10026,17469,17464,8192,5681,7178,7684,8213,17475,17477, +17478,17474,17476,17465,17473,17481,17480,10841,5642,17479,17483,17482,17486, +17488,6683,17484,17489,17490,17491,17497,9242,17493,17492,17494,17495,17496, +17498,17499,4907,17500,17501,17664,17665,17666,17667,17668,17669,17671,17670, +17672,17673,17674,17677,17675,17676,6464,5682,8757,10002,7247,9772,10060, +17678,14156,17679,17681,11332,17680,17683,17682,11314,17684,10077,17685,17688, +17687,17686,17689,5649,8193,5152,17693,17690,17691,17694,17695,17692,4104, +4358,17697,17698,17699,11329,7179,17701,17700,7752,17702,17703,17704,4932, +4908,17705,17706,10812,11330, +11315,11798,6188,17709,6963,17708,17710,6920,8496,17711,6187,11062,17712, +17713,17714,17715,17716,6921,11084,17718,8734,17717,17720,17719,17721,7962, +17722,17723,10520,17724,8270,17725,17726,11613,17729,17728,17727,8975,17730, +7685,17731,17732,11799,17733,17734,17736,17735,9988,9560,11805,9992,17738, +7474,10249,17739,17737,4909,5939,6727,10061,5897,10786,17742,17740,6189,6190, +3912,6471,9784,3902,17747,8735,9783,8506,17749,17745,17748,17743,17746,10757, +5940,3932,17744,17751,17752,9496,5402,17925,9756,6728,5403,7975,11813,11021, +17750,7987,5170,17753,17755,17754,17756,8709,9757,8976,17922,17921,17757,7732, +10308,17924,17923,6191,11826,17940,17928,17929,6991,17927,6231,17926,17930, +8977,10497,8194,8507,17934,17935,17931,17932,17933,6192,17941,17937,10309, +10827,10247,17936,17939,17938,10787,17942,17943,8214,17944,17946,17950,17947, +17945,9758,17948,17949,4369,17956,17951,17952,17953,8448,17955,17954,17957, +17958,17959,7714,4424,17960,11574,6922,7180,6729,8758,17961,17962,4112,17963, +17964,17965,17966,17967,5404,14601,17968,8004,17969,6954,17970,12047,17971, +10557,4923,8195,7223,10320,7181,17972,6193,17973,10027,17987,17975,8488,9812, +5918,17974,8196,17976,9049,17978,17977,17980,17979,17981,17983,17982,4910, +17984,17985,17986,6416,11560,17988,7686,4175,17989,17990,17991,3921,17992, +17993,10310,6950,17995,4616,3857,17994,17997,9773,7715,4405,10758,5692,5435, +17996,4425,4866,4176,18001,11593,8508,10275,18013,4406,18011,18009,18000, +17998,17999, +6978,5451,8790,9520,4144,18003,18002,18008,18004,18007,11055,18006,4407,4700, +18010,18012,5683,18178,18187,18188,3850,18195,3920,18186,18185,18180,18179, +18177,18176,8770,8538,18182,18181,18184,8271,5684,4128,18183,6194,8272,18201, +18202,4408,4365,18199,18189,18197,18204,18198,18196,18005,18194,18190,4911, +18192,18203,18193,18205,18191,9819,11336,18200,18222,18214,7770,5157,5436, +18209,4410,7475,18212,6457,9264,18217,10573,18208,4409,5941,10248,18218,18206, +18215,18225,18210,18211,9497,18216,18213,10759,18219,3903,18207,18221,18220, +9802,18227,18238,4701,18241,18223,18228,11341,18237,11316,11529,8791,4682, +10321,18243,9472,3856,18236,18232,8273,18226,18234,18239,9739,3849,18231, +18240,10327,18235,18230,7476,7182,6923,11063,10278,18246,18255,18233,4694, +7511,18244,18249,8274,18245,18252,8766,18253,11317,18242,4631,18248,18251, +11019,18254,18247,18250,10760,11776,18258,18265,18257,6946,18224,10541,11009, +18264,18263,18259,18260,4117,18262,18256,9012,18261,3933,8449,10530,18266, +18432,10040,18269,7477,6952,18434,5405,18435,10328,18268,18229,18267,11822, +9473,10322,18442,18448,18449,18436,9813,18446,18438,18440,18450,18439,18443, +4177,9540,18444,18447,18437,8197,18441,6662,7716,5647,11091,11096,7249,18454, +18452,11821,18451,11348,18453,18455,18456,18459,18457,9474,18458,10028,18445, +7250,18460,18465,8275,18464,18433,18466,8232,18461,18463,18462,15376,15361, +18468,18467,11349,16667,18469,18470,18471,5942,5171,18473,12348,5204,11545, +5458,18474,18475,8781,18476, +9561,3865,4418,18481,18482,18477,6684,18478,9761,18479,18480,18490,18484, +18487,18483,18485,18486,6967,18488,8736,5685,4641,18491,4638,18496,18492, +18495,10009,18493,18494,10279,10041,18497,8540,18507,18503,4426,18501,10761, +18502,18499,18500,18505,18508,18506,18504,18498,8759,18515,11017,18513,18514, +18509,18511,18512,18510,8005,11800,18519,18520,18688,7689,18522,18525,18517, +18516,18689,4411,18523,18690,18524,18521,8978,18518,9799,18694,11290,18693, +18692,18701,18695,18703,11333,18706,18697,18698,18702,18705,18704,18696,18699, +18716,18709,18707,18708,18713,18714,4617,5153,18712,18691,18711,18715,18710, +18717,18719,18718,18721,18720,18489,18725,18722,18723,18724,18726,5707,18728, +18727,7183,6195,15622,18729,7216,4632,18730,4145,7478,18731,6196,18732,3904, +10268,18733,7753,18740,18737,8782,18738,18735,5437,18734,18741,5653,8509, +18747,18743,8468,18742,18745,18736,18746,18748,10062,18744,18749,18751,5938, +18739,3872,18750,6458,11605,18752,18753,8276,11521,18754,11284,18755,18756, +10563,18757,6431,11522,18762,18763,7479,18761,11334,18758,18760,7964,7773, +18759,18764,10498,18766,18765,4683,10762,18767,18779,18769,18770,18771,18772, +18776,18777,18775,18773,18768,18774,18778,20246,4359,18781,5438,18780,18945, +18944,18947,18946,18948,7184,18949,18950,18951,7965,11318,18952,10499,9765, +18953,18954,5898,5131,18955,6730,9760,18956,4655,18957,18959,11350,18958,7717, +18960,18961,18962,4912,18963,18964,18965,18966,4656,18967,18968,18969,4433, +7687,18970,18971,18972,5919,9050,18973, +5686,7733,18976,9475,18975,5648,18974,8534,5132,18977,18978,7480,5708,18979, +10763,7998,5205,11092,8233,18980,7718,8783,7481,18981,18984,18985,6429,8481, +18983,7482,10269,18982,6731,4146,18989,5687,6733,6732,11820,18988,18987,8198, +5164,11810,4633,7483,18986,18991,18992,18990,5943,11295,6734,9734,18995,7967, +8737,11285,18998,5963,7966,18994,18999,5964,18996,18997,18993,8001,9512,8718, +4412,10063,5154,8979,19002,19000,8747,7968,4913,19001,7738,11561,11807,19003, +19014,8980,19013,19010,19018,19011,19007,9051,19006,19004,11264,6735,19008, +19005,19012,7251,5920,8537,10788,4153,3905,9476,19016,19015,9541,19020,19009, +19019,19021,5899,19017,6197,6964,19022,11319,19025,19028,19026,10260,19023, +5439,19027,19029,19033,19030,19032,19031,19034,6928,19036,19035,10311,19200, +5688,19037,19201,19202,5155,17696,7512,19203,5965,19204,19205,6685,14637, +19206,19207,7185,19208,19209,19210,19211,19212,8714,19213,19215,19214,9477, +19216,10764,19217,19218,19219,19220,9529,7484,19221,6218,12045,19222,19223, +10270,19224,19232,19225,19227,19226,19228,10789,19229,19230,19231,19233,4620, +9030,10312,6465,6198,10286,4414,10029,19236,4914,7988,19235,19240,8792,11074, +19238,19239,5133,19241,9794,8510,10064,9244,19237,10790,4427,19243,11783,8993, +11812,6736,19242,8464,19259,8199,9559,10287,19246,6686,6737,7485,9796,5900, +19245,19244,10313,6944,9265,19248,19249,6199,19247,19250,19251,19253,8450, +19252,4933,19255,19254,19256,19258,19260,19261,7989,6958,19262,4657, +19263,8277,19264,19265,10314,5134,19266,8981,4154,19267,6992,7765,8460,19270, +19269,19268,19276,19274,19271,19273,19272,19275,5206,19279,7990,19280,5944, +19277,19278,11784,8982,8200,19281,19284,19282,19283,11320,9478,19287,19285, +19286,19288,19464,19291,19292,19290,19289,9052,19456,19460,19457,19293,19458, +19459,19466,19461,7991,19463,19465,19462,19468,7186,19467,19469,19470,19473, +19472,19471,19475,19474,11093,19477,19476,19478,19479,19481,19480,7719,19482, +5452,19483,19485,19486,19487,19484,19488,6965,19489,5135,5650,5901,19490,9551, +9245,19491,19494,6931,19493,19492,5689,19495,4658,19497,6459,19496,19505, +19499,19501,10564,19498,19500,19504,19502,5136,19503,19506,9785,11575,7187, +19507,11265,19509,19508,19512,11296,19511,4684,19510,19515,19514,19513,9233, +19516,19517,19518,6219,5636,19519,19520,19521,7720,19522,6924,19523,19524, +12544,12381,19525,17487,19526,8707,7690,9759,19527,10548,9011,6237,8712,4105, +10839,7734,5693,5440,10549,19528,19530,19529,4415,9557,19531,9814,9234,19532, +7217,19534,11041,19549,19536,19537,9000,8511,8278,9479,19535,5172,19544,19541, +19716,9480,8767,19538,9053,9266,19539,19543,7743,9798,9003,7969,19542,8461, +8451,19540,3848,11777,19545,8512,7188,7721,19547,19546,3918,19548,10254,19718, +9530,7754,8760,5463,19717,11286,4126,10550,4416,19712,19713,19714,19715,9498, +8706,3906,19719,19720,21250,8476,19721,4178,8235,5902,11321,19722,9227,8279, +6966,19723,19726,7236,19724,8202,8201,3907,11562,19728,10065,19730,19729, +19727,16963,4915,19533,19732,19731,19733,11287,9536,10765,19734,6968,19735, +19736,19737,9216,3913,6200,11801,19741,5651,19738,19739,10323,4659,11288,5406, +9267,19742,19743,19744,9217,19746,19745,9522,19747,7189,6975,9786,8784,6993, +7755,19748,19749,7740,19750,19751,19752,11342,7190,19754,19753,6201,6226,6687, +19757,7237,19756,19755,8520,5966,7970,9999,7192,19758,7486,19761,19759,19760, +19763,19762,7513,19764,19765,19766,10031,6450,6976,19767,19768,11523,7204, +11085,11563,19769,5441,19770,9218,19773,4695,7722,19771,19772,9023,10804,5467, +19775,19776,19774,19778,9534,4642,19782,19779,19781,19777,20014,19780,11594, +5945,19790,9235,19785,19788,19786,19791,19792,19784,19797,4179,19783,9996, +19787,7487,6202,10791,5443,7205,9499,8204,19795,19789,19794,11042,8983,19796, +19793,8203,19800,19799,19798,10766,7258,19801,10558,4147,10277,8785,5207, +19803,6204,6667,19802,7756,7757,19968,19970,7514,19969,19971,5426,10276,6977, +11778,19805,6487,11806,19973,19972,19974,19804,9544,9268,9014,19979,8738, +19975,19976,5644,19978,5903,19977,7488,4696,19983,6430,8280,9001,4634,19981, +19982,8994,19980,19984,19990,19993,19992,9228,19985,19986,19989,19991,5407, +19994,19988,19987,19998,19999,20000,19997,19996,7489,9481,19995,20004,20002, +20003,20001,8535,20005,20006,20008,4916,20007,11097,20019,20009,20012,20010, +20011,20013,20015,20016,20017,20020,20018,20021,20023,20022,8984,11078,20024, +8205,20025,10531,20026,4618,4123,4918,4917,20027,20028,20029,20030,20031,4919, +4660,6205,10005,20033,20032,20034,4155,20037,20036,20035,20038,20041,3878, +20039,20043,20042,20045,20044,20046,9485,20047,20048,20050,20049,10315,20051, +20052,6468,20053,20054,10792,8234,3843,8490,20055,10316,20058,20056,6206, +20057,5921,10532,20060,20224,20061,20225,4096,7735,7259,4920,20226,9797,20228, +4097,20227,8995,11564,9482,20059,11525,5904,11322,5464,11539,5639,8513,17920, +20229,4619,7758,4661,20231,20232,20230,5699,6460,7490,4098,11576,20234,19725, +20233,20237,20235,20236,20238,20239,11595,20240,20241,7976,10010,7772,4934, +11289,4428,7191,5946,20244,20243,6738,20245,20242,6663,20249,18700,12597,7766, +20247,11524,9552,4106,8002,6933,10518,4127,11596,11338,20250,9252,7002,20251, +20252,7723,20253,11597,20248,20255,20257,20256,20254,20258,20259,8281,4417, +20260,11031,20261,20262,11785,14864,20263,20264,20265,20269,20266,20267,20268, +20270,7971,11094,7972,20271,10066,20272,21042,11051,20273,20274,20275,4662, +20277,7736,20278,5635,20279,20283,20281,20282,4690,20280,20284,20285,3879, +20286,20287,7491,20288,5158,20291,20290,20289,19024,10555,20292,20293,20294, +20295,20296,20297,4921,20298,20299,9730,20301,4378,20304,20303,4099,5408, +10534,8985,6401,6207,7238,7739,20306,20305,11297,4935,10033,9531,7771,11565, +5690,20309,20308,10794,9483,4143,20310,20307,10288,11337,20311,20312,20314, +8521,4666,4667,20313,4936,5905,4937,9246,11583,5947,20315,20316,20317,20480, +20482,20481,10326,20483,20484,20485,20486,20488,20487,20489,10067,17707,7688, +5137,20490, +20491,12555,15386,10034,3930,3866,6739,10767,7517,20492,11070,20493,11323, +4129,6688,20494,4429,20495,20496,20498,20499,20501,20497,20500,4922,20502, +20503,20504,20505,20506,20508,20507,20510,20513,20509,20511,20512,20514,5409, +6994,20515,20516,6208,20517,4637,9774,20518,20519,8761,9546,20520,9820,8491, +4151,5453,5454,8786,20525,5455,4430,20524,20522,20523,20521,20535,20526,20527, +20528,20529,20531,20530,7224,20532,20534,5138,20533,8282,5906,20536,8492, +20537,9484,20538,20543,20541,20540,20542,20539,20545,20544,20547,5410,20546, +20548,20549,20551,20550,20552,20554,20553,6235,20555,20556,4635,20557,20558, +7760,20559,20560,20561,20562,6209,20563,20564,20565,20566,20567,10000,20569, +10245,20570,20568,20572,20571,20573,20736,20737,20738,20739,20740,20741,20742, +20743,20744,20745,20746,20747,20748,20749,15380,20750,17239,5139,4608,6417, +20752,20751,11012,20754,20755,20753,20756,10817,20757,5210,11780,20758,20760, +3869,20761,10506,20759,20762,20763,20764,20765,20766,10829,6668,6489,8206, +20767,20770,20768,20771,5968,20769,20772,20773,20774,20778,6665,8515,20779, +20776,20775,20777,5694,20783,20782,20781,3858,20793,20789,20790,20786,20792, +20788,4673,11819,20791,20787,20785,20784,20795,20798,20797,20796,10280,20794, +3922,20799,20801,4686,20780,4118,20803,20802,20800,8716,10831,11577,20804, +20805,20806,20807,20808,8986,20809,10006,20814,20810,20811,10768,11043,9519, +20815,20816,9501,20813,20812,4361,20824,20823,4180,20821,20820,20818,4698, +20817,6929,4360,6210,20827,20826,20825, +20822,20828,20829,20996,20995,20997,4108,20992,20993,6227,11032,20994,10769, +21002,20998,21003,21000,20999,5691,21004,21005,21006,21001,20819,21007,9024, +21011,21012,21010,21009,21015,21008,21013,21014,21017,21016,21019,21020,21021, +11816,21018,8522,6476,21022,21023,21024,21025,21026,5907,21027,21028,6926, +21029,21030,21031,21032,21035,21033,11803,21034,11598,21036,11578,21037,9821, +21038,21040,21041,21039,6220,11052,10818,13654,15423,10842,4362,21043,5167, +21044,21045,21046,6228,21047,16179,11066,8514,21048,21050,21049,21051,21052, +21053,21054,21055,21056,21057,21058,21059,21060,21061,21062,21063,9219,5948, +21065,8236,21066,21067,10240,21068,21069,16918,19257,20300,21070,21071,21073, +21074,21075,11599,21072,21076,21077,21079,21078,21081,21082,21080,11541,21083, +21084,16947,21085,9,83,79,82,84,41,42,85,59,3,4,30,527,528,529,530,531,532, +533,534,535,536,6,7,66,64,67,8,86,544,545,546,547,548,549,550,551,552,553,554, +555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,45,46,15,17,13, +576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594, +595,596,597,598,599,600,601,47,34,48,16,78, diff --git a/system/lib/libc/musl/src/locale/setlocale.c b/system/lib/libc/musl/src/locale/setlocale.c index 8dae5a4e8e446..360c4437644b8 100644 --- a/system/lib/libc/musl/src/locale/setlocale.c +++ b/system/lib/libc/musl/src/locale/setlocale.c @@ -3,29 +3,17 @@ #include #include "locale_impl.h" #include "libc.h" -#include "atomic.h" +#include "lock.h" static char buf[LC_ALL*(LOCALE_NAME_MAX+1)]; -static char *setlocale_one_unlocked(int cat, const char *name) -{ - const struct __locale_map *lm; - - if (name) libc.global_locale.cat[cat] = lm = __get_locale(cat, name); - else lm = libc.global_locale.cat[cat]; - - return lm ? (char *)lm->name : "C"; -} - -char *__strchrnul(const char *, int); - char *setlocale(int cat, const char *name) { - static volatile int lock[2]; + const struct __locale_map *lm; if ((unsigned)cat > LC_ALL) return 0; - LOCK(lock); + LOCK(__locale_lock); /* For LC_ALL, setlocale is required to return a string which * encodes the current setting for all categories. The format of @@ -35,6 +23,7 @@ char *setlocale(int cat, const char *name) if (cat == LC_ALL) { int i; if (name) { + struct __locale_struct tmp_locale; char part[LOCALE_NAME_MAX+1] = "C.UTF-8"; const char *p = name; for (i=0; iname : "C"; + if (lm == libc.global_locale.cat[0]) same++; + part = lm ? lm->name : "C"; size_t l = strlen(part); memcpy(s, part, l); s[l] = ';'; s += l+1; } *--s = 0; - UNLOCK(lock); - return buf; + UNLOCK(__locale_lock); + return same==LC_ALL ? (char *)part : buf; } - char *ret = setlocale_one_unlocked(cat, name); + if (name) { + lm = __get_locale(cat, name); + if (lm == LOC_MAP_FAILED) { + UNLOCK(__locale_lock); + return 0; + } + libc.global_locale.cat[cat] = lm; + } else { + lm = libc.global_locale.cat[cat]; + } + char *ret = lm ? (char *)lm->name : "C"; - UNLOCK(lock); + UNLOCK(__locale_lock); return ret; } diff --git a/system/lib/libc/musl/src/locale/strcoll.c b/system/lib/libc/musl/src/locale/strcoll.c index 84f199ff9527d..dd3cbc480e345 100644 --- a/system/lib/libc/musl/src/locale/strcoll.c +++ b/system/lib/libc/musl/src/locale/strcoll.c @@ -1,7 +1,6 @@ #include #include #include "locale_impl.h" -#include "libc.h" int __strcoll_l(const char *l, const char *r, locale_t loc) { diff --git a/system/lib/libc/musl/src/locale/strxfrm.c b/system/lib/libc/musl/src/locale/strxfrm.c index 14b76a632779b..c66c62039d959 100644 --- a/system/lib/libc/musl/src/locale/strxfrm.c +++ b/system/lib/libc/musl/src/locale/strxfrm.c @@ -1,7 +1,6 @@ #include #include #include "locale_impl.h" -#include "libc.h" /* collate only by code points */ size_t __strxfrm_l(char *restrict dest, const char *restrict src, size_t n, locale_t loc) diff --git a/system/lib/libc/musl/src/locale/textdomain.c b/system/lib/libc/musl/src/locale/textdomain.c index c501501d2b0e7..d727539799fd8 100644 --- a/system/lib/libc/musl/src/locale/textdomain.c +++ b/system/lib/libc/musl/src/locale/textdomain.c @@ -3,8 +3,6 @@ #include #include #include -#include "libc.h" -#include "atomic.h" static char *current_domain; diff --git a/system/lib/libc/musl/src/locale/wcscoll.c b/system/lib/libc/musl/src/locale/wcscoll.c index 14bb8b9f96079..ad2cc691632a1 100644 --- a/system/lib/libc/musl/src/locale/wcscoll.c +++ b/system/lib/libc/musl/src/locale/wcscoll.c @@ -1,7 +1,6 @@ #include #include #include "locale_impl.h" -#include "libc.h" /* FIXME: stub */ int __wcscoll_l(const wchar_t *l, const wchar_t *r, locale_t locale) diff --git a/system/lib/libc/musl/src/locale/wcsxfrm.c b/system/lib/libc/musl/src/locale/wcsxfrm.c index 0a0b776dadf46..05e3e1158188e 100644 --- a/system/lib/libc/musl/src/locale/wcsxfrm.c +++ b/system/lib/libc/musl/src/locale/wcsxfrm.c @@ -1,7 +1,6 @@ #include #include #include "locale_impl.h" -#include "libc.h" /* collate only by code points */ size_t __wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t loc) diff --git a/system/lib/libc/musl/src/math/__expo2.c b/system/lib/libc/musl/src/math/__expo2.c index 740ac680e8570..248f052b98b65 100644 --- a/system/lib/libc/musl/src/math/__expo2.c +++ b/system/lib/libc/musl/src/math/__expo2.c @@ -5,12 +5,13 @@ static const int k = 2043; static const double kln2 = 0x1.62066151add8bp+10; /* exp(x)/2 for x >= log(DBL_MAX), slightly better than 0.5*exp(x/2)*exp(x/2) */ -double __expo2(double x) +double __expo2(double x, double sign) { double scale; /* note that k is odd and scale*scale overflows */ INSERT_WORDS(scale, (uint32_t)(0x3ff + k/2) << 20, 0); /* exp(x - k ln2) * 2**(k-1) */ - return exp(x - kln2) * scale * scale; + /* in directed rounding correct sign before rounding or overflow is important */ + return exp(x - kln2) * (sign * scale) * scale; } diff --git a/system/lib/libc/musl/src/math/__expo2f.c b/system/lib/libc/musl/src/math/__expo2f.c index 5163e4180033b..538eb09c0724c 100644 --- a/system/lib/libc/musl/src/math/__expo2f.c +++ b/system/lib/libc/musl/src/math/__expo2f.c @@ -5,12 +5,13 @@ static const int k = 235; static const float kln2 = 0x1.45c778p+7f; /* expf(x)/2 for x >= log(FLT_MAX), slightly better than 0.5f*expf(x/2)*expf(x/2) */ -float __expo2f(float x) +float __expo2f(float x, float sign) { float scale; /* note that k is odd and scale*scale overflows */ SET_FLOAT_WORD(scale, (uint32_t)(0x7f + k/2) << 23); /* exp(x - k ln2) * 2**(k-1) */ - return expf(x - kln2) * scale * scale; + /* in directed rounding correct sign before rounding or overflow is important */ + return expf(x - kln2) * (sign * scale) * scale; } diff --git a/system/lib/libc/musl/src/math/__fpclassifyl.c b/system/lib/libc/musl/src/math/__fpclassifyl.c index 481c0b949974a..e41781b689af7 100644 --- a/system/lib/libc/musl/src/math/__fpclassifyl.c +++ b/system/lib/libc/musl/src/math/__fpclassifyl.c @@ -13,10 +13,18 @@ int __fpclassifyl(long double x) int msb = u.i.m>>63; if (!e && !msb) return u.i.m ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7fff) { + /* The x86 variant of 80-bit extended precision only admits + * one representation of each infinity, with the mantissa msb + * necessarily set. The version with it clear is invalid/nan. + * The m68k variant, however, allows either, and tooling uses + * the version with it clear. */ + if (__BYTE_ORDER == __LITTLE_ENDIAN && !msb) + return FP_NAN; + return u.i.m << 1 ? FP_NAN : FP_INFINITE; + } if (!msb) return FP_NAN; - if (e == 0x7fff) - return u.i.m << 1 ? FP_NAN : FP_INFINITE; return FP_NORMAL; } #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 diff --git a/system/lib/libc/musl/src/math/__invtrigl.c b/system/lib/libc/musl/src/math/__invtrigl.c index ef7f4e1b79ebb..48f83aaf8c7f8 100644 --- a/system/lib/libc/musl/src/math/__invtrigl.c +++ b/system/lib/libc/musl/src/math/__invtrigl.c @@ -57,7 +57,7 @@ long double __invtrigl_R(long double z) { long double p, q; p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*(pS5+z*(pS6+z*(pS7+z*(pS8+z*pS9))))))))); - q = 1.0+z*(qS1+z*(qS2+z*(qS3+z*(qS4+z*(qS5+z*(pS6+z*(pS7+z*(pS8+z*pS9)))))))); + q = 1.0+z*(qS1+z*(qS2+z*(qS3+z*(qS4+z*(qS5+z*(qS6+z*(qS7+z*(qS8+z*qS9)))))))); return p/q; } #endif diff --git a/system/lib/libc/musl/src/math/__invtrigl.h b/system/lib/libc/musl/src/math/__invtrigl.h index 91a8a3b61f584..bee7931720d8e 100644 --- a/system/lib/libc/musl/src/math/__invtrigl.h +++ b/system/lib/libc/musl/src/math/__invtrigl.h @@ -1,6 +1,8 @@ +#include + /* shared by acosl, asinl and atan2l */ #define pio2_hi __pio2_hi #define pio2_lo __pio2_lo -extern const long double pio2_hi, pio2_lo; +hidden extern const long double pio2_hi, pio2_lo; -long double __invtrigl_R(long double z); +hidden long double __invtrigl_R(long double z); diff --git a/system/lib/libc/musl/src/math/__math_divzero.c b/system/lib/libc/musl/src/math/__math_divzero.c new file mode 100644 index 0000000000000..59d2135001ca3 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_divzero.c @@ -0,0 +1,6 @@ +#include "libm.h" + +double __math_divzero(uint32_t sign) +{ + return fp_barrier(sign ? -1.0 : 1.0) / 0.0; +} diff --git a/system/lib/libc/musl/src/math/__math_divzerof.c b/system/lib/libc/musl/src/math/__math_divzerof.c new file mode 100644 index 0000000000000..ce046f3e320a9 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_divzerof.c @@ -0,0 +1,6 @@ +#include "libm.h" + +float __math_divzerof(uint32_t sign) +{ + return fp_barrierf(sign ? -1.0f : 1.0f) / 0.0f; +} diff --git a/system/lib/libc/musl/src/math/__math_invalid.c b/system/lib/libc/musl/src/math/__math_invalid.c new file mode 100644 index 0000000000000..177404900d161 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_invalid.c @@ -0,0 +1,6 @@ +#include "libm.h" + +double __math_invalid(double x) +{ + return (x - x) / (x - x); +} diff --git a/system/lib/libc/musl/src/math/__math_invalidf.c b/system/lib/libc/musl/src/math/__math_invalidf.c new file mode 100644 index 0000000000000..357d4b1211767 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_invalidf.c @@ -0,0 +1,6 @@ +#include "libm.h" + +float __math_invalidf(float x) +{ + return (x - x) / (x - x); +} diff --git a/system/lib/libc/musl/src/math/__math_invalidl.c b/system/lib/libc/musl/src/math/__math_invalidl.c new file mode 100644 index 0000000000000..1fca99de4f545 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_invalidl.c @@ -0,0 +1,9 @@ +#include +#include "libm.h" + +#if LDBL_MANT_DIG != DBL_MANT_DIG +long double __math_invalidl(long double x) +{ + return (x - x) / (x - x); +} +#endif diff --git a/system/lib/libc/musl/src/math/__math_oflow.c b/system/lib/libc/musl/src/math/__math_oflow.c new file mode 100644 index 0000000000000..c85dbf982a0db --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_oflow.c @@ -0,0 +1,6 @@ +#include "libm.h" + +double __math_oflow(uint32_t sign) +{ + return __math_xflow(sign, 0x1p769); +} diff --git a/system/lib/libc/musl/src/math/__math_oflowf.c b/system/lib/libc/musl/src/math/__math_oflowf.c new file mode 100644 index 0000000000000..fa7d06208e41d --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_oflowf.c @@ -0,0 +1,6 @@ +#include "libm.h" + +float __math_oflowf(uint32_t sign) +{ + return __math_xflowf(sign, 0x1p97f); +} diff --git a/system/lib/libc/musl/src/math/__math_uflow.c b/system/lib/libc/musl/src/math/__math_uflow.c new file mode 100644 index 0000000000000..b90594aee14e5 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_uflow.c @@ -0,0 +1,6 @@ +#include "libm.h" + +double __math_uflow(uint32_t sign) +{ + return __math_xflow(sign, 0x1p-767); +} diff --git a/system/lib/libc/musl/src/math/__math_uflowf.c b/system/lib/libc/musl/src/math/__math_uflowf.c new file mode 100644 index 0000000000000..94d50f2bf1297 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_uflowf.c @@ -0,0 +1,6 @@ +#include "libm.h" + +float __math_uflowf(uint32_t sign) +{ + return __math_xflowf(sign, 0x1p-95f); +} diff --git a/system/lib/libc/musl/src/math/__math_xflow.c b/system/lib/libc/musl/src/math/__math_xflow.c new file mode 100644 index 0000000000000..744203c4c817b --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_xflow.c @@ -0,0 +1,6 @@ +#include "libm.h" + +double __math_xflow(uint32_t sign, double y) +{ + return eval_as_double(fp_barrier(sign ? -y : y) * y); +} diff --git a/system/lib/libc/musl/src/math/__math_xflowf.c b/system/lib/libc/musl/src/math/__math_xflowf.c new file mode 100644 index 0000000000000..f2c84784f81f8 --- /dev/null +++ b/system/lib/libc/musl/src/math/__math_xflowf.c @@ -0,0 +1,6 @@ +#include "libm.h" + +float __math_xflowf(uint32_t sign, float y) +{ + return eval_as_float(fp_barrierf(sign ? -y : y) * y); +} diff --git a/system/lib/libc/musl/src/math/__rem_pio2.c b/system/lib/libc/musl/src/math/__rem_pio2.c index d403f81c79221..dcf672fbd7034 100644 --- a/system/lib/libc/musl/src/math/__rem_pio2.c +++ b/system/lib/libc/musl/src/math/__rem_pio2.c @@ -36,6 +36,7 @@ */ static const double toint = 1.5/EPS, +pio4 = 0x1.921fb54442d18p-1, invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */ @@ -117,11 +118,23 @@ int __rem_pio2(double x, double *y) } if (ix < 0x413921fb) { /* |x| ~< 2^20*(pi/2), medium size */ medium: - /* rint(x/(pi/2)), Assume round-to-nearest. */ + /* rint(x/(pi/2)) */ fn = (double_t)x*invpio2 + toint - toint; n = (int32_t)fn; r = x - fn*pio2_1; w = fn*pio2_1t; /* 1st round, good to 85 bits */ + /* Matters with directed rounding. */ + if (predict_false(r - w < -pio4)) { + n--; + fn--; + r = x - fn*pio2_1; + w = fn*pio2_1t; + } else if (predict_false(r - w > pio4)) { + n++; + fn++; + r = x - fn*pio2_1; + w = fn*pio2_1t; + } y[0] = r - w; u.f = y[0]; ey = u.i>>52 & 0x7ff; diff --git a/system/lib/libc/musl/src/math/__rem_pio2f.c b/system/lib/libc/musl/src/math/__rem_pio2f.c index 4473c1c420e92..e67656431a825 100644 --- a/system/lib/libc/musl/src/math/__rem_pio2f.c +++ b/system/lib/libc/musl/src/math/__rem_pio2f.c @@ -35,6 +35,7 @@ */ static const double toint = 1.5/EPS, +pio4 = 0x1.921fb6p-1, invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ @@ -50,10 +51,20 @@ int __rem_pio2f(float x, double *y) ix = u.i & 0x7fffffff; /* 25+53 bit pi is good enough for medium size */ if (ix < 0x4dc90fdb) { /* |x| ~< 2^28*(pi/2), medium size */ - /* Use a specialized rint() to get fn. Assume round-to-nearest. */ + /* Use a specialized rint() to get fn. */ fn = (double_t)x*invpio2 + toint - toint; n = (int32_t)fn; *y = x - fn*pio2_1 - fn*pio2_1t; + /* Matters with directed rounding. */ + if (predict_false(*y < -pio4)) { + n--; + fn--; + *y = x - fn*pio2_1 - fn*pio2_1t; + } else if (predict_false(*y > pio4)) { + n++; + fn++; + *y = x - fn*pio2_1 - fn*pio2_1t; + } return n; } if(ix>=0x7f800000) { /* x is inf or NaN */ diff --git a/system/lib/libc/musl/src/math/__rem_pio2l.c b/system/lib/libc/musl/src/math/__rem_pio2l.c index 77255bd80ae48..236b2def3d276 100644 --- a/system/lib/libc/musl/src/math/__rem_pio2l.c +++ b/system/lib/libc/musl/src/math/__rem_pio2l.c @@ -44,6 +44,7 @@ pio2_1 = 1.57079632679597125389e+00, /* 0x3FF921FB, 0x54444000 */ pio2_2 = -1.07463465549783099519e-12, /* -0x12e7b967674000.0p-92 */ pio2_3 = 6.36831716351370313614e-25; /* 0x18a2e037074000.0p-133 */ static const long double +pio4 = 0x1.921fb54442d1846ap-1L, invpio2 = 6.36619772367581343076e-01L, /* 0xa2f9836e4e44152a.0p-64 */ pio2_1t = -1.07463465549719416346e-12L, /* -0x973dcb3b399d747f.0p-103 */ pio2_2t = 6.36831716351095013979e-25L, /* 0xc51701b839a25205.0p-144 */ @@ -57,6 +58,7 @@ pio2_3t = -2.75299651904407171810e-37L; /* -0xbb5bf6c7ddd660ce.0p-185 */ #define NX 5 #define NY 3 static const long double +pio4 = 0x1.921fb54442d18469898cc51701b8p-1L, invpio2 = 6.3661977236758134307553505349005747e-01L, /* 0x145f306dc9c882a53f84eafa3ea6a.0p-113 */ pio2_1 = 1.5707963267948966192292994253909555e+00L, /* 0x1921fb54442d18469800000000000.0p-112 */ pio2_1t = 2.0222662487959507323996846200947577e-21L, /* 0x13198a2e03707344a4093822299f3.0p-181 */ @@ -76,11 +78,23 @@ int __rem_pio2l(long double x, long double *y) u.f = x; ex = u.i.se & 0x7fff; if (SMALL(u)) { - /* rint(x/(pi/2)), Assume round-to-nearest. */ + /* rint(x/(pi/2)) */ fn = x*invpio2 + toint - toint; n = QUOBITS(fn); r = x-fn*pio2_1; w = fn*pio2_1t; /* 1st round good to 102/180 bits (ld80/ld128) */ + /* Matters with directed rounding. */ + if (predict_false(r - w < -pio4)) { + n--; + fn--; + r = x - fn*pio2_1; + w = fn*pio2_1t; + } else if (predict_false(r - w > pio4)) { + n++; + fn++; + r = x - fn*pio2_1; + w = fn*pio2_1t; + } y[0] = r-w; u.f = y[0]; ey = u.i.se & 0x7fff; diff --git a/system/lib/libc/musl/src/math/atanl.c b/system/lib/libc/musl/src/math/atanl.c index 79a3edb805a09..c3b0c9268db30 100644 --- a/system/lib/libc/musl/src/math/atanl.c +++ b/system/lib/libc/musl/src/math/atanl.c @@ -70,21 +70,21 @@ static long double T_odd(long double x) #elif LDBL_MANT_DIG == 113 #define EXPMAN(u) ((u.i.se & 0x7fff)<<8 | u.i.top>>8) -const long double atanhi[] = { +static const long double atanhi[] = { 4.63647609000806116214256231461214397e-01L, 7.85398163397448309615660845819875699e-01L, 9.82793723247329067985710611014666038e-01L, 1.57079632679489661923132169163975140e+00L, }; -const long double atanlo[] = { +static const long double atanlo[] = { 4.89509642257333492668618435220297706e-36L, 2.16795253253094525619926100651083806e-35L, -2.31288434538183565909319952098066272e-35L, 4.33590506506189051239852201302167613e-35L, }; -const long double aT[] = { +static const long double aT[] = { 3.33333333333333333333333333333333125e-01L, -1.99999999999999999999999999999180430e-01L, 1.42857142857142857142857142125269827e-01L, diff --git a/system/lib/libc/musl/src/math/cosh.c b/system/lib/libc/musl/src/math/cosh.c index 100f8231d8829..490c15fb16675 100644 --- a/system/lib/libc/musl/src/math/cosh.c +++ b/system/lib/libc/musl/src/math/cosh.c @@ -35,6 +35,6 @@ double cosh(double x) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(x); + t = __expo2(x, 1.0); return t; } diff --git a/system/lib/libc/musl/src/math/coshf.c b/system/lib/libc/musl/src/math/coshf.c index b09f2ee5751f4..e739cff93b132 100644 --- a/system/lib/libc/musl/src/math/coshf.c +++ b/system/lib/libc/musl/src/math/coshf.c @@ -28,6 +28,6 @@ float coshf(float x) } /* |x| > log(FLT_MAX) or nan */ - t = __expo2f(x); + t = __expo2f(x, 1.0f); return t; } diff --git a/system/lib/libc/musl/src/math/exp.c b/system/lib/libc/musl/src/math/exp.c index 9ea672fac6168..b764d73cfe339 100644 --- a/system/lib/libc/musl/src/math/exp.c +++ b/system/lib/libc/musl/src/math/exp.c @@ -1,134 +1,134 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_exp.c */ /* - * ==================================================== - * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved. + * Double-precision e^x function. * - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* exp(x) - * Returns the exponential of x. - * - * Method - * 1. Argument reduction: - * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. - * Given x, find r and integer k such that - * - * x = k*ln2 + r, |r| <= 0.5*ln2. - * - * Here r will be represented as r = hi-lo for better - * accuracy. - * - * 2. Approximation of exp(r) by a special rational function on - * the interval [0,0.34658]: - * Write - * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... - * We use a special Remez algorithm on [0,0.34658] to generate - * a polynomial of degree 5 to approximate R. The maximum error - * of this polynomial approximation is bounded by 2**-59. In - * other words, - * R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5 - * (where z=r*r, and the values of P1 to P5 are listed below) - * and - * | 5 | -59 - * | 2.0+P1*z+...+P5*z - R(z) | <= 2 - * | | - * The computation of exp(r) thus becomes - * 2*r - * exp(r) = 1 + ---------- - * R(r) - r - * r*c(r) - * = 1 + r + ----------- (for better accuracy) - * 2 - c(r) - * where - * 2 4 10 - * c(r) = r - (P1*r + P2*r + ... + P5*r ). - * - * 3. Scale back to obtain exp(x): - * From step 1, we have - * exp(x) = 2^k * exp(r) - * - * Special cases: - * exp(INF) is INF, exp(NaN) is NaN; - * exp(-INF) is 0, and - * for finite argument, only exp(0)=1 is exact. - * - * Accuracy: - * according to an error analysis, the error is always less than - * 1 ulp (unit in the last place). - * - * Misc. info. - * For IEEE double - * if x > 709.782712893383973096 then exp(x) overflows - * if x < -745.133219101941108420 then exp(x) underflows + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp_data.h" -static const double -half[2] = {0.5,-0.5}, -ln2hi = 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ -ln2lo = 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */ -invln2 = 1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */ -P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ -P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ -P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ -P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ -P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ +#define N (1 << EXP_TABLE_BITS) +#define InvLn2N __exp_data.invln2N +#define NegLn2hiN __exp_data.negln2hiN +#define NegLn2loN __exp_data.negln2loN +#define Shift __exp_data.shift +#define T __exp_data.tab +#define C2 __exp_data.poly[5 - EXP_POLY_ORDER] +#define C3 __exp_data.poly[6 - EXP_POLY_ORDER] +#define C4 __exp_data.poly[7 - EXP_POLY_ORDER] +#define C5 __exp_data.poly[8 - EXP_POLY_ORDER] -double exp(double x) +/* Handle cases that may overflow or underflow when computing the result that + is scale*(1+TMP) without intermediate rounding. The bit representation of + scale is in SBITS, however it has a computed exponent that may have + overflown into the sign bit so that needs to be adjusted before using it as + a double. (int32_t)KI is the k used in the argument reduction and exponent + adjustment of scale, positive k here means the result may overflow and + negative k means the result may underflow. */ +static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki) { - double_t hi, lo, c, xx, y; - int k, sign; - uint32_t hx; - - GET_HIGH_WORD(hx, x); - sign = hx>>31; - hx &= 0x7fffffff; /* high word of |x| */ + double_t scale, y; - /* special cases */ - if (hx >= 0x4086232b) { /* if |x| >= 708.39... */ - if (isnan(x)) - return x; - if (x > 709.782712893383973096) { - /* overflow if x!=inf */ - x *= 0x1p1023; - return x; - } - if (x < -708.39641853226410622) { - /* underflow if x!=-inf */ - FORCE_EVAL((float)(-0x1p-149/x)); - if (x < -745.13321910194110842) - return 0; - } + if ((ki & 0x80000000) == 0) { + /* k > 0, the exponent of scale might have overflowed by <= 460. */ + sbits -= 1009ull << 52; + scale = asdouble(sbits); + y = 0x1p1009 * (scale + scale * tmp); + return eval_as_double(y); + } + /* k < 0, need special care in the subnormal range. */ + sbits += 1022ull << 52; + scale = asdouble(sbits); + y = scale + scale * tmp; + if (y < 1.0) { + /* Round y to the right precision before scaling it into the subnormal + range to avoid double rounding that can cause 0.5+E/2 ulp error where + E is the worst-case ulp error outside the subnormal range. So this + is only useful if the goal is better than 1 ulp worst-case error. */ + double_t hi, lo; + lo = scale - y + scale * tmp; + hi = 1.0 + y; + lo = 1.0 - hi + y + lo; + y = eval_as_double(hi + lo) - 1.0; + /* Avoid -0.0 with downward rounding. */ + if (WANT_ROUNDING && y == 0.0) + y = 0.0; + /* The underflow exception needs to be signaled explicitly. */ + fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022); } + y = 0x1p-1022 * y; + return eval_as_double(y); +} - /* argument reduction */ - if (hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ - if (hx >= 0x3ff0a2b2) /* if |x| >= 1.5 ln2 */ - k = (int)(invln2*x + half[sign]); - else - k = 1 - sign - sign; - hi = x - k*ln2hi; /* k*ln2hi is exact here */ - lo = k*ln2lo; - x = hi - lo; - } else if (hx > 0x3e300000) { /* if |x| > 2**-28 */ - k = 0; - hi = x; - lo = 0; - } else { - /* inexact if x!=0 */ - FORCE_EVAL(0x1p1023 + x); - return 1 + x; +/* Top 12 bits of a double (sign and exponent bits). */ +static inline uint32_t top12(double x) +{ + return asuint64(x) >> 52; +} + +double exp(double x) +{ + uint32_t abstop; + uint64_t ki, idx, top, sbits; + double_t kd, z, r, r2, scale, tail, tmp; + + abstop = top12(x) & 0x7ff; + if (predict_false(abstop - top12(0x1p-54) >= top12(512.0) - top12(0x1p-54))) { + if (abstop - top12(0x1p-54) >= 0x80000000) + /* Avoid spurious underflow for tiny x. */ + /* Note: 0 is common input. */ + return WANT_ROUNDING ? 1.0 + x : 1.0; + if (abstop >= top12(1024.0)) { + if (asuint64(x) == asuint64(-INFINITY)) + return 0.0; + if (abstop >= top12(INFINITY)) + return 1.0 + x; + if (asuint64(x) >> 63) + return __math_uflow(0); + else + return __math_oflow(0); + } + /* Large x is special cased below. */ + abstop = 0; } - /* x is now in primary range */ - xx = x*x; - c = x - xx*(P1+xx*(P2+xx*(P3+xx*(P4+xx*P5)))); - y = 1 + (x*c/(2-c) - lo + hi); - if (k == 0) - return y; - return scalbn(y, k); + /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ + /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ + z = InvLn2N * x; +#if TOINT_INTRINSICS + kd = roundtoint(z); + ki = converttoint(z); +#elif EXP_USE_TOINT_NARROW + /* z - kd is in [-0.5-2^-16, 0.5] in all rounding modes. */ + kd = eval_as_double(z + Shift); + ki = asuint64(kd) >> 16; + kd = (double_t)(int32_t)ki; +#else + /* z - kd is in [-1, 1] in non-nearest rounding modes. */ + kd = eval_as_double(z + Shift); + ki = asuint64(kd); + kd -= Shift; +#endif + r = x + kd * NegLn2hiN + kd * NegLn2loN; + /* 2^(k/N) ~= scale * (1 + tail). */ + idx = 2 * (ki % N); + top = ki << (52 - EXP_TABLE_BITS); + tail = asdouble(T[idx]); + /* This is only a valid scale when -1023*N < k < 1024*N. */ + sbits = T[idx + 1] + top; + /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (tail + exp(r) - 1). */ + /* Evaluation is optimized assuming superscalar pipelined execution. */ + r2 = r * r; + /* Without fma the worst case error is 0.25/N ulp larger. */ + /* Worst case error is less than 0.5+1.11/N+(abs poly error * 2^53) ulp. */ + tmp = tail + r + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5); + if (predict_false(abstop == 0)) + return specialcase(tmp, sbits, ki); + scale = asdouble(sbits); + /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there + is no spurious underflow here even without fma. */ + return eval_as_double(scale + scale * tmp); } diff --git a/system/lib/libc/musl/src/math/exp10.c b/system/lib/libc/musl/src/math/exp10.c index 9f5e3c2c51ea4..26899ebac90e1 100644 --- a/system/lib/libc/musl/src/math/exp10.c +++ b/system/lib/libc/musl/src/math/exp10.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include -#include "libc.h" double exp10(double x) { diff --git a/system/lib/libc/musl/src/math/exp10f.c b/system/lib/libc/musl/src/math/exp10f.c index 7a8d447033eb7..d009f0a84fdd9 100644 --- a/system/lib/libc/musl/src/math/exp10f.c +++ b/system/lib/libc/musl/src/math/exp10f.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include -#include "libc.h" float exp10f(float x) { diff --git a/system/lib/libc/musl/src/math/exp10l.c b/system/lib/libc/musl/src/math/exp10l.c index b758ebffe1dac..f3da1a082c5ef 100644 --- a/system/lib/libc/musl/src/math/exp10l.c +++ b/system/lib/libc/musl/src/math/exp10l.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include #include -#include "libc.h" #include "libm.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 diff --git a/system/lib/libc/musl/src/math/exp2.c b/system/lib/libc/musl/src/math/exp2.c index e14adba530e49..e0ff54bd85bb4 100644 --- a/system/lib/libc/musl/src/math/exp2.c +++ b/system/lib/libc/musl/src/math/exp2.c @@ -1,375 +1,121 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/s_exp2.c */ -/*- - * Copyright (c) 2005 David Schultz - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. +/* + * Double-precision 2^x function. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp_data.h" -#define TBLSIZE 256 +#define N (1 << EXP_TABLE_BITS) +#define Shift __exp_data.exp2_shift +#define T __exp_data.tab +#define C1 __exp_data.exp2_poly[0] +#define C2 __exp_data.exp2_poly[1] +#define C3 __exp_data.exp2_poly[2] +#define C4 __exp_data.exp2_poly[3] +#define C5 __exp_data.exp2_poly[4] -static const double -redux = 0x1.8p52 / TBLSIZE, -P1 = 0x1.62e42fefa39efp-1, -P2 = 0x1.ebfbdff82c575p-3, -P3 = 0x1.c6b08d704a0a6p-5, -P4 = 0x1.3b2ab88f70400p-7, -P5 = 0x1.5d88003875c74p-10; +/* Handle cases that may overflow or underflow when computing the result that + is scale*(1+TMP) without intermediate rounding. The bit representation of + scale is in SBITS, however it has a computed exponent that may have + overflown into the sign bit so that needs to be adjusted before using it as + a double. (int32_t)KI is the k used in the argument reduction and exponent + adjustment of scale, positive k here means the result may overflow and + negative k means the result may underflow. */ +static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki) +{ + double_t scale, y; -static const double tbl[TBLSIZE * 2] = { -/* exp2(z + eps) eps */ - 0x1.6a09e667f3d5dp-1, 0x1.9880p-44, - 0x1.6b052fa751744p-1, 0x1.8000p-50, - 0x1.6c012750bd9fep-1, -0x1.8780p-45, - 0x1.6cfdcddd476bfp-1, 0x1.ec00p-46, - 0x1.6dfb23c651a29p-1, -0x1.8000p-50, - 0x1.6ef9298593ae3p-1, -0x1.c000p-52, - 0x1.6ff7df9519386p-1, -0x1.fd80p-45, - 0x1.70f7466f42da3p-1, -0x1.c880p-45, - 0x1.71f75e8ec5fc3p-1, 0x1.3c00p-46, - 0x1.72f8286eacf05p-1, -0x1.8300p-44, - 0x1.73f9a48a58152p-1, -0x1.0c00p-47, - 0x1.74fbd35d7ccfcp-1, 0x1.f880p-45, - 0x1.75feb564267f1p-1, 0x1.3e00p-47, - 0x1.77024b1ab6d48p-1, -0x1.7d00p-45, - 0x1.780694fde5d38p-1, -0x1.d000p-50, - 0x1.790b938ac1d00p-1, 0x1.3000p-49, - 0x1.7a11473eb0178p-1, -0x1.d000p-49, - 0x1.7b17b0976d060p-1, 0x1.0400p-45, - 0x1.7c1ed0130c133p-1, 0x1.0000p-53, - 0x1.7d26a62ff8636p-1, -0x1.6900p-45, - 0x1.7e2f336cf4e3bp-1, -0x1.2e00p-47, - 0x1.7f3878491c3e8p-1, -0x1.4580p-45, - 0x1.80427543e1b4ep-1, 0x1.3000p-44, - 0x1.814d2add1071ap-1, 0x1.f000p-47, - 0x1.82589994ccd7ep-1, -0x1.1c00p-45, - 0x1.8364c1eb942d0p-1, 0x1.9d00p-45, - 0x1.8471a4623cab5p-1, 0x1.7100p-43, - 0x1.857f4179f5bbcp-1, 0x1.2600p-45, - 0x1.868d99b4491afp-1, -0x1.2c40p-44, - 0x1.879cad931a395p-1, -0x1.3000p-45, - 0x1.88ac7d98a65b8p-1, -0x1.a800p-45, - 0x1.89bd0a4785800p-1, -0x1.d000p-49, - 0x1.8ace5422aa223p-1, 0x1.3280p-44, - 0x1.8be05bad619fap-1, 0x1.2b40p-43, - 0x1.8cf3216b54383p-1, -0x1.ed00p-45, - 0x1.8e06a5e08664cp-1, -0x1.0500p-45, - 0x1.8f1ae99157807p-1, 0x1.8280p-45, - 0x1.902fed0282c0ep-1, -0x1.cb00p-46, - 0x1.9145b0b91ff96p-1, -0x1.5e00p-47, - 0x1.925c353aa2ff9p-1, 0x1.5400p-48, - 0x1.93737b0cdc64ap-1, 0x1.7200p-46, - 0x1.948b82b5f98aep-1, -0x1.9000p-47, - 0x1.95a44cbc852cbp-1, 0x1.5680p-45, - 0x1.96bdd9a766f21p-1, -0x1.6d00p-44, - 0x1.97d829fde4e2ap-1, -0x1.1000p-47, - 0x1.98f33e47a23a3p-1, 0x1.d000p-45, - 0x1.9a0f170ca0604p-1, -0x1.8a40p-44, - 0x1.9b2bb4d53ff89p-1, 0x1.55c0p-44, - 0x1.9c49182a3f15bp-1, 0x1.6b80p-45, - 0x1.9d674194bb8c5p-1, -0x1.c000p-49, - 0x1.9e86319e3238ep-1, 0x1.7d00p-46, - 0x1.9fa5e8d07f302p-1, 0x1.6400p-46, - 0x1.a0c667b5de54dp-1, -0x1.5000p-48, - 0x1.a1e7aed8eb8f6p-1, 0x1.9e00p-47, - 0x1.a309bec4a2e27p-1, 0x1.ad80p-45, - 0x1.a42c980460a5dp-1, -0x1.af00p-46, - 0x1.a5503b23e259bp-1, 0x1.b600p-47, - 0x1.a674a8af46213p-1, 0x1.8880p-44, - 0x1.a799e1330b3a7p-1, 0x1.1200p-46, - 0x1.a8bfe53c12e8dp-1, 0x1.6c00p-47, - 0x1.a9e6b5579fcd2p-1, -0x1.9b80p-45, - 0x1.ab0e521356fb8p-1, 0x1.b700p-45, - 0x1.ac36bbfd3f381p-1, 0x1.9000p-50, - 0x1.ad5ff3a3c2780p-1, 0x1.4000p-49, - 0x1.ae89f995ad2a3p-1, -0x1.c900p-45, - 0x1.afb4ce622f367p-1, 0x1.6500p-46, - 0x1.b0e07298db790p-1, 0x1.fd40p-45, - 0x1.b20ce6c9a89a9p-1, 0x1.2700p-46, - 0x1.b33a2b84f1a4bp-1, 0x1.d470p-43, - 0x1.b468415b747e7p-1, -0x1.8380p-44, - 0x1.b59728de5593ap-1, 0x1.8000p-54, - 0x1.b6c6e29f1c56ap-1, 0x1.ad00p-47, - 0x1.b7f76f2fb5e50p-1, 0x1.e800p-50, - 0x1.b928cf22749b2p-1, -0x1.4c00p-47, - 0x1.ba5b030a10603p-1, -0x1.d700p-47, - 0x1.bb8e0b79a6f66p-1, 0x1.d900p-47, - 0x1.bcc1e904bc1ffp-1, 0x1.2a00p-47, - 0x1.bdf69c3f3a16fp-1, -0x1.f780p-46, - 0x1.bf2c25bd71db8p-1, -0x1.0a00p-46, - 0x1.c06286141b2e9p-1, -0x1.1400p-46, - 0x1.c199bdd8552e0p-1, 0x1.be00p-47, - 0x1.c2d1cd9fa64eep-1, -0x1.9400p-47, - 0x1.c40ab5fffd02fp-1, -0x1.ed00p-47, - 0x1.c544778fafd15p-1, 0x1.9660p-44, - 0x1.c67f12e57d0cbp-1, -0x1.a100p-46, - 0x1.c7ba88988c1b6p-1, -0x1.8458p-42, - 0x1.c8f6d9406e733p-1, -0x1.a480p-46, - 0x1.ca3405751c4dfp-1, 0x1.b000p-51, - 0x1.cb720dcef9094p-1, 0x1.1400p-47, - 0x1.ccb0f2e6d1689p-1, 0x1.0200p-48, - 0x1.cdf0b555dc412p-1, 0x1.3600p-48, - 0x1.cf3155b5bab3bp-1, -0x1.6900p-47, - 0x1.d072d4a0789bcp-1, 0x1.9a00p-47, - 0x1.d1b532b08c8fap-1, -0x1.5e00p-46, - 0x1.d2f87080d8a85p-1, 0x1.d280p-46, - 0x1.d43c8eacaa203p-1, 0x1.1a00p-47, - 0x1.d5818dcfba491p-1, 0x1.f000p-50, - 0x1.d6c76e862e6a1p-1, -0x1.3a00p-47, - 0x1.d80e316c9834ep-1, -0x1.cd80p-47, - 0x1.d955d71ff6090p-1, 0x1.4c00p-48, - 0x1.da9e603db32aep-1, 0x1.f900p-48, - 0x1.dbe7cd63a8325p-1, 0x1.9800p-49, - 0x1.dd321f301b445p-1, -0x1.5200p-48, - 0x1.de7d5641c05bfp-1, -0x1.d700p-46, - 0x1.dfc97337b9aecp-1, -0x1.6140p-46, - 0x1.e11676b197d5ep-1, 0x1.b480p-47, - 0x1.e264614f5a3e7p-1, 0x1.0ce0p-43, - 0x1.e3b333b16ee5cp-1, 0x1.c680p-47, - 0x1.e502ee78b3fb4p-1, -0x1.9300p-47, - 0x1.e653924676d68p-1, -0x1.5000p-49, - 0x1.e7a51fbc74c44p-1, -0x1.7f80p-47, - 0x1.e8f7977cdb726p-1, -0x1.3700p-48, - 0x1.ea4afa2a490e8p-1, 0x1.5d00p-49, - 0x1.eb9f4867ccae4p-1, 0x1.61a0p-46, - 0x1.ecf482d8e680dp-1, 0x1.5500p-48, - 0x1.ee4aaa2188514p-1, 0x1.6400p-51, - 0x1.efa1bee615a13p-1, -0x1.e800p-49, - 0x1.f0f9c1cb64106p-1, -0x1.a880p-48, - 0x1.f252b376bb963p-1, -0x1.c900p-45, - 0x1.f3ac948dd7275p-1, 0x1.a000p-53, - 0x1.f50765b6e4524p-1, -0x1.4f00p-48, - 0x1.f6632798844fdp-1, 0x1.a800p-51, - 0x1.f7bfdad9cbe38p-1, 0x1.abc0p-48, - 0x1.f91d802243c82p-1, -0x1.4600p-50, - 0x1.fa7c1819e908ep-1, -0x1.b0c0p-47, - 0x1.fbdba3692d511p-1, -0x1.0e00p-51, - 0x1.fd3c22b8f7194p-1, -0x1.0de8p-46, - 0x1.fe9d96b2a23eep-1, 0x1.e430p-49, - 0x1.0000000000000p+0, 0x0.0000p+0, - 0x1.00b1afa5abcbep+0, -0x1.3400p-52, - 0x1.0163da9fb3303p+0, -0x1.2170p-46, - 0x1.02168143b0282p+0, 0x1.a400p-52, - 0x1.02c9a3e77806cp+0, 0x1.f980p-49, - 0x1.037d42e11bbcap+0, -0x1.7400p-51, - 0x1.04315e86e7f89p+0, 0x1.8300p-50, - 0x1.04e5f72f65467p+0, -0x1.a3f0p-46, - 0x1.059b0d315855ap+0, -0x1.2840p-47, - 0x1.0650a0e3c1f95p+0, 0x1.1600p-48, - 0x1.0706b29ddf71ap+0, 0x1.5240p-46, - 0x1.07bd42b72a82dp+0, -0x1.9a00p-49, - 0x1.0874518759bd0p+0, 0x1.6400p-49, - 0x1.092bdf66607c8p+0, -0x1.0780p-47, - 0x1.09e3ecac6f383p+0, -0x1.8000p-54, - 0x1.0a9c79b1f3930p+0, 0x1.fa00p-48, - 0x1.0b5586cf988fcp+0, -0x1.ac80p-48, - 0x1.0c0f145e46c8ap+0, 0x1.9c00p-50, - 0x1.0cc922b724816p+0, 0x1.5200p-47, - 0x1.0d83b23395dd8p+0, -0x1.ad00p-48, - 0x1.0e3ec32d3d1f3p+0, 0x1.bac0p-46, - 0x1.0efa55fdfa9a6p+0, -0x1.4e80p-47, - 0x1.0fb66affed2f0p+0, -0x1.d300p-47, - 0x1.1073028d7234bp+0, 0x1.1500p-48, - 0x1.11301d0125b5bp+0, 0x1.c000p-49, - 0x1.11edbab5e2af9p+0, 0x1.6bc0p-46, - 0x1.12abdc06c31d5p+0, 0x1.8400p-49, - 0x1.136a814f2047dp+0, -0x1.ed00p-47, - 0x1.1429aaea92de9p+0, 0x1.8e00p-49, - 0x1.14e95934f3138p+0, 0x1.b400p-49, - 0x1.15a98c8a58e71p+0, 0x1.5300p-47, - 0x1.166a45471c3dfp+0, 0x1.3380p-47, - 0x1.172b83c7d5211p+0, 0x1.8d40p-45, - 0x1.17ed48695bb9fp+0, -0x1.5d00p-47, - 0x1.18af9388c8d93p+0, -0x1.c880p-46, - 0x1.1972658375d66p+0, 0x1.1f00p-46, - 0x1.1a35beb6fcba7p+0, 0x1.0480p-46, - 0x1.1af99f81387e3p+0, -0x1.7390p-43, - 0x1.1bbe084045d54p+0, 0x1.4e40p-45, - 0x1.1c82f95281c43p+0, -0x1.a200p-47, - 0x1.1d4873168b9b2p+0, 0x1.3800p-49, - 0x1.1e0e75eb44031p+0, 0x1.ac00p-49, - 0x1.1ed5022fcd938p+0, 0x1.1900p-47, - 0x1.1f9c18438cdf7p+0, -0x1.b780p-46, - 0x1.2063b88628d8fp+0, 0x1.d940p-45, - 0x1.212be3578a81ep+0, 0x1.8000p-50, - 0x1.21f49917ddd41p+0, 0x1.b340p-45, - 0x1.22bdda2791323p+0, 0x1.9f80p-46, - 0x1.2387a6e7561e7p+0, -0x1.9c80p-46, - 0x1.2451ffb821427p+0, 0x1.2300p-47, - 0x1.251ce4fb2a602p+0, -0x1.3480p-46, - 0x1.25e85711eceb0p+0, 0x1.2700p-46, - 0x1.26b4565e27d16p+0, 0x1.1d00p-46, - 0x1.2780e341de00fp+0, 0x1.1ee0p-44, - 0x1.284dfe1f5633ep+0, -0x1.4c00p-46, - 0x1.291ba7591bb30p+0, -0x1.3d80p-46, - 0x1.29e9df51fdf09p+0, 0x1.8b00p-47, - 0x1.2ab8a66d10e9bp+0, -0x1.27c0p-45, - 0x1.2b87fd0dada3ap+0, 0x1.a340p-45, - 0x1.2c57e39771af9p+0, -0x1.0800p-46, - 0x1.2d285a6e402d9p+0, -0x1.ed00p-47, - 0x1.2df961f641579p+0, -0x1.4200p-48, - 0x1.2ecafa93e2ecfp+0, -0x1.4980p-45, - 0x1.2f9d24abd8822p+0, -0x1.6300p-46, - 0x1.306fe0a31b625p+0, -0x1.2360p-44, - 0x1.31432edeea50bp+0, -0x1.0df8p-40, - 0x1.32170fc4cd7b8p+0, -0x1.2480p-45, - 0x1.32eb83ba8e9a2p+0, -0x1.5980p-45, - 0x1.33c08b2641766p+0, 0x1.ed00p-46, - 0x1.3496266e3fa27p+0, -0x1.c000p-50, - 0x1.356c55f929f0fp+0, -0x1.0d80p-44, - 0x1.36431a2de88b9p+0, 0x1.2c80p-45, - 0x1.371a7373aaa39p+0, 0x1.0600p-45, - 0x1.37f26231e74fep+0, -0x1.6600p-46, - 0x1.38cae6d05d838p+0, -0x1.ae00p-47, - 0x1.39a401b713ec3p+0, -0x1.4720p-43, - 0x1.3a7db34e5a020p+0, 0x1.8200p-47, - 0x1.3b57fbfec6e95p+0, 0x1.e800p-44, - 0x1.3c32dc313a8f2p+0, 0x1.f800p-49, - 0x1.3d0e544ede122p+0, -0x1.7a00p-46, - 0x1.3dea64c1234bbp+0, 0x1.6300p-45, - 0x1.3ec70df1c4eccp+0, -0x1.8a60p-43, - 0x1.3fa4504ac7e8cp+0, -0x1.cdc0p-44, - 0x1.40822c367a0bbp+0, 0x1.5b80p-45, - 0x1.4160a21f72e95p+0, 0x1.ec00p-46, - 0x1.423fb27094646p+0, -0x1.3600p-46, - 0x1.431f5d950a920p+0, 0x1.3980p-45, - 0x1.43ffa3f84b9ebp+0, 0x1.a000p-48, - 0x1.44e0860618919p+0, -0x1.6c00p-48, - 0x1.45c2042a7d201p+0, -0x1.bc00p-47, - 0x1.46a41ed1d0016p+0, -0x1.2800p-46, - 0x1.4786d668b3326p+0, 0x1.0e00p-44, - 0x1.486a2b5c13c00p+0, -0x1.d400p-45, - 0x1.494e1e192af04p+0, 0x1.c200p-47, - 0x1.4a32af0d7d372p+0, -0x1.e500p-46, - 0x1.4b17dea6db801p+0, 0x1.7800p-47, - 0x1.4bfdad53629e1p+0, -0x1.3800p-46, - 0x1.4ce41b817c132p+0, 0x1.0800p-47, - 0x1.4dcb299fddddbp+0, 0x1.c700p-45, - 0x1.4eb2d81d8ab96p+0, -0x1.ce00p-46, - 0x1.4f9b2769d2d02p+0, 0x1.9200p-46, - 0x1.508417f4531c1p+0, -0x1.8c00p-47, - 0x1.516daa2cf662ap+0, -0x1.a000p-48, - 0x1.5257de83f51eap+0, 0x1.a080p-43, - 0x1.5342b569d4edap+0, -0x1.6d80p-45, - 0x1.542e2f4f6ac1ap+0, -0x1.2440p-44, - 0x1.551a4ca5d94dbp+0, 0x1.83c0p-43, - 0x1.56070dde9116bp+0, 0x1.4b00p-45, - 0x1.56f4736b529dep+0, 0x1.15a0p-43, - 0x1.57e27dbe2c40ep+0, -0x1.9e00p-45, - 0x1.58d12d497c76fp+0, -0x1.3080p-45, - 0x1.59c0827ff0b4cp+0, 0x1.dec0p-43, - 0x1.5ab07dd485427p+0, -0x1.4000p-51, - 0x1.5ba11fba87af4p+0, 0x1.0080p-44, - 0x1.5c9268a59460bp+0, -0x1.6c80p-45, - 0x1.5d84590998e3fp+0, 0x1.69a0p-43, - 0x1.5e76f15ad20e1p+0, -0x1.b400p-46, - 0x1.5f6a320dcebcap+0, 0x1.7700p-46, - 0x1.605e1b976dcb8p+0, 0x1.6f80p-45, - 0x1.6152ae6cdf715p+0, 0x1.1000p-47, - 0x1.6247eb03a5531p+0, -0x1.5d00p-46, - 0x1.633dd1d1929b5p+0, -0x1.2d00p-46, - 0x1.6434634ccc313p+0, -0x1.a800p-49, - 0x1.652b9febc8efap+0, -0x1.8600p-45, - 0x1.6623882553397p+0, 0x1.1fe0p-40, - 0x1.671c1c708328ep+0, -0x1.7200p-44, - 0x1.68155d44ca97ep+0, 0x1.6800p-49, - 0x1.690f4b19e9471p+0, -0x1.9780p-45, -}; + if ((ki & 0x80000000) == 0) { + /* k > 0, the exponent of scale might have overflowed by 1. */ + sbits -= 1ull << 52; + scale = asdouble(sbits); + y = 2 * (scale + scale * tmp); + return eval_as_double(y); + } + /* k < 0, need special care in the subnormal range. */ + sbits += 1022ull << 52; + scale = asdouble(sbits); + y = scale + scale * tmp; + if (y < 1.0) { + /* Round y to the right precision before scaling it into the subnormal + range to avoid double rounding that can cause 0.5+E/2 ulp error where + E is the worst-case ulp error outside the subnormal range. So this + is only useful if the goal is better than 1 ulp worst-case error. */ + double_t hi, lo; + lo = scale - y + scale * tmp; + hi = 1.0 + y; + lo = 1.0 - hi + y + lo; + y = eval_as_double(hi + lo) - 1.0; + /* Avoid -0.0 with downward rounding. */ + if (WANT_ROUNDING && y == 0.0) + y = 0.0; + /* The underflow exception needs to be signaled explicitly. */ + fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022); + } + y = 0x1p-1022 * y; + return eval_as_double(y); +} + +/* Top 12 bits of a double (sign and exponent bits). */ +static inline uint32_t top12(double x) +{ + return asuint64(x) >> 52; +} -/* - * exp2(x): compute the base 2 exponential of x - * - * Accuracy: Peak error < 0.503 ulp for normalized results. - * - * Method: (accurate tables) - * - * Reduce x: - * x = k + y, for integer k and |y| <= 1/2. - * Thus we have exp2(x) = 2**k * exp2(y). - * - * Reduce y: - * y = i/TBLSIZE + z - eps[i] for integer i near y * TBLSIZE. - * Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z - eps[i]), - * with |z - eps[i]| <= 2**-9 + 2**-39 for the table used. - * - * We compute exp2(i/TBLSIZE) via table lookup and exp2(z - eps[i]) via - * a degree-5 minimax polynomial with maximum error under 1.3 * 2**-61. - * The values in exp2t[] and eps[] are chosen such that - * exp2t[i] = exp2(i/TBLSIZE + eps[i]), and eps[i] is a small offset such - * that exp2t[i] is accurate to 2**-64. - * - * Note that the range of i is +-TBLSIZE/2, so we actually index the tables - * by i0 = i + TBLSIZE/2. For cache efficiency, exp2t[] and eps[] are - * virtual tables, interleaved in the real table tbl[]. - * - * This method is due to Gal, with many details due to Gal and Bachelis: - * - * Gal, S. and Bachelis, B. An Accurate Elementary Mathematical Library - * for the IEEE Floating Point Standard. TOMS 17(1), 26-46 (1991). - */ double exp2(double x) { - double_t r, t, z; - uint32_t ix, i0; - union {double f; uint64_t i;} u = {x}; - union {uint32_t u; int32_t i;} k; + uint32_t abstop; + uint64_t ki, idx, top, sbits; + double_t kd, r, r2, scale, tail, tmp; - /* Filter out exceptional cases. */ - ix = u.i>>32 & 0x7fffffff; - if (ix >= 0x408ff000) { /* |x| >= 1022 or nan */ - if (ix >= 0x40900000 && u.i>>63 == 0) { /* x >= 1024 or nan */ - /* overflow */ - x *= 0x1p1023; - return x; - } - if (ix >= 0x7ff00000) /* -inf or -nan */ - return -1/x; - if (u.i>>63) { /* x <= -1022 */ - /* underflow */ - if (x <= -1075 || x - 0x1p52 + 0x1p52 != x) - FORCE_EVAL((float)(-0x1p-149/x)); - if (x <= -1075) - return 0; + abstop = top12(x) & 0x7ff; + if (predict_false(abstop - top12(0x1p-54) >= top12(512.0) - top12(0x1p-54))) { + if (abstop - top12(0x1p-54) >= 0x80000000) + /* Avoid spurious underflow for tiny x. */ + /* Note: 0 is common input. */ + return WANT_ROUNDING ? 1.0 + x : 1.0; + if (abstop >= top12(1024.0)) { + if (asuint64(x) == asuint64(-INFINITY)) + return 0.0; + if (abstop >= top12(INFINITY)) + return 1.0 + x; + if (!(asuint64(x) >> 63)) + return __math_oflow(0); + else if (asuint64(x) >= asuint64(-1075.0)) + return __math_uflow(0); } - } else if (ix < 0x3c900000) { /* |x| < 0x1p-54 */ - return 1.0 + x; + if (2 * asuint64(x) > 2 * asuint64(928.0)) + /* Large x is special cased below. */ + abstop = 0; } - /* Reduce x, computing z, i0, and k. */ - u.f = x + redux; - i0 = u.i; - i0 += TBLSIZE / 2; - k.u = i0 / TBLSIZE * TBLSIZE; - k.i /= TBLSIZE; - i0 %= TBLSIZE; - u.f -= redux; - z = x - u.f; - - /* Compute r = exp2(y) = exp2t[i0] * p(z - eps[i]). */ - t = tbl[2*i0]; /* exp2t[i0] */ - z -= tbl[2*i0 + 1]; /* eps[i0] */ - r = t + t * z * (P1 + z * (P2 + z * (P3 + z * (P4 + z * P5)))); - - return scalbn(r, k.i); + /* exp2(x) = 2^(k/N) * 2^r, with 2^r in [2^(-1/2N),2^(1/2N)]. */ + /* x = k/N + r, with int k and r in [-1/2N, 1/2N]. */ + kd = eval_as_double(x + Shift); + ki = asuint64(kd); /* k. */ + kd -= Shift; /* k/N for int k. */ + r = x - kd; + /* 2^(k/N) ~= scale * (1 + tail). */ + idx = 2 * (ki % N); + top = ki << (52 - EXP_TABLE_BITS); + tail = asdouble(T[idx]); + /* This is only a valid scale when -1023*N < k < 1024*N. */ + sbits = T[idx + 1] + top; + /* exp2(x) = 2^(k/N) * 2^r ~= scale + scale * (tail + 2^r - 1). */ + /* Evaluation is optimized assuming superscalar pipelined execution. */ + r2 = r * r; + /* Without fma the worst case error is 0.5/N ulp larger. */ + /* Worst case error is less than 0.5+0.86/N+(abs poly error * 2^53) ulp. */ + tmp = tail + r * C1 + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5); + if (predict_false(abstop == 0)) + return specialcase(tmp, sbits, ki); + scale = asdouble(sbits); + /* Note: tmp == 0 or |tmp| > 2^-65 and scale > 2^-928, so there + is no spurious underflow here even without fma. */ + return eval_as_double(scale + scale * tmp); } diff --git a/system/lib/libc/musl/src/math/exp2f.c b/system/lib/libc/musl/src/math/exp2f.c index 296b63436f644..0360482cae0a3 100644 --- a/system/lib/libc/musl/src/math/exp2f.c +++ b/system/lib/libc/musl/src/math/exp2f.c @@ -1,126 +1,69 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/s_exp2f.c */ -/*- - * Copyright (c) 2005 David Schultz - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. +/* + * Single-precision 2^x function. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp2f_data.h" -#define TBLSIZE 16 +/* +EXP2F_TABLE_BITS = 5 +EXP2F_POLY_ORDER = 3 -static const float -redux = 0x1.8p23f / TBLSIZE, -P1 = 0x1.62e430p-1f, -P2 = 0x1.ebfbe0p-3f, -P3 = 0x1.c6b348p-5f, -P4 = 0x1.3b2c9cp-7f; +ULP error: 0.502 (nearest rounding.) +Relative error: 1.69 * 2^-34 in [-1/64, 1/64] (before rounding.) +Wrong count: 168353 (all nearest rounding wrong results with fma.) +Non-nearest ULP error: 1 (rounded ULP error) +*/ -static const double exp2ft[TBLSIZE] = { - 0x1.6a09e667f3bcdp-1, - 0x1.7a11473eb0187p-1, - 0x1.8ace5422aa0dbp-1, - 0x1.9c49182a3f090p-1, - 0x1.ae89f995ad3adp-1, - 0x1.c199bdd85529cp-1, - 0x1.d5818dcfba487p-1, - 0x1.ea4afa2a490dap-1, - 0x1.0000000000000p+0, - 0x1.0b5586cf9890fp+0, - 0x1.172b83c7d517bp+0, - 0x1.2387a6e756238p+0, - 0x1.306fe0a31b715p+0, - 0x1.3dea64c123422p+0, - 0x1.4bfdad5362a27p+0, - 0x1.5ab07dd485429p+0, -}; +#define N (1 << EXP2F_TABLE_BITS) +#define T __exp2f_data.tab +#define C __exp2f_data.poly +#define SHIFT __exp2f_data.shift_scaled + +static inline uint32_t top12(float x) +{ + return asuint(x) >> 20; +} -/* - * exp2f(x): compute the base 2 exponential of x - * - * Accuracy: Peak error < 0.501 ulp; location of peak: -0.030110927. - * - * Method: (equally-spaced tables) - * - * Reduce x: - * x = k + y, for integer k and |y| <= 1/2. - * Thus we have exp2f(x) = 2**k * exp2(y). - * - * Reduce y: - * y = i/TBLSIZE + z for integer i near y * TBLSIZE. - * Thus we have exp2(y) = exp2(i/TBLSIZE) * exp2(z), - * with |z| <= 2**-(TBLSIZE+1). - * - * We compute exp2(i/TBLSIZE) via table lookup and exp2(z) via a - * degree-4 minimax polynomial with maximum error under 1.4 * 2**-33. - * Using double precision for everything except the reduction makes - * roundoff error insignificant and simplifies the scaling step. - * - * This method is due to Tang, but I do not use his suggested parameters: - * - * Tang, P. Table-driven Implementation of the Exponential Function - * in IEEE Floating-Point Arithmetic. TOMS 15(2), 144-157 (1989). - */ float exp2f(float x) { - double_t t, r, z; - union {float f; uint32_t i;} u = {x}; - union {double f; uint64_t i;} uk; - uint32_t ix, i0, k; + uint32_t abstop; + uint64_t ki, t; + double_t kd, xd, z, r, r2, y, s; - /* Filter out exceptional cases. */ - ix = u.i & 0x7fffffff; - if (ix > 0x42fc0000) { /* |x| > 126 */ - if (ix > 0x7f800000) /* NaN */ - return x; - if (u.i >= 0x43000000 && u.i < 0x80000000) { /* x >= 128 */ - x *= 0x1p127f; - return x; - } - if (u.i >= 0x80000000) { /* x < -126 */ - if (u.i >= 0xc3160000 || (u.i & 0x0000ffff)) - FORCE_EVAL(-0x1p-149f/x); - if (u.i >= 0xc3160000) /* x <= -150 */ - return 0; - } - } else if (ix <= 0x33000000) { /* |x| <= 0x1p-25 */ - return 1.0f + x; + xd = (double_t)x; + abstop = top12(x) & 0x7ff; + if (predict_false(abstop >= top12(128.0f))) { + /* |x| >= 128 or x is nan. */ + if (asuint(x) == asuint(-INFINITY)) + return 0.0f; + if (abstop >= top12(INFINITY)) + return x + x; + if (x > 0.0f) + return __math_oflowf(0); + if (x <= -150.0f) + return __math_uflowf(0); } - /* Reduce x, computing z, i0, and k. */ - u.f = x + redux; - i0 = u.i; - i0 += TBLSIZE / 2; - k = i0 / TBLSIZE; - uk.i = (uint64_t)(0x3ff + k)<<52; - i0 &= TBLSIZE - 1; - u.f -= redux; - z = x - u.f; - /* Compute r = exp2(y) = exp2ft[i0] * p(z). */ - r = exp2ft[i0]; - t = r * z; - r = r + t * (P1 + z * P2) + t * (z * z) * (P3 + z * P4); + /* x = k/N + r with r in [-1/(2N), 1/(2N)] and int k. */ + kd = eval_as_double(xd + SHIFT); + ki = asuint64(kd); + kd -= SHIFT; /* k/N for int k. */ + r = xd - kd; - /* Scale by 2**k */ - return r * uk.f; + /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ + t = T[ki % N]; + t += ki << (52 - EXP2F_TABLE_BITS); + s = asdouble(t); + z = C[0] * r + C[1]; + r2 = r * r; + y = C[2] * r + 1; + y = z * r2 + y; + y = y * s; + return eval_as_float(y); } diff --git a/system/lib/libc/musl/src/math/exp2f_data.c b/system/lib/libc/musl/src/math/exp2f_data.c new file mode 100644 index 0000000000000..be324727f5f10 --- /dev/null +++ b/system/lib/libc/musl/src/math/exp2f_data.c @@ -0,0 +1,35 @@ +/* + * Shared data between expf, exp2f and powf. + * + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "exp2f_data.h" + +#define N (1 << EXP2F_TABLE_BITS) + +const struct exp2f_data __exp2f_data = { + /* tab[i] = uint(2^(i/N)) - (i << 52-BITS) + used for computing 2^(k/N) for an int |k| < 150 N as + double(tab[k%N] + (k << 52-BITS)) */ + .tab = { +0x3ff0000000000000, 0x3fefd9b0d3158574, 0x3fefb5586cf9890f, 0x3fef9301d0125b51, +0x3fef72b83c7d517b, 0x3fef54873168b9aa, 0x3fef387a6e756238, 0x3fef1e9df51fdee1, +0x3fef06fe0a31b715, 0x3feef1a7373aa9cb, 0x3feedea64c123422, 0x3feece086061892d, +0x3feebfdad5362a27, 0x3feeb42b569d4f82, 0x3feeab07dd485429, 0x3feea47eb03a5585, +0x3feea09e667f3bcd, 0x3fee9f75e8ec5f74, 0x3feea11473eb0187, 0x3feea589994cce13, +0x3feeace5422aa0db, 0x3feeb737b0cdc5e5, 0x3feec49182a3f090, 0x3feed503b23e255d, +0x3feee89f995ad3ad, 0x3feeff76f2fb5e47, 0x3fef199bdd85529c, 0x3fef3720dcef9069, +0x3fef5818dcfba487, 0x3fef7c97337b9b5f, 0x3fefa4afa2a490da, 0x3fefd0765b6e4540, + }, + .shift_scaled = 0x1.8p+52 / N, + .poly = { + 0x1.c6af84b912394p-5, 0x1.ebfce50fac4f3p-3, 0x1.62e42ff0c52d6p-1, + }, + .shift = 0x1.8p+52, + .invln2_scaled = 0x1.71547652b82fep+0 * N, + .poly_scaled = { + 0x1.c6af84b912394p-5/N/N/N, 0x1.ebfce50fac4f3p-3/N/N, 0x1.62e42ff0c52d6p-1/N, + }, +}; diff --git a/system/lib/libc/musl/src/math/exp2f_data.h b/system/lib/libc/musl/src/math/exp2f_data.h new file mode 100644 index 0000000000000..fe744f15beb21 --- /dev/null +++ b/system/lib/libc/musl/src/math/exp2f_data.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _EXP2F_DATA_H +#define _EXP2F_DATA_H + +#include +#include + +/* Shared between expf, exp2f and powf. */ +#define EXP2F_TABLE_BITS 5 +#define EXP2F_POLY_ORDER 3 +extern hidden const struct exp2f_data { + uint64_t tab[1 << EXP2F_TABLE_BITS]; + double shift_scaled; + double poly[EXP2F_POLY_ORDER]; + double shift; + double invln2_scaled; + double poly_scaled[EXP2F_POLY_ORDER]; +} __exp2f_data; + +#endif diff --git a/system/lib/libc/musl/src/math/exp_data.c b/system/lib/libc/musl/src/math/exp_data.c new file mode 100644 index 0000000000000..21be0146a1674 --- /dev/null +++ b/system/lib/libc/musl/src/math/exp_data.c @@ -0,0 +1,182 @@ +/* + * Shared data between exp, exp2 and pow. + * + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "exp_data.h" + +#define N (1 << EXP_TABLE_BITS) + +const struct exp_data __exp_data = { +// N/ln2 +.invln2N = 0x1.71547652b82fep0 * N, +// -ln2/N +.negln2hiN = -0x1.62e42fefa0000p-8, +.negln2loN = -0x1.cf79abc9e3b3ap-47, +// Used for rounding when !TOINT_INTRINSICS +#if EXP_USE_TOINT_NARROW +.shift = 0x1800000000.8p0, +#else +.shift = 0x1.8p52, +#endif +// exp polynomial coefficients. +.poly = { +// abs error: 1.555*2^-66 +// ulp error: 0.509 (0.511 without fma) +// if |x| < ln2/256+eps +// abs error if |x| < ln2/256+0x1p-15: 1.09*2^-65 +// abs error if |x| < ln2/128: 1.7145*2^-56 +0x1.ffffffffffdbdp-2, +0x1.555555555543cp-3, +0x1.55555cf172b91p-5, +0x1.1111167a4d017p-7, +}, +.exp2_shift = 0x1.8p52 / N, +// exp2 polynomial coefficients. +.exp2_poly = { +// abs error: 1.2195*2^-65 +// ulp error: 0.507 (0.511 without fma) +// if |x| < 1/256 +// abs error if |x| < 1/128: 1.9941*2^-56 +0x1.62e42fefa39efp-1, +0x1.ebfbdff82c424p-3, +0x1.c6b08d70cf4b5p-5, +0x1.3b2abd24650ccp-7, +0x1.5d7e09b4e3a84p-10, +}, +// 2^(k/N) ~= H[k]*(1 + T[k]) for int k in [0,N) +// tab[2*k] = asuint64(T[k]) +// tab[2*k+1] = asuint64(H[k]) - (k << 52)/N +.tab = { +0x0, 0x3ff0000000000000, +0x3c9b3b4f1a88bf6e, 0x3feff63da9fb3335, +0xbc7160139cd8dc5d, 0x3fefec9a3e778061, +0xbc905e7a108766d1, 0x3fefe315e86e7f85, +0x3c8cd2523567f613, 0x3fefd9b0d3158574, +0xbc8bce8023f98efa, 0x3fefd06b29ddf6de, +0x3c60f74e61e6c861, 0x3fefc74518759bc8, +0x3c90a3e45b33d399, 0x3fefbe3ecac6f383, +0x3c979aa65d837b6d, 0x3fefb5586cf9890f, +0x3c8eb51a92fdeffc, 0x3fefac922b7247f7, +0x3c3ebe3d702f9cd1, 0x3fefa3ec32d3d1a2, +0xbc6a033489906e0b, 0x3fef9b66affed31b, +0xbc9556522a2fbd0e, 0x3fef9301d0125b51, +0xbc5080ef8c4eea55, 0x3fef8abdc06c31cc, +0xbc91c923b9d5f416, 0x3fef829aaea92de0, +0x3c80d3e3e95c55af, 0x3fef7a98c8a58e51, +0xbc801b15eaa59348, 0x3fef72b83c7d517b, +0xbc8f1ff055de323d, 0x3fef6af9388c8dea, +0x3c8b898c3f1353bf, 0x3fef635beb6fcb75, +0xbc96d99c7611eb26, 0x3fef5be084045cd4, +0x3c9aecf73e3a2f60, 0x3fef54873168b9aa, +0xbc8fe782cb86389d, 0x3fef4d5022fcd91d, +0x3c8a6f4144a6c38d, 0x3fef463b88628cd6, +0x3c807a05b0e4047d, 0x3fef3f49917ddc96, +0x3c968efde3a8a894, 0x3fef387a6e756238, +0x3c875e18f274487d, 0x3fef31ce4fb2a63f, +0x3c80472b981fe7f2, 0x3fef2b4565e27cdd, +0xbc96b87b3f71085e, 0x3fef24dfe1f56381, +0x3c82f7e16d09ab31, 0x3fef1e9df51fdee1, +0xbc3d219b1a6fbffa, 0x3fef187fd0dad990, +0x3c8b3782720c0ab4, 0x3fef1285a6e4030b, +0x3c6e149289cecb8f, 0x3fef0cafa93e2f56, +0x3c834d754db0abb6, 0x3fef06fe0a31b715, +0x3c864201e2ac744c, 0x3fef0170fc4cd831, +0x3c8fdd395dd3f84a, 0x3feefc08b26416ff, +0xbc86a3803b8e5b04, 0x3feef6c55f929ff1, +0xbc924aedcc4b5068, 0x3feef1a7373aa9cb, +0xbc9907f81b512d8e, 0x3feeecae6d05d866, +0xbc71d1e83e9436d2, 0x3feee7db34e59ff7, +0xbc991919b3ce1b15, 0x3feee32dc313a8e5, +0x3c859f48a72a4c6d, 0x3feedea64c123422, +0xbc9312607a28698a, 0x3feeda4504ac801c, +0xbc58a78f4817895b, 0x3feed60a21f72e2a, +0xbc7c2c9b67499a1b, 0x3feed1f5d950a897, +0x3c4363ed60c2ac11, 0x3feece086061892d, +0x3c9666093b0664ef, 0x3feeca41ed1d0057, +0x3c6ecce1daa10379, 0x3feec6a2b5c13cd0, +0x3c93ff8e3f0f1230, 0x3feec32af0d7d3de, +0x3c7690cebb7aafb0, 0x3feebfdad5362a27, +0x3c931dbdeb54e077, 0x3feebcb299fddd0d, +0xbc8f94340071a38e, 0x3feeb9b2769d2ca7, +0xbc87deccdc93a349, 0x3feeb6daa2cf6642, +0xbc78dec6bd0f385f, 0x3feeb42b569d4f82, +0xbc861246ec7b5cf6, 0x3feeb1a4ca5d920f, +0x3c93350518fdd78e, 0x3feeaf4736b527da, +0x3c7b98b72f8a9b05, 0x3feead12d497c7fd, +0x3c9063e1e21c5409, 0x3feeab07dd485429, +0x3c34c7855019c6ea, 0x3feea9268a5946b7, +0x3c9432e62b64c035, 0x3feea76f15ad2148, +0xbc8ce44a6199769f, 0x3feea5e1b976dc09, +0xbc8c33c53bef4da8, 0x3feea47eb03a5585, +0xbc845378892be9ae, 0x3feea34634ccc320, +0xbc93cedd78565858, 0x3feea23882552225, +0x3c5710aa807e1964, 0x3feea155d44ca973, +0xbc93b3efbf5e2228, 0x3feea09e667f3bcd, +0xbc6a12ad8734b982, 0x3feea012750bdabf, +0xbc6367efb86da9ee, 0x3fee9fb23c651a2f, +0xbc80dc3d54e08851, 0x3fee9f7df9519484, +0xbc781f647e5a3ecf, 0x3fee9f75e8ec5f74, +0xbc86ee4ac08b7db0, 0x3fee9f9a48a58174, +0xbc8619321e55e68a, 0x3fee9feb564267c9, +0x3c909ccb5e09d4d3, 0x3feea0694fde5d3f, +0xbc7b32dcb94da51d, 0x3feea11473eb0187, +0x3c94ecfd5467c06b, 0x3feea1ed0130c132, +0x3c65ebe1abd66c55, 0x3feea2f336cf4e62, +0xbc88a1c52fb3cf42, 0x3feea427543e1a12, +0xbc9369b6f13b3734, 0x3feea589994cce13, +0xbc805e843a19ff1e, 0x3feea71a4623c7ad, +0xbc94d450d872576e, 0x3feea8d99b4492ed, +0x3c90ad675b0e8a00, 0x3feeaac7d98a6699, +0x3c8db72fc1f0eab4, 0x3feeace5422aa0db, +0xbc65b6609cc5e7ff, 0x3feeaf3216b5448c, +0x3c7bf68359f35f44, 0x3feeb1ae99157736, +0xbc93091fa71e3d83, 0x3feeb45b0b91ffc6, +0xbc5da9b88b6c1e29, 0x3feeb737b0cdc5e5, +0xbc6c23f97c90b959, 0x3feeba44cbc8520f, +0xbc92434322f4f9aa, 0x3feebd829fde4e50, +0xbc85ca6cd7668e4b, 0x3feec0f170ca07ba, +0x3c71affc2b91ce27, 0x3feec49182a3f090, +0x3c6dd235e10a73bb, 0x3feec86319e32323, +0xbc87c50422622263, 0x3feecc667b5de565, +0x3c8b1c86e3e231d5, 0x3feed09bec4a2d33, +0xbc91bbd1d3bcbb15, 0x3feed503b23e255d, +0x3c90cc319cee31d2, 0x3feed99e1330b358, +0x3c8469846e735ab3, 0x3feede6b5579fdbf, +0xbc82dfcd978e9db4, 0x3feee36bbfd3f37a, +0x3c8c1a7792cb3387, 0x3feee89f995ad3ad, +0xbc907b8f4ad1d9fa, 0x3feeee07298db666, +0xbc55c3d956dcaeba, 0x3feef3a2b84f15fb, +0xbc90a40e3da6f640, 0x3feef9728de5593a, +0xbc68d6f438ad9334, 0x3feeff76f2fb5e47, +0xbc91eee26b588a35, 0x3fef05b030a1064a, +0x3c74ffd70a5fddcd, 0x3fef0c1e904bc1d2, +0xbc91bdfbfa9298ac, 0x3fef12c25bd71e09, +0x3c736eae30af0cb3, 0x3fef199bdd85529c, +0x3c8ee3325c9ffd94, 0x3fef20ab5fffd07a, +0x3c84e08fd10959ac, 0x3fef27f12e57d14b, +0x3c63cdaf384e1a67, 0x3fef2f6d9406e7b5, +0x3c676b2c6c921968, 0x3fef3720dcef9069, +0xbc808a1883ccb5d2, 0x3fef3f0b555dc3fa, +0xbc8fad5d3ffffa6f, 0x3fef472d4a07897c, +0xbc900dae3875a949, 0x3fef4f87080d89f2, +0x3c74a385a63d07a7, 0x3fef5818dcfba487, +0xbc82919e2040220f, 0x3fef60e316c98398, +0x3c8e5a50d5c192ac, 0x3fef69e603db3285, +0x3c843a59ac016b4b, 0x3fef7321f301b460, +0xbc82d52107b43e1f, 0x3fef7c97337b9b5f, +0xbc892ab93b470dc9, 0x3fef864614f5a129, +0x3c74b604603a88d3, 0x3fef902ee78b3ff6, +0x3c83c5ec519d7271, 0x3fef9a51fbc74c83, +0xbc8ff7128fd391f0, 0x3fefa4afa2a490da, +0xbc8dae98e223747d, 0x3fefaf482d8e67f1, +0x3c8ec3bc41aa2008, 0x3fefba1bee615a27, +0x3c842b94c3a9eb32, 0x3fefc52b376bba97, +0x3c8a64a931d185ee, 0x3fefd0765b6e4540, +0xbc8e37bae43be3ed, 0x3fefdbfdad9cbe14, +0x3c77893b4d91cd9d, 0x3fefe7c1819e90d8, +0x3c5305c14160cc89, 0x3feff3c22b8f71f1, +}, +}; diff --git a/system/lib/libc/musl/src/math/exp_data.h b/system/lib/libc/musl/src/math/exp_data.h new file mode 100644 index 0000000000000..3e24bac57a80f --- /dev/null +++ b/system/lib/libc/musl/src/math/exp_data.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _EXP_DATA_H +#define _EXP_DATA_H + +#include +#include + +#define EXP_TABLE_BITS 7 +#define EXP_POLY_ORDER 5 +#define EXP_USE_TOINT_NARROW 0 +#define EXP2_POLY_ORDER 5 +extern hidden const struct exp_data { + double invln2N; + double shift; + double negln2hiN; + double negln2loN; + double poly[4]; /* Last four coefficients. */ + double exp2_shift; + double exp2_poly[EXP2_POLY_ORDER]; + uint64_t tab[2*(1 << EXP_TABLE_BITS)]; +} __exp_data; + +#endif diff --git a/system/lib/libc/musl/src/math/expf.c b/system/lib/libc/musl/src/math/expf.c index feee2b0ed2174..f9fbf8e727db6 100644 --- a/system/lib/libc/musl/src/math/expf.c +++ b/system/lib/libc/musl/src/math/expf.c @@ -1,83 +1,80 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_expf.c */ /* - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Single-precision e^x function. * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp2f_data.h" -static const float -half[2] = {0.5,-0.5}, -ln2hi = 6.9314575195e-1f, /* 0x3f317200 */ -ln2lo = 1.4286067653e-6f, /* 0x35bfbe8e */ -invln2 = 1.4426950216e+0f, /* 0x3fb8aa3b */ /* - * Domain [-0.34568, 0.34568], range ~[-4.278e-9, 4.447e-9]: - * |x*(exp(x)+1)/(exp(x)-1) - p(x)| < 2**-27.74 - */ -P1 = 1.6666625440e-1f, /* 0xaaaa8f.0p-26 */ -P2 = -2.7667332906e-3f; /* -0xb55215.0p-32 */ +EXP2F_TABLE_BITS = 5 +EXP2F_POLY_ORDER = 3 -float expf(float x) +ULP error: 0.502 (nearest rounding.) +Relative error: 1.69 * 2^-34 in [-ln2/64, ln2/64] (before rounding.) +Wrong count: 170635 (all nearest rounding wrong results with fma.) +Non-nearest ULP error: 1 (rounded ULP error) +*/ + +#define N (1 << EXP2F_TABLE_BITS) +#define InvLn2N __exp2f_data.invln2_scaled +#define T __exp2f_data.tab +#define C __exp2f_data.poly_scaled + +static inline uint32_t top12(float x) { - float_t hi, lo, c, xx, y; - int k, sign; - uint32_t hx; + return asuint(x) >> 20; +} - GET_FLOAT_WORD(hx, x); - sign = hx >> 31; /* sign bit of x */ - hx &= 0x7fffffff; /* high word of |x| */ +float expf(float x) +{ + uint32_t abstop; + uint64_t ki, t; + double_t kd, xd, z, r, r2, y, s; - /* special cases */ - if (hx >= 0x42aeac50) { /* if |x| >= -87.33655f or NaN */ - if (hx > 0x7f800000) /* NaN */ - return x; - if (hx >= 0x42b17218 && !sign) { /* x >= 88.722839f */ - /* overflow */ - x *= 0x1p127f; - return x; - } - if (sign) { - /* underflow */ - FORCE_EVAL(-0x1p-149f/x); - if (hx >= 0x42cff1b5) /* x <= -103.972084f */ - return 0; - } + xd = (double_t)x; + abstop = top12(x) & 0x7ff; + if (predict_false(abstop >= top12(88.0f))) { + /* |x| >= 88 or x is nan. */ + if (asuint(x) == asuint(-INFINITY)) + return 0.0f; + if (abstop >= top12(INFINITY)) + return x + x; + if (x > 0x1.62e42ep6f) /* x > log(0x1p128) ~= 88.72 */ + return __math_oflowf(0); + if (x < -0x1.9fe368p6f) /* x < log(0x1p-150) ~= -103.97 */ + return __math_uflowf(0); } - /* argument reduction */ - if (hx > 0x3eb17218) { /* if |x| > 0.5 ln2 */ - if (hx > 0x3f851592) /* if |x| > 1.5 ln2 */ - k = invln2*x + half[sign]; - else - k = 1 - sign - sign; - hi = x - k*ln2hi; /* k*ln2hi is exact here */ - lo = k*ln2lo; - x = hi - lo; - } else if (hx > 0x39000000) { /* |x| > 2**-14 */ - k = 0; - hi = x; - lo = 0; - } else { - /* raise inexact */ - FORCE_EVAL(0x1p127f + x); - return 1 + x; - } + /* x*N/Ln2 = k + r with r in [-1/2, 1/2] and int k. */ + z = InvLn2N * xd; + + /* Round and convert z to int, the result is in [-150*N, 128*N] and + ideally ties-to-even rule is used, otherwise the magnitude of r + can be bigger which gives larger approximation error. */ +#if TOINT_INTRINSICS + kd = roundtoint(z); + ki = converttoint(z); +#else +# define SHIFT __exp2f_data.shift + kd = eval_as_double(z + SHIFT); + ki = asuint64(kd); + kd -= SHIFT; +#endif + r = z - kd; - /* x is now in primary range */ - xx = x*x; - c = x - xx*(P1+xx*P2); - y = 1 + (x*c/(2-c) - lo + hi); - if (k == 0) - return y; - return scalbnf(y, k); + /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ + t = T[ki % N]; + t += ki << (52 - EXP2F_TABLE_BITS); + s = asdouble(t); + z = C[0] * r + C[1]; + r2 = r * r; + y = C[2] * r + 1; + y = z * r2 + y; + y = y * s; + return eval_as_float(y); } diff --git a/system/lib/libc/musl/src/math/fma.c b/system/lib/libc/musl/src/math/fma.c index 38e0866f85285..5336a2d504467 100644 --- a/system/lib/libc/musl/src/math/fma.c +++ b/system/lib/libc/musl/src/math/fma.c @@ -1,80 +1,42 @@ -#include -#include "libm.h" +#include +#include +#include +#include "atomic.h" -#if LDBL_MANT_DIG==64 && LDBL_MAX_EXP==16384 -/* exact add, assumes exponent_x >= exponent_y */ -static void add(long double *hi, long double *lo, long double x, long double y) -{ - long double r; +#define ASUINT64(x) ((union {double f; uint64_t i;}){x}).i +#define ZEROINFNAN (0x7ff-0x3ff-52-1) - r = x + y; - *hi = r; - r -= x; - *lo = y - r; -} +struct num { uint64_t m; int e; int sign; }; -/* exact mul, assumes no over/underflow */ -static void mul(long double *hi, long double *lo, long double x, long double y) +static struct num normalize(double x) { - static const long double c = 1.0 + 0x1p32L; - long double cx, xh, xl, cy, yh, yl; - - cx = c*x; - xh = (x - cx) + cx; - xl = x - xh; - cy = c*y; - yh = (y - cy) + cy; - yl = y - yh; - *hi = x*y; - *lo = (xh*yh - *hi) + xh*yl + xl*yh + xl*yl; -} - -/* -assume (long double)(hi+lo) == hi -return an adjusted hi so that rounding it to double (or less) precision is correct -*/ -static long double adjust(long double hi, long double lo) -{ - union ldshape uhi, ulo; - - if (lo == 0) - return hi; - uhi.f = hi; - if (uhi.i.m & 0x3ff) - return hi; - ulo.f = lo; - if ((uhi.i.se & 0x8000) == (ulo.i.se & 0x8000)) - uhi.i.m++; - else { - /* handle underflow and take care of ld80 implicit msb */ - if (uhi.i.m << 1 == 0) { - uhi.i.m = 0; - uhi.i.se--; - } - uhi.i.m--; + uint64_t ix = ASUINT64(x); + int e = ix>>52; + int sign = e & 0x800; + e &= 0x7ff; + if (!e) { + ix = ASUINT64(x*0x1p63); + e = ix>>52 & 0x7ff; + e = e ? e-63 : 0x800; } - return uhi.f; -} - -/* adjusted add so the result is correct when rounded to double (or less) precision */ -static long double dadd(long double x, long double y) -{ - add(&x, &y, x, y); - return adjust(x, y); -} - -/* adjusted mul so the result is correct when rounded to double (or less) precision */ -static long double dmul(long double x, long double y) -{ - mul(&x, &y, x, y); - return adjust(x, y); + ix &= (1ull<<52)-1; + ix |= 1ull<<52; + ix <<= 1; + e -= 0x3ff + 52 + 1; + return (struct num){ix,e,sign}; } -static int getexp(long double x) +static void mul(uint64_t *hi, uint64_t *lo, uint64_t x, uint64_t y) { - union ldshape u; - u.f = x; - return u.i.se & 0x7fff; + uint64_t t1,t2,t3; + uint64_t xlo = (uint32_t)x, xhi = x>>32; + uint64_t ylo = (uint32_t)y, yhi = y>>32; + + t1 = xlo*ylo; + t2 = xlo*yhi + xhi*ylo; + t3 = xhi*yhi; + *lo = t1 + (t2<<32); + *hi = t3 + (t2>>32) + (t1 > *lo); } double fma(double x, double y, double z) @@ -82,383 +44,142 @@ double fma(double x, double y, double z) #ifndef __EMSCRIPTEN__ #pragma STDC FENV_ACCESS ON #endif - long double hi, lo1, lo2, xy; - int round, ez, exy; - /* handle +-inf,nan */ - if (!isfinite(x) || !isfinite(y)) + /* normalize so top 10bits and last bit are 0 */ + struct num nx, ny, nz; + nx = normalize(x); + ny = normalize(y); + nz = normalize(z); + + if (nx.e >= ZEROINFNAN || ny.e >= ZEROINFNAN) return x*y + z; - if (!isfinite(z)) + if (nz.e >= ZEROINFNAN) { + if (nz.e > ZEROINFNAN) /* z==0 */ + return x*y + z; return z; - /* handle +-0 */ - if (x == 0.0 || y == 0.0) - return x*y + z; - round = fegetround(); - if (z == 0.0) { - if (round == FE_TONEAREST) - return dmul(x, y); - return x*y; } - /* exact mul and add require nearest rounding */ - /* spurious inexact exceptions may be raised */ - fesetround(FE_TONEAREST); - mul(&xy, &lo1, x, y); - exy = getexp(xy); - ez = getexp(z); - if (ez > exy) { - add(&hi, &lo2, z, xy); - } else if (ez > exy - 12) { - add(&hi, &lo2, xy, z); - if (hi == 0) { - /* - xy + z is 0, but it should be calculated with the - original rounding mode so the sign is correct, if the - compiler does not support FENV_ACCESS ON it does not - know about the changed rounding mode and eliminates - the xy + z below without the volatile memory access - */ - volatile double z_; - fesetround(round); - z_ = z; - return (xy + z_) + lo1; + /* mul: r = x*y */ + uint64_t rhi, rlo, zhi, zlo; + mul(&rhi, &rlo, nx.m, ny.m); + /* either top 20 or 21 bits of rhi and last 2 bits of rlo are 0 */ + + /* align exponents */ + int e = nx.e + ny.e; + int d = nz.e - e; + /* shift bits z<<=kz, r>>=kr, so kz+kr == d, set e = e+kr (== ez-kz) */ + if (d > 0) { + if (d < 64) { + zlo = nz.m<>64-d; + } else { + zlo = 0; + zhi = nz.m; + e = nz.e - 64; + d -= 64; + if (d == 0) { + } else if (d < 64) { + rlo = rhi<<64-d | rlo>>d | !!(rlo<<64-d); + rhi = rhi>>d; + } else { + rlo = 1; + rhi = 0; + } } } else { - /* - ez <= exy - 12 - the 12 extra bits (1guard, 11round+sticky) are needed so with - lo = dadd(lo1, lo2) - elo <= ehi - 11, and we use the last 10 bits in adjust so - dadd(hi, lo) - gives correct result when rounded to double - */ - hi = xy; - lo2 = z; - } - /* - the result is stored before return for correct precision and exceptions - - one corner case is when the underflow flag should be raised because - the precise result is an inexact subnormal double, but the calculated - long double result is an exact subnormal double - (so rounding to double does not raise exceptions) - - in nearest rounding mode dadd takes care of this: the last bit of the - result is adjusted so rounding sees an inexact value when it should - - in non-nearest rounding mode fenv is used for the workaround - */ - fesetround(round); - if (round == FE_TONEAREST) - z = dadd(hi, dadd(lo1, lo2)); - else { -#if defined(FE_INEXACT) && defined(FE_UNDERFLOW) - int e = fetestexcept(FE_INEXACT); - feclearexcept(FE_INEXACT); -#endif - z = hi + (lo1 + lo2); -#if defined(FE_INEXACT) && defined(FE_UNDERFLOW) - if (getexp(z) < 0x3fff-1022 && fetestexcept(FE_INEXACT)) - feraiseexcept(FE_UNDERFLOW); - else if (e) - feraiseexcept(FE_INEXACT); -#endif - } - return z; -} -#else -/* origin: FreeBSD /usr/src/lib/msun/src/s_fma.c */ -/*- - * Copyright (c) 2005-2011 David Schultz - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * A struct dd represents a floating-point number with twice the precision - * of a double. We maintain the invariant that "hi" stores the 53 high-order - * bits of the result. - */ -struct dd { - double hi; - double lo; -}; - -/* - * Compute a+b exactly, returning the exact result in a struct dd. We assume - * that both a and b are finite, but make no assumptions about their relative - * magnitudes. - */ -static inline struct dd dd_add(double a, double b) -{ - struct dd ret; - double s; - - ret.hi = a + b; - s = ret.hi - a; - ret.lo = (a - (ret.hi - s)) + (b - s); - return (ret); -} - -/* - * Compute a+b, with a small tweak: The least significant bit of the - * result is adjusted into a sticky bit summarizing all the bits that - * were lost to rounding. This adjustment negates the effects of double - * rounding when the result is added to another number with a higher - * exponent. For an explanation of round and sticky bits, see any reference - * on FPU design, e.g., - * - * J. Coonen. An Implementation Guide to a Proposed Standard for - * Floating-Point Arithmetic. Computer, vol. 13, no. 1, Jan 1980. - */ -static inline double add_adjusted(double a, double b) -{ - struct dd sum; - union {double f; uint64_t i;} uhi, ulo; - - sum = dd_add(a, b); - if (sum.lo != 0) { - uhi.f = sum.hi; - if ((uhi.i & 1) == 0) { - /* hibits += (int)copysign(1.0, sum.hi * sum.lo) */ - ulo.f = sum.lo; - uhi.i += 1 - ((uhi.i ^ ulo.i) >> 62); - sum.hi = uhi.f; - } - } - return (sum.hi); -} - -/* - * Compute ldexp(a+b, scale) with a single rounding error. It is assumed - * that the result will be subnormal, and care is taken to ensure that - * double rounding does not occur. - */ -static inline double add_and_denormalize(double a, double b, int scale) -{ - struct dd sum; - union {double f; uint64_t i;} uhi, ulo; - int bits_lost; - - sum = dd_add(a, b); - - /* - * If we are losing at least two bits of accuracy to denormalization, - * then the first lost bit becomes a round bit, and we adjust the - * lowest bit of sum.hi to make it a sticky bit summarizing all the - * bits in sum.lo. With the sticky bit adjusted, the hardware will - * break any ties in the correct direction. - * - * If we are losing only one bit to denormalization, however, we must - * break the ties manually. - */ - if (sum.lo != 0) { - uhi.f = sum.hi; - bits_lost = -((int)(uhi.i >> 52) & 0x7ff) - scale + 1; - if ((bits_lost != 1) ^ (int)(uhi.i & 1)) { - /* hibits += (int)copysign(1.0, sum.hi * sum.lo) */ - ulo.f = sum.lo; - uhi.i += 1 - (((uhi.i ^ ulo.i) >> 62) & 2); - sum.hi = uhi.f; + zhi = 0; + d = -d; + if (d == 0) { + zlo = nz.m; + } else if (d < 64) { + zlo = nz.m>>d | !!(nz.m<<64-d); + } else { + zlo = 1; } } - return scalbn(sum.hi, scale); -} - -/* - * Compute a*b exactly, returning the exact result in a struct dd. We assume - * that both a and b are normalized, so no underflow or overflow will occur. - * The current rounding mode must be round-to-nearest. - */ -static inline struct dd dd_mul(double a, double b) -{ - static const double split = 0x1p27 + 1.0; - struct dd ret; - double ha, hb, la, lb, p, q; - - p = a * split; - ha = a - p; - ha += p; - la = a - ha; - - p = b * split; - hb = b - p; - hb += p; - lb = b - hb; - - p = ha * hb; - q = ha * lb + la * hb; - - ret.hi = p + q; - ret.lo = p - ret.hi + q + la * lb; - return (ret); -} - -/* - * Fused multiply-add: Compute x * y + z with a single rounding error. - * - * We use scaling to avoid overflow/underflow, along with the - * canonical precision-doubling technique adapted from: - * - * Dekker, T. A Floating-Point Technique for Extending the - * Available Precision. Numer. Math. 18, 224-242 (1971). - * - * This algorithm is sensitive to the rounding precision. FPUs such - * as the i387 must be set in double-precision mode if variables are - * to be stored in FP registers in order to avoid incorrect results. - * This is the default on FreeBSD, but not on many other systems. - * - * Hardware instructions should be used on architectures that support it, - * since this implementation will likely be several times slower. - */ -double fma(double x, double y, double z) -{ -#ifndef __EMSCRIPTEN__ - #pragma STDC FENV_ACCESS ON -#endif - double xs, ys, zs, adj; - struct dd xy, r; - int oround; - int ex, ey, ez; - int spread; - - /* - * Handle special cases. The order of operations and the particular - * return values here are crucial in handling special cases involving - * infinities, NaNs, overflows, and signed zeroes correctly. - */ - if (!isfinite(x) || !isfinite(y)) - return (x * y + z); - if (!isfinite(z)) - return (z); - if (x == 0.0 || y == 0.0) - return (x * y + z); - if (z == 0.0) - return (x * y); - xs = frexp(x, &ex); - ys = frexp(y, &ey); - zs = frexp(z, &ez); - oround = fegetround(); - spread = ex + ey - ez; - - /* - * If x * y and z are many orders of magnitude apart, the scaling - * will overflow, so we handle these cases specially. Rounding - * modes other than FE_TONEAREST are painful. - */ - if (spread < -DBL_MANT_DIG) { -#ifdef FE_INEXACT - feraiseexcept(FE_INEXACT); -#endif -#ifdef FE_UNDERFLOW - if (!isnormal(z)) - feraiseexcept(FE_UNDERFLOW); -#endif - switch (oround) { - default: /* FE_TONEAREST */ - return (z); -#ifdef FE_TOWARDZERO - case FE_TOWARDZERO: - if (x > 0.0 ^ y < 0.0 ^ z < 0.0) - return (z); - else - return (nextafter(z, 0)); -#endif -#ifdef FE_DOWNWARD - case FE_DOWNWARD: - if (x > 0.0 ^ y < 0.0) - return (z); - else - return (nextafter(z, -INFINITY)); -#endif -#ifdef FE_UPWARD - case FE_UPWARD: - if (x > 0.0 ^ y < 0.0) - return (nextafter(z, INFINITY)); - else - return (z); -#endif + /* add */ + int sign = nx.sign^ny.sign; + int samesign = !(sign^nz.sign); + int nonzero = 1; + if (samesign) { + /* r += z */ + rlo += zlo; + rhi += zhi + (rlo < zlo); + } else { + /* r -= z */ + uint64_t t = rlo; + rlo -= zlo; + rhi = rhi - zhi - (t < rlo); + if (rhi>>63) { + rlo = -rlo; + rhi = -rhi-!!rlo; + sign = !sign; } + nonzero = !!rhi; } - if (spread <= DBL_MANT_DIG * 2) - zs = scalbn(zs, -spread); - else - zs = copysign(DBL_MIN, zs); - - fesetround(FE_TONEAREST); - - /* - * Basic approach for round-to-nearest: - * - * (xy.hi, xy.lo) = x * y (exact) - * (r.hi, r.lo) = xy.hi + z (exact) - * adj = xy.lo + r.lo (inexact; low bit is sticky) - * result = r.hi + adj (correctly rounded) - */ - xy = dd_mul(xs, ys); - r = dd_add(xy.hi, zs); - spread = ex + ey; - - if (r.hi == 0.0) { - /* - * When the addends cancel to 0, ensure that the result has - * the correct sign. - */ - fesetround(oround); - volatile double vzs = zs; /* XXX gcc CSE bug workaround */ - return xy.hi + vzs + scalbn(xy.lo, spread); + /* set rhi to top 63bit of the result (last bit is sticky) */ + if (nonzero) { + e += 64; + d = a_clz_64(rhi)-1; + /* note: d > 0 */ + rhi = rhi<>64-d | !!(rlo<>1 | (rlo&1); + else + rhi = rlo<>1 | (rhi&1) | 1ull<<62; + if (sign) + i = -i; + r = i; + r = 2*r - c; /* remove top bit */ + + /* raise underflow portably, such that it + cannot be optimized away */ + { + double_t tiny = DBL_MIN/FLT_MIN * r; + r += (double)(tiny*tiny) * (r-r); + } + } + } else { + /* only round once when scaled */ + d = 10; + i = ( rhi>>d | !!(rhi<<64-d) ) << d; + if (sign) + i = -i; + r = i; + } } - - adj = add_adjusted(r.lo, xy.lo); - if (spread + ilogb(r.hi) > -1023) - return scalbn(r.hi + adj, spread); - else - return add_and_denormalize(r.hi, adj, spread); + return scalbn(r, e); } -#endif diff --git a/system/lib/libc/musl/src/math/fmaf.c b/system/lib/libc/musl/src/math/fmaf.c index f3d232b104c8b..551b3454f6c30 100644 --- a/system/lib/libc/musl/src/math/fmaf.c +++ b/system/lib/libc/musl/src/math/fmaf.c @@ -52,7 +52,7 @@ float fmaf(float x, float y, float z) /* Common case: The double precision result is fine. */ if ((u.i & 0x1fffffff) != 0x10000000 || /* not a halfway case */ e == 0x7ff || /* NaN */ - result - xy == z || /* exact */ + (result - xy == z && result - z == xy) || /* exact */ fegetround() != FE_TONEAREST) /* not round-to-nearest */ { /* diff --git a/system/lib/libc/musl/src/math/j0f.c b/system/lib/libc/musl/src/math/j0f.c index 45883dc419e98..fab554a311933 100644 --- a/system/lib/libc/musl/src/math/j0f.c +++ b/system/lib/libc/musl/src/math/j0f.c @@ -208,8 +208,8 @@ static float pzerof(float x) GET_FLOAT_WORD(ix, x); ix &= 0x7fffffff; if (ix >= 0x41000000){p = pR8; q = pS8;} - else if (ix >= 0x40f71c58){p = pR5; q = pS5;} - else if (ix >= 0x4036db68){p = pR3; q = pS3;} + else if (ix >= 0x409173eb){p = pR5; q = pS5;} + else if (ix >= 0x4036d917){p = pR3; q = pS3;} else /*ix >= 0x40000000*/ {p = pR2; q = pS2;} z = 1.0f/(x*x); r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5])))); @@ -304,8 +304,8 @@ static float qzerof(float x) GET_FLOAT_WORD(ix, x); ix &= 0x7fffffff; if (ix >= 0x41000000){p = qR8; q = qS8;} - else if (ix >= 0x40f71c58){p = qR5; q = qS5;} - else if (ix >= 0x4036db68){p = qR3; q = qS3;} + else if (ix >= 0x409173eb){p = qR5; q = qS5;} + else if (ix >= 0x4036d917){p = qR3; q = qS3;} else /*ix >= 0x40000000*/ {p = qR2; q = qS2;} z = 1.0f/(x*x); r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5])))); diff --git a/system/lib/libc/musl/src/math/j1f.c b/system/lib/libc/musl/src/math/j1f.c index 58875af9fc1ed..3434c53dcc2d8 100644 --- a/system/lib/libc/musl/src/math/j1f.c +++ b/system/lib/libc/musl/src/math/j1f.c @@ -74,14 +74,13 @@ float j1f(float x) return 1/(x*x); if (ix >= 0x40000000) /* |x| >= 2 */ return common(ix, fabsf(x), 0, sign); - if (ix >= 0x32000000) { /* |x| >= 2**-27 */ + if (ix >= 0x39000000) { /* |x| >= 2**-13 */ z = x*x; r = z*(r00+z*(r01+z*(r02+z*r03))); s = 1+z*(s01+z*(s02+z*(s03+z*(s04+z*s05)))); z = 0.5f + r/s; } else - /* raise inexact if x!=0 */ - z = 0.5f + x; + z = 0.5f; return z*x; } @@ -114,7 +113,7 @@ float y1f(float x) return 1/x; if (ix >= 0x40000000) /* |x| >= 2.0 */ return common(ix,x,1,0); - if (ix < 0x32000000) /* x < 2**-27 */ + if (ix < 0x33000000) /* x < 2**-25 */ return -tpi/x; z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); @@ -205,8 +204,8 @@ static float ponef(float x) GET_FLOAT_WORD(ix, x); ix &= 0x7fffffff; if (ix >= 0x41000000){p = pr8; q = ps8;} - else if (ix >= 0x40f71c58){p = pr5; q = ps5;} - else if (ix >= 0x4036db68){p = pr3; q = ps3;} + else if (ix >= 0x409173eb){p = pr5; q = ps5;} + else if (ix >= 0x4036d917){p = pr3; q = ps3;} else /*ix >= 0x40000000*/ {p = pr2; q = ps2;} z = 1.0f/(x*x); r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5])))); @@ -300,9 +299,9 @@ static float qonef(float x) GET_FLOAT_WORD(ix, x); ix &= 0x7fffffff; - if (ix >= 0x40200000){p = qr8; q = qs8;} - else if (ix >= 0x40f71c58){p = qr5; q = qs5;} - else if (ix >= 0x4036db68){p = qr3; q = qs3;} + if (ix >= 0x41000000){p = qr8; q = qs8;} + else if (ix >= 0x409173eb){p = qr5; q = qs5;} + else if (ix >= 0x4036d917){p = qr3; q = qs3;} else /*ix >= 0x40000000*/ {p = qr2; q = qs2;} z = 1.0f/(x*x); r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5])))); diff --git a/system/lib/libc/musl/src/math/lgamma.c b/system/lib/libc/musl/src/math/lgamma.c index e25ec8e600e14..2fc9b478ec08a 100644 --- a/system/lib/libc/musl/src/math/lgamma.c +++ b/system/lib/libc/musl/src/math/lgamma.c @@ -1,7 +1,5 @@ #include - -extern int __signgam; -double __lgamma_r(double, int *); +#include "libm.h" double lgamma(double x) { diff --git a/system/lib/libc/musl/src/math/lgamma_r.c b/system/lib/libc/musl/src/math/lgamma_r.c index fff565d228ef6..f9984cd0c6603 100644 --- a/system/lib/libc/musl/src/math/lgamma_r.c +++ b/system/lib/libc/musl/src/math/lgamma_r.c @@ -79,7 +79,6 @@ */ #include "libm.h" -#include "libc.h" static const double pi = 3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */ diff --git a/system/lib/libc/musl/src/math/lgammaf.c b/system/lib/libc/musl/src/math/lgammaf.c index badb6dfec927c..2ae051d09aae5 100644 --- a/system/lib/libc/musl/src/math/lgammaf.c +++ b/system/lib/libc/musl/src/math/lgammaf.c @@ -1,7 +1,5 @@ #include - -extern int __signgam; -float __lgammaf_r(float, int *); +#include "libm.h" float lgammaf(float x) { diff --git a/system/lib/libc/musl/src/math/lgammaf_r.c b/system/lib/libc/musl/src/math/lgammaf_r.c index c5b43db558c2a..3f353f19b339f 100644 --- a/system/lib/libc/musl/src/math/lgammaf_r.c +++ b/system/lib/libc/musl/src/math/lgammaf_r.c @@ -14,7 +14,6 @@ */ #include "libm.h" -#include "libc.h" static const float pi = 3.1415927410e+00, /* 0x40490fdb */ diff --git a/system/lib/libc/musl/src/math/lgammal.c b/system/lib/libc/musl/src/math/lgammal.c index 2b354a7c13245..abbd4fc6f3826 100644 --- a/system/lib/libc/musl/src/math/lgammal.c +++ b/system/lib/libc/musl/src/math/lgammal.c @@ -87,11 +87,8 @@ #define _GNU_SOURCE #include "libm.h" -#include "libc.h" #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 -double __lgamma_r(double x, int *sg); - long double __lgammal_r(long double x, int *sg) { return __lgamma_r(x, sg); @@ -342,16 +339,12 @@ long double __lgammal_r(long double x, int *sg) { } #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 // TODO: broken implementation to make things compile -double __lgamma_r(double x, int *sg); - long double __lgammal_r(long double x, int *sg) { return __lgamma_r(x, sg); } #endif -extern int __signgam; - long double lgammal(long double x) { return __lgammal_r(x, &__signgam); diff --git a/system/lib/libc/musl/src/math/log.c b/system/lib/libc/musl/src/math/log.c index e61e113d41af9..cc52585a94988 100644 --- a/system/lib/libc/musl/src/math/log.c +++ b/system/lib/libc/musl/src/math/log.c @@ -1,118 +1,112 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_log.c */ /* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Double-precision log(x) function. * - * Developed at SunSoft, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* log(x) - * Return the logarithm of x - * - * Method : - * 1. Argument Reduction: find k and f such that - * x = 2^k * (1+f), - * where sqrt(2)/2 < 1+f < sqrt(2) . - * - * 2. Approximation of log(1+f). - * Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s) - * = 2s + 2/3 s**3 + 2/5 s**5 + ....., - * = 2s + s*R - * We use a special Remez algorithm on [0,0.1716] to generate - * a polynomial of degree 14 to approximate R The maximum error - * of this polynomial approximation is bounded by 2**-58.45. In - * other words, - * 2 4 6 8 10 12 14 - * R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s +Lg6*s +Lg7*s - * (the values of Lg1 to Lg7 are listed in the program) - * and - * | 2 14 | -58.45 - * | Lg1*s +...+Lg7*s - R(z) | <= 2 - * | | - * Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2. - * In order to guarantee error in log below 1ulp, we compute log - * by - * log(1+f) = f - s*(f - R) (if f is not too large) - * log(1+f) = f - (hfsq - s*(hfsq+R)). (better accuracy) - * - * 3. Finally, log(x) = k*ln2 + log(1+f). - * = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo))) - * Here ln2 is split into two floating point number: - * ln2_hi + ln2_lo, - * where n*ln2_hi is always exact for |n| < 2000. - * - * Special cases: - * log(x) is NaN with signal if x < 0 (including -INF) ; - * log(+INF) is +INF; log(0) is -INF with signal; - * log(NaN) is that NaN with no signal. - * - * Accuracy: - * according to an error analysis, the error is always less than - * 1 ulp (unit in the last place). - * - * Constants: - * The hexadecimal values are the intended ones for the following - * constants. The decimal values may be used, provided that the - * compiler will convert from decimal to binary accurately enough - * to produce the hexadecimal values shown. + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT */ #include #include +#include "libm.h" +#include "log_data.h" + +#define T __log_data.tab +#define T2 __log_data.tab2 +#define B __log_data.poly1 +#define A __log_data.poly +#define Ln2hi __log_data.ln2hi +#define Ln2lo __log_data.ln2lo +#define N (1 << LOG_TABLE_BITS) +#define OFF 0x3fe6000000000000 -static const double -ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ -ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ -Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ -Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ -Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ -Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ -Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ -Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ -Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ +/* Top 16 bits of a double. */ +static inline uint32_t top16(double x) +{ + return asuint64(x) >> 48; +} double log(double x) { - union {double f; uint64_t i;} u = {x}; - double_t hfsq,f,s,z,R,w,t1,t2,dk; - uint32_t hx; - int k; + double_t w, z, r, r2, r3, y, invc, logc, kd, hi, lo; + uint64_t ix, iz, tmp; + uint32_t top; + int k, i; + + ix = asuint64(x); + top = top16(x); +#define LO asuint64(1.0 - 0x1p-4) +#define HI asuint64(1.0 + 0x1.09p-4) + if (predict_false(ix - LO < HI - LO)) { + /* Handle close to 1.0 inputs separately. */ + /* Fix sign of zero with downward rounding when x==1. */ + if (WANT_ROUNDING && predict_false(ix == asuint64(1.0))) + return 0; + r = x - 1.0; + r2 = r * r; + r3 = r * r2; + y = r3 * + (B[1] + r * B[2] + r2 * B[3] + + r3 * (B[4] + r * B[5] + r2 * B[6] + + r3 * (B[7] + r * B[8] + r2 * B[9] + r3 * B[10]))); + /* Worst-case error is around 0.507 ULP. */ + w = r * 0x1p27; + double_t rhi = r + w - w; + double_t rlo = r - rhi; + w = rhi * rhi * B[0]; /* B[0] == -0.5. */ + hi = r + w; + lo = r - hi + w; + lo += B[0] * rlo * (rhi + r); + y += lo; + y += hi; + return eval_as_double(y); + } + if (predict_false(top - 0x0010 >= 0x7ff0 - 0x0010)) { + /* x < 0x1p-1022 or inf or nan. */ + if (ix * 2 == 0) + return __math_divzero(1); + if (ix == asuint64(INFINITY)) /* log(inf) == inf. */ + return x; + if ((top & 0x8000) || (top & 0x7ff0) == 0x7ff0) + return __math_invalid(x); + /* x is subnormal, normalize it. */ + ix = asuint64(x * 0x1p52); + ix -= 52ULL << 52; + } + + /* x = 2^k z; where z is in range [OFF,2*OFF) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (52 - LOG_TABLE_BITS)) % N; + k = (int64_t)tmp >> 52; /* arithmetic shift */ + iz = ix - (tmp & 0xfffULL << 52); + invc = T[i].invc; + logc = T[i].logc; + z = asdouble(iz); - hx = u.i>>32; - k = 0; - if (hx < 0x00100000 || hx>>31) { - if (u.i<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ - if (hx>>31) - return (x-x)/0.0; /* log(-#) = NaN */ - /* subnormal number, scale x up */ - k -= 54; - x *= 0x1p54; - u.f = x; - hx = u.i>>32; - } else if (hx >= 0x7ff00000) { - return x; - } else if (hx == 0x3ff00000 && u.i<<32 == 0) - return 0; + /* log(x) = log1p(z/c-1) + log(c) + k*Ln2. */ + /* r ~= z/c - 1, |r| < 1/(2*N). */ +#if __FP_FAST_FMA + /* rounding error: 0x1p-55/N. */ + r = __builtin_fma(z, invc, -1.0); +#else + /* rounding error: 0x1p-55/N + 0x1p-66. */ + r = (z - T2[i].chi - T2[i].clo) * invc; +#endif + kd = (double_t)k; - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - hx += 0x3ff00000 - 0x3fe6a09e; - k += (int)(hx>>20) - 0x3ff; - hx = (hx&0x000fffff) + 0x3fe6a09e; - u.i = (uint64_t)hx<<32 | (u.i&0xffffffff); - x = u.f; + /* hi + lo = r + log(c) + k*Ln2. */ + w = kd * Ln2hi + logc; + hi = w + r; + lo = w - hi + r + kd * Ln2lo; - f = x - 1.0; - hfsq = 0.5*f*f; - s = f/(2.0+f); - z = s*s; - w = z*z; - t1 = w*(Lg2+w*(Lg4+w*Lg6)); - t2 = z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); - R = t2 + t1; - dk = k; - return s*(hfsq+R) + dk*ln2_lo - hfsq + f + dk*ln2_hi; + /* log(x) = lo + (log1p(r) - r) + hi. */ + r2 = r * r; /* rounding error: 0x1p-54/N^2. */ + /* Worst case error if |y| > 0x1p-5: + 0.5 + 4.13/N + abs-poly-error*2^57 ULP (+ 0.002 ULP without fma) + Worst case error if |y| > 0x1p-4: + 0.5 + 2.06/N + abs-poly-error*2^56 ULP (+ 0.001 ULP without fma). */ + y = lo + r2 * A[0] + + r * r2 * (A[1] + r * A[2] + r2 * (A[3] + r * A[4])) + hi; + return eval_as_double(y); } diff --git a/system/lib/libc/musl/src/math/log2.c b/system/lib/libc/musl/src/math/log2.c index 0aafad4b86c1c..1276ed4e31009 100644 --- a/system/lib/libc/musl/src/math/log2.c +++ b/system/lib/libc/musl/src/math/log2.c @@ -1,122 +1,122 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_log2.c */ /* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Double-precision log2(x) function. * - * Developed at SunSoft, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* - * Return the base 2 logarithm of x. See log.c for most comments. - * - * Reduce x to 2^k (1+f) and calculate r = log(1+f) - f + f*f/2 - * as in log.c, then combine and scale in extra precision: - * log2(x) = (f - f*f/2 + r)/log(2) + k + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT */ #include #include +#include "libm.h" +#include "log2_data.h" -static const double -ivln2hi = 1.44269504072144627571e+00, /* 0x3ff71547, 0x65200000 */ -ivln2lo = 1.67517131648865118353e-10, /* 0x3de705fc, 0x2eefa200 */ -Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ -Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ -Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ -Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ -Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ -Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ -Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ +#define T __log2_data.tab +#define T2 __log2_data.tab2 +#define B __log2_data.poly1 +#define A __log2_data.poly +#define InvLn2hi __log2_data.invln2hi +#define InvLn2lo __log2_data.invln2lo +#define N (1 << LOG2_TABLE_BITS) +#define OFF 0x3fe6000000000000 -double log2(double x) +/* Top 16 bits of a double. */ +static inline uint32_t top16(double x) { - union {double f; uint64_t i;} u = {x}; - double_t hfsq,f,s,z,R,w,t1,t2,y,hi,lo,val_hi,val_lo; - uint32_t hx; - int k; - - hx = u.i>>32; - k = 0; - if (hx < 0x00100000 || hx>>31) { - if (u.i<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ - if (hx>>31) - return (x-x)/0.0; /* log(-#) = NaN */ - /* subnormal number, scale x up */ - k -= 54; - x *= 0x1p54; - u.f = x; - hx = u.i>>32; - } else if (hx >= 0x7ff00000) { - return x; - } else if (hx == 0x3ff00000 && u.i<<32 == 0) - return 0; - - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - hx += 0x3ff00000 - 0x3fe6a09e; - k += (int)(hx>>20) - 0x3ff; - hx = (hx&0x000fffff) + 0x3fe6a09e; - u.i = (uint64_t)hx<<32 | (u.i&0xffffffff); - x = u.f; + return asuint64(x) >> 48; +} - f = x - 1.0; - hfsq = 0.5*f*f; - s = f/(2.0+f); - z = s*s; - w = z*z; - t1 = w*(Lg2+w*(Lg4+w*Lg6)); - t2 = z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); - R = t2 + t1; +double log2(double x) +{ + double_t z, r, r2, r4, y, invc, logc, kd, hi, lo, t1, t2, t3, p; + uint64_t ix, iz, tmp; + uint32_t top; + int k, i; - /* - * f-hfsq must (for args near 1) be evaluated in extra precision - * to avoid a large cancellation when x is near sqrt(2) or 1/sqrt(2). - * This is fairly efficient since f-hfsq only depends on f, so can - * be evaluated in parallel with R. Not combining hfsq with R also - * keeps R small (though not as small as a true `lo' term would be), - * so that extra precision is not needed for terms involving R. - * - * Compiler bugs involving extra precision used to break Dekker's - * theorem for spitting f-hfsq as hi+lo, unless double_t was used - * or the multi-precision calculations were avoided when double_t - * has extra precision. These problems are now automatically - * avoided as a side effect of the optimization of combining the - * Dekker splitting step with the clear-low-bits step. - * - * y must (for args near sqrt(2) and 1/sqrt(2)) be added in extra - * precision to avoid a very large cancellation when x is very near - * these values. Unlike the above cancellations, this problem is - * specific to base 2. It is strange that adding +-1 is so much - * harder than adding +-ln2 or +-log10_2. - * - * This uses Dekker's theorem to normalize y+val_hi, so the - * compiler bugs are back in some configurations, sigh. And I - * don't want to used double_t to avoid them, since that gives a - * pessimization and the support for avoiding the pessimization - * is not yet available. - * - * The multi-precision calculations for the multiplications are - * routine. - */ + ix = asuint64(x); + top = top16(x); +#define LO asuint64(1.0 - 0x1.5b51p-5) +#define HI asuint64(1.0 + 0x1.6ab2p-5) + if (predict_false(ix - LO < HI - LO)) { + /* Handle close to 1.0 inputs separately. */ + /* Fix sign of zero with downward rounding when x==1. */ + if (WANT_ROUNDING && predict_false(ix == asuint64(1.0))) + return 0; + r = x - 1.0; +#if __FP_FAST_FMA + hi = r * InvLn2hi; + lo = r * InvLn2lo + __builtin_fma(r, InvLn2hi, -hi); +#else + double_t rhi, rlo; + rhi = asdouble(asuint64(r) & -1ULL << 32); + rlo = r - rhi; + hi = rhi * InvLn2hi; + lo = rlo * InvLn2hi + r * InvLn2lo; +#endif + r2 = r * r; /* rounding error: 0x1p-62. */ + r4 = r2 * r2; + /* Worst-case error is less than 0.54 ULP (0.55 ULP without fma). */ + p = r2 * (B[0] + r * B[1]); + y = hi + p; + lo += hi - y + p; + lo += r4 * (B[2] + r * B[3] + r2 * (B[4] + r * B[5]) + + r4 * (B[6] + r * B[7] + r2 * (B[8] + r * B[9]))); + y += lo; + return eval_as_double(y); + } + if (predict_false(top - 0x0010 >= 0x7ff0 - 0x0010)) { + /* x < 0x1p-1022 or inf or nan. */ + if (ix * 2 == 0) + return __math_divzero(1); + if (ix == asuint64(INFINITY)) /* log(inf) == inf. */ + return x; + if ((top & 0x8000) || (top & 0x7ff0) == 0x7ff0) + return __math_invalid(x); + /* x is subnormal, normalize it. */ + ix = asuint64(x * 0x1p52); + ix -= 52ULL << 52; + } - /* hi+lo = f - hfsq + s*(hfsq+R) ~ log(1+f) */ - hi = f - hfsq; - u.f = hi; - u.i &= (uint64_t)-1<<32; - hi = u.f; - lo = f - hi - hfsq + s*(hfsq+R); + /* x = 2^k z; where z is in range [OFF,2*OFF) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (52 - LOG2_TABLE_BITS)) % N; + k = (int64_t)tmp >> 52; /* arithmetic shift */ + iz = ix - (tmp & 0xfffULL << 52); + invc = T[i].invc; + logc = T[i].logc; + z = asdouble(iz); + kd = (double_t)k; - val_hi = hi*ivln2hi; - val_lo = (lo+hi)*ivln2lo + lo*ivln2hi; + /* log2(x) = log2(z/c) + log2(c) + k. */ + /* r ~= z/c - 1, |r| < 1/(2*N). */ +#if __FP_FAST_FMA + /* rounding error: 0x1p-55/N. */ + r = __builtin_fma(z, invc, -1.0); + t1 = r * InvLn2hi; + t2 = r * InvLn2lo + __builtin_fma(r, InvLn2hi, -t1); +#else + double_t rhi, rlo; + /* rounding error: 0x1p-55/N + 0x1p-65. */ + r = (z - T2[i].chi - T2[i].clo) * invc; + rhi = asdouble(asuint64(r) & -1ULL << 32); + rlo = r - rhi; + t1 = rhi * InvLn2hi; + t2 = rlo * InvLn2hi + r * InvLn2lo; +#endif - /* spadd(val_hi, val_lo, y), except for not using double_t: */ - y = k; - w = y + val_hi; - val_lo += (y - w) + val_hi; - val_hi = w; + /* hi + lo = r/ln2 + log2(c) + k. */ + t3 = kd + logc; + hi = t3 + t1; + lo = t3 - hi + t1 + t2; - return val_lo + val_hi; + /* log2(r+1) = r/ln2 + r^2*poly(r). */ + /* Evaluation is optimized assuming superscalar pipelined execution. */ + r2 = r * r; /* rounding error: 0x1p-54/N^2. */ + r4 = r2 * r2; + /* Worst-case error if |y| > 0x1p-4: 0.547 ULP (0.550 ULP without fma). + ~ 0.5 + 2/N/ln2 + abs-poly-error*0x1p56 ULP (+ 0.003 ULP without fma). */ + p = A[0] + r * A[1] + r2 * (A[2] + r * A[3]) + r4 * (A[4] + r * A[5]); + y = lo + r2 * p + hi; + return eval_as_double(y); } diff --git a/system/lib/libc/musl/src/math/log2_data.c b/system/lib/libc/musl/src/math/log2_data.c new file mode 100644 index 0000000000000..3dd1ca5146cf4 --- /dev/null +++ b/system/lib/libc/musl/src/math/log2_data.c @@ -0,0 +1,201 @@ +/* + * Data for log2. + * + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "log2_data.h" + +#define N (1 << LOG2_TABLE_BITS) + +const struct log2_data __log2_data = { +// First coefficient: 0x1.71547652b82fe1777d0ffda0d24p0 +.invln2hi = 0x1.7154765200000p+0, +.invln2lo = 0x1.705fc2eefa200p-33, +.poly1 = { +// relative error: 0x1.2fad8188p-63 +// in -0x1.5b51p-5 0x1.6ab2p-5 +-0x1.71547652b82fep-1, +0x1.ec709dc3a03f7p-2, +-0x1.71547652b7c3fp-2, +0x1.2776c50f05be4p-2, +-0x1.ec709dd768fe5p-3, +0x1.a61761ec4e736p-3, +-0x1.7153fbc64a79bp-3, +0x1.484d154f01b4ap-3, +-0x1.289e4a72c383cp-3, +0x1.0b32f285aee66p-3, +}, +.poly = { +// relative error: 0x1.a72c2bf8p-58 +// abs error: 0x1.67a552c8p-66 +// in -0x1.f45p-8 0x1.f45p-8 +-0x1.71547652b8339p-1, +0x1.ec709dc3a04bep-2, +-0x1.7154764702ffbp-2, +0x1.2776c50034c48p-2, +-0x1.ec7b328ea92bcp-3, +0x1.a6225e117f92ep-3, +}, +/* Algorithm: + + x = 2^k z + log2(x) = k + log2(c) + log2(z/c) + log2(z/c) = poly(z/c - 1) + +where z is in [1.6p-1; 1.6p0] which is split into N subintervals and z falls +into the ith one, then table entries are computed as + + tab[i].invc = 1/c + tab[i].logc = (double)log2(c) + tab2[i].chi = (double)c + tab2[i].clo = (double)(c - (double)c) + +where c is near the center of the subinterval and is chosen by trying +-2^29 +floating point invc candidates around 1/center and selecting one for which + + 1) the rounding error in 0x1.8p10 + logc is 0, + 2) the rounding error in z - chi - clo is < 0x1p-64 and + 3) the rounding error in (double)log2(c) is minimized (< 0x1p-68). + +Note: 1) ensures that k + logc can be computed without rounding error, 2) +ensures that z/c - 1 can be computed as (z - chi - clo)*invc with close to a +single rounding error when there is no fast fma for z*invc - 1, 3) ensures +that logc + poly(z/c - 1) has small error, however near x == 1 when +|log2(x)| < 0x1p-4, this is not enough so that is special cased. */ +.tab = { +{0x1.724286bb1acf8p+0, -0x1.1095feecdb000p-1}, +{0x1.6e1f766d2cca1p+0, -0x1.08494bd76d000p-1}, +{0x1.6a13d0e30d48ap+0, -0x1.00143aee8f800p-1}, +{0x1.661ec32d06c85p+0, -0x1.efec5360b4000p-2}, +{0x1.623fa951198f8p+0, -0x1.dfdd91ab7e000p-2}, +{0x1.5e75ba4cf026cp+0, -0x1.cffae0cc79000p-2}, +{0x1.5ac055a214fb8p+0, -0x1.c043811fda000p-2}, +{0x1.571ed0f166e1ep+0, -0x1.b0b67323ae000p-2}, +{0x1.53909590bf835p+0, -0x1.a152f5a2db000p-2}, +{0x1.5014fed61adddp+0, -0x1.9217f5af86000p-2}, +{0x1.4cab88e487bd0p+0, -0x1.8304db0719000p-2}, +{0x1.49539b4334feep+0, -0x1.74189f9a9e000p-2}, +{0x1.460cbdfafd569p+0, -0x1.6552bb5199000p-2}, +{0x1.42d664ee4b953p+0, -0x1.56b23a29b1000p-2}, +{0x1.3fb01111dd8a6p+0, -0x1.483650f5fa000p-2}, +{0x1.3c995b70c5836p+0, -0x1.39de937f6a000p-2}, +{0x1.3991c4ab6fd4ap+0, -0x1.2baa1538d6000p-2}, +{0x1.3698e0ce099b5p+0, -0x1.1d98340ca4000p-2}, +{0x1.33ae48213e7b2p+0, -0x1.0fa853a40e000p-2}, +{0x1.30d191985bdb1p+0, -0x1.01d9c32e73000p-2}, +{0x1.2e025cab271d7p+0, -0x1.e857da2fa6000p-3}, +{0x1.2b404cf13cd82p+0, -0x1.cd3c8633d8000p-3}, +{0x1.288b02c7ccb50p+0, -0x1.b26034c14a000p-3}, +{0x1.25e2263944de5p+0, -0x1.97c1c2f4fe000p-3}, +{0x1.234563d8615b1p+0, -0x1.7d6023f800000p-3}, +{0x1.20b46e33eaf38p+0, -0x1.633a71a05e000p-3}, +{0x1.1e2eefdcda3ddp+0, -0x1.494f5e9570000p-3}, +{0x1.1bb4a580b3930p+0, -0x1.2f9e424e0a000p-3}, +{0x1.19453847f2200p+0, -0x1.162595afdc000p-3}, +{0x1.16e06c0d5d73cp+0, -0x1.f9c9a75bd8000p-4}, +{0x1.1485f47b7e4c2p+0, -0x1.c7b575bf9c000p-4}, +{0x1.12358ad0085d1p+0, -0x1.960c60ff48000p-4}, +{0x1.0fef00f532227p+0, -0x1.64ce247b60000p-4}, +{0x1.0db2077d03a8fp+0, -0x1.33f78b2014000p-4}, +{0x1.0b7e6d65980d9p+0, -0x1.0387d1a42c000p-4}, +{0x1.0953efe7b408dp+0, -0x1.a6f9208b50000p-5}, +{0x1.07325cac53b83p+0, -0x1.47a954f770000p-5}, +{0x1.05197e40d1b5cp+0, -0x1.d23a8c50c0000p-6}, +{0x1.03091c1208ea2p+0, -0x1.16a2629780000p-6}, +{0x1.0101025b37e21p+0, -0x1.720f8d8e80000p-8}, +{0x1.fc07ef9caa76bp-1, 0x1.6fe53b1500000p-7}, +{0x1.f4465d3f6f184p-1, 0x1.11ccce10f8000p-5}, +{0x1.ecc079f84107fp-1, 0x1.c4dfc8c8b8000p-5}, +{0x1.e573a99975ae8p-1, 0x1.3aa321e574000p-4}, +{0x1.de5d6f0bd3de6p-1, 0x1.918a0d08b8000p-4}, +{0x1.d77b681ff38b3p-1, 0x1.e72e9da044000p-4}, +{0x1.d0cb5724de943p-1, 0x1.1dcd2507f6000p-3}, +{0x1.ca4b2dc0e7563p-1, 0x1.476ab03dea000p-3}, +{0x1.c3f8ee8d6cb51p-1, 0x1.7074377e22000p-3}, +{0x1.bdd2b4f020c4cp-1, 0x1.98ede8ba94000p-3}, +{0x1.b7d6c006015cap-1, 0x1.c0db86ad2e000p-3}, +{0x1.b20366e2e338fp-1, 0x1.e840aafcee000p-3}, +{0x1.ac57026295039p-1, 0x1.0790ab4678000p-2}, +{0x1.a6d01bc2731ddp-1, 0x1.1ac056801c000p-2}, +{0x1.a16d3bc3ff18bp-1, 0x1.2db11d4fee000p-2}, +{0x1.9c2d14967feadp-1, 0x1.406464ec58000p-2}, +{0x1.970e4f47c9902p-1, 0x1.52dbe093af000p-2}, +{0x1.920fb3982bcf2p-1, 0x1.651902050d000p-2}, +{0x1.8d30187f759f1p-1, 0x1.771d2cdeaf000p-2}, +{0x1.886e5ebb9f66dp-1, 0x1.88e9c857d9000p-2}, +{0x1.83c97b658b994p-1, 0x1.9a80155e16000p-2}, +{0x1.7f405ffc61022p-1, 0x1.abe186ed3d000p-2}, +{0x1.7ad22181415cap-1, 0x1.bd0f2aea0e000p-2}, +{0x1.767dcf99eff8cp-1, 0x1.ce0a43dbf4000p-2}, +}, +#if !__FP_FAST_FMA +.tab2 = { +{0x1.6200012b90a8ep-1, 0x1.904ab0644b605p-55}, +{0x1.66000045734a6p-1, 0x1.1ff9bea62f7a9p-57}, +{0x1.69fffc325f2c5p-1, 0x1.27ecfcb3c90bap-55}, +{0x1.6e00038b95a04p-1, 0x1.8ff8856739326p-55}, +{0x1.71fffe09994e3p-1, 0x1.afd40275f82b1p-55}, +{0x1.7600015590e1p-1, -0x1.2fd75b4238341p-56}, +{0x1.7a00012655bd5p-1, 0x1.808e67c242b76p-56}, +{0x1.7e0003259e9a6p-1, -0x1.208e426f622b7p-57}, +{0x1.81fffedb4b2d2p-1, -0x1.402461ea5c92fp-55}, +{0x1.860002dfafcc3p-1, 0x1.df7f4a2f29a1fp-57}, +{0x1.89ffff78c6b5p-1, -0x1.e0453094995fdp-55}, +{0x1.8e00039671566p-1, -0x1.a04f3bec77b45p-55}, +{0x1.91fffe2bf1745p-1, -0x1.7fa34400e203cp-56}, +{0x1.95fffcc5c9fd1p-1, -0x1.6ff8005a0695dp-56}, +{0x1.9a0003bba4767p-1, 0x1.0f8c4c4ec7e03p-56}, +{0x1.9dfffe7b92da5p-1, 0x1.e7fd9478c4602p-55}, +{0x1.a1fffd72efdafp-1, -0x1.a0c554dcdae7ep-57}, +{0x1.a5fffde04ff95p-1, 0x1.67da98ce9b26bp-55}, +{0x1.a9fffca5e8d2bp-1, -0x1.284c9b54c13dep-55}, +{0x1.adfffddad03eap-1, 0x1.812c8ea602e3cp-58}, +{0x1.b1ffff10d3d4dp-1, -0x1.efaddad27789cp-55}, +{0x1.b5fffce21165ap-1, 0x1.3cb1719c61237p-58}, +{0x1.b9fffd950e674p-1, 0x1.3f7d94194cep-56}, +{0x1.be000139ca8afp-1, 0x1.50ac4215d9bcp-56}, +{0x1.c20005b46df99p-1, 0x1.beea653e9c1c9p-57}, +{0x1.c600040b9f7aep-1, -0x1.c079f274a70d6p-56}, +{0x1.ca0006255fd8ap-1, -0x1.a0b4076e84c1fp-56}, +{0x1.cdfffd94c095dp-1, 0x1.8f933f99ab5d7p-55}, +{0x1.d1ffff975d6cfp-1, -0x1.82c08665fe1bep-58}, +{0x1.d5fffa2561c93p-1, -0x1.b04289bd295f3p-56}, +{0x1.d9fff9d228b0cp-1, 0x1.70251340fa236p-55}, +{0x1.de00065bc7e16p-1, -0x1.5011e16a4d80cp-56}, +{0x1.e200002f64791p-1, 0x1.9802f09ef62ep-55}, +{0x1.e600057d7a6d8p-1, -0x1.e0b75580cf7fap-56}, +{0x1.ea00027edc00cp-1, -0x1.c848309459811p-55}, +{0x1.ee0006cf5cb7cp-1, -0x1.f8027951576f4p-55}, +{0x1.f2000782b7dccp-1, -0x1.f81d97274538fp-55}, +{0x1.f6000260c450ap-1, -0x1.071002727ffdcp-59}, +{0x1.f9fffe88cd533p-1, -0x1.81bdce1fda8bp-58}, +{0x1.fdfffd50f8689p-1, 0x1.7f91acb918e6ep-55}, +{0x1.0200004292367p+0, 0x1.b7ff365324681p-54}, +{0x1.05fffe3e3d668p+0, 0x1.6fa08ddae957bp-55}, +{0x1.0a0000a85a757p+0, -0x1.7e2de80d3fb91p-58}, +{0x1.0e0001a5f3fccp+0, -0x1.1823305c5f014p-54}, +{0x1.11ffff8afbaf5p+0, -0x1.bfabb6680bac2p-55}, +{0x1.15fffe54d91adp+0, -0x1.d7f121737e7efp-54}, +{0x1.1a00011ac36e1p+0, 0x1.c000a0516f5ffp-54}, +{0x1.1e00019c84248p+0, -0x1.082fbe4da5dap-54}, +{0x1.220000ffe5e6ep+0, -0x1.8fdd04c9cfb43p-55}, +{0x1.26000269fd891p+0, 0x1.cfe2a7994d182p-55}, +{0x1.2a00029a6e6dap+0, -0x1.00273715e8bc5p-56}, +{0x1.2dfffe0293e39p+0, 0x1.b7c39dab2a6f9p-54}, +{0x1.31ffff7dcf082p+0, 0x1.df1336edc5254p-56}, +{0x1.35ffff05a8b6p+0, -0x1.e03564ccd31ebp-54}, +{0x1.3a0002e0eaeccp+0, 0x1.5f0e74bd3a477p-56}, +{0x1.3e000043bb236p+0, 0x1.c7dcb149d8833p-54}, +{0x1.4200002d187ffp+0, 0x1.e08afcf2d3d28p-56}, +{0x1.460000d387cb1p+0, 0x1.20837856599a6p-55}, +{0x1.4a00004569f89p+0, -0x1.9fa5c904fbcd2p-55}, +{0x1.4e000043543f3p+0, -0x1.81125ed175329p-56}, +{0x1.51fffcc027f0fp+0, 0x1.883d8847754dcp-54}, +{0x1.55ffffd87b36fp+0, -0x1.709e731d02807p-55}, +{0x1.59ffff21df7bap+0, 0x1.7f79f68727b02p-55}, +{0x1.5dfffebfc3481p+0, -0x1.180902e30e93ep-54}, +}, +#endif +}; diff --git a/system/lib/libc/musl/src/math/log2_data.h b/system/lib/libc/musl/src/math/log2_data.h new file mode 100644 index 0000000000000..276a786d1424e --- /dev/null +++ b/system/lib/libc/musl/src/math/log2_data.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _LOG2_DATA_H +#define _LOG2_DATA_H + +#include + +#define LOG2_TABLE_BITS 6 +#define LOG2_POLY_ORDER 7 +#define LOG2_POLY1_ORDER 11 +extern hidden const struct log2_data { + double invln2hi; + double invln2lo; + double poly[LOG2_POLY_ORDER - 1]; + double poly1[LOG2_POLY1_ORDER - 1]; + struct { + double invc, logc; + } tab[1 << LOG2_TABLE_BITS]; +#if !__FP_FAST_FMA + struct { + double chi, clo; + } tab2[1 << LOG2_TABLE_BITS]; +#endif +} __log2_data; + +#endif diff --git a/system/lib/libc/musl/src/math/log2f.c b/system/lib/libc/musl/src/math/log2f.c index b3e305fe2a629..c368f88f33f5c 100644 --- a/system/lib/libc/musl/src/math/log2f.c +++ b/system/lib/libc/musl/src/math/log2f.c @@ -1,74 +1,72 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_log2f.c */ /* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Single-precision log2 function. * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* - * See comments in log2.c. + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT */ #include #include +#include "libm.h" +#include "log2f_data.h" + +/* +LOG2F_TABLE_BITS = 4 +LOG2F_POLY_ORDER = 4 + +ULP error: 0.752 (nearest rounding.) +Relative error: 1.9 * 2^-26 (before rounding.) +*/ -static const float -ivln2hi = 1.4428710938e+00, /* 0x3fb8b000 */ -ivln2lo = -1.7605285393e-04, /* 0xb9389ad4 */ -/* |(log(1+s)-log(1-s))/s - Lg(s)| < 2**-34.24 (~[-4.95e-11, 4.97e-11]). */ -Lg1 = 0xaaaaaa.0p-24, /* 0.66666662693 */ -Lg2 = 0xccce13.0p-25, /* 0.40000972152 */ -Lg3 = 0x91e9ee.0p-25, /* 0.28498786688 */ -Lg4 = 0xf89e26.0p-26; /* 0.24279078841 */ +#define N (1 << LOG2F_TABLE_BITS) +#define T __log2f_data.tab +#define A __log2f_data.poly +#define OFF 0x3f330000 float log2f(float x) { - union {float f; uint32_t i;} u = {x}; - float_t hfsq,f,s,z,R,w,t1,t2,hi,lo; - uint32_t ix; - int k; + double_t z, r, r2, p, y, y0, invc, logc; + uint32_t ix, iz, top, tmp; + int k, i; - ix = u.i; - k = 0; - if (ix < 0x00800000 || ix>>31) { /* x < 2**-126 */ - if (ix<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ - if (ix>>31) - return (x-x)/0.0f; /* log(-#) = NaN */ - /* subnormal number, scale up x */ - k -= 25; - x *= 0x1p25f; - u.f = x; - ix = u.i; - } else if (ix >= 0x7f800000) { - return x; - } else if (ix == 0x3f800000) + ix = asuint(x); + /* Fix sign of zero with downward rounding when x==1. */ + if (WANT_ROUNDING && predict_false(ix == 0x3f800000)) return 0; + if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000)) { + /* x < 0x1p-126 or inf or nan. */ + if (ix * 2 == 0) + return __math_divzerof(1); + if (ix == 0x7f800000) /* log2(inf) == inf. */ + return x; + if ((ix & 0x80000000) || ix * 2 >= 0xff000000) + return __math_invalidf(x); + /* x is subnormal, normalize it. */ + ix = asuint(x * 0x1p23f); + ix -= 23 << 23; + } - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - ix += 0x3f800000 - 0x3f3504f3; - k += (int)(ix>>23) - 0x7f; - ix = (ix&0x007fffff) + 0x3f3504f3; - u.i = ix; - x = u.f; + /* x = 2^k z; where z is in range [OFF,2*OFF] and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (23 - LOG2F_TABLE_BITS)) % N; + top = tmp & 0xff800000; + iz = ix - top; + k = (int32_t)tmp >> 23; /* arithmetic shift */ + invc = T[i].invc; + logc = T[i].logc; + z = (double_t)asfloat(iz); - f = x - 1.0f; - s = f/(2.0f + f); - z = s*s; - w = z*z; - t1= w*(Lg2+w*Lg4); - t2= z*(Lg1+w*Lg3); - R = t2 + t1; - hfsq = 0.5f*f*f; + /* log2(x) = log1p(z/c-1)/ln2 + log2(c) + k */ + r = z * invc - 1; + y0 = logc + (double_t)k; - hi = f - hfsq; - u.f = hi; - u.i &= 0xfffff000; - hi = u.f; - lo = f - hi - hfsq + s*(hfsq+R); - return (lo+hi)*ivln2lo + lo*ivln2hi + hi*ivln2hi + k; + /* Pipelined polynomial evaluation to approximate log1p(r)/ln2. */ + r2 = r * r; + y = A[1] * r + A[2]; + y = A[0] * r2 + y; + p = A[3] * r + y0; + y = y * r2 + p; + return eval_as_float(y); } diff --git a/system/lib/libc/musl/src/math/log2f_data.c b/system/lib/libc/musl/src/math/log2f_data.c new file mode 100644 index 0000000000000..24e450f1ec399 --- /dev/null +++ b/system/lib/libc/musl/src/math/log2f_data.c @@ -0,0 +1,33 @@ +/* + * Data definition for log2f. + * + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "log2f_data.h" + +const struct log2f_data __log2f_data = { + .tab = { + { 0x1.661ec79f8f3bep+0, -0x1.efec65b963019p-2 }, + { 0x1.571ed4aaf883dp+0, -0x1.b0b6832d4fca4p-2 }, + { 0x1.49539f0f010bp+0, -0x1.7418b0a1fb77bp-2 }, + { 0x1.3c995b0b80385p+0, -0x1.39de91a6dcf7bp-2 }, + { 0x1.30d190c8864a5p+0, -0x1.01d9bf3f2b631p-2 }, + { 0x1.25e227b0b8eap+0, -0x1.97c1d1b3b7afp-3 }, + { 0x1.1bb4a4a1a343fp+0, -0x1.2f9e393af3c9fp-3 }, + { 0x1.12358f08ae5bap+0, -0x1.960cbbf788d5cp-4 }, + { 0x1.0953f419900a7p+0, -0x1.a6f9db6475fcep-5 }, + { 0x1p+0, 0x0p+0 }, + { 0x1.e608cfd9a47acp-1, 0x1.338ca9f24f53dp-4 }, + { 0x1.ca4b31f026aap-1, 0x1.476a9543891bap-3 }, + { 0x1.b2036576afce6p-1, 0x1.e840b4ac4e4d2p-3 }, + { 0x1.9c2d163a1aa2dp-1, 0x1.40645f0c6651cp-2 }, + { 0x1.886e6037841edp-1, 0x1.88e9c2c1b9ff8p-2 }, + { 0x1.767dcf5534862p-1, 0x1.ce0a44eb17bccp-2 }, + }, + .poly = { + -0x1.712b6f70a7e4dp-2, 0x1.ecabf496832ep-2, -0x1.715479ffae3dep-1, + 0x1.715475f35c8b8p0, + } +}; diff --git a/system/lib/libc/musl/src/math/log2f_data.h b/system/lib/libc/musl/src/math/log2f_data.h new file mode 100644 index 0000000000000..4fa489560d4aa --- /dev/null +++ b/system/lib/libc/musl/src/math/log2f_data.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _LOG2F_DATA_H +#define _LOG2F_DATA_H + +#include + +#define LOG2F_TABLE_BITS 4 +#define LOG2F_POLY_ORDER 4 +extern hidden const struct log2f_data { + struct { + double invc, logc; + } tab[1 << LOG2F_TABLE_BITS]; + double poly[LOG2F_POLY_ORDER]; +} __log2f_data; + +#endif diff --git a/system/lib/libc/musl/src/math/log_data.c b/system/lib/libc/musl/src/math/log_data.c new file mode 100644 index 0000000000000..1a6ec712a0ceb --- /dev/null +++ b/system/lib/libc/musl/src/math/log_data.c @@ -0,0 +1,328 @@ +/* + * Data for log. + * + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "log_data.h" + +#define N (1 << LOG_TABLE_BITS) + +const struct log_data __log_data = { +.ln2hi = 0x1.62e42fefa3800p-1, +.ln2lo = 0x1.ef35793c76730p-45, +.poly1 = { +// relative error: 0x1.c04d76cp-63 +// in -0x1p-4 0x1.09p-4 (|log(1+x)| > 0x1p-4 outside the interval) +-0x1p-1, +0x1.5555555555577p-2, +-0x1.ffffffffffdcbp-3, +0x1.999999995dd0cp-3, +-0x1.55555556745a7p-3, +0x1.24924a344de3p-3, +-0x1.fffffa4423d65p-4, +0x1.c7184282ad6cap-4, +-0x1.999eb43b068ffp-4, +0x1.78182f7afd085p-4, +-0x1.5521375d145cdp-4, +}, +.poly = { +// relative error: 0x1.926199e8p-56 +// abs error: 0x1.882ff33p-65 +// in -0x1.fp-9 0x1.fp-9 +-0x1.0000000000001p-1, +0x1.555555551305bp-2, +-0x1.fffffffeb459p-3, +0x1.999b324f10111p-3, +-0x1.55575e506c89fp-3, +}, +/* Algorithm: + + x = 2^k z + log(x) = k ln2 + log(c) + log(z/c) + log(z/c) = poly(z/c - 1) + +where z is in [1.6p-1; 1.6p0] which is split into N subintervals and z falls +into the ith one, then table entries are computed as + + tab[i].invc = 1/c + tab[i].logc = (double)log(c) + tab2[i].chi = (double)c + tab2[i].clo = (double)(c - (double)c) + +where c is near the center of the subinterval and is chosen by trying +-2^29 +floating point invc candidates around 1/center and selecting one for which + + 1) the rounding error in 0x1.8p9 + logc is 0, + 2) the rounding error in z - chi - clo is < 0x1p-66 and + 3) the rounding error in (double)log(c) is minimized (< 0x1p-66). + +Note: 1) ensures that k*ln2hi + logc can be computed without rounding error, +2) ensures that z/c - 1 can be computed as (z - chi - clo)*invc with close to +a single rounding error when there is no fast fma for z*invc - 1, 3) ensures +that logc + poly(z/c - 1) has small error, however near x == 1 when +|log(x)| < 0x1p-4, this is not enough so that is special cased. */ +.tab = { +{0x1.734f0c3e0de9fp+0, -0x1.7cc7f79e69000p-2}, +{0x1.713786a2ce91fp+0, -0x1.76feec20d0000p-2}, +{0x1.6f26008fab5a0p+0, -0x1.713e31351e000p-2}, +{0x1.6d1a61f138c7dp+0, -0x1.6b85b38287800p-2}, +{0x1.6b1490bc5b4d1p+0, -0x1.65d5590807800p-2}, +{0x1.69147332f0cbap+0, -0x1.602d076180000p-2}, +{0x1.6719f18224223p+0, -0x1.5a8ca86909000p-2}, +{0x1.6524f99a51ed9p+0, -0x1.54f4356035000p-2}, +{0x1.63356aa8f24c4p+0, -0x1.4f637c36b4000p-2}, +{0x1.614b36b9ddc14p+0, -0x1.49da7fda85000p-2}, +{0x1.5f66452c65c4cp+0, -0x1.445923989a800p-2}, +{0x1.5d867b5912c4fp+0, -0x1.3edf439b0b800p-2}, +{0x1.5babccb5b90dep+0, -0x1.396ce448f7000p-2}, +{0x1.59d61f2d91a78p+0, -0x1.3401e17bda000p-2}, +{0x1.5805612465687p+0, -0x1.2e9e2ef468000p-2}, +{0x1.56397cee76bd3p+0, -0x1.2941b3830e000p-2}, +{0x1.54725e2a77f93p+0, -0x1.23ec58cda8800p-2}, +{0x1.52aff42064583p+0, -0x1.1e9e129279000p-2}, +{0x1.50f22dbb2bddfp+0, -0x1.1956d2b48f800p-2}, +{0x1.4f38f4734ded7p+0, -0x1.141679ab9f800p-2}, +{0x1.4d843cfde2840p+0, -0x1.0edd094ef9800p-2}, +{0x1.4bd3ec078a3c8p+0, -0x1.09aa518db1000p-2}, +{0x1.4a27fc3e0258ap+0, -0x1.047e65263b800p-2}, +{0x1.4880524d48434p+0, -0x1.feb224586f000p-3}, +{0x1.46dce1b192d0bp+0, -0x1.f474a7517b000p-3}, +{0x1.453d9d3391854p+0, -0x1.ea4443d103000p-3}, +{0x1.43a2744b4845ap+0, -0x1.e020d44e9b000p-3}, +{0x1.420b54115f8fbp+0, -0x1.d60a22977f000p-3}, +{0x1.40782da3ef4b1p+0, -0x1.cc00104959000p-3}, +{0x1.3ee8f5d57fe8fp+0, -0x1.c202956891000p-3}, +{0x1.3d5d9a00b4ce9p+0, -0x1.b81178d811000p-3}, +{0x1.3bd60c010c12bp+0, -0x1.ae2c9ccd3d000p-3}, +{0x1.3a5242b75dab8p+0, -0x1.a45402e129000p-3}, +{0x1.38d22cd9fd002p+0, -0x1.9a877681df000p-3}, +{0x1.3755bc5847a1cp+0, -0x1.90c6d69483000p-3}, +{0x1.35dce49ad36e2p+0, -0x1.87120a645c000p-3}, +{0x1.34679984dd440p+0, -0x1.7d68fb4143000p-3}, +{0x1.32f5cceffcb24p+0, -0x1.73cb83c627000p-3}, +{0x1.3187775a10d49p+0, -0x1.6a39a9b376000p-3}, +{0x1.301c8373e3990p+0, -0x1.60b3154b7a000p-3}, +{0x1.2eb4ebb95f841p+0, -0x1.5737d76243000p-3}, +{0x1.2d50a0219a9d1p+0, -0x1.4dc7b8fc23000p-3}, +{0x1.2bef9a8b7fd2ap+0, -0x1.4462c51d20000p-3}, +{0x1.2a91c7a0c1babp+0, -0x1.3b08abc830000p-3}, +{0x1.293726014b530p+0, -0x1.31b996b490000p-3}, +{0x1.27dfa5757a1f5p+0, -0x1.2875490a44000p-3}, +{0x1.268b39b1d3bbfp+0, -0x1.1f3b9f879a000p-3}, +{0x1.2539d838ff5bdp+0, -0x1.160c8252ca000p-3}, +{0x1.23eb7aac9083bp+0, -0x1.0ce7f57f72000p-3}, +{0x1.22a012ba940b6p+0, -0x1.03cdc49fea000p-3}, +{0x1.2157996cc4132p+0, -0x1.f57bdbc4b8000p-4}, +{0x1.201201dd2fc9bp+0, -0x1.e370896404000p-4}, +{0x1.1ecf4494d480bp+0, -0x1.d17983ef94000p-4}, +{0x1.1d8f5528f6569p+0, -0x1.bf9674ed8a000p-4}, +{0x1.1c52311577e7cp+0, -0x1.adc79202f6000p-4}, +{0x1.1b17c74cb26e9p+0, -0x1.9c0c3e7288000p-4}, +{0x1.19e010c2c1ab6p+0, -0x1.8a646b372c000p-4}, +{0x1.18ab07bb670bdp+0, -0x1.78d01b3ac0000p-4}, +{0x1.1778a25efbcb6p+0, -0x1.674f145380000p-4}, +{0x1.1648d354c31dap+0, -0x1.55e0e6d878000p-4}, +{0x1.151b990275fddp+0, -0x1.4485cdea1e000p-4}, +{0x1.13f0ea432d24cp+0, -0x1.333d94d6aa000p-4}, +{0x1.12c8b7210f9dap+0, -0x1.22079f8c56000p-4}, +{0x1.11a3028ecb531p+0, -0x1.10e4698622000p-4}, +{0x1.107fbda8434afp+0, -0x1.ffa6c6ad20000p-5}, +{0x1.0f5ee0f4e6bb3p+0, -0x1.dda8d4a774000p-5}, +{0x1.0e4065d2a9fcep+0, -0x1.bbcece4850000p-5}, +{0x1.0d244632ca521p+0, -0x1.9a1894012c000p-5}, +{0x1.0c0a77ce2981ap+0, -0x1.788583302c000p-5}, +{0x1.0af2f83c636d1p+0, -0x1.5715e67d68000p-5}, +{0x1.09ddb98a01339p+0, -0x1.35c8a49658000p-5}, +{0x1.08cabaf52e7dfp+0, -0x1.149e364154000p-5}, +{0x1.07b9f2f4e28fbp+0, -0x1.e72c082eb8000p-6}, +{0x1.06ab58c358f19p+0, -0x1.a55f152528000p-6}, +{0x1.059eea5ecf92cp+0, -0x1.63d62cf818000p-6}, +{0x1.04949cdd12c90p+0, -0x1.228fb8caa0000p-6}, +{0x1.038c6c6f0ada9p+0, -0x1.c317b20f90000p-7}, +{0x1.02865137932a9p+0, -0x1.419355daa0000p-7}, +{0x1.0182427ea7348p+0, -0x1.81203c2ec0000p-8}, +{0x1.008040614b195p+0, -0x1.0040979240000p-9}, +{0x1.fe01ff726fa1ap-1, 0x1.feff384900000p-9}, +{0x1.fa11cc261ea74p-1, 0x1.7dc41353d0000p-7}, +{0x1.f6310b081992ep-1, 0x1.3cea3c4c28000p-6}, +{0x1.f25f63ceeadcdp-1, 0x1.b9fc114890000p-6}, +{0x1.ee9c8039113e7p-1, 0x1.1b0d8ce110000p-5}, +{0x1.eae8078cbb1abp-1, 0x1.58a5bd001c000p-5}, +{0x1.e741aa29d0c9bp-1, 0x1.95c8340d88000p-5}, +{0x1.e3a91830a99b5p-1, 0x1.d276aef578000p-5}, +{0x1.e01e009609a56p-1, 0x1.07598e598c000p-4}, +{0x1.dca01e577bb98p-1, 0x1.253f5e30d2000p-4}, +{0x1.d92f20b7c9103p-1, 0x1.42edd8b380000p-4}, +{0x1.d5cac66fb5ccep-1, 0x1.606598757c000p-4}, +{0x1.d272caa5ede9dp-1, 0x1.7da76356a0000p-4}, +{0x1.cf26e3e6b2ccdp-1, 0x1.9ab434e1c6000p-4}, +{0x1.cbe6da2a77902p-1, 0x1.b78c7bb0d6000p-4}, +{0x1.c8b266d37086dp-1, 0x1.d431332e72000p-4}, +{0x1.c5894bd5d5804p-1, 0x1.f0a3171de6000p-4}, +{0x1.c26b533bb9f8cp-1, 0x1.067152b914000p-3}, +{0x1.bf583eeece73fp-1, 0x1.147858292b000p-3}, +{0x1.bc4fd75db96c1p-1, 0x1.2266ecdca3000p-3}, +{0x1.b951e0c864a28p-1, 0x1.303d7a6c55000p-3}, +{0x1.b65e2c5ef3e2cp-1, 0x1.3dfc33c331000p-3}, +{0x1.b374867c9888bp-1, 0x1.4ba366b7a8000p-3}, +{0x1.b094b211d304ap-1, 0x1.5933928d1f000p-3}, +{0x1.adbe885f2ef7ep-1, 0x1.66acd2418f000p-3}, +{0x1.aaf1d31603da2p-1, 0x1.740f8ec669000p-3}, +{0x1.a82e63fd358a7p-1, 0x1.815c0f51af000p-3}, +{0x1.a5740ef09738bp-1, 0x1.8e92954f68000p-3}, +{0x1.a2c2a90ab4b27p-1, 0x1.9bb3602f84000p-3}, +{0x1.a01a01393f2d1p-1, 0x1.a8bed1c2c0000p-3}, +{0x1.9d79f24db3c1bp-1, 0x1.b5b515c01d000p-3}, +{0x1.9ae2505c7b190p-1, 0x1.c2967ccbcc000p-3}, +{0x1.9852ef297ce2fp-1, 0x1.cf635d5486000p-3}, +{0x1.95cbaeea44b75p-1, 0x1.dc1bd3446c000p-3}, +{0x1.934c69de74838p-1, 0x1.e8c01b8cfe000p-3}, +{0x1.90d4f2f6752e6p-1, 0x1.f5509c0179000p-3}, +{0x1.8e6528effd79dp-1, 0x1.00e6c121fb800p-2}, +{0x1.8bfce9fcc007cp-1, 0x1.071b80e93d000p-2}, +{0x1.899c0dabec30ep-1, 0x1.0d46b9e867000p-2}, +{0x1.87427aa2317fbp-1, 0x1.13687334bd000p-2}, +{0x1.84f00acb39a08p-1, 0x1.1980d67234800p-2}, +{0x1.82a49e8653e55p-1, 0x1.1f8ffe0cc8000p-2}, +{0x1.8060195f40260p-1, 0x1.2595fd7636800p-2}, +{0x1.7e22563e0a329p-1, 0x1.2b9300914a800p-2}, +{0x1.7beb377dcb5adp-1, 0x1.3187210436000p-2}, +{0x1.79baa679725c2p-1, 0x1.377266dec1800p-2}, +{0x1.77907f2170657p-1, 0x1.3d54ffbaf3000p-2}, +{0x1.756cadbd6130cp-1, 0x1.432eee32fe000p-2}, +}, +#if !__FP_FAST_FMA +.tab2 = { +{0x1.61000014fb66bp-1, 0x1.e026c91425b3cp-56}, +{0x1.63000034db495p-1, 0x1.dbfea48005d41p-55}, +{0x1.650000d94d478p-1, 0x1.e7fa786d6a5b7p-55}, +{0x1.67000074e6fadp-1, 0x1.1fcea6b54254cp-57}, +{0x1.68ffffedf0faep-1, -0x1.c7e274c590efdp-56}, +{0x1.6b0000763c5bcp-1, -0x1.ac16848dcda01p-55}, +{0x1.6d0001e5cc1f6p-1, 0x1.33f1c9d499311p-55}, +{0x1.6efffeb05f63ep-1, -0x1.e80041ae22d53p-56}, +{0x1.710000e86978p-1, 0x1.bff6671097952p-56}, +{0x1.72ffffc67e912p-1, 0x1.c00e226bd8724p-55}, +{0x1.74fffdf81116ap-1, -0x1.e02916ef101d2p-57}, +{0x1.770000f679c9p-1, -0x1.7fc71cd549c74p-57}, +{0x1.78ffffa7ec835p-1, 0x1.1bec19ef50483p-55}, +{0x1.7affffe20c2e6p-1, -0x1.07e1729cc6465p-56}, +{0x1.7cfffed3fc9p-1, -0x1.08072087b8b1cp-55}, +{0x1.7efffe9261a76p-1, 0x1.dc0286d9df9aep-55}, +{0x1.81000049ca3e8p-1, 0x1.97fd251e54c33p-55}, +{0x1.8300017932c8fp-1, -0x1.afee9b630f381p-55}, +{0x1.850000633739cp-1, 0x1.9bfbf6b6535bcp-55}, +{0x1.87000204289c6p-1, -0x1.bbf65f3117b75p-55}, +{0x1.88fffebf57904p-1, -0x1.9006ea23dcb57p-55}, +{0x1.8b00022bc04dfp-1, -0x1.d00df38e04b0ap-56}, +{0x1.8cfffe50c1b8ap-1, -0x1.8007146ff9f05p-55}, +{0x1.8effffc918e43p-1, 0x1.3817bd07a7038p-55}, +{0x1.910001efa5fc7p-1, 0x1.93e9176dfb403p-55}, +{0x1.9300013467bb9p-1, 0x1.f804e4b980276p-56}, +{0x1.94fffe6ee076fp-1, -0x1.f7ef0d9ff622ep-55}, +{0x1.96fffde3c12d1p-1, -0x1.082aa962638bap-56}, +{0x1.98ffff4458a0dp-1, -0x1.7801b9164a8efp-55}, +{0x1.9afffdd982e3ep-1, -0x1.740e08a5a9337p-55}, +{0x1.9cfffed49fb66p-1, 0x1.fce08c19bep-60}, +{0x1.9f00020f19c51p-1, -0x1.a3faa27885b0ap-55}, +{0x1.a10001145b006p-1, 0x1.4ff489958da56p-56}, +{0x1.a300007bbf6fap-1, 0x1.cbeab8a2b6d18p-55}, +{0x1.a500010971d79p-1, 0x1.8fecadd78793p-55}, +{0x1.a70001df52e48p-1, -0x1.f41763dd8abdbp-55}, +{0x1.a90001c593352p-1, -0x1.ebf0284c27612p-55}, +{0x1.ab0002a4f3e4bp-1, -0x1.9fd043cff3f5fp-57}, +{0x1.acfffd7ae1ed1p-1, -0x1.23ee7129070b4p-55}, +{0x1.aefffee510478p-1, 0x1.a063ee00edea3p-57}, +{0x1.b0fffdb650d5bp-1, 0x1.a06c8381f0ab9p-58}, +{0x1.b2ffffeaaca57p-1, -0x1.9011e74233c1dp-56}, +{0x1.b4fffd995badcp-1, -0x1.9ff1068862a9fp-56}, +{0x1.b7000249e659cp-1, 0x1.aff45d0864f3ep-55}, +{0x1.b8ffff987164p-1, 0x1.cfe7796c2c3f9p-56}, +{0x1.bafffd204cb4fp-1, -0x1.3ff27eef22bc4p-57}, +{0x1.bcfffd2415c45p-1, -0x1.cffb7ee3bea21p-57}, +{0x1.beffff86309dfp-1, -0x1.14103972e0b5cp-55}, +{0x1.c0fffe1b57653p-1, 0x1.bc16494b76a19p-55}, +{0x1.c2ffff1fa57e3p-1, -0x1.4feef8d30c6edp-57}, +{0x1.c4fffdcbfe424p-1, -0x1.43f68bcec4775p-55}, +{0x1.c6fffed54b9f7p-1, 0x1.47ea3f053e0ecp-55}, +{0x1.c8fffeb998fd5p-1, 0x1.383068df992f1p-56}, +{0x1.cb0002125219ap-1, -0x1.8fd8e64180e04p-57}, +{0x1.ccfffdd94469cp-1, 0x1.e7ebe1cc7ea72p-55}, +{0x1.cefffeafdc476p-1, 0x1.ebe39ad9f88fep-55}, +{0x1.d1000169af82bp-1, 0x1.57d91a8b95a71p-56}, +{0x1.d30000d0ff71dp-1, 0x1.9c1906970c7dap-55}, +{0x1.d4fffea790fc4p-1, -0x1.80e37c558fe0cp-58}, +{0x1.d70002edc87e5p-1, -0x1.f80d64dc10f44p-56}, +{0x1.d900021dc82aap-1, -0x1.47c8f94fd5c5cp-56}, +{0x1.dafffd86b0283p-1, 0x1.c7f1dc521617ep-55}, +{0x1.dd000296c4739p-1, 0x1.8019eb2ffb153p-55}, +{0x1.defffe54490f5p-1, 0x1.e00d2c652cc89p-57}, +{0x1.e0fffcdabf694p-1, -0x1.f8340202d69d2p-56}, +{0x1.e2fffdb52c8ddp-1, 0x1.b00c1ca1b0864p-56}, +{0x1.e4ffff24216efp-1, 0x1.2ffa8b094ab51p-56}, +{0x1.e6fffe88a5e11p-1, -0x1.7f673b1efbe59p-58}, +{0x1.e9000119eff0dp-1, -0x1.4808d5e0bc801p-55}, +{0x1.eafffdfa51744p-1, 0x1.80006d54320b5p-56}, +{0x1.ed0001a127fa1p-1, -0x1.002f860565c92p-58}, +{0x1.ef00007babcc4p-1, -0x1.540445d35e611p-55}, +{0x1.f0ffff57a8d02p-1, -0x1.ffb3139ef9105p-59}, +{0x1.f30001ee58ac7p-1, 0x1.a81acf2731155p-55}, +{0x1.f4ffff5823494p-1, 0x1.a3f41d4d7c743p-55}, +{0x1.f6ffffca94c6bp-1, -0x1.202f41c987875p-57}, +{0x1.f8fffe1f9c441p-1, 0x1.77dd1f477e74bp-56}, +{0x1.fafffd2e0e37ep-1, -0x1.f01199a7ca331p-57}, +{0x1.fd0001c77e49ep-1, 0x1.181ee4bceacb1p-56}, +{0x1.feffff7e0c331p-1, -0x1.e05370170875ap-57}, +{0x1.00ffff465606ep+0, -0x1.a7ead491c0adap-55}, +{0x1.02ffff3867a58p+0, -0x1.77f69c3fcb2ep-54}, +{0x1.04ffffdfc0d17p+0, 0x1.7bffe34cb945bp-54}, +{0x1.0700003cd4d82p+0, 0x1.20083c0e456cbp-55}, +{0x1.08ffff9f2cbe8p+0, -0x1.dffdfbe37751ap-57}, +{0x1.0b000010cda65p+0, -0x1.13f7faee626ebp-54}, +{0x1.0d00001a4d338p+0, 0x1.07dfa79489ff7p-55}, +{0x1.0effffadafdfdp+0, -0x1.7040570d66bcp-56}, +{0x1.110000bbafd96p+0, 0x1.e80d4846d0b62p-55}, +{0x1.12ffffae5f45dp+0, 0x1.dbffa64fd36efp-54}, +{0x1.150000dd59ad9p+0, 0x1.a0077701250aep-54}, +{0x1.170000f21559ap+0, 0x1.dfdf9e2e3deeep-55}, +{0x1.18ffffc275426p+0, 0x1.10030dc3b7273p-54}, +{0x1.1b000123d3c59p+0, 0x1.97f7980030188p-54}, +{0x1.1cffff8299eb7p+0, -0x1.5f932ab9f8c67p-57}, +{0x1.1effff48ad4p+0, 0x1.37fbf9da75bebp-54}, +{0x1.210000c8b86a4p+0, 0x1.f806b91fd5b22p-54}, +{0x1.2300003854303p+0, 0x1.3ffc2eb9fbf33p-54}, +{0x1.24fffffbcf684p+0, 0x1.601e77e2e2e72p-56}, +{0x1.26ffff52921d9p+0, 0x1.ffcbb767f0c61p-56}, +{0x1.2900014933a3cp+0, -0x1.202ca3c02412bp-56}, +{0x1.2b00014556313p+0, -0x1.2808233f21f02p-54}, +{0x1.2cfffebfe523bp+0, -0x1.8ff7e384fdcf2p-55}, +{0x1.2f0000bb8ad96p+0, -0x1.5ff51503041c5p-55}, +{0x1.30ffffb7ae2afp+0, -0x1.10071885e289dp-55}, +{0x1.32ffffeac5f7fp+0, -0x1.1ff5d3fb7b715p-54}, +{0x1.350000ca66756p+0, 0x1.57f82228b82bdp-54}, +{0x1.3700011fbf721p+0, 0x1.000bac40dd5ccp-55}, +{0x1.38ffff9592fb9p+0, -0x1.43f9d2db2a751p-54}, +{0x1.3b00004ddd242p+0, 0x1.57f6b707638e1p-55}, +{0x1.3cffff5b2c957p+0, 0x1.a023a10bf1231p-56}, +{0x1.3efffeab0b418p+0, 0x1.87f6d66b152bp-54}, +{0x1.410001532aff4p+0, 0x1.7f8375f198524p-57}, +{0x1.4300017478b29p+0, 0x1.301e672dc5143p-55}, +{0x1.44fffe795b463p+0, 0x1.9ff69b8b2895ap-55}, +{0x1.46fffe80475ep+0, -0x1.5c0b19bc2f254p-54}, +{0x1.48fffef6fc1e7p+0, 0x1.b4009f23a2a72p-54}, +{0x1.4afffe5bea704p+0, -0x1.4ffb7bf0d7d45p-54}, +{0x1.4d000171027dep+0, -0x1.9c06471dc6a3dp-54}, +{0x1.4f0000ff03ee2p+0, 0x1.77f890b85531cp-54}, +{0x1.5100012dc4bd1p+0, 0x1.004657166a436p-57}, +{0x1.530001605277ap+0, -0x1.6bfcece233209p-54}, +{0x1.54fffecdb704cp+0, -0x1.902720505a1d7p-55}, +{0x1.56fffef5f54a9p+0, 0x1.bbfe60ec96412p-54}, +{0x1.5900017e61012p+0, 0x1.87ec581afef9p-55}, +{0x1.5b00003c93e92p+0, -0x1.f41080abf0ccp-54}, +{0x1.5d0001d4919bcp+0, -0x1.8812afb254729p-54}, +{0x1.5efffe7b87a89p+0, -0x1.47eb780ed6904p-54}, +}, +#endif +}; diff --git a/system/lib/libc/musl/src/math/log_data.h b/system/lib/libc/musl/src/math/log_data.h new file mode 100644 index 0000000000000..1be22ab242a36 --- /dev/null +++ b/system/lib/libc/musl/src/math/log_data.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _LOG_DATA_H +#define _LOG_DATA_H + +#include + +#define LOG_TABLE_BITS 7 +#define LOG_POLY_ORDER 6 +#define LOG_POLY1_ORDER 12 +extern hidden const struct log_data { + double ln2hi; + double ln2lo; + double poly[LOG_POLY_ORDER - 1]; /* First coefficient is 1. */ + double poly1[LOG_POLY1_ORDER - 1]; + struct { + double invc, logc; + } tab[1 << LOG_TABLE_BITS]; +#if !__FP_FAST_FMA + struct { + double chi, clo; + } tab2[1 << LOG_TABLE_BITS]; +#endif +} __log_data; + +#endif diff --git a/system/lib/libc/musl/src/math/logf.c b/system/lib/libc/musl/src/math/logf.c index 52230a1bd4dd6..7ee5d7fe623d6 100644 --- a/system/lib/libc/musl/src/math/logf.c +++ b/system/lib/libc/musl/src/math/logf.c @@ -1,69 +1,71 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_logf.c */ /* - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Single-precision log function. * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT */ #include #include +#include "libm.h" +#include "logf_data.h" + +/* +LOGF_TABLE_BITS = 4 +LOGF_POLY_ORDER = 4 + +ULP error: 0.818 (nearest rounding.) +Relative error: 1.957 * 2^-26 (before rounding.) +*/ -static const float -ln2_hi = 6.9313812256e-01, /* 0x3f317180 */ -ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */ -/* |(log(1+s)-log(1-s))/s - Lg(s)| < 2**-34.24 (~[-4.95e-11, 4.97e-11]). */ -Lg1 = 0xaaaaaa.0p-24, /* 0.66666662693 */ -Lg2 = 0xccce13.0p-25, /* 0.40000972152 */ -Lg3 = 0x91e9ee.0p-25, /* 0.28498786688 */ -Lg4 = 0xf89e26.0p-26; /* 0.24279078841 */ +#define T __logf_data.tab +#define A __logf_data.poly +#define Ln2 __logf_data.ln2 +#define N (1 << LOGF_TABLE_BITS) +#define OFF 0x3f330000 float logf(float x) { - union {float f; uint32_t i;} u = {x}; - float_t hfsq,f,s,z,R,w,t1,t2,dk; - uint32_t ix; - int k; + double_t z, r, r2, y, y0, invc, logc; + uint32_t ix, iz, tmp; + int k, i; - ix = u.i; - k = 0; - if (ix < 0x00800000 || ix>>31) { /* x < 2**-126 */ - if (ix<<1 == 0) - return -1/(x*x); /* log(+-0)=-inf */ - if (ix>>31) - return (x-x)/0.0f; /* log(-#) = NaN */ - /* subnormal number, scale up x */ - k -= 25; - x *= 0x1p25f; - u.f = x; - ix = u.i; - } else if (ix >= 0x7f800000) { - return x; - } else if (ix == 0x3f800000) + ix = asuint(x); + /* Fix sign of zero with downward rounding when x==1. */ + if (WANT_ROUNDING && predict_false(ix == 0x3f800000)) return 0; + if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000)) { + /* x < 0x1p-126 or inf or nan. */ + if (ix * 2 == 0) + return __math_divzerof(1); + if (ix == 0x7f800000) /* log(inf) == inf. */ + return x; + if ((ix & 0x80000000) || ix * 2 >= 0xff000000) + return __math_invalidf(x); + /* x is subnormal, normalize it. */ + ix = asuint(x * 0x1p23f); + ix -= 23 << 23; + } + + /* x = 2^k z; where z is in range [OFF,2*OFF] and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (23 - LOGF_TABLE_BITS)) % N; + k = (int32_t)tmp >> 23; /* arithmetic shift */ + iz = ix - (tmp & 0x1ff << 23); + invc = T[i].invc; + logc = T[i].logc; + z = (double_t)asfloat(iz); - /* reduce x into [sqrt(2)/2, sqrt(2)] */ - ix += 0x3f800000 - 0x3f3504f3; - k += (int)(ix>>23) - 0x7f; - ix = (ix&0x007fffff) + 0x3f3504f3; - u.i = ix; - x = u.f; + /* log(x) = log1p(z/c-1) + log(c) + k*Ln2 */ + r = z * invc - 1; + y0 = logc + (double_t)k * Ln2; - f = x - 1.0f; - s = f/(2.0f + f); - z = s*s; - w = z*z; - t1= w*(Lg2+w*Lg4); - t2= z*(Lg1+w*Lg3); - R = t2 + t1; - hfsq = 0.5f*f*f; - dk = k; - return s*(hfsq+R) + dk*ln2_lo - hfsq + f + dk*ln2_hi; + /* Pipelined polynomial evaluation to approximate log1p(r). */ + r2 = r * r; + y = A[1] * r + A[2]; + y = A[0] * r2 + y; + y = y * r2 + (y0 + r); + return eval_as_float(y); } diff --git a/system/lib/libc/musl/src/math/logf_data.c b/system/lib/libc/musl/src/math/logf_data.c new file mode 100644 index 0000000000000..857221f790157 --- /dev/null +++ b/system/lib/libc/musl/src/math/logf_data.c @@ -0,0 +1,33 @@ +/* + * Data definition for logf. + * + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "logf_data.h" + +const struct logf_data __logf_data = { + .tab = { + { 0x1.661ec79f8f3bep+0, -0x1.57bf7808caadep-2 }, + { 0x1.571ed4aaf883dp+0, -0x1.2bef0a7c06ddbp-2 }, + { 0x1.49539f0f010bp+0, -0x1.01eae7f513a67p-2 }, + { 0x1.3c995b0b80385p+0, -0x1.b31d8a68224e9p-3 }, + { 0x1.30d190c8864a5p+0, -0x1.6574f0ac07758p-3 }, + { 0x1.25e227b0b8eap+0, -0x1.1aa2bc79c81p-3 }, + { 0x1.1bb4a4a1a343fp+0, -0x1.a4e76ce8c0e5ep-4 }, + { 0x1.12358f08ae5bap+0, -0x1.1973c5a611cccp-4 }, + { 0x1.0953f419900a7p+0, -0x1.252f438e10c1ep-5 }, + { 0x1p+0, 0x0p+0 }, + { 0x1.e608cfd9a47acp-1, 0x1.aa5aa5df25984p-5 }, + { 0x1.ca4b31f026aap-1, 0x1.c5e53aa362eb4p-4 }, + { 0x1.b2036576afce6p-1, 0x1.526e57720db08p-3 }, + { 0x1.9c2d163a1aa2dp-1, 0x1.bc2860d22477p-3 }, + { 0x1.886e6037841edp-1, 0x1.1058bc8a07ee1p-2 }, + { 0x1.767dcf5534862p-1, 0x1.4043057b6ee09p-2 }, + }, + .ln2 = 0x1.62e42fefa39efp-1, + .poly = { + -0x1.00ea348b88334p-2, 0x1.5575b0be00b6ap-2, -0x1.ffffef20a4123p-2, + } +}; diff --git a/system/lib/libc/musl/src/math/logf_data.h b/system/lib/libc/musl/src/math/logf_data.h new file mode 100644 index 0000000000000..00cff6f81d438 --- /dev/null +++ b/system/lib/libc/musl/src/math/logf_data.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _LOGF_DATA_H +#define _LOGF_DATA_H + +#include + +#define LOGF_TABLE_BITS 4 +#define LOGF_POLY_ORDER 4 +extern hidden const struct logf_data { + struct { + double invc, logc; + } tab[1 << LOGF_TABLE_BITS]; + double ln2; + double poly[LOGF_POLY_ORDER - 1]; /* First order coefficient is 1. */ +} __logf_data; + +#endif diff --git a/system/lib/libc/musl/src/math/lrint.c b/system/lib/libc/musl/src/math/lrint.c index bdca8b7cb82ec..ddee7a0d9a689 100644 --- a/system/lib/libc/musl/src/math/lrint.c +++ b/system/lib/libc/musl/src/math/lrint.c @@ -1,5 +1,6 @@ #include #include +#include #include "libm.h" /* @@ -26,7 +27,18 @@ as a double. */ #if LONG_MAX < 1U<<53 && defined(FE_INEXACT) -long lrint(double x) +#include +#include +#if FLT_EVAL_METHOD==0 || FLT_EVAL_METHOD==1 +#define EPS DBL_EPSILON +#elif FLT_EVAL_METHOD==2 +#define EPS LDBL_EPSILON +#endif +#ifdef __GNUC__ +/* avoid stack frame in lrint */ +__attribute__((noinline)) +#endif +static long lrint_slow(double x) { #pragma STDC FENV_ACCESS ON int e; @@ -38,6 +50,20 @@ long lrint(double x) /* conversion */ return x; } + +long lrint(double x) +{ + uint32_t abstop = asuint64(x)>>32 & 0x7fffffff; + uint64_t sign = asuint64(x) & (1ULL << 63); + + if (abstop < 0x41dfffff) { + /* |x| < 0x7ffffc00, no overflow */ + double_t toint = asdouble(asuint64(1/EPS) | sign); + double_t y = x + toint - toint; + return (long)y; + } + return lrint_slow(x); +} #else long lrint(double x) { diff --git a/system/lib/libc/musl/src/math/pow.c b/system/lib/libc/musl/src/math/pow.c index b66f632d8eea9..694c2ef64d008 100644 --- a/system/lib/libc/musl/src/math/pow.c +++ b/system/lib/libc/musl/src/math/pow.c @@ -1,328 +1,343 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_pow.c */ /* - * ==================================================== - * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved. + * Double-precision x^y function. * - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* pow(x,y) return x**y - * - * n - * Method: Let x = 2 * (1+f) - * 1. Compute and return log2(x) in two pieces: - * log2(x) = w1 + w2, - * where w1 has 53-24 = 29 bit trailing zeros. - * 2. Perform y*log2(x) = n+y' by simulating muti-precision - * arithmetic, where |y'|<=0.5. - * 3. Return x**y = 2**n*exp(y'*log2) - * - * Special cases: - * 1. (anything) ** 0 is 1 - * 2. 1 ** (anything) is 1 - * 3. (anything except 1) ** NAN is NAN - * 4. NAN ** (anything except 0) is NAN - * 5. +-(|x| > 1) ** +INF is +INF - * 6. +-(|x| > 1) ** -INF is +0 - * 7. +-(|x| < 1) ** +INF is +0 - * 8. +-(|x| < 1) ** -INF is +INF - * 9. -1 ** +-INF is 1 - * 10. +0 ** (+anything except 0, NAN) is +0 - * 11. -0 ** (+anything except 0, NAN, odd integer) is +0 - * 12. +0 ** (-anything except 0, NAN) is +INF, raise divbyzero - * 13. -0 ** (-anything except 0, NAN, odd integer) is +INF, raise divbyzero - * 14. -0 ** (+odd integer) is -0 - * 15. -0 ** (-odd integer) is -INF, raise divbyzero - * 16. +INF ** (+anything except 0,NAN) is +INF - * 17. +INF ** (-anything except 0,NAN) is +0 - * 18. -INF ** (+odd integer) is -INF - * 19. -INF ** (anything) = -0 ** (-anything), (anything except odd integer) - * 20. (anything) ** 1 is (anything) - * 21. (anything) ** -1 is 1/(anything) - * 22. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer) - * 23. (-anything except 0 and inf) ** (non-integer) is NAN - * - * Accuracy: - * pow(x,y) returns x**y nearly rounded. In particular - * pow(integer,integer) - * always returns the correct integer provided it is - * representable. - * - * Constants : - * The hexadecimal values are the intended ones for the following - * constants. The decimal values may be used, provided that the - * compiler will convert from decimal to binary accurately enough - * to produce the hexadecimal values shown. + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp_data.h" +#include "pow_data.h" -static const double -bp[] = {1.0, 1.5,}, -dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ -dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ -two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ -huge = 1.0e300, -tiny = 1.0e-300, -/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ -L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ -L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ -L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ -L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ -L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ -L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ -P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ -P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ -P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ -P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ -P5 = 4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */ -lg2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ -lg2_h = 6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */ -lg2_l = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */ -ovt = 8.0085662595372944372e-017, /* -(1024-log2(ovfl+.5ulp)) */ -cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ -cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ -cp_l = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/ -ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ -ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/ -ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ +/* +Worst-case error: 0.54 ULP (~= ulperr_exp + 1024*Ln2*relerr_log*2^53) +relerr_log: 1.3 * 2^-68 (Relative error of log, 1.5 * 2^-68 without fma) +ulperr_exp: 0.509 ULP (ULP error of exp, 0.511 ULP without fma) +*/ -double pow(double x, double y) +#define T __pow_log_data.tab +#define A __pow_log_data.poly +#define Ln2hi __pow_log_data.ln2hi +#define Ln2lo __pow_log_data.ln2lo +#define N (1 << POW_LOG_TABLE_BITS) +#define OFF 0x3fe6955500000000 + +/* Top 12 bits of a double (sign and exponent bits). */ +static inline uint32_t top12(double x) { - double z,ax,z_h,z_l,p_h,p_l; - double y1,t1,t2,r,s,t,u,v,w; - int32_t i,j,k,yisint,n; - int32_t hx,hy,ix,iy; - uint32_t lx,ly; + return asuint64(x) >> 52; +} - EXTRACT_WORDS(hx, lx, x); - EXTRACT_WORDS(hy, ly, y); - ix = hx & 0x7fffffff; - iy = hy & 0x7fffffff; +/* Compute y+TAIL = log(x) where the rounded result is y and TAIL has about + additional 15 bits precision. IX is the bit representation of x, but + normalized in the subnormal range using the sign bit for the exponent. */ +static inline double_t log_inline(uint64_t ix, double_t *tail) +{ + /* double_t for better performance on targets with FLT_EVAL_METHOD==2. */ + double_t z, r, y, invc, logc, logctail, kd, hi, t1, t2, lo, lo1, lo2, p; + uint64_t iz, tmp; + int k, i; - /* x**0 = 1, even if x is NaN */ - if ((iy|ly) == 0) - return 1.0; - /* 1**y = 1, even if y is NaN */ - if (hx == 0x3ff00000 && lx == 0) - return 1.0; - /* NaN if either arg is NaN */ - if (ix > 0x7ff00000 || (ix == 0x7ff00000 && lx != 0) || - iy > 0x7ff00000 || (iy == 0x7ff00000 && ly != 0)) - return x + y; + /* x = 2^k z; where z is in range [OFF,2*OFF) and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (52 - POW_LOG_TABLE_BITS)) % N; + k = (int64_t)tmp >> 52; /* arithmetic shift */ + iz = ix - (tmp & 0xfffULL << 52); + z = asdouble(iz); + kd = (double_t)k; - /* determine if y is an odd int when x < 0 - * yisint = 0 ... y is not an integer - * yisint = 1 ... y is an odd int - * yisint = 2 ... y is an even int - */ - yisint = 0; - if (hx < 0) { - if (iy >= 0x43400000) - yisint = 2; /* even integer y */ - else if (iy >= 0x3ff00000) { - k = (iy>>20) - 0x3ff; /* exponent */ - if (k > 20) { - j = ly>>(52-k); - if ((j<<(52-k)) == ly) - yisint = 2 - (j&1); - } else if (ly == 0) { - j = iy>>(20-k); - if ((j<<(20-k)) == iy) - yisint = 2 - (j&1); - } - } - } + /* log(x) = k*Ln2 + log(c) + log1p(z/c-1). */ + invc = T[i].invc; + logc = T[i].logc; + logctail = T[i].logctail; - /* special value of y */ - if (ly == 0) { - if (iy == 0x7ff00000) { /* y is +-inf */ - if (((ix-0x3ff00000)|lx) == 0) /* (-1)**+-inf is 1 */ - return 1.0; - else if (ix >= 0x3ff00000) /* (|x|>1)**+-inf = inf,0 */ - return hy >= 0 ? y : 0.0; - else /* (|x|<1)**+-inf = 0,inf */ - return hy >= 0 ? 0.0 : -y; - } - if (iy == 0x3ff00000) { /* y is +-1 */ - if (hy >= 0) - return x; - y = 1/x; -#if FLT_EVAL_METHOD!=0 - { - union {double f; uint64_t i;} u = {y}; - uint64_t i = u.i & -1ULL/2; - if (i>>52 == 0 && (i&(i-1))) - FORCE_EVAL((float)y); - } + /* Note: 1/c is j/N or j/N/2 where j is an integer in [N,2N) and + |z/c - 1| < 1/N, so r = z/c - 1 is exactly representible. */ +#if __FP_FAST_FMA + r = __builtin_fma(z, invc, -1.0); +#else + /* Split z such that rhi, rlo and rhi*rhi are exact and |rlo| <= |r|. */ + double_t zhi = asdouble((iz + (1ULL << 31)) & (-1ULL << 32)); + double_t zlo = z - zhi; + double_t rhi = zhi * invc - 1.0; + double_t rlo = zlo * invc; + r = rhi + rlo; #endif - return y; - } - if (hy == 0x40000000) /* y is 2 */ - return x*x; - if (hy == 0x3fe00000) { /* y is 0.5 */ - if (hx >= 0) /* x >= +0 */ - return sqrt(x); - } + + /* k*Ln2 + log(c) + r. */ + t1 = kd * Ln2hi + logc; + t2 = t1 + r; + lo1 = kd * Ln2lo + logctail; + lo2 = t1 - t2 + r; + + /* Evaluation is optimized assuming superscalar pipelined execution. */ + double_t ar, ar2, ar3, lo3, lo4; + ar = A[0] * r; /* A[0] = -0.5. */ + ar2 = r * ar; + ar3 = r * ar2; + /* k*Ln2 + log(c) + r + A[0]*r*r. */ +#if __FP_FAST_FMA + hi = t2 + ar2; + lo3 = __builtin_fma(ar, r, -ar2); + lo4 = t2 - hi + ar2; +#else + double_t arhi = A[0] * rhi; + double_t arhi2 = rhi * arhi; + hi = t2 + arhi2; + lo3 = rlo * (ar + arhi); + lo4 = t2 - hi + arhi2; +#endif + /* p = log1p(r) - r - A[0]*r*r. */ + p = (ar3 * (A[1] + r * A[2] + + ar2 * (A[3] + r * A[4] + ar2 * (A[5] + r * A[6])))); + lo = lo1 + lo2 + lo3 + lo4 + p; + y = hi + lo; + *tail = hi - y + lo; + return y; +} + +#undef N +#undef T +#define N (1 << EXP_TABLE_BITS) +#define InvLn2N __exp_data.invln2N +#define NegLn2hiN __exp_data.negln2hiN +#define NegLn2loN __exp_data.negln2loN +#define Shift __exp_data.shift +#define T __exp_data.tab +#define C2 __exp_data.poly[5 - EXP_POLY_ORDER] +#define C3 __exp_data.poly[6 - EXP_POLY_ORDER] +#define C4 __exp_data.poly[7 - EXP_POLY_ORDER] +#define C5 __exp_data.poly[8 - EXP_POLY_ORDER] +#define C6 __exp_data.poly[9 - EXP_POLY_ORDER] + +/* Handle cases that may overflow or underflow when computing the result that + is scale*(1+TMP) without intermediate rounding. The bit representation of + scale is in SBITS, however it has a computed exponent that may have + overflown into the sign bit so that needs to be adjusted before using it as + a double. (int32_t)KI is the k used in the argument reduction and exponent + adjustment of scale, positive k here means the result may overflow and + negative k means the result may underflow. */ +static inline double specialcase(double_t tmp, uint64_t sbits, uint64_t ki) +{ + double_t scale, y; + + if ((ki & 0x80000000) == 0) { + /* k > 0, the exponent of scale might have overflowed by <= 460. */ + sbits -= 1009ull << 52; + scale = asdouble(sbits); + y = 0x1p1009 * (scale + scale * tmp); + return eval_as_double(y); + } + /* k < 0, need special care in the subnormal range. */ + sbits += 1022ull << 52; + /* Note: sbits is signed scale. */ + scale = asdouble(sbits); + y = scale + scale * tmp; + if (fabs(y) < 1.0) { + /* Round y to the right precision before scaling it into the subnormal + range to avoid double rounding that can cause 0.5+E/2 ulp error where + E is the worst-case ulp error outside the subnormal range. So this + is only useful if the goal is better than 1 ulp worst-case error. */ + double_t hi, lo, one = 1.0; + if (y < 0.0) + one = -1.0; + lo = scale - y + scale * tmp; + hi = one + y; + lo = one - hi + y + lo; + y = eval_as_double(hi + lo) - one; + /* Fix the sign of 0. */ + if (y == 0.0) + y = asdouble(sbits & 0x8000000000000000); + /* The underflow exception needs to be signaled explicitly. */ + fp_force_eval(fp_barrier(0x1p-1022) * 0x1p-1022); } + y = 0x1p-1022 * y; + return eval_as_double(y); +} - ax = fabs(x); - /* special value of x */ - if (lx == 0) { - if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) { /* x is +-0,+-inf,+-1 */ - z = ax; - if (hy < 0) /* z = (1/|x|) */ - z = 1.0/z; - if (hx < 0) { - if (((ix-0x3ff00000)|yisint) == 0) { - z = (z-z)/(z-z); /* (-1)**non-int is NaN */ - } else if (yisint == 1) - z = -z; /* (x<0)**odd = -(|x|**odd) */ - } - return z; +#define SIGN_BIAS (0x800 << EXP_TABLE_BITS) + +/* Computes sign*exp(x+xtail) where |xtail| < 2^-8/N and |xtail| <= |x|. + The sign_bias argument is SIGN_BIAS or 0 and sets the sign to -1 or 1. */ +static inline double exp_inline(double_t x, double_t xtail, uint32_t sign_bias) +{ + uint32_t abstop; + uint64_t ki, idx, top, sbits; + /* double_t for better performance on targets with FLT_EVAL_METHOD==2. */ + double_t kd, z, r, r2, scale, tail, tmp; + + abstop = top12(x) & 0x7ff; + if (predict_false(abstop - top12(0x1p-54) >= + top12(512.0) - top12(0x1p-54))) { + if (abstop - top12(0x1p-54) >= 0x80000000) { + /* Avoid spurious underflow for tiny x. */ + /* Note: 0 is common input. */ + double_t one = WANT_ROUNDING ? 1.0 + x : 1.0; + return sign_bias ? -one : one; + } + if (abstop >= top12(1024.0)) { + /* Note: inf and nan are already handled. */ + if (asuint64(x) >> 63) + return __math_uflow(sign_bias); + else + return __math_oflow(sign_bias); } + /* Large x is special cased below. */ + abstop = 0; } - s = 1.0; /* sign of result */ - if (hx < 0) { - if (yisint == 0) /* (x<0)**(non-int) is NaN */ - return (x-x)/(x-x); - if (yisint == 1) /* (x<0)**(odd int) */ - s = -1.0; - } + /* exp(x) = 2^(k/N) * exp(r), with exp(r) in [2^(-1/2N),2^(1/2N)]. */ + /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ + z = InvLn2N * x; +#if TOINT_INTRINSICS + kd = roundtoint(z); + ki = converttoint(z); +#elif EXP_USE_TOINT_NARROW + /* z - kd is in [-0.5-2^-16, 0.5] in all rounding modes. */ + kd = eval_as_double(z + Shift); + ki = asuint64(kd) >> 16; + kd = (double_t)(int32_t)ki; +#else + /* z - kd is in [-1, 1] in non-nearest rounding modes. */ + kd = eval_as_double(z + Shift); + ki = asuint64(kd); + kd -= Shift; +#endif + r = x + kd * NegLn2hiN + kd * NegLn2loN; + /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ + r += xtail; + /* 2^(k/N) ~= scale * (1 + tail). */ + idx = 2 * (ki % N); + top = (ki + sign_bias) << (52 - EXP_TABLE_BITS); + tail = asdouble(T[idx]); + /* This is only a valid scale when -1023*N < k < 1024*N. */ + sbits = T[idx + 1] + top; + /* exp(x) = 2^(k/N) * exp(r) ~= scale + scale * (tail + exp(r) - 1). */ + /* Evaluation is optimized assuming superscalar pipelined execution. */ + r2 = r * r; + /* Without fma the worst case error is 0.25/N ulp larger. */ + /* Worst case error is less than 0.5+1.11/N+(abs poly error * 2^53) ulp. */ + tmp = tail + r + r2 * (C2 + r * C3) + r2 * r2 * (C4 + r * C5); + if (predict_false(abstop == 0)) + return specialcase(tmp, sbits, ki); + scale = asdouble(sbits); + /* Note: tmp == 0 or |tmp| > 2^-200 and scale > 2^-739, so there + is no spurious underflow here even without fma. */ + return eval_as_double(scale + scale * tmp); +} - /* |y| is huge */ - if (iy > 0x41e00000) { /* if |y| > 2**31 */ - if (iy > 0x43f00000) { /* if |y| > 2**64, must o/uflow */ - if (ix <= 0x3fefffff) - return hy < 0 ? huge*huge : tiny*tiny; - if (ix >= 0x3ff00000) - return hy > 0 ? huge*huge : tiny*tiny; +/* Returns 0 if not int, 1 if odd int, 2 if even int. The argument is + the bit representation of a non-zero finite floating-point value. */ +static inline int checkint(uint64_t iy) +{ + int e = iy >> 52 & 0x7ff; + if (e < 0x3ff) + return 0; + if (e > 0x3ff + 52) + return 2; + if (iy & ((1ULL << (0x3ff + 52 - e)) - 1)) + return 0; + if (iy & (1ULL << (0x3ff + 52 - e))) + return 1; + return 2; +} + +/* Returns 1 if input is the bit representation of 0, infinity or nan. */ +static inline int zeroinfnan(uint64_t i) +{ + return 2 * i - 1 >= 2 * asuint64(INFINITY) - 1; +} + +double pow(double x, double y) +{ + uint32_t sign_bias = 0; + uint64_t ix, iy; + uint32_t topx, topy; + + ix = asuint64(x); + iy = asuint64(y); + topx = top12(x); + topy = top12(y); + if (predict_false(topx - 0x001 >= 0x7ff - 0x001 || + (topy & 0x7ff) - 0x3be >= 0x43e - 0x3be)) { + /* Note: if |y| > 1075 * ln2 * 2^53 ~= 0x1.749p62 then pow(x,y) = inf/0 + and if |y| < 2^-54 / 1075 ~= 0x1.e7b6p-65 then pow(x,y) = +-1. */ + /* Special cases: (x < 0x1p-126 or inf or nan) or + (|y| < 0x1p-65 or |y| >= 0x1p63 or nan). */ + if (predict_false(zeroinfnan(iy))) { + if (2 * iy == 0) + return issignaling_inline(x) ? x + y : 1.0; + if (ix == asuint64(1.0)) + return issignaling_inline(y) ? x + y : 1.0; + if (2 * ix > 2 * asuint64(INFINITY) || + 2 * iy > 2 * asuint64(INFINITY)) + return x + y; + if (2 * ix == 2 * asuint64(1.0)) + return 1.0; + if ((2 * ix < 2 * asuint64(1.0)) == !(iy >> 63)) + return 0.0; /* |x|<1 && y==inf or |x|>1 && y==-inf. */ + return y * y; } - /* over/underflow if x is not close to one */ - if (ix < 0x3fefffff) - return hy < 0 ? s*huge*huge : s*tiny*tiny; - if (ix > 0x3ff00000) - return hy > 0 ? s*huge*huge : s*tiny*tiny; - /* now |1-x| is tiny <= 2**-20, suffice to compute - log(x) by x-x^2/2+x^3/3-x^4/4 */ - t = ax - 1.0; /* t has 20 trailing zeros */ - w = (t*t)*(0.5 - t*(0.3333333333333333333333-t*0.25)); - u = ivln2_h*t; /* ivln2_h has 21 sig. bits */ - v = t*ivln2_l - w*ivln2; - t1 = u + v; - SET_LOW_WORD(t1, 0); - t2 = v - (t1-u); - } else { - double ss,s2,s_h,s_l,t_h,t_l; - n = 0; - /* take care subnormal number */ - if (ix < 0x00100000) { - ax *= two53; - n -= 53; - GET_HIGH_WORD(ix,ax); + if (predict_false(zeroinfnan(ix))) { + double_t x2 = x * x; + if (ix >> 63 && checkint(iy) == 1) + x2 = -x2; + /* Without the barrier some versions of clang hoist the 1/x2 and + thus division by zero exception can be signaled spuriously. */ + return iy >> 63 ? fp_barrier(1 / x2) : x2; } - n += ((ix)>>20) - 0x3ff; - j = ix & 0x000fffff; - /* determine interval */ - ix = j | 0x3ff00000; /* normalize ix */ - if (j <= 0x3988E) /* |x|> 63) { + /* Finite x < 0. */ + int yint = checkint(iy); + if (yint == 0) + return __math_invalid(x); + if (yint == 1) + sign_bias = SIGN_BIAS; + ix &= 0x7fffffffffffffff; + topx &= 0x7ff; + } + if ((topy & 0x7ff) - 0x3be >= 0x43e - 0x3be) { + /* Note: sign_bias == 0 here because y is not odd. */ + if (ix == asuint64(1.0)) + return 1.0; + if ((topy & 0x7ff) < 0x3be) { + /* |y| < 2^-65, x^y ~= 1 + y*log(x). */ + if (WANT_ROUNDING) + return ix > asuint64(1.0) ? 1.0 + y : + 1.0 - y; + else + return 1.0; + } + return (ix > asuint64(1.0)) == (topy < 0x800) ? + __math_oflow(0) : + __math_uflow(0); + } + if (topx == 0) { + /* Normalize subnormal x so exponent becomes negative. */ + ix = asuint64(x * 0x1p52); + ix &= 0x7fffffffffffffff; + ix -= 52ULL << 52; } - SET_HIGH_WORD(ax, ix); - - /* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */ - u = ax - bp[k]; /* bp[0]=1.0, bp[1]=1.5 */ - v = 1.0/(ax+bp[k]); - ss = u*v; - s_h = ss; - SET_LOW_WORD(s_h, 0); - /* t_h=ax+bp[k] High */ - t_h = 0.0; - SET_HIGH_WORD(t_h, ((ix>>1)|0x20000000) + 0x00080000 + (k<<18)); - t_l = ax - (t_h-bp[k]); - s_l = v*((u-s_h*t_h)-s_h*t_l); - /* compute log(ax) */ - s2 = ss*ss; - r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6))))); - r += s_l*(s_h+ss); - s2 = s_h*s_h; - t_h = 3.0 + s2 + r; - SET_LOW_WORD(t_h, 0); - t_l = r - ((t_h-3.0)-s2); - /* u+v = ss*(1+...) */ - u = s_h*t_h; - v = s_l*t_h + t_l*ss; - /* 2/(3log2)*(ss+...) */ - p_h = u + v; - SET_LOW_WORD(p_h, 0); - p_l = v - (p_h-u); - z_h = cp_h*p_h; /* cp_h+cp_l = 2/(3*log2) */ - z_l = cp_l*p_h+p_l*cp + dp_l[k]; - /* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */ - t = (double)n; - t1 = ((z_h + z_l) + dp_h[k]) + t; - SET_LOW_WORD(t1, 0); - t2 = z_l - (((t1 - t) - dp_h[k]) - z_h); } - /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ - y1 = y; - SET_LOW_WORD(y1, 0); - p_l = (y-y1)*t1 + y*t2; - p_h = y1*t1; - z = p_l + p_h; - EXTRACT_WORDS(j, i, z); - if (j >= 0x40900000) { /* z >= 1024 */ - if (((j-0x40900000)|i) != 0) /* if z > 1024 */ - return s*huge*huge; /* overflow */ - if (p_l + ovt > z - p_h) - return s*huge*huge; /* overflow */ - } else if ((j&0x7fffffff) >= 0x4090cc00) { /* z <= -1075 */ // FIXME: instead of abs(j) use unsigned j - if (((j-0xc090cc00)|i) != 0) /* z < -1075 */ - return s*tiny*tiny; /* underflow */ - if (p_l <= z - p_h) - return s*tiny*tiny; /* underflow */ - } - /* - * compute 2**(p_h+p_l) - */ - i = j & 0x7fffffff; - k = (i>>20) - 0x3ff; - n = 0; - if (i > 0x3fe00000) { /* if |z| > 0.5, set n = [z+0.5] */ - n = j + (0x00100000>>(k+1)); - k = ((n&0x7fffffff)>>20) - 0x3ff; /* new k for n */ - t = 0.0; - SET_HIGH_WORD(t, n & ~(0x000fffff>>k)); - n = ((n&0x000fffff)|0x00100000)>>(20-k); - if (j < 0) - n = -n; - p_h -= t; - } - t = p_l + p_h; - SET_LOW_WORD(t, 0); - u = t*lg2_h; - v = (p_l-(t-p_h))*lg2 + t*lg2_l; - z = u + v; - w = v - (z-u); - t = z*z; - t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); - r = (z*t1)/(t1-2.0) - (w + z*w); - z = 1.0 - (r-z); - GET_HIGH_WORD(j, z); - j += n<<20; - if ((j>>20) <= 0) /* subnormal output */ - z = scalbn(z,n); - else - SET_HIGH_WORD(z, j); - return s*z; + double_t lo; + double_t hi = log_inline(ix, &lo); + double_t ehi, elo; +#if __FP_FAST_FMA + ehi = y * hi; + elo = y * lo + __builtin_fma(y, hi, -ehi); +#else + double_t yhi = asdouble(iy & -1ULL << 27); + double_t ylo = y - yhi; + double_t lhi = asdouble(asuint64(hi) & -1ULL << 27); + double_t llo = hi - lhi + lo; + ehi = yhi * lhi; + elo = ylo * lhi + y * llo; /* |elo| < |ehi| * 2^-25. */ +#endif + return exp_inline(ehi, elo, sign_bias); } diff --git a/system/lib/libc/musl/src/math/pow_data.c b/system/lib/libc/musl/src/math/pow_data.c new file mode 100644 index 0000000000000..81e760de196e4 --- /dev/null +++ b/system/lib/libc/musl/src/math/pow_data.c @@ -0,0 +1,180 @@ +/* + * Data for the log part of pow. + * + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "pow_data.h" + +#define N (1 << POW_LOG_TABLE_BITS) + +const struct pow_log_data __pow_log_data = { +.ln2hi = 0x1.62e42fefa3800p-1, +.ln2lo = 0x1.ef35793c76730p-45, +.poly = { +// relative error: 0x1.11922ap-70 +// in -0x1.6bp-8 0x1.6bp-8 +// Coefficients are scaled to match the scaling during evaluation. +-0x1p-1, +0x1.555555555556p-2 * -2, +-0x1.0000000000006p-2 * -2, +0x1.999999959554ep-3 * 4, +-0x1.555555529a47ap-3 * 4, +0x1.2495b9b4845e9p-3 * -8, +-0x1.0002b8b263fc3p-3 * -8, +}, +/* Algorithm: + + x = 2^k z + log(x) = k ln2 + log(c) + log(z/c) + log(z/c) = poly(z/c - 1) + +where z is in [0x1.69555p-1; 0x1.69555p0] which is split into N subintervals +and z falls into the ith one, then table entries are computed as + + tab[i].invc = 1/c + tab[i].logc = round(0x1p43*log(c))/0x1p43 + tab[i].logctail = (double)(log(c) - logc) + +where c is chosen near the center of the subinterval such that 1/c has only a +few precision bits so z/c - 1 is exactly representible as double: + + 1/c = center < 1 ? round(N/center)/N : round(2*N/center)/N/2 + +Note: |z/c - 1| < 1/N for the chosen c, |log(c) - logc - logctail| < 0x1p-97, +the last few bits of logc are rounded away so k*ln2hi + logc has no rounding +error and the interval for z is selected such that near x == 1, where log(x) +is tiny, large cancellation error is avoided in logc + poly(z/c - 1). */ +.tab = { +#define A(a, b, c) {a, 0, b, c}, +A(0x1.6a00000000000p+0, -0x1.62c82f2b9c800p-2, 0x1.ab42428375680p-48) +A(0x1.6800000000000p+0, -0x1.5d1bdbf580800p-2, -0x1.ca508d8e0f720p-46) +A(0x1.6600000000000p+0, -0x1.5767717455800p-2, -0x1.362a4d5b6506dp-45) +A(0x1.6400000000000p+0, -0x1.51aad872df800p-2, -0x1.684e49eb067d5p-49) +A(0x1.6200000000000p+0, -0x1.4be5f95777800p-2, -0x1.41b6993293ee0p-47) +A(0x1.6000000000000p+0, -0x1.4618bc21c6000p-2, 0x1.3d82f484c84ccp-46) +A(0x1.5e00000000000p+0, -0x1.404308686a800p-2, 0x1.c42f3ed820b3ap-50) +A(0x1.5c00000000000p+0, -0x1.3a64c55694800p-2, 0x1.0b1c686519460p-45) +A(0x1.5a00000000000p+0, -0x1.347dd9a988000p-2, 0x1.5594dd4c58092p-45) +A(0x1.5800000000000p+0, -0x1.2e8e2bae12000p-2, 0x1.67b1e99b72bd8p-45) +A(0x1.5600000000000p+0, -0x1.2895a13de8800p-2, 0x1.5ca14b6cfb03fp-46) +A(0x1.5600000000000p+0, -0x1.2895a13de8800p-2, 0x1.5ca14b6cfb03fp-46) +A(0x1.5400000000000p+0, -0x1.22941fbcf7800p-2, -0x1.65a242853da76p-46) +A(0x1.5200000000000p+0, -0x1.1c898c1699800p-2, -0x1.fafbc68e75404p-46) +A(0x1.5000000000000p+0, -0x1.1675cababa800p-2, 0x1.f1fc63382a8f0p-46) +A(0x1.4e00000000000p+0, -0x1.1058bf9ae4800p-2, -0x1.6a8c4fd055a66p-45) +A(0x1.4c00000000000p+0, -0x1.0a324e2739000p-2, -0x1.c6bee7ef4030ep-47) +A(0x1.4a00000000000p+0, -0x1.0402594b4d000p-2, -0x1.036b89ef42d7fp-48) +A(0x1.4a00000000000p+0, -0x1.0402594b4d000p-2, -0x1.036b89ef42d7fp-48) +A(0x1.4800000000000p+0, -0x1.fb9186d5e4000p-3, 0x1.d572aab993c87p-47) +A(0x1.4600000000000p+0, -0x1.ef0adcbdc6000p-3, 0x1.b26b79c86af24p-45) +A(0x1.4400000000000p+0, -0x1.e27076e2af000p-3, -0x1.72f4f543fff10p-46) +A(0x1.4200000000000p+0, -0x1.d5c216b4fc000p-3, 0x1.1ba91bbca681bp-45) +A(0x1.4000000000000p+0, -0x1.c8ff7c79aa000p-3, 0x1.7794f689f8434p-45) +A(0x1.4000000000000p+0, -0x1.c8ff7c79aa000p-3, 0x1.7794f689f8434p-45) +A(0x1.3e00000000000p+0, -0x1.bc286742d9000p-3, 0x1.94eb0318bb78fp-46) +A(0x1.3c00000000000p+0, -0x1.af3c94e80c000p-3, 0x1.a4e633fcd9066p-52) +A(0x1.3a00000000000p+0, -0x1.a23bc1fe2b000p-3, -0x1.58c64dc46c1eap-45) +A(0x1.3a00000000000p+0, -0x1.a23bc1fe2b000p-3, -0x1.58c64dc46c1eap-45) +A(0x1.3800000000000p+0, -0x1.9525a9cf45000p-3, -0x1.ad1d904c1d4e3p-45) +A(0x1.3600000000000p+0, -0x1.87fa06520d000p-3, 0x1.bbdbf7fdbfa09p-45) +A(0x1.3400000000000p+0, -0x1.7ab890210e000p-3, 0x1.bdb9072534a58p-45) +A(0x1.3400000000000p+0, -0x1.7ab890210e000p-3, 0x1.bdb9072534a58p-45) +A(0x1.3200000000000p+0, -0x1.6d60fe719d000p-3, -0x1.0e46aa3b2e266p-46) +A(0x1.3000000000000p+0, -0x1.5ff3070a79000p-3, -0x1.e9e439f105039p-46) +A(0x1.3000000000000p+0, -0x1.5ff3070a79000p-3, -0x1.e9e439f105039p-46) +A(0x1.2e00000000000p+0, -0x1.526e5e3a1b000p-3, -0x1.0de8b90075b8fp-45) +A(0x1.2c00000000000p+0, -0x1.44d2b6ccb8000p-3, 0x1.70cc16135783cp-46) +A(0x1.2c00000000000p+0, -0x1.44d2b6ccb8000p-3, 0x1.70cc16135783cp-46) +A(0x1.2a00000000000p+0, -0x1.371fc201e9000p-3, 0x1.178864d27543ap-48) +A(0x1.2800000000000p+0, -0x1.29552f81ff000p-3, -0x1.48d301771c408p-45) +A(0x1.2600000000000p+0, -0x1.1b72ad52f6000p-3, -0x1.e80a41811a396p-45) +A(0x1.2600000000000p+0, -0x1.1b72ad52f6000p-3, -0x1.e80a41811a396p-45) +A(0x1.2400000000000p+0, -0x1.0d77e7cd09000p-3, 0x1.a699688e85bf4p-47) +A(0x1.2400000000000p+0, -0x1.0d77e7cd09000p-3, 0x1.a699688e85bf4p-47) +A(0x1.2200000000000p+0, -0x1.fec9131dbe000p-4, -0x1.575545ca333f2p-45) +A(0x1.2000000000000p+0, -0x1.e27076e2b0000p-4, 0x1.a342c2af0003cp-45) +A(0x1.2000000000000p+0, -0x1.e27076e2b0000p-4, 0x1.a342c2af0003cp-45) +A(0x1.1e00000000000p+0, -0x1.c5e548f5bc000p-4, -0x1.d0c57585fbe06p-46) +A(0x1.1c00000000000p+0, -0x1.a926d3a4ae000p-4, 0x1.53935e85baac8p-45) +A(0x1.1c00000000000p+0, -0x1.a926d3a4ae000p-4, 0x1.53935e85baac8p-45) +A(0x1.1a00000000000p+0, -0x1.8c345d631a000p-4, 0x1.37c294d2f5668p-46) +A(0x1.1a00000000000p+0, -0x1.8c345d631a000p-4, 0x1.37c294d2f5668p-46) +A(0x1.1800000000000p+0, -0x1.6f0d28ae56000p-4, -0x1.69737c93373dap-45) +A(0x1.1600000000000p+0, -0x1.51b073f062000p-4, 0x1.f025b61c65e57p-46) +A(0x1.1600000000000p+0, -0x1.51b073f062000p-4, 0x1.f025b61c65e57p-46) +A(0x1.1400000000000p+0, -0x1.341d7961be000p-4, 0x1.c5edaccf913dfp-45) +A(0x1.1400000000000p+0, -0x1.341d7961be000p-4, 0x1.c5edaccf913dfp-45) +A(0x1.1200000000000p+0, -0x1.16536eea38000p-4, 0x1.47c5e768fa309p-46) +A(0x1.1000000000000p+0, -0x1.f0a30c0118000p-5, 0x1.d599e83368e91p-45) +A(0x1.1000000000000p+0, -0x1.f0a30c0118000p-5, 0x1.d599e83368e91p-45) +A(0x1.0e00000000000p+0, -0x1.b42dd71198000p-5, 0x1.c827ae5d6704cp-46) +A(0x1.0e00000000000p+0, -0x1.b42dd71198000p-5, 0x1.c827ae5d6704cp-46) +A(0x1.0c00000000000p+0, -0x1.77458f632c000p-5, -0x1.cfc4634f2a1eep-45) +A(0x1.0c00000000000p+0, -0x1.77458f632c000p-5, -0x1.cfc4634f2a1eep-45) +A(0x1.0a00000000000p+0, -0x1.39e87b9fec000p-5, 0x1.502b7f526feaap-48) +A(0x1.0a00000000000p+0, -0x1.39e87b9fec000p-5, 0x1.502b7f526feaap-48) +A(0x1.0800000000000p+0, -0x1.f829b0e780000p-6, -0x1.980267c7e09e4p-45) +A(0x1.0800000000000p+0, -0x1.f829b0e780000p-6, -0x1.980267c7e09e4p-45) +A(0x1.0600000000000p+0, -0x1.7b91b07d58000p-6, -0x1.88d5493faa639p-45) +A(0x1.0400000000000p+0, -0x1.fc0a8b0fc0000p-7, -0x1.f1e7cf6d3a69cp-50) +A(0x1.0400000000000p+0, -0x1.fc0a8b0fc0000p-7, -0x1.f1e7cf6d3a69cp-50) +A(0x1.0200000000000p+0, -0x1.fe02a6b100000p-8, -0x1.9e23f0dda40e4p-46) +A(0x1.0200000000000p+0, -0x1.fe02a6b100000p-8, -0x1.9e23f0dda40e4p-46) +A(0x1.0000000000000p+0, 0x0.0000000000000p+0, 0x0.0000000000000p+0) +A(0x1.0000000000000p+0, 0x0.0000000000000p+0, 0x0.0000000000000p+0) +A(0x1.fc00000000000p-1, 0x1.0101575890000p-7, -0x1.0c76b999d2be8p-46) +A(0x1.f800000000000p-1, 0x1.0205658938000p-6, -0x1.3dc5b06e2f7d2p-45) +A(0x1.f400000000000p-1, 0x1.8492528c90000p-6, -0x1.aa0ba325a0c34p-45) +A(0x1.f000000000000p-1, 0x1.0415d89e74000p-5, 0x1.111c05cf1d753p-47) +A(0x1.ec00000000000p-1, 0x1.466aed42e0000p-5, -0x1.c167375bdfd28p-45) +A(0x1.e800000000000p-1, 0x1.894aa149fc000p-5, -0x1.97995d05a267dp-46) +A(0x1.e400000000000p-1, 0x1.ccb73cdddc000p-5, -0x1.a68f247d82807p-46) +A(0x1.e200000000000p-1, 0x1.eea31c006c000p-5, -0x1.e113e4fc93b7bp-47) +A(0x1.de00000000000p-1, 0x1.1973bd1466000p-4, -0x1.5325d560d9e9bp-45) +A(0x1.da00000000000p-1, 0x1.3bdf5a7d1e000p-4, 0x1.cc85ea5db4ed7p-45) +A(0x1.d600000000000p-1, 0x1.5e95a4d97a000p-4, -0x1.c69063c5d1d1ep-45) +A(0x1.d400000000000p-1, 0x1.700d30aeac000p-4, 0x1.c1e8da99ded32p-49) +A(0x1.d000000000000p-1, 0x1.9335e5d594000p-4, 0x1.3115c3abd47dap-45) +A(0x1.cc00000000000p-1, 0x1.b6ac88dad6000p-4, -0x1.390802bf768e5p-46) +A(0x1.ca00000000000p-1, 0x1.c885801bc4000p-4, 0x1.646d1c65aacd3p-45) +A(0x1.c600000000000p-1, 0x1.ec739830a2000p-4, -0x1.dc068afe645e0p-45) +A(0x1.c400000000000p-1, 0x1.fe89139dbe000p-4, -0x1.534d64fa10afdp-45) +A(0x1.c000000000000p-1, 0x1.1178e8227e000p-3, 0x1.1ef78ce2d07f2p-45) +A(0x1.be00000000000p-1, 0x1.1aa2b7e23f000p-3, 0x1.ca78e44389934p-45) +A(0x1.ba00000000000p-1, 0x1.2d1610c868000p-3, 0x1.39d6ccb81b4a1p-47) +A(0x1.b800000000000p-1, 0x1.365fcb0159000p-3, 0x1.62fa8234b7289p-51) +A(0x1.b400000000000p-1, 0x1.4913d8333b000p-3, 0x1.5837954fdb678p-45) +A(0x1.b200000000000p-1, 0x1.527e5e4a1b000p-3, 0x1.633e8e5697dc7p-45) +A(0x1.ae00000000000p-1, 0x1.6574ebe8c1000p-3, 0x1.9cf8b2c3c2e78p-46) +A(0x1.ac00000000000p-1, 0x1.6f0128b757000p-3, -0x1.5118de59c21e1p-45) +A(0x1.aa00000000000p-1, 0x1.7898d85445000p-3, -0x1.c661070914305p-46) +A(0x1.a600000000000p-1, 0x1.8beafeb390000p-3, -0x1.73d54aae92cd1p-47) +A(0x1.a400000000000p-1, 0x1.95a5adcf70000p-3, 0x1.7f22858a0ff6fp-47) +A(0x1.a000000000000p-1, 0x1.a93ed3c8ae000p-3, -0x1.8724350562169p-45) +A(0x1.9e00000000000p-1, 0x1.b31d8575bd000p-3, -0x1.c358d4eace1aap-47) +A(0x1.9c00000000000p-1, 0x1.bd087383be000p-3, -0x1.d4bc4595412b6p-45) +A(0x1.9a00000000000p-1, 0x1.c6ffbc6f01000p-3, -0x1.1ec72c5962bd2p-48) +A(0x1.9600000000000p-1, 0x1.db13db0d49000p-3, -0x1.aff2af715b035p-45) +A(0x1.9400000000000p-1, 0x1.e530effe71000p-3, 0x1.212276041f430p-51) +A(0x1.9200000000000p-1, 0x1.ef5ade4dd0000p-3, -0x1.a211565bb8e11p-51) +A(0x1.9000000000000p-1, 0x1.f991c6cb3b000p-3, 0x1.bcbecca0cdf30p-46) +A(0x1.8c00000000000p-1, 0x1.07138604d5800p-2, 0x1.89cdb16ed4e91p-48) +A(0x1.8a00000000000p-1, 0x1.0c42d67616000p-2, 0x1.7188b163ceae9p-45) +A(0x1.8800000000000p-1, 0x1.1178e8227e800p-2, -0x1.c210e63a5f01cp-45) +A(0x1.8600000000000p-1, 0x1.16b5ccbacf800p-2, 0x1.b9acdf7a51681p-45) +A(0x1.8400000000000p-1, 0x1.1bf99635a6800p-2, 0x1.ca6ed5147bdb7p-45) +A(0x1.8200000000000p-1, 0x1.214456d0eb800p-2, 0x1.a87deba46baeap-47) +A(0x1.7e00000000000p-1, 0x1.2bef07cdc9000p-2, 0x1.a9cfa4a5004f4p-45) +A(0x1.7c00000000000p-1, 0x1.314f1e1d36000p-2, -0x1.8e27ad3213cb8p-45) +A(0x1.7a00000000000p-1, 0x1.36b6776be1000p-2, 0x1.16ecdb0f177c8p-46) +A(0x1.7800000000000p-1, 0x1.3c25277333000p-2, 0x1.83b54b606bd5cp-46) +A(0x1.7600000000000p-1, 0x1.419b423d5e800p-2, 0x1.8e436ec90e09dp-47) +A(0x1.7400000000000p-1, 0x1.4718dc271c800p-2, -0x1.f27ce0967d675p-45) +A(0x1.7200000000000p-1, 0x1.4c9e09e173000p-2, -0x1.e20891b0ad8a4p-45) +A(0x1.7000000000000p-1, 0x1.522ae0738a000p-2, 0x1.ebe708164c759p-45) +A(0x1.6e00000000000p-1, 0x1.57bf753c8d000p-2, 0x1.fadedee5d40efp-46) +A(0x1.6c00000000000p-1, 0x1.5d5bddf596000p-2, -0x1.a0b2a08a465dcp-47) +}, +}; diff --git a/system/lib/libc/musl/src/math/pow_data.h b/system/lib/libc/musl/src/math/pow_data.h new file mode 100644 index 0000000000000..5d609ae80ec21 --- /dev/null +++ b/system/lib/libc/musl/src/math/pow_data.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _POW_DATA_H +#define _POW_DATA_H + +#include + +#define POW_LOG_TABLE_BITS 7 +#define POW_LOG_POLY_ORDER 8 +extern hidden const struct pow_log_data { + double ln2hi; + double ln2lo; + double poly[POW_LOG_POLY_ORDER - 1]; /* First coefficient is 1. */ + /* Note: the pad field is unused, but allows slightly faster indexing. */ + struct { + double invc, pad, logc, logctail; + } tab[1 << POW_LOG_TABLE_BITS]; +} __pow_log_data; + +#endif diff --git a/system/lib/libc/musl/src/math/powf.c b/system/lib/libc/musl/src/math/powf.c index 427c8965b9e8e..de8fab545545b 100644 --- a/system/lib/libc/musl/src/math/powf.c +++ b/system/lib/libc/musl/src/math/powf.c @@ -1,259 +1,185 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_powf.c */ /* - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT */ +#include +#include #include "libm.h" +#include "exp2f_data.h" +#include "powf_data.h" -static const float -bp[] = {1.0, 1.5,}, -dp_h[] = { 0.0, 5.84960938e-01,}, /* 0x3f15c000 */ -dp_l[] = { 0.0, 1.56322085e-06,}, /* 0x35d1cfdc */ -two24 = 16777216.0, /* 0x4b800000 */ -huge = 1.0e30, -tiny = 1.0e-30, -/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ -L1 = 6.0000002384e-01, /* 0x3f19999a */ -L2 = 4.2857143283e-01, /* 0x3edb6db7 */ -L3 = 3.3333334327e-01, /* 0x3eaaaaab */ -L4 = 2.7272811532e-01, /* 0x3e8ba305 */ -L5 = 2.3066075146e-01, /* 0x3e6c3255 */ -L6 = 2.0697501302e-01, /* 0x3e53f142 */ -P1 = 1.6666667163e-01, /* 0x3e2aaaab */ -P2 = -2.7777778450e-03, /* 0xbb360b61 */ -P3 = 6.6137559770e-05, /* 0x388ab355 */ -P4 = -1.6533901999e-06, /* 0xb5ddea0e */ -P5 = 4.1381369442e-08, /* 0x3331bb4c */ -lg2 = 6.9314718246e-01, /* 0x3f317218 */ -lg2_h = 6.93145752e-01, /* 0x3f317200 */ -lg2_l = 1.42860654e-06, /* 0x35bfbe8c */ -ovt = 4.2995665694e-08, /* -(128-log2(ovfl+.5ulp)) */ -cp = 9.6179670095e-01, /* 0x3f76384f =2/(3ln2) */ -cp_h = 9.6191406250e-01, /* 0x3f764000 =12b cp */ -cp_l = -1.1736857402e-04, /* 0xb8f623c6 =tail of cp_h */ -ivln2 = 1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */ -ivln2_h = 1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/ -ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/ +/* +POWF_LOG2_POLY_ORDER = 5 +EXP2F_TABLE_BITS = 5 -float powf(float x, float y) +ULP error: 0.82 (~ 0.5 + relerr*2^24) +relerr: 1.27 * 2^-26 (Relative error ~= 128*Ln2*relerr_log2 + relerr_exp2) +relerr_log2: 1.83 * 2^-33 (Relative error of logx.) +relerr_exp2: 1.69 * 2^-34 (Relative error of exp2(ylogx).) +*/ + +#define N (1 << POWF_LOG2_TABLE_BITS) +#define T __powf_log2_data.tab +#define A __powf_log2_data.poly +#define OFF 0x3f330000 + +/* Subnormal input is normalized so ix has negative biased exponent. + Output is multiplied by N (POWF_SCALE) if TOINT_INTRINICS is set. */ +static inline double_t log2_inline(uint32_t ix) { - float z,ax,z_h,z_l,p_h,p_l; - float y1,t1,t2,r,s,sn,t,u,v,w; - int32_t i,j,k,yisint,n; - int32_t hx,hy,ix,iy,is; + double_t z, r, r2, r4, p, q, y, y0, invc, logc; + uint32_t iz, top, tmp; + int k, i; - GET_FLOAT_WORD(hx, x); - GET_FLOAT_WORD(hy, y); - ix = hx & 0x7fffffff; - iy = hy & 0x7fffffff; + /* x = 2^k z; where z is in range [OFF,2*OFF] and exact. + The range is split into N subintervals. + The ith subinterval contains z and c is near its center. */ + tmp = ix - OFF; + i = (tmp >> (23 - POWF_LOG2_TABLE_BITS)) % N; + top = tmp & 0xff800000; + iz = ix - top; + k = (int32_t)top >> (23 - POWF_SCALE_BITS); /* arithmetic shift */ + invc = T[i].invc; + logc = T[i].logc; + z = (double_t)asfloat(iz); - /* x**0 = 1, even if x is NaN */ - if (iy == 0) - return 1.0f; - /* 1**y = 1, even if y is NaN */ - if (hx == 0x3f800000) - return 1.0f; - /* NaN if either arg is NaN */ - if (ix > 0x7f800000 || iy > 0x7f800000) - return x + y; + /* log2(x) = log1p(z/c-1)/ln2 + log2(c) + k */ + r = z * invc - 1; + y0 = logc + (double_t)k; - /* determine if y is an odd int when x < 0 - * yisint = 0 ... y is not an integer - * yisint = 1 ... y is an odd int - * yisint = 2 ... y is an even int - */ - yisint = 0; - if (hx < 0) { - if (iy >= 0x4b800000) - yisint = 2; /* even integer y */ - else if (iy >= 0x3f800000) { - k = (iy>>23) - 0x7f; /* exponent */ - j = iy>>(23-k); - if ((j<<(23-k)) == iy) - yisint = 2 - (j & 1); - } - } + /* Pipelined polynomial evaluation to approximate log1p(r)/ln2. */ + r2 = r * r; + y = A[0] * r + A[1]; + p = A[2] * r + A[3]; + r4 = r2 * r2; + q = A[4] * r + y0; + q = p * r2 + q; + y = y * r4 + q; + return y; +} - /* special value of y */ - if (iy == 0x7f800000) { /* y is +-inf */ - if (ix == 0x3f800000) /* (-1)**+-inf is 1 */ - return 1.0f; - else if (ix > 0x3f800000) /* (|x|>1)**+-inf = inf,0 */ - return hy >= 0 ? y : 0.0f; - else /* (|x|<1)**+-inf = 0,inf */ - return hy >= 0 ? 0.0f: -y; - } - if (iy == 0x3f800000) /* y is +-1 */ - return hy >= 0 ? x : 1.0f/x; - if (hy == 0x40000000) /* y is 2 */ - return x*x; - if (hy == 0x3f000000) { /* y is 0.5 */ - if (hx >= 0) /* x >= +0 */ - return sqrtf(x); - } +#undef N +#undef T +#define N (1 << EXP2F_TABLE_BITS) +#define T __exp2f_data.tab +#define SIGN_BIAS (1 << (EXP2F_TABLE_BITS + 11)) - ax = fabsf(x); - /* special value of x */ - if (ix == 0x7f800000 || ix == 0 || ix == 0x3f800000) { /* x is +-0,+-inf,+-1 */ - z = ax; - if (hy < 0) /* z = (1/|x|) */ - z = 1.0f/z; - if (hx < 0) { - if (((ix-0x3f800000)|yisint) == 0) { - z = (z-z)/(z-z); /* (-1)**non-int is NaN */ - } else if (yisint == 1) - z = -z; /* (x<0)**odd = -(|x|**odd) */ - } - return z; - } +/* The output of log2 and thus the input of exp2 is either scaled by N + (in case of fast toint intrinsics) or not. The unscaled xd must be + in [-1021,1023], sign_bias sets the sign of the result. */ +static inline float exp2_inline(double_t xd, uint32_t sign_bias) +{ + uint64_t ki, ski, t; + double_t kd, z, r, r2, y, s; - sn = 1.0f; /* sign of result */ - if (hx < 0) { - if (yisint == 0) /* (x<0)**(non-int) is NaN */ - return (x-x)/(x-x); - if (yisint == 1) /* (x<0)**(odd int) */ - sn = -1.0f; - } +#if TOINT_INTRINSICS +#define C __exp2f_data.poly_scaled + /* N*x = k + r with r in [-1/2, 1/2] */ + kd = roundtoint(xd); /* k */ + ki = converttoint(xd); +#else +#define C __exp2f_data.poly +#define SHIFT __exp2f_data.shift_scaled + /* x = k/N + r with r in [-1/(2N), 1/(2N)] */ + kd = eval_as_double(xd + SHIFT); + ki = asuint64(kd); + kd -= SHIFT; /* k/N */ +#endif + r = xd - kd; - /* |y| is huge */ - if (iy > 0x4d000000) { /* if |y| > 2**27 */ - /* over/underflow if x is not close to one */ - if (ix < 0x3f7ffff8) - return hy < 0 ? sn*huge*huge : sn*tiny*tiny; - if (ix > 0x3f800007) - return hy > 0 ? sn*huge*huge : sn*tiny*tiny; - /* now |1-x| is tiny <= 2**-20, suffice to compute - log(x) by x-x^2/2+x^3/3-x^4/4 */ - t = ax - 1; /* t has 20 trailing zeros */ - w = (t*t)*(0.5f - t*(0.333333333333f - t*0.25f)); - u = ivln2_h*t; /* ivln2_h has 16 sig. bits */ - v = t*ivln2_l - w*ivln2; - t1 = u + v; - GET_FLOAT_WORD(is, t1); - SET_FLOAT_WORD(t1, is & 0xfffff000); - t2 = v - (t1-u); - } else { - float s2,s_h,s_l,t_h,t_l; - n = 0; - /* take care subnormal number */ - if (ix < 0x00800000) { - ax *= two24; - n -= 24; - GET_FLOAT_WORD(ix, ax); - } - n += ((ix)>>23) - 0x7f; - j = ix & 0x007fffff; - /* determine interval */ - ix = j | 0x3f800000; /* normalize ix */ - if (j <= 0x1cc471) /* |x|>1) & 0xfffff000) | 0x20000000; - SET_FLOAT_WORD(t_h, is + 0x00400000 + (k<<21)); - t_l = ax - (t_h - bp[k]); - s_l = v*((u - s_h*t_h) - s_h*t_l); - /* compute log(ax) */ - s2 = s*s; - r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6))))); - r += s_l*(s_h+s); - s2 = s_h*s_h; - t_h = 3.0f + s2 + r; - GET_FLOAT_WORD(is, t_h); - SET_FLOAT_WORD(t_h, is & 0xfffff000); - t_l = r - ((t_h - 3.0f) - s2); - /* u+v = s*(1+...) */ - u = s_h*t_h; - v = s_l*t_h + t_l*s; - /* 2/(3log2)*(s+...) */ - p_h = u + v; - GET_FLOAT_WORD(is, p_h); - SET_FLOAT_WORD(p_h, is & 0xfffff000); - p_l = v - (p_h - u); - z_h = cp_h*p_h; /* cp_h+cp_l = 2/(3*log2) */ - z_l = cp_l*p_h + p_l*cp+dp_l[k]; - /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */ - t = (float)n; - t1 = (((z_h + z_l) + dp_h[k]) + t); - GET_FLOAT_WORD(is, t1); - SET_FLOAT_WORD(t1, is & 0xfffff000); - t2 = z_l - (((t1 - t) - dp_h[k]) - z_h); - } +/* Returns 0 if not int, 1 if odd int, 2 if even int. The argument is + the bit representation of a non-zero finite floating-point value. */ +static inline int checkint(uint32_t iy) +{ + int e = iy >> 23 & 0xff; + if (e < 0x7f) + return 0; + if (e > 0x7f + 23) + return 2; + if (iy & ((1 << (0x7f + 23 - e)) - 1)) + return 0; + if (iy & (1 << (0x7f + 23 - e))) + return 1; + return 2; +} + +static inline int zeroinfnan(uint32_t ix) +{ + return 2 * ix - 1 >= 2u * 0x7f800000 - 1; +} - /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ - GET_FLOAT_WORD(is, y); - SET_FLOAT_WORD(y1, is & 0xfffff000); - p_l = (y-y1)*t1 + y*t2; - p_h = y1*t1; - z = p_l + p_h; - GET_FLOAT_WORD(j, z); - if (j > 0x43000000) /* if z > 128 */ - return sn*huge*huge; /* overflow */ - else if (j == 0x43000000) { /* if z == 128 */ - if (p_l + ovt > z - p_h) - return sn*huge*huge; /* overflow */ - } else if ((j&0x7fffffff) > 0x43160000) /* z < -150 */ // FIXME: check should be (uint32_t)j > 0xc3160000 - return sn*tiny*tiny; /* underflow */ - else if (j == 0xc3160000) { /* z == -150 */ - if (p_l <= z-p_h) - return sn*tiny*tiny; /* underflow */ +float powf(float x, float y) +{ + uint32_t sign_bias = 0; + uint32_t ix, iy; + + ix = asuint(x); + iy = asuint(y); + if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000 || + zeroinfnan(iy))) { + /* Either (x < 0x1p-126 or inf or nan) or (y is 0 or inf or nan). */ + if (predict_false(zeroinfnan(iy))) { + if (2 * iy == 0) + return issignalingf_inline(x) ? x + y : 1.0f; + if (ix == 0x3f800000) + return issignalingf_inline(y) ? x + y : 1.0f; + if (2 * ix > 2u * 0x7f800000 || + 2 * iy > 2u * 0x7f800000) + return x + y; + if (2 * ix == 2 * 0x3f800000) + return 1.0f; + if ((2 * ix < 2 * 0x3f800000) == !(iy & 0x80000000)) + return 0.0f; /* |x|<1 && y==inf or |x|>1 && y==-inf. */ + return y * y; + } + if (predict_false(zeroinfnan(ix))) { + float_t x2 = x * x; + if (ix & 0x80000000 && checkint(iy) == 1) + x2 = -x2; + /* Without the barrier some versions of clang hoist the 1/x2 and + thus division by zero exception can be signaled spuriously. */ + return iy & 0x80000000 ? fp_barrierf(1 / x2) : x2; + } + /* x and y are non-zero finite. */ + if (ix & 0x80000000) { + /* Finite x < 0. */ + int yint = checkint(iy); + if (yint == 0) + return __math_invalidf(x); + if (yint == 1) + sign_bias = SIGN_BIAS; + ix &= 0x7fffffff; + } + if (ix < 0x00800000) { + /* Normalize subnormal x so exponent becomes negative. */ + ix = asuint(x * 0x1p23f); + ix &= 0x7fffffff; + ix -= 23 << 23; + } } - /* - * compute 2**(p_h+p_l) - */ - i = j & 0x7fffffff; - k = (i>>23) - 0x7f; - n = 0; - if (i > 0x3f000000) { /* if |z| > 0.5, set n = [z+0.5] */ - n = j + (0x00800000>>(k+1)); - k = ((n&0x7fffffff)>>23) - 0x7f; /* new k for n */ - SET_FLOAT_WORD(t, n & ~(0x007fffff>>k)); - n = ((n&0x007fffff)|0x00800000)>>(23-k); - if (j < 0) - n = -n; - p_h -= t; + double_t logx = log2_inline(ix); + double_t ylogx = y * logx; /* cannot overflow, y is single prec. */ + if (predict_false((asuint64(ylogx) >> 47 & 0xffff) >= + asuint64(126.0 * POWF_SCALE) >> 47)) { + /* |y*log(x)| >= 126. */ + if (ylogx > 0x1.fffffffd1d571p+6 * POWF_SCALE) + return __math_oflowf(sign_bias); + if (ylogx <= -150.0 * POWF_SCALE) + return __math_uflowf(sign_bias); } - t = p_l + p_h; - GET_FLOAT_WORD(is, t); - SET_FLOAT_WORD(t, is & 0xffff8000); - u = t*lg2_h; - v = (p_l-(t-p_h))*lg2 + t*lg2_l; - z = u + v; - w = v - (z - u); - t = z*z; - t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); - r = (z*t1)/(t1-2.0f) - (w+z*w); - z = 1.0f - (r - z); - GET_FLOAT_WORD(j, z); - j += n<<23; - if ((j>>23) <= 0) /* subnormal output */ - z = scalbnf(z, n); - else - SET_FLOAT_WORD(z, j); - return sn*z; + return exp2_inline(ylogx, sign_bias); } diff --git a/system/lib/libc/musl/src/math/powf_data.c b/system/lib/libc/musl/src/math/powf_data.c new file mode 100644 index 0000000000000..13e1d9a06a9eb --- /dev/null +++ b/system/lib/libc/musl/src/math/powf_data.c @@ -0,0 +1,34 @@ +/* + * Data definition for powf. + * + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ + +#include "powf_data.h" + +const struct powf_log2_data __powf_log2_data = { + .tab = { + { 0x1.661ec79f8f3bep+0, -0x1.efec65b963019p-2 * POWF_SCALE }, + { 0x1.571ed4aaf883dp+0, -0x1.b0b6832d4fca4p-2 * POWF_SCALE }, + { 0x1.49539f0f010bp+0, -0x1.7418b0a1fb77bp-2 * POWF_SCALE }, + { 0x1.3c995b0b80385p+0, -0x1.39de91a6dcf7bp-2 * POWF_SCALE }, + { 0x1.30d190c8864a5p+0, -0x1.01d9bf3f2b631p-2 * POWF_SCALE }, + { 0x1.25e227b0b8eap+0, -0x1.97c1d1b3b7afp-3 * POWF_SCALE }, + { 0x1.1bb4a4a1a343fp+0, -0x1.2f9e393af3c9fp-3 * POWF_SCALE }, + { 0x1.12358f08ae5bap+0, -0x1.960cbbf788d5cp-4 * POWF_SCALE }, + { 0x1.0953f419900a7p+0, -0x1.a6f9db6475fcep-5 * POWF_SCALE }, + { 0x1p+0, 0x0p+0 * POWF_SCALE }, + { 0x1.e608cfd9a47acp-1, 0x1.338ca9f24f53dp-4 * POWF_SCALE }, + { 0x1.ca4b31f026aap-1, 0x1.476a9543891bap-3 * POWF_SCALE }, + { 0x1.b2036576afce6p-1, 0x1.e840b4ac4e4d2p-3 * POWF_SCALE }, + { 0x1.9c2d163a1aa2dp-1, 0x1.40645f0c6651cp-2 * POWF_SCALE }, + { 0x1.886e6037841edp-1, 0x1.88e9c2c1b9ff8p-2 * POWF_SCALE }, + { 0x1.767dcf5534862p-1, 0x1.ce0a44eb17bccp-2 * POWF_SCALE }, + }, + .poly = { + 0x1.27616c9496e0bp-2 * POWF_SCALE, -0x1.71969a075c67ap-2 * POWF_SCALE, + 0x1.ec70a6ca7baddp-2 * POWF_SCALE, -0x1.7154748bef6c8p-1 * POWF_SCALE, + 0x1.71547652ab82bp0 * POWF_SCALE, + } +}; diff --git a/system/lib/libc/musl/src/math/powf_data.h b/system/lib/libc/musl/src/math/powf_data.h new file mode 100644 index 0000000000000..5b136e28374fb --- /dev/null +++ b/system/lib/libc/musl/src/math/powf_data.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2017-2018, Arm Limited. + * SPDX-License-Identifier: MIT + */ +#ifndef _POWF_DATA_H +#define _POWF_DATA_H + +#include "libm.h" +#include "exp2f_data.h" + +#define POWF_LOG2_TABLE_BITS 4 +#define POWF_LOG2_POLY_ORDER 5 +#if TOINT_INTRINSICS +#define POWF_SCALE_BITS EXP2F_TABLE_BITS +#else +#define POWF_SCALE_BITS 0 +#endif +#define POWF_SCALE ((double)(1 << POWF_SCALE_BITS)) +extern hidden const struct powf_log2_data { + struct { + double invc, logc; + } tab[1 << POWF_LOG2_TABLE_BITS]; + double poly[POWF_LOG2_POLY_ORDER]; +} __powf_log2_data; + +#endif diff --git a/system/lib/libc/musl/src/math/remainder.c b/system/lib/libc/musl/src/math/remainder.c index 6cd089c467cee..612155fedaa58 100644 --- a/system/lib/libc/musl/src/math/remainder.c +++ b/system/lib/libc/musl/src/math/remainder.c @@ -1,5 +1,4 @@ #include -#include "libc.h" double remainder(double x, double y) { diff --git a/system/lib/libc/musl/src/math/remainderf.c b/system/lib/libc/musl/src/math/remainderf.c index 420d3bfc447b2..bf1d7b2831cff 100644 --- a/system/lib/libc/musl/src/math/remainderf.c +++ b/system/lib/libc/musl/src/math/remainderf.c @@ -1,5 +1,4 @@ #include -#include "libc.h" float remainderf(float x, float y) { diff --git a/system/lib/libc/musl/src/math/scalbn.c b/system/lib/libc/musl/src/math/scalbn.c index 530e07c79f051..182f561068fda 100644 --- a/system/lib/libc/musl/src/math/scalbn.c +++ b/system/lib/libc/musl/src/math/scalbn.c @@ -16,11 +16,13 @@ double scalbn(double x, int n) n = 1023; } } else if (n < -1022) { - y *= 0x1p-1022; - n += 1022; + /* make sure final n < -53 to avoid double + rounding in the subnormal range */ + y *= 0x1p-1022 * 0x1p53; + n += 1022 - 53; if (n < -1022) { - y *= 0x1p-1022; - n += 1022; + y *= 0x1p-1022 * 0x1p53; + n += 1022 - 53; if (n < -1022) n = -1022; } diff --git a/system/lib/libc/musl/src/math/scalbnf.c b/system/lib/libc/musl/src/math/scalbnf.c index 0b62c3c71f85d..a5ad208b69929 100644 --- a/system/lib/libc/musl/src/math/scalbnf.c +++ b/system/lib/libc/musl/src/math/scalbnf.c @@ -16,11 +16,11 @@ float scalbnf(float x, int n) n = 127; } } else if (n < -126) { - y *= 0x1p-126f; - n += 126; + y *= 0x1p-126f * 0x1p24f; + n += 126 - 24; if (n < -126) { - y *= 0x1p-126f; - n += 126; + y *= 0x1p-126f * 0x1p24f; + n += 126 - 24; if (n < -126) n = -126; } diff --git a/system/lib/libc/musl/src/math/scalbnl.c b/system/lib/libc/musl/src/math/scalbnl.c index 08a4c58754d8a..db44dab064827 100644 --- a/system/lib/libc/musl/src/math/scalbnl.c +++ b/system/lib/libc/musl/src/math/scalbnl.c @@ -20,11 +20,11 @@ long double scalbnl(long double x, int n) n = 16383; } } else if (n < -16382) { - x *= 0x1p-16382L; - n += 16382; + x *= 0x1p-16382L * 0x1p113L; + n += 16382 - 113; if (n < -16382) { - x *= 0x1p-16382L; - n += 16382; + x *= 0x1p-16382L * 0x1p113L; + n += 16382 - 113; if (n < -16382) n = -16382; } diff --git a/system/lib/libc/musl/src/math/signgam.c b/system/lib/libc/musl/src/math/signgam.c index cd728001ba375..ee331b274e99a 100644 --- a/system/lib/libc/musl/src/math/signgam.c +++ b/system/lib/libc/musl/src/math/signgam.c @@ -1,5 +1,5 @@ #include -#include "libc.h" +#include "libm.h" int __signgam = 0; diff --git a/system/lib/libc/musl/src/math/sinh.c b/system/lib/libc/musl/src/math/sinh.c index 00022c4e6ff6d..a01951ae6fc4f 100644 --- a/system/lib/libc/musl/src/math/sinh.c +++ b/system/lib/libc/musl/src/math/sinh.c @@ -34,6 +34,6 @@ double sinh(double x) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = 2*h*__expo2(absx); + t = __expo2(absx, 2*h); return t; } diff --git a/system/lib/libc/musl/src/math/sinhf.c b/system/lib/libc/musl/src/math/sinhf.c index 6ad19ea2b0c8d..b9caa793c4f92 100644 --- a/system/lib/libc/musl/src/math/sinhf.c +++ b/system/lib/libc/musl/src/math/sinhf.c @@ -26,6 +26,6 @@ float sinhf(float x) } /* |x| > logf(FLT_MAX) or nan */ - t = 2*h*__expo2f(absx); + t = __expo2f(absx, 2*h); return t; } diff --git a/system/lib/libc/musl/src/math/sqrt.c b/system/lib/libc/musl/src/math/sqrt.c index e612a1c64b4e7..2ce6e9ec18bb3 100644 --- a/system/lib/libc/musl/src/math/sqrt.c +++ b/system/lib/libc/musl/src/math/sqrt.c @@ -1,84 +1,25 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrt.c */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunSoft, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ -/* sqrt(x) - * Return correctly rounded sqrt. - * ------------------------------------------ - * | Use the hardware sqrt if you have one | - * ------------------------------------------ - * Method: - * Bit by bit method using integer arithmetic. (Slow, but portable) - * 1. Normalization - * Scale x to y in [1,4) with even powers of 2: - * find an integer k such that 1 <= (y=x*2^(2k)) < 4, then - * sqrt(x) = 2^k * sqrt(y) - * 2. Bit by bit computation - * Let q = sqrt(y) truncated to i bit after binary point (q = 1), - * i 0 - * i+1 2 - * s = 2*q , and y = 2 * ( y - q ). (1) - * i i i i - * - * To compute q from q , one checks whether - * i+1 i - * - * -(i+1) 2 - * (q + 2 ) <= y. (2) - * i - * -(i+1) - * If (2) is false, then q = q ; otherwise q = q + 2 . - * i+1 i i+1 i - * - * With some algebric manipulation, it is not difficult to see - * that (2) is equivalent to - * -(i+1) - * s + 2 <= y (3) - * i i - * - * The advantage of (3) is that s and y can be computed by - * i i - * the following recurrence formula: - * if (3) is false - * - * s = s , y = y ; (4) - * i+1 i i+1 i - * - * otherwise, - * -i -(i+1) - * s = s + 2 , y = y - s - 2 (5) - * i+1 i i+1 i i - * - * One may easily use induction to prove (4) and (5). - * Note. Since the left hand side of (3) contain only i+2 bits, - * it does not necessary to do a full (53-bit) comparison - * in (3). - * 3. Final rounding - * After generating the 53 bits result, we compute one more bit. - * Together with the remainder, we can decide whether the - * result is exact, bigger than 1/2ulp, or less than 1/2ulp - * (it will never equal to 1/2ulp). - * The rounding mode can be detected by checking whether - * huge + tiny is equal to huge, and whether huge - tiny is - * equal to huge for some floating point number "huge" and "tiny". - * - * Special cases: - * sqrt(+-0) = +-0 ... exact - * sqrt(inf) = inf - * sqrt(-ve) = NaN ... with invalid signal - * sqrt(NaN) = NaN ... with invalid signal for signaling NaN - */ - +#include +#include #include "libm.h" +#include "sqrt_data.h" + +#define FENV_SUPPORT 1 + +/* returns a*b*2^-32 - e, with error 0 <= e < 1. */ +static inline uint32_t mul32(uint32_t a, uint32_t b) +{ + return (uint64_t)a*b >> 32; +} -static const double tiny = 1.0e-300; +/* returns a*b*2^-64 - e, with error 0 <= e < 3. */ +static inline uint64_t mul64(uint64_t a, uint64_t b) +{ + uint64_t ahi = a>>32; + uint64_t alo = a&0xffffffff; + uint64_t bhi = b>>32; + uint64_t blo = b&0xffffffff; + return ahi*bhi + (ahi*blo >> 32) + (alo*bhi >> 32); +} double sqrt(double x) { @@ -87,105 +28,137 @@ double sqrt(double x) #ifdef __wasm__ return __builtin_sqrt(x); #else - double z; - int32_t sign = (int)0x80000000; - int32_t ix0,s0,q,m,t,i; - uint32_t r,t1,s1,ix1,q1; - - EXTRACT_WORDS(ix0, ix1, x); + uint64_t ix, top, m; - /* take care of Inf and NaN */ - if ((ix0&0x7ff00000) == 0x7ff00000) { - return x*x + x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */ - } - /* take care of zero */ - if (ix0 <= 0) { - if (((ix0&~sign)|ix1) == 0) - return x; /* sqrt(+-0) = +-0 */ - if (ix0 < 0) - return (x-x)/(x-x); /* sqrt(-ve) = sNaN */ - } - /* normalize x */ - m = ix0>>20; - if (m == 0) { /* subnormal x */ - while (ix0 == 0) { - m -= 21; - ix0 |= (ix1>>11); - ix1 <<= 21; - } - for (i=0; (ix0&0x00100000) == 0; i++) - ix0<<=1; - m -= i - 1; - ix0 |= ix1>>(32-i); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0&0x000fffff)|0x00100000; - if (m & 1) { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1&sign)>>31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1&sign)>>31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s0 + r; - if (t <= ix0) { - s0 = t + r; - ix0 -= t; - q += r; - } - ix0 += ix0 + ((ix1&sign)>>31); - ix1 += ix1; - r >>= 1; + /* special case handling. */ + ix = asuint64(x); + top = ix >> 52; + if (predict_false(top - 0x001 >= 0x7ff - 0x001)) { + /* x < 0x1p-1022 or inf or nan. */ + if (ix * 2 == 0) + return x; + if (ix == 0x7ff0000000000000) + return x; + if (ix > 0x7ff0000000000000) + return __math_invalid(x); + /* x is subnormal, normalize it. */ + ix = asuint64(x * 0x1p52); + top = ix >> 52; + top -= 52; } - r = sign; - while (r != 0) { - t1 = s1 + r; - t = s0; - if (t < ix0 || (t == ix0 && t1 <= ix1)) { - s1 = t1 + r; - if ((t1&sign) == sign && (s1&sign) == 0) - s0++; - ix0 -= t; - if (ix1 < t1) - ix0--; - ix1 -= t1; - q1 += r; - } - ix0 += ix0 + ((ix1&sign)>>31); - ix1 += ix1; - r >>= 1; - } + /* argument reduction: + x = 4^e m; with integer e, and m in [1, 4) + m: fixed point representation [2.62] + 2^e is the exponent part of the result. */ + int even = top & 1; + m = (ix << 11) | 0x8000000000000000; + if (even) m >>= 1; + top = (top + 0x3ff) >> 1; + + /* approximate r ~ 1/sqrt(m) and s ~ sqrt(m) when m in [1,4) + + initial estimate: + 7bit table lookup (1bit exponent and 6bit significand). + + iterative approximation: + using 2 goldschmidt iterations with 32bit int arithmetics + and a final iteration with 64bit int arithmetics. + + details: + + the relative error (e = r0 sqrt(m)-1) of a linear estimate + (r0 = a m + b) is |e| < 0.085955 ~ 0x1.6p-4 at best, + a table lookup is faster and needs one less iteration + 6 bit lookup table (128b) gives |e| < 0x1.f9p-8 + 7 bit lookup table (256b) gives |e| < 0x1.fdp-9 + for single and double prec 6bit is enough but for quad + prec 7bit is needed (or modified iterations). to avoid + one more iteration >=13bit table would be needed (16k). + + a newton-raphson iteration for r is + w = r*r + u = 3 - m*w + r = r*u/2 + can use a goldschmidt iteration for s at the end or + s = m*r + + first goldschmidt iteration is + s = m*r + u = 3 - s*r + r = r*u/2 + s = s*u/2 + next goldschmidt iteration is + u = 3 - s*r + r = r*u/2 + s = s*u/2 + and at the end r is not computed only s. + + they use the same amount of operations and converge at the + same quadratic rate, i.e. if + r1 sqrt(m) - 1 = e, then + r2 sqrt(m) - 1 = -3/2 e^2 - 1/2 e^3 + the advantage of goldschmidt is that the mul for s and r + are independent (computed in parallel), however it is not + "self synchronizing": it only uses the input m in the + first iteration so rounding errors accumulate. at the end + or when switching to larger precision arithmetics rounding + errors dominate so the first iteration should be used. + + the fixed point representations are + m: 2.30 r: 0.32, s: 2.30, d: 2.30, u: 2.30, three: 2.30 + and after switching to 64 bit + m: 2.62 r: 0.64, s: 2.62, d: 2.62, u: 2.62, three: 2.62 */ + + static const uint64_t three = 0xc0000000; + uint64_t r, s, d, u, i; + + i = (ix >> 46) % 128; + r = (uint32_t)__rsqrt_tab[i] << 16; + /* |r sqrt(m) - 1| < 0x1.fdp-9 */ + s = mul32(m>>32, r); + /* |s/sqrt(m) - 1| < 0x1.fdp-9 */ + d = mul32(s, r); + u = three - d; + r = mul32(r, u) << 1; + /* |r sqrt(m) - 1| < 0x1.7bp-16 */ + s = mul32(s, u) << 1; + /* |s/sqrt(m) - 1| < 0x1.7bp-16 */ + d = mul32(s, r); + u = three - d; + r = mul32(r, u) << 1; + /* |r sqrt(m) - 1| < 0x1.3704p-29 (measured worst-case) */ + r = r << 32; + s = mul64(m, r); + d = mul64(s, r); + u = (three<<32) - d; + s = mul64(s, u); /* repr: 3.61 */ + /* -0x1p-57 < s - sqrt(m) < 0x1.8001p-61 */ + s = (s - 2) >> 9; /* repr: 12.52 */ + /* -0x1.09p-52 < s - sqrt(m) < -0x1.fffcp-63 */ - /* use floating add to find out rounding direction */ - if ((ix0|ix1) != 0) { - z = 1.0 - tiny; /* raise inexact flag */ - if (z >= 1.0) { - z = 1.0 + tiny; - if (q1 == (uint32_t)0xffffffff) { - q1 = 0; - q++; - } else if (z > 1.0) { - if (q1 == (uint32_t)0xfffffffe) - q++; - q1 += 2; - } else - q1 += q1 & 1; - } + /* s < sqrt(m) < s + 0x1.09p-52, + compute nearest rounded result: + the nearest result to 52 bits is either s or s+0x1p-52, + we can decide by comparing (2^52 s + 0.5)^2 to 2^104 m. */ + uint64_t d0, d1, d2; + double y, t; + d0 = (m << 42) - s*s; + d1 = s - d0; + d2 = d1 + s + 1; + s += d1 >> 63; + s &= 0x000fffffffffffff; + s |= top << 52; + y = asdouble(s); + if (FENV_SUPPORT) { + /* handle rounding modes and inexact exception: + only (s+1)^2 == 2^42 m case is exact otherwise + add a tiny value to cause the fenv effects. */ + uint64_t tiny = predict_false(d2==0) ? 0 : 0x0010000000000000; + tiny |= (d1^d2) & 0x8000000000000000; + t = asdouble(tiny); + y = eval_as_double(y + t); } - ix0 = (q>>1) + 0x3fe00000; - ix1 = q1>>1; - if (q&1) - ix1 |= sign; - ix0 += m << 20; - INSERT_WORDS(z, ix0, ix1); - return z; + return y; #endif } diff --git a/system/lib/libc/musl/src/math/sqrt_data.c b/system/lib/libc/musl/src/math/sqrt_data.c new file mode 100644 index 0000000000000..61bc22f430958 --- /dev/null +++ b/system/lib/libc/musl/src/math/sqrt_data.c @@ -0,0 +1,19 @@ +#include "sqrt_data.h" +const uint16_t __rsqrt_tab[128] = { +0xb451,0xb2f0,0xb196,0xb044,0xaef9,0xadb6,0xac79,0xab43, +0xaa14,0xa8eb,0xa7c8,0xa6aa,0xa592,0xa480,0xa373,0xa26b, +0xa168,0xa06a,0x9f70,0x9e7b,0x9d8a,0x9c9d,0x9bb5,0x9ad1, +0x99f0,0x9913,0x983a,0x9765,0x9693,0x95c4,0x94f8,0x9430, +0x936b,0x92a9,0x91ea,0x912e,0x9075,0x8fbe,0x8f0a,0x8e59, +0x8daa,0x8cfe,0x8c54,0x8bac,0x8b07,0x8a64,0x89c4,0x8925, +0x8889,0x87ee,0x8756,0x86c0,0x862b,0x8599,0x8508,0x8479, +0x83ec,0x8361,0x82d8,0x8250,0x81c9,0x8145,0x80c2,0x8040, +0xff02,0xfd0e,0xfb25,0xf947,0xf773,0xf5aa,0xf3ea,0xf234, +0xf087,0xeee3,0xed47,0xebb3,0xea27,0xe8a3,0xe727,0xe5b2, +0xe443,0xe2dc,0xe17a,0xe020,0xdecb,0xdd7d,0xdc34,0xdaf1, +0xd9b3,0xd87b,0xd748,0xd61a,0xd4f1,0xd3cd,0xd2ad,0xd192, +0xd07b,0xcf69,0xce5b,0xcd51,0xcc4a,0xcb48,0xca4a,0xc94f, +0xc858,0xc764,0xc674,0xc587,0xc49d,0xc3b7,0xc2d4,0xc1f4, +0xc116,0xc03c,0xbf65,0xbe90,0xbdbe,0xbcef,0xbc23,0xbb59, +0xba91,0xb9cc,0xb90a,0xb84a,0xb78c,0xb6d0,0xb617,0xb560, +}; diff --git a/system/lib/libc/musl/src/math/sqrt_data.h b/system/lib/libc/musl/src/math/sqrt_data.h new file mode 100644 index 0000000000000..260c7f9c292be --- /dev/null +++ b/system/lib/libc/musl/src/math/sqrt_data.h @@ -0,0 +1,13 @@ +#ifndef _SQRT_DATA_H +#define _SQRT_DATA_H + +#include +#include + +/* if x in [1,2): i = (int)(64*x); + if x in [2,4): i = (int)(32*x-64); + __rsqrt_tab[i]*2^-16 is estimating 1/sqrt(x) with small relative error: + |__rsqrt_tab[i]*0x1p-16*sqrt(x) - 1| < -0x1.fdp-9 < 2^-8 */ +extern hidden const uint16_t __rsqrt_tab[128]; + +#endif diff --git a/system/lib/libc/musl/src/math/sqrtf.c b/system/lib/libc/musl/src/math/sqrtf.c index fc58451e03502..6c90a2c22c9f3 100644 --- a/system/lib/libc/musl/src/math/sqrtf.c +++ b/system/lib/libc/musl/src/math/sqrtf.c @@ -1,21 +1,16 @@ -/* origin: FreeBSD /usr/src/lib/msun/src/e_sqrtf.c */ -/* - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - +#include +#include #include "libm.h" +#include "sqrt_data.h" + +#define FENV_SUPPORT 1 + +static inline uint32_t mul32(uint32_t a, uint32_t b) +{ + return (uint64_t)a*b >> 32; +} -static const float tiny = 1.0e-30; +/* see sqrt.c for more detailed comments. */ float sqrtf(float x) { @@ -24,67 +19,71 @@ float sqrtf(float x) #ifdef __wasm__ return __builtin_sqrtf(x); #else - float z; - int32_t sign = (int)0x80000000; - int32_t ix,s,q,m,t,i; - uint32_t r; + uint32_t ix, m, m1, m0, even, ey; - GET_FLOAT_WORD(ix, x); - - /* take care of Inf and NaN */ - if ((ix&0x7f800000) == 0x7f800000) - return x*x + x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */ - - /* take care of zero */ - if (ix <= 0) { - if ((ix&~sign) == 0) - return x; /* sqrt(+-0) = +-0 */ - if (ix < 0) - return (x-x)/(x-x); /* sqrt(-ve) = sNaN */ - } - /* normalize x */ - m = ix>>23; - if (m == 0) { /* subnormal x */ - for (i = 0; (ix&0x00800000) == 0; i++) - ix<<=1; - m -= i - 1; + ix = asuint(x); + if (predict_false(ix - 0x00800000 >= 0x7f800000 - 0x00800000)) { + /* x < 0x1p-126 or inf or nan. */ + if (ix * 2 == 0) + return x; + if (ix == 0x7f800000) + return x; + if (ix > 0x7f800000) + return __math_invalidf(x); + /* x is subnormal, normalize it. */ + ix = asuint(x * 0x1p23f); + ix -= 23 << 23; } - m -= 127; /* unbias exponent */ - ix = (ix&0x007fffff)|0x00800000; - if (m&1) /* odd m, double x to make it even */ - ix += ix; - m >>= 1; /* m = [m/2] */ - /* generate sqrt(x) bit by bit */ - ix += ix; - q = s = 0; /* q = sqrt(x) */ - r = 0x01000000; /* r = moving bit from right to left */ + /* x = 4^e m; with int e and m in [1, 4). */ + even = ix & 0x00800000; + m1 = (ix << 8) | 0x80000000; + m0 = (ix << 7) & 0x7fffffff; + m = even ? m0 : m1; - while (r != 0) { - t = s + r; - if (t <= ix) { - s = t+r; - ix -= t; - q += r; - } - ix += ix; - r >>= 1; - } + /* 2^e is the exponent part of the return value. */ + ey = ix >> 1; + ey += 0x3f800000 >> 1; + ey &= 0x7f800000; + + /* compute r ~ 1/sqrt(m), s ~ sqrt(m) with 2 goldschmidt iterations. */ + static const uint32_t three = 0xc0000000; + uint32_t r, s, d, u, i; + i = (ix >> 17) % 128; + r = (uint32_t)__rsqrt_tab[i] << 16; + /* |r*sqrt(m) - 1| < 0x1p-8 */ + s = mul32(m, r); + /* |s/sqrt(m) - 1| < 0x1p-8 */ + d = mul32(s, r); + u = three - d; + r = mul32(r, u) << 1; + /* |r*sqrt(m) - 1| < 0x1.7bp-16 */ + s = mul32(s, u) << 1; + /* |s/sqrt(m) - 1| < 0x1.7bp-16 */ + d = mul32(s, r); + u = three - d; + s = mul32(s, u); + /* -0x1.03p-28 < s/sqrt(m) - 1 < 0x1.fp-31 */ + s = (s - 1)>>6; + /* s < sqrt(m) < s + 0x1.08p-23 */ - /* use floating add to find out rounding direction */ - if (ix != 0) { - z = 1.0f - tiny; /* raise inexact flag */ - if (z >= 1.0f) { - z = 1.0f + tiny; - if (z > 1.0f) - q += 2; - else - q += q & 1; - } + /* compute nearest rounded result. */ + uint32_t d0, d1, d2; + float y, t; + d0 = (m << 16) - s*s; + d1 = s - d0; + d2 = d1 + s + 1; + s += d1 >> 31; + s &= 0x007fffff; + s |= ey; + y = asfloat(s); + if (FENV_SUPPORT) { + /* handle rounding and inexact exception. */ + uint32_t tiny = predict_false(d2==0) ? 0 : 0x01000000; + tiny |= (d1^d2) & 0x80000000; + t = asfloat(tiny); + y = eval_as_float(y + t); } - ix = (q>>1) + 0x3f000000; - ix += m << 23; - SET_FLOAT_WORD(z, ix); - return z; + return y; #endif } diff --git a/system/lib/libc/musl/src/math/sqrtl.c b/system/lib/libc/musl/src/math/sqrtl.c index 83a8f80c9984d..1b9f19c7d46b9 100644 --- a/system/lib/libc/musl/src/math/sqrtl.c +++ b/system/lib/libc/musl/src/math/sqrtl.c @@ -1,7 +1,259 @@ +#include #include +#include +#include "libm.h" +#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 long double sqrtl(long double x) { - /* FIXME: implement in C, this is for LDBL_MANT_DIG == 64 only */ return sqrt(x); } +#elif (LDBL_MANT_DIG == 113 || LDBL_MANT_DIG == 64) && LDBL_MAX_EXP == 16384 +#include "sqrt_data.h" + +#define FENV_SUPPORT 1 + +typedef struct { + uint64_t hi; + uint64_t lo; +} u128; + +/* top: 16 bit sign+exponent, x: significand. */ +static inline long double mkldbl(uint64_t top, u128 x) +{ + union ldshape u; +#if LDBL_MANT_DIG == 113 + u.i2.hi = x.hi; + u.i2.lo = x.lo; + u.i2.hi &= 0x0000ffffffffffff; + u.i2.hi |= top << 48; +#elif LDBL_MANT_DIG == 64 + u.i.se = top; + u.i.m = x.lo; + /* force the top bit on non-zero (and non-subnormal) results. */ + if (top & 0x7fff) + u.i.m |= 0x8000000000000000; +#endif + return u.f; +} + +/* return: top 16 bit is sign+exp and following bits are the significand. */ +static inline u128 asu128(long double x) +{ + union ldshape u = {.f=x}; + u128 r; +#if LDBL_MANT_DIG == 113 + r.hi = u.i2.hi; + r.lo = u.i2.lo; +#elif LDBL_MANT_DIG == 64 + r.lo = u.i.m<<49; + /* ignore the top bit: pseudo numbers are not handled. */ + r.hi = u.i.m>>15; + r.hi &= 0x0000ffffffffffff; + r.hi |= (uint64_t)u.i.se << 48; +#endif + return r; +} + +/* returns a*b*2^-32 - e, with error 0 <= e < 1. */ +static inline uint32_t mul32(uint32_t a, uint32_t b) +{ + return (uint64_t)a*b >> 32; +} + +/* returns a*b*2^-64 - e, with error 0 <= e < 3. */ +static inline uint64_t mul64(uint64_t a, uint64_t b) +{ + uint64_t ahi = a>>32; + uint64_t alo = a&0xffffffff; + uint64_t bhi = b>>32; + uint64_t blo = b&0xffffffff; + return ahi*bhi + (ahi*blo >> 32) + (alo*bhi >> 32); +} + +static inline u128 add64(u128 a, uint64_t b) +{ + u128 r; + r.lo = a.lo + b; + r.hi = a.hi; + if (r.lo < a.lo) + r.hi++; + return r; +} + +static inline u128 add128(u128 a, u128 b) +{ + u128 r; + r.lo = a.lo + b.lo; + r.hi = a.hi + b.hi; + if (r.lo < a.lo) + r.hi++; + return r; +} + +static inline u128 sub64(u128 a, uint64_t b) +{ + u128 r; + r.lo = a.lo - b; + r.hi = a.hi; + if (a.lo < b) + r.hi--; + return r; +} + +static inline u128 sub128(u128 a, u128 b) +{ + u128 r; + r.lo = a.lo - b.lo; + r.hi = a.hi - b.hi; + if (a.lo < b.lo) + r.hi--; + return r; +} + +/* a<= 64) { + a.hi = a.lo<<(n-64); + a.lo = 0; + } else { + a.hi = (a.hi<>(64-n)); + a.lo = a.lo<>n, 0 <= n <= 127 */ +static inline u128 rsh(u128 a, int n) +{ + if (n == 0) + return a; + if (n >= 64) { + a.lo = a.hi>>(n-64); + a.hi = 0; + } else { + a.lo = (a.lo>>n) | (a.hi<<(64-n)); + a.hi = a.hi>>n; + } + return a; +} + +/* returns a*b exactly. */ +static inline u128 mul64_128(uint64_t a, uint64_t b) +{ + u128 r; + uint64_t ahi = a>>32; + uint64_t alo = a&0xffffffff; + uint64_t bhi = b>>32; + uint64_t blo = b&0xffffffff; + uint64_t lo1 = ((ahi*blo)&0xffffffff) + ((alo*bhi)&0xffffffff) + (alo*blo>>32); + uint64_t lo2 = (alo*blo)&0xffffffff; + r.hi = ahi*bhi + (ahi*blo>>32) + (alo*bhi>>32) + (lo1>>32); + r.lo = (lo1<<32) + lo2; + return r; +} + +/* returns a*b*2^-128 - e, with error 0 <= e < 7. */ +static inline u128 mul128(u128 a, u128 b) +{ + u128 hi = mul64_128(a.hi, b.hi); + uint64_t m1 = mul64(a.hi, b.lo); + uint64_t m2 = mul64(a.lo, b.hi); + return add64(add64(hi, m1), m2); +} + +/* returns a*b % 2^128. */ +static inline u128 mul128_tail(u128 a, u128 b) +{ + u128 lo = mul64_128(a.lo, b.lo); + lo.hi += a.hi*b.lo + a.lo*b.hi; + return lo; +} + + +/* see sqrt.c for detailed comments. */ + +long double sqrtl(long double x) +{ + u128 ix, ml; + uint64_t top; + + ix = asu128(x); + top = ix.hi >> 48; + if (predict_false(top - 0x0001 >= 0x7fff - 0x0001)) { + /* x < 0x1p-16382 or inf or nan. */ + if (2*ix.hi == 0 && ix.lo == 0) + return x; + if (ix.hi == 0x7fff000000000000 && ix.lo == 0) + return x; + if (top >= 0x7fff) + return __math_invalidl(x); + /* x is subnormal, normalize it. */ + ix = asu128(x * 0x1p112); + top = ix.hi >> 48; + top -= 112; + } + + /* x = 4^e m; with int e and m in [1, 4) */ + int even = top & 1; + ml = lsh(ix, 15); + ml.hi |= 0x8000000000000000; + if (even) ml = rsh(ml, 1); + top = (top + 0x3fff) >> 1; + + /* r ~ 1/sqrt(m) */ + static const uint64_t three = 0xc0000000; + uint64_t r, s, d, u, i; + i = (ix.hi >> 42) % 128; + r = (uint32_t)__rsqrt_tab[i] << 16; + /* |r sqrt(m) - 1| < 0x1p-8 */ + s = mul32(ml.hi>>32, r); + d = mul32(s, r); + u = three - d; + r = mul32(u, r) << 1; + /* |r sqrt(m) - 1| < 0x1.7bp-16, switch to 64bit */ + r = r<<32; + s = mul64(ml.hi, r); + d = mul64(s, r); + u = (three<<32) - d; + r = mul64(u, r) << 1; + /* |r sqrt(m) - 1| < 0x1.a5p-31 */ + s = mul64(u, s) << 1; + d = mul64(s, r); + u = (three<<32) - d; + r = mul64(u, r) << 1; + /* |r sqrt(m) - 1| < 0x1.c001p-59, switch to 128bit */ + + static const u128 threel = {.hi=three<<32, .lo=0}; + u128 rl, sl, dl, ul; + rl.hi = r; + rl.lo = 0; + sl = mul128(ml, rl); + dl = mul128(sl, rl); + ul = sub128(threel, dl); + sl = mul128(ul, sl); /* repr: 3.125 */ + /* -0x1p-116 < s - sqrt(m) < 0x3.8001p-125 */ + sl = rsh(sub64(sl, 4), 125-(LDBL_MANT_DIG-1)); + /* s < sqrt(m) < s + 1 ULP + tiny */ + + long double y; + u128 d2, d1, d0; + d0 = sub128(lsh(ml, 2*(LDBL_MANT_DIG-1)-126), mul128_tail(sl,sl)); + d1 = sub128(sl, d0); + d2 = add128(add64(sl, 1), d1); + sl = add64(sl, d1.hi >> 63); + y = mkldbl(top, sl); + if (FENV_SUPPORT) { + /* handle rounding modes and inexact exception. */ + top = predict_false((d2.hi|d2.lo)==0) ? 0 : 1; + top |= ((d1.hi^d2.hi)&0x8000000000000000) >> 48; + y += mkldbl(top, (u128){0}); + } + return y; +} +#else +#error unsupported long double format +#endif diff --git a/system/lib/libc/musl/src/misc/basename.c b/system/lib/libc/musl/src/misc/basename.c index cc4f778c518b8..438377b647786 100644 --- a/system/lib/libc/musl/src/misc/basename.c +++ b/system/lib/libc/musl/src/misc/basename.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" char *basename(char *s) { diff --git a/system/lib/libc/musl/src/misc/getauxval.c b/system/lib/libc/musl/src/misc/getauxval.c index b846c80fdd4c0..57f21eed9ef8d 100644 --- a/system/lib/libc/musl/src/misc/getauxval.c +++ b/system/lib/libc/musl/src/misc/getauxval.c @@ -2,7 +2,7 @@ #include #include "libc.h" -unsigned long getauxval(unsigned long item) +unsigned long __getauxval(unsigned long item) { size_t *auxv = libc.auxv; if (item == AT_SECURE) return libc.secure; @@ -11,3 +11,5 @@ unsigned long getauxval(unsigned long item) errno = ENOENT; return 0; } + +weak_alias(__getauxval, getauxval); diff --git a/system/lib/libc/musl/src/misc/getentropy.c b/system/lib/libc/musl/src/misc/getentropy.c new file mode 100644 index 0000000000000..651ea95f14310 --- /dev/null +++ b/system/lib/libc/musl/src/misc/getentropy.c @@ -0,0 +1,33 @@ +#define _BSD_SOURCE +#include +#include +#include +#include + +int getentropy(void *buffer, size_t len) +{ + int cs, ret = 0; + char *pos = buffer; + + if (len > 256) { + errno = EIO; + return -1; + } + + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + + while (len) { + ret = getrandom(pos, len, 0); + if (ret < 0) { + if (errno == EINTR) continue; + else break; + } + pos += ret; + len -= ret; + ret = 0; + } + + pthread_setcancelstate(cs, 0); + + return ret; +} diff --git a/system/lib/libc/musl/src/misc/gethostid.c b/system/lib/libc/musl/src/misc/gethostid.c index ea65611abb74d..25bb35db862d2 100644 --- a/system/lib/libc/musl/src/misc/gethostid.c +++ b/system/lib/libc/musl/src/misc/gethostid.c @@ -1,3 +1,5 @@ +#include + long gethostid() { return 0; diff --git a/system/lib/libc/musl/src/misc/getopt.c b/system/lib/libc/musl/src/misc/getopt.c index 8290aef75aa43..c3f6699559b5c 100644 --- a/system/lib/libc/musl/src/misc/getopt.c +++ b/system/lib/libc/musl/src/misc/getopt.c @@ -1,10 +1,11 @@ +#define _BSD_SOURCE #include #include #include #include #include -#include "libc.h" #include "locale_impl.h" +#include "stdio_impl.h" char *optarg; int optind=1, opterr=1, optopt, __optpos, __optreset=0; @@ -16,12 +17,12 @@ void __getopt_msg(const char *a, const char *b, const char *c, size_t l) { FILE *f = stderr; b = __lctrans_cur(b); - flockfile(f); + FLOCK(f); fputs(a, f)>=0 && fwrite(b, strlen(b), 1, f) && fwrite(c, 1, l, f)==l && putc('\n', f); - funlockfile(f); + FUNLOCK(f); } int getopt(int argc, char * const argv[], const char *optstring) @@ -60,7 +61,6 @@ int getopt(int argc, char * const argv[], const char *optstring) c = 0xfffd; /* replacement char */ } optchar = argv[optind]+optpos; - optopt = c; optpos += k; if (!argv[optind][optpos]) { @@ -78,24 +78,26 @@ int getopt(int argc, char * const argv[], const char *optstring) if (l>0) i+=l; else i++; } while (l && d != c); - if (d != c) { + if (d != c || c == ':') { + optopt = c; if (optstring[0] != ':' && opterr) __getopt_msg(argv[0], ": unrecognized option: ", optchar, k); return '?'; } if (optstring[i] == ':') { - if (optstring[i+1] == ':') optarg = 0; - else if (optind >= argc) { + optarg = 0; + if (optstring[i+1] != ':' || optpos) { + optarg = argv[optind++] + optpos; + optpos = 0; + } + if (optind > argc) { + optopt = c; if (optstring[0] == ':') return ':'; if (opterr) __getopt_msg(argv[0], ": option requires an argument: ", optchar, k); return '?'; } - if (optstring[i+1] != ':' || optpos) { - optarg = argv[optind++] + optpos; - optpos = 0; - } } return c; } diff --git a/system/lib/libc/musl/src/misc/getopt_long.c b/system/lib/libc/musl/src/misc/getopt_long.c index 480c00139e086..6949ab1c7eec0 100644 --- a/system/lib/libc/musl/src/misc/getopt_long.c +++ b/system/lib/libc/musl/src/misc/getopt_long.c @@ -1,8 +1,11 @@ #define _GNU_SOURCE #include +#include +#include #include #include #include +#include "stdio_impl.h" extern int __optpos, __optreset; @@ -16,8 +19,6 @@ static void permute(char *const *argv, int dest, int src) av[dest] = tmp; } -void __getopt_msg(const char *, const char *, const char *, size_t); - static int __getopt_long_core(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly); static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly) @@ -53,18 +54,20 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring { optarg = 0; if (longopts && argv[optind][0] == '-' && - ((longonly && argv[optind][1]) || + ((longonly && argv[optind][1] && argv[optind][1] != '-') || (argv[optind][1] == '-' && argv[optind][2]))) { int colon = optstring[optstring[0]=='+'||optstring[0]=='-']==':'; int i, cnt, match; - char *opt; + char *arg, *opt, *start = argv[optind]+1; for (cnt=i=0; longopts[i].name; i++) { const char *name = longopts[i].name; - opt = argv[optind]+1; + opt = start; if (*opt == '-') opt++; - for (; *name && *name == *opt; name++, opt++); + while (*opt && *opt != '=' && *opt == *name) + name++, opt++; if (*opt && *opt != '=') continue; + arg = opt; match = i; if (!*name) { cnt = 1; @@ -72,12 +75,24 @@ static int __getopt_long_core(int argc, char *const *argv, const char *optstring } cnt++; } + if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) { + int l = arg-start; + for (i=0; optstring[i]; i++) { + int j; + for (j=0; j #include #include "syscall.h" -#include "libc.h" #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0) @@ -24,4 +23,4 @@ int getrlimit(int resource, struct rlimit *rlim) return 0; } -LFS64(getrlimit); +weak_alias(getrlimit, getrlimit64); diff --git a/system/lib/libc/musl/src/misc/getrusage.c b/system/lib/libc/musl/src/misc/getrusage.c index 0aaf0ac72ee9c..8e03e2e3db4e3 100644 --- a/system/lib/libc/musl/src/misc/getrusage.c +++ b/system/lib/libc/musl/src/misc/getrusage.c @@ -1,7 +1,35 @@ #include +#include +#include #include "syscall.h" int getrusage(int who, struct rusage *ru) { - return syscall(SYS_getrusage, who, ru); + int r; +#ifdef SYS_getrusage_time64 + long long kru64[18]; + r = __syscall(SYS_getrusage_time64, who, kru64); + if (!r) { + ru->ru_utime = (struct timeval) + { .tv_sec = kru64[0], .tv_usec = kru64[1] }; + ru->ru_stime = (struct timeval) + { .tv_sec = kru64[2], .tv_usec = kru64[3] }; + char *slots = (char *)&ru->ru_maxrss; + for (int i=0; i<14; i++) + *(long *)(slots + i*sizeof(long)) = kru64[4+i]; + } + if (SYS_getrusage_time64 == SYS_getrusage || r != -ENOSYS) + return __syscall_ret(r); +#endif + char *dest = (char *)&ru->ru_maxrss - 4*sizeof(long); + r = __syscall(SYS_getrusage, who, dest); + if (!r && sizeof(time_t) > sizeof(long)) { + long kru[4]; + memcpy(kru, dest, 4*sizeof(long)); + ru->ru_utime = (struct timeval) + { .tv_sec = kru[0], .tv_usec = kru[1] }; + ru->ru_stime = (struct timeval) + { .tv_sec = kru[2], .tv_usec = kru[3] }; + } + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/misc/ioctl.c b/system/lib/libc/musl/src/misc/ioctl.c index 5a41f0e846456..492828119aeaa 100644 --- a/system/lib/libc/musl/src/misc/ioctl.c +++ b/system/lib/libc/musl/src/misc/ioctl.c @@ -1,7 +1,125 @@ #include #include +#include +#include +#include +#include +#include +#include #include "syscall.h" +#define alignof(t) offsetof(struct { char c; t x; }, x) + +#define W 1 +#define R 2 +#define WR 3 + +struct ioctl_compat_map { + int new_req, old_req; + unsigned char old_size, dir, force_align, noffs; + unsigned char offsets[8]; +}; + +#define NINTH(a,b,c,d,e,f,g,h,i,...) i +#define COUNT(...) NINTH(__VA_ARGS__,8,7,6,5,4,3,2,1,0) +#define OFFS(...) COUNT(__VA_ARGS__), { __VA_ARGS__ } + +/* yields a type for a struct with original size n, with a misaligned + * timeval/timespec expanded from 32- to 64-bit. for use with ioctl + * number producing macros; only size of result is meaningful. */ +#define new_misaligned(n) struct { int i; time_t t; char c[(n)-4]; } + +struct v4l2_event { + uint32_t a; + uint64_t b[8]; + uint32_t c[2], ts[2], d[9]; +}; + +static const struct ioctl_compat_map compat_map[] = { + { SIOCGSTAMP, SIOCGSTAMP_OLD, 8, R, 0, OFFS(0, 4) }, + { SIOCGSTAMPNS, SIOCGSTAMPNS_OLD, 8, R, 0, OFFS(0, 4) }, + + /* SNDRV_TIMER_IOCTL_STATUS */ + { _IOR('T', 0x14, char[96]), _IOR('T', 0x14, 88), 88, R, 0, OFFS(0,4) }, + + /* SNDRV_PCM_IOCTL_STATUS[_EXT] */ + { _IOR('A', 0x20, char[128]), _IOR('A', 0x20, char[108]), 108, R, 1, OFFS(4,8,12,16,52,56,60,64) }, + { _IOWR('A', 0x24, char[128]), _IOWR('A', 0x24, char[108]), 108, WR, 1, OFFS(4,8,12,16,52,56,60,64) }, + + /* SNDRV_RAWMIDI_IOCTL_STATUS */ + { _IOWR('W', 0x20, char[48]), _IOWR('W', 0x20, char[36]), 36, WR, 1, OFFS(4,8) }, + + /* SNDRV_PCM_IOCTL_SYNC_PTR - with 3 subtables */ + { _IOWR('A', 0x23, char[136]), _IOWR('A', 0x23, char[132]), 0, WR, 1, 0 }, + { 0, 0, 4, WR, 1, 0 }, /* snd_pcm_sync_ptr (flags only) */ + { 0, 0, 32, WR, 1, OFFS(8,12,16,24,28) }, /* snd_pcm_mmap_status */ + { 0, 0, 8, WR, 1, OFFS(0,4) }, /* snd_pcm_mmap_control */ + + /* VIDIOC_QUERYBUF, VIDIOC_QBUF, VIDIOC_DQBUF, VIDIOC_PREPARE_BUF */ + { _IOWR('V', 9, new_misaligned(68)), _IOWR('V', 9, char[68]), 68, WR, 1, OFFS(20, 24) }, + { _IOWR('V', 15, new_misaligned(68)), _IOWR('V', 15, char[68]), 68, WR, 1, OFFS(20, 24) }, + { _IOWR('V', 17, new_misaligned(68)), _IOWR('V', 17, char[68]), 68, WR, 1, OFFS(20, 24) }, + { _IOWR('V', 93, new_misaligned(68)), _IOWR('V', 93, char[68]), 68, WR, 1, OFFS(20, 24) }, + + /* VIDIOC_DQEVENT */ + { _IOR('V', 89, new_misaligned(120)), _IOR('V', 89, struct v4l2_event), sizeof(struct v4l2_event), + R, 0, OFFS(offsetof(struct v4l2_event, ts[0]), offsetof(struct v4l2_event, ts[1])) }, + + /* VIDIOC_OMAP3ISP_STAT_REQ */ + { _IOWR('V', 192+6, char[32]), _IOWR('V', 192+6, char[24]), 22, WR, 0, OFFS(0,4) }, + + /* PPPIOCGIDLE */ + { _IOR('t', 63, char[16]), _IOR('t', 63, char[8]), 8, R, 0, OFFS(0,4) }, + + /* PPGETTIME, PPSETTIME */ + { _IOR('p', 0x95, char[16]), _IOR('p', 0x95, char[8]), 8, R, 0, OFFS(0,4) }, + { _IOW('p', 0x96, char[16]), _IOW('p', 0x96, char[8]), 8, W, 0, OFFS(0,4) }, + + /* LPSETTIMEOUT */ + { _IOW(0x6, 0xf, char[16]), 0x060f, 8, W, 0, OFFS(0,4) }, +}; + +static void convert_ioctl_struct(const struct ioctl_compat_map *map, char *old, char *new, int dir) +{ + int new_offset = 0; + int old_offset = 0; + int old_size = map->old_size; + if (!(dir & map->dir)) return; + if (!map->old_size) { + /* offsets hard-coded for SNDRV_PCM_IOCTL_SYNC_PTR; + * if another exception appears this needs changing. */ + convert_ioctl_struct(map+1, old, new, dir); + convert_ioctl_struct(map+2, old+4, new+8, dir); + convert_ioctl_struct(map+3, old+68, new+72, dir); + return; + } + for (int i=0; i < map->noffs; i++) { + int ts_offset = map->offsets[i]; + int len = ts_offset-old_offset; + if (dir==W) memcpy(old+old_offset, new+new_offset, len); + else memcpy(new+new_offset, old+old_offset, len); + new_offset += len; + old_offset += len; + long long new_ts; + long old_ts; + int align = map->force_align ? sizeof(time_t) : alignof(time_t); + new_offset += (align-1) & -new_offset; + if (dir==W) { + memcpy(&new_ts, new+new_offset, sizeof new_ts); + old_ts = new_ts; + memcpy(old+old_offset, &old_ts, sizeof old_ts); + } else { + memcpy(&old_ts, old+old_offset, sizeof old_ts); + new_ts = old_ts; + memcpy(new+new_offset, &new_ts, sizeof new_ts); + } + new_offset += sizeof new_ts; + old_offset += sizeof old_ts; + } + if (dir==W) memcpy(old+old_offset, new+new_offset, old_size-old_offset); + else memcpy(new+new_offset, old+old_offset, old_size-old_offset); +} + int ioctl(int fd, int req, ...) { void *arg; @@ -9,5 +127,20 @@ int ioctl(int fd, int req, ...) va_start(ap, req); arg = va_arg(ap, void *); va_end(ap); - return syscall(SYS_ioctl, fd, req, arg); + int r = __syscall(SYS_ioctl, fd, req, arg); + if (SIOCGSTAMP != SIOCGSTAMP_OLD && req && r==-ENOTTY) { + for (int i=0; i #include "libc.h" diff --git a/system/lib/libc/musl/src/misc/lockf.c b/system/lib/libc/musl/src/misc/lockf.c index d8f82efd3b1d2..16a80bec13206 100644 --- a/system/lib/libc/musl/src/misc/lockf.c +++ b/system/lib/libc/musl/src/misc/lockf.c @@ -1,7 +1,6 @@ #include #include #include -#include "libc.h" int lockf(int fd, int op, off_t size) { @@ -30,4 +29,4 @@ int lockf(int fd, int op, off_t size) return -1; } -LFS64(lockf); +weak_alias(lockf, lockf64); diff --git a/system/lib/libc/musl/src/misc/mntent.c b/system/lib/libc/musl/src/misc/mntent.c index a16d65254d504..eabb8200bf94d 100644 --- a/system/lib/libc/musl/src/misc/mntent.c +++ b/system/lib/libc/musl/src/misc/mntent.c @@ -3,6 +3,11 @@ #include #include +static char *internal_buf; +static size_t internal_bufsize; + +#define SENTINEL (char *)&internal_buf + FILE *setmntent(const char *name, const char *mode) { return fopen(name, mode); @@ -16,13 +21,18 @@ int endmntent(FILE *f) struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int buflen) { - int cnt, n[8]; + int cnt, n[8], use_internal = (linebuf == SENTINEL); mnt->mnt_freq = 0; mnt->mnt_passno = 0; do { - fgets(linebuf, buflen, f); + if (use_internal) { + getline(&internal_buf, &internal_bufsize, f); + linebuf = internal_buf; + } else { + fgets(linebuf, buflen, f); + } if (feof(f) || ferror(f)) return 0; if (!strchr(linebuf, '\n')) { fscanf(f, "%*[^\n]%*[\n]"); @@ -49,9 +59,8 @@ struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int bufle struct mntent *getmntent(FILE *f) { - static char linebuf[256]; static struct mntent mnt; - return getmntent_r(f, &mnt, linebuf, sizeof linebuf); + return getmntent_r(f, &mnt, SENTINEL, 0); } int addmntent(FILE *f, const struct mntent *mnt) diff --git a/system/lib/libc/musl/src/misc/nftw.c b/system/lib/libc/musl/src/misc/nftw.c index efb2b89524747..8dcff7fefd2a3 100644 --- a/system/lib/libc/musl/src/misc/nftw.c +++ b/system/lib/libc/musl/src/misc/nftw.c @@ -1,12 +1,12 @@ #include #include +#include #include #include #include #include #include #include -#include "libc.h" struct history { @@ -27,8 +27,9 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, struct history new; int type; int r; + int dfd; + int err; struct FTW lev; - char *name; if ((flags & FTW_PHYS) ? lstat(path, &st) : stat(path, &st) < 0) { if (!(flags & FTW_PHYS) && errno==ENOENT && !lstat(path, &st)) @@ -36,8 +37,7 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, else if (errno != EACCES) return -1; else type = FTW_NS; } else if (S_ISDIR(st.st_mode)) { - if (access(path, R_OK) < 0) type = FTW_DNR; - else if (flags & FTW_DEPTH) type = FTW_DP; + if (flags & FTW_DEPTH) type = FTW_DP; else type = FTW_D; } else if (S_ISLNK(st.st_mode)) { if (flags & FTW_PHYS) type = FTW_SL; @@ -53,10 +53,24 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, new.dev = st.st_dev; new.ino = st.st_ino; new.level = h ? h->level+1 : 0; - new.base = l+1; + new.base = j+1; lev.level = new.level; - lev.base = h ? h->base : (name=strrchr(path, '/')) ? name-path : 0; + if (h) { + lev.base = h->base; + } else { + size_t k; + for (k=j; k && path[k]=='/'; k--); + for (; k && path[k-1]!='/'; k--); + lev.base = k; + } + + if (type == FTW_D || type == FTW_DP) { + dfd = open(path, O_RDONLY); + err = errno; + if (dfd < 0 && err == EACCES) type = FTW_DNR; + if (!fd_limit) close(dfd); + } if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) return r; @@ -66,7 +80,11 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, return 0; if ((type == FTW_D || type == FTW_DP) && fd_limit) { - DIR *d = opendir(path); + if (dfd < 0) { + errno = err; + return -1; + } + DIR *d = fdopendir(dfd); if (d) { struct dirent *de; while ((de = readdir(d))) { @@ -87,7 +105,8 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int, } } closedir(d); - } else if (errno != EACCES) { + } else { + close(dfd); return -1; } } @@ -120,4 +139,4 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str return r; } -LFS64(nftw); +weak_alias(nftw, nftw64); diff --git a/system/lib/libc/musl/src/misc/ptsname.c b/system/lib/libc/musl/src/misc/ptsname.c index a34779276fa01..58c151c97fbbc 100644 --- a/system/lib/libc/musl/src/misc/ptsname.c +++ b/system/lib/libc/musl/src/misc/ptsname.c @@ -1,8 +1,6 @@ #include #include -int __ptsname_r(int, char *, size_t); - char *ptsname(int fd) { static char buf[9 + sizeof(int)*3 + 1]; diff --git a/system/lib/libc/musl/src/misc/pty.c b/system/lib/libc/musl/src/misc/pty.c index b395d2c09e14f..a0577147a4c2b 100644 --- a/system/lib/libc/musl/src/misc/pty.c +++ b/system/lib/libc/musl/src/misc/pty.c @@ -3,12 +3,13 @@ #include #include #include -#include "libc.h" #include "syscall.h" int posix_openpt(int flags) { - return open("/dev/ptmx", flags); + int r = open("/dev/ptmx", flags); + if (r < 0 && errno == ENOSPC) errno = EAGAIN; + return r; } int grantpt(int fd) diff --git a/system/lib/libc/musl/src/misc/realpath.c b/system/lib/libc/musl/src/misc/realpath.c index 975c0fa2ec4ec..db8b74dc8dbbc 100644 --- a/system/lib/libc/musl/src/misc/realpath.c +++ b/system/lib/libc/musl/src/misc/realpath.c @@ -1,53 +1,156 @@ #include #include -#include -#include #include #include #include -#include "syscall.h" -void __procfdname(char *, unsigned); +static size_t slash_len(const char *s) +{ + const char *s0 = s; + while (*s == '/') s++; + return s-s0; +} char *realpath(const char *restrict filename, char *restrict resolved) { - int fd; - ssize_t r; - struct stat st1, st2; - char buf[15+3*sizeof(int)]; - char tmp[PATH_MAX]; + char stack[PATH_MAX+1]; + char output[PATH_MAX]; + size_t p, q, l, l0, cnt=0, nup=0; + int check_dir=0; if (!filename) { errno = EINVAL; return 0; } + l = strnlen(filename, sizeof stack); + if (!l) { + errno = ENOENT; + return 0; + } + if (l >= PATH_MAX) goto toolong; + p = sizeof stack - l - 1; + q = 0; + memcpy(stack+p, filename, l+1); + + /* Main loop. Each iteration pops the next part from stack of + * remaining path components and consumes any slashes that follow. + * If not a link, it's moved to output; if a link, contents are + * pushed to the stack. */ +restart: + for (; ; p+=slash_len(stack+p)) { + /* If stack starts with /, the whole component is / or // + * and the output state must be reset. */ + if (stack[p] == '/') { + check_dir=0; + nup=0; + q=0; + output[q++] = '/'; + p++; + /* Initial // is special. */ + if (stack[p] == '/' && stack[p+1] != '/') + output[q++] = '/'; + continue; + } + + char *z = __strchrnul(stack+p, '/'); + l0 = l = z-(stack+p); + + if (!l && !check_dir) break; - fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC); - if (fd < 0) return 0; - __procfdname(buf, fd); + /* Skip any . component but preserve check_dir status. */ + if (l==1 && stack[p]=='.') { + p += l; + continue; + } - r = readlink(buf, tmp, sizeof tmp - 1); - if (r < 0) goto err; - tmp[r] = 0; + /* Copy next component onto output at least temporarily, to + * call readlink, but wait to advance output position until + * determining it's not a link. */ + if (q && output[q-1] != '/') { + if (!p) goto toolong; + stack[--p] = '/'; + l++; + } + if (q+l >= PATH_MAX) goto toolong; + memcpy(output+q, stack+p, l); + output[q+l] = 0; + p += l; - fstat(fd, &st1); - r = stat(tmp, &st2); - if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) { - if (!r) errno = ELOOP; - goto err; + int up = 0; + if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') { + up = 1; + /* Any non-.. path components we could cancel start + * after nup repetitions of the 3-byte string "../"; + * if there are none, accumulate .. components to + * later apply to cwd, if needed. */ + if (q <= 3*nup) { + nup++; + q += l; + continue; + } + /* When previous components are already known to be + * directories, processing .. can skip readlink. */ + if (!check_dir) goto skip_readlink; + } + ssize_t k = readlink(output, stack, p); + if (k==p) goto toolong; + if (!k) { + errno = ENOENT; + return 0; + } + if (k<0) { + if (errno != EINVAL) return 0; +skip_readlink: + check_dir = 0; + if (up) { + while(q && output[q-1]!='/') q--; + if (q>1 && (q>2 || output[0]!='/')) q--; + continue; + } + if (l0) q += l; + check_dir = stack[p]; + continue; + } + if (++cnt == SYMLOOP_MAX) { + errno = ELOOP; + return 0; + } + + /* If link contents end in /, strip any slashes already on + * stack to avoid /->// or //->/// or spurious toolong. */ + if (stack[k-1]=='/') while (stack[p]=='/') p++; + p -= k; + memmove(stack+p, stack, k); + + /* Skip the stack advancement in case we have a new + * absolute base path. */ + goto restart; + } + + output[q] = 0; + + if (output[0] != '/') { + if (!getcwd(stack, sizeof stack)) return 0; + l = strlen(stack); + /* Cancel any initial .. components. */ + p = 0; + while (nup--) { + while(l>1 && stack[l-1]!='/') l--; + if (l>1) l--; + p += 2; + if (p= PATH_MAX) goto toolong; + memmove(output + l, output + p, q - p + 1); + memcpy(output, stack, l); + q = l + q-p; } -#ifdef __EMSCRIPTEN__ - __wasi_fd_close(fd); -#else - __syscall(SYS_close, fd); -#endif - return resolved ? strcpy(resolved, tmp) : strdup(tmp); -err: -#ifdef __EMSCRIPTEN__ - __wasi_fd_close(fd); -#else - __syscall(SYS_close, fd); -#endif + if (resolved) return memcpy(resolved, output, q+1); + else return strdup(output); + +toolong: + errno = ENAMETOOLONG; return 0; } diff --git a/system/lib/libc/musl/src/misc/setrlimit.c b/system/lib/libc/musl/src/misc/setrlimit.c index 7130d719e6fec..8340aee096413 100644 --- a/system/lib/libc/musl/src/misc/setrlimit.c +++ b/system/lib/libc/musl/src/misc/setrlimit.c @@ -6,25 +6,8 @@ #define MIN(a, b) ((a)<(b) ? (a) : (b)) #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0) -int __setrlimit(int resource, const struct rlimit *rlim) -{ - unsigned long k_rlim[2]; - struct rlimit tmp; - if (SYSCALL_RLIM_INFINITY != RLIM_INFINITY) { - tmp = *rlim; - FIX(tmp.rlim_cur); - FIX(tmp.rlim_max); - rlim = &tmp; - } - int ret = __syscall(SYS_prlimit64, 0, resource, rlim, 0); - if (ret != -ENOSYS) return ret; - k_rlim[0] = MIN(rlim->rlim_cur, MIN(-1UL, SYSCALL_RLIM_INFINITY)); - k_rlim[1] = MIN(rlim->rlim_max, MIN(-1UL, SYSCALL_RLIM_INFINITY)); - return __syscall(SYS_setrlimit, resource, k_rlim); -} - struct ctx { - const struct rlimit *rlim; + unsigned long lim[2]; int res; int err; }; @@ -33,12 +16,26 @@ static void do_setrlimit(void *p) { struct ctx *c = p; if (c->err>0) return; - c->err = -__setrlimit(c->res, c->rlim); + c->err = -__syscall(SYS_setrlimit, c->res, c->lim); } int setrlimit(int resource, const struct rlimit *rlim) { - struct ctx c = { .res = resource, .rlim = rlim, .err = -1 }; + struct rlimit tmp; + if (SYSCALL_RLIM_INFINITY != RLIM_INFINITY) { + tmp = *rlim; + FIX(tmp.rlim_cur); + FIX(tmp.rlim_max); + rlim = &tmp; + } + int ret = __syscall(SYS_prlimit64, 0, resource, rlim, 0); + if (ret != -ENOSYS) return __syscall_ret(ret); + + struct ctx c = { + .lim[0] = MIN(rlim->rlim_cur, MIN(-1UL, SYSCALL_RLIM_INFINITY)), + .lim[1] = MIN(rlim->rlim_max, MIN(-1UL, SYSCALL_RLIM_INFINITY)), + .res = resource, .err = -1 + }; __synccall(do_setrlimit, &c); if (c.err) { if (c.err>0) errno = c.err; @@ -47,4 +44,4 @@ int setrlimit(int resource, const struct rlimit *rlim) return 0; } -LFS64(setrlimit); +weak_alias(setrlimit, setrlimit64); diff --git a/system/lib/libc/musl/src/misc/syscall.c b/system/lib/libc/musl/src/misc/syscall.c index 9d435a978579d..6f3ef65639aa0 100644 --- a/system/lib/libc/musl/src/misc/syscall.c +++ b/system/lib/libc/musl/src/misc/syscall.c @@ -1,3 +1,5 @@ +#define _BSD_SOURCE +#include #include "syscall.h" #include diff --git a/system/lib/libc/musl/src/misc/syslog.c b/system/lib/libc/musl/src/misc/syslog.c index 9dd1ddb588932..7dc0c1be50ed8 100644 --- a/system/lib/libc/musl/src/misc/syslog.c +++ b/system/lib/libc/musl/src/misc/syslog.c @@ -9,14 +9,16 @@ #include #include #include -#include "libc.h" +#include "lock.h" +#include "fork_impl.h" -static volatile int lock[2]; +static volatile int lock[1]; static char log_ident[32]; static int log_opt; static int log_facility = LOG_USER; static int log_mask = 0xff; static int log_fd = -1; +volatile int *const __syslog_lockptr = lock; int setlogmask(int maskpri) { @@ -122,7 +124,7 @@ static void _vsyslog(int priority, const char *message, va_list ap) } } -void __vsyslog(int priority, const char *message, va_list ap) +static void __vsyslog(int priority, const char *message, va_list ap) { int cs; if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return; diff --git a/system/lib/libc/musl/src/misc/wordexp.c b/system/lib/libc/musl/src/misc/wordexp.c index db39b5b8a3e3d..db83a69f37d99 100644 --- a/system/lib/libc/musl/src/misc/wordexp.c +++ b/system/lib/libc/musl/src/misc/wordexp.c @@ -14,13 +14,7 @@ static void reap(pid_t pid) { int status; - for (;;) { - if (waitpid(pid, &status, 0) < 0) { - if (errno != EINTR) return; - } else { - if (WIFEXITED(status)) return; - } - } + while (waitpid(pid, &status, 0) < 0 && errno == EINTR); } static char *getword(FILE *f) @@ -48,7 +42,7 @@ static int do_wordexp(const char *s, wordexp_t *we, int flags) if (flags & WRDE_NOCMD) for (i=0; s[i]; i++) switch (s[i]) { case '\\': - if (!sq) i++; + if (!sq && !s[++i]) return WRDE_SYNTAX; break; case '\'': if (!dq) sq^=1; diff --git a/system/lib/libc/musl/src/mman/madvise.c b/system/lib/libc/musl/src/mman/madvise.c index f80926bec4875..e0c7c0ec92b81 100644 --- a/system/lib/libc/musl/src/mman/madvise.c +++ b/system/lib/libc/musl/src/mman/madvise.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int __madvise(void *addr, size_t len, int advice) { diff --git a/system/lib/libc/musl/src/mman/mlock.c b/system/lib/libc/musl/src/mman/mlock.c index e683a44aefc97..71af582fe6a3e 100644 --- a/system/lib/libc/musl/src/mman/mlock.c +++ b/system/lib/libc/musl/src/mman/mlock.c @@ -3,5 +3,9 @@ int mlock(const void *addr, size_t len) { +#ifdef SYS_mlock return syscall(SYS_mlock, addr, len); +#else + return syscall(SYS_mlock2, addr, len, 0); +#endif } diff --git a/system/lib/libc/musl/src/mman/mmap.c b/system/lib/libc/musl/src/mman/mmap.c index b85f25ca083e8..eff88d82a8fcf 100644 --- a/system/lib/libc/musl/src/mman/mmap.c +++ b/system/lib/libc/musl/src/mman/mmap.c @@ -4,16 +4,16 @@ #include #include #include "syscall.h" -#include "libc.h" static void dummy(void) { } weak_alias(dummy, __vm_wait); #define UNIT SYSCALL_MMAP2_UNIT -#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | (UNIT-1)) +#define OFF_MASK ((-0x2000ULL << (8*sizeof(syscall_arg_t)-1)) | (UNIT-1)) void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off) { + long ret; if (off & OFF_MASK) { errno = EINVAL; return MAP_FAILED; @@ -26,12 +26,16 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off) __vm_wait(); } #ifdef SYS_mmap2 - return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT); + ret = __syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT); #else - return (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off); + ret = __syscall(SYS_mmap, start, len, prot, flags, fd, off); #endif + /* Fixup incorrect EPERM from kernel. */ + if (ret == -EPERM && !start && (flags&MAP_ANON) && !(flags&MAP_FIXED)) + ret = -ENOMEM; + return (void *)__syscall_ret(ret); } weak_alias(__mmap, mmap); -LFS64(mmap); +weak_alias(mmap, mmap64); diff --git a/system/lib/libc/musl/src/mman/mremap.c b/system/lib/libc/musl/src/mman/mremap.c index ce4e8ea13677a..cc6991a635e1d 100644 --- a/system/lib/libc/musl/src/mman/mremap.c +++ b/system/lib/libc/musl/src/mman/mremap.c @@ -5,7 +5,6 @@ #include #include #include "syscall.h" -#include "libc.h" static void dummy(void) { } weak_alias(dummy, __vm_wait); diff --git a/system/lib/libc/musl/src/mman/munmap.c b/system/lib/libc/musl/src/mman/munmap.c index 3f711ee50145b..2bf83bbe9b702 100644 --- a/system/lib/libc/musl/src/mman/munmap.c +++ b/system/lib/libc/musl/src/mman/munmap.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" static void dummy(void) { } weak_alias(dummy, __vm_wait); diff --git a/system/lib/libc/musl/src/mman/shm_open.c b/system/lib/libc/musl/src/mman/shm_open.c index d042a5a882bd3..79784bd306e2d 100644 --- a/system/lib/libc/musl/src/mman/shm_open.c +++ b/system/lib/libc/musl/src/mman/shm_open.c @@ -6,8 +6,6 @@ #include #include -char *__strchrnul(const char *, int); - char *__shm_mapname(const char *name, char *buf) { char *p; diff --git a/system/lib/libc/musl/src/mq/mq_timedreceive.c b/system/lib/libc/musl/src/mq/mq_timedreceive.c index 2cef6a86bff8c..f41b6642f822e 100644 --- a/system/lib/libc/musl/src/mq/mq_timedreceive.c +++ b/system/lib/libc/musl/src/mq/mq_timedreceive.c @@ -1,7 +1,24 @@ #include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + ssize_t mq_timedreceive(mqd_t mqd, char *restrict msg, size_t len, unsigned *restrict prio, const struct timespec *restrict at) { +#ifdef SYS_mq_timedreceive_time64 + time_t s = at ? at->tv_sec : 0; + long ns = at ? at->tv_nsec : 0; + long r = -ENOSYS; + if (SYS_mq_timedreceive == SYS_mq_timedreceive_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_mq_timedreceive_time64, mqd, msg, len, prio, + at ? ((long long []){at->tv_sec, at->tv_nsec}) : 0); + if (SYS_mq_timedreceive == SYS_mq_timedreceive_time64 || r != -ENOSYS) + return __syscall_ret(r); + return syscall_cp(SYS_mq_timedreceive, mqd, msg, len, prio, + at ? ((long[]){CLAMP(s), ns}) : 0); +#else return syscall_cp(SYS_mq_timedreceive, mqd, msg, len, prio, at); +#endif } diff --git a/system/lib/libc/musl/src/mq/mq_timedsend.c b/system/lib/libc/musl/src/mq/mq_timedsend.c index 1c00aa0b28660..56cfcbb833edb 100644 --- a/system/lib/libc/musl/src/mq/mq_timedsend.c +++ b/system/lib/libc/musl/src/mq/mq_timedsend.c @@ -1,7 +1,24 @@ #include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + int mq_timedsend(mqd_t mqd, const char *msg, size_t len, unsigned prio, const struct timespec *at) { +#ifdef SYS_mq_timedsend_time64 + time_t s = at ? at->tv_sec : 0; + long ns = at ? at->tv_nsec : 0; + long r = -ENOSYS; + if (SYS_mq_timedsend == SYS_mq_timedsend_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_mq_timedsend_time64, mqd, msg, len, prio, + at ? ((long long []){at->tv_sec, at->tv_nsec}) : 0); + if (SYS_mq_timedsend == SYS_mq_timedsend_time64 || r != -ENOSYS) + return __syscall_ret(r); + return syscall_cp(SYS_mq_timedsend, mqd, msg, len, prio, + at ? ((long[]){CLAMP(s), ns}) : 0); +#else return syscall_cp(SYS_mq_timedsend, mqd, msg, len, prio, at); +#endif } diff --git a/system/lib/libc/musl/src/multibyte/internal.c b/system/lib/libc/musl/src/multibyte/internal.c index 7e1b1c03409f0..2f5aaa914a1e1 100644 --- a/system/lib/libc/musl/src/multibyte/internal.c +++ b/system/lib/libc/musl/src/multibyte/internal.c @@ -9,7 +9,7 @@ | x ) #define F(x) ( ( x>=5 ? 0 : \ x==0 ? R(0x90,0xc0) : \ - x==4 ? R(0x80,0xa0) : \ + x==4 ? R(0x80,0x90) : \ R(0x80,0xc0) ) \ | ( R(0x80,0xc0) >> 6 ) \ | ( R(0x80,0xc0) >> 12 ) \ diff --git a/system/lib/libc/musl/src/multibyte/internal.h b/system/lib/libc/musl/src/multibyte/internal.h index 421a3d4af9b10..45bbc6d062897 100644 --- a/system/lib/libc/musl/src/multibyte/internal.h +++ b/system/lib/libc/musl/src/multibyte/internal.h @@ -1,11 +1,9 @@ #define bittab __fsmu8 #include +#include -#ifdef __PIC__ -__attribute__((__visibility__("hidden"))) -#endif -extern const uint32_t bittab[]; +extern hidden const uint32_t bittab[]; /* Upper 6 state bits are a negative integer offset to bound-check next byte */ /* equivalent to: ( (b-0x80) | (b+offset) ) & ~0x3f */ diff --git a/system/lib/libc/musl/src/multibyte/mbsnrtowcs.c b/system/lib/libc/musl/src/multibyte/mbsnrtowcs.c index cae4caa2a6c74..931192e2d83c4 100644 --- a/system/lib/libc/musl/src/multibyte/mbsnrtowcs.c +++ b/system/lib/libc/musl/src/multibyte/mbsnrtowcs.c @@ -5,6 +5,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si size_t l, cnt=0, n2; wchar_t *ws, wbuf[256]; const char *s = *src; + const char *tmp_s; if (!wcs) ws = wbuf, wn = sizeof wbuf / sizeof *wbuf; else ws = wcs; @@ -15,7 +16,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si while ( s && wn && ( (n2=n/4)>=wn || n2>32 ) ) { if (n2>=wn) n2=wn; - n -= n2; + tmp_s = s; l = mbsrtowcs(ws, &s, n2, st); if (!(l+1)) { cnt = l; @@ -26,6 +27,7 @@ size_t mbsnrtowcs(wchar_t *restrict wcs, const char **restrict src, size_t n, si ws += l; wn -= l; } + n = s ? n - (s - tmp_s) : 0; cnt += l; } if (s) while (wn && n) { diff --git a/system/lib/libc/musl/src/multibyte/mbsrtowcs.c b/system/lib/libc/musl/src/multibyte/mbsrtowcs.c index 0ee8b69cbfda8..9b2f2dfbb023b 100644 --- a/system/lib/libc/musl/src/multibyte/mbsrtowcs.c +++ b/system/lib/libc/musl/src/multibyte/mbsrtowcs.c @@ -38,12 +38,15 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs } if (!ws) for (;;) { +#ifdef __GNUC__ + typedef uint32_t __attribute__((__may_alias__)) w32; if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) { - while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) { + while (!(( *(w32*)s | *(w32*)s-0x01010101) & 0x80808080)) { s += 4; wn -= 4; } } +#endif if (*s-1u < 0x7f) { s++; wn--; @@ -69,8 +72,10 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs *src = (const void *)s; return wn0; } +#ifdef __GNUC__ + typedef uint32_t __attribute__((__may_alias__)) w32; if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) { - while (wn>=5 && !(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) { + while (wn>=5 && !(( *(w32*)s | *(w32*)s-0x01010101) & 0x80808080)) { *ws++ = *s++; *ws++ = *s++; *ws++ = *s++; @@ -78,6 +83,7 @@ size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs wn -= 4; } } +#endif if (*s-1u < 0x7f) { *ws++ = *s++; wn--; diff --git a/system/lib/libc/musl/src/multibyte/wcsnrtombs.c b/system/lib/libc/musl/src/multibyte/wcsnrtombs.c index 640cbbeb5416d..95e25e708dd9d 100644 --- a/system/lib/libc/musl/src/multibyte/wcsnrtombs.c +++ b/system/lib/libc/musl/src/multibyte/wcsnrtombs.c @@ -1,39 +1,33 @@ #include +#include +#include size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st) { - size_t l, cnt=0, n2; - char *s, buf[256]; const wchar_t *ws = *wcs; - - if (!dst) s = buf, n = sizeof buf; - else s = dst; - - while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) { - if (n2>=n) n2=n; - wn -= n2; - l = wcsrtombs(s, &ws, n2, 0); - if (!(l+1)) { - cnt = l; - n = 0; + size_t cnt = 0; + if (!dst) n=0; + while (ws && wn) { + char tmp[MB_LEN_MAX]; + size_t l = wcrtomb(nn) break; + memcpy(dst, tmp, l); + } + dst += l; n -= l; } - cnt += l; - } - if (ws) while (n && wn) { - l = wcrtomb(s, *ws, 0); - if ((l+1)<=1) { - if (!l) ws = 0; - else cnt = l; + if (!*ws) { + ws = 0; break; } - ws++; wn--; - /* safe - this loop runs fewer than sizeof(buf) times */ - s+=l; n-=l; + ws++; + wn--; cnt += l; } if (dst) *wcs = ws; diff --git a/system/lib/libc/musl/src/network/accept.c b/system/lib/libc/musl/src/network/accept.c index 521e9ef984fab..a92406fa7315c 100644 --- a/system/lib/libc/musl/src/network/accept.c +++ b/system/lib/libc/musl/src/network/accept.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int accept(int fd, struct sockaddr *restrict addr, socklen_t *restrict len) { diff --git a/system/lib/libc/musl/src/network/accept4.c b/system/lib/libc/musl/src/network/accept4.c index 285d85887eff2..59ab1726bdcb3 100644 --- a/system/lib/libc/musl/src/network/accept4.c +++ b/system/lib/libc/musl/src/network/accept4.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" int accept4(int fd, struct sockaddr *restrict addr, socklen_t *restrict len, int flg) { diff --git a/system/lib/libc/musl/src/network/connect.c b/system/lib/libc/musl/src/network/connect.c index 57f01a1edbea3..289127be4875a 100644 --- a/system/lib/libc/musl/src/network/connect.c +++ b/system/lib/libc/musl/src/network/connect.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int connect(int fd, const struct sockaddr *addr, socklen_t len) { diff --git a/system/lib/libc/musl/src/network/dn_comp.c b/system/lib/libc/musl/src/network/dn_comp.c index a17d434dc260a..f0ccd160f657d 100644 --- a/system/lib/libc/musl/src/network/dn_comp.c +++ b/system/lib/libc/musl/src/network/dn_comp.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" /* RFC 1035 message compression */ @@ -55,7 +54,7 @@ static int match(int *offset, const unsigned char *base, const unsigned char *dn } } -int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr) +int dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr) { int i, j, n, m=0, offset, bestlen=0, bestoff; unsigned char lens[127]; @@ -106,5 +105,3 @@ int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dn } return i; } - -weak_alias(__dn_comp, dn_comp); diff --git a/system/lib/libc/musl/src/network/dn_expand.c b/system/lib/libc/musl/src/network/dn_expand.c index d9b3393652298..eac343af5ed4f 100644 --- a/system/lib/libc/musl/src/network/dn_expand.c +++ b/system/lib/libc/musl/src/network/dn_expand.c @@ -1,5 +1,4 @@ #include -#include "libc.h" int __dn_expand(const unsigned char *base, const unsigned char *end, const unsigned char *src, char *dest, int space) { diff --git a/system/lib/libc/musl/src/network/dn_skipname.c b/system/lib/libc/musl/src/network/dn_skipname.c index d54c2e5d04d94..eba65bb82ad27 100644 --- a/system/lib/libc/musl/src/network/dn_skipname.c +++ b/system/lib/libc/musl/src/network/dn_skipname.c @@ -2,11 +2,14 @@ int dn_skipname(const unsigned char *s, const unsigned char *end) { - const unsigned char *p; - for (p=s; p=192) if (p+1 +#include "lookup.h" int __dns_parse(const unsigned char *r, int rlen, int (*callback)(void *, int, const void *, int, const void *), void *ctx) { diff --git a/system/lib/libc/musl/src/network/ent.c b/system/lib/libc/musl/src/network/ent.c index ececdc4866b0d..c6e012306dd8b 100644 --- a/system/lib/libc/musl/src/network/ent.c +++ b/system/lib/libc/musl/src/network/ent.c @@ -1,10 +1,15 @@ -#include "libc.h" +#include void sethostent(int x) { } -void *gethostent() +struct hostent *gethostent() +{ + return 0; +} + +struct netent *getnetent() { return 0; } @@ -14,5 +19,4 @@ void endhostent(void) } weak_alias(sethostent, setnetent); -weak_alias(gethostent, getnetent); weak_alias(endhostent, endnetent); diff --git a/system/lib/libc/musl/src/network/freeaddrinfo.c b/system/lib/libc/musl/src/network/freeaddrinfo.c index df3798ae787cb..62241c239e27f 100644 --- a/system/lib/libc/musl/src/network/freeaddrinfo.c +++ b/system/lib/libc/musl/src/network/freeaddrinfo.c @@ -1,7 +1,16 @@ #include +#include #include +#include "lookup.h" +#include "lock.h" void freeaddrinfo(struct addrinfo *p) { - free(p); + size_t cnt; + for (cnt=1; p->ai_next; cnt++, p=p->ai_next); + struct aibuf *b = (void *)((char *)p - offsetof(struct aibuf, ai)); + b -= b->slot; + LOCK(b->lock); + if (!(b->ref -= cnt)) free(b); + else UNLOCK(b->lock); } diff --git a/system/lib/libc/musl/src/network/getaddrinfo.c b/system/lib/libc/musl/src/network/getaddrinfo.c index b9439f776fceb..efaab306828e8 100644 --- a/system/lib/libc/musl/src/network/getaddrinfo.c +++ b/system/lib/libc/musl/src/network/getaddrinfo.c @@ -3,6 +3,10 @@ #include #include #include +#include +#include +#include +#include #include "lookup.h" int getaddrinfo(const char *restrict host, const char *restrict serv, const struct addrinfo *restrict hint, struct addrinfo **restrict res) @@ -12,13 +16,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru char canon[256], *outcanon; int nservs, naddrs, nais, canon_len, i, j, k; int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0; - struct aibuf { - struct addrinfo ai; - union sa { - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - } sa; - } *out; + struct aibuf *out; if (!host && !serv) return EAI_NONAME; @@ -43,6 +41,50 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru } } + if (flags & AI_ADDRCONFIG) { + /* Define the "an address is configured" condition for address + * families via ability to create a socket for the family plus + * routability of the loopback address for the family. */ + static const struct sockaddr_in lo4 = { + .sin_family = AF_INET, .sin_port = 65535, + .sin_addr.s_addr = __BYTE_ORDER == __BIG_ENDIAN + ? 0x7f000001 : 0x0100007f + }; + static const struct sockaddr_in6 lo6 = { + .sin6_family = AF_INET6, .sin6_port = 65535, + .sin6_addr = IN6ADDR_LOOPBACK_INIT + }; + int tf[2] = { AF_INET, AF_INET6 }; + const void *ta[2] = { &lo4, &lo6 }; + socklen_t tl[2] = { sizeof lo4, sizeof lo6 }; + for (i=0; i<2; i++) { + if (family==tf[1-i]) continue; + int s = socket(tf[i], SOCK_CLOEXEC|SOCK_DGRAM, + IPPROTO_UDP); + if (s>=0) { + int cs; + pthread_setcancelstate( + PTHREAD_CANCEL_DISABLE, &cs); + int r = connect(s, ta[i], tl[i]); + pthread_setcancelstate(cs, 0); + close(s); + if (!r) continue; + } + switch (errno) { + case EADDRNOTAVAIL: + case EAFNOSUPPORT: + case EHOSTUNREACH: + case ENETDOWN: + case ENETUNREACH: + break; + default: + return EAI_SYSTEM; + } + if (family == tf[i]) return EAI_NONAME; + family = tf[1-i]; + } + } + nservs = __lookup_serv(ports, serv, proto, socktype, flags); if (nservs < 0) return nservs; @@ -62,6 +104,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru } for (k=i=0; iai; return 0; } diff --git a/system/lib/libc/musl/src/network/gethostbyname.c b/system/lib/libc/musl/src/network/gethostbyname.c index 5088a51e07544..bfedf52ad65bf 100644 --- a/system/lib/libc/musl/src/network/gethostbyname.c +++ b/system/lib/libc/musl/src/network/gethostbyname.c @@ -9,55 +9,3 @@ struct hostent *gethostbyname(const char *name) { return gethostbyname2(name, AF_INET); } - -#if 0 -struct hostent *gethostbyname(const char *name) -{ - static struct hostent h; - static char *h_aliases[3]; - static char h_canon[256]; - static char *h_addr_list[10]; - static char h_addr_data[10][4]; - static const struct addrinfo hint = { - .ai_family = AF_INET, .ai_flags = AI_CANONNAME - }; - struct addrinfo *ai, *p; - int i; - - switch (getaddrinfo(name, 0, &hint, &ai)) { - case EAI_NONAME: - h_errno = HOST_NOT_FOUND; - break; - case EAI_AGAIN: - h_errno = TRY_AGAIN; - break; - case EAI_FAIL: - h_errno = NO_RECOVERY; - break; - default: - case EAI_MEMORY: - case EAI_SYSTEM: - h_errno = NO_DATA; - break; - case 0: - break; - } - - strcpy(h_canon, ai->ai_canonname); - h.h_name = h_canon; - h.h_aliases = h_aliases; - h.h_aliases[0] = h_canon; - h.h_aliases[1] = strcmp(h_canon, name) ? (char *)name : 0; - h.h_length = 4; - h.h_addr_list = h_addr_list; - for (i=0, p=ai; iai_next) { - h.h_addr_list[i] = h_addr_data[i]; - memcpy(h.h_addr_list[i], - &((struct sockaddr_in *)p->ai_addr)->sin_addr, 4); - } - h.h_addr_list[i] = 0; - h.h_addrtype = AF_INET; - freeaddrinfo(ai); - return &h; -} -#endif diff --git a/system/lib/libc/musl/src/network/gethostbyname2_r.c b/system/lib/libc/musl/src/network/gethostbyname2_r.c index 5c1cae98f3f74..fc8948776d35f 100644 --- a/system/lib/libc/musl/src/network/gethostbyname2_r.c +++ b/system/lib/libc/musl/src/network/gethostbyname2_r.c @@ -34,8 +34,6 @@ int gethostbyname2_r(const char *name, int af, case EAI_SYSTEM: *err = NO_RECOVERY; return errno; - case 0: - break; } h->h_addrtype = af; diff --git a/system/lib/libc/musl/src/network/getnameinfo.c b/system/lib/libc/musl/src/network/getnameinfo.c index 5e6fae3ed0e51..949e18115a7b4 100644 --- a/system/lib/libc/musl/src/network/getnameinfo.c +++ b/system/lib/libc/musl/src/network/getnameinfo.c @@ -2,19 +2,16 @@ #include #include #include +#include #include #include #include #include #include +#include #include "lookup.h" #include "stdio_impl.h" -int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *); -int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int); -int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int); -int __res_send(const unsigned char *, int, unsigned char *, int); - #define PTR_MAX (64 + sizeof ".in-addr.arpa") #define RR_PTR 12 @@ -161,6 +158,7 @@ int getnameinfo(const struct sockaddr *restrict sa, socklen_t sl, unsigned char query[18+PTR_MAX], reply[512]; int qlen = __res_mkquery(0, ptr, 1, RR_PTR, 0, 0, 0, query, sizeof query); + query[3] = 0; /* don't need AD flag */ int rlen = __res_send(query, qlen, reply, sizeof reply); buf[0] = 0; if (rlen > 0) diff --git a/system/lib/libc/musl/src/network/getservbyname_r.c b/system/lib/libc/musl/src/network/getservbyname_r.c index 056c2f33bbd32..cad6317ab8424 100644 --- a/system/lib/libc/musl/src/network/getservbyname_r.c +++ b/system/lib/libc/musl/src/network/getservbyname_r.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "lookup.h" #define ALIGN (sizeof(struct { char a; char *b; }) - sizeof(char *)) @@ -15,6 +16,13 @@ int getservbyname_r(const char *name, const char *prots, struct service servs[MAXSERVS]; int cnt, proto, align; + *res = 0; + + /* Don't treat numeric port number strings as service records. */ + char *end = ""; + strtoul(name, &end, 10); + if (!*end) return ENOENT; + /* Align buffer */ align = -(uintptr_t)buf & ALIGN-1; if (buflen < 2*sizeof(char *)+align) diff --git a/system/lib/libc/musl/src/network/getservbyport_r.c b/system/lib/libc/musl/src/network/getservbyport_r.c index a0a7caecf77e8..b7f21c6b398a5 100644 --- a/system/lib/libc/musl/src/network/getservbyport_r.c +++ b/system/lib/libc/musl/src/network/getservbyport_r.c @@ -5,6 +5,7 @@ #include #include #include +#include int getservbyport_r(int port, const char *prots, struct servent *se, char *buf, size_t buflen, struct servent **res) @@ -20,6 +21,7 @@ int getservbyport_r(int port, const char *prots, if (r) r = getservbyport_r(port, "udp", se, buf, buflen, res); return r; } + *res = 0; /* Align buffer */ i = (uintptr_t)buf & sizeof(char *)-1; @@ -50,6 +52,9 @@ int getservbyport_r(int port, const char *prots, break; } + /* A numeric port string is not a service record. */ + if (strtol(buf, 0, 10)==ntohs(port)) return ENOENT; + *res = se; return 0; } diff --git a/system/lib/libc/musl/src/network/getsockopt.c b/system/lib/libc/musl/src/network/getsockopt.c index 28079d8c0cb60..d3640d9c91f26 100644 --- a/system/lib/libc/musl/src/network/getsockopt.c +++ b/system/lib/libc/musl/src/network/getsockopt.c @@ -1,7 +1,41 @@ #include +#include +#include #include "syscall.h" int getsockopt(int fd, int level, int optname, void *restrict optval, socklen_t *restrict optlen) { - return socketcall(getsockopt, fd, level, optname, optval, optlen, 0); + long tv32[2]; + struct timeval *tv; + + int r = __socketcall(getsockopt, fd, level, optname, optval, optlen, 0); + + if (r==-ENOPROTOOPT) switch (level) { + case SOL_SOCKET: + switch (optname) { + case SO_RCVTIMEO: + case SO_SNDTIMEO: + if (SO_RCVTIMEO == SO_RCVTIMEO_OLD) break; + if (*optlen < sizeof *tv) return __syscall_ret(-EINVAL); + if (optname==SO_RCVTIMEO) optname=SO_RCVTIMEO_OLD; + if (optname==SO_SNDTIMEO) optname=SO_SNDTIMEO_OLD; + r = __socketcall(getsockopt, fd, level, optname, + tv32, (socklen_t[]){sizeof tv32}, 0); + if (r<0) break; + tv = optval; + tv->tv_sec = tv32[0]; + tv->tv_usec = tv32[1]; + *optlen = sizeof *tv; + break; + case SO_TIMESTAMP: + case SO_TIMESTAMPNS: + if (SO_TIMESTAMP == SO_TIMESTAMP_OLD) break; + if (optname==SO_TIMESTAMP) optname=SO_TIMESTAMP_OLD; + if (optname==SO_TIMESTAMPNS) optname=SO_TIMESTAMPNS_OLD; + r = __socketcall(getsockopt, fd, level, + optname, optval, optlen, 0); + break; + } + } + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/network/h_errno.c b/system/lib/libc/musl/src/network/h_errno.c index 4f700ceaf1674..638f77180314a 100644 --- a/system/lib/libc/musl/src/network/h_errno.c +++ b/system/lib/libc/musl/src/network/h_errno.c @@ -1,9 +1,11 @@ #include +#include "pthread_impl.h" #undef h_errno int h_errno; int *__h_errno_location(void) { - return &h_errno; + if (!__pthread_self()->stack) return &h_errno; + return &__pthread_self()->h_errno_val; } diff --git a/system/lib/libc/musl/src/network/herror.c b/system/lib/libc/musl/src/network/herror.c index 65f25ff3f45b6..87f8cff4fd47e 100644 --- a/system/lib/libc/musl/src/network/herror.c +++ b/system/lib/libc/musl/src/network/herror.c @@ -4,5 +4,5 @@ void herror(const char *msg) { - fprintf(stderr, "%s%s%s", msg?msg:"", msg?": ":"", hstrerror(h_errno)); + fprintf(stderr, "%s%s%s\n", msg?msg:"", msg?": ":"", hstrerror(h_errno)); } diff --git a/system/lib/libc/musl/src/network/if_indextoname.c b/system/lib/libc/musl/src/network/if_indextoname.c index 42fe33de82681..830e1a2dac159 100644 --- a/system/lib/libc/musl/src/network/if_indextoname.c +++ b/system/lib/libc/musl/src/network/if_indextoname.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "syscall.h" char *if_indextoname(unsigned index, char *name) @@ -18,5 +19,9 @@ char *if_indextoname(unsigned index, char *name) #else __syscall(SYS_close, fd); #endif - return r < 0 ? 0 : strncpy(name, ifr.ifr_name, IF_NAMESIZE); + if (r < 0) { + if (errno == ENODEV) errno = ENXIO; + return 0; + } + return strncpy(name, ifr.ifr_name, IF_NAMESIZE); } diff --git a/system/lib/libc/musl/src/network/inet_addr.c b/system/lib/libc/musl/src/network/inet_addr.c index 10b21f211cfd7..11ece3d6f8f14 100644 --- a/system/lib/libc/musl/src/network/inet_addr.c +++ b/system/lib/libc/musl/src/network/inet_addr.c @@ -2,8 +2,6 @@ #include #include -int __inet_aton(const char *, struct in_addr *); - in_addr_t inet_addr(const char *p) { struct in_addr a; diff --git a/system/lib/libc/musl/src/network/inet_aton.c b/system/lib/libc/musl/src/network/inet_aton.c index 0f9a45f66ddee..c65f7c2c039db 100644 --- a/system/lib/libc/musl/src/network/inet_aton.c +++ b/system/lib/libc/musl/src/network/inet_aton.c @@ -2,7 +2,7 @@ #include #include #include -#include "libc.h" +#include int __inet_aton(const char *s0, struct in_addr *dest) { diff --git a/system/lib/libc/musl/src/network/inet_ntop.c b/system/lib/libc/musl/src/network/inet_ntop.c index 14f9f4c4018ed..4bfef2c557ab4 100644 --- a/system/lib/libc/musl/src/network/inet_ntop.c +++ b/system/lib/libc/musl/src/network/inet_ntop.c @@ -36,7 +36,7 @@ const char *inet_ntop(int af, const void *restrict a0, char *restrict s, socklen j = strspn(buf+i, ":0"); if (j>max) best=i, max=j; } - if (max>2) { + if (max>3) { buf[best] = buf[best+1] = ':'; memmove(buf+best+2, buf+best+max, i-best-max+1); } diff --git a/system/lib/libc/musl/src/network/lookup.h b/system/lib/libc/musl/src/network/lookup.h index 0468edbc61c56..ef6627256756a 100644 --- a/system/lib/libc/musl/src/network/lookup.h +++ b/system/lib/libc/musl/src/network/lookup.h @@ -3,6 +3,19 @@ #include #include +#include +#include +#include + +struct aibuf { + struct addrinfo ai; + union sa { + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + } sa; + volatile int lock[1]; + short slot, ref; +}; struct address { int family; @@ -30,10 +43,13 @@ struct resolvconf { #define MAXADDRS 48 #define MAXSERVS 2 -int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int proto, int socktype, int flags); -int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags); -int __lookup_ipliteral(struct address buf[static 1], const char *name, int family); +hidden int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int proto, int socktype, int flags); +hidden int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, int flags); +hidden int __lookup_ipliteral(struct address buf[static 1], const char *name, int family); + +hidden int __get_resolv_conf(struct resolvconf *, char *, size_t); +hidden int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *); -int __get_resolv_conf(struct resolvconf *, char *, size_t); +hidden int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *); #endif diff --git a/system/lib/libc/musl/src/network/lookup_ipliteral.c b/system/lib/libc/musl/src/network/lookup_ipliteral.c index 8ed14605238ef..2fddab7373253 100644 --- a/system/lib/libc/musl/src/network/lookup_ipliteral.c +++ b/system/lib/libc/musl/src/network/lookup_ipliteral.c @@ -9,8 +9,6 @@ #include #include "lookup.h" -int __inet_aton(const char *, struct in_addr *); - int __lookup_ipliteral(struct address buf[static 1], const char *name, int family) { struct in_addr a4; diff --git a/system/lib/libc/musl/src/network/lookup_name.c b/system/lib/libc/musl/src/network/lookup_name.c index fb7303a309618..aa558c197abe8 100644 --- a/system/lib/libc/musl/src/network/lookup_name.c +++ b/system/lib/libc/musl/src/network/lookup_name.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "lookup.h" #include "stdio_impl.h" #include "syscall.h" @@ -49,7 +50,7 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati { char line[512]; size_t l = strlen(name); - int cnt = 0, badfam = 0; + int cnt = 0, badfam = 0, have_canon = 0; unsigned char _buf[1032]; FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf); if (!f) switch (errno) { @@ -79,14 +80,19 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati continue; default: badfam = EAI_NONAME; - continue; + break; } + if (have_canon) continue; + /* Extract first name as canonical name */ for (; *p && isspace(*p); p++); for (z=p; *z && !isspace(*z); z++); *z = 0; - if (is_valid_hostname(p)) memcpy(canon, p, z-p+1); + if (is_valid_hostname(p)) { + have_canon = 1; + memcpy(canon, p, z-p+1); + } } __fclose_ca(f); return cnt ? cnt : badfam; @@ -98,11 +104,6 @@ struct dpc_ctx { int cnt; }; -int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *); -int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int); -int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int); -int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *); - #define RR_A 1 #define RR_CNAME 5 #define RR_AAAA 28 @@ -111,6 +112,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const { char tmp[256]; struct dpc_ctx *ctx = c; + if (ctx->cnt >= MAXADDRS) return -1; switch (rr) { case RR_A: if (len != 4) return -1; @@ -152,6 +154,7 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static 0, 0, 0, qbuf[nq], sizeof *qbuf); if (qlens[nq] == -1) return EAI_NONAME; + qbuf[nq][3] = 0; /* don't need AD flag */ nq++; } } @@ -159,14 +162,17 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0) return EAI_SYSTEM; + for (i=0; i= conf.ndots || name[l-1]=='.') *search = 0; + /* Strip final dot for canon, fail if multiple trailing dots. */ + if (name[l-1]=='.') l--; + if (!l || name[l-1]=='.') return EAI_NONAME; + /* This can never happen; the caller already checked length. */ if (l >= 256) return EAI_NONAME; @@ -338,8 +348,8 @@ int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], c /* No further processing is needed if there are fewer than 2 * results or if there are only IPv4 results. */ if (cnt<2 || family==AF_INET) return cnt; - for (i=0; buf[i].family == AF_INET; i++) - if (i==cnt) return cnt; + for (i=0; ilabel; int dprec = dpolicy->prec; int prefixlen = 0; - int fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP); + int fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP); if (fd >= 0) { - if (!connect(fd, (void *)&da, sizeof da)) { + if (!connect(fd, da, dalen)) { key |= DAS_USABLE; - if (!getsockname(fd, (void *)&sa, - &(socklen_t){sizeof sa})) { - if (dscope == scopeof(&sa.sin6_addr)) + if (!getsockname(fd, sa, &salen)) { + if (family == AF_INET) memcpy( + sa6.sin6_addr.s6_addr+12, + &sa4.sin_addr, 4); + if (dscope == scopeof(&sa6.sin6_addr)) key |= DAS_MATCHINGSCOPE; - if (dlabel == labelof(&sa.sin6_addr)) + if (dlabel == labelof(&sa6.sin6_addr)) key |= DAS_MATCHINGLABEL; - prefixlen = prefixmatch(&sa.sin6_addr, - &da.sin6_addr); + prefixlen = prefixmatch(&sa6.sin6_addr, + &da6.sin6_addr); } } close(fd); diff --git a/system/lib/libc/musl/src/network/lookup_serv.c b/system/lib/libc/musl/src/network/lookup_serv.c index 66ebaea25a3fb..ae38277851327 100644 --- a/system/lib/libc/musl/src/network/lookup_serv.c +++ b/system/lib/libc/musl/src/network/lookup_serv.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include "lookup.h" @@ -64,7 +65,7 @@ int __lookup_serv(struct service buf[static MAXSERVS], const char *name, int pro return cnt; } - if (flags & AI_NUMERICSERV) return EAI_SERVICE; + if (flags & AI_NUMERICSERV) return EAI_NONAME; size_t l = strlen(name); diff --git a/system/lib/libc/musl/src/network/netlink.h b/system/lib/libc/musl/src/network/netlink.h index 20700ac5b4f03..38acb178928d3 100644 --- a/system/lib/libc/musl/src/network/netlink.h +++ b/system/lib/libc/musl/src/network/netlink.h @@ -91,4 +91,4 @@ struct ifaddrmsg { #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh)) -int __rtnetlink_enumerate(int link_af, int addr_af, int (*cb)(void *ctx, struct nlmsghdr *h), void *ctx); +hidden int __rtnetlink_enumerate(int link_af, int addr_af, int (*cb)(void *ctx, struct nlmsghdr *h), void *ctx); diff --git a/system/lib/libc/musl/src/network/recvfrom.c b/system/lib/libc/musl/src/network/recvfrom.c index 436f3447cfb87..61911663e0868 100644 --- a/system/lib/libc/musl/src/network/recvfrom.c +++ b/system/lib/libc/musl/src/network/recvfrom.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t recvfrom(int fd, void *restrict buf, size_t len, int flags, struct sockaddr *restrict addr, socklen_t *restrict alen) { diff --git a/system/lib/libc/musl/src/network/recvmmsg.c b/system/lib/libc/musl/src/network/recvmmsg.c index d8a4df5d228e2..7ef9ad1894ec6 100644 --- a/system/lib/libc/musl/src/network/recvmmsg.c +++ b/system/lib/libc/musl/src/network/recvmmsg.c @@ -1,8 +1,15 @@ #define _GNU_SOURCE #include #include +#include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +hidden void __convert_scm_timestamps(struct msghdr *, socklen_t); + int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout) { #if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__) @@ -11,5 +18,22 @@ int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int fla for (i = vlen; i; i--, mh++) mh->msg_hdr.__pad1 = mh->msg_hdr.__pad2 = 0; #endif +#ifdef SYS_recvmmsg_time64 + time_t s = timeout ? timeout->tv_sec : 0; + long ns = timeout ? timeout->tv_nsec : 0; + int r = __syscall_cp(SYS_recvmmsg_time64, fd, msgvec, vlen, flags, + timeout ? ((long long[]){s, ns}) : 0); + if (SYS_recvmmsg == SYS_recvmmsg_time64 || r!=-ENOSYS) + return __syscall_ret(r); + if (vlen > IOV_MAX) vlen = IOV_MAX; + socklen_t csize[vlen]; + for (int i=0; i #include +#include +#include +#include #include "syscall.h" -#include "libc.h" + +hidden void __convert_scm_timestamps(struct msghdr *, socklen_t); + +void __convert_scm_timestamps(struct msghdr *msg, socklen_t csize) +{ + if (SCM_TIMESTAMP == SCM_TIMESTAMP_OLD) return; + if (!msg->msg_control || !msg->msg_controllen) return; + + struct cmsghdr *cmsg, *last=0; + long tmp; + long long tvts[2]; + int type = 0; + + for (cmsg=CMSG_FIRSTHDR(msg); cmsg; cmsg=CMSG_NXTHDR(msg, cmsg)) { + if (cmsg->cmsg_level==SOL_SOCKET) switch (cmsg->cmsg_type) { + case SCM_TIMESTAMP_OLD: + if (type) break; + type = SCM_TIMESTAMP; + goto common; + case SCM_TIMESTAMPNS_OLD: + type = SCM_TIMESTAMPNS; + common: + memcpy(&tmp, CMSG_DATA(cmsg), sizeof tmp); + tvts[0] = tmp; + memcpy(&tmp, CMSG_DATA(cmsg) + sizeof tmp, sizeof tmp); + tvts[1] = tmp; + break; + } + last = cmsg; + } + if (!last || !type) return; + if (CMSG_SPACE(sizeof tvts) > csize-msg->msg_controllen) { + msg->msg_flags |= MSG_CTRUNC; + return; + } + msg->msg_controllen += CMSG_SPACE(sizeof tvts); + cmsg = CMSG_NXTHDR(msg, last); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = type; + cmsg->cmsg_len = CMSG_LEN(sizeof tvts); + memcpy(CMSG_DATA(cmsg), &tvts, sizeof tvts); +} ssize_t recvmsg(int fd, struct msghdr *msg, int flags) { ssize_t r; + socklen_t orig_controllen = msg->msg_controllen; #if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__) struct msghdr h, *orig = msg; if (msg) { @@ -15,6 +60,7 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags) } #endif r = socketcall_cp(recvmsg, fd, msg, flags, 0, 0, 0); + if (r >= 0) __convert_scm_timestamps(msg, orig_controllen); #if LONG_MAX > INT_MAX && !defined(__EMSCRIPTEN__) if (orig) *orig = h; #endif diff --git a/system/lib/libc/musl/src/network/res_mkquery.c b/system/lib/libc/musl/src/network/res_mkquery.c index ec4568acb8166..33f50cb9339ac 100644 --- a/system/lib/libc/musl/src/network/res_mkquery.c +++ b/system/lib/libc/musl/src/network/res_mkquery.c @@ -1,7 +1,6 @@ #include #include #include -#include "libc.h" int __res_mkquery(int op, const char *dname, int class, int type, const unsigned char *data, int datalen, @@ -21,6 +20,7 @@ int __res_mkquery(int op, const char *dname, int class, int type, /* Construct query template - ID will be filled later */ memset(q, 0, n); q[2] = op*8 + 1; + q[3] = 32; /* AD */ q[5] = 1; memcpy((char *)q+13, dname, l); for (i=13; q[i]; i=j+1) { diff --git a/system/lib/libc/musl/src/network/res_msend.c b/system/lib/libc/musl/src/network/res_msend.c index fd3431f16a3db..ab11fc270408c 100644 --- a/system/lib/libc/musl/src/network/res_msend.c +++ b/system/lib/libc/musl/src/network/res_msend.c @@ -80,7 +80,11 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries, fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); family = AF_INET; } - if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) return -1; + if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) { + if (fd >= 0) close(fd); + pthread_setcancelstate(cs, 0); + return -1; + } /* Past this point, there are no errors. Each individual query will * yield either no reply (indicated by zero length) or an answer diff --git a/system/lib/libc/musl/src/network/res_query.c b/system/lib/libc/musl/src/network/res_query.c index 2b4e4bb1bef80..506dc231266d9 100644 --- a/system/lib/libc/musl/src/network/res_query.c +++ b/system/lib/libc/musl/src/network/res_query.c @@ -1,17 +1,26 @@ +#define _BSD_SOURCE #include #include -#include "libc.h" -int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int); -int __res_send(const unsigned char *, int, unsigned char *, int); - -int __res_query(const char *name, int class, int type, unsigned char *dest, int len) +int res_query(const char *name, int class, int type, unsigned char *dest, int len) { unsigned char q[280]; int ql = __res_mkquery(0, name, class, type, 0, 0, 0, q, sizeof q); if (ql < 0) return ql; - return __res_send(q, ql, dest, len); + int r = __res_send(q, ql, dest, len); + if (r<12) { + h_errno = TRY_AGAIN; + return -1; + } + if ((dest[3] & 15) == 3) { + h_errno = HOST_NOT_FOUND; + return -1; + } + if ((dest[3] & 15) == 0 && !dest[6] && !dest[7]) { + h_errno = NO_DATA; + return -1; + } + return r; } -weak_alias(__res_query, res_query); -weak_alias(__res_query, res_search); +weak_alias(res_query, res_search); diff --git a/system/lib/libc/musl/src/network/res_send.c b/system/lib/libc/musl/src/network/res_send.c index 19cfe0f6b4050..ee4abf1f1ade6 100644 --- a/system/lib/libc/musl/src/network/res_send.c +++ b/system/lib/libc/musl/src/network/res_send.c @@ -1,12 +1,9 @@ #include -#include "libc.h" - -int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int); int __res_send(const unsigned char *msg, int msglen, unsigned char *answer, int anslen) { int r = __res_msend(1, &msg, &msglen, &answer, &anslen, anslen); - return r<0 ? r : anslen; + return r<0 || !anslen ? -1 : anslen; } weak_alias(__res_send, res_send); diff --git a/system/lib/libc/musl/src/network/resolvconf.c b/system/lib/libc/musl/src/network/resolvconf.c index 2cf1f47542ab5..ceabf0808450b 100644 --- a/system/lib/libc/musl/src/network/resolvconf.c +++ b/system/lib/libc/musl/src/network/resolvconf.c @@ -3,6 +3,7 @@ #include #include #include +#include #include int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) @@ -45,8 +46,8 @@ int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) if (z != p) conf->ndots = x > 15 ? 15 : x; } p = strstr(line, "attempts:"); - if (p && isdigit(p[6])) { - p += 6; + if (p && isdigit(p[9])) { + p += 9; unsigned long x = strtoul(p, &z, 10); if (z != p) conf->attempts = x > 10 ? 10 : x; } diff --git a/system/lib/libc/musl/src/network/sendmsg.c b/system/lib/libc/musl/src/network/sendmsg.c index afd12c693c674..1cfc5af5161c2 100644 --- a/system/lib/libc/musl/src/network/sendmsg.c +++ b/system/lib/libc/musl/src/network/sendmsg.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" ssize_t sendmsg(int fd, const struct msghdr *msg, int flags) { diff --git a/system/lib/libc/musl/src/network/sendto.c b/system/lib/libc/musl/src/network/sendto.c index 899eecff57bef..c598797c72b6c 100644 --- a/system/lib/libc/musl/src/network/sendto.c +++ b/system/lib/libc/musl/src/network/sendto.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t sendto(int fd, const void *buf, size_t len, int flags, const struct sockaddr *addr, socklen_t alen) { diff --git a/system/lib/libc/musl/src/network/setsockopt.c b/system/lib/libc/musl/src/network/setsockopt.c index c960c9ca7de97..612a1947a1f61 100644 --- a/system/lib/libc/musl/src/network/setsockopt.c +++ b/system/lib/libc/musl/src/network/setsockopt.c @@ -1,7 +1,46 @@ #include +#include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + int setsockopt(int fd, int level, int optname, const void *optval, socklen_t optlen) { - return socketcall(setsockopt, fd, level, optname, optval, optlen, 0); + const struct timeval *tv; + time_t s; + suseconds_t us; + + int r = __socketcall(setsockopt, fd, level, optname, optval, optlen, 0); + + if (r==-ENOPROTOOPT) switch (level) { + case SOL_SOCKET: + switch (optname) { + case SO_RCVTIMEO: + case SO_SNDTIMEO: + if (SO_RCVTIMEO == SO_RCVTIMEO_OLD) break; + if (optlen < sizeof *tv) return __syscall_ret(-EINVAL); + tv = optval; + s = tv->tv_sec; + us = tv->tv_usec; + if (!IS32BIT(s)) return __syscall_ret(-ENOTSUP); + + if (optname==SO_RCVTIMEO) optname=SO_RCVTIMEO_OLD; + if (optname==SO_SNDTIMEO) optname=SO_SNDTIMEO_OLD; + + r = __socketcall(setsockopt, fd, level, optname, + ((long[]){s, CLAMP(us)}), 2*sizeof(long), 0); + break; + case SO_TIMESTAMP: + case SO_TIMESTAMPNS: + if (SO_TIMESTAMP == SO_TIMESTAMP_OLD) break; + if (optname==SO_TIMESTAMP) optname=SO_TIMESTAMP_OLD; + if (optname==SO_TIMESTAMPNS) optname=SO_TIMESTAMPNS_OLD; + r = __socketcall(setsockopt, fd, level, + optname, optval, optlen, 0); + break; + } + } + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/network/socket.c b/system/lib/libc/musl/src/network/socket.c index a2e92d9082656..afa1a7f3e7825 100644 --- a/system/lib/libc/musl/src/network/socket.c +++ b/system/lib/libc/musl/src/network/socket.c @@ -5,17 +5,17 @@ int socket(int domain, int type, int protocol) { - int s = socketcall(socket, domain, type, protocol, 0, 0, 0); - if (s<0 && (errno==EINVAL || errno==EPROTONOSUPPORT) + int s = __socketcall(socket, domain, type, protocol, 0, 0, 0); + if ((s==-EINVAL || s==-EPROTONOSUPPORT) && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) { - s = socketcall(socket, domain, + s = __socketcall(socket, domain, type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK), protocol, 0, 0, 0); - if (s < 0) return s; + if (s < 0) return __syscall_ret(s); if (type & SOCK_CLOEXEC) __syscall(SYS_fcntl, s, F_SETFD, FD_CLOEXEC); if (type & SOCK_NONBLOCK) __syscall(SYS_fcntl, s, F_SETFL, O_NONBLOCK); } - return s; + return __syscall_ret(s); } diff --git a/system/lib/libc/musl/src/passwd/getgr_r.c b/system/lib/libc/musl/src/passwd/getgr_r.c index 7246e8a42d387..f3e8f603a3283 100644 --- a/system/lib/libc/musl/src/passwd/getgr_r.c +++ b/system/lib/libc/musl/src/passwd/getgr_r.c @@ -34,6 +34,7 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz free(mem); free(line); pthread_setcancelstate(cs, 0); + if (rv) errno = rv; return rv; } diff --git a/system/lib/libc/musl/src/passwd/getgrouplist.c b/system/lib/libc/musl/src/passwd/getgrouplist.c index 43e518245f8e6..301824cec5ac1 100644 --- a/system/lib/libc/musl/src/passwd/getgrouplist.c +++ b/system/lib/libc/musl/src/passwd/getgrouplist.c @@ -31,7 +31,8 @@ int getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups) if (resp[INITGRFOUND]) { nscdbuf = calloc(resp[INITGRNGRPS], sizeof(uint32_t)); if (!nscdbuf) goto cleanup; - if (!fread(nscdbuf, sizeof(*nscdbuf)*resp[INITGRNGRPS], 1, f)) { + size_t nbytes = sizeof(*nscdbuf)*resp[INITGRNGRPS]; + if (nbytes && !fread(nscdbuf, nbytes, 1, f)) { if (!ferror(f)) errno = EIO; goto cleanup; } diff --git a/system/lib/libc/musl/src/passwd/getpw_r.c b/system/lib/libc/musl/src/passwd/getpw_r.c index e8cc811e4d898..0c87ab05d2700 100644 --- a/system/lib/libc/musl/src/passwd/getpw_r.c +++ b/system/lib/libc/musl/src/passwd/getpw_r.c @@ -27,6 +27,7 @@ static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, si } free(line); pthread_setcancelstate(cs, 0); + if (rv) errno = rv; return rv; } diff --git a/system/lib/libc/musl/src/passwd/getspnam.c b/system/lib/libc/musl/src/passwd/getspnam.c index 041f896525f1e..709b526dc503a 100644 --- a/system/lib/libc/musl/src/passwd/getspnam.c +++ b/system/lib/libc/musl/src/passwd/getspnam.c @@ -8,10 +8,11 @@ struct spwd *getspnam(const char *name) static char *line; struct spwd *res; int e; + int orig_errno = errno; if (!line) line = malloc(LINE_LIM); if (!line) return 0; e = getspnam_r(name, &sp, line, LINE_LIM, &res); - if (e) errno = e; + errno = e ? e : orig_errno; return res; } diff --git a/system/lib/libc/musl/src/passwd/getspnam_r.c b/system/lib/libc/musl/src/passwd/getspnam_r.c index 92339528ad170..541e85314d56c 100644 --- a/system/lib/libc/musl/src/passwd/getspnam_r.c +++ b/system/lib/libc/musl/src/passwd/getspnam_r.c @@ -67,19 +67,21 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct size_t k, l = strlen(name); int skip = 0; int cs; + int orig_errno = errno; *res = 0; /* Disallow potentially-malicious user names */ if (*name=='.' || strchr(name, '/') || !l) - return EINVAL; + return errno = EINVAL; /* Buffer size must at least be able to hold name, plus some.. */ - if (size < l+100) return ERANGE; + if (size < l+100) + return errno = ERANGE; /* Protect against truncation */ if (snprintf(path, sizeof path, "/etc/tcb/%s/shadow", name) >= sizeof path) - return EINVAL; + return errno = EINVAL; fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC); if (fd >= 0) { @@ -92,8 +94,14 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct return errno; } } else { + if (errno != ENOENT && errno != ENOTDIR) + return errno; f = fopen("/etc/shadow", "rbe"); - if (!f) return errno; + if (!f) { + if (errno != ENOENT && errno != ENOTDIR) + return errno; + return 0; + } } pthread_cleanup_push(cleanup, f); @@ -112,5 +120,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct break; } pthread_cleanup_pop(1); + errno = rv ? rv : orig_errno; return rv; } diff --git a/system/lib/libc/musl/src/passwd/nscd.h b/system/lib/libc/musl/src/passwd/nscd.h index 9a53c3283338d..ae5aa8d5dbfa2 100644 --- a/system/lib/libc/musl/src/passwd/nscd.h +++ b/system/lib/libc/musl/src/passwd/nscd.h @@ -39,6 +39,6 @@ #define INITGRNGRPS 2 #define INITGR_LEN 3 -FILE *__nscd_query(int32_t req, const char *key, int32_t *buf, size_t len, int *swap); +hidden FILE *__nscd_query(int32_t req, const char *key, int32_t *buf, size_t len, int *swap); #endif diff --git a/system/lib/libc/musl/src/passwd/putgrent.c b/system/lib/libc/musl/src/passwd/putgrent.c index a0b320fc32692..2a8257dc9c2df 100644 --- a/system/lib/libc/musl/src/passwd/putgrent.c +++ b/system/lib/libc/musl/src/passwd/putgrent.c @@ -7,7 +7,7 @@ int putgrent(const struct group *gr, FILE *f) int r; size_t i; flockfile(f); - if ((r = fprintf(f, "%s:%s:%d:", gr->gr_name, gr->gr_passwd, gr->gr_gid))<0) goto done; + if ((r = fprintf(f, "%s:%s:%u:", gr->gr_name, gr->gr_passwd, gr->gr_gid))<0) goto done; if (gr->gr_mem) for (i=0; gr->gr_mem[i]; i++) if ((r = fprintf(f, "%s%s", i?",":"", gr->gr_mem[i]))<0) goto done; r = fputc('\n', f); diff --git a/system/lib/libc/musl/src/passwd/putpwent.c b/system/lib/libc/musl/src/passwd/putpwent.c index 3a02e57304820..312b76530254d 100644 --- a/system/lib/libc/musl/src/passwd/putpwent.c +++ b/system/lib/libc/musl/src/passwd/putpwent.c @@ -4,7 +4,7 @@ int putpwent(const struct passwd *pw, FILE *f) { - return fprintf(f, "%s:%s:%d:%d:%s:%s:%s\n", + return fprintf(f, "%s:%s:%u:%u:%s:%s:%s\n", pw->pw_name, pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_gecos, pw->pw_dir, pw->pw_shell)<0 ? -1 : 0; } diff --git a/system/lib/libc/musl/src/passwd/pwf.h b/system/lib/libc/musl/src/passwd/pwf.h index fc63db21a2cd8..95bb6e0534c1a 100644 --- a/system/lib/libc/musl/src/passwd/pwf.h +++ b/system/lib/libc/musl/src/passwd/pwf.h @@ -4,12 +4,12 @@ #include #include #include +#include #include #include -#include "libc.h" -int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct passwd **res); -int __getpw_a(const char *name, uid_t uid, struct passwd *pw, char **buf, size_t *size, struct passwd **res); -int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem, struct group **res); -int __getgr_a(const char *name, gid_t gid, struct group *gr, char **buf, size_t *size, char ***mem, size_t *nmem, struct group **res); -int __parsespent(char *s, struct spwd *sp); +hidden int __getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size, struct passwd **res); +hidden int __getpw_a(const char *name, uid_t uid, struct passwd *pw, char **buf, size_t *size, struct passwd **res); +hidden int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem, struct group **res); +hidden int __getgr_a(const char *name, gid_t gid, struct group *gr, char **buf, size_t *size, char ***mem, size_t *nmem, struct group **res); +hidden int __parsespent(char *s, struct spwd *sp); diff --git a/system/lib/libc/musl/src/prng/__rand48_step.c b/system/lib/libc/musl/src/prng/__rand48_step.c index 961d30fc9161e..94703d0738d24 100644 --- a/system/lib/libc/musl/src/prng/__rand48_step.c +++ b/system/lib/libc/musl/src/prng/__rand48_step.c @@ -1,4 +1,5 @@ #include +#include "rand48.h" uint64_t __rand48_step(unsigned short *xi, unsigned short *lc) { diff --git a/system/lib/libc/musl/src/prng/__seed48.c b/system/lib/libc/musl/src/prng/__seed48.c index 05a4539e4ee31..e436b4d302bfe 100644 --- a/system/lib/libc/musl/src/prng/__seed48.c +++ b/system/lib/libc/musl/src/prng/__seed48.c @@ -1 +1,3 @@ +#include "rand48.h" + unsigned short __seed48[7] = { 0, 0, 0, 0xe66d, 0xdeec, 0x5, 0xb }; diff --git a/system/lib/libc/musl/src/prng/drand48.c b/system/lib/libc/musl/src/prng/drand48.c index d808353c9872e..08283e240b14f 100644 --- a/system/lib/libc/musl/src/prng/drand48.c +++ b/system/lib/libc/musl/src/prng/drand48.c @@ -1,8 +1,6 @@ #include #include - -uint64_t __rand48_step(unsigned short *xi, unsigned short *lc); -extern unsigned short __seed48[7]; +#include "rand48.h" double erand48(unsigned short s[3]) { diff --git a/system/lib/libc/musl/src/prng/lcong48.c b/system/lib/libc/musl/src/prng/lcong48.c index 32b27d423aa1d..030e51484463b 100644 --- a/system/lib/libc/musl/src/prng/lcong48.c +++ b/system/lib/libc/musl/src/prng/lcong48.c @@ -1,7 +1,6 @@ #include #include - -extern unsigned short __seed48[7]; +#include "rand48.h" void lcong48(unsigned short p[7]) { diff --git a/system/lib/libc/musl/src/prng/lrand48.c b/system/lib/libc/musl/src/prng/lrand48.c index a3c4e4e2b2bb0..07e2b78440f13 100644 --- a/system/lib/libc/musl/src/prng/lrand48.c +++ b/system/lib/libc/musl/src/prng/lrand48.c @@ -1,8 +1,6 @@ #include #include - -uint64_t __rand48_step(unsigned short *xi, unsigned short *lc); -extern unsigned short __seed48[7]; +#include "rand48.h" long nrand48(unsigned short s[3]) { diff --git a/system/lib/libc/musl/src/prng/mrand48.c b/system/lib/libc/musl/src/prng/mrand48.c index ee650fc3e6a9f..f4a56e61b2e65 100644 --- a/system/lib/libc/musl/src/prng/mrand48.c +++ b/system/lib/libc/musl/src/prng/mrand48.c @@ -1,12 +1,10 @@ #include #include - -uint64_t __rand48_step(unsigned short *xi, unsigned short *lc); -extern unsigned short __seed48[7]; +#include "rand48.h" long jrand48(unsigned short s[3]) { - return __rand48_step(s, __seed48+3) >> 16; + return (int32_t)(__rand48_step(s, __seed48+3) >> 16); } long mrand48(void) diff --git a/system/lib/libc/musl/src/prng/rand48.h b/system/lib/libc/musl/src/prng/rand48.h new file mode 100644 index 0000000000000..55cbec1c60bc6 --- /dev/null +++ b/system/lib/libc/musl/src/prng/rand48.h @@ -0,0 +1,5 @@ +#include +#include + +hidden uint64_t __rand48_step(unsigned short *xi, unsigned short *lc); +extern hidden unsigned short __seed48[7]; diff --git a/system/lib/libc/musl/src/prng/random.c b/system/lib/libc/musl/src/prng/random.c index 7d557d700de02..d3780fa7eac3b 100644 --- a/system/lib/libc/musl/src/prng/random.c +++ b/system/lib/libc/musl/src/prng/random.c @@ -1,6 +1,7 @@ #include #include -#include "libc.h" +#include "lock.h" +#include "fork_impl.h" /* this code uses the same lagged fibonacci generator as the @@ -22,7 +23,8 @@ static int n = 31; static int i = 3; static int j = 0; static uint32_t *x = init+1; -static volatile int lock[2]; +static volatile int lock[1]; +volatile int *const __random_lockptr = lock; static uint32_t lcg31(uint32_t x) { return (1103515245*x + 12345) & 0x7fffffff; diff --git a/system/lib/libc/musl/src/prng/seed48.c b/system/lib/libc/musl/src/prng/seed48.c index e0699c092afd6..bce7b339fea01 100644 --- a/system/lib/libc/musl/src/prng/seed48.c +++ b/system/lib/libc/musl/src/prng/seed48.c @@ -1,7 +1,6 @@ #include #include - -extern unsigned short __seed48[7]; +#include "rand48.h" unsigned short *seed48(unsigned short *s) { diff --git a/system/lib/libc/musl/src/process/_Fork.c b/system/lib/libc/musl/src/process/_Fork.c new file mode 100644 index 0000000000000..da063868150bc --- /dev/null +++ b/system/lib/libc/musl/src/process/_Fork.c @@ -0,0 +1,38 @@ +#include +#include +#include "syscall.h" +#include "libc.h" +#include "lock.h" +#include "pthread_impl.h" +#include "aio_impl.h" + +static void dummy(int x) { } +weak_alias(dummy, __aio_atfork); + +pid_t _Fork(void) +{ + pid_t ret; + sigset_t set; + __block_all_sigs(&set); + __aio_atfork(-1); + LOCK(__abort_lock); +#ifdef SYS_fork + ret = __syscall(SYS_fork); +#else + ret = __syscall(SYS_clone, SIGCHLD, 0); +#endif + if (!ret) { + pthread_t self = __pthread_self(); + self->tid = __syscall(SYS_gettid); + self->robust_list.off = 0; + self->robust_list.pending = 0; + self->next = self->prev = self; + __thread_list_lock = 0; + libc.threads_minus_1 = 0; + if (libc.need_locks) libc.need_locks = -1; + } + UNLOCK(__abort_lock); + __aio_atfork(!ret); + __restore_sigs(&set); + return __syscall_ret(ret); +} diff --git a/system/lib/libc/musl/src/process/execvp.c b/system/lib/libc/musl/src/process/execvp.c index 3a8bbe83295ab..ef3b9dd598fc5 100644 --- a/system/lib/libc/musl/src/process/execvp.c +++ b/system/lib/libc/musl/src/process/execvp.c @@ -3,7 +3,6 @@ #include #include #include -#include "libc.h" extern char **__environ; @@ -29,8 +28,7 @@ int __execvpe(const char *file, char *const argv[], char *const envp[]) for(p=path; ; p=z) { char b[l+k+1]; - z = strchr(p, ':'); - if (!z) z = p+strlen(p); + z = __strchrnul(p, ':'); if (z-p >= l) { if (!*z++) break; continue; @@ -39,8 +37,15 @@ int __execvpe(const char *file, char *const argv[], char *const envp[]) b[z-p] = '/'; memcpy(b+(z-p)+(z>p), file, k+1); execve(b, argv, envp); - if (errno == EACCES) seen_eacces = 1; - else if (errno != ENOENT) return -1; + switch (errno) { + case EACCES: + seen_eacces = 1; + case ENOENT: + case ENOTDIR: + break; + default: + return -1; + } if (!*z++) break; } if (seen_eacces) errno = EACCES; diff --git a/system/lib/libc/musl/src/process/fdop.h b/system/lib/libc/musl/src/process/fdop.h index 00b875143afa6..5adf144387485 100644 --- a/system/lib/libc/musl/src/process/fdop.h +++ b/system/lib/libc/musl/src/process/fdop.h @@ -1,6 +1,8 @@ #define FDOP_CLOSE 1 #define FDOP_DUP2 2 #define FDOP_OPEN 3 +#define FDOP_CHDIR 4 +#define FDOP_FCHDIR 5 struct fdop { struct fdop *next, *prev; diff --git a/system/lib/libc/musl/src/process/fexecve.c b/system/lib/libc/musl/src/process/fexecve.c index 6507b42949c91..37fb294482093 100644 --- a/system/lib/libc/musl/src/process/fexecve.c +++ b/system/lib/libc/musl/src/process/fexecve.c @@ -1,10 +1,15 @@ +#define _GNU_SOURCE #include #include - -void __procfdname(char *, unsigned); +#include +#include "syscall.h" int fexecve(int fd, char *const argv[], char *const envp[]) { +#ifndef __EMSCRIPTEN__ + int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH); + if (r != -ENOSYS) return __syscall_ret(r); +#endif char buf[15 + 3*sizeof(int)]; __procfdname(buf, fd); execve(buf, argv, envp); diff --git a/system/lib/libc/musl/src/process/fork.c b/system/lib/libc/musl/src/process/fork.c index b96f0024f4c03..54bc289202955 100644 --- a/system/lib/libc/musl/src/process/fork.c +++ b/system/lib/libc/musl/src/process/fork.c @@ -1,35 +1,86 @@ #include -#include -#include -#include "syscall.h" +#include #include "libc.h" +#include "lock.h" #include "pthread_impl.h" +#include "fork_impl.h" -static void dummy(int x) -{ -} +static volatile int *const dummy_lockptr = 0; + +weak_alias(dummy_lockptr, __at_quick_exit_lockptr); +weak_alias(dummy_lockptr, __atexit_lockptr); +weak_alias(dummy_lockptr, __dlerror_lockptr); +weak_alias(dummy_lockptr, __gettext_lockptr); +weak_alias(dummy_lockptr, __locale_lockptr); +weak_alias(dummy_lockptr, __random_lockptr); +weak_alias(dummy_lockptr, __sem_open_lockptr); +weak_alias(dummy_lockptr, __stdio_ofl_lockptr); +weak_alias(dummy_lockptr, __syslog_lockptr); +weak_alias(dummy_lockptr, __timezone_lockptr); +weak_alias(dummy_lockptr, __bump_lockptr); + +weak_alias(dummy_lockptr, __vmlock_lockptr); +static volatile int *const *const atfork_locks[] = { + &__at_quick_exit_lockptr, + &__atexit_lockptr, + &__dlerror_lockptr, + &__gettext_lockptr, + &__locale_lockptr, + &__random_lockptr, + &__sem_open_lockptr, + &__stdio_ofl_lockptr, + &__syslog_lockptr, + &__timezone_lockptr, + &__bump_lockptr, +}; + +static void dummy(int x) { } weak_alias(dummy, __fork_handler); +weak_alias(dummy, __malloc_atfork); +weak_alias(dummy, __ldso_atfork); + +static void dummy_0(void) { } +weak_alias(dummy_0, __tl_lock); +weak_alias(dummy_0, __tl_unlock); pid_t fork(void) { - pid_t ret; sigset_t set; __fork_handler(-1); - __block_all_sigs(&set); -#ifdef SYS_fork - ret = syscall(SYS_fork); -#else - ret = syscall(SYS_clone, SIGCHLD, 0); -#endif - if (!ret) { - pthread_t self = __pthread_self(); - self->tid = __syscall(SYS_gettid); - self->robust_list.off = 0; - self->robust_list.pending = 0; - libc.threads_minus_1 = 0; + __block_app_sigs(&set); + int need_locks = libc.need_locks > 0; + if (need_locks) { + __ldso_atfork(-1); + __inhibit_ptc(); + for (int i=0; inext; + pid_t ret = _Fork(); + int errno_save = errno; + if (need_locks) { + if (!ret) { + for (pthread_t td=next; td!=self; td=td->next) + td->tid = -1; + if (__vmlock_lockptr) { + __vmlock_lockptr[0] = 0; + __vmlock_lockptr[1] = 0; + } + } + __tl_unlock(); + __malloc_atfork(!ret); + for (int i=0; i #include #include "syscall.h" +#include "lock.h" #include "pthread_impl.h" #include "fdop.h" -#include "libc.h" struct args { int p[2]; sigset_t oldmask; const char *path; - int (*exec)(const char *, char *const *, char *const *); const posix_spawn_file_actions_t *fa; const posix_spawnattr_t *restrict attr; char *const *argv, *const *envp; }; -void __get_handler_set(sigset_t *); - static int __sys_dup2(int old, int new) { #ifdef SYS_dup2 return __syscall(SYS_dup2, old, new); #else - if (old==new) { - int r = __syscall(SYS_fcntl, old, F_GETFD); - return r<0 ? r : old; - } else { - return __syscall(SYS_dup3, old, new, 0); - } + return __syscall(SYS_dup3, old, new, 0); #endif } @@ -73,6 +65,10 @@ static int child(void *args_vp) __libc_sigaction(i, &sa, 0); } + if (attr->__flags & POSIX_SPAWN_SETSID) + if ((ret=__syscall(SYS_setsid)) < 0) + goto fail; + if (attr->__flags & POSIX_SPAWN_SETPGROUP) if ((ret=__syscall(SYS_setpgid, 0, attr->__pgrp))) goto fail; @@ -105,8 +101,21 @@ static int child(void *args_vp) __syscall(SYS_close, op->fd); break; case FDOP_DUP2: - if ((ret=__sys_dup2(op->srcfd, op->fd))<0) + fd = op->srcfd; + if (fd == p) { + ret = -EBADF; goto fail; + } + if (fd != op->fd) { + if ((ret=__sys_dup2(fd, op->fd))<0) + goto fail; + } else { + ret = __syscall(SYS_fcntl, fd, F_GETFD); + ret = __syscall(SYS_fcntl, fd, F_SETFD, + ret & ~FD_CLOEXEC); + if (ret<0) + goto fail; + } break; case FDOP_OPEN: fd = __sys_open(op->path, op->oflag, op->mode); @@ -117,6 +126,14 @@ static int child(void *args_vp) __syscall(SYS_close, fd); } break; + case FDOP_CHDIR: + ret = __syscall(SYS_chdir, op->path); + if (ret<0) goto fail; + break; + case FDOP_FCHDIR: + ret = __syscall(SYS_fchdir, op->fd); + if (ret<0) goto fail; + break; } } } @@ -130,7 +147,10 @@ static int child(void *args_vp) pthread_sigmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) ? &attr->__mask : &args->oldmask, 0); - args->exec(args->path, args->argv, args->envp); + int (*exec)(const char *, char *const *, char *const *) = + attr->__fn ? (int (*)())attr->__fn : execve; + + exec(args->path, args->argv, args->envp); ret = -errno; fail: @@ -141,33 +161,39 @@ static int child(void *args_vp) } -int __posix_spawnx(pid_t *restrict res, const char *restrict path, - int (*exec)(const char *, char *const *, char *const *), +int posix_spawn(pid_t *restrict res, const char *restrict path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]) { pid_t pid; - char stack[1024]; + char stack[1024+PATH_MAX]; int ec=0, cs; struct args args; - if (pipe2(args.p, O_CLOEXEC)) - return errno; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); args.path = path; - args.exec = exec; args.fa = fa; args.attr = attr ? attr : &(const posix_spawnattr_t){0}; args.argv = argv; args.envp = envp; pthread_sigmask(SIG_BLOCK, SIGALL_SET, &args.oldmask); + /* The lock guards both against seeing a SIGABRT disposition change + * by abort and against leaking the pipe fd to fork-without-exec. */ + LOCK(__abort_lock); + + if (pipe2(args.p, O_CLOEXEC)) { + UNLOCK(__abort_lock); + ec = errno; + goto fail; + } + pid = __clone(child, stack+sizeof stack, CLONE_VM|CLONE_VFORK|SIGCHLD, &args); close(args.p[1]); + UNLOCK(__abort_lock); if (pid > 0) { if (read(args.p[0], &ec, sizeof ec) != sizeof ec) ec = 0; @@ -180,16 +206,9 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path, if (!ec && res) *res = pid; +fail: pthread_sigmask(SIG_SETMASK, &args.oldmask, 0); pthread_setcancelstate(cs, 0); return ec; } - -int posix_spawn(pid_t *restrict res, const char *restrict path, - const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *restrict attr, - char *const argv[restrict], char *const envp[restrict]) -{ - return __posix_spawnx(res, path, execve, fa, attr, argv, envp); -} diff --git a/system/lib/libc/musl/src/process/posix_spawn_file_actions_addchdir.c b/system/lib/libc/musl/src/process/posix_spawn_file_actions_addchdir.c new file mode 100644 index 0000000000000..7f2590ae4e160 --- /dev/null +++ b/system/lib/libc/musl/src/process/posix_spawn_file_actions_addchdir.c @@ -0,0 +1,18 @@ +#include +#include +#include +#include +#include "fdop.h" + +int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t *restrict fa, const char *restrict path) +{ + struct fdop *op = malloc(sizeof *op + strlen(path) + 1); + if (!op) return ENOMEM; + op->cmd = FDOP_CHDIR; + op->fd = -1; + strcpy(op->path, path); + if ((op->next = fa->__actions)) op->next->prev = op; + op->prev = 0; + fa->__actions = op; + return 0; +} diff --git a/system/lib/libc/musl/src/process/posix_spawn_file_actions_addfchdir.c b/system/lib/libc/musl/src/process/posix_spawn_file_actions_addfchdir.c new file mode 100644 index 0000000000000..436c683d25d4e --- /dev/null +++ b/system/lib/libc/musl/src/process/posix_spawn_file_actions_addfchdir.c @@ -0,0 +1,17 @@ +#include +#include +#include +#include +#include "fdop.h" + +int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *fa, int fd) +{ + struct fdop *op = malloc(sizeof *op); + if (!op) return ENOMEM; + op->cmd = FDOP_FCHDIR; + op->fd = fd; + if ((op->next = fa->__actions)) op->next->prev = op; + op->prev = 0; + fa->__actions = op; + return 0; +} diff --git a/system/lib/libc/musl/src/process/posix_spawnattr_setflags.c b/system/lib/libc/musl/src/process/posix_spawnattr_setflags.c index f750c040bcaf6..6878099212426 100644 --- a/system/lib/libc/musl/src/process/posix_spawnattr_setflags.c +++ b/system/lib/libc/musl/src/process/posix_spawnattr_setflags.c @@ -1,7 +1,18 @@ #include +#include int posix_spawnattr_setflags(posix_spawnattr_t *attr, short flags) { + const unsigned all_flags = + POSIX_SPAWN_RESETIDS | + POSIX_SPAWN_SETPGROUP | + POSIX_SPAWN_SETSIGDEF | + POSIX_SPAWN_SETSIGMASK | + POSIX_SPAWN_SETSCHEDPARAM | + POSIX_SPAWN_SETSCHEDULER | + POSIX_SPAWN_USEVFORK | + POSIX_SPAWN_SETSID; + if (flags & ~all_flags) return EINVAL; attr->__flags = flags; return 0; } diff --git a/system/lib/libc/musl/src/process/posix_spawnp.c b/system/lib/libc/musl/src/process/posix_spawnp.c index 37360001d24bd..aad6133b91928 100644 --- a/system/lib/libc/musl/src/process/posix_spawnp.c +++ b/system/lib/libc/musl/src/process/posix_spawnp.c @@ -1,17 +1,13 @@ #include #include -int __execvpe(const char *, char *const *, char *const *); - -int __posix_spawnx(pid_t *restrict, const char *restrict, - int (*)(const char *, char *const *, char *const *), - const posix_spawn_file_actions_t *, - const posix_spawnattr_t *restrict, char *const *restrict, char *const *restrict); - int posix_spawnp(pid_t *restrict res, const char *restrict file, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]) { - return __posix_spawnx(res, file, __execvpe, fa, attr, argv, envp); + posix_spawnattr_t spawnp_attr = { 0 }; + if (attr) spawnp_attr = *attr; + spawnp_attr.__fn = (void *)__execvpe; + return posix_spawn(res, file, fa, &spawnp_attr, argv, envp); } diff --git a/system/lib/libc/musl/src/process/system.c b/system/lib/libc/musl/src/process/system.c index 8cbdda060d027..5af59b809f18d 100644 --- a/system/lib/libc/musl/src/process/system.c +++ b/system/lib/libc/musl/src/process/system.c @@ -5,7 +5,6 @@ #include #include #include "pthread_impl.h" -#include "libc.h" extern char **__environ; @@ -14,7 +13,7 @@ int system(const char *cmd) pid_t pid; sigset_t old, reset; struct sigaction sa = { .sa_handler = SIG_IGN }, oldint, oldquit; - int status = 0x7f00, ret; + int status = -1, ret; posix_spawnattr_t attr; pthread_testcancel(); diff --git a/system/lib/libc/musl/src/process/vfork.c b/system/lib/libc/musl/src/process/vfork.c index ac954651b7016..d430c13fca36b 100644 --- a/system/lib/libc/musl/src/process/vfork.c +++ b/system/lib/libc/musl/src/process/vfork.c @@ -2,9 +2,8 @@ #include #include #include "syscall.h" -#include "libc.h" -pid_t __vfork(void) +pid_t vfork(void) { /* vfork syscall cannot be made from C code */ #ifdef SYS_fork @@ -13,5 +12,3 @@ pid_t __vfork(void) return syscall(SYS_clone, SIGCHLD, 0); #endif } - -weak_alias(__vfork, vfork); diff --git a/system/lib/libc/musl/src/process/waitid.c b/system/lib/libc/musl/src/process/waitid.c index c67feac3836fc..d688650d85559 100644 --- a/system/lib/libc/musl/src/process/waitid.c +++ b/system/lib/libc/musl/src/process/waitid.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int waitid(idtype_t type, id_t id, siginfo_t *info, int options) { diff --git a/system/lib/libc/musl/src/process/waitpid.c b/system/lib/libc/musl/src/process/waitpid.c index f75e31ef24674..1b65bf0512383 100644 --- a/system/lib/libc/musl/src/process/waitpid.c +++ b/system/lib/libc/musl/src/process/waitpid.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" pid_t waitpid(pid_t pid, int *status, int options) { diff --git a/system/lib/libc/musl/src/regex/glob.c b/system/lib/libc/musl/src/regex/glob.c index 6affee040c310..9de080ed9ccd7 100644 --- a/system/lib/libc/musl/src/regex/glob.c +++ b/system/lib/libc/musl/src/regex/glob.c @@ -1,3 +1,4 @@ +#define _BSD_SOURCE #include #include #include @@ -7,131 +8,167 @@ #include #include #include -#include "libc.h" +#include +#include struct match { struct match *next; - char name[1]; + char name[]; }; -static int is_literal(const char *p, int useesc) -{ - int bracket = 0; - for (; *p; p++) { - switch (*p) { - case '\\': - if (!useesc) break; - case '?': - case '*': - return 0; - case '[': - bracket = 1; - break; - case ']': - if (bracket) return 0; - break; - } - } - return 1; -} - static int append(struct match **tail, const char *name, size_t len, int mark) { - struct match *new = malloc(sizeof(struct match) + len + 1); + struct match *new = malloc(sizeof(struct match) + len + 2); if (!new) return -1; (*tail)->next = new; new->next = NULL; - strcpy(new->name, name); - if (mark) strcat(new->name, "/"); + memcpy(new->name, name, len+1); + if (mark && len && name[len-1]!='/') { + new->name[len] = '/'; + new->name[len+1] = 0; + } *tail = new; return 0; } -static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail) +static int do_glob(char *buf, size_t pos, int type, char *pat, int flags, int (*errfunc)(const char *path, int err), struct match **tail) { - DIR *dir; - struct dirent de_buf, *de; - char pat[strlen(p)+1]; - char *p2; - size_t l = strlen(d); - int literal; - int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) - | ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0); - int error; - - if ((p2 = strchr(p, '/'))) { - strcpy(pat, p); - pat[p2-p] = 0; - for (; *p2 == '/'; p2++); - p = pat; - } - literal = is_literal(p, !(flags & GLOB_NOESCAPE)); - if (*d == '/' && !*(d+1)) l = 0; + /* If GLOB_MARK is unused, we don't care about type. */ + if (!type && !(flags & GLOB_MARK)) type = DT_REG; - /* rely on opendir failing for nondirectory objects */ - dir = opendir(*d ? d : "."); - error = errno; - if (!dir) { - /* this is not an error -- we let opendir call stat for us */ - if (error == ENOTDIR) return 0; - if (error == EACCES && !*p) { - struct stat st; - if (!stat(d, &st) && S_ISDIR(st.st_mode)) { - if (append(tail, d, l, l)) - return GLOB_NOSPACE; - return 0; - } + /* Special-case the remaining pattern being all slashes, in + * which case we can use caller-passed type if it's a dir. */ + if (*pat && type!=DT_DIR) type = 0; + while (pos+1 < PATH_MAX && *pat=='/') buf[pos++] = *pat++; + + /* Consume maximal [escaped-]literal prefix of pattern, copying + * and un-escaping it to the running buffer as we go. */ + ptrdiff_t i=0, j=0; + int in_bracket = 0, overflow = 0; + for (; pat[i]!='*' && pat[i]!='?' && (!in_bracket || pat[i]!=']'); i++) { + if (!pat[i]) { + if (overflow) return 0; + pat += i; + pos += j; + i = j = 0; + break; + } else if (pat[i] == '[') { + in_bracket = 1; + } else if (pat[i] == '\\' && !(flags & GLOB_NOESCAPE)) { + /* Backslashes inside a bracket are (at least by + * our interpretation) non-special, so if next + * char is ']' we have a complete expression. */ + if (in_bracket && pat[i+1]==']') break; + /* Unpaired final backslash never matches. */ + if (!pat[i+1]) return 0; + i++; } - if (errfunc(d, error) || (flags & GLOB_ERR)) - return GLOB_ABORTED; + if (pat[i] == '/') { + if (overflow) return 0; + in_bracket = 0; + pat += i+1; + i = -1; + pos += j+1; + j = -1; + } + /* Only store a character if it fits in the buffer, but if + * a potential bracket expression is open, the overflow + * must be remembered and handled later only if the bracket + * is unterminated (and thereby a literal), so as not to + * disallow long bracket expressions with short matches. */ + if (pos+(j+1) < PATH_MAX) { + buf[pos+j++] = pat[i]; + } else if (in_bracket) { + overflow = 1; + } else { + return 0; + } + /* If we consume any new components, the caller-passed type + * or dummy type from above is no longer valid. */ + type = 0; + } + buf[pos] = 0; + if (!*pat) { + /* If we consumed any components above, or if GLOB_MARK is + * requested and we don't yet know if the match is a dir, + * we must confirm the file exists and/or determine its type. + * + * If marking dirs, symlink type is inconclusive; we need the + * type for the symlink target, and therefore must try stat + * first unless type is known not to be a symlink. Otherwise, + * or if that fails, use lstat for determining existence to + * avoid false negatives in the case of broken symlinks. */ + struct stat st; + if ((flags & GLOB_MARK) && (!type||type==DT_LNK) && !stat(buf, &st)) { + if (S_ISDIR(st.st_mode)) type = DT_DIR; + else type = DT_REG; + } + if (!type && lstat(buf, &st)) { + if (errno!=ENOENT && (errfunc(buf, errno) || (flags & GLOB_ERR))) + return GLOB_ABORTED; + return 0; + } + if (append(tail, buf, pos, (flags & GLOB_MARK) && type==DT_DIR)) + return GLOB_NOSPACE; return 0; } - if (!*p) { - error = append(tail, d, l, l) ? GLOB_NOSPACE : 0; - closedir(dir); - return error; + char *p2 = strchr(pat, '/'), saved_sep = '/'; + /* Check if the '/' was escaped and, if so, remove the escape char + * so that it will not be unpaired when passed to fnmatch. */ + if (p2 && !(flags & GLOB_NOESCAPE)) { + char *p; + for (p=p2; p>pat && p[-1]=='\\'; p--); + if ((p2-p)%2) { + p2--; + saved_sep = '\\'; + } + } + DIR *dir = opendir(pos ? buf : "."); + if (!dir) { + if (errfunc(buf, errno) || (flags & GLOB_ERR)) + return GLOB_ABORTED; + return 0; } - while (!(error = readdir_r(dir, &de_buf, &de)) && de) { - char namebuf[l+de->d_reclen+2], *name = namebuf; - if (!literal && fnmatch(p, de->d_name, fnm_flags)) + int old_errno = errno; + struct dirent *de; + while (errno=0, de=readdir(dir)) { + /* Quickly skip non-directories when there's pattern left. */ + if (p2 && de->d_type && de->d_type!=DT_DIR && de->d_type!=DT_LNK) continue; - if (literal && strcmp(p, de->d_name)) + + size_t l = strlen(de->d_name); + if (l >= PATH_MAX-pos) continue; + + if (p2) *p2 = 0; + + int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) + | ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0); + + if (fnmatch(pat, de->d_name, fnm_flags)) continue; - if (p2 && de->d_type && !S_ISDIR(de->d_type<<12) && !S_ISLNK(de->d_type<<12)) + + /* With GLOB_PERIOD, don't allow matching . or .. unless + * fnmatch would match them with FNM_PERIOD rules in effect. */ + if (p2 && (flags & GLOB_PERIOD) && de->d_name[0]=='.' + && (!de->d_name[1] || de->d_name[1]=='.' && !de->d_name[2]) + && fnmatch(pat, de->d_name, fnm_flags | FNM_PERIOD)) continue; - if (*d) { - memcpy(name, d, l); - name[l] = '/'; - strcpy(name+l+1, de->d_name); - } else { - name = de->d_name; - } - if (p2) { - if ((error = match_in_dir(name, p2, flags, errfunc, tail))) { - closedir(dir); - return error; - } - } else { - int mark = 0; - if (flags & GLOB_MARK) { - if (de->d_type && !S_ISLNK(de->d_type<<12)) - mark = S_ISDIR(de->d_type<<12); - else { - struct stat st; - stat(name, &st); - mark = S_ISDIR(st.st_mode); - } - } - if (append(tail, name, l+de->d_reclen+1, mark)) { - closedir(dir); - return GLOB_NOSPACE; - } + + memcpy(buf+pos, de->d_name, l+1); + if (p2) *p2 = saved_sep; + int r = do_glob(buf, pos+l, de->d_type, p2 ? p2 : "", flags, errfunc, tail); + if (r) { + closedir(dir); + return r; } } + int readerr = errno; + if (p2) *p2 = saved_sep; closedir(dir); - if (error && (errfunc(d, error) || (flags & GLOB_ERR))) + if (readerr && (errfunc(buf, errno) || (flags & GLOB_ERR))) return GLOB_ABORTED; + errno = old_errno; return 0; } @@ -154,23 +191,47 @@ static int sort(const void *a, const void *b) return strcmp(*(const char **)a, *(const char **)b); } +static int expand_tilde(char **pat, char *buf, size_t *pos) +{ + char *p = *pat + 1; + size_t i = 0; + + char delim, *name_end = __strchrnul(p, '/'); + if ((delim = *name_end)) *name_end++ = 0; + *pat = name_end; + + char *home = *p ? NULL : getenv("HOME"); + if (!home) { + struct passwd pw, *res; + switch (*p ? getpwnam_r(p, &pw, buf, PATH_MAX, &res) + : getpwuid_r(getuid(), &pw, buf, PATH_MAX, &res)) { + case ENOMEM: + return GLOB_NOSPACE; + case 0: + if (!res) + default: + return GLOB_NOMATCH; + } + home = pw.pw_dir; + } + while (i < PATH_MAX - 2 && *home) + buf[i++] = *home++; + if (*home) + return GLOB_NOMATCH; + if ((buf[i] = delim)) + buf[++i] = 0; + *pos = i; + return 0; +} + int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g) { - const char *p=pat, *d; struct match head = { .next = NULL }, *tail = &head; size_t cnt, i; size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0; int error = 0; + char buf[PATH_MAX]; - if (*p == '/') { - for (; *p == '/'; p++); - d = "/"; - } else { - d = ""; - } - - if (strlen(p) > PATH_MAX) return GLOB_NOSPACE; - if (!errfunc) errfunc = ignore_err; if (!(flags & GLOB_APPEND)) { @@ -179,7 +240,19 @@ int glob(const char *restrict pat, int flags, int (*errfunc)(const char *path, i g->gl_pathv = NULL; } - if (*p) error = match_in_dir(d, p, flags, errfunc, &tail); + if (*pat) { + char *p = strdup(pat); + if (!p) return GLOB_NOSPACE; + buf[0] = 0; + size_t pos = 0; + char *s = p; + if ((flags & (GLOB_TILDE | GLOB_TILDE_CHECK)) && *p == '~') + error = expand_tilde(&s, buf, &pos); + if (!error) + error = do_glob(buf, pos, 0, s, flags, errfunc, &tail); + free(p); + } + if (error == GLOB_NOSPACE) { freelist(&head); return error; @@ -234,5 +307,5 @@ void globfree(glob_t *g) g->gl_pathv = NULL; } -LFS64(glob); -LFS64(globfree); +weak_alias(glob, glob64); +weak_alias(globfree, globfree64); diff --git a/system/lib/libc/musl/src/regex/regcomp.c b/system/lib/libc/musl/src/regex/regcomp.c index 65f2fd0bbba86..fb24556ebe12e 100644 --- a/system/lib/libc/musl/src/regex/regcomp.c +++ b/system/lib/libc/musl/src/regex/regcomp.c @@ -401,8 +401,8 @@ typedef struct { tre_ast_node_t *n; /* Position in the regexp pattern after a parse function returns. */ const char *s; - /* The first character of the regexp. */ - const char *re; + /* The first character of the last subexpression parsed. */ + const char *start; /* Current submatch ID. */ int submatch_id; /* Current position (number of literal). */ @@ -636,6 +636,20 @@ static reg_errcode_t parse_bracket(tre_parse_ctx_t *ctx, const char *s) goto parse_bracket_done; if (neg.negate) { + /* + * With REG_NEWLINE, POSIX requires that newlines are not matched by + * any form of a non-matching list. + */ + if (ctx->cflags & REG_NEWLINE) { + lit = tre_new_lit(&ls); + if (!lit) { + err = REG_ESPACE; + goto parse_bracket_done; + } + lit->code_min = '\n'; + lit->code_max = '\n'; + lit->position = -1; + } /* Sort the array if we need to negate it. */ qsort(ls.a, ls.len, sizeof *ls.a, tre_compare_lit); /* extra lit for the last negated range */ @@ -876,14 +890,14 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s) break; case '^': /* '^' has a special meaning everywhere in EREs, and at beginning of BRE. */ - if (!ere && s != ctx->re) + if (!ere && s != ctx->start) goto parse_literal; node = tre_ast_new_literal(ctx->mem, ASSERTION, ASSERT_AT_BOL, -1); s++; break; case '$': - /* '$' is special everywhere in EREs, and in the end of the string in BREs. */ - if (!ere && s[1]) + /* '$' is special everywhere in EREs, and at the end of a BRE subexpression. */ + if (!ere && s[1] && (s[1]!='\\'|| (s[2]!=')' && s[2]!='|'))) goto parse_literal; node = tre_ast_new_literal(ctx->mem, ASSERTION, ASSERT_AT_EOL, -1); s++; @@ -944,7 +958,7 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx) { tre_ast_node_t *nbranch=0, *nunion=0; int ere = ctx->cflags & REG_EXTENDED; - const char *s = ctx->re; + const char *s = ctx->start; int subid = 0; int depth = 0; reg_errcode_t err; @@ -962,6 +976,7 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx) s++; depth++; nbranch = nunion = 0; + ctx->start = s; continue; } if ((!ere && *s == '\\' && s[1] == ')') || @@ -994,8 +1009,8 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx) if (*s=='\\') s++; - /* handle ^* at the start of a complete BRE. */ - if (!ere && s==ctx->re+1 && s[-1]=='^') + /* handle ^* at the start of a BRE. */ + if (!ere && s==ctx->start+1 && s[-1]=='^') break; /* extension: multiple consecutive *+?{,} is unspecified, @@ -1038,8 +1053,10 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx) if (c == '\\' && s[1] == '|') { s+=2; + ctx->start = s; } else if (c == '|') { s++; + ctx->start = s; } else { if (c == '\\') { if (!depth) return REG_EPAREN; @@ -2705,7 +2722,7 @@ regcomp(regex_t *restrict preg, const char *restrict regex, int cflags) memset(&parse_ctx, 0, sizeof(parse_ctx)); parse_ctx.mem = mem; parse_ctx.stack = stack; - parse_ctx.re = regex; + parse_ctx.start = regex; parse_ctx.cflags = cflags; parse_ctx.max_backref = -1; errcode = tre_parse(&parse_ctx); diff --git a/system/lib/libc/musl/src/regex/regexec.c b/system/lib/libc/musl/src/regex/regexec.c index 16c5d0ac5c7b5..253b0e1495601 100644 --- a/system/lib/libc/musl/src/regex/regexec.c +++ b/system/lib/libc/musl/src/regex/regexec.c @@ -34,6 +34,7 @@ #include #include #include +#include #include @@ -43,7 +44,7 @@ static void tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags, - const tre_tnfa_t *tnfa, int *tags, int match_eo); + const tre_tnfa_t *tnfa, regoff_t *tags, regoff_t match_eo); /*********************************************************************** from tre-match-utils.h @@ -96,7 +97,7 @@ tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags, /* Returns 1 if `t1' wins `t2', 0 otherwise. */ static int tre_tag_order(int num_tags, tre_tag_direction_t *tag_directions, - int *t1, int *t2) + regoff_t *t1, regoff_t *t2) { int i; for (i = 0; i < num_tags; i++) @@ -156,25 +157,25 @@ tre_neg_char_classes_match(tre_ctype_t *classes, tre_cint_t wc, int icase) typedef struct { tre_tnfa_transition_t *state; - int *tags; + regoff_t *tags; } tre_tnfa_reach_t; typedef struct { - int pos; - int **tags; + regoff_t pos; + regoff_t **tags; } tre_reach_pos_t; static reg_errcode_t tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string, - int *match_tags, int eflags, - int *match_end_ofs) + regoff_t *match_tags, int eflags, + regoff_t *match_end_ofs) { /* State variables required by GET_NEXT_WCHAR. */ tre_char_t prev_c = 0, next_c = 0; const char *str_byte = string; - int pos = -1; - int pos_add_next = 1; + regoff_t pos = -1; + regoff_t pos_add_next = 1; #ifdef TRE_MBSTATE mbstate_t mbstate; #endif /* TRE_MBSTATE */ @@ -190,10 +191,10 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string, int *tag_i; int num_tags, i; - int match_eo = -1; /* end offset of match (-1 if no match found yet) */ + regoff_t match_eo = -1; /* end offset of match (-1 if no match found yet) */ int new_match = 0; - int *tmp_tags = NULL; - int *tmp_iptr; + regoff_t *tmp_tags = NULL; + regoff_t *tmp_iptr; #ifdef TRE_MBSTATE memset(&mbstate, '\0', sizeof(mbstate)); @@ -206,25 +207,37 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string, /* Allocate memory for temporary data required for matching. This needs to be done for every matching operation to be thread safe. This allocates - everything in a single large block from the stack frame using alloca() - or with malloc() if alloca is unavailable. */ + everything in a single large block with calloc(). */ { - int tbytes, rbytes, pbytes, xbytes, total_bytes; + size_t tbytes, rbytes, pbytes, xbytes, total_bytes; char *tmp_buf; + + /* Ensure that tbytes and xbytes*num_states cannot overflow, and that + * they don't contribute more than 1/8 of SIZE_MAX to total_bytes. */ + if (num_tags > SIZE_MAX/(8 * sizeof(regoff_t) * tnfa->num_states)) + return REG_ESPACE; + + /* Likewise check rbytes. */ + if (tnfa->num_states+1 > SIZE_MAX/(8 * sizeof(*reach_next))) + return REG_ESPACE; + + /* Likewise check pbytes. */ + if (tnfa->num_states > SIZE_MAX/(8 * sizeof(*reach_pos))) + return REG_ESPACE; + /* Compute the length of the block we need. */ tbytes = sizeof(*tmp_tags) * num_tags; rbytes = sizeof(*reach_next) * (tnfa->num_states + 1); pbytes = sizeof(*reach_pos) * tnfa->num_states; - xbytes = sizeof(int) * num_tags; + xbytes = sizeof(regoff_t) * num_tags; total_bytes = (sizeof(long) - 1) * 4 /* for alignment paddings */ + (rbytes + xbytes * tnfa->num_states) * 2 + tbytes + pbytes; /* Allocate the memory. */ - buf = xmalloc((unsigned)total_bytes); + buf = calloc(total_bytes, 1); if (buf == NULL) return REG_ESPACE; - memset(buf, 0, (size_t)total_bytes); /* Get the various pointers within tmp_buf (properly aligned). */ tmp_tags = (void *)buf; @@ -477,12 +490,12 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string, */ typedef struct { - int pos; + regoff_t pos; const char *str_byte; tre_tnfa_transition_t *state; int state_id; int next_c; - int *tags; + regoff_t *tags; #ifdef TRE_MBSTATE mbstate_t mbstate; #endif /* TRE_MBSTATE */ @@ -578,13 +591,13 @@ typedef struct tre_backtrack_struct { static reg_errcode_t tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string, - int *match_tags, int eflags, int *match_end_ofs) + regoff_t *match_tags, int eflags, regoff_t *match_end_ofs) { /* State variables required by GET_NEXT_WCHAR. */ tre_char_t prev_c = 0, next_c = 0; const char *str_byte = string; - int pos = 0; - int pos_add_next = 1; + regoff_t pos = 0; + regoff_t pos_add_next = 1; #ifdef TRE_MBSTATE mbstate_t mbstate; #endif /* TRE_MBSTATE */ @@ -597,15 +610,16 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string, started from. */ int next_c_start; const char *str_byte_start; - int pos_start = -1; + regoff_t pos_start = -1; #ifdef TRE_MBSTATE mbstate_t mbstate_start; #endif /* TRE_MBSTATE */ /* End offset of best match so far, or -1 if no match found yet. */ - int match_eo = -1; + regoff_t match_eo = -1; /* Tag arrays. */ - int *next_tags, *tags = NULL; + int *next_tags; + regoff_t *tags = NULL; /* Current TNFA state. */ tre_tnfa_transition_t *state; int *states_seen = NULL; @@ -755,8 +769,9 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string, /* This is a back reference state. All transitions leaving from this state have the same back reference "assertion". Instead of reading the next character, we match the back reference. */ - int so, eo, bt = trans_i->u.backref; - int bt_len; + regoff_t so, eo; + int bt = trans_i->u.backref; + regoff_t bt_len; int result; /* Get the substring we need to match against. Remember to @@ -913,7 +928,7 @@ tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string, endpoint values. */ static void tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags, - const tre_tnfa_t *tnfa, int *tags, int match_eo) + const tre_tnfa_t *tnfa, regoff_t *tags, regoff_t match_eo) { tre_submatch_data_t *submatch_data; unsigned int i, j; @@ -983,7 +998,7 @@ regexec(const regex_t *restrict preg, const char *restrict string, { tre_tnfa_t *tnfa = (void *)preg->TRE_REGEX_T_FIELD; reg_errcode_t status; - int *tags = NULL, eo; + regoff_t *tags = NULL, eo; if (tnfa->cflags & REG_NOSUB) nmatch = 0; if (tnfa->num_tags > 0 && nmatch > 0) { diff --git a/system/lib/libc/musl/src/regex/tre.h b/system/lib/libc/musl/src/regex/tre.h index 67cb9a84fb9b8..9aae851f617af 100644 --- a/system/lib/libc/musl/src/regex/tre.h +++ b/system/lib/libc/musl/src/regex/tre.h @@ -191,9 +191,9 @@ typedef struct tre_mem_struct { #define tre_mem_alloc_impl __tre_mem_alloc_impl #define tre_mem_destroy __tre_mem_destroy -tre_mem_t tre_mem_new_impl(int provided, void *provided_block); -void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block, - int zero, size_t size); +hidden tre_mem_t tre_mem_new_impl(int provided, void *provided_block); +hidden void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block, + int zero, size_t size); /* Returns a new memory allocator or NULL if out of memory. */ #define tre_mem_new() tre_mem_new_impl(0, NULL) @@ -222,7 +222,7 @@ void *tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block, /* Frees the memory allocator and all memory allocated with it. */ -void tre_mem_destroy(tre_mem_t mem); +hidden void tre_mem_destroy(tre_mem_t mem); #define xmalloc malloc #define xcalloc calloc diff --git a/system/lib/libc/musl/src/sched/sched_getcpu.c b/system/lib/libc/musl/src/sched/sched_getcpu.c index e08cfdf13921b..4ec5eaf67961c 100644 --- a/system/lib/libc/musl/src/sched/sched_getcpu.c +++ b/system/lib/libc/musl/src/sched/sched_getcpu.c @@ -6,8 +6,6 @@ #ifdef VDSO_GETCPU_SYM -void *__vdsosym(const char *, const char *); - static void *volatile vdso_func; typedef long (*getcpu_f)(unsigned *, unsigned *, void *); diff --git a/system/lib/libc/musl/src/sched/sched_rr_get_interval.c b/system/lib/libc/musl/src/sched/sched_rr_get_interval.c index 4b01028f5ddaf..33a3d1aeed43b 100644 --- a/system/lib/libc/musl/src/sched/sched_rr_get_interval.c +++ b/system/lib/libc/musl/src/sched/sched_rr_get_interval.c @@ -3,5 +3,19 @@ int sched_rr_get_interval(pid_t pid, struct timespec *ts) { +#ifdef SYS_sched_rr_get_interval_time64 + /* On a 32-bit arch, use the old syscall if it exists. */ + if (SYS_sched_rr_get_interval != SYS_sched_rr_get_interval_time64) { + long ts32[2]; + int r = __syscall(SYS_sched_rr_get_interval, pid, ts32); + if (!r) { + ts->tv_sec = ts32[0]; + ts->tv_nsec = ts32[1]; + } + return __syscall_ret(r); + } +#endif + /* If reaching this point, it's a 64-bit arch or time64-only + * 32-bit arch and we can get result directly into timespec. */ return syscall(SYS_sched_rr_get_interval, pid, ts); } diff --git a/system/lib/libc/musl/src/search/hsearch.c b/system/lib/libc/musl/src/search/hsearch.c index 5c8965114bdcb..b3ac8796e70fd 100644 --- a/system/lib/libc/musl/src/search/hsearch.c +++ b/system/lib/libc/musl/src/search/hsearch.c @@ -2,7 +2,6 @@ #include #include #include -#include "libc.h" /* open addressing hash table with 2^n table size @@ -24,9 +23,9 @@ struct __tab { static struct hsearch_data htab; -int __hcreate_r(size_t, struct hsearch_data *); -void __hdestroy_r(struct hsearch_data *); -int __hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *); +static int __hcreate_r(size_t, struct hsearch_data *); +static void __hdestroy_r(struct hsearch_data *); +static int __hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *); static size_t keyhash(char *k) { @@ -101,7 +100,7 @@ ENTRY *hsearch(ENTRY item, ACTION action) return e; } -int __hcreate_r(size_t nel, struct hsearch_data *htab) +static int __hcreate_r(size_t nel, struct hsearch_data *htab) { int r; @@ -117,7 +116,7 @@ int __hcreate_r(size_t nel, struct hsearch_data *htab) } weak_alias(__hcreate_r, hcreate_r); -void __hdestroy_r(struct hsearch_data *htab) +static void __hdestroy_r(struct hsearch_data *htab) { if (htab->__tab) free(htab->__tab->entries); free(htab->__tab); @@ -125,7 +124,7 @@ void __hdestroy_r(struct hsearch_data *htab) } weak_alias(__hdestroy_r, hdestroy_r); -int __hsearch_r(ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab) +static int __hsearch_r(ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab) { size_t hash = keyhash(item.key); ENTRY *e = lookup(item.key, hash, htab); diff --git a/system/lib/libc/musl/src/search/lsearch.c b/system/lib/libc/musl/src/search/lsearch.c index 63f319223a0ab..5eb5cc2bd5bc4 100644 --- a/system/lib/libc/musl/src/search/lsearch.c +++ b/system/lib/libc/musl/src/search/lsearch.c @@ -9,7 +9,7 @@ void *lsearch(const void *key, void *base, size_t *nelp, size_t width, size_t i; for (i = 0; i < n; i++) - if (compar(p[i], key) == 0) + if (compar(key, p[i]) == 0) return p[i]; *nelp = n+1; return memcpy(p[n], key, width); @@ -23,7 +23,7 @@ void *lfind(const void *key, const void *base, size_t *nelp, size_t i; for (i = 0; i < n; i++) - if (compar(p[i], key) == 0) + if (compar(key, p[i]) == 0) return p[i]; return 0; } diff --git a/system/lib/libc/musl/src/search/tdelete.c b/system/lib/libc/musl/src/search/tdelete.c new file mode 100644 index 0000000000000..b8bb924b4e5d0 --- /dev/null +++ b/system/lib/libc/musl/src/search/tdelete.c @@ -0,0 +1,49 @@ +#include +#include +#include "tsearch.h" + +void *tdelete(const void *restrict key, void **restrict rootp, + int(*cmp)(const void *, const void *)) +{ + if (!rootp) + return 0; + + void **a[MAXH+1]; + struct node *n = *rootp; + struct node *parent; + struct node *child; + int i=0; + /* *a[0] is an arbitrary non-null pointer that is returned when + the root node is deleted. */ + a[i++] = rootp; + a[i++] = rootp; + for (;;) { + if (!n) + return 0; + int c = cmp(key, n->key); + if (!c) + break; + a[i++] = &n->a[c>0]; + n = n->a[c>0]; + } + parent = *a[i-2]; + if (n->a[0]) { + /* free the preceding node instead of the deleted one. */ + struct node *deleted = n; + a[i++] = &n->a[0]; + n = n->a[0]; + while (n->a[1]) { + a[i++] = &n->a[1]; + n = n->a[1]; + } + deleted->key = n->key; + child = n->a[0]; + } else { + child = n->a[1]; + } + /* freed node has at most one child, move it up and rebalance. */ + free(n); + *a[--i] = child; + while (--i && __tsearch_balance(a[i])); + return parent; +} diff --git a/system/lib/libc/musl/src/search/tdestroy.c b/system/lib/libc/musl/src/search/tdestroy.c index 5f9e197dcd1ea..699a901c6a8e6 100644 --- a/system/lib/libc/musl/src/search/tdestroy.c +++ b/system/lib/libc/musl/src/search/tdestroy.c @@ -1,12 +1,7 @@ #define _GNU_SOURCE #include #include - -struct node { - void *key; - struct node *left; - struct node *right; -}; +#include "tsearch.h" void tdestroy(void *root, void (*freekey)(void *)) { @@ -14,8 +9,8 @@ void tdestroy(void *root, void (*freekey)(void *)) if (r == 0) return; - tdestroy(r->left, freekey); - tdestroy(r->right, freekey); - if (freekey) freekey(r->key); + tdestroy(r->a[0], freekey); + tdestroy(r->a[1], freekey); + if (freekey) freekey((void *)r->key); free(r); } diff --git a/system/lib/libc/musl/src/search/tfind.c b/system/lib/libc/musl/src/search/tfind.c new file mode 100644 index 0000000000000..9e1cf98f5c511 --- /dev/null +++ b/system/lib/libc/musl/src/search/tfind.c @@ -0,0 +1,20 @@ +#include +#include "tsearch.h" + +void *tfind(const void *key, void *const *rootp, + int(*cmp)(const void *, const void *)) +{ + if (!rootp) + return 0; + + struct node *n = *rootp; + for (;;) { + if (!n) + break; + int c = cmp(key, n->key); + if (!c) + break; + n = n->a[c>0]; + } + return n; +} diff --git a/system/lib/libc/musl/src/search/tsearch.c b/system/lib/libc/musl/src/search/tsearch.c new file mode 100644 index 0000000000000..0de27d05e94c0 --- /dev/null +++ b/system/lib/libc/musl/src/search/tsearch.c @@ -0,0 +1,92 @@ +#include +#include +#include "tsearch.h" + +static inline int height(struct node *n) { return n ? n->h : 0; } + +static int rot(void **p, struct node *x, int dir /* deeper side */) +{ + struct node *y = x->a[dir]; + struct node *z = y->a[!dir]; + int hx = x->h; + int hz = height(z); + if (hz > height(y->a[dir])) { + /* + * x + * / \ dir z + * A y / \ + * / \ --> x y + * z D /| |\ + * / \ A B C D + * B C + */ + x->a[dir] = z->a[!dir]; + y->a[!dir] = z->a[dir]; + z->a[!dir] = x; + z->a[dir] = y; + x->h = hz; + y->h = hz; + z->h = hz+1; + } else { + /* + * x y + * / \ / \ + * A y --> x D + * / \ / \ + * z D A z + */ + x->a[dir] = z; + y->a[!dir] = x; + x->h = hz+1; + y->h = hz+2; + z = y; + } + *p = z; + return z->h - hx; +} + +/* balance *p, return 0 if height is unchanged. */ +int __tsearch_balance(void **p) +{ + struct node *n = *p; + int h0 = height(n->a[0]); + int h1 = height(n->a[1]); + if (h0 - h1 + 1u < 3u) { + int old = n->h; + n->h = h0

h - old; + } + return rot(p, n, h0key); + if (!c) + return n; + a[i++] = &n->a[c>0]; + n = n->a[c>0]; + } + r = malloc(sizeof *r); + if (!r) + return 0; + r->key = key; + r->a[0] = r->a[1] = 0; + r->h = 1; + /* insert new node, rebalance ancestors. */ + *a[--i] = r; + while (i && __tsearch_balance(a[--i])); + return r; +} diff --git a/system/lib/libc/musl/src/search/tsearch.h b/system/lib/libc/musl/src/search/tsearch.h new file mode 100644 index 0000000000000..37d11d7354103 --- /dev/null +++ b/system/lib/libc/musl/src/search/tsearch.h @@ -0,0 +1,13 @@ +#include +#include + +/* AVL tree height < 1.44*log2(nodes+2)-0.3, MAXH is a safe upper bound. */ +#define MAXH (sizeof(void*)*8*3/2) + +struct node { + const void *key; + void *a[2]; + int h; +}; + +hidden int __tsearch_balance(void **); diff --git a/system/lib/libc/musl/src/search/tsearch_avl.c b/system/lib/libc/musl/src/search/tsearch_avl.c deleted file mode 100644 index 57194c843dcaa..0000000000000 --- a/system/lib/libc/musl/src/search/tsearch_avl.c +++ /dev/null @@ -1,204 +0,0 @@ -#include -#include - -/* -avl tree implementation using recursive functions -the height of an n node tree is less than 1.44*log2(n+2)-1 -(so the max recursion depth in case of a tree with 2^32 nodes is 45) -*/ - -struct node { - const void *key; - struct node *left; - struct node *right; - int height; -}; - -static int delta(struct node *n) { - return (n->left ? n->left->height:0) - (n->right ? n->right->height:0); -} - -static void updateheight(struct node *n) { - n->height = 0; - if (n->left && n->left->height > n->height) - n->height = n->left->height; - if (n->right && n->right->height > n->height) - n->height = n->right->height; - n->height++; -} - -static struct node *rotl(struct node *n) { - struct node *r = n->right; - n->right = r->left; - r->left = n; - updateheight(n); - updateheight(r); - return r; -} - -static struct node *rotr(struct node *n) { - struct node *l = n->left; - n->left = l->right; - l->right = n; - updateheight(n); - updateheight(l); - return l; -} - -static struct node *balance(struct node *n) { - int d = delta(n); - - if (d < -1) { - if (delta(n->right) > 0) - n->right = rotr(n->right); - return rotl(n); - } else if (d > 1) { - if (delta(n->left) < 0) - n->left = rotl(n->left); - return rotr(n); - } - updateheight(n); - return n; -} - -static struct node *find(struct node *n, const void *k, - int (*cmp)(const void *, const void *)) -{ - int c; - - if (!n) - return 0; - c = cmp(k, n->key); - if (c == 0) - return n; - if (c < 0) - return find(n->left, k, cmp); - else - return find(n->right, k, cmp); -} - -static struct node *insert(struct node *n, const void *k, - int (*cmp)(const void *, const void *), struct node **found) -{ - struct node *r; - int c; - - if (!n) { - n = malloc(sizeof *n); - if (n) { - n->key = k; - n->left = n->right = 0; - n->height = 1; - } - *found = n; - return n; - } - c = cmp(k, n->key); - if (c == 0) { - *found = n; - return 0; - } - r = insert(c < 0 ? n->left : n->right, k, cmp, found); - if (r) { - if (c < 0) - n->left = r; - else - n->right = r; - r = balance(n); - } - return r; -} - -static struct node *remove_rightmost(struct node *n, struct node **rightmost) -{ - if (!n->right) { - *rightmost = n; - return n->left; - } - n->right = remove_rightmost(n->right, rightmost); - return balance(n); -} - -static struct node *remove(struct node **n, const void *k, - int (*cmp)(const void *, const void *), struct node *parent) -{ - int c; - - if (!*n) - return 0; - c = cmp(k, (*n)->key); - if (c == 0) { - struct node *r = *n; - if (r->left) { - r->left = remove_rightmost(r->left, n); - (*n)->left = r->left; - (*n)->right = r->right; - *n = balance(*n); - } else - *n = r->right; - free(r); - return parent; - } - if (c < 0) - parent = remove(&(*n)->left, k, cmp, *n); - else - parent = remove(&(*n)->right, k, cmp, *n); - if (parent) - *n = balance(*n); - return parent; -} - -void *tdelete(const void *restrict key, void **restrict rootp, - int(*compar)(const void *, const void *)) -{ - if (!rootp) - return 0; - struct node *n = *rootp; - struct node *ret; - /* last argument is arbitrary non-null pointer - which is returned when the root node is deleted */ - ret = remove(&n, key, compar, n); - *rootp = n; - return ret; -} - -void *tfind(const void *key, void *const *rootp, - int(*compar)(const void *, const void *)) -{ - if (!rootp) - return 0; - return find(*rootp, key, compar); -} - -void *tsearch(const void *key, void **rootp, - int (*compar)(const void *, const void *)) -{ - struct node *update; - struct node *ret; - if (!rootp) - return 0; - update = insert(*rootp, key, compar, &ret); - if (update) - *rootp = update; - return ret; -} - -static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d) -{ - if (r == 0) - return; - if (r->left == 0 && r->right == 0) - action(r, leaf, d); - else { - action(r, preorder, d); - walk(r->left, action, d+1); - action(r, postorder, d); - walk(r->right, action, d+1); - action(r, endorder, d); - } -} - -void twalk(const void *root, void (*action)(const void *, VISIT, int)) -{ - walk(root, action, 0); -} diff --git a/system/lib/libc/musl/src/search/twalk.c b/system/lib/libc/musl/src/search/twalk.c new file mode 100644 index 0000000000000..53821cdaf34e7 --- /dev/null +++ b/system/lib/libc/musl/src/search/twalk.c @@ -0,0 +1,22 @@ +#include +#include "tsearch.h" + +static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d) +{ + if (!r) + return; + if (r->h == 1) + action(r, leaf, d); + else { + action(r, preorder, d); + walk(r->a[0], action, d+1); + action(r, postorder, d); + walk(r->a[1], action, d+1); + action(r, endorder, d); + } +} + +void twalk(const void *root, void (*action)(const void *, VISIT, int)) +{ + walk(root, action, 0); +} diff --git a/system/lib/libc/musl/src/select/poll.c b/system/lib/libc/musl/src/select/poll.c index 9e0bcbd804f32..c84c8a999ccca 100644 --- a/system/lib/libc/musl/src/select/poll.c +++ b/system/lib/libc/musl/src/select/poll.c @@ -2,7 +2,6 @@ #include #include #include "syscall.h" -#include "libc.h" int poll(struct pollfd *fds, nfds_t n, int timeout) { diff --git a/system/lib/libc/musl/src/select/pselect.c b/system/lib/libc/musl/src/select/pselect.c index 4e2d7b073dbad..54cfb291bba2c 100644 --- a/system/lib/libc/musl/src/select/pselect.c +++ b/system/lib/libc/musl/src/select/pselect.c @@ -1,13 +1,26 @@ #include #include #include +#include #include "syscall.h" -#include "libc.h" + +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask) { syscall_arg_t data[2] = { (uintptr_t)mask, _NSIG/8 }; - struct timespec ts_tmp; - if (ts) ts_tmp = *ts; - return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data); + time_t s = ts ? ts->tv_sec : 0; + long ns = ts ? ts->tv_nsec : 0; +#ifdef SYS_pselect6_time64 + int r = -ENOSYS; + if (SYS_pselect6 == SYS_pselect6_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_pselect6_time64, n, rfds, wfds, efds, + ts ? ((long long[]){s, ns}) : 0, data); + if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS) + return __syscall_ret(r); + s = CLAMP(s); +#endif + return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, + ts ? ((long[]){s, ns}) : 0, data); } diff --git a/system/lib/libc/musl/src/select/select.c b/system/lib/libc/musl/src/select/select.c index 7b5f6dcf7a53a..8a78688403047 100644 --- a/system/lib/libc/musl/src/select/select.c +++ b/system/lib/libc/musl/src/select/select.c @@ -3,24 +3,42 @@ #include #include #include "syscall.h" -#include "libc.h" + +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) int select(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv) { + time_t s = tv ? tv->tv_sec : 0; + suseconds_t us = tv ? tv->tv_usec : 0; + long ns; + const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1; + + if (s<0 || us<0) return __syscall_ret(-EINVAL); + if (us/1000000 > max_time - s) { + s = max_time; + us = 999999; + ns = 999999999; + } else { + s += us/1000000; + us %= 1000000; + ns = us*1000; + } + +#ifdef SYS_pselect6_time64 + int r = -ENOSYS; + if (SYS_pselect6 == SYS_pselect6_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_pselect6_time64, n, rfds, wfds, efds, + tv ? ((long long[]){s, ns}) : 0, + ((syscall_arg_t[]){ 0, _NSIG/8 })); + if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS) + return __syscall_ret(r); +#endif #ifdef SYS_select - return syscall_cp(SYS_select, n, rfds, wfds, efds, tv); + return syscall_cp(SYS_select, n, rfds, wfds, efds, + tv ? ((long[]){s, us}) : 0); #else - syscall_arg_t data[2] = { 0, _NSIG/8 }; - struct timespec ts; - if (tv) { - if (tv->tv_sec < 0 || tv->tv_usec < 0) - return __syscall_ret(-EINVAL); - time_t extra_secs = tv->tv_usec / 1000000; - ts.tv_nsec = tv->tv_usec % 1000000 * 1000; - const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1; - ts.tv_sec = extra_secs > max_time - tv->tv_sec ? - max_time : tv->tv_sec + extra_secs; - } - return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, tv ? &ts : 0, data); + return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, + tv ? ((long[]){s, ns}) : 0, ((syscall_arg_t[]){ 0, _NSIG/8 })); #endif } diff --git a/system/lib/libc/musl/src/signal/block.c b/system/lib/libc/musl/src/signal/block.c index d7f6100134572..89c32206bd095 100644 --- a/system/lib/libc/musl/src/signal/block.c +++ b/system/lib/libc/musl/src/signal/block.c @@ -30,15 +30,21 @@ static const unsigned long app_mask[] = { void __block_all_sigs(void *set) { +#ifndef __EMSCRIPTEN__ __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &all_mask, set, _NSIG/8); +#endif } void __block_app_sigs(void *set) { +#ifndef __EMSCRIPTEN__ __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &app_mask, set, _NSIG/8); +#endif } void __restore_sigs(void *set) { +#ifndef __EMSCRIPTEN__ __syscall(SYS_rt_sigprocmask, SIG_SETMASK, set, 0, _NSIG/8); +#endif } diff --git a/system/lib/libc/musl/src/signal/getitimer.c b/system/lib/libc/musl/src/signal/getitimer.c index 8a8046a76b5c6..36d1eb9dc6e99 100644 --- a/system/lib/libc/musl/src/signal/getitimer.c +++ b/system/lib/libc/musl/src/signal/getitimer.c @@ -3,5 +3,16 @@ int getitimer(int which, struct itimerval *old) { + if (sizeof(time_t) > sizeof(long)) { + long old32[4]; + int r = __syscall(SYS_getitimer, which, old32); + if (!r) { + old->it_interval.tv_sec = old32[0]; + old->it_interval.tv_usec = old32[1]; + old->it_value.tv_sec = old32[2]; + old->it_value.tv_usec = old32[3]; + } + return __syscall_ret(r); + } return syscall(SYS_getitimer, which, old); } diff --git a/system/lib/libc/musl/src/signal/psiginfo.c b/system/lib/libc/musl/src/signal/psiginfo.c index 57be34cd017ca..2b15982be488d 100644 --- a/system/lib/libc/musl/src/signal/psiginfo.c +++ b/system/lib/libc/musl/src/signal/psiginfo.c @@ -1,10 +1,6 @@ -#include -#include #include void psiginfo(const siginfo_t *si, const char *msg) { - char *s = strsignal(si->si_signo); - if (msg) fprintf(stderr, "%s: %s\n", msg, s); - else fprintf(stderr, "%s\n", s); + psignal(si->si_signo, msg); } diff --git a/system/lib/libc/musl/src/signal/psignal.c b/system/lib/libc/musl/src/signal/psignal.c index 02f1c76096038..138dbe00fa078 100644 --- a/system/lib/libc/musl/src/signal/psignal.c +++ b/system/lib/libc/musl/src/signal/psignal.c @@ -1,10 +1,27 @@ -#include +#include "stdio_impl.h" #include #include +#include void psignal(int sig, const char *msg) { + FILE *f = stderr; char *s = strsignal(sig); - if (msg) fprintf(stderr, "%s: %s\n", msg, s); - else fprintf(stderr, "%s\n", s); + + FLOCK(f); + + /* Save stderr's orientation and encoding rule, since psignal is not + * permitted to change them. Save errno and restore it if there is no + * error since fprintf might change it even on success but psignal is + * not permitted to do so. */ + void *old_locale = f->locale; + int old_mode = f->mode; + int old_errno = errno; + + if (fprintf(f, "%s%s%s\n", msg?msg:"", msg?": ":"", s)>=0) + errno = old_errno; + f->mode = old_mode; + f->locale = old_locale; + + FUNLOCK(f); } diff --git a/system/lib/libc/musl/src/signal/raise.c b/system/lib/libc/musl/src/signal/raise.c index 717b1c917a343..f0512019a1921 100644 --- a/system/lib/libc/musl/src/signal/raise.c +++ b/system/lib/libc/musl/src/signal/raise.c @@ -5,11 +5,9 @@ int raise(int sig) { - int tid, ret; sigset_t set; __block_app_sigs(&set); - tid = __syscall(SYS_gettid); - ret = syscall(SYS_tkill, tid, sig); + int ret = syscall(SYS_tkill, __pthread_self()->tid, sig); __restore_sigs(&set); return ret; } diff --git a/system/lib/libc/musl/src/signal/restore.c b/system/lib/libc/musl/src/signal/restore.c index 873b867e6feb7..5ec4f5dddc658 100644 --- a/system/lib/libc/musl/src/signal/restore.c +++ b/system/lib/libc/musl/src/signal/restore.c @@ -1,10 +1,12 @@ +#include + /* These functions will not work, but suffice for targets where the * kernel sigaction structure does not actually use sa_restorer. */ -void __restore() +hidden void __restore() { } -void __restore_rt() +hidden void __restore_rt() { } diff --git a/system/lib/libc/musl/src/signal/setitimer.c b/system/lib/libc/musl/src/signal/setitimer.c index 21b1f45da9b7a..0dfbeb4db5a7a 100644 --- a/system/lib/libc/musl/src/signal/setitimer.c +++ b/system/lib/libc/musl/src/signal/setitimer.c @@ -1,7 +1,26 @@ #include +#include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) + int setitimer(int which, const struct itimerval *restrict new, struct itimerval *restrict old) { + if (sizeof(time_t) > sizeof(long)) { + time_t is = new->it_interval.tv_sec, vs = new->it_value.tv_sec; + long ius = new->it_interval.tv_usec, vus = new->it_value.tv_usec; + if (!IS32BIT(is) || !IS32BIT(vs)) + return __syscall_ret(-ENOTSUP); + long old32[4]; + int r = __syscall(SYS_setitimer, which, + ((long[]){is, ius, vs, vus}), old32); + if (!r && old) { + old->it_interval.tv_sec = old32[0]; + old->it_interval.tv_usec = old32[1]; + old->it_value.tv_sec = old32[2]; + old->it_value.tv_usec = old32[3]; + } + return __syscall_ret(r); + } return syscall(SYS_setitimer, which, new, old); } diff --git a/system/lib/libc/musl/src/signal/sigaction.c b/system/lib/libc/musl/src/signal/sigaction.c index 6eca06f11fb63..2203471b243d9 100644 --- a/system/lib/libc/musl/src/signal/sigaction.c +++ b/system/lib/libc/musl/src/signal/sigaction.c @@ -4,6 +4,7 @@ #include "syscall.h" #include "pthread_impl.h" #include "libc.h" +#include "lock.h" #include "ksigaction.h" static int unmask_done; @@ -14,6 +15,8 @@ void __get_handler_set(sigset_t *set) memcpy(set, handler_set, sizeof handler_set); } +volatile int __eintr_valid_flag; + int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old) { struct k_sigaction ksa, ksa_old; @@ -35,29 +38,47 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact SIGPT_SET, 0, _NSIG/8); unmask_done = 1; } + + if (!(sa->sa_flags & SA_RESTART)) { + a_store(&__eintr_valid_flag, 1); + } } ksa.handler = sa->sa_handler; ksa.flags = sa->sa_flags | SA_RESTORER; ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore; - memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask); + memcpy(&ksa.mask, &sa->sa_mask, _NSIG/8); } - if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask)) - return -1; - if (old) { + int r = __syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, _NSIG/8); + if (old && !r) { old->sa_handler = ksa_old.handler; old->sa_flags = ksa_old.flags; - memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask); + memcpy(&old->sa_mask, &ksa_old.mask, _NSIG/8); } - return 0; + return __syscall_ret(r); } int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old) { + unsigned long set[_NSIG/(8*sizeof(long))]; + if (sig-32U < 3 || sig-1U >= _NSIG-1) { errno = EINVAL; return -1; } - return __libc_sigaction(sig, sa, old); + + /* Doing anything with the disposition of SIGABRT requires a lock, + * so that it cannot be changed while abort is terminating the + * process and so any change made by abort can't be observed. */ + if (sig == SIGABRT) { + __block_all_sigs(&set); + LOCK(__abort_lock); + } + int r = __libc_sigaction(sig, sa, old); + if (sig == SIGABRT) { + UNLOCK(__abort_lock); + __restore_sigs(&set); + } + return r; } weak_alias(__sigaction, sigaction); diff --git a/system/lib/libc/musl/src/signal/sigaltstack.c b/system/lib/libc/musl/src/signal/sigaltstack.c index 62cb81adfe16e..d3a6e8215f83c 100644 --- a/system/lib/libc/musl/src/signal/sigaltstack.c +++ b/system/lib/libc/musl/src/signal/sigaltstack.c @@ -5,11 +5,11 @@ int sigaltstack(const stack_t *restrict ss, stack_t *restrict old) { if (ss) { - if (ss->ss_size < MINSIGSTKSZ) { + if (!(ss->ss_flags & SS_DISABLE) && ss->ss_size < MINSIGSTKSZ) { errno = ENOMEM; return -1; } - if (ss->ss_flags & ~SS_DISABLE) { + if (ss->ss_flags & SS_ONSTACK) { errno = EINVAL; return -1; } diff --git a/system/lib/libc/musl/src/signal/sigisemptyset.c b/system/lib/libc/musl/src/signal/sigisemptyset.c index 312c66cf84f14..68b8662468eed 100644 --- a/system/lib/libc/musl/src/signal/sigisemptyset.c +++ b/system/lib/libc/musl/src/signal/sigisemptyset.c @@ -4,6 +4,7 @@ int sigisemptyset(const sigset_t *set) { - static const unsigned long zeroset[_NSIG/8/sizeof(long)]; - return !memcmp(set, &zeroset, _NSIG/8); + for (size_t i=0; i<_NSIG/8/sizeof *set->__bits; i++) + if (set->__bits[i]) return 0; + return 1; } diff --git a/system/lib/libc/musl/src/signal/signal.c b/system/lib/libc/musl/src/signal/signal.c index 29e03c88423fe..7a6dd172769cf 100644 --- a/system/lib/libc/musl/src/signal/signal.c +++ b/system/lib/libc/musl/src/signal/signal.c @@ -1,8 +1,5 @@ #include #include "syscall.h" -#include "libc.h" - -int __sigaction(int, const struct sigaction *, struct sigaction *); void (*signal(int sig, void (*func)(int)))(int) { diff --git a/system/lib/libc/musl/src/signal/sigrtmin.c b/system/lib/libc/musl/src/signal/sigrtmin.c index d0e769bbc1548..c5a1fd92dae74 100644 --- a/system/lib/libc/musl/src/signal/sigrtmin.c +++ b/system/lib/libc/musl/src/signal/sigrtmin.c @@ -1,3 +1,5 @@ +#include + int __libc_current_sigrtmin() { return 35; diff --git a/system/lib/libc/musl/src/signal/sigset.c b/system/lib/libc/musl/src/signal/sigset.c index 0d7b4564677b8..f3e8c4077ec27 100644 --- a/system/lib/libc/musl/src/signal/sigset.c +++ b/system/lib/libc/musl/src/signal/sigset.c @@ -3,7 +3,7 @@ void (*sigset(int sig, void (*handler)(int)))(int) { struct sigaction sa, sa_old; - sigset_t mask; + sigset_t mask, mask_old; sigemptyset(&mask); if (sigaddset(&mask, sig) < 0) @@ -12,7 +12,7 @@ void (*sigset(int sig, void (*handler)(int)))(int) if (handler == SIG_HOLD) { if (sigaction(sig, 0, &sa_old) < 0) return SIG_ERR; - if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0) + if (sigprocmask(SIG_BLOCK, &mask, &mask_old) < 0) return SIG_ERR; } else { sa.sa_handler = handler; @@ -20,8 +20,8 @@ void (*sigset(int sig, void (*handler)(int)))(int) sigemptyset(&sa.sa_mask); if (sigaction(sig, &sa, &sa_old) < 0) return SIG_ERR; - if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0) + if (sigprocmask(SIG_UNBLOCK, &mask, &mask_old) < 0) return SIG_ERR; } - return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler; + return sigismember(&mask_old, sig) ? SIG_HOLD : sa_old.sa_handler; } diff --git a/system/lib/libc/musl/src/signal/sigsetjmp_tail.c b/system/lib/libc/musl/src/signal/sigsetjmp_tail.c index 78762aa2bf8d1..f2aa28878e47f 100644 --- a/system/lib/libc/musl/src/signal/sigsetjmp_tail.c +++ b/system/lib/libc/musl/src/signal/sigsetjmp_tail.c @@ -2,8 +2,7 @@ #include #include "syscall.h" -__attribute__((__visibility__("hidden"))) -int __sigsetjmp_tail(sigjmp_buf jb, int ret) +hidden int __sigsetjmp_tail(sigjmp_buf jb, int ret) { void *p = jb->__ss; __syscall(SYS_rt_sigprocmask, SIG_SETMASK, ret?p:0, ret?0:p, _NSIG/8); diff --git a/system/lib/libc/musl/src/signal/sigsuspend.c b/system/lib/libc/musl/src/signal/sigsuspend.c index 0b42725acef2a..36e0602c60bf5 100644 --- a/system/lib/libc/musl/src/signal/sigsuspend.c +++ b/system/lib/libc/musl/src/signal/sigsuspend.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" int sigsuspend(const sigset_t *mask) { diff --git a/system/lib/libc/musl/src/signal/sigtimedwait.c b/system/lib/libc/musl/src/signal/sigtimedwait.c index 0739986b1959b..1287174ebafdf 100644 --- a/system/lib/libc/musl/src/signal/sigtimedwait.c +++ b/system/lib/libc/musl/src/signal/sigtimedwait.c @@ -1,13 +1,32 @@ #include #include #include "syscall.h" -#include "libc.h" + +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +static int do_sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict ts) +{ +#ifdef SYS_rt_sigtimedwait_time64 + time_t s = ts ? ts->tv_sec : 0; + long ns = ts ? ts->tv_nsec : 0; + int r = -ENOSYS; + if (SYS_rt_sigtimedwait == SYS_rt_sigtimedwait_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_rt_sigtimedwait_time64, mask, si, + ts ? ((long long[]){s, ns}) : 0, _NSIG/8); + if (SYS_rt_sigtimedwait == SYS_rt_sigtimedwait_time64 || r!=-ENOSYS) + return r; + return __syscall_cp(SYS_rt_sigtimedwait, mask, si, + ts ? ((long[]){CLAMP(s), ns}) : 0, _NSIG/8);; +#else + return __syscall_cp(SYS_rt_sigtimedwait, mask, si, ts, _NSIG/8); +#endif +} int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict timeout) { int ret; - do ret = syscall_cp(SYS_rt_sigtimedwait, mask, - si, timeout, _NSIG/8); - while (ret<0 && errno==EINTR); - return ret; + do ret = do_sigtimedwait(mask, si, timeout); + while (ret==-EINTR); + return __syscall_ret(ret); } diff --git a/system/lib/libc/musl/src/stat/__xstat.c b/system/lib/libc/musl/src/stat/__xstat.c index 73c873aea226a..630936a0faf3f 100644 --- a/system/lib/libc/musl/src/stat/__xstat.c +++ b/system/lib/libc/musl/src/stat/__xstat.c @@ -1,5 +1,6 @@ #include -#include "libc.h" + +#if !_REDIR_TIME64 int __fxstat(int ver, int fd, struct stat *buf) { @@ -21,10 +22,12 @@ int __xstat(int ver, const char *path, struct stat *buf) return stat(path, buf); } -LFS64(__fxstat); -LFS64(__fxstatat); -LFS64(__lxstat); -LFS64(__xstat); +weak_alias(__fxstat, __fxstat64); +weak_alias(__fxstatat, __fxstatat64); +weak_alias(__lxstat, __lxstat64); +weak_alias(__xstat, __xstat64); + +#endif int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev) { diff --git a/system/lib/libc/musl/src/stat/fchmod.c b/system/lib/libc/musl/src/stat/fchmod.c index 5d90ecceff973..58badd5c01bb8 100644 --- a/system/lib/libc/musl/src/stat/fchmod.c +++ b/system/lib/libc/musl/src/stat/fchmod.c @@ -6,8 +6,6 @@ #include #include "syscall.h" -void __procfdname(char *, unsigned); - int fchmod(int fd, mode_t mode) { int ret = __syscall(SYS_fchmod, fd, mode); diff --git a/system/lib/libc/musl/src/stat/fchmodat.c b/system/lib/libc/musl/src/stat/fchmodat.c index 9ff4a5928ed35..934c5355fbd45 100644 --- a/system/lib/libc/musl/src/stat/fchmodat.c +++ b/system/lib/libc/musl/src/stat/fchmodat.c @@ -2,8 +2,7 @@ #include #include #include "syscall.h" - -void __procfdname(char *, unsigned); +#include "kstat.h" int fchmodat(int fd, const char *path, mode_t mode, int flag) { @@ -12,7 +11,7 @@ int fchmodat(int fd, const char *path, mode_t mode, int flag) if (flag != AT_SYMLINK_NOFOLLOW) return __syscall_ret(-EINVAL); - struct stat st; + struct kstat st; int ret, fd2; char proc[15+3*sizeof(int)]; diff --git a/system/lib/libc/musl/src/stat/fstat.c b/system/lib/libc/musl/src/stat/fstat.c index ca4d49991908c..9bbb46decb035 100644 --- a/system/lib/libc/musl/src/stat/fstat.c +++ b/system/lib/libc/musl/src/stat/fstat.c @@ -1,31 +1,15 @@ -#ifdef __EMSCRIPTEN__ -#include -#endif +#define _BSD_SOURCE #include #include #include #include "syscall.h" -#include "libc.h" - -void __procfdname(char *, unsigned); int fstat(int fd, struct stat *st) { - int ret = __syscall(SYS_fstat, fd, st); -#if __EMSCRIPTEN__ - return __syscall_ret(ret); -#else - if (ret != -EBADF || __syscall(SYS_fcntl, fd, F_GETFD) < 0) - return __syscall_ret(ret); -#endif - - char buf[15+3*sizeof(int)]; - __procfdname(buf, fd); -#ifdef SYS_stat - return syscall(SYS_stat, buf, st); -#else - return syscall(SYS_fstatat, AT_FDCWD, buf, st, 0); -#endif + if (fd<0) return __syscall_ret(-EBADF); + return fstatat(fd, "", st, AT_EMPTY_PATH); } -LFS64(fstat); +#if !_REDIR_TIME64 +weak_alias(fstat, fstat64); +#endif diff --git a/system/lib/libc/musl/src/stat/fstatat.c b/system/lib/libc/musl/src/stat/fstatat.c index 863d5268e880d..cd555accf3deb 100644 --- a/system/lib/libc/musl/src/stat/fstatat.c +++ b/system/lib/libc/musl/src/stat/fstatat.c @@ -1,10 +1,163 @@ +#define _BSD_SOURCE #include +#include +#include +#include +#include +#include #include "syscall.h" -#include "libc.h" +#include "kstat.h" -int fstatat(int fd, const char *restrict path, struct stat *restrict buf, int flag) +/* XXX Emscripten: We #define kstat to stat so we can simply make the syscall + * without the extra copy. + * See arch/emscripten/kstat.h + */ +#ifndef __EMSCRIPTEN__ +struct statx { + uint32_t stx_mask; + uint32_t stx_blksize; + uint64_t stx_attributes; + uint32_t stx_nlink; + uint32_t stx_uid; + uint32_t stx_gid; + uint16_t stx_mode; + uint16_t pad1; + uint64_t stx_ino; + uint64_t stx_size; + uint64_t stx_blocks; + uint64_t stx_attributes_mask; + struct { + int64_t tv_sec; + uint32_t tv_nsec; + int32_t pad; + } stx_atime, stx_btime, stx_ctime, stx_mtime; + uint32_t stx_rdev_major; + uint32_t stx_rdev_minor; + uint32_t stx_dev_major; + uint32_t stx_dev_minor; + uint64_t spare[14]; +}; + +static int fstatat_statx(int fd, const char *restrict path, struct stat *restrict st, int flag) +{ + struct statx stx; + + int ret = __syscall(SYS_statx, fd, path, flag, 0x7ff, &stx); + if (ret) return ret; + + *st = (struct stat){ + .st_dev = makedev(stx.stx_dev_major, stx.stx_dev_minor), + .st_ino = stx.stx_ino, + .st_mode = stx.stx_mode, + .st_nlink = stx.stx_nlink, + .st_uid = stx.stx_uid, + .st_gid = stx.stx_gid, + .st_rdev = makedev(stx.stx_rdev_major, stx.stx_rdev_minor), + .st_size = stx.stx_size, + .st_blksize = stx.stx_blksize, + .st_blocks = stx.stx_blocks, + .st_atim.tv_sec = stx.stx_atime.tv_sec, + .st_atim.tv_nsec = stx.stx_atime.tv_nsec, + .st_mtim.tv_sec = stx.stx_mtime.tv_sec, + .st_mtim.tv_nsec = stx.stx_mtime.tv_nsec, + .st_ctim.tv_sec = stx.stx_ctime.tv_sec, + .st_ctim.tv_nsec = stx.stx_ctime.tv_nsec, +#if _REDIR_TIME64 + .__st_atim32.tv_sec = stx.stx_atime.tv_sec, + .__st_atim32.tv_nsec = stx.stx_atime.tv_nsec, + .__st_mtim32.tv_sec = stx.stx_mtime.tv_sec, + .__st_mtim32.tv_nsec = stx.stx_mtime.tv_nsec, + .__st_ctim32.tv_sec = stx.stx_ctime.tv_sec, + .__st_ctim32.tv_nsec = stx.stx_ctime.tv_nsec, +#endif + }; + return 0; +} + +static int fstatat_kstat(int fd, const char *restrict path, struct stat *restrict st, int flag) +{ + int ret; + struct kstat kst; + + if (flag==AT_EMPTY_PATH && fd>=0 && !*path) { + ret = __syscall(SYS_fstat, fd, &kst); + if (ret==-EBADF && __syscall(SYS_fcntl, fd, F_GETFD)>=0) { + ret = __syscall(SYS_fstatat, fd, path, &kst, flag); + if (ret==-EINVAL) { + char buf[15+3*sizeof(int)]; + __procfdname(buf, fd); +#ifdef SYS_stat + ret = __syscall(SYS_stat, buf, &kst); +#else + ret = __syscall(SYS_fstatat, AT_FDCWD, buf, &kst, 0); +#endif + } + } + } +#ifdef SYS_lstat + else if ((fd == AT_FDCWD || *path=='/') && flag==AT_SYMLINK_NOFOLLOW) + ret = __syscall(SYS_lstat, path, &kst); +#endif +#ifdef SYS_stat + else if ((fd == AT_FDCWD || *path=='/') && !flag) + ret = __syscall(SYS_stat, path, &kst); +#endif + else ret = __syscall(SYS_fstatat, fd, path, &kst, flag); + + if (ret) return ret; + + *st = (struct stat){ + .st_dev = kst.st_dev, + .st_ino = kst.st_ino, + .st_mode = kst.st_mode, + .st_nlink = kst.st_nlink, + .st_uid = kst.st_uid, + .st_gid = kst.st_gid, + .st_rdev = kst.st_rdev, + .st_size = kst.st_size, + .st_blksize = kst.st_blksize, + .st_blocks = kst.st_blocks, + .st_atim.tv_sec = kst.st_atime_sec, + .st_atim.tv_nsec = kst.st_atime_nsec, + .st_mtim.tv_sec = kst.st_mtime_sec, + .st_mtim.tv_nsec = kst.st_mtime_nsec, + .st_ctim.tv_sec = kst.st_ctime_sec, + .st_ctim.tv_nsec = kst.st_ctime_nsec, +#if _REDIR_TIME64 + .__st_atim32.tv_sec = kst.st_atime_sec, + .__st_atim32.tv_nsec = kst.st_atime_nsec, + .__st_mtim32.tv_sec = kst.st_mtime_sec, + .__st_mtim32.tv_nsec = kst.st_mtime_nsec, + .__st_ctim32.tv_sec = kst.st_ctime_sec, + .__st_ctim32.tv_nsec = kst.st_ctime_nsec, +#endif + }; + + return 0; +} +#endif + +int fstatat(int fd, const char *restrict path, struct stat *restrict st, int flag) { - return syscall(SYS_fstatat, fd, path, buf, flag); + int ret; +#ifdef __EMSCRIPTEN__ + // some logic here copied from fstatat_kstat above + if (flag==AT_EMPTY_PATH && fd>=0 && !*path) + ret = __syscall(SYS_fstat, fd, st); + else if ((fd == AT_FDCWD || *path=='/') && !flag) + ret = __syscall(SYS_stat, path, st); + else + ret = __syscall(SYS_fstatat, fd, path, st, flag); +#else + if (sizeof((struct kstat){0}.st_atime_sec) < sizeof(time_t)) { + ret = fstatat_statx(fd, path, st, flag); + if (ret!=-ENOSYS) return __syscall_ret(ret); + } + ret = fstatat_kstat(fd, path, st, flag); +#endif + return __syscall_ret(ret); } -LFS64(fstatat); +#if !_REDIR_TIME64 +weak_alias(fstatat, fstatat64); +#endif diff --git a/system/lib/libc/musl/src/stat/futimesat.c b/system/lib/libc/musl/src/stat/futimesat.c index b4eea1d3c440b..4bdb1c2965a90 100644 --- a/system/lib/libc/musl/src/stat/futimesat.c +++ b/system/lib/libc/musl/src/stat/futimesat.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" int __futimesat(int dirfd, const char *pathname, const struct timeval times[2]) { diff --git a/system/lib/libc/musl/src/stat/lstat.c b/system/lib/libc/musl/src/stat/lstat.c index 5e8b84fcffad6..6fe004dec28c4 100644 --- a/system/lib/libc/musl/src/stat/lstat.c +++ b/system/lib/libc/musl/src/stat/lstat.c @@ -1,15 +1,11 @@ #include #include -#include "syscall.h" -#include "libc.h" int lstat(const char *restrict path, struct stat *restrict buf) { -#ifdef SYS_lstat - return syscall(SYS_lstat, path, buf); -#else - return syscall(SYS_fstatat, AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW); -#endif + return fstatat(AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW); } -LFS64(lstat); +#if !_REDIR_TIME64 +weak_alias(lstat, lstat64); +#endif diff --git a/system/lib/libc/musl/src/stat/stat.c b/system/lib/libc/musl/src/stat/stat.c index b4433a0a7cd13..ea70efc4a0a4e 100644 --- a/system/lib/libc/musl/src/stat/stat.c +++ b/system/lib/libc/musl/src/stat/stat.c @@ -1,15 +1,11 @@ #include #include -#include "syscall.h" -#include "libc.h" int stat(const char *restrict path, struct stat *restrict buf) { -#ifdef SYS_stat - return syscall(SYS_stat, path, buf); -#else - return syscall(SYS_fstatat, AT_FDCWD, path, buf, 0); -#endif + return fstatat(AT_FDCWD, path, buf, 0); } -LFS64(stat); +#if !_REDIR_TIME64 +weak_alias(stat, stat64); +#endif diff --git a/system/lib/libc/musl/src/stat/statvfs.c b/system/lib/libc/musl/src/stat/statvfs.c index 30d587971b0a0..f65d1b548d41e 100644 --- a/system/lib/libc/musl/src/stat/statvfs.c +++ b/system/lib/libc/musl/src/stat/statvfs.c @@ -1,9 +1,8 @@ #include #include #include "syscall.h" -#include "libc.h" -int __statfs(const char *path, struct statfs *buf) +static int __statfs(const char *path, struct statfs *buf) { *buf = (struct statfs){0}; #ifdef SYS_statfs64 @@ -13,7 +12,7 @@ int __statfs(const char *path, struct statfs *buf) #endif } -int __fstatfs(int fd, struct statfs *buf) +static int __fstatfs(int fd, struct statfs *buf) { *buf = (struct statfs){0}; #ifdef SYS_fstatfs64 @@ -58,7 +57,7 @@ int fstatvfs(int fd, struct statvfs *buf) return 0; } -LFS64(statvfs); -LFS64(statfs); -LFS64(fstatvfs); -LFS64(fstatfs); +weak_alias(statvfs, statvfs64); +weak_alias(statfs, statfs64); +weak_alias(fstatvfs, fstatvfs64); +weak_alias(fstatfs, fstatfs64); diff --git a/system/lib/libc/musl/src/stat/utimensat.c b/system/lib/libc/musl/src/stat/utimensat.c index 159c8be3b3c71..730723a9ea70d 100644 --- a/system/lib/libc/musl/src/stat/utimensat.c +++ b/system/lib/libc/musl/src/stat/utimensat.c @@ -4,28 +4,51 @@ #include #include "syscall.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define NS_SPECIAL(ns) ((ns)==UTIME_NOW || (ns)==UTIME_OMIT) + int utimensat(int fd, const char *path, const struct timespec times[2], int flags) { - int r = __syscall(SYS_utimensat, fd, path, times, flags); + int r; + if (times && times[0].tv_nsec==UTIME_NOW && times[1].tv_nsec==UTIME_NOW) + times = 0; +#ifdef SYS_utimensat_time64 + r = -ENOSYS; + time_t s0=0, s1=0; + long ns0=0, ns1=0; + if (times) { + ns0 = times[0].tv_nsec; + ns1 = times[1].tv_nsec; + if (!NS_SPECIAL(ns0)) s0 = times[0].tv_sec; + if (!NS_SPECIAL(ns1)) s1 = times[1].tv_sec; + } + if (SYS_utimensat == SYS_utimensat_time64 || !IS32BIT(s0) || !IS32BIT(s1)) + r = __syscall(SYS_utimensat_time64, fd, path, times ? + ((long long[]){s0, ns0, s1, ns1}) : 0, flags); + if (SYS_utimensat == SYS_utimensat_time64 || r!=-ENOSYS) + return __syscall_ret(r); + if (!IS32BIT(s0) || !IS32BIT(s1)) + return __syscall_ret(-ENOTSUP); + r = __syscall(SYS_utimensat, fd, path, + times ? ((long[]){s0, ns0, s1, ns1}) : 0, flags); +#else + r = __syscall(SYS_utimensat, fd, path, times, flags); +#endif + #ifdef SYS_futimesat if (r != -ENOSYS || flags) return __syscall_ret(r); - struct timeval *tv = 0, tmp[2]; + long *tv=0, tmp[4]; if (times) { int i; tv = tmp; for (i=0; i<2; i++) { if (times[i].tv_nsec >= 1000000000ULL) { - if (times[i].tv_nsec == UTIME_NOW && - times[1-i].tv_nsec == UTIME_NOW) { - tv = 0; - break; - } - if (times[i].tv_nsec == UTIME_OMIT) + if (NS_SPECIAL(times[i].tv_nsec)) return __syscall_ret(-ENOSYS); return __syscall_ret(-EINVAL); } - tmp[i].tv_sec = times[i].tv_sec; - tmp[i].tv_usec = times[i].tv_nsec / 1000; + tmp[2*i+0] = times[i].tv_sec; + tmp[2*i+1] = times[i].tv_nsec / 1000; } } diff --git a/system/lib/libc/musl/src/stdio/__fdopen.c b/system/lib/libc/musl/src/stdio/__fdopen.c index eceee1a69fa2f..ffc4df718a0b8 100644 --- a/system/lib/libc/musl/src/stdio/__fdopen.c +++ b/system/lib/libc/musl/src/stdio/__fdopen.c @@ -4,6 +4,7 @@ #include #include #include +#include "libc.h" FILE *__fdopen(int fd, const char *mode) { diff --git a/system/lib/libc/musl/src/stdio/__lockfile.c b/system/lib/libc/musl/src/stdio/__lockfile.c index 7932d4a1b2046..2b648c05660a2 100644 --- a/system/lib/libc/musl/src/stdio/__lockfile.c +++ b/system/lib/libc/musl/src/stdio/__lockfile.c @@ -4,11 +4,16 @@ int __lockfile(FILE *f) { #if defined(__EMSCRIPTEN_PTHREADS__) - int owner, tid = __pthread_self()->tid; - if (f->lock == tid) + int owner = f->lock, tid = __pthread_self()->tid; + if ((owner & ~MAYBE_WAITERS) == tid) return 0; - while ((owner = a_cas(&f->lock, 0, tid))) - __wait(&f->lock, &f->waiters, owner, 1); + owner = a_cas(&f->lock, 0, tid); + if (!owner) return 1; + while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { + if ((owner & MAYBE_WAITERS) || + a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) + __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); + } #endif return 1; } @@ -16,17 +21,7 @@ int __lockfile(FILE *f) void __unlockfile(FILE *f) { #if defined(__EMSCRIPTEN_PTHREADS__) - a_store(&f->lock, 0); - - /* The following read is technically invalid under situations - * of self-synchronized destruction. Another thread may have - * called fclose as soon as the above store has completed. - * Nonetheless, since FILE objects always live in memory - * obtained by malloc from the heap, it's safe to assume - * the dereferences below will not fault. In the worst case, - * a spurious syscall will be made. If the implementation of - * malloc changes, this assumption needs revisiting. */ - - if (f->waiters) __wake(&f->lock, 1, 1); + if (a_swap(&f->lock, 0) & MAYBE_WAITERS) + __wake(&f->lock, 1, 1); #endif } diff --git a/system/lib/libc/musl/src/stdio/__overflow.c b/system/lib/libc/musl/src/stdio/__overflow.c index 3bb37923abb84..e65a594dd7bf1 100644 --- a/system/lib/libc/musl/src/stdio/__overflow.c +++ b/system/lib/libc/musl/src/stdio/__overflow.c @@ -4,7 +4,7 @@ int __overflow(FILE *f, int _c) { unsigned char c = _c; if (!f->wend && __towrite(f)) return EOF; - if (f->wpos < f->wend && c != f->lbf) return *f->wpos++ = c; + if (f->wpos != f->wend && c != f->lbf) return *f->wpos++ = c; if (f->write(f, &c, 1)!=1) return EOF; return c; } diff --git a/system/lib/libc/musl/src/stdio/__stdio_close.c b/system/lib/libc/musl/src/stdio/__stdio_close.c index 0fba49163b1ff..ee1dbacf5ec9f 100644 --- a/system/lib/libc/musl/src/stdio/__stdio_close.c +++ b/system/lib/libc/musl/src/stdio/__stdio_close.c @@ -1,4 +1,5 @@ #include "stdio_impl.h" +#include "aio_impl.h" static int dummy(int fd) { diff --git a/system/lib/libc/musl/src/stdio/__stdio_exit.c b/system/lib/libc/musl/src/stdio/__stdio_exit.c index 191b4454a48d3..a5e42c675fa90 100644 --- a/system/lib/libc/musl/src/stdio/__stdio_exit.c +++ b/system/lib/libc/musl/src/stdio/__stdio_exit.c @@ -9,8 +9,8 @@ static void close_file(FILE *f) { if (!f) return; FFINALLOCK(f); - if (f->wpos > f->wbase) f->write(f, 0, 0); - if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR); + if (f->wpos != f->wbase) f->write(f, 0, 0); + if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR); } void __stdio_exit(void) @@ -19,6 +19,7 @@ void __stdio_exit(void) for (f=*__ofl_lock(); f; f=f->next) close_file(f); close_file(__stdin_used); close_file(__stdout_used); + close_file(__stderr_used); } weak_alias(__stdio_exit, __stdio_exit_needed); diff --git a/system/lib/libc/musl/src/stdio/__stdio_read.c b/system/lib/libc/musl/src/stdio/__stdio_read.c index bff641e82a589..392a4858281f3 100644 --- a/system/lib/libc/musl/src/stdio/__stdio_read.c +++ b/system/lib/libc/musl/src/stdio/__stdio_read.c @@ -16,11 +16,12 @@ size_t __stdio_read(FILE *f, unsigned char *buf, size_t len) } cnt = num; #else - cnt = syscall(SYS_readv, f->fd, iov, 2); + cnt = iov[0].iov_len ? syscall(SYS_readv, f->fd, iov, 2) + : syscall(SYS_read, f->fd, iov[1].iov_base, iov[1].iov_len); #endif if (cnt <= 0) { - f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt); - return cnt; + f->flags |= cnt ? F_ERR : F_EOF; + return 0; } if (cnt <= iov[0].iov_len) return cnt; cnt -= iov[0].iov_len; diff --git a/system/lib/libc/musl/src/stdio/__stdio_seek.c b/system/lib/libc/musl/src/stdio/__stdio_seek.c index 37d09f8d9804d..326ab9bce48ed 100644 --- a/system/lib/libc/musl/src/stdio/__stdio_seek.c +++ b/system/lib/libc/musl/src/stdio/__stdio_seek.c @@ -1,18 +1,7 @@ #include "stdio_impl.h" +#include off_t __stdio_seek(FILE *f, off_t off, int whence) { - off_t ret; -#ifdef __EMSCRIPTEN__ - if (__wasi_syscall_ret(__wasi_fd_seek(f->fd, off, whence, &ret))) - ret = -1; -#else -#ifdef SYS__llseek - if (syscall(SYS__llseek, f->fd, off>>32, off, &ret, whence)<0) - ret = -1; -#else - ret = syscall(SYS_lseek, f->fd, off, whence); -#endif -#endif // __EMSCRIPTEN__ - return ret; + return __lseek(f->fd, off, whence); } diff --git a/system/lib/libc/musl/src/stdio/__string_read.c b/system/lib/libc/musl/src/stdio/__string_read.c deleted file mode 100644 index 7b50a7e115422..0000000000000 --- a/system/lib/libc/musl/src/stdio/__string_read.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "stdio_impl.h" -#include - -size_t __string_read(FILE *f, unsigned char *buf, size_t len) -{ - char *src = f->cookie; - size_t k = len+256; - char *end = memchr(src, 0, k); - if (end) k = end-src; - if (k < len) len = k; - memcpy(buf, src, len); - f->rpos = (void *)(src+len); - f->rend = (void *)(src+k); - f->cookie = src+k; - return len; -} diff --git a/system/lib/libc/musl/src/stdio/__toread.c b/system/lib/libc/musl/src/stdio/__toread.c index 35f67b8f8d938..f142ff09c087e 100644 --- a/system/lib/libc/musl/src/stdio/__toread.c +++ b/system/lib/libc/musl/src/stdio/__toread.c @@ -3,7 +3,7 @@ int __toread(FILE *f) { f->mode |= f->mode-1; - if (f->wpos > f->wbase) f->write(f, 0, 0); + if (f->wpos != f->wbase) f->write(f, 0, 0); f->wpos = f->wbase = f->wend = 0; if (f->flags & F_NORD) { f->flags |= F_ERR; @@ -13,9 +13,7 @@ int __toread(FILE *f) return (f->flags & F_EOF) ? EOF : 0; } -void __stdio_exit_needed(void); - -void __toread_needs_stdio_exit() +hidden void __toread_needs_stdio_exit() { __stdio_exit_needed(); } diff --git a/system/lib/libc/musl/src/stdio/__towrite.c b/system/lib/libc/musl/src/stdio/__towrite.c index 0a69d926dc3c1..4c9c66ae79c9e 100644 --- a/system/lib/libc/musl/src/stdio/__towrite.c +++ b/system/lib/libc/musl/src/stdio/__towrite.c @@ -3,7 +3,7 @@ int __towrite(FILE *f) { f->mode |= f->mode-1; - if (f->flags & (F_NOWR)) { + if (f->flags & F_NOWR) { f->flags |= F_ERR; return EOF; } @@ -17,9 +17,7 @@ int __towrite(FILE *f) return 0; } -void __stdio_exit_needed(void); - -void __towrite_needs_stdio_exit() +hidden void __towrite_needs_stdio_exit() { __stdio_exit_needed(); } diff --git a/system/lib/libc/musl/src/stdio/ext2.c b/system/lib/libc/musl/src/stdio/ext2.c index f359be9af7622..3416278013184 100644 --- a/system/lib/libc/musl/src/stdio/ext2.c +++ b/system/lib/libc/musl/src/stdio/ext2.c @@ -1,15 +1,15 @@ #include "stdio_impl.h" +#include size_t __freadahead(FILE *f) { - return f->rend - f->rpos; + return f->rend ? f->rend - f->rpos : 0; } const char *__freadptr(FILE *f, size_t *sizep) { - size_t size = f->rend - f->rpos; - if (!size) return 0; - *sizep = size; + if (f->rpos == f->rend) return 0; + *sizep = f->rend - f->rpos; return (const char *)f->rpos; } diff --git a/system/lib/libc/musl/src/stdio/fclose.c b/system/lib/libc/musl/src/stdio/fclose.c index d687a8779b64f..d594532bd64fd 100644 --- a/system/lib/libc/musl/src/stdio/fclose.c +++ b/system/lib/libc/musl/src/stdio/fclose.c @@ -1,5 +1,5 @@ #include "stdio_impl.h" -#include "libc.h" +#include static void dummy(FILE *f) { } weak_alias(dummy, __unlist_locked_file); @@ -7,26 +7,32 @@ weak_alias(dummy, __unlist_locked_file); int fclose(FILE *f) { int r; - int perm; FLOCK(f); + r = fflush(f); + r |= f->close(f); + FUNLOCK(f); - __unlist_locked_file(f); + /* Past this point, f is closed and any further explict access + * to it is undefined. However, it still exists as an entry in + * the open file list and possibly in the thread's locked files + * list, if it was closed while explicitly locked. Functions + * which process these lists must tolerate dead FILE objects + * (which necessarily have inactive buffer pointers) without + * producing any side effects. */ - if (!(perm = f->flags & F_PERM)) { - FILE **head = __ofl_lock(); - if (f->prev) f->prev->next = f->next; - if (f->next) f->next->prev = f->prev; - if (*head == f) *head = f->next; - __ofl_unlock(); - } + if (f->flags & F_PERM) return r; - r = fflush(f); - r |= f->close(f); + __unlist_locked_file(f); + + FILE **head = __ofl_lock(); + if (f->prev) f->prev->next = f->next; + if (f->next) f->next->prev = f->prev; + if (*head == f) *head = f->next; + __ofl_unlock(); - if (f->getln_buf) free(f->getln_buf); - if (!perm) free(f); - else FUNLOCK(f); + free(f->getln_buf); + free(f); return r; } diff --git a/system/lib/libc/musl/src/stdio/fflush.c b/system/lib/libc/musl/src/stdio/fflush.c index 3f462c80e8d12..b009437641899 100644 --- a/system/lib/libc/musl/src/stdio/fflush.c +++ b/system/lib/libc/musl/src/stdio/fflush.c @@ -1,48 +1,47 @@ #include "stdio_impl.h" -static int __fflush_unlocked(FILE *f) -{ - /* If writing, flush output */ - if (f->wpos > f->wbase) { - f->write(f, 0, 0); - if (!f->wpos) return EOF; - } - - /* If reading, sync position, per POSIX */ - if (f->rpos < f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR); - - /* Clear read and write modes */ - f->wpos = f->wbase = f->wend = 0; - f->rpos = f->rend = 0; - - return 0; -} - /* stdout.c will override this if linked */ static FILE *volatile dummy = 0; weak_alias(dummy, __stdout_used); +weak_alias(dummy, __stderr_used); int fflush(FILE *f) { - int r; + if (!f) { + int r = 0; + if (__stdout_used) r |= fflush(__stdout_used); + if (__stderr_used) r |= fflush(__stderr_used); + + for (f=*__ofl_lock(); f; f=f->next) { + FLOCK(f); + if (f->wpos != f->wbase) r |= fflush(f); + FUNLOCK(f); + } + __ofl_unlock(); - if (f) { - FLOCK(f); - r = __fflush_unlocked(f); - FUNLOCK(f); return r; } - r = __stdout_used ? fflush(__stdout_used) : 0; + FLOCK(f); - for (f=*__ofl_lock(); f; f=f->next) { - FLOCK(f); - if (f->wpos > f->wbase) r |= __fflush_unlocked(f); - FUNLOCK(f); + /* If writing, flush output */ + if (f->wpos != f->wbase) { + f->write(f, 0, 0); + if (!f->wpos) { + FUNLOCK(f); + return EOF; + } } - __ofl_unlock(); - - return r; + + /* If reading, sync position, per POSIX */ + if (f->rpos != f->rend) f->seek(f, f->rpos-f->rend, SEEK_CUR); + + /* Clear read and write modes */ + f->wpos = f->wbase = f->wend = 0; + f->rpos = f->rend = 0; + + FUNLOCK(f); + return 0; } -weak_alias(__fflush_unlocked, fflush_unlocked); +weak_alias(fflush, fflush_unlocked); diff --git a/system/lib/libc/musl/src/stdio/fgetc.c b/system/lib/libc/musl/src/stdio/fgetc.c index e122416406d8c..2578afccd28ac 100644 --- a/system/lib/libc/musl/src/stdio/fgetc.c +++ b/system/lib/libc/musl/src/stdio/fgetc.c @@ -1,11 +1,7 @@ -#include "stdio_impl.h" +#include +#include "getc.h" int fgetc(FILE *f) { - int c; - if (f->lock < 0 || !__lockfile(f)) - return getc_unlocked(f); - c = getc_unlocked(f); - __unlockfile(f); - return c; + return do_getc(f); } diff --git a/system/lib/libc/musl/src/stdio/fgetln.c b/system/lib/libc/musl/src/stdio/fgetln.c index afe12b5dfe024..5748435d9f6f9 100644 --- a/system/lib/libc/musl/src/stdio/fgetln.c +++ b/system/lib/libc/musl/src/stdio/fgetln.c @@ -8,7 +8,7 @@ char *fgetln(FILE *f, size_t *plen) ssize_t l; FLOCK(f); ungetc(getc_unlocked(f), f); - if ((z=memchr(f->rpos, '\n', f->rend - f->rpos))) { + if (f->rend && (z=memchr(f->rpos, '\n', f->rend - f->rpos))) { ret = (char *)f->rpos; *plen = ++z - ret; f->rpos = (void *)z; diff --git a/system/lib/libc/musl/src/stdio/fgetpos.c b/system/lib/libc/musl/src/stdio/fgetpos.c index c3fa0eb0af429..50813d2c50eea 100644 --- a/system/lib/libc/musl/src/stdio/fgetpos.c +++ b/system/lib/libc/musl/src/stdio/fgetpos.c @@ -4,8 +4,8 @@ int fgetpos(FILE *restrict f, fpos_t *restrict pos) { off_t off = __ftello(f); if (off < 0) return -1; - *(off_t *)pos = off; + *(long long *)pos = off; return 0; } -LFS64(fgetpos); +weak_alias(fgetpos, fgetpos64); diff --git a/system/lib/libc/musl/src/stdio/fgets.c b/system/lib/libc/musl/src/stdio/fgets.c index d3f9819e82eec..6171f398dacb4 100644 --- a/system/lib/libc/musl/src/stdio/fgets.c +++ b/system/lib/libc/musl/src/stdio/fgets.c @@ -21,14 +21,16 @@ char *fgets(char *restrict s, int n, FILE *restrict f) } while (n) { - z = memchr(f->rpos, '\n', f->rend - f->rpos); - k = z ? z - f->rpos + 1 : f->rend - f->rpos; - k = MIN(k, n); - memcpy(p, f->rpos, k); - f->rpos += k; - p += k; - n -= k; - if (z || !n) break; + if (f->rpos != f->rend) { + z = memchr(f->rpos, '\n', f->rend - f->rpos); + k = z ? z - f->rpos + 1 : f->rend - f->rpos; + k = MIN(k, n); + memcpy(p, f->rpos, k); + f->rpos += k; + p += k; + n -= k; + if (z || !n) break; + } if ((c = getc_unlocked(f)) < 0) { if (p==s || !feof(f)) s = 0; break; diff --git a/system/lib/libc/musl/src/stdio/fgetwc.c b/system/lib/libc/musl/src/stdio/fgetwc.c index e455cfec408bc..aa10b818566a8 100644 --- a/system/lib/libc/musl/src/stdio/fgetwc.c +++ b/system/lib/libc/musl/src/stdio/fgetwc.c @@ -5,35 +5,42 @@ static wint_t __fgetwc_unlocked_internal(FILE *f) { - mbstate_t st = { 0 }; wchar_t wc; int c; - unsigned char b; size_t l; /* Convert character from buffer if possible */ - if (f->rpos < f->rend) { - l = mbrtowc(&wc, (void *)f->rpos, f->rend - f->rpos, &st); - if (l+2 >= 2) { + if (f->rpos != f->rend) { + l = mbtowc(&wc, (void *)f->rpos, f->rend - f->rpos); + if (l+1 >= 1) { f->rpos += l + !l; /* l==0 means 1 byte, null */ return wc; } - if (l == -1) { - f->rpos++; - return WEOF; - } - } else l = -2; + } /* Convert character byte-by-byte */ - while (l == -2) { + mbstate_t st = { 0 }; + unsigned char b; + int first = 1; + do { b = c = getc_unlocked(f); if (c < 0) { - if (!mbsinit(&st)) errno = EILSEQ; + if (!first) { + f->flags |= F_ERR; + errno = EILSEQ; + } return WEOF; } l = mbrtowc(&wc, (void *)&b, 1, &st); - if (l == -1) return WEOF; - } + if (l == -1) { + if (!first) { + f->flags |= F_ERR; + ungetc(b, f); + } + return WEOF; + } + first = 0; + } while (l == -2); return wc; } diff --git a/system/lib/libc/musl/src/stdio/fgetws.c b/system/lib/libc/musl/src/stdio/fgetws.c index 195cb4355a14b..b08b30491af14 100644 --- a/system/lib/libc/musl/src/stdio/fgetws.c +++ b/system/lib/libc/musl/src/stdio/fgetws.c @@ -1,5 +1,6 @@ #include "stdio_impl.h" #include +#include wint_t __fgetwc_unlocked(FILE *); @@ -11,6 +12,10 @@ wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f) FLOCK(f); + /* Setup a dummy errno so we can detect EILSEQ. This is + * the only way to catch encoding errors in the form of a + * partial character just before EOF. */ + errno = EAGAIN; for (; n; n--) { wint_t c = __fgetwc_unlocked(f); if (c == WEOF) break; @@ -18,7 +23,7 @@ wchar_t *fgetws(wchar_t *restrict s, int n, FILE *restrict f) if (c == '\n') break; } *p = 0; - if (ferror(f)) p = s; + if (ferror(f) || errno==EILSEQ) p = s; FUNLOCK(f); diff --git a/system/lib/libc/musl/src/stdio/fileno.c b/system/lib/libc/musl/src/stdio/fileno.c index ba7f9391b1ec9..0bd0e9889eb02 100644 --- a/system/lib/libc/musl/src/stdio/fileno.c +++ b/system/lib/libc/musl/src/stdio/fileno.c @@ -1,13 +1,16 @@ #include "stdio_impl.h" +#include int fileno(FILE *f) { - /* f->fd never changes, but the lock must be obtained and released - * anyway since this function cannot return while another thread - * holds the lock. */ FLOCK(f); + int fd = f->fd; FUNLOCK(f); - return f->fd; + if (fd < 0) { + errno = EBADF; + return -1; + } + return fd; } weak_alias(fileno, fileno_unlocked); diff --git a/system/lib/libc/musl/src/stdio/flockfile.c b/system/lib/libc/musl/src/stdio/flockfile.c index a196c1efe0af1..8e2206514c67d 100644 --- a/system/lib/libc/musl/src/stdio/flockfile.c +++ b/system/lib/libc/musl/src/stdio/flockfile.c @@ -3,8 +3,7 @@ void flockfile(FILE *f) { - while (ftrylockfile(f)) { - int owner = f->lock; - if (owner) __wait(&f->lock, &f->waiters, owner, 1); - } + if (!ftrylockfile(f)) return; + __lockfile(f); + __register_locked_file(f, __pthread_self()); } diff --git a/system/lib/libc/musl/src/stdio/fmemopen.c b/system/lib/libc/musl/src/stdio/fmemopen.c index 7c193a579ba4b..343e3e3fe2f88 100644 --- a/system/lib/libc/musl/src/stdio/fmemopen.c +++ b/system/lib/libc/musl/src/stdio/fmemopen.c @@ -1,7 +1,10 @@ #include "stdio_impl.h" #include #include +#include +#include #include +#include "libc.h" struct cookie { size_t pos, len, size; @@ -9,6 +12,12 @@ struct cookie { int mode; }; +struct mem_FILE { + FILE f; + struct cookie c; + unsigned char buf[UNGET+BUFSIZ], buf2[]; +}; + static off_t mseek(FILE *f, off_t off, int whence) { ssize_t base; @@ -72,43 +81,47 @@ static int mclose(FILE *m) FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode) { - FILE *f; - struct cookie *c; + struct mem_FILE *f; int plus = !!strchr(mode, '+'); - if (!size || !strchr("rwa", *mode)) { + if (!strchr("rwa", *mode)) { errno = EINVAL; return 0; } - if (!buf && size > SIZE_MAX-sizeof(FILE)-BUFSIZ-UNGET) { + if (!buf && size > PTRDIFF_MAX) { errno = ENOMEM; return 0; } - f = calloc(sizeof *f + sizeof *c + UNGET + BUFSIZ + (buf?0:size), 1); + f = malloc(sizeof *f + (buf?0:size)); if (!f) return 0; - f->cookie = c = (void *)(f+1); - f->fd = -1; - f->lbf = EOF; - f->buf = (unsigned char *)(c+1) + UNGET; - f->buf_size = BUFSIZ; - if (!buf) buf = f->buf + BUFSIZ; + memset(f, 0, offsetof(struct mem_FILE, buf)); + f->f.cookie = &f->c; + f->f.fd = -1; + f->f.lbf = EOF; + f->f.buf = f->buf + UNGET; + f->f.buf_size = sizeof f->buf - UNGET; + if (!buf) { + buf = f->buf2; + memset(buf, 0, size); + } - c->buf = buf; - c->size = size; - c->mode = *mode; + f->c.buf = buf; + f->c.size = size; + f->c.mode = *mode; - if (!plus) f->flags = (*mode == 'r') ? F_NOWR : F_NORD; - if (*mode == 'r') c->len = size; - else if (*mode == 'a') c->len = c->pos = strnlen(buf, size); + if (!plus) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD; + if (*mode == 'r') f->c.len = size; + else if (*mode == 'a') f->c.len = f->c.pos = strnlen(buf, size); + else if (plus) *f->c.buf = 0; - f->read = mread; - f->write = mwrite; - f->seek = mseek; - f->close = mclose; + f->f.read = mread; + f->f.write = mwrite; + f->f.seek = mseek; + f->f.close = mclose; - if (!libc.threaded) f->lock = -1; + if (!libc.threaded) f->f.lock = -1; - return __ofl_add(f); + return __ofl_add(&f->f); } diff --git a/system/lib/libc/musl/src/stdio/fopen.c b/system/lib/libc/musl/src/stdio/fopen.c index 8fa9c63a0548e..5692da61aea4f 100644 --- a/system/lib/libc/musl/src/stdio/fopen.c +++ b/system/lib/libc/musl/src/stdio/fopen.c @@ -36,4 +36,4 @@ FILE *fopen(const char *restrict filename, const char *restrict mode) return 0; } -LFS64(fopen); +weak_alias(fopen, fopen64); diff --git a/system/lib/libc/musl/src/stdio/fopencookie.c b/system/lib/libc/musl/src/stdio/fopencookie.c new file mode 100644 index 0000000000000..da042fe8adc37 --- /dev/null +++ b/system/lib/libc/musl/src/stdio/fopencookie.c @@ -0,0 +1,135 @@ +#define _GNU_SOURCE +#include "stdio_impl.h" +#include +#include +#include +#include +#include + +struct fcookie { + void *cookie; + cookie_io_functions_t iofuncs; +}; + +struct cookie_FILE { + FILE f; + struct fcookie fc; + unsigned char buf[UNGET+BUFSIZ]; +}; + +static size_t cookieread(FILE *f, unsigned char *buf, size_t len) +{ + struct fcookie *fc = f->cookie; + ssize_t ret = -1; + size_t remain = len, readlen = 0; + size_t len2 = len - !!f->buf_size; + + if (!fc->iofuncs.read) goto bail; + + if (len2) { + ret = fc->iofuncs.read(fc->cookie, (char *) buf, len2); + if (ret <= 0) goto bail; + + readlen += ret; + remain -= ret; + } + + if (!f->buf_size || remain > !!f->buf_size) return readlen; + + f->rpos = f->buf; + ret = fc->iofuncs.read(fc->cookie, (char *) f->rpos, f->buf_size); + if (ret <= 0) goto bail; + f->rend = f->rpos + ret; + + buf[readlen++] = *f->rpos++; + + return readlen; + +bail: + f->flags |= ret == 0 ? F_EOF : F_ERR; + f->rpos = f->rend = f->buf; + return readlen; +} + +static size_t cookiewrite(FILE *f, const unsigned char *buf, size_t len) +{ + struct fcookie *fc = f->cookie; + ssize_t ret; + size_t len2 = f->wpos - f->wbase; + if (!fc->iofuncs.write) return len; + if (len2) { + f->wpos = f->wbase; + if (cookiewrite(f, f->wpos, len2) < len2) return 0; + } + ret = fc->iofuncs.write(fc->cookie, (const char *) buf, len); + if (ret < 0) { + f->wpos = f->wbase = f->wend = 0; + f->flags |= F_ERR; + return 0; + } + return ret; +} + +static off_t cookieseek(FILE *f, off_t off, int whence) +{ + struct fcookie *fc = f->cookie; + int res; + if (whence > 2U) { + errno = EINVAL; + return -1; + } + if (!fc->iofuncs.seek) { + errno = ENOTSUP; + return -1; + } + res = fc->iofuncs.seek(fc->cookie, &off, whence); + if (res < 0) + return res; + return off; +} + +static int cookieclose(FILE *f) +{ + struct fcookie *fc = f->cookie; + if (fc->iofuncs.close) return fc->iofuncs.close(fc->cookie); + return 0; +} + +FILE *fopencookie(void *cookie, const char *mode, cookie_io_functions_t iofuncs) +{ + struct cookie_FILE *f; + + /* Check for valid initial mode character */ + if (!strchr("rwa", *mode)) { + errno = EINVAL; + return 0; + } + + /* Allocate FILE+fcookie+buffer or fail */ + if (!(f=malloc(sizeof *f))) return 0; + + /* Zero-fill only the struct, not the buffer */ + memset(&f->f, 0, sizeof f->f); + + /* Impose mode restrictions */ + if (!strchr(mode, '+')) f->f.flags = (*mode == 'r') ? F_NOWR : F_NORD; + + /* Set up our fcookie */ + f->fc.cookie = cookie; + f->fc.iofuncs = iofuncs; + + f->f.fd = -1; + f->f.cookie = &f->fc; + f->f.buf = f->buf + UNGET; + f->f.buf_size = sizeof f->buf - UNGET; + f->f.lbf = EOF; + + /* Initialize op ptrs. No problem if some are unneeded. */ + f->f.read = cookieread; + f->f.write = cookiewrite; + f->f.seek = cookieseek; + f->f.close = cookieclose; + + /* Add new FILE to open file list */ + return __ofl_add(&f->f); +} diff --git a/system/lib/libc/musl/src/stdio/fputc.c b/system/lib/libc/musl/src/stdio/fputc.c index 92762c98f8ccf..f364ed38ba747 100644 --- a/system/lib/libc/musl/src/stdio/fputc.c +++ b/system/lib/libc/musl/src/stdio/fputc.c @@ -1,10 +1,7 @@ -#include "stdio_impl.h" +#include +#include "putc.h" int fputc(int c, FILE *f) { - if (f->lock < 0 || !__lockfile(f)) - return putc_unlocked(c, f); - c = putc_unlocked(c, f); - __unlockfile(f); - return c; + return do_putc(c, f); } diff --git a/system/lib/libc/musl/src/stdio/fread.c b/system/lib/libc/musl/src/stdio/fread.c index aef75f7376f70..a2116da61370b 100644 --- a/system/lib/libc/musl/src/stdio/fread.c +++ b/system/lib/libc/musl/src/stdio/fread.c @@ -13,7 +13,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f) f->mode |= f->mode-1; - if (f->rend - f->rpos > 0) { + if (f->rpos != f->rend) { /* First exhaust the buffer. */ k = MIN(f->rend - f->rpos, l); memcpy(dest, f->rpos, k); @@ -25,7 +25,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f) /* Read the remainder directly */ for (; l; l-=k, dest+=k) { k = __toread(f) ? 0 : f->read(f, dest, l); - if (k+1<=1) { + if (!k) { FUNLOCK(f); return (len-l)/size; } diff --git a/system/lib/libc/musl/src/stdio/freopen.c b/system/lib/libc/musl/src/stdio/freopen.c index 9895023dbe621..b636a87484efc 100644 --- a/system/lib/libc/musl/src/stdio/freopen.c +++ b/system/lib/libc/musl/src/stdio/freopen.c @@ -1,5 +1,6 @@ #include "stdio_impl.h" #include +#include /* The basic idea of this implementation is to open a new FILE, * hack the necessary parts of the new FILE into the old one, then @@ -9,8 +10,6 @@ * lock, via flockfile or otherwise, when freopen is called, and in that * case, freopen cannot act until the lock is released. */ -int __dup3(int, int, int); - FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *restrict f) { int fl = __fmodeflags(mode); @@ -53,4 +52,4 @@ FILE *freopen(const char *restrict filename, const char *restrict mode, FILE *re return NULL; } -LFS64(freopen); +weak_alias(freopen, freopen64); diff --git a/system/lib/libc/musl/src/stdio/fscanf.c b/system/lib/libc/musl/src/stdio/fscanf.c index acb8a106c4385..f639e118b0dae 100644 --- a/system/lib/libc/musl/src/stdio/fscanf.c +++ b/system/lib/libc/musl/src/stdio/fscanf.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int fscanf(FILE *restrict f, const char *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdio/fseek.c b/system/lib/libc/musl/src/stdio/fseek.c index b160b74edca0d..439308f7574ba 100644 --- a/system/lib/libc/musl/src/stdio/fseek.c +++ b/system/lib/libc/musl/src/stdio/fseek.c @@ -3,10 +3,10 @@ int __fseeko_unlocked(FILE *f, off_t off, int whence) { /* Adjust relative offset for unread data in buffer, if any. */ - if (whence == SEEK_CUR) off -= f->rend - f->rpos; + if (whence == SEEK_CUR && f->rend) off -= f->rend - f->rpos; /* Flush write buffer, and report error on failure. */ - if (f->wpos > f->wbase) { + if (f->wpos != f->wbase) { f->write(f, 0, 0); if (!f->wpos) return -1; } @@ -40,4 +40,4 @@ int fseek(FILE *f, long off, int whence) weak_alias(__fseeko, fseeko); -LFS64(fseeko); +weak_alias(fseeko, fseeko64); diff --git a/system/lib/libc/musl/src/stdio/fsetpos.c b/system/lib/libc/musl/src/stdio/fsetpos.c index 5d76c8cd5dee4..77ab8d8206034 100644 --- a/system/lib/libc/musl/src/stdio/fsetpos.c +++ b/system/lib/libc/musl/src/stdio/fsetpos.c @@ -2,7 +2,7 @@ int fsetpos(FILE *f, const fpos_t *pos) { - return __fseeko(f, *(const off_t *)pos, SEEK_SET); + return __fseeko(f, *(const long long *)pos, SEEK_SET); } -LFS64(fsetpos); +weak_alias(fsetpos, fsetpos64); diff --git a/system/lib/libc/musl/src/stdio/ftell.c b/system/lib/libc/musl/src/stdio/ftell.c index bb62897a4c7cc..1a2afbbce3a62 100644 --- a/system/lib/libc/musl/src/stdio/ftell.c +++ b/system/lib/libc/musl/src/stdio/ftell.c @@ -5,12 +5,16 @@ off_t __ftello_unlocked(FILE *f) { off_t pos = f->seek(f, 0, - (f->flags & F_APP) && f->wpos > f->wbase + (f->flags & F_APP) && f->wpos != f->wbase ? SEEK_END : SEEK_CUR); if (pos < 0) return pos; /* Adjust for data in buffer. */ - return pos - (f->rend - f->rpos) + (f->wpos - f->wbase); + if (f->rend) + pos += f->rpos - f->rend; + else if (f->wbase) + pos += f->wpos - f->wbase; + return pos; } off_t __ftello(FILE *f) @@ -34,4 +38,4 @@ long ftell(FILE *f) weak_alias(__ftello, ftello); -LFS64(ftello); +weak_alias(ftello, ftello64); diff --git a/system/lib/libc/musl/src/stdio/ftrylockfile.c b/system/lib/libc/musl/src/stdio/ftrylockfile.c index eb13c839bf818..50650585be01f 100644 --- a/system/lib/libc/musl/src/stdio/ftrylockfile.c +++ b/system/lib/libc/musl/src/stdio/ftrylockfile.c @@ -18,23 +18,29 @@ void __unlist_locked_file(FILE *f) } } +void __register_locked_file(FILE *f, pthread_t self) +{ + f->lockcount = 1; + f->prev_locked = 0; + f->next_locked = self->stdio_locks; + if (f->next_locked) f->next_locked->prev_locked = f; + self->stdio_locks = f; +} + int ftrylockfile(FILE *f) { pthread_t self = __pthread_self(); int tid = self->tid; - if (f->lock == tid) { + int owner = f->lock; + if ((owner & ~MAYBE_WAITERS) == tid) { if (f->lockcount == LONG_MAX) return -1; f->lockcount++; return 0; } - if (f->lock < 0) f->lock = 0; - if (f->lock || a_cas(&f->lock, 0, tid)) + if (owner < 0) f->lock = owner = 0; + if (owner || a_cas(&f->lock, 0, tid)) return -1; - f->lockcount = 1; - f->prev_locked = 0; - f->next_locked = self->stdio_locks; - if (f->next_locked) f->next_locked->prev_locked = f; - self->stdio_locks = f; + __register_locked_file(f, self); return 0; } diff --git a/system/lib/libc/musl/src/stdio/funlockfile.c b/system/lib/libc/musl/src/stdio/funlockfile.c index 30a07ef4b3743..44d8b0df5cff3 100644 --- a/system/lib/libc/musl/src/stdio/funlockfile.c +++ b/system/lib/libc/musl/src/stdio/funlockfile.c @@ -1,8 +1,6 @@ #include "stdio_impl.h" #include "pthread_impl.h" -void __unlist_locked_file(FILE *); - void funlockfile(FILE *f) { if (f->lockcount == 1) { diff --git a/system/lib/libc/musl/src/stdio/fwide.c b/system/lib/libc/musl/src/stdio/fwide.c index 8410b1530780d..8bab634ae0b50 100644 --- a/system/lib/libc/musl/src/stdio/fwide.c +++ b/system/lib/libc/musl/src/stdio/fwide.c @@ -1,3 +1,4 @@ +#include #include "stdio_impl.h" #include "locale_impl.h" diff --git a/system/lib/libc/musl/src/stdio/fwscanf.c b/system/lib/libc/musl/src/stdio/fwscanf.c index cb114b39f4bc9..530bb7c7eaa57 100644 --- a/system/lib/libc/musl/src/stdio/fwscanf.c +++ b/system/lib/libc/musl/src/stdio/fwscanf.c @@ -1,7 +1,6 @@ #include #include #include -#include "libc.h" int fwscanf(FILE *restrict f, const wchar_t *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdio/getc.c b/system/lib/libc/musl/src/stdio/getc.c index b3f351d1d7e45..8409fc2343fc9 100644 --- a/system/lib/libc/musl/src/stdio/getc.c +++ b/system/lib/libc/musl/src/stdio/getc.c @@ -1,13 +1,9 @@ -#include "stdio_impl.h" +#include +#include "getc.h" int getc(FILE *f) { - int c; - if (f->lock < 0 || !__lockfile(f)) - return getc_unlocked(f); - c = getc_unlocked(f); - __unlockfile(f); - return c; + return do_getc(f); } weak_alias(getc, _IO_getc); diff --git a/system/lib/libc/musl/src/stdio/getc.h b/system/lib/libc/musl/src/stdio/getc.h new file mode 100644 index 0000000000000..e24f9905c1f8c --- /dev/null +++ b/system/lib/libc/musl/src/stdio/getc.h @@ -0,0 +1,22 @@ +#include "stdio_impl.h" +#include "pthread_impl.h" + +#ifdef __GNUC__ +__attribute__((__noinline__)) +#endif +static int locking_getc(FILE *f) +{ + if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f); + int c = getc_unlocked(f); + if (a_swap(&f->lock, 0) & MAYBE_WAITERS) + __wake(&f->lock, 1, 1); + return c; +} + +static inline int do_getc(FILE *f) +{ + int l = f->lock; + if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid) + return getc_unlocked(f); + return locking_getc(f); +} diff --git a/system/lib/libc/musl/src/stdio/getchar.c b/system/lib/libc/musl/src/stdio/getchar.c index c10126581bf95..df395ca9548dc 100644 --- a/system/lib/libc/musl/src/stdio/getchar.c +++ b/system/lib/libc/musl/src/stdio/getchar.c @@ -1,6 +1,7 @@ #include +#include "getc.h" int getchar(void) { - return fgetc(stdin); + return do_getc(stdin); } diff --git a/system/lib/libc/musl/src/stdio/getdelim.c b/system/lib/libc/musl/src/stdio/getdelim.c index 1ccd802923898..d2f5b15ab1d7d 100644 --- a/system/lib/libc/musl/src/stdio/getdelim.c +++ b/system/lib/libc/musl/src/stdio/getdelim.c @@ -1,10 +1,9 @@ #include "stdio_impl.h" #include +#include #include #include -#define MIN(a,b) ((a)<(b) ? (a) : (b)) - ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restrict f) { char *tmp; @@ -16,6 +15,7 @@ ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restric FLOCK(f); if (!n || !s) { + f->mode |= f->mode-1; f->flags |= F_ERR; FUNLOCK(f); errno = EINVAL; @@ -25,17 +25,32 @@ ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restric if (!*s) *n=0; for (;;) { - z = memchr(f->rpos, delim, f->rend - f->rpos); - k = z ? z - f->rpos + 1 : f->rend - f->rpos; - if (i+k+1 >= *n) { - if (k >= SIZE_MAX/2-i) goto oom; + if (f->rpos != f->rend) { + z = memchr(f->rpos, delim, f->rend - f->rpos); + k = z ? z - f->rpos + 1 : f->rend - f->rpos; + } else { + z = 0; + k = 0; + } + if (i+k >= *n) { size_t m = i+k+2; if (!z && m < SIZE_MAX/4) m += m/2; tmp = realloc(*s, m); if (!tmp) { m = i+k+2; tmp = realloc(*s, m); - if (!tmp) goto oom; + if (!tmp) { + /* Copy as much as fits and ensure no + * pushback remains in the FILE buf. */ + k = *n-i; + memcpy(*s+i, f->rpos, k); + f->rpos += k; + f->mode |= f->mode-1; + f->flags |= F_ERR; + FUNLOCK(f); + errno = ENOMEM; + return -1; + } } *s = tmp; *n = m; @@ -51,18 +66,16 @@ ssize_t getdelim(char **restrict s, size_t *restrict n, int delim, FILE *restric } break; } - if (((*s)[i++] = c) == delim) break; + /* If the byte read by getc won't fit without growing the + * output buffer, push it back for next iteration. */ + if (i+1 >= *n) *--f->rpos = c; + else if (((*s)[i++] = c) == delim) break; } (*s)[i] = 0; FUNLOCK(f); return i; -oom: - f->flags |= F_ERR; - FUNLOCK(f); - errno = ENOMEM; - return -1; } weak_alias(getdelim, __getdelim); diff --git a/system/lib/libc/musl/src/stdio/gets.c b/system/lib/libc/musl/src/stdio/gets.c index 6c4645e5640b7..17963b93e3922 100644 --- a/system/lib/libc/musl/src/stdio/gets.c +++ b/system/lib/libc/musl/src/stdio/gets.c @@ -4,7 +4,12 @@ char *gets(char *s) { - char *ret = fgets(s, INT_MAX, stdin); - if (ret && s[strlen(s)-1] == '\n') s[strlen(s)-1] = 0; - return ret; + size_t i=0; + int c; + FLOCK(stdin); + while ((c=getc_unlocked(stdin)) != EOF && c != '\n') s[i++] = c; + s[i] = 0; + if (c != '\n' && (!feof(stdin) || !i)) s = 0; + FUNLOCK(stdin); + return s; } diff --git a/system/lib/libc/musl/src/stdio/ofl.c b/system/lib/libc/musl/src/stdio/ofl.c index b143999c278a6..aad3d171dff35 100644 --- a/system/lib/libc/musl/src/stdio/ofl.c +++ b/system/lib/libc/musl/src/stdio/ofl.c @@ -1,8 +1,10 @@ #include "stdio_impl.h" -#include "libc.h" +#include "lock.h" +#include "fork_impl.h" static FILE *ofl_head; -static volatile int ofl_lock[2]; +static volatile int ofl_lock[1]; +volatile int *const __stdio_ofl_lockptr = ofl_lock; FILE **__ofl_lock() { diff --git a/system/lib/libc/musl/src/stdio/open_memstream.c b/system/lib/libc/musl/src/stdio/open_memstream.c index eab024da6cd17..600d27705bf52 100644 --- a/system/lib/libc/musl/src/stdio/open_memstream.c +++ b/system/lib/libc/musl/src/stdio/open_memstream.c @@ -2,6 +2,8 @@ #include #include #include +#include +#include "libc.h" struct cookie { char **bufp; @@ -12,6 +14,12 @@ struct cookie { size_t space; }; +struct ms_FILE { + FILE f; + struct cookie c; + unsigned char buf[BUFSIZ]; +}; + static off_t ms_seek(FILE *f, off_t off, int whence) { ssize_t base; @@ -57,34 +65,35 @@ static int ms_close(FILE *f) FILE *open_memstream(char **bufp, size_t *sizep) { - FILE *f; - struct cookie *c; + struct ms_FILE *f; char *buf; - if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0; + if (!(f=malloc(sizeof *f))) return 0; if (!(buf=malloc(sizeof *buf))) { free(f); return 0; } - memset(f, 0, sizeof *f + sizeof *c); - f->cookie = c = (void *)(f+1); + memset(&f->f, 0, sizeof f->f); + memset(&f->c, 0, sizeof f->c); + f->f.cookie = &f->c; - c->bufp = bufp; - c->sizep = sizep; - c->pos = c->len = c->space = *sizep = 0; - c->buf = *bufp = buf; + f->c.bufp = bufp; + f->c.sizep = sizep; + f->c.pos = f->c.len = f->c.space = *sizep = 0; + f->c.buf = *bufp = buf; *buf = 0; - f->flags = F_NORD; - f->fd = -1; - f->buf = (void *)(c+1); - f->buf_size = BUFSIZ; - f->lbf = EOF; - f->write = ms_write; - f->seek = ms_seek; - f->close = ms_close; + f->f.flags = F_NORD; + f->f.fd = -1; + f->f.buf = f->buf; + f->f.buf_size = sizeof f->buf; + f->f.lbf = EOF; + f->f.write = ms_write; + f->f.seek = ms_seek; + f->f.close = ms_close; + f->f.mode = -1; - if (!libc.threaded) f->lock = -1; + if (!libc.threaded) f->f.lock = -1; - return __ofl_add(f); + return __ofl_add(&f->f); } diff --git a/system/lib/libc/musl/src/stdio/open_wmemstream.c b/system/lib/libc/musl/src/stdio/open_wmemstream.c index 4d90cd971964f..ed1b561d9c92f 100644 --- a/system/lib/libc/musl/src/stdio/open_wmemstream.c +++ b/system/lib/libc/musl/src/stdio/open_wmemstream.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include "libc.h" struct cookie { wchar_t **bufp; @@ -14,6 +16,12 @@ struct cookie { mbstate_t mbs; }; +struct wms_FILE { + FILE f; + struct cookie c; + unsigned char buf[1]; +}; + static off_t wms_seek(FILE *f, off_t off, int whence) { ssize_t base; @@ -59,34 +67,36 @@ static int wms_close(FILE *f) FILE *open_wmemstream(wchar_t **bufp, size_t *sizep) { - FILE *f; - struct cookie *c; + struct wms_FILE *f; wchar_t *buf; - if (!(f=malloc(sizeof *f + sizeof *c))) return 0; + if (!(f=malloc(sizeof *f))) return 0; if (!(buf=malloc(sizeof *buf))) { free(f); return 0; } - memset(f, 0, sizeof *f + sizeof *c); - f->cookie = c = (void *)(f+1); + memset(&f->f, 0, sizeof f->f); + memset(&f->c, 0, sizeof f->c); + f->f.cookie = &f->c; - c->bufp = bufp; - c->sizep = sizep; - c->pos = c->len = c->space = *sizep = 0; - c->buf = *bufp = buf; + f->c.bufp = bufp; + f->c.sizep = sizep; + f->c.pos = f->c.len = f->c.space = *sizep = 0; + f->c.buf = *bufp = buf; *buf = 0; - f->flags = F_NORD; - f->fd = -1; - f->buf = (void *)(c+1); - f->buf_size = 0; - f->lbf = EOF; - f->write = wms_write; - f->seek = wms_seek; - f->close = wms_close; + f->f.flags = F_NORD; + f->f.fd = -1; + f->f.buf = f->buf; + f->f.buf_size = 0; + f->f.lbf = EOF; + f->f.write = wms_write; + f->f.seek = wms_seek; + f->f.close = wms_close; + + if (!libc.threaded) f->f.lock = -1; - if (!libc.threaded) f->lock = -1; + fwide(&f->f, 1); - return __ofl_add(f); + return __ofl_add(&f->f); } diff --git a/system/lib/libc/musl/src/stdio/perror.c b/system/lib/libc/musl/src/stdio/perror.c index fdcb4d71c8855..d0943f26a938b 100644 --- a/system/lib/libc/musl/src/stdio/perror.c +++ b/system/lib/libc/musl/src/stdio/perror.c @@ -9,6 +9,11 @@ void perror(const char *msg) char *errstr = strerror(errno); FLOCK(f); + + /* Save stderr's orientation and encoding rule, since perror is not + * permitted to change them. */ + void *old_locale = f->locale; + int old_mode = f->mode; if (msg && *msg) { fwrite(msg, strlen(msg), 1, f); @@ -18,5 +23,8 @@ void perror(const char *msg) fwrite(errstr, strlen(errstr), 1, f); fputc('\n', f); + f->mode = old_mode; + f->locale = old_locale; + FUNLOCK(f); } diff --git a/system/lib/libc/musl/src/stdio/putc.c b/system/lib/libc/musl/src/stdio/putc.c index fa8934969b62d..4744d978725de 100644 --- a/system/lib/libc/musl/src/stdio/putc.c +++ b/system/lib/libc/musl/src/stdio/putc.c @@ -1,12 +1,9 @@ -#include "stdio_impl.h" +#include +#include "putc.h" int putc(int c, FILE *f) { - if (f->lock < 0 || !__lockfile(f)) - return putc_unlocked(c, f); - c = putc_unlocked(c, f); - __unlockfile(f); - return c; + return do_putc(c, f); } weak_alias(putc, _IO_putc); diff --git a/system/lib/libc/musl/src/stdio/putc.h b/system/lib/libc/musl/src/stdio/putc.h new file mode 100644 index 0000000000000..2014c4ec4af9c --- /dev/null +++ b/system/lib/libc/musl/src/stdio/putc.h @@ -0,0 +1,22 @@ +#include "stdio_impl.h" +#include "pthread_impl.h" + +#ifdef __GNUC__ +__attribute__((__noinline__)) +#endif +static int locking_putc(int c, FILE *f) +{ + if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f); + c = putc_unlocked(c, f); + if (a_swap(&f->lock, 0) & MAYBE_WAITERS) + __wake(&f->lock, 1, 1); + return c; +} + +static inline int do_putc(int c, FILE *f) +{ + int l = f->lock; + if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid) + return putc_unlocked(c, f); + return locking_putc(c, f); +} diff --git a/system/lib/libc/musl/src/stdio/putchar.c b/system/lib/libc/musl/src/stdio/putchar.c index 945636d5e6628..f044f16973b57 100644 --- a/system/lib/libc/musl/src/stdio/putchar.c +++ b/system/lib/libc/musl/src/stdio/putchar.c @@ -1,6 +1,7 @@ #include +#include "putc.h" int putchar(int c) { - return fputc(c, stdout); + return do_putc(c, stdout); } diff --git a/system/lib/libc/musl/src/stdio/rename.c b/system/lib/libc/musl/src/stdio/rename.c index 04c90c01343a4..f540adb6cd9c2 100644 --- a/system/lib/libc/musl/src/stdio/rename.c +++ b/system/lib/libc/musl/src/stdio/rename.c @@ -4,9 +4,11 @@ int rename(const char *old, const char *new) { -#ifdef SYS_rename +#if defined(SYS_rename) return syscall(SYS_rename, old, new); -#else +#elif defined(SYS_renameat) return syscall(SYS_renameat, AT_FDCWD, old, AT_FDCWD, new); +#else + return syscall(SYS_renameat2, AT_FDCWD, old, AT_FDCWD, new, 0); #endif } diff --git a/system/lib/libc/musl/src/stdio/scanf.c b/system/lib/libc/musl/src/stdio/scanf.c index a740056cc9c92..bd77699cabef6 100644 --- a/system/lib/libc/musl/src/stdio/scanf.c +++ b/system/lib/libc/musl/src/stdio/scanf.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int scanf(const char *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdio/setvbuf.c b/system/lib/libc/musl/src/stdio/setvbuf.c index 541a125ff124b..523dddc8ba28f 100644 --- a/system/lib/libc/musl/src/stdio/setvbuf.c +++ b/system/lib/libc/musl/src/stdio/setvbuf.c @@ -1,22 +1,27 @@ #include "stdio_impl.h" -/* This function makes no attempt to protect the user from his/her own - * stupidity. If called any time but when then ISO C standard specifically - * allows it, all hell can and will break loose, especially with threads! - * - * This implementation ignores all arguments except the buffering type, - * and uses the existing buffer allocated alongside the FILE object. - * In the case of stderr where the preexisting buffer is length 1, it - * is not possible to set line buffering or full buffering. */ +/* The behavior of this function is undefined except when it is the first + * operation on the stream, so the presence or absence of locking is not + * observable in a program whose behavior is defined. Thus no locking is + * performed here. No allocation of buffers is performed, but a buffer + * provided by the caller is used as long as it is suitably sized. */ int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size) { f->lbf = EOF; - if (type == _IONBF) + if (type == _IONBF) { f->buf_size = 0; - else if (type == _IOLBF) - f->lbf = '\n'; + } else if (type == _IOLBF || type == _IOFBF) { + if (buf && size >= UNGET) { + f->buf = (void *)(buf + UNGET); + f->buf_size = size - UNGET; + } + if (type == _IOLBF && f->buf_size) + f->lbf = '\n'; + } else { + return -1; + } f->flags |= F_SVB; diff --git a/system/lib/libc/musl/src/stdio/sscanf.c b/system/lib/libc/musl/src/stdio/sscanf.c index 8a2302ff67a7f..f2ac2f5da889d 100644 --- a/system/lib/libc/musl/src/stdio/sscanf.c +++ b/system/lib/libc/musl/src/stdio/sscanf.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int sscanf(const char *restrict s, const char *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdio/stderr.c b/system/lib/libc/musl/src/stdio/stderr.c index 229c8651dd5bd..f2bc4648d6f0a 100644 --- a/system/lib/libc/musl/src/stdio/stderr.c +++ b/system/lib/libc/musl/src/stdio/stderr.c @@ -1,7 +1,9 @@ #include "stdio_impl.h" +#undef stderr + static unsigned char buf[UNGET]; -static FILE f = { +hidden FILE __stderr_FILE = { .buf = buf+UNGET, .buf_size = 0, .fd = 2, @@ -12,5 +14,5 @@ static FILE f = { .close = __stdio_close, .lock = -1, }; -FILE *const stderr = &f; -FILE *volatile __stderr_used = &f; +FILE *const stderr = &__stderr_FILE; +FILE *volatile __stderr_used = &__stderr_FILE; diff --git a/system/lib/libc/musl/src/stdio/stdin.c b/system/lib/libc/musl/src/stdio/stdin.c index 171ff22a9842d..5aa5262c2a5c8 100644 --- a/system/lib/libc/musl/src/stdio/stdin.c +++ b/system/lib/libc/musl/src/stdio/stdin.c @@ -1,7 +1,9 @@ #include "stdio_impl.h" +#undef stdin + static unsigned char buf[BUFSIZ+UNGET]; -static FILE f = { +hidden FILE __stdin_FILE = { .buf = buf+UNGET, .buf_size = sizeof buf-UNGET, .fd = 0, @@ -11,5 +13,5 @@ static FILE f = { .close = __stdio_close, .lock = -1, }; -FILE *const stdin = &f; -FILE *volatile __stdin_used = &f; +FILE *const stdin = &__stdin_FILE; +FILE *volatile __stdin_used = &__stdin_FILE; diff --git a/system/lib/libc/musl/src/stdio/stdout.c b/system/lib/libc/musl/src/stdio/stdout.c index 862a7f479ee04..62cf40220a5c4 100644 --- a/system/lib/libc/musl/src/stdio/stdout.c +++ b/system/lib/libc/musl/src/stdio/stdout.c @@ -14,8 +14,10 @@ static int __emscripten_stdout_close(FILE *f) } #endif +#undef stdout + static unsigned char buf[BUFSIZ+UNGET]; -static FILE f = { +hidden FILE __stdout_FILE = { .buf = buf+UNGET, .buf_size = sizeof buf-UNGET, .fd = 1, @@ -33,5 +35,5 @@ static FILE f = { #endif .lock = -1, }; -FILE *const stdout = &f; -FILE *volatile __stdout_used = &f; +FILE *const stdout = &__stdout_FILE; +FILE *volatile __stdout_used = &__stdout_FILE; diff --git a/system/lib/libc/musl/src/stdio/swscanf.c b/system/lib/libc/musl/src/stdio/swscanf.c index d893fbacf13c7..03d572da1c3f2 100644 --- a/system/lib/libc/musl/src/stdio/swscanf.c +++ b/system/lib/libc/musl/src/stdio/swscanf.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int swscanf(const wchar_t *restrict s, const wchar_t *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdio/tempnam.c b/system/lib/libc/musl/src/stdio/tempnam.c index 5a5597527c085..565df6b656a95 100644 --- a/system/lib/libc/musl/src/stdio/tempnam.c +++ b/system/lib/libc/musl/src/stdio/tempnam.c @@ -4,12 +4,12 @@ #include #include #include +#include #include "syscall.h" +#include "kstat.h" #define MAXTRIES 100 -char *__randname(char *); - char *tempnam(const char *dir, const char *pfx) { char s[PATH_MAX]; @@ -38,10 +38,10 @@ char *tempnam(const char *dir, const char *pfx) for (try=0; try #include +#include #include "stdio_impl.h" #define MAXTRIES 100 -char *__randname(char *); - FILE *tmpfile(void) { char s[] = "/tmp/tmpfile_XXXXXX"; @@ -33,4 +32,4 @@ FILE *tmpfile(void) return 0; } -LFS64(tmpfile); +weak_alias(tmpfile, tmpfile64); diff --git a/system/lib/libc/musl/src/stdio/tmpnam.c b/system/lib/libc/musl/src/stdio/tmpnam.c index 449eb9b0708c2..d667a83686b09 100644 --- a/system/lib/libc/musl/src/stdio/tmpnam.c +++ b/system/lib/libc/musl/src/stdio/tmpnam.c @@ -3,12 +3,12 @@ #include #include #include +#include #include "syscall.h" +#include "kstat.h" #define MAXTRIES 100 -char *__randname(char *); - char *tmpnam(char *buf) { static char internal[L_tmpnam]; @@ -18,10 +18,10 @@ char *tmpnam(char *buf) for (try=0; tryflags &= ~F_EOF; FUNLOCK(f); - return c; + return (unsigned char)c; } diff --git a/system/lib/libc/musl/src/stdio/vdprintf.c b/system/lib/libc/musl/src/stdio/vdprintf.c index c35d9b4fb0412..3b9c093bdab85 100644 --- a/system/lib/libc/musl/src/stdio/vdprintf.c +++ b/system/lib/libc/musl/src/stdio/vdprintf.c @@ -1,14 +1,9 @@ #include "stdio_impl.h" -static size_t wrap_write(FILE *f, const unsigned char *buf, size_t len) -{ - return __stdio_write(f, buf, len); -} - int vdprintf(int fd, const char *restrict fmt, va_list ap) { FILE f = { - .fd = fd, .lbf = EOF, .write = wrap_write, + .fd = fd, .lbf = EOF, .write = __stdio_write, .buf = (void *)fmt, .buf_size = 0, .lock = -1 }; diff --git a/system/lib/libc/musl/src/stdio/vfprintf.c b/system/lib/libc/musl/src/stdio/vfprintf.c index 902697950b8cc..998688b1ca8d9 100644 --- a/system/lib/libc/musl/src/stdio/vfprintf.c +++ b/system/lib/libc/musl/src/stdio/vfprintf.c @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include #include @@ -59,14 +61,6 @@ typedef long double long_double; #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED) -#if UINT_MAX == ULONG_MAX -#define LONG_IS_INT -#endif - -#if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX -#define ODD_TYPES -#endif - /* State machine to accept length modifiers + conversion specifiers. * Result is 0 on failure, or an argument type to pop on success. */ @@ -75,23 +69,9 @@ enum { ZTPRE, JPRE, STOP, PTR, INT, UINT, ULLONG, -#ifndef LONG_IS_INT LONG, ULONG, -#else -#define LONG INT -#define ULONG UINT -#endif SHORT, USHORT, CHAR, UCHAR, -#ifdef ODD_TYPES LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR, -#else -#define LLONG ULLONG -#define SIZET ULONG -#define IMAX LLONG -#define UMAX ULLONG -#define PDIFF LONG -#define UIPTR ULONG -#endif DBL, LDBL, NOARG, MAXSTATE @@ -172,29 +152,23 @@ static void pop_arg_long_double(union arg *arg, va_list *ap) static void pop_arg(union arg *arg, int type, va_list *ap, pop_arg_long_double_t pop_arg_long_double) { - /* Give the compiler a hint for optimizing the switch. */ - if ((unsigned)type > MAXSTATE) return; switch (type) { case PTR: arg->p = va_arg(*ap, void *); break; case INT: arg->i = va_arg(*ap, int); break; case UINT: arg->i = va_arg(*ap, unsigned int); -#ifndef LONG_IS_INT break; case LONG: arg->i = va_arg(*ap, long); break; case ULONG: arg->i = va_arg(*ap, unsigned long); -#endif break; case ULLONG: arg->i = va_arg(*ap, unsigned long long); break; case SHORT: arg->i = (short)va_arg(*ap, int); break; case USHORT: arg->i = (unsigned short)va_arg(*ap, int); break; case CHAR: arg->i = (signed char)va_arg(*ap, int); break; case UCHAR: arg->i = (unsigned char)va_arg(*ap, int); -#ifdef ODD_TYPES break; case LLONG: arg->i = va_arg(*ap, long long); break; case SIZET: arg->i = va_arg(*ap, size_t); break; case IMAX: arg->i = va_arg(*ap, intmax_t); break; case UMAX: arg->i = va_arg(*ap, uintmax_t); break; case PDIFF: arg->i = va_arg(*ap, ptrdiff_t); break; case UIPTR: arg->i = (uintptr_t)va_arg(*ap, void *); -#endif break; case DBL: arg->f = va_arg(*ap, double); break; case LDBL: pop_arg_long_double(arg, ap); } @@ -297,6 +271,7 @@ static int fmt_fp(FILE *f, long_double y, int w, int p, int fl, int t) else re=LDBL_MANT_DIG/4-1-p; if (re) { + round *= 1<<(LDBL_MANT_DIG%4); while (re--) round*=16; if (*prefix=='-') { y=-y; @@ -322,6 +297,8 @@ static int fmt_fp(FILE *f, long_double y, int w, int p, int fl, int t) if (s-buf==1 && (y||p>0||(fl&ALT_FORM))) *s++='.'; } while (y); + if (p > INT_MAX-2-(ebuf-estr)-pl) + return -1; if (p && s-buf-2 < p) l = (p+2) + (ebuf-estr); else @@ -362,7 +339,7 @@ static int fmt_fp(FILE *f, long_double y, int w, int p, int fl, int t) } while (e2<0) { uint32_t carry=0, *b; - int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9; + int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3U+8)/9; for (d=a; d>sh) + carry; @@ -393,7 +370,8 @@ static int fmt_fp(FILE *f, long_double y, int w, int p, int fl, int t) if (x || d+1!=z) { long_double round = 2/LDBL_EPSILON; long_double small; - if (*d/i & 1) round += 2; + if ((*d/i & 1) || (i==1000000000 && d>a && (d[-1]&1))) + round += 2; if (x INT_MAX-1-(p || (fl&ALT_FORM))) + return -1; l = 1 + p + (p || (fl&ALT_FORM)); if ((t|32)=='f') { + if (e > INT_MAX-l) return -1; if (e>0) l+=e; } else { estr=fmt_u(e<0 ? -e : e, ebuf); while(ebuf-estr<2) *--estr='0'; *--estr = (e<0 ? '-' : '+'); *--estr = t; + if (ebuf-estr > INT_MAX-l) return -1; l += ebuf-estr; } + if (l > INT_MAX-pl) return -1; pad(f, ' ', w, pl+l, fl); out(f, prefix, pl); pad(f, '0', w, pl+l, fl^ZERO_PAD); @@ -487,8 +470,10 @@ static int fmt_fp(FILE *f, long_double y, int w, int p, int fl, int t) static int getint(char **s) { int i; - for (i=0; isdigit(**s); (*s)++) - i = 10*i + (**s-'0'); + for (i=0; isdigit(**s); (*s)++) { + if (i > INT_MAX/10U || **s-'0' > INT_MAX-10*i) i = -1; + else i = 10*i + (**s-'0'); + } return i; } @@ -498,12 +483,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, { char *a, *z, *s=(char *)fmt; unsigned l10n=0, fl; - int w, p; + int w, p, xp; union arg arg; int argpos; unsigned st, ps; int cnt=0, l=0; - int i; + size_t i; char buf[sizeof(uintmax_t)*3+3+LDBL_MANT_DIG/4]; const char *prefix; int t, pl; @@ -511,18 +496,19 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, char mb[4]; for (;;) { + /* This error is only specified for snprintf, but since it's + * unspecified for other forms, do the same. Stop immediately + * on overflow; otherwise %n could produce wrong results. */ + if (l > INT_MAX - cnt) goto overflow; + /* Update output count, end loop when fmt is exhausted */ - if (cnt >= 0) { - if (l > INT_MAX - cnt) { - errno = EOVERFLOW; - cnt = -1; - } else cnt += l; - } + cnt += l; if (!*s) break; /* Handle literal text and %% format specifiers */ for (a=s; *s && *s!='%'; s++); for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2); + if (z-a > INT_MAX-cnt) goto overflow; l = z-a; if (f) out(f, a, l); if (l) continue; @@ -550,9 +536,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, } else if (!l10n) { w = f ? va_arg(*ap, int) : 0; s++; - } else return -1; + } else goto inval; if (w<0) fl|=LEFT_ADJ, w=-w; - } else if ((w=getint(&s))<0) return -1; + } else if ((w=getint(&s))<0) goto overflow; /* Read precision */ if (*s=='.' && s[1]=='*') { @@ -563,24 +549,29 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, } else if (!l10n) { p = f ? va_arg(*ap, int) : 0; s+=2; - } else return -1; + } else goto inval; + xp = (p>=0); } else if (*s=='.') { s++; p = getint(&s); - } else p = -1; + xp = 1; + } else { + p = -1; + xp = 0; + } /* Format specifier state machine */ st=0; do { - if (OOB(*s)) return -1; + if (OOB(*s)) goto inval; ps=st; st=states[st]S(*s++); } while (st-1=0) return -1; + if (argpos>=0) goto inval; } else { if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos]; else if (f) pop_arg(&arg, st, ap, pop_arg_long_double); @@ -636,7 +627,8 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, case 'u': a = fmt_u(arg.i, z); } - if (p>=0) fl &= ~ZERO_PAD; + if (xp && p<0) goto overflow; + if (xp) fl &= ~ZERO_PAD; if (!arg.i && !p) { a=z; break; @@ -653,9 +645,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, #endif case 's': a = arg.p ? arg.p : "(null)"; - z = memchr(a, 0, p); - if (!z) z=a+p; - else p=z-a; + z = a + strnlen(a, p<0 ? INT_MAX : p); + if (p<0 && *z) goto overflow; + p = z-a; fl &= ~ZERO_PAD; break; case 'C': @@ -665,8 +657,9 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, p = -1; case 'S': ws = arg.p; - for (i=l=0; i<0U+p && *ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l); + for (i=l=0; i

=0 && l<=p-i; i+=l); if (l<0) return -1; + if (i > INT_MAX) goto overflow; p = i; pad(f, ' ', w, p, fl); ws = arg.p; @@ -677,12 +670,16 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, continue; case 'e': case 'f': case 'g': case 'a': case 'E': case 'F': case 'G': case 'A': + if (xp && p<0) goto overflow; l = fmt_fp(f, arg.f, w, p, fl, t); + if (l<0) goto overflow; continue; } if (p < z-a) p = z-a; + if (p > INT_MAX-pl) goto overflow; if (w < pl+p) w = pl+p; + if (w > INT_MAX-cnt) goto overflow; pad(f, ' ', w, pl+p, fl); out(f, prefix, pl); @@ -700,8 +697,15 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, for (i=1; i<=NL_ARGMAX && nl_type[i]; i++) pop_arg(nl_arg+i, nl_type[i], ap, pop_arg_long_double); for (; i<=NL_ARGMAX && !nl_type[i]; i++); - if (i<=NL_ARGMAX) return -1; + if (i<=NL_ARGMAX) goto inval; return 1; + +inval: + errno = EINVAL; + return -1; +overflow: + errno = EOVERFLOW; + return -1; } // XXX EMSCRIPTEN: pass in fmt_fp and pop_arg as a function pointer, so iprintf/__small_printf don't @@ -727,11 +731,12 @@ int __vfprintf_internal(FILE *restrict f, const char *restrict fmt, va_list ap, if (f->mode < 1) f->flags &= ~F_ERR; if (!f->buf_size) { saved_buf = f->buf; - f->wpos = f->wbase = f->buf = internal_buf; + f->buf = internal_buf; f->buf_size = sizeof internal_buf; - f->wend = internal_buf + sizeof internal_buf; + f->wpos = f->wbase = f->wend = 0; } - ret = printf_core(f, fmt, &ap2, nl_arg, nl_type, fmt_fp, pop_arg_long_double); + if (!f->wend && __towrite(f)) ret = -1; + else ret = printf_core(f, fmt, &ap2, nl_arg, nl_type, fmt_fp, pop_arg_long_double); if (saved_buf) { f->write(f, 0, 0); if (!f->wpos) ret = -1; diff --git a/system/lib/libc/musl/src/stdio/vfscanf.c b/system/lib/libc/musl/src/stdio/vfscanf.c index d4d2454b08417..b78a374d3a7f4 100644 --- a/system/lib/libc/musl/src/stdio/vfscanf.c +++ b/system/lib/libc/musl/src/stdio/vfscanf.c @@ -57,7 +57,7 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap) { int width; int size; - int alloc; + int alloc = 0; int base; const unsigned char *p; int c, t; @@ -76,6 +76,9 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap) FLOCK(f); + if (!f->rpos) __toread(f); + if (!f->rpos) goto input_fail; + for (p=(const unsigned char *)fmt; *p; p++) { alloc = 0; @@ -89,15 +92,19 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap) continue; } if (*p != '%' || p[1] == '%') { - p += *p=='%'; shlim(f, 0); - c = shgetc(f); + if (*p == '%') { + p++; + while (isspace((c=shgetc(f)))); + } else { + c = shgetc(f); + } if (c!=*p) { shunget(f); if (c<0) goto input_fail; goto match_fail; } - pos++; + pos += shcnt(f); continue; } diff --git a/system/lib/libc/musl/src/stdio/vfwprintf.c b/system/lib/libc/musl/src/stdio/vfwprintf.c index f9f1ecfd54090..85b036c3dfe2a 100644 --- a/system/lib/libc/musl/src/stdio/vfwprintf.c +++ b/system/lib/libc/musl/src/stdio/vfwprintf.c @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include @@ -19,14 +21,6 @@ #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED) -#if UINT_MAX == ULONG_MAX -#define LONG_IS_INT -#endif - -#if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX -#define ODD_TYPES -#endif - /* State machine to accept length modifiers + conversion specifiers. * Result is 0 on failure, or an argument type to pop on success. */ @@ -35,23 +29,9 @@ enum { ZTPRE, JPRE, STOP, PTR, INT, UINT, ULLONG, -#ifndef LONG_IS_INT LONG, ULONG, -#else -#define LONG INT -#define ULONG UINT -#endif SHORT, USHORT, CHAR, UCHAR, -#ifdef ODD_TYPES LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR, -#else -#define LLONG ULLONG -#define SIZET ULONG -#define IMAX LLONG -#define UMAX ULLONG -#define PDIFF LONG -#define UIPTR ULONG -#endif DBL, LDBL, NOARG, MAXSTATE @@ -73,6 +53,8 @@ static const unsigned char states[]['z'-'A'+1] = { }, { /* 1: l-prefixed */ S('d') = LONG, S('i') = LONG, S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG, + S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL, + S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL, S('c') = INT, S('s') = PTR, S('n') = PTR, S('l') = LLPRE, }, { /* 2: ll-prefixed */ @@ -119,29 +101,23 @@ union arg static void pop_arg(union arg *arg, int type, va_list *ap) { - /* Give the compiler a hint for optimizing the switch. */ - if ((unsigned)type > MAXSTATE) return; switch (type) { case PTR: arg->p = va_arg(*ap, void *); break; case INT: arg->i = va_arg(*ap, int); break; case UINT: arg->i = va_arg(*ap, unsigned int); -#ifndef LONG_IS_INT break; case LONG: arg->i = va_arg(*ap, long); break; case ULONG: arg->i = va_arg(*ap, unsigned long); -#endif break; case ULLONG: arg->i = va_arg(*ap, unsigned long long); break; case SHORT: arg->i = (short)va_arg(*ap, int); break; case USHORT: arg->i = (unsigned short)va_arg(*ap, int); break; case CHAR: arg->i = (signed char)va_arg(*ap, int); break; case UCHAR: arg->i = (unsigned char)va_arg(*ap, int); -#ifdef ODD_TYPES break; case LLONG: arg->i = va_arg(*ap, long long); break; case SIZET: arg->i = va_arg(*ap, size_t); break; case IMAX: arg->i = va_arg(*ap, intmax_t); break; case UMAX: arg->i = va_arg(*ap, uintmax_t); break; case PDIFF: arg->i = va_arg(*ap, ptrdiff_t); break; case UIPTR: arg->i = (uintptr_t)va_arg(*ap, void *); -#endif break; case DBL: arg->f = va_arg(*ap, double); break; case LDBL: arg->f = va_arg(*ap, long double); } @@ -154,8 +130,10 @@ static void out(FILE *f, const wchar_t *s, size_t l) static int getint(wchar_t **s) { int i; - for (i=0; iswdigit(**s); (*s)++) - i = 10*i + (**s-'0'); + for (i=0; iswdigit(**s); (*s)++) { + if (i > INT_MAX/10U || **s-'0' > INT_MAX-10*i) i = -1; + else i = 10*i + (**s-'0'); + } return i; } @@ -168,8 +146,8 @@ static const char sizeprefix['y'-'a'] = { static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_arg, int *nl_type) { wchar_t *a, *z, *s=(wchar_t *)fmt; - unsigned l10n=0, litpct, fl; - int w, p; + unsigned l10n=0, fl; + int w, p, xp; union arg arg; int argpos; unsigned st, ps; @@ -181,20 +159,19 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ wchar_t wc; for (;;) { + /* This error is only specified for snprintf, but since it's + * unspecified for other forms, do the same. Stop immediately + * on overflow; otherwise %n could produce wrong results. */ + if (l > INT_MAX - cnt) goto overflow; + /* Update output count, end loop when fmt is exhausted */ - if (cnt >= 0) { - if (l > INT_MAX - cnt) { - if (!ferror(f)) errno = EOVERFLOW; - cnt = -1; - } else cnt += l; - } + cnt += l; if (!*s) break; /* Handle literal text and %% format specifiers */ for (a=s; *s && *s!='%'; s++); - litpct = wcsspn(s, L"%")/2; /* Optimize %%%% runs */ - z = s+litpct; - s += 2*litpct; + for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2); + if (z-a > INT_MAX-cnt) goto overflow; l = z-a; if (f) out(f, a, l); if (l) continue; @@ -222,9 +199,9 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ } else if (!l10n) { w = f ? va_arg(*ap, int) : 0; s++; - } else return -1; + } else goto inval; if (w<0) fl|=LEFT_ADJ, w=-w; - } else if ((w=getint(&s))<0) return -1; + } else if ((w=getint(&s))<0) goto overflow; /* Read precision */ if (*s=='.' && s[1]=='*') { @@ -235,24 +212,29 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ } else if (!l10n) { p = f ? va_arg(*ap, int) : 0; s+=2; - } else return -1; + } else goto inval; + xp = (p>=0); } else if (*s=='.') { s++; p = getint(&s); - } else p = -1; + xp = 1; + } else { + p = -1; + xp = 0; + } /* Format specifier state machine */ st=0; do { - if (OOB(*s)) return -1; + if (OOB(*s)) goto inval; ps=st; st=states[st]S(*s++); } while (st-1=0) return -1; + if (argpos>=0) goto inval; } else { if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos]; else if (f) pop_arg(&arg, st, ap); @@ -276,8 +258,11 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ } continue; case 'c': + if (w<1) w=1; + if (w>1 && !(fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, ""); fputwc(btowc(arg.i), f); - l = 1; + if (w>1 && (fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, ""); + l = w; continue; case 'C': fputwc(arg.i, f); @@ -285,8 +270,9 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_ continue; case 'S': a = arg.p; - z = wmemchr(a, 0, p); - if (z) p=z-a; + z = a + wcsnlen(a, p<0 ? INT_MAX : p); + if (p<0 && *z) goto overflow; + p = z-a; if (w0; bs+=i, l++); + for (i=l=0; l<(p<0?INT_MAX:p) && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs+=i, l++); if (i<0) return -1; + if (p<0 && *bs) goto overflow; p=l; if (wrpos < (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f)) + ((f)->rpos != (f)->rend && *(f)->rpos < 128 ? *(f)->rpos++ : (getwc)(f)) #undef ungetwc #define ungetwc(c,f) \ @@ -117,8 +116,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) continue; } if (*p != '%' || p[1] == '%') { - p += *p=='%'; - c = getwc(f); + if (*p == '%') { + p++; + while (iswspace((c=getwc(f)))) pos++; + } else { + c = getwc(f); + } if (c!=*p) { ungetwc(c, f); if (c<0) goto input_fail; @@ -214,11 +217,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) set = L""; } else if (t == 's') { invert = 1; - set = (const wchar_t[]){ + static const wchar_t spaces[] = { ' ', '\t', '\n', '\r', 11, 12, 0x0085, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2008, 0x2009, 0x200a, 0x2028, 0x2029, 0x205f, 0x3000, 0 }; + set = spaces; } else { if (*++p == '^') p++, invert = 1; else invert = 0; diff --git a/system/lib/libc/musl/src/stdio/vscanf.c b/system/lib/libc/musl/src/stdio/vscanf.c index 43892f01b304d..9d46ab09d506b 100644 --- a/system/lib/libc/musl/src/stdio/vscanf.c +++ b/system/lib/libc/musl/src/stdio/vscanf.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int vscanf(const char *restrict fmt, va_list ap) { diff --git a/system/lib/libc/musl/src/stdio/vsnprintf.c b/system/lib/libc/musl/src/stdio/vsnprintf.c index 4a234b761cad2..01a3d2bc184b7 100644 --- a/system/lib/libc/musl/src/stdio/vsnprintf.c +++ b/system/lib/libc/musl/src/stdio/vsnprintf.c @@ -4,41 +4,54 @@ #include #include +struct cookie { + char *s; + size_t n; +}; + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + static size_t sn_write(FILE *f, const unsigned char *s, size_t l) { - size_t k = f->wend - f->wpos; - if (k > l) k = l; - memcpy(f->wpos, s, k); - f->wpos += k; - /* pretend to succeed, but discard extra data */ + struct cookie *c = f->cookie; + size_t k = MIN(c->n, f->wpos - f->wbase); + if (k) { + memcpy(c->s, f->wbase, k); + c->s += k; + c->n -= k; + } + k = MIN(c->n, l); + if (k) { + memcpy(c->s, s, k); + c->s += k; + c->n -= k; + } + *c->s = 0; + f->wpos = f->wbase = f->buf; + /* pretend to succeed, even if we discarded extra data */ return l; } int vsnprintf(char *restrict s, size_t n, const char *restrict fmt, va_list ap) { - int r; - char b; - FILE f = { .lbf = EOF, .write = sn_write, .lock = -1 }; + unsigned char buf[1]; + char dummy[1]; + struct cookie c = { .s = n ? s : dummy, .n = n ? n-1 : 0 }; + FILE f = { + .lbf = EOF, + .write = sn_write, + .lock = -1, + .buf = buf, + .cookie = &c, + }; - if (n-1 > INT_MAX-1) { - if (n) { - errno = EOVERFLOW; - return -1; - } - s = &b; - n = 1; + if (n > INT_MAX) { + errno = EOVERFLOW; + return -1; } - /* Ensure pointers don't wrap if "infinite" n is passed in */ - if (n > (char *)0+SIZE_MAX-s-1) n = (char *)0+SIZE_MAX-s-1; - f.buf_size = n; - f.buf = f.wpos = (void *)s; - f.wbase = f.wend = (void *)(s+n); - r = vfprintf(&f, fmt, ap); - - /* Null-terminate, overwriting last char if dest buffer is full */ - if (n) f.wpos[-(f.wpos == f.wend)] = 0; - return r; + *c.s = 0; + return vfprintf(&f, fmt, ap); } // XXX EMSCRIPTEN diff --git a/system/lib/libc/musl/src/stdio/vsscanf.c b/system/lib/libc/musl/src/stdio/vsscanf.c index 929ffa3b0fd8a..4d6d259b8291a 100644 --- a/system/lib/libc/musl/src/stdio/vsscanf.c +++ b/system/lib/libc/musl/src/stdio/vsscanf.c @@ -1,16 +1,25 @@ #include "stdio_impl.h" -#include "libc.h" +#include -static size_t do_read(FILE *f, unsigned char *buf, size_t len) +static size_t string_read(FILE *f, unsigned char *buf, size_t len) { - return __string_read(f, buf, len); + char *src = f->cookie; + size_t k = len+256; + char *end = memchr(src, 0, k); + if (end) k = end-src; + if (k < len) len = k; + memcpy(buf, src, len); + f->rpos = (void *)(src+len); + f->rend = (void *)(src+k); + f->cookie = src+k; + return len; } int vsscanf(const char *restrict s, const char *restrict fmt, va_list ap) { FILE f = { .buf = (void *)s, .cookie = (void *)s, - .read = do_read, .lock = -1 + .read = string_read, .lock = -1 }; return vfscanf(&f, fmt, ap); } diff --git a/system/lib/libc/musl/src/stdio/vswscanf.c b/system/lib/libc/musl/src/stdio/vswscanf.c index 411dd39c9a27f..00b614bc2f5af 100644 --- a/system/lib/libc/musl/src/stdio/vswscanf.c +++ b/system/lib/libc/musl/src/stdio/vswscanf.c @@ -1,5 +1,4 @@ #include "stdio_impl.h" -#include "libc.h" #include static size_t wstring_read(FILE *f, unsigned char *buf, size_t len) diff --git a/system/lib/libc/musl/src/stdio/vwscanf.c b/system/lib/libc/musl/src/stdio/vwscanf.c index 63c9cce10b15a..5a3931e1918d4 100644 --- a/system/lib/libc/musl/src/stdio/vwscanf.c +++ b/system/lib/libc/musl/src/stdio/vwscanf.c @@ -1,7 +1,6 @@ #include #include #include -#include "libc.h" int vwscanf(const wchar_t *restrict fmt, va_list ap) { diff --git a/system/lib/libc/musl/src/stdio/wscanf.c b/system/lib/libc/musl/src/stdio/wscanf.c index 80412252346d3..4dfec25dcf58a 100644 --- a/system/lib/libc/musl/src/stdio/wscanf.c +++ b/system/lib/libc/musl/src/stdio/wscanf.c @@ -1,7 +1,6 @@ #include #include #include -#include "libc.h" int wscanf(const wchar_t *restrict fmt, ...) { diff --git a/system/lib/libc/musl/src/stdlib/abs.c b/system/lib/libc/musl/src/stdlib/abs.c index 4806d629d6cd1..e721fdc2b17e7 100644 --- a/system/lib/libc/musl/src/stdlib/abs.c +++ b/system/lib/libc/musl/src/stdlib/abs.c @@ -1,3 +1,5 @@ +#include + int abs(int a) { return a>0 ? a : -a; diff --git a/system/lib/libc/musl/src/stdlib/bsearch.c b/system/lib/libc/musl/src/stdlib/bsearch.c index 61d89367e7b91..fe050ea30a223 100644 --- a/system/lib/libc/musl/src/stdlib/bsearch.c +++ b/system/lib/libc/musl/src/stdlib/bsearch.c @@ -7,13 +7,13 @@ void *bsearch(const void *key, const void *base, size_t nel, size_t width, int ( while (nel > 0) { try = (char *)base + width*(nel/2); sign = cmp(key, try); - if (!sign) return try; - else if (nel == 1) break; - else if (sign < 0) + if (sign < 0) { nel /= 2; - else { - base = try; - nel -= nel/2; + } else if (sign > 0) { + base = (char *)try + width; + nel -= nel/2+1; + } else { + return try; } } return NULL; diff --git a/system/lib/libc/musl/src/stdlib/labs.c b/system/lib/libc/musl/src/stdlib/labs.c index 675b95b8ef762..83ddb1475c2df 100644 --- a/system/lib/libc/musl/src/stdlib/labs.c +++ b/system/lib/libc/musl/src/stdlib/labs.c @@ -1,3 +1,5 @@ +#include + long labs(long a) { return a>0 ? a : -a; diff --git a/system/lib/libc/musl/src/stdlib/llabs.c b/system/lib/libc/musl/src/stdlib/llabs.c index bec4a03d6685c..9dfaf5cf766d2 100644 --- a/system/lib/libc/musl/src/stdlib/llabs.c +++ b/system/lib/libc/musl/src/stdlib/llabs.c @@ -1,3 +1,5 @@ +#include + long long llabs(long long a) { return a>0 ? a : -a; diff --git a/system/lib/libc/musl/src/stdlib/qsort.c b/system/lib/libc/musl/src/stdlib/qsort.c index 434d9350726df..da58fd3177814 100644 --- a/system/lib/libc/musl/src/stdlib/qsort.c +++ b/system/lib/libc/musl/src/stdlib/qsort.c @@ -21,6 +21,9 @@ /* Minor changes by Rich Felker for integration in musl, 2011-04-27. */ +/* Smoothsort, an adaptive variant of Heapsort. Memory usage: O(1). + Run time: Worst case O(n log n), close to O(n) in the mostly-sorted case. */ + #include #include #include diff --git a/system/lib/libc/musl/src/stdlib/strtod.c b/system/lib/libc/musl/src/stdlib/strtod.c index 07cd599adac57..3aef25a282cc9 100644 --- a/system/lib/libc/musl/src/stdlib/strtod.c +++ b/system/lib/libc/musl/src/stdlib/strtod.c @@ -2,14 +2,11 @@ #include "shgetc.h" #include "floatscan.h" #include "stdio_impl.h" -#include "libc.h" static long double strtox(const char *s, char **p, int prec) { - FILE f = { - .buf = (void *)s, .rpos = (void *)s, - .rend = (void *)-1, .lock = -1 - }; + FILE f; + sh_fromstring(&f, s); shlim(&f, 0); long double y = __floatscan(&f, prec, 1); off_t cnt = shcnt(&f); diff --git a/system/lib/libc/musl/src/stdlib/strtol.c b/system/lib/libc/musl/src/stdlib/strtol.c index f4e53c79def25..29a7f1ad74965 100644 --- a/system/lib/libc/musl/src/stdlib/strtol.c +++ b/system/lib/libc/musl/src/stdlib/strtol.c @@ -4,7 +4,6 @@ #include #include #include -#include "libc.h" #ifdef __EMSCRIPTEN__ #include @@ -91,15 +90,8 @@ static unsigned long long strtox(const char *s, char **p, int base, unsigned lon #else static unsigned long long strtox(const char *s, char **p, int base, unsigned long long lim) { - /* FIXME: use a helper function or macro to setup the FILE */ FILE f; - f.flags = 0; - f.buf = f.rpos = (void *)s; - if ((size_t)s > (size_t)-1/2) - f.rend = (void *)-1; - else - f.rend = (unsigned char *)s+(size_t)-1/2; - f.lock = -1; + sh_fromstring(&f, s); shlim(&f, 0); unsigned long long y = __intscan(&f, base, 1, lim); if (p) { diff --git a/system/lib/libc/musl/src/stdlib/wcstod.c b/system/lib/libc/musl/src/stdlib/wcstod.c index 26fe9af8b4cc7..0deb7010b1afa 100644 --- a/system/lib/libc/musl/src/stdlib/wcstod.c +++ b/system/lib/libc/musl/src/stdlib/wcstod.c @@ -33,8 +33,7 @@ static long double wcstox(const wchar_t *s, wchar_t **p, int prec) unsigned char buf[64]; FILE f = {0}; f.flags = 0; - f.rpos = f.rend = 0; - f.buf = buf + 4; + f.rpos = f.rend = f.buf = buf + 4; f.buf_size = sizeof buf - 4; f.lock = -1; f.read = do_read; diff --git a/system/lib/libc/musl/src/stdlib/wcstol.c b/system/lib/libc/musl/src/stdlib/wcstol.c index 4443f5772d90e..1eeb495fd6eaf 100644 --- a/system/lib/libc/musl/src/stdlib/wcstol.c +++ b/system/lib/libc/musl/src/stdlib/wcstol.c @@ -35,8 +35,7 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign unsigned char buf[64]; FILE f = {0}; f.flags = 0; - f.rpos = f.rend = 0; - f.buf = buf + 4; + f.rpos = f.rend = f.buf = buf + 4; f.buf_size = sizeof buf - 4; f.lock = -1; f.read = do_read; diff --git a/system/lib/libc/musl/src/string/explicit_bzero.c b/system/lib/libc/musl/src/string/explicit_bzero.c new file mode 100644 index 0000000000000..f2e12f2375e2d --- /dev/null +++ b/system/lib/libc/musl/src/string/explicit_bzero.c @@ -0,0 +1,8 @@ +#define _BSD_SOURCE +#include + +void explicit_bzero(void *d, size_t n) +{ + d = memset(d, 0, n); + __asm__ __volatile__ ("" : : "r"(d) : "memory"); +} diff --git a/system/lib/libc/musl/src/string/memccpy.c b/system/lib/libc/musl/src/string/memccpy.c index f515581cd3d92..3b0a370020c4d 100644 --- a/system/lib/libc/musl/src/string/memccpy.c +++ b/system/lib/libc/musl/src/string/memccpy.c @@ -29,6 +29,6 @@ void *memccpy(void *restrict dest, const void *restrict src, int c, size_t n) #endif for (; n && (*d=*s)!=c; n--, s++, d++); tail: - if (*s==c) return d+1; + if (n) return d+1; return 0; } diff --git a/system/lib/libc/musl/src/string/memmem.c b/system/lib/libc/musl/src/string/memmem.c index 4be6a310a7618..11eff86e443e7 100644 --- a/system/lib/libc/musl/src/string/memmem.c +++ b/system/lib/libc/musl/src/string/memmem.c @@ -5,27 +5,27 @@ static char *twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n) { uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1]; - for (h++, k--; k; k--, hw = hw<<8 | *++h) - if (hw == nw) return (char *)h-1; - return 0; + for (h+=2, k-=2; k; k--, hw = hw<<8 | *h++) + if (hw == nw) return (char *)h-2; + return hw == nw ? (char *)h-2 : 0; } static char *threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n) { - uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8; - uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8; - for (h+=2, k-=2; k; k--, hw = (hw|*++h)<<8) - if (hw == nw) return (char *)h-2; - return 0; + uint32_t nw = (uint32_t)n[0]<<24 | n[1]<<16 | n[2]<<8; + uint32_t hw = (uint32_t)h[0]<<24 | h[1]<<16 | h[2]<<8; + for (h+=3, k-=3; k; k--, hw = (hw|*h++)<<8) + if (hw == nw) return (char *)h-3; + return hw == nw ? (char *)h-3 : 0; } static char *fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n) { - uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3]; - uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3]; - for (h+=3, k-=3; k; k--, hw = hw<<8 | *++h) - if (hw == nw) return (char *)h-3; - return 0; + uint32_t nw = (uint32_t)n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3]; + uint32_t hw = (uint32_t)h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3]; + for (h+=4, k-=4; k; k--, hw = hw<<8 | *h++) + if (hw == nw) return (char *)h-4; + return hw == nw ? (char *)h-4 : 0; } #define MAX(a,b) ((a)>(b)?(a):(b)) @@ -100,7 +100,7 @@ static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const if (BITOP(byteset, h[l-1], &)) { k = l-shift[h[l-1]]; if (k) { - if (mem0 && mem && k < p) k = l-p; + if (k < mem) k = mem; h += k; mem = 0; continue; diff --git a/system/lib/libc/musl/src/string/memrchr.c b/system/lib/libc/musl/src/string/memrchr.c index a78e9d6cafa0c..e51748b805654 100644 --- a/system/lib/libc/musl/src/string/memrchr.c +++ b/system/lib/libc/musl/src/string/memrchr.c @@ -1,5 +1,4 @@ #include -#include "libc.h" void *__memrchr(const void *m, int c, size_t n) { diff --git a/system/lib/libc/musl/src/string/memset.c b/system/lib/libc/musl/src/string/memset.c index f438b073ae099..5613a1486e6a6 100644 --- a/system/lib/libc/musl/src/string/memset.c +++ b/system/lib/libc/musl/src/string/memset.c @@ -11,12 +11,16 @@ void *memset(void *dest, int c, size_t n) * offsets are well-defined and in the dest region. */ if (!n) return dest; - s[0] = s[n-1] = c; + s[0] = c; + s[n-1] = c; if (n <= 2) return dest; - s[1] = s[n-2] = c; - s[2] = s[n-3] = c; + s[1] = c; + s[2] = c; + s[n-2] = c; + s[n-3] = c; if (n <= 6) return dest; - s[3] = s[n-4] = c; + s[3] = c; + s[n-4] = c; if (n <= 8) return dest; /* Advance pointer to align it at a 4-byte boundary, diff --git a/system/lib/libc/musl/src/string/strcasecmp.c b/system/lib/libc/musl/src/string/strcasecmp.c index 3cd5f2d0243e5..002c6aa15bcaf 100644 --- a/system/lib/libc/musl/src/string/strcasecmp.c +++ b/system/lib/libc/musl/src/string/strcasecmp.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int strcasecmp(const char *_l, const char *_r) { diff --git a/system/lib/libc/musl/src/string/strchr.c b/system/lib/libc/musl/src/string/strchr.c index bfae8f9f846a0..3cbc828bebf70 100644 --- a/system/lib/libc/musl/src/string/strchr.c +++ b/system/lib/libc/musl/src/string/strchr.c @@ -1,7 +1,5 @@ #include -char *__strchrnul(const char *, int); - char *strchr(const char *s, int c) { char *r = __strchrnul(s, c); diff --git a/system/lib/libc/musl/src/string/strcpy.c b/system/lib/libc/musl/src/string/strcpy.c index f7e3ba38c16e3..6668a12956385 100644 --- a/system/lib/libc/musl/src/string/strcpy.c +++ b/system/lib/libc/musl/src/string/strcpy.c @@ -1,16 +1,7 @@ #include -char *__stpcpy(char *, const char *); - char *strcpy(char *restrict dest, const char *restrict src) { -#if 1 __stpcpy(dest, src); return dest; -#else - const unsigned char *s = src; - unsigned char *d = dest; - while ((*d++ = *s++)); - return dest; -#endif } diff --git a/system/lib/libc/musl/src/string/strcspn.c b/system/lib/libc/musl/src/string/strcspn.c index cfdba114ca632..a0c617bd7cdb7 100644 --- a/system/lib/libc/musl/src/string/strcspn.c +++ b/system/lib/libc/musl/src/string/strcspn.c @@ -3,8 +3,6 @@ #define BITOP(a,b,op) \ ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a)))) -char *__strchrnul(const char *, int); - size_t strcspn(const char *s, const char *c) { const char *a = s; diff --git a/system/lib/libc/musl/src/string/strdup.c b/system/lib/libc/musl/src/string/strdup.c index dd5f80c1c39d2..d4c274494f654 100644 --- a/system/lib/libc/musl/src/string/strdup.c +++ b/system/lib/libc/musl/src/string/strdup.c @@ -1,13 +1,10 @@ #include #include -#include "libc.h" -char *__strdup(const char *s) +char *strdup(const char *s) { size_t l = strlen(s); char *d = malloc(l+1); if (!d) return NULL; return memcpy(d, s, l+1); } - -weak_alias(__strdup, strdup); diff --git a/system/lib/libc/musl/src/string/strerror_r.c b/system/lib/libc/musl/src/string/strerror_r.c index da26b4fe9875a..1dc88bb160372 100644 --- a/system/lib/libc/musl/src/string/strerror_r.c +++ b/system/lib/libc/musl/src/string/strerror_r.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int strerror_r(int err, char *buf, size_t buflen) { diff --git a/system/lib/libc/musl/src/string/strncasecmp.c b/system/lib/libc/musl/src/string/strncasecmp.c index 3af5300878a45..e0ef93c20de1a 100644 --- a/system/lib/libc/musl/src/string/strncasecmp.c +++ b/system/lib/libc/musl/src/string/strncasecmp.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" int strncasecmp(const char *_l, const char *_r, size_t n) { diff --git a/system/lib/libc/musl/src/string/strncpy.c b/system/lib/libc/musl/src/string/strncpy.c index 441ba0335f737..545892e6ec5f6 100644 --- a/system/lib/libc/musl/src/string/strncpy.c +++ b/system/lib/libc/musl/src/string/strncpy.c @@ -1,7 +1,5 @@ #include -char *__stpncpy(char *, const char *, size_t); - char *strncpy(char *restrict d, const char *restrict s, size_t n) { __stpncpy(d, s, n); diff --git a/system/lib/libc/musl/src/string/strrchr.c b/system/lib/libc/musl/src/string/strrchr.c index 635fb3c1dcde1..98ad1b0454924 100644 --- a/system/lib/libc/musl/src/string/strrchr.c +++ b/system/lib/libc/musl/src/string/strrchr.c @@ -1,7 +1,5 @@ #include -void *__memrchr(const void *, int, size_t); - char *strrchr(const char *s, int c) { return __memrchr(s, c, strlen(s) + 1); diff --git a/system/lib/libc/musl/src/string/strsignal.c b/system/lib/libc/musl/src/string/strsignal.c index 96bfe841ff3f6..5156366e6ed2a 100644 --- a/system/lib/libc/musl/src/string/strsignal.c +++ b/system/lib/libc/musl/src/string/strsignal.c @@ -31,7 +31,11 @@ static const char map[] = { [SIGPIPE] = 13, [SIGALRM] = 14, [SIGTERM] = 15, +#if defined(SIGSTKFLT) [SIGSTKFLT] = 16, +#elif defined(SIGEMT) + [SIGEMT] = 16, +#endif [SIGCHLD] = 17, [SIGCONT] = 18, [SIGSTOP] = 19, @@ -70,7 +74,13 @@ static const char strings[] = "Broken pipe\0" "Alarm clock\0" "Terminated\0" +#if defined(SIGSTKFLT) "Stack fault\0" +#elif defined(SIGEMT) + "Emulator trap\0" +#else + "Unknown signal\0" +#endif "Child process status\0" "Continued\0" "Stopped (signal)\0" diff --git a/system/lib/libc/musl/src/string/strstr.c b/system/lib/libc/musl/src/string/strstr.c index cd0691275b2e4..96657bc23114d 100644 --- a/system/lib/libc/musl/src/string/strstr.c +++ b/system/lib/libc/musl/src/string/strstr.c @@ -10,16 +10,16 @@ static char *twobyte_strstr(const unsigned char *h, const unsigned char *n) static char *threebyte_strstr(const unsigned char *h, const unsigned char *n) { - uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8; - uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8; + uint32_t nw = (uint32_t)n[0]<<24 | n[1]<<16 | n[2]<<8; + uint32_t hw = (uint32_t)h[0]<<24 | h[1]<<16 | h[2]<<8; for (h+=2; *h && hw != nw; hw = (hw|*++h)<<8); return *h ? (char *)h-2 : 0; } static char *fourbyte_strstr(const unsigned char *h, const unsigned char *n) { - uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3]; - uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3]; + uint32_t nw = (uint32_t)n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3]; + uint32_t hw = (uint32_t)h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3]; for (h+=3; *h && hw != nw; hw = hw<<8 | *++h); return *h ? (char *)h-3 : 0; } @@ -96,7 +96,7 @@ static char *twoway_strstr(const unsigned char *h, const unsigned char *n) for (;;) { /* Update incremental end-of-haystack pointer */ if (z-h < l) { - /* Fast estimate for MIN(l,63) */ + /* Fast estimate for MAX(l,63) */ size_t grow = l | 63; const unsigned char *z2 = memchr(z, 0, grow); if (z2) { @@ -108,9 +108,8 @@ static char *twoway_strstr(const unsigned char *h, const unsigned char *n) /* Check last byte first; advance by shift on mismatch */ if (BITOP(byteset, h[l-1], &)) { k = l-shift[h[l-1]]; - //printf("adv by %zu (on %c) at [%s] (%zu;l=%zu)\n", k, h[l-1], h, shift[h[l-1]], l); if (k) { - if (mem0 && mem && k < p) k = l-p; + if (k < mem) k = mem; h += k; mem = 0; continue; diff --git a/system/lib/libc/musl/src/string/wcsdup.c b/system/lib/libc/musl/src/string/wcsdup.c index dd49c1b6297f6..f398e8091c382 100644 --- a/system/lib/libc/musl/src/string/wcsdup.c +++ b/system/lib/libc/musl/src/string/wcsdup.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" wchar_t *wcsdup(const wchar_t *s) { diff --git a/system/lib/libc/musl/src/string/wmemmove.c b/system/lib/libc/musl/src/string/wmemmove.c index e406f3d5c8dfc..964c9032991ed 100644 --- a/system/lib/libc/musl/src/string/wmemmove.c +++ b/system/lib/libc/musl/src/string/wmemmove.c @@ -1,9 +1,11 @@ #include +#include wchar_t *wmemmove(wchar_t *d, const wchar_t *s, size_t n) { wchar_t *d0 = d; - if ((size_t)(d-s) < n) + if (d == s) return d; + if ((uintptr_t)d-(uintptr_t)s < n * sizeof *d) while (n--) d[n] = s[n]; else while (n--) *d++ = *s++; diff --git a/system/lib/libc/musl/src/temp/__randname.c b/system/lib/libc/musl/src/temp/__randname.c index 464b83d5f95b0..2bce37a0c4a27 100644 --- a/system/lib/libc/musl/src/temp/__randname.c +++ b/system/lib/libc/musl/src/temp/__randname.c @@ -1,8 +1,6 @@ #include #include -int __clock_gettime(clockid_t, struct timespec *); - /* This assumes that a check for the template size has already been made */ char *__randname(char *template) diff --git a/system/lib/libc/musl/src/temp/mkdtemp.c b/system/lib/libc/musl/src/temp/mkdtemp.c index 6c2c16ef2e802..5708257bfecf6 100644 --- a/system/lib/libc/musl/src/temp/mkdtemp.c +++ b/system/lib/libc/musl/src/temp/mkdtemp.c @@ -3,8 +3,6 @@ #include #include -char *__randname(char *); - char *mkdtemp(char *template) { size_t l = strlen(template); diff --git a/system/lib/libc/musl/src/temp/mkostemp.c b/system/lib/libc/musl/src/temp/mkostemp.c index e73e22a68d121..d8dcb8052da56 100644 --- a/system/lib/libc/musl/src/temp/mkostemp.c +++ b/system/lib/libc/musl/src/temp/mkostemp.c @@ -1,12 +1,9 @@ #define _BSD_SOURCE #include -#include "libc.h" - -int __mkostemps(char *, int, int); int mkostemp(char *template, int flags) { return __mkostemps(template, 0, flags); } -LFS64(mkostemp); +weak_alias(mkostemp, mkostemp64); diff --git a/system/lib/libc/musl/src/temp/mkostemps.c b/system/lib/libc/musl/src/temp/mkostemps.c index 512b5f188a1fd..ef24eeae2ce92 100644 --- a/system/lib/libc/musl/src/temp/mkostemps.c +++ b/system/lib/libc/musl/src/temp/mkostemps.c @@ -1,11 +1,9 @@ #define _BSD_SOURCE +#include #include #include #include #include -#include "libc.h" - -char *__randname(char *); int __mkostemps(char *template, int len, int flags) { diff --git a/system/lib/libc/musl/src/temp/mkstemp.c b/system/lib/libc/musl/src/temp/mkstemp.c index 85764af7cd35d..166b8afe49bb2 100644 --- a/system/lib/libc/musl/src/temp/mkstemp.c +++ b/system/lib/libc/musl/src/temp/mkstemp.c @@ -1,11 +1,8 @@ #include -#include "libc.h" - -int __mkostemps(char *, int, int); int mkstemp(char *template) { return __mkostemps(template, 0, 0); } -LFS64(mkstemp); +weak_alias(mkstemp, mkstemp64); diff --git a/system/lib/libc/musl/src/temp/mkstemps.c b/system/lib/libc/musl/src/temp/mkstemps.c index fda710b0d9eda..6b7531b5e9a97 100644 --- a/system/lib/libc/musl/src/temp/mkstemps.c +++ b/system/lib/libc/musl/src/temp/mkstemps.c @@ -1,12 +1,9 @@ #define _BSD_SOURCE #include -#include "libc.h" - -int __mkostemps(char *, int, int); int mkstemps(char *template, int len) { return __mkostemps(template, len, 0); } -LFS64(mkstemps); +weak_alias(mkstemps, mkstemps64); diff --git a/system/lib/libc/musl/src/temp/mktemp.c b/system/lib/libc/musl/src/temp/mktemp.c index 4ab0df2069ac6..7b3d2648b2067 100644 --- a/system/lib/libc/musl/src/temp/mktemp.c +++ b/system/lib/libc/musl/src/temp/mktemp.c @@ -4,8 +4,6 @@ #include #include -char *__randname(char *); - char *mktemp(char *template) { size_t l = strlen(template); diff --git a/system/lib/libc/musl/src/termios/cfsetospeed.c b/system/lib/libc/musl/src/termios/cfsetospeed.c index b571f62e39cc1..c9cbdd9d9d2e1 100644 --- a/system/lib/libc/musl/src/termios/cfsetospeed.c +++ b/system/lib/libc/musl/src/termios/cfsetospeed.c @@ -2,7 +2,6 @@ #include #include #include -#include "libc.h" int cfsetospeed(struct termios *tio, speed_t speed) { diff --git a/system/lib/libc/musl/src/termios/tcdrain.c b/system/lib/libc/musl/src/termios/tcdrain.c index 6e43afb756400..c0e542b3e5fbb 100644 --- a/system/lib/libc/musl/src/termios/tcdrain.c +++ b/system/lib/libc/musl/src/termios/tcdrain.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" #include "syscall.h" int tcdrain(int fd) diff --git a/system/lib/libc/musl/src/termios/tcgetwinsize.c b/system/lib/libc/musl/src/termios/tcgetwinsize.c new file mode 100644 index 0000000000000..9b3a65a40d3ee --- /dev/null +++ b/system/lib/libc/musl/src/termios/tcgetwinsize.c @@ -0,0 +1,8 @@ +#include +#include +#include "syscall.h" + +int tcgetwinsize(int fd, struct winsize *wsz) +{ + return syscall(SYS_ioctl, fd, TIOCGWINSZ, wsz); +} diff --git a/system/lib/libc/musl/src/termios/tcsetwinsize.c b/system/lib/libc/musl/src/termios/tcsetwinsize.c new file mode 100644 index 0000000000000..e01d0e2546a97 --- /dev/null +++ b/system/lib/libc/musl/src/termios/tcsetwinsize.c @@ -0,0 +1,8 @@ +#include +#include +#include "syscall.h" + +int tcsetwinsize(int fd, const struct winsize *wsz) +{ + return syscall(SYS_ioctl, fd, TIOCSWINSZ, wsz); +} diff --git a/system/lib/libc/musl/src/thread/__futex.c b/system/lib/libc/musl/src/thread/__futex.c deleted file mode 100644 index 96307c0888ed4..0000000000000 --- a/system/lib/libc/musl/src/thread/__futex.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "futex.h" -#include "syscall.h" - -int __futex(volatile int *addr, int op, int val, void *ts) -{ - return syscall(SYS_futex, addr, op, val, ts); -} diff --git a/system/lib/libc/musl/src/thread/__lock.c b/system/lib/libc/musl/src/thread/__lock.c index 0874c04a4c0a8..60eece49a2888 100644 --- a/system/lib/libc/musl/src/thread/__lock.c +++ b/system/lib/libc/musl/src/thread/__lock.c @@ -1,15 +1,62 @@ #include "pthread_impl.h" +/* This lock primitive combines a flag (in the sign bit) and a + * congestion count (= threads inside the critical section, CS) in a + * single int that is accessed through atomic operations. The states + * of the int for value x are: + * + * x == 0: unlocked and no thread inside the critical section + * + * x < 0: locked with a congestion of x-INT_MIN, including the thread + * that holds the lock + * + * x > 0: unlocked with a congestion of x + * + * or in an equivalent formulation x is the congestion count or'ed + * with INT_MIN as a lock flag. + */ + void __lock(volatile int *l) { - if (libc.threads_minus_1) - while (a_swap(l, 1)) __wait(l, l+1, 1, 1); + int need_locks = libc.need_locks; + if (!need_locks) return; + /* fast path: INT_MIN for the lock, +1 for the congestion */ + int current = a_cas(l, 0, INT_MIN + 1); + if (need_locks < 0) libc.need_locks = 0; + if (!current) return; + /* A first spin loop, for medium congestion. */ + for (unsigned i = 0; i < 10; ++i) { + if (current < 0) current -= INT_MIN + 1; + // assertion: current >= 0 + int val = a_cas(l, current, INT_MIN + (current + 1)); + if (val == current) return; + current = val; + } + // Spinning failed, so mark ourselves as being inside the CS. + current = a_fetch_add(l, 1) + 1; + /* The main lock acquisition loop for heavy congestion. The only + * change to the value performed inside that loop is a successful + * lock via the CAS that acquires the lock. */ + for (;;) { + /* We can only go into wait, if we know that somebody holds the + * lock and will eventually wake us up, again. */ + if (current < 0) { + __futexwait(l, current, 1); + current -= INT_MIN + 1; + } + /* assertion: current > 0, the count includes us already. */ + int val = a_cas(l, current, INT_MIN + current); + if (val == current) return; + current = val; + } } void __unlock(volatile int *l) { - if (l[0]) { - a_store(l, 0); - if (l[1]) __wake(l, 1, 1); + /* Check l[0] to see if we are multi-threaded. */ + if (l[0] < 0) { + if (a_fetch_add(l, -(INT_MIN + 1)) != (INT_MIN + 1)) { + __wake(l, 1, 1); + } } } diff --git a/system/lib/libc/musl/src/thread/__syscall_cp.c b/system/lib/libc/musl/src/thread/__syscall_cp.c index 09a2be84f5839..42a01674bf40d 100644 --- a/system/lib/libc/musl/src/thread/__syscall_cp.c +++ b/system/lib/libc/musl/src/thread/__syscall_cp.c @@ -1,14 +1,13 @@ #include "pthread_impl.h" #include "syscall.h" -__attribute__((__visibility__("hidden"))) -long __syscall_cp_c(); +hidden long __syscall_cp_c(); static long sccp(syscall_arg_t nr, syscall_arg_t u, syscall_arg_t v, syscall_arg_t w, syscall_arg_t x, syscall_arg_t y, syscall_arg_t z) { - return (__syscall)(nr, u, v, w, x, y, z); + return __syscall(nr, u, v, w, x, y, z); } weak_alias(sccp, __syscall_cp_c); diff --git a/system/lib/libc/musl/src/thread/__timedwait.c b/system/lib/libc/musl/src/thread/__timedwait.c index 433f1d00c6300..eeeef53cbeb01 100644 --- a/system/lib/libc/musl/src/thread/__timedwait.c +++ b/system/lib/libc/musl/src/thread/__timedwait.c @@ -12,8 +12,31 @@ #include "syscall.h" #include "pthread_impl.h" -int __pthread_setcancelstate(int, int *); -int __clock_gettime(clockid_t, struct timespec *); +#ifndef __EMSCRIPTEN__ +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +static int __futex4_cp(volatile void *addr, int op, int val, const struct timespec *to) +{ + int r; +#ifdef SYS_futex_time64 + time_t s = to ? to->tv_sec : 0; + long ns = to ? to->tv_nsec : 0; + r = -ENOSYS; + if (SYS_futex == SYS_futex_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_futex_time64, addr, op, val, + to ? ((long long[]){s, ns}) : 0); + if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r; + to = to ? (void *)(long[]){CLAMP(s), ns} : 0; +#endif + r = __syscall_cp(SYS_futex, addr, op, val, to); + if (r != -ENOSYS) return r; + return __syscall_cp(SYS_futex, addr, op & ~FUTEX_PRIVATE, val, to); +} +#endif + +static volatile int dummy = 0; +weak_alias(dummy, __eintr_valid_flag); #ifdef __EMSCRIPTEN__ int _pthread_isduecanceled(struct pthread *pthread_ptr); @@ -25,7 +48,7 @@ int __timedwait_cp(volatile int *addr, int val, int r; struct timespec to, *top=0; - if (priv) priv = 128; + if (priv) priv = FUTEX_PRIVATE; if (at) { if (at->tv_nsec >= 1000000000UL) return EINVAL; @@ -73,10 +96,14 @@ int __timedwait_cp(volatile int *addr, int val, r = -emscripten_futex_wait((void*)addr, val, msecsToSleep); } #else - r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT|priv, val, top); - if (r == ENOSYS) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top); + r = -__futex4_cp(addr, FUTEX_WAIT|priv, val, top); #endif if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0; + /* Mitigate bug in old kernels wrongly reporting EINTR for non- + * interrupting (SA_RESTART) signal handlers. This is only practical + * when NO interrupting signal handlers have been installed, and + * works by sigaction tracking whether that's the case. */ + if (r == EINTR && !__eintr_valid_flag) r = 0; return r; } diff --git a/system/lib/libc/musl/src/thread/__tls_get_addr.c b/system/lib/libc/musl/src/thread/__tls_get_addr.c index 6945faa060d75..19524fe07671f 100644 --- a/system/lib/libc/musl/src/thread/__tls_get_addr.c +++ b/system/lib/libc/musl/src/thread/__tls_get_addr.c @@ -1,16 +1,7 @@ -#include #include "pthread_impl.h" -#include "libc.h" -__attribute__((__visibility__("hidden"))) -void *__tls_get_new(size_t *); - -void *__tls_get_addr(size_t *v) +void *__tls_get_addr(tls_mod_off_t *v) { pthread_t self = __pthread_self(); - if (v[0]<=(size_t)self->dtv[0]) - return (char *)self->dtv[v[0]]+v[1]+DTP_OFFSET; - return __tls_get_new(v); + return (void *)(self->dtv[v[0]] + v[1]); } - -weak_alias(__tls_get_addr, __tls_get_new); diff --git a/system/lib/libc/musl/src/thread/__unmapself.c b/system/lib/libc/musl/src/thread/__unmapself.c index 1d3bee1d9b040..31d94e67edb9e 100644 --- a/system/lib/libc/musl/src/thread/__unmapself.c +++ b/system/lib/libc/musl/src/thread/__unmapself.c @@ -4,7 +4,6 @@ /* cheat and reuse CRTJMP macro from dynlink code */ #include "dynlink.h" -static volatile int lock; static void *unmap_base; static size_t unmap_size; static char shared_stack[256]; @@ -17,12 +16,8 @@ static void do_unmap() void __unmapself(void *base, size_t size) { - int tid=__pthread_self()->tid; char *stack = shared_stack + sizeof shared_stack; stack -= (uintptr_t)stack % 16; - while (lock || a_cas(&lock, 0, tid)) - a_spin(); - __syscall(SYS_set_tid_address, &lock); unmap_base = base; unmap_size = size; CRTJMP(do_unmap, stack); diff --git a/system/lib/libc/musl/src/thread/call_once.c b/system/lib/libc/musl/src/thread/call_once.c index a7bc93532bc5e..5ed30183dff17 100644 --- a/system/lib/libc/musl/src/thread/call_once.c +++ b/system/lib/libc/musl/src/thread/call_once.c @@ -1,6 +1,5 @@ #include - -int __pthread_once(once_flag *, void (*)(void)); +#include void call_once(once_flag *flag, void (*func)(void)) { diff --git a/system/lib/libc/musl/src/thread/cnd_broadcast.c b/system/lib/libc/musl/src/thread/cnd_broadcast.c index 85d4d3ead318a..e76b5a81bd76c 100644 --- a/system/lib/libc/musl/src/thread/cnd_broadcast.c +++ b/system/lib/libc/musl/src/thread/cnd_broadcast.c @@ -1,10 +1,9 @@ #include - -int __private_cond_signal(cnd_t *, int); +#include int cnd_broadcast(cnd_t *c) { /* This internal function never fails, and always returns zero, * which matches the value thrd_success is defined with. */ - return __private_cond_signal(c, -1); + return __private_cond_signal((pthread_cond_t *)c, -1); } diff --git a/system/lib/libc/musl/src/thread/cnd_signal.c b/system/lib/libc/musl/src/thread/cnd_signal.c index 1211260b4b895..02cdc6c60a255 100644 --- a/system/lib/libc/musl/src/thread/cnd_signal.c +++ b/system/lib/libc/musl/src/thread/cnd_signal.c @@ -1,10 +1,9 @@ #include - -int __private_cond_signal(cnd_t *, int); +#include int cnd_signal(cnd_t *c) { /* This internal function never fails, and always returns zero, * which matches the value thrd_success is defined with. */ - return __private_cond_signal(c, 1); + return __private_cond_signal((pthread_cond_t *)c, 1); } diff --git a/system/lib/libc/musl/src/thread/cnd_timedwait.c b/system/lib/libc/musl/src/thread/cnd_timedwait.c index 599767937d052..2802af522a50a 100644 --- a/system/lib/libc/musl/src/thread/cnd_timedwait.c +++ b/system/lib/libc/musl/src/thread/cnd_timedwait.c @@ -1,11 +1,10 @@ #include +#include #include -int __pthread_cond_timedwait(cnd_t *restrict, mtx_t *restrict, const struct timespec *restrict); - int cnd_timedwait(cnd_t *restrict c, mtx_t *restrict m, const struct timespec *restrict ts) { - int ret = __pthread_cond_timedwait(c, m, ts); + int ret = __pthread_cond_timedwait((pthread_cond_t *)c, (pthread_mutex_t *)m, ts); switch (ret) { /* May also return EINVAL or EPERM. */ default: return thrd_error; diff --git a/system/lib/libc/musl/src/thread/default_attr.c b/system/lib/libc/musl/src/thread/default_attr.c new file mode 100644 index 0000000000000..dce9640964c23 --- /dev/null +++ b/system/lib/libc/musl/src/thread/default_attr.c @@ -0,0 +1,4 @@ +#include "pthread_impl.h" + +unsigned __default_stacksize = DEFAULT_STACK_SIZE; +unsigned __default_guardsize = DEFAULT_GUARD_SIZE; diff --git a/system/lib/libc/musl/src/thread/mtx_timedlock.c b/system/lib/libc/musl/src/thread/mtx_timedlock.c index bcc152c564348..d22c8cf448163 100644 --- a/system/lib/libc/musl/src/thread/mtx_timedlock.c +++ b/system/lib/libc/musl/src/thread/mtx_timedlock.c @@ -1,11 +1,10 @@ #include +#include #include -int __pthread_mutex_timedlock(mtx_t *restrict, const struct timespec *restrict); - int mtx_timedlock(mtx_t *restrict m, const struct timespec *restrict ts) { - int ret = __pthread_mutex_timedlock(m, ts); + int ret = __pthread_mutex_timedlock((pthread_mutex_t *)m, ts); switch (ret) { default: return thrd_error; case 0: return thrd_success; diff --git a/system/lib/libc/musl/src/thread/mtx_trylock.c b/system/lib/libc/musl/src/thread/mtx_trylock.c index 61e7694edcda2..40a8b8c297721 100644 --- a/system/lib/libc/musl/src/thread/mtx_trylock.c +++ b/system/lib/libc/musl/src/thread/mtx_trylock.c @@ -1,14 +1,12 @@ #include "pthread_impl.h" #include -int __pthread_mutex_trylock(mtx_t *); - int mtx_trylock(mtx_t *m) { if (m->_m_type == PTHREAD_MUTEX_NORMAL) return (a_cas(&m->_m_lock, 0, EBUSY) & EBUSY) ? thrd_busy : thrd_success; - int ret = __pthread_mutex_trylock(m); + int ret = __pthread_mutex_trylock((pthread_mutex_t *)m); switch (ret) { default: return thrd_error; case 0: return thrd_success; diff --git a/system/lib/libc/musl/src/thread/mtx_unlock.c b/system/lib/libc/musl/src/thread/mtx_unlock.c index 5033ace7f3292..2e5c8cf6bf998 100644 --- a/system/lib/libc/musl/src/thread/mtx_unlock.c +++ b/system/lib/libc/musl/src/thread/mtx_unlock.c @@ -1,11 +1,10 @@ #include - -int __pthread_mutex_unlock(mtx_t *); +#include int mtx_unlock(mtx_t *mtx) { /* The only cases where pthread_mutex_unlock can return an * error are undefined behavior for C11 mtx_unlock, so we can * assume it does not return an error and simply tail call. */ - return __pthread_mutex_unlock(mtx); + return __pthread_mutex_unlock((pthread_mutex_t *)mtx); } diff --git a/system/lib/libc/musl/src/thread/pthread_atfork.c b/system/lib/libc/musl/src/thread/pthread_atfork.c index 792b7eda90cdb..0ed71fd434823 100644 --- a/system/lib/libc/musl/src/thread/pthread_atfork.c +++ b/system/lib/libc/musl/src/thread/pthread_atfork.c @@ -1,5 +1,6 @@ #include #include "libc.h" +#include "lock.h" #ifndef __EMSCRIPTEN__ // XXX Emscripten fork() is not supported: pthread_atfork is a no-op static struct atfork_funcs { @@ -9,7 +10,7 @@ static struct atfork_funcs { struct atfork_funcs *prev, *next; } *funcs; -static volatile int lock[2]; +static volatile int lock[1]; void __fork_handler(int who) { diff --git a/system/lib/libc/musl/src/thread/pthread_attr_get.c b/system/lib/libc/musl/src/thread/pthread_attr_get.c index e2a44d19843f1..73e30a5f01214 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_get.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_get.c @@ -7,7 +7,7 @@ int pthread_attr_getdetachstate(const pthread_attr_t *a, int *state) } int pthread_attr_getguardsize(const pthread_attr_t *restrict a, size_t *restrict size) { - *size = a->_a_guardsize + DEFAULT_GUARD_SIZE; + *size = a->_a_guardsize; return 0; } @@ -43,14 +43,14 @@ int pthread_attr_getstack(const pthread_attr_t *restrict a, void **restrict addr // if (!a->_a_stackaddr) // return EINVAL; - *size = a->_a_stacksize + DEFAULT_STACK_SIZE; + *size = a->_a_stacksize; *addr = (void *)(a->_a_stackaddr - *size); return 0; } int pthread_attr_getstacksize(const pthread_attr_t *restrict a, size_t *restrict size) { - *size = a->_a_stacksize + DEFAULT_STACK_SIZE; + *size = a->_a_stacksize; return 0; } @@ -74,7 +74,7 @@ int pthread_condattr_getpshared(const pthread_condattr_t *restrict a, int *restr int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *restrict a, int *restrict protocol) { - *protocol = PTHREAD_PRIO_NONE; + *protocol = a->__attr / 8U % 2; return 0; } int pthread_mutexattr_getpshared(const pthread_mutexattr_t *restrict a, int *restrict pshared) diff --git a/system/lib/libc/musl/src/thread/pthread_attr_init.c b/system/lib/libc/musl/src/thread/pthread_attr_init.c index 969e0a3805e92..463a8d2075125 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_init.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_init.c @@ -3,5 +3,9 @@ int pthread_attr_init(pthread_attr_t *a) { *a = (pthread_attr_t){0}; + __acquire_ptc(); + a->_a_stacksize = __default_stacksize; + a->_a_guardsize = __default_guardsize; + __release_ptc(); return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_attr_setguardsize.c b/system/lib/libc/musl/src/thread/pthread_attr_setguardsize.c index 9f21d24702fbf..1c5c60acbc70a 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_setguardsize.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_setguardsize.c @@ -3,6 +3,6 @@ int pthread_attr_setguardsize(pthread_attr_t *a, size_t size) { if (size > SIZE_MAX/8) return EINVAL; - a->_a_guardsize = size - DEFAULT_GUARD_SIZE; + a->_a_guardsize = size; return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_attr_setinheritsched.c b/system/lib/libc/musl/src/thread/pthread_attr_setinheritsched.c index c91d8f83cc749..ca264be7c4d96 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_setinheritsched.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_setinheritsched.c @@ -1,4 +1,5 @@ #include "pthread_impl.h" +#include "syscall.h" int pthread_attr_setinheritsched(pthread_attr_t *a, int inherit) { diff --git a/system/lib/libc/musl/src/thread/pthread_attr_setstack.c b/system/lib/libc/musl/src/thread/pthread_attr_setstack.c index 61707a3189933..1eddcbd6ebb4f 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_setstack.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_setstack.c @@ -4,6 +4,6 @@ int pthread_attr_setstack(pthread_attr_t *a, void *addr, size_t size) { if (size-PTHREAD_STACK_MIN > SIZE_MAX/4) return EINVAL; a->_a_stackaddr = (size_t)addr + size; - a->_a_stacksize = size - DEFAULT_STACK_SIZE; + a->_a_stacksize = size; return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_attr_setstacksize.c b/system/lib/libc/musl/src/thread/pthread_attr_setstacksize.c index 09d3fda72ee05..9c6a8806eefe0 100644 --- a/system/lib/libc/musl/src/thread/pthread_attr_setstacksize.c +++ b/system/lib/libc/musl/src/thread/pthread_attr_setstacksize.c @@ -4,6 +4,6 @@ int pthread_attr_setstacksize(pthread_attr_t *a, size_t size) { if (size-PTHREAD_STACK_MIN > SIZE_MAX/4) return EINVAL; a->_a_stackaddr = 0; - a->_a_stacksize = size - DEFAULT_STACK_SIZE; + a->_a_stacksize = size; return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_barrier_wait.c b/system/lib/libc/musl/src/thread/pthread_barrier_wait.c index 8e212f0090803..ee2d17e86b58d 100644 --- a/system/lib/libc/musl/src/thread/pthread_barrier_wait.c +++ b/system/lib/libc/musl/src/thread/pthread_barrier_wait.c @@ -106,7 +106,7 @@ int pthread_barrier_wait(pthread_barrier_t *b) } #else while (inst->finished == 1) { - __syscall(SYS_futex,&inst->finished,FUTEX_WAIT|128,1,0) != -ENOSYS + __syscall(SYS_futex,&inst->finished,FUTEX_WAIT|FUTEX_PRIVATE,1,0) != -ENOSYS || __syscall(SYS_futex,&inst->finished,FUTEX_WAIT,1,0); } #endif diff --git a/system/lib/libc/musl/src/thread/pthread_barrierattr_setpshared.c b/system/lib/libc/musl/src/thread/pthread_barrierattr_setpshared.c index b391461e16d19..c2d2929dcf8e9 100644 --- a/system/lib/libc/musl/src/thread/pthread_barrierattr_setpshared.c +++ b/system/lib/libc/musl/src/thread/pthread_barrierattr_setpshared.c @@ -2,6 +2,7 @@ int pthread_barrierattr_setpshared(pthread_barrierattr_t *a, int pshared) { + if (pshared > 1U) return EINVAL; a->__attr = pshared ? INT_MIN : 0; return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_cancel.c b/system/lib/libc/musl/src/thread/pthread_cancel.c index 3d229223ed1b0..2f9d5e975f22c 100644 --- a/system/lib/libc/musl/src/thread/pthread_cancel.c +++ b/system/lib/libc/musl/src/thread/pthread_cancel.c @@ -2,10 +2,8 @@ #include #include "pthread_impl.h" #include "syscall.h" -#include "libc.h" -__attribute__((__visibility__("hidden"))) -long __cancel(), __syscall_cp_asm(), __syscall_cp_c(); +hidden long __cancel(), __syscall_cp_asm(), __syscall_cp_c(); long __cancel() { @@ -45,8 +43,7 @@ static void _sigaddset(sigset_t *set, int sig) set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1); } -__attribute__((__visibility__("hidden"))) -extern const char __cp_begin[1], __cp_end[1], __cp_cancel[1]; +extern hidden const char __cp_begin[1], __cp_end[1], __cp_cancel[1]; static void cancel_handler(int sig, siginfo_t *si, void *ctx) { @@ -61,6 +58,9 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx) if (self->cancelasync || pc >= (uintptr_t)__cp_begin && pc < (uintptr_t)__cp_end) { uc->uc_mcontext.MC_PC = (uintptr_t)__cp_cancel; +#ifdef CANCEL_GOT + uc->uc_mcontext.MC_GOT = CANCEL_GOT; +#endif return; } @@ -92,6 +92,10 @@ int pthread_cancel(pthread_t t) init = 1; } a_store(&t->cancel, 1); - if (t == pthread_self() && !t->cancelasync) return 0; + if (t == pthread_self()) { + if (t->canceldisable == PTHREAD_CANCEL_ENABLE && t->cancelasync) + pthread_exit(PTHREAD_CANCELED); + return 0; + } return pthread_kill(t, SIGCANCEL); } diff --git a/system/lib/libc/musl/src/thread/pthread_cond_broadcast.c b/system/lib/libc/musl/src/thread/pthread_cond_broadcast.c index 69f840fb4faee..6bfab78f961f7 100644 --- a/system/lib/libc/musl/src/thread/pthread_cond_broadcast.c +++ b/system/lib/libc/musl/src/thread/pthread_cond_broadcast.c @@ -1,7 +1,5 @@ #include "pthread_impl.h" -int __private_cond_signal(pthread_cond_t *, int); - int pthread_cond_broadcast(pthread_cond_t *c) { if (!c->_c_shared) return __private_cond_signal(c, -1); diff --git a/system/lib/libc/musl/src/thread/pthread_cond_signal.c b/system/lib/libc/musl/src/thread/pthread_cond_signal.c index 119c00abcd990..575ad54bc0509 100644 --- a/system/lib/libc/musl/src/thread/pthread_cond_signal.c +++ b/system/lib/libc/musl/src/thread/pthread_cond_signal.c @@ -1,7 +1,5 @@ #include "pthread_impl.h" -int __private_cond_signal(pthread_cond_t *, int); - int pthread_cond_signal(pthread_cond_t *c) { if (!c->_c_shared) return __private_cond_signal(c, 1); diff --git a/system/lib/libc/musl/src/thread/pthread_cond_timedwait.c b/system/lib/libc/musl/src/thread/pthread_cond_timedwait.c index 90869b18a503a..f46f5fedd0d10 100644 --- a/system/lib/libc/musl/src/thread/pthread_cond_timedwait.c +++ b/system/lib/libc/musl/src/thread/pthread_cond_timedwait.c @@ -1,10 +1,5 @@ #include "pthread_impl.h" -void __pthread_testcancel(void); -int __pthread_mutex_lock(pthread_mutex_t *); -int __pthread_mutex_unlock(pthread_mutex_t *); -int __pthread_setcancelstate(int, int *); - /* * struct waiter * @@ -63,7 +58,7 @@ static inline void unlock_requeue(volatile int *l, volatile int *r, int w) emscripten_futex_wake(l, 0x7FFFFFFF); #else if (w) __wake(l, 1, 1); - else __syscall(SYS_futex, l, FUTEX_REQUEUE|128, 0, 1, r) != -ENOSYS + else __syscall(SYS_futex, l, FUTEX_REQUEUE|FUTEX_PRIVATE, 0, 1, r) != -ENOSYS || __syscall(SYS_futex, l, FUTEX_REQUEUE, 0, 1, r); #endif } @@ -168,14 +163,18 @@ int __pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restri if (oldstate == WAITING) goto done; - if (!node.next) a_inc(&m->_m_waiters); + if (!node.next && !(m->_m_type & 8)) + a_inc(&m->_m_waiters); /* Unlock the barrier that's holding back the next waiter, and * either wake it or requeue it to the mutex. */ - if (node.prev) - unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128); - else - a_dec(&m->_m_waiters); + if (node.prev) { + int val = m->_m_lock; + if (val>0) a_cas(&m->_m_lock, val, val|0x80000000); + unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128)); + } else if (!(m->_m_type & 8)) { + a_dec(&m->_m_waiters); + } /* Since a signal was consumed, cancellation is not permitted. */ if (e == ECANCELED) e = 0; diff --git a/system/lib/libc/musl/src/thread/pthread_create.c b/system/lib/libc/musl/src/thread/pthread_create.c index 9f6b98e609863..6f187ee89d3dd 100644 --- a/system/lib/libc/musl/src/thread/pthread_create.c +++ b/system/lib/libc/musl/src/thread/pthread_create.c @@ -2,14 +2,11 @@ #include "pthread_impl.h" #include "stdio_impl.h" #include "libc.h" +#include "lock.h" #include #include #include -void *__mmap(void *, size_t, int, int, int, off_t); -int __munmap(void *, size_t); -int __mprotect(void *, size_t, int); - static void dummy_0() { } @@ -18,6 +15,41 @@ weak_alias(dummy_0, __release_ptc); weak_alias(dummy_0, __pthread_tsd_run_dtors); weak_alias(dummy_0, __do_orphaned_stdio_locks); weak_alias(dummy_0, __dl_thread_cleanup); +weak_alias(dummy_0, __membarrier_init); + +static int tl_lock_count; +static int tl_lock_waiters; + +void __tl_lock(void) +{ + int tid = __pthread_self()->tid; + int val = __thread_list_lock; + if (val == tid) { + tl_lock_count++; + return; + } + while ((val = a_cas(&__thread_list_lock, 0, tid))) + __wait(&__thread_list_lock, &tl_lock_waiters, val, 0); +} + +void __tl_unlock(void) +{ + if (tl_lock_count) { + tl_lock_count--; + return; + } + a_store(&__thread_list_lock, 0); + if (tl_lock_waiters) __wake(&__thread_list_lock, 1, 0); +} + +void __tl_sync(pthread_t td) +{ + a_barrier(); + int val = __thread_list_lock; + if (!val) return; + __wait(&__thread_list_lock, &tl_lock_waiters, val, 0); + if (tl_lock_waiters) __wake(&__thread_list_lock, 1, 0); +} _Noreturn void __pthread_exit(void *result) { @@ -37,36 +69,44 @@ _Noreturn void __pthread_exit(void *result) __pthread_tsd_run_dtors(); - __lock(self->exitlock); - - /* Mark this thread dead before decrementing count */ - __lock(self->killlock); - self->dead = 1; - - /* Block all signals before decrementing the live thread count. - * This is important to ensure that dynamically allocated TLS - * is not under-allocated/over-committed, and possibly for other - * reasons as well. */ - __block_all_sigs(&set); - - /* Wait to unlock the kill lock, which governs functions like - * pthread_kill which target a thread id, until signals have - * been blocked. This precludes observation of the thread id - * as a live thread (with application code running in it) after - * the thread was reported dead by ESRCH being returned. */ - __unlock(self->killlock); - - /* It's impossible to determine whether this is "the last thread" - * until performing the atomic decrement, since multiple threads - * could exit at the same time. For the last thread, revert the - * decrement and unblock signals to give the atexit handlers and - * stdio cleanup code a consistent state. */ - if (a_fetch_add(&libc.threads_minus_1, -1)==0) { - libc.threads_minus_1 = 0; + __block_app_sigs(&set); + + /* This atomic potentially competes with a concurrent pthread_detach + * call; the loser is responsible for freeing thread resources. */ + int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING); + + if (state==DT_DETACHED && self->map_base) { + /* Since __unmapself bypasses the normal munmap code path, + * explicitly wait for vmlock holders first. This must be + * done before any locks are taken, to avoid lock ordering + * issues that could lead to deadlock. */ + __vm_wait(); + } + + /* Access to target the exiting thread with syscalls that use + * its kernel tid is controlled by killlock. For detached threads, + * any use past this point would have undefined behavior, but for + * joinable threads it's a valid usage that must be handled. + * Signals must be blocked since pthread_kill must be AS-safe. */ + LOCK(self->killlock); + + /* The thread list lock must be AS-safe, and thus depends on + * application signals being blocked above. */ + __tl_lock(); + + /* If this is the only thread in the list, don't proceed with + * termination of the thread, but restore the previous lock and + * signal state to prepare for exit to call atexit handlers. */ + if (self->next == self) { + __tl_unlock(); + UNLOCK(self->killlock); + self->detach_state = state; __restore_sigs(&set); exit(0); } + /* At this point we are committed to thread termination. */ + /* Process robust list in userspace to handle non-pshared mutexes * and the detached thread case where the robust list head will * be invalid when the kernel would process it. */ @@ -89,30 +129,42 @@ _Noreturn void __pthread_exit(void *result) __do_orphaned_stdio_locks(); __dl_thread_cleanup(); - if (self->detached && self->map_base) { - /* Detached threads must avoid the kernel clear_child_tid - * feature, since the virtual address will have been - * unmapped and possibly already reused by a new mapping - * at the time the kernel would perform the write. In - * the case of threads that started out detached, the - * initial clone flags are correct, but if the thread was - * detached later (== 2), we need to clear it here. */ - if (self->detached == 2) __syscall(SYS_set_tid_address, 0); + /* Last, unlink thread from the list. This change will not be visible + * until the lock is released, which only happens after SYS_exit + * has been called, via the exit futex address pointing at the lock. + * This needs to happen after any possible calls to LOCK() that might + * skip locking if process appears single-threaded. */ + if (!--libc.threads_minus_1) libc.need_locks = -1; + self->next->prev = self->prev; + self->prev->next = self->next; + self->prev = self->next = self; + + if (state==DT_DETACHED && self->map_base) { + /* Detached threads must block even implementation-internal + * signals, since they will not have a stack in their last + * moments of existence. */ + __block_all_sigs(&set); /* Robust list will no longer be valid, and was already * processed above, so unregister it with the kernel. */ if (self->robust_list.off) __syscall(SYS_set_robust_list, 0, 3*sizeof(long)); - /* Since __unmapself bypasses the normal munmap code path, - * explicitly wait for vmlock holders first. */ - __vm_wait(); - /* The following call unmaps the thread's stack mapping * and then exits without touching the stack. */ __unmapself(self->map_base, self->map_size); } + /* Wake any joiner. */ + a_store(&self->detach_state, DT_EXITED); + __wake(&self->detach_state, 1, 1); + + /* After the kernel thread exits, its tid may be reused. Clear it + * to prevent inadvertent use and inform functions that would use + * it that it's no longer available. */ + self->tid = 0; + UNLOCK(self->killlock); + for (;;) __syscall(SYS_exit, 0); } @@ -128,29 +180,35 @@ void __do_cleanup_pop(struct __ptcb *cb) __pthread_self()->cancelbuf = cb->__next; } +struct start_args { + void *(*start_func)(void *); + void *start_arg; + volatile int control; + unsigned long sig_mask[_NSIG/8/sizeof(long)]; +}; + static int start(void *p) { - pthread_t self = p; - if (self->startlock[0]) { - __wait(self->startlock, 0, 1, 1); - if (self->startlock[0]) { - self->detached = 2; - pthread_exit(0); + struct start_args *args = p; + int state = args->control; + if (state) { + if (a_cas(&args->control, 1, 2)==1) + __wait(&args->control, 0, 2, 1); + if (args->control) { + __syscall(SYS_set_tid_address, &args->control); + for (;;) __syscall(SYS_exit, 0); } - __restore_sigs(self->sigmask); } - if (self->unblock_cancel) - __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, - SIGPT_SET, 0, _NSIG/8); - __pthread_exit(self->start(self->start_arg)); + __syscall(SYS_rt_sigprocmask, SIG_SETMASK, &args->sig_mask, 0, _NSIG/8); + __pthread_exit(args->start_func(args->start_arg)); return 0; } static int start_c11(void *p) { - pthread_t self = p; - int (*start)(void*) = (int(*)(void*)) self->start; - __pthread_exit((void *)(uintptr_t)start(self->start_arg)); + struct start_args *args = p; + int (*start)(void*) = (int(*)(void*)) args->start_func; + __pthread_exit((void *)(uintptr_t)start(args->start_arg)); return 0; } @@ -162,8 +220,6 @@ weak_alias(dummy, __pthread_tsd_size); static void *dummy_tsd[1] = { 0 }; weak_alias(dummy_tsd, __pthread_tsd_main); -volatile int __block_new_threads = 0; - static FILE *volatile dummy_file = 0; weak_alias(dummy_file, __stdin_used); weak_alias(dummy_file, __stdout_used); @@ -174,8 +230,6 @@ static void init_file_lock(FILE *f) if (f && f->lock<0) f->lock = 0; } -void *__copy_tls(unsigned char *); - int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp, void *(*entry)(void *), void *restrict arg) { int ret, c11 = (attrp == __ATTRP_C11_THREAD); @@ -185,8 +239,8 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att unsigned flags = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED; - int do_sched = 0; - pthread_attr_t attr = {0}; + pthread_attr_t attr = { 0 }; + sigset_t set; if (!libc.can_do_threads) return ENOSYS; self = __pthread_self(); @@ -199,16 +253,20 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att init_file_lock(__stderr_used); __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, _NSIG/8); self->tsd = (void **)__pthread_tsd_main; + __membarrier_init(); libc.threaded = 1; } if (attrp && !c11) attr = *attrp; __acquire_ptc(); - if (__block_new_threads) __wait(&__block_new_threads, 0, 1, 1); + if (!attrp || c11) { + attr._a_stacksize = __default_stacksize; + attr._a_guardsize = __default_guardsize; + } if (attr._a_stackaddr) { size_t need = libc.tls_size + __pthread_tsd_size; - size = attr._a_stacksize + DEFAULT_STACK_SIZE; + size = attr._a_stacksize; stack = (void *)(attr._a_stackaddr & -16); stack_limit = (void *)(attr._a_stackaddr - size); /* Use application-provided stack for TLS only when @@ -220,11 +278,11 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att memset(stack, 0, need); } else { size = ROUND(need); - guard = 0; } + guard = 0; } else { - guard = ROUND(DEFAULT_GUARD_SIZE + attr._a_guardsize); - size = guard + ROUND(DEFAULT_STACK_SIZE + attr._a_stacksize + guard = ROUND(attr._a_guardsize); + size = guard + ROUND(attr._a_stacksize + libc.tls_size + __pthread_tsd_size); } @@ -253,44 +311,75 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att new->map_size = size; new->stack = stack; new->stack_size = stack - stack_limit; - new->start = entry; - new->start_arg = arg; + new->guard_size = guard; new->self = new; new->tsd = (void *)tsd; new->locale = &libc.global_locale; if (attr._a_detach) { - new->detached = 1; - flags -= CLONE_CHILD_CLEARTID; - } - if (attr._a_sched) { - do_sched = new->startlock[0] = 1; - __block_app_sigs(new->sigmask); + new->detach_state = DT_DETACHED; + } else { + new->detach_state = DT_JOINABLE; } new->robust_list.head = &new->robust_list.head; - new->unblock_cancel = self->cancel; - new->CANARY = self->CANARY; - - a_inc(&libc.threads_minus_1); - ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->tid); - - __release_ptc(); + new->canary = self->canary; + new->sysinfo = self->sysinfo; + + /* Setup argument structure for the new thread on its stack. + * It's safe to access from the caller only until the thread + * list is unlocked. */ + stack -= (uintptr_t)stack % sizeof(uintptr_t); + stack -= sizeof(struct start_args); + struct start_args *args = (void *)stack; + args->start_func = entry; + args->start_arg = arg; + args->control = attr._a_sched ? 1 : 0; + + /* Application signals (but not the synccall signal) must be + * blocked before the thread list lock can be taken, to ensure + * that the lock is AS-safe. */ + __block_app_sigs(&set); + + /* Ensure SIGCANCEL is unblocked in new thread. This requires + * working with a copy of the set so we can restore the + * original mask in the calling thread. */ + memcpy(&args->sig_mask, &set, sizeof args->sig_mask); + args->sig_mask[(SIGCANCEL-1)/8/sizeof(long)] &= + ~(1UL<<((SIGCANCEL-1)%(8*sizeof(long)))); + + __tl_lock(); + if (!libc.threads_minus_1++) libc.need_locks = 1; + ret = __clone((c11 ? start_c11 : start), stack, flags, args, &new->tid, TP_ADJ(new), &__thread_list_lock); + + /* All clone failures translate to EAGAIN. If explicit scheduling + * was requested, attempt it before unlocking the thread list so + * that the failed thread is never exposed and so that we can + * clean up all transient resource usage before returning. */ + if (ret < 0) { + ret = -EAGAIN; + } else if (attr._a_sched) { + ret = __syscall(SYS_sched_setscheduler, + new->tid, attr._a_policy, &attr._a_prio); + if (a_swap(&args->control, ret ? 3 : 0)==2) + __wake(&args->control, 1, 1); + if (ret) + __wait(&args->control, 0, 3, 0); + } - if (do_sched) { - __restore_sigs(new->sigmask); + if (ret >= 0) { + new->next = self->next; + new->prev = self; + new->next->prev = new; + new->prev->next = new; + } else { + if (!--libc.threads_minus_1) libc.need_locks = 0; } + __tl_unlock(); + __restore_sigs(&set); + __release_ptc(); if (ret < 0) { - a_dec(&libc.threads_minus_1); if (map) __munmap(map, size); - return EAGAIN; - } - - if (do_sched) { - ret = __syscall(SYS_sched_setscheduler, new->tid, - attr._a_policy, &attr._a_prio); - a_store(new->startlock, ret<0 ? 2 : 0); - __wake(new->startlock, 1, 1); - if (ret < 0) return -ret; + return -ret; } *res = new; diff --git a/system/lib/libc/musl/src/thread/pthread_detach.c b/system/lib/libc/musl/src/thread/pthread_detach.c index 263799504f00b..06487441ae266 100644 --- a/system/lib/libc/musl/src/thread/pthread_detach.c +++ b/system/lib/libc/musl/src/thread/pthread_detach.c @@ -1,23 +1,16 @@ #include "pthread_impl.h" #include -int __pthread_join(pthread_t, void **); - static int __pthread_detach(pthread_t t) { // XXX EMSCRIPTEN: Add check for invalid (already joined) thread. Again // for the benefit of the conformance tests. if (t->self != t) return ESRCH; - // XXX EMSCRIPTEN: Even though the man page says this is undefined behaviour - // we have several tests in the posixtest suite that depend on this. - if (t->detached) - return EINVAL; - /* Cannot detach a thread that's already exiting */ - if (a_swap(t->exitlock, 1)) + /* If the cas fails, detach state is either already-detached + * or exiting/exited, and pthread_join will trap or cleanup. */ + if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE) return __pthread_join(t, 0); - t->detached = 2; - __unlock(t->exitlock); return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_equal.c b/system/lib/libc/musl/src/thread/pthread_equal.c index 7c31482af3f8f..dbb7365587d6d 100644 --- a/system/lib/libc/musl/src/thread/pthread_equal.c +++ b/system/lib/libc/musl/src/thread/pthread_equal.c @@ -1,6 +1,5 @@ #include #include -#include "libc.h" static int __pthread_equal(pthread_t a, pthread_t b) { diff --git a/system/lib/libc/musl/src/thread/pthread_getattr_np.c b/system/lib/libc/musl/src/thread/pthread_getattr_np.c index d213096a0b9ff..5f5246133bc32 100644 --- a/system/lib/libc/musl/src/thread/pthread_getattr_np.c +++ b/system/lib/libc/musl/src/thread/pthread_getattr_np.c @@ -6,14 +6,15 @@ int pthread_getattr_np(pthread_t t, pthread_attr_t *a) { *a = (pthread_attr_t){0}; - a->_a_detach = !!t->detached; + a->_a_detach = t->detach_state>=DT_DETACHED; + a->_a_guardsize = t->guard_size; #ifdef __EMSCRIPTEN__ a->_a_stackaddr = (uintptr_t)t->stack; - a->_a_stacksize = t->stack_size - DEFAULT_STACK_SIZE; + a->_a_stacksize = t->stack_size; #else if (t->stack) { a->_a_stackaddr = (uintptr_t)t->stack; - a->_a_stacksize = t->stack_size - DEFAULT_STACK_SIZE; + a->_a_stacksize = t->stack_size; } else { char *p = (void *)libc.auxv; size_t l = PAGE_SIZE; @@ -21,7 +22,7 @@ int pthread_getattr_np(pthread_t t, pthread_attr_t *a) a->_a_stackaddr = (uintptr_t)p; while (mremap(p-l-PAGE_SIZE, PAGE_SIZE, 2*PAGE_SIZE, 0)==MAP_FAILED && errno==ENOMEM) l += PAGE_SIZE; - a->_a_stacksize = l - DEFAULT_STACK_SIZE; + a->_a_stacksize = l; } #endif return 0; diff --git a/system/lib/libc/musl/src/thread/pthread_getschedparam.c b/system/lib/libc/musl/src/thread/pthread_getschedparam.c index 1e81ea849e5f8..d5931b7b64e5c 100644 --- a/system/lib/libc/musl/src/thread/pthread_getschedparam.c +++ b/system/lib/libc/musl/src/thread/pthread_getschedparam.c @@ -1,4 +1,5 @@ #include "pthread_impl.h" +#include "lock.h" int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param *restrict param) { @@ -7,8 +8,10 @@ int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param return 0; #else int r; - __lock(t->killlock); - if (t->dead) { + sigset_t set; + __block_app_sigs(&set); + LOCK(t->killlock); + if (!t->tid) { r = ESRCH; } else { r = -__syscall(SYS_sched_getparam, t->tid, param); @@ -16,7 +19,8 @@ int pthread_getschedparam(pthread_t t, int *restrict policy, struct sched_param *policy = __syscall(SYS_sched_getscheduler, t->tid); } } - __unlock(t->killlock); + UNLOCK(t->killlock); + __restore_sigs(&set); return r; #endif } diff --git a/system/lib/libc/musl/src/thread/pthread_join.c b/system/lib/libc/musl/src/thread/pthread_join.c index 52111489540ed..17dae85d70861 100644 --- a/system/lib/libc/musl/src/thread/pthread_join.c +++ b/system/lib/libc/musl/src/thread/pthread_join.c @@ -1,21 +1,25 @@ +#define _GNU_SOURCE #include "pthread_impl.h" #include -int __munmap(void *, size_t); -void __pthread_testcancel(void); -int __pthread_setcancelstate(int, int *); +static void dummy1(pthread_t t) +{ +} +weak_alias(dummy1, __tl_sync); -int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) +static int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at) { - int tmp, cs, r = 0; + int state, cs, r = 0; __pthread_testcancel(); __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0); - while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL) - r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 0); + while ((state = t->detach_state) && r != ETIMEDOUT && r != EINVAL) { + if (state >= DT_DETACHED) a_crash(); + r = __timedwait_cp(&t->detach_state, state, CLOCK_REALTIME, at, 1); + } __pthread_setcancelstate(cs, 0); if (r == ETIMEDOUT || r == EINVAL) return r; - a_barrier(); + __tl_sync(t); if (res) *res = t->result; if (t->map_base) __munmap(t->map_base, t->map_size); return 0; @@ -26,9 +30,9 @@ int __pthread_join(pthread_t t, void **res) return __pthread_timedjoin_np(t, res, 0); } -int __pthread_tryjoin_np(pthread_t t, void **res) +static int __pthread_tryjoin_np(pthread_t t, void **res) { - return t->tid ? EBUSY : __pthread_join(t, res); + return t->detach_state==DT_JOINABLE ? EBUSY : __pthread_join(t, res); } weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np); diff --git a/system/lib/libc/musl/src/thread/pthread_key_create.c b/system/lib/libc/musl/src/thread/pthread_key_create.c index d6e2a50b4b14a..53caad405732e 100644 --- a/system/lib/libc/musl/src/thread/pthread_key_create.c +++ b/system/lib/libc/musl/src/thread/pthread_key_create.c @@ -7,54 +7,92 @@ volatile size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX; void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 }; -static void (*volatile keys[PTHREAD_KEYS_MAX])(void *); +static void (*keys[PTHREAD_KEYS_MAX])(void *); + +static pthread_rwlock_t key_lock = PTHREAD_RWLOCK_INITIALIZER; + +static pthread_key_t next_key; static void nodtor(void *dummy) { } +static void dummy_0(void) +{ +} + +weak_alias(dummy_0, __tl_lock); +weak_alias(dummy_0, __tl_unlock); + int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *)) { - unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX; - unsigned j = i; pthread_t self = __pthread_self(); /* This can only happen in the main thread before * pthread_create has been called. */ if (!self->tsd) self->tsd = __pthread_tsd_main; + /* Purely a sentinel value since null means slot is free. */ if (!dtor) dtor = nodtor; + + __pthread_rwlock_wrlock(&key_lock); + pthread_key_t j = next_key; do { - if (!a_cas_p(keys+j, 0, (void *)dtor)) { - *k = j; + if (!keys[j]) { + keys[next_key = *k = j] = dtor; + __pthread_rwlock_unlock(&key_lock); return 0; } - } while ((j=(j+1)%PTHREAD_KEYS_MAX) != i); + } while ((j=(j+1)%PTHREAD_KEYS_MAX) != next_key); + + __pthread_rwlock_unlock(&key_lock); return EAGAIN; } int __pthread_key_delete(pthread_key_t k) { + sigset_t set; + pthread_t self = __pthread_self(), td=self; + + __block_app_sigs(&set); + __pthread_rwlock_wrlock(&key_lock); + + // TODO(sbc): Implement circular list of threads + /* + __tl_lock(); + do td->tsd[k] = 0; + while ((td=td->next)!=self); + __tl_unlock(); + */ + keys[k] = 0; + + __pthread_rwlock_unlock(&key_lock); + __restore_sigs(&set); + return 0; } void __pthread_tsd_run_dtors() { pthread_t self = __pthread_self(); - int i, j, not_finished = self->tsd_used; - for (j=0; not_finished && jtsd_used && jtsd_used = 0; for (i=0; itsd[i] && keys[i]) { - void *tmp = self->tsd[i]; - self->tsd[i] = 0; - keys[i](tmp); - not_finished = 1; + void *val = self->tsd[i]; + void (*dtor)(void *) = keys[i]; + self->tsd[i] = 0; + if (val && dtor && dtor != nodtor) { + __pthread_rwlock_unlock(&key_lock); + dtor(val); + __pthread_rwlock_rdlock(&key_lock); } } + __pthread_rwlock_unlock(&key_lock); } } -weak_alias(__pthread_key_delete, pthread_key_delete); weak_alias(__pthread_key_create, pthread_key_create); +weak_alias(__pthread_key_delete, pthread_key_delete); diff --git a/system/lib/libc/musl/src/thread/pthread_kill.c b/system/lib/libc/musl/src/thread/pthread_kill.c index acdb1ea6173c2..79ddb20978f75 100644 --- a/system/lib/libc/musl/src/thread/pthread_kill.c +++ b/system/lib/libc/musl/src/thread/pthread_kill.c @@ -1,10 +1,18 @@ #include "pthread_impl.h" +#include "lock.h" int pthread_kill(pthread_t t, int sig) { int r; - __lock(t->killlock); - r = t->dead ? ESRCH : -__syscall(SYS_tkill, t->tid, sig); - __unlock(t->killlock); + sigset_t set; + /* Block not just app signals, but internal ones too, since + * pthread_kill is used to implement pthread_cancel, which + * must be async-cancel-safe. */ + __block_all_sigs(&set); + LOCK(t->killlock); + r = t->tid ? -__syscall(SYS_tkill, t->tid, sig) + : (sig+0U >= _NSIG ? EINVAL : 0); + UNLOCK(t->killlock); + __restore_sigs(&set); return r; } diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_consistent.c b/system/lib/libc/musl/src/thread/pthread_mutex_consistent.c index 96b83b52851b2..27c74e5b6a010 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_consistent.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_consistent.c @@ -1,10 +1,14 @@ #include "pthread_impl.h" +#include "atomic.h" int pthread_mutex_consistent(pthread_mutex_t *m) { - if (!(m->_m_type & 8)) return EINVAL; - if ((m->_m_lock & 0x7fffffff) != __pthread_self()->tid) + int old = m->_m_lock; + int own = old & 0x3fffffff; + if (!(m->_m_type & 4) || !own || !(old & 0x40000000)) + return EINVAL; + if (own != __pthread_self()->tid) return EPERM; - m->_m_type &= ~8U; + a_and(&m->_m_lock, ~0x40000000); return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_destroy.c b/system/lib/libc/musl/src/thread/pthread_mutex_destroy.c index 6d49e68989226..8d1bf77b87921 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_destroy.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_destroy.c @@ -1,6 +1,10 @@ -#include +#include "pthread_impl.h" int pthread_mutex_destroy(pthread_mutex_t *mutex) { + /* If the mutex being destroyed is process-shared and has nontrivial + * type (tracking ownership), it might be in the pending slot of a + * robust_list; wait for quiescence. */ + if (mutex->_m_type > 128) __vm_wait(); return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_lock.c b/system/lib/libc/musl/src/thread/pthread_mutex_lock.c index d0c93cab50119..638d4b8697d84 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_lock.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_lock.c @@ -1,7 +1,5 @@ #include "pthread_impl.h" -int __pthread_mutex_timedlock(pthread_mutex_t *restrict, const struct timespec *restrict); - int __pthread_mutex_lock(pthread_mutex_t *m) { if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_timedlock.c b/system/lib/libc/musl/src/thread/pthread_mutex_timedlock.c index 0a240e7913418..8a8952b67e8ae 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_timedlock.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_timedlock.c @@ -1,24 +1,86 @@ #include "pthread_impl.h" +#ifndef __EMSCRIPTEN__ +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +static int __futex4(volatile void *addr, int op, int val, const struct timespec *to) +{ +#ifdef SYS_futex_time64 + time_t s = to ? to->tv_sec : 0; + long ns = to ? to->tv_nsec : 0; + int r = -ENOSYS; + if (SYS_futex == SYS_futex_time64 || !IS32BIT(s)) + r = __syscall(SYS_futex_time64, addr, op, val, + to ? ((long long[]){s, ns}) : 0); + if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r; + to = to ? (void *)(long[]){CLAMP(s), ns} : 0; +#endif + return __syscall(SYS_futex, addr, op, val, to); +} + +static int pthread_mutex_timedlock_pi(pthread_mutex_t *restrict m, const struct timespec *restrict at) +{ + int type = m->_m_type; + int priv = (type & 128) ^ 128; + pthread_t self = __pthread_self(); + int e; + + if (!priv) self->robust_list.pending = &m->_m_next; + + do e = -__futex4(&m->_m_lock, FUTEX_LOCK_PI|priv, 0, at); + while (e==EINTR); + if (e) self->robust_list.pending = 0; + + switch (e) { + case 0: + /* Catch spurious success for non-robust mutexes. */ + if (!(type&4) && ((m->_m_lock & 0x40000000) || m->_m_waiters)) { + a_store(&m->_m_waiters, -1); + __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); + self->robust_list.pending = 0; + break; + } + /* Signal to trylock that we already have the lock. */ + m->_m_count = -1; + return __pthread_mutex_trylock(m); + case ETIMEDOUT: + return e; + case EDEADLK: + if ((type&3) == PTHREAD_MUTEX_ERRORCHECK) return e; + } + do e = __timedwait(&(int){0}, 0, CLOCK_REALTIME, at, 1); + while (e != ETIMEDOUT); + return e; +} +#endif + int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at) { if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL && !a_cas(&m->_m_lock, 0, EBUSY)) return 0; - int r, t, priv = (m->_m_type & 128) ^ 128; + int type = m->_m_type; + int r, t, priv = (type & 128) ^ 128; - r = pthread_mutex_trylock(m); + r = __pthread_mutex_trylock(m); if (r != EBUSY) return r; + +#ifndef __EMSCRIPTEN__ + if (type&8) return pthread_mutex_timedlock_pi(m, at); +#endif int spins = 100; while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); - while ((r=pthread_mutex_trylock(m)) == EBUSY) { - if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4))) + while ((r=__pthread_mutex_trylock(m)) == EBUSY) { + r = m->_m_lock; + int own = r & 0x3fffffff; + if (!own && (!r || (type&4))) continue; - if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK - && (r&0x7fffffff) == __pthread_self()->tid) + if ((type&3) == PTHREAD_MUTEX_ERRORCHECK + && own == __pthread_self()->tid) return EDEADLK; a_inc(&m->_m_waiters); diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_trylock.c b/system/lib/libc/musl/src/thread/pthread_mutex_trylock.c index fa530915aeeb2..9c7d8496a8c10 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_trylock.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_trylock.c @@ -3,20 +3,29 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) { int old, own; - int type = m->_m_type & 15; + int type = m->_m_type; pthread_t self = __pthread_self(); int tid = self->tid; + volatile void *next; old = m->_m_lock; - own = old & 0x7fffffff; - if (own == tid && (type&3) == PTHREAD_MUTEX_RECURSIVE) { - if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; - m->_m_count++; - return 0; + own = old & 0x3fffffff; + if (own == tid) { + if ((type&8) && m->_m_count<0) { + old &= 0x40000000; + m->_m_count = 0; + goto success; + } + if ((type&3) == PTHREAD_MUTEX_RECURSIVE) { + if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; + m->_m_count++; + return 0; + } } - if (own == 0x7fffffff) return ENOTRECOVERABLE; + if (own == 0x3fffffff) return ENOTRECOVERABLE; + if (own || (old && !(type & 4))) return EBUSY; - if (m->_m_type & 128) { + if (type & 128) { if (!self->robust_list.off) { self->robust_list.off = (char*)&m->_m_lock-(char *)&m->_m_next; #ifndef __EMSCRIPTEN__ // XXX Emscripten does not have a concept of multiple processes or kernel space, so robust mutex lists don't need to register to kernel. @@ -26,14 +35,25 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) if (m->_m_waiters) tid |= 0x80000000; self->robust_list.pending = &m->_m_next; } + tid |= old & 0x40000000; - if ((own && (!(own & 0x40000000) || !(type & 4))) - || a_cas(&m->_m_lock, old, tid) != old) { + if (a_cas(&m->_m_lock, old, tid) != old) { self->robust_list.pending = 0; + if ((type&12)==12 && m->_m_waiters) return ENOTRECOVERABLE; return EBUSY; } - volatile void *next = self->robust_list.head; +success: +#ifndef __EMSCRIPTEN__ + if ((type&8) && m->_m_waiters) { + int priv = (type & 128) ^ 128; + __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); + self->robust_list.pending = 0; + return (type&4) ? ENOTRECOVERABLE : EBUSY; + } +#endif + + next = self->robust_list.head; m->_m_next = next; m->_m_prev = &self->robust_list.head; if (next != &self->robust_list.head) *(volatile void *volatile *) @@ -41,9 +61,8 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) self->robust_list.head = &m->_m_next; self->robust_list.pending = 0; - if (own) { + if (old) { m->_m_count = 0; - m->_m_type |= 8; return EOWNERDEAD; } diff --git a/system/lib/libc/musl/src/thread/pthread_mutex_unlock.c b/system/lib/libc/musl/src/thread/pthread_mutex_unlock.c index 7dd00d275b6dd..af13bcfa12012 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutex_unlock.c +++ b/system/lib/libc/musl/src/thread/pthread_mutex_unlock.c @@ -7,13 +7,19 @@ int __pthread_mutex_unlock(pthread_mutex_t *m) int cont; int type = m->_m_type & 15; int priv = (m->_m_type & 128) ^ 128; + int new = 0; + int old; if (type != PTHREAD_MUTEX_NORMAL) { self = __pthread_self(); - if ((m->_m_lock&0x7fffffff) != self->tid) + old = m->_m_lock; + int own = old & 0x3fffffff; + if (own != self->tid) return EPERM; if ((type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count) return m->_m_count--, 0; + if ((type&4) && (old&0x40000000)) + new = 0x7fffffff; if (!priv) { self->robust_list.pending = &m->_m_next; __vm_lock(); @@ -24,7 +30,20 @@ int __pthread_mutex_unlock(pthread_mutex_t *m) if (next != &self->robust_list.head) *(volatile void *volatile *) ((char *)next - sizeof(void *)) = prev; } - cont = a_swap(&m->_m_lock, (type & 8) ? 0x7fffffff : 0); +#ifdef __EMSCRIPTEN__ + cont = a_swap(&m->_m_lock, new); +#else + if (type&8) { + if (old<0 || a_cas(&m->_m_lock, old, new)!=old) { + if (new) a_store(&m->_m_waiters, -1); + __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); + } + cont = 0; + waiters = 0; + } else { + cont = a_swap(&m->_m_lock, new); + } +#endif if (type != PTHREAD_MUTEX_NORMAL && !priv) { self->robust_list.pending = 0; __vm_unlock(); diff --git a/system/lib/libc/musl/src/thread/pthread_mutexattr_setprotocol.c b/system/lib/libc/musl/src/thread/pthread_mutexattr_setprotocol.c index c92a31c8a46cf..bda16ebd5ba21 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutexattr_setprotocol.c +++ b/system/lib/libc/musl/src/thread/pthread_mutexattr_setprotocol.c @@ -1,7 +1,30 @@ #include "pthread_impl.h" +#include "syscall.h" + +static volatile int check_pi_result = -1; int pthread_mutexattr_setprotocol(pthread_mutexattr_t *a, int protocol) { - if (protocol) return ENOTSUP; - return 0; + int r; + switch (protocol) { + case PTHREAD_PRIO_NONE: + a->__attr &= ~8; + return 0; + case PTHREAD_PRIO_INHERIT: +#ifndef __EMSCRIPTEN__ + r = check_pi_result; + if (r < 0) { + volatile int lk = 0; + r = -__syscall(SYS_futex, &lk, FUTEX_LOCK_PI, 0, 0); + a_store(&check_pi_result, r); + } + if (r) return r; + a->__attr |= 8; + return 0; +#endif + case PTHREAD_PRIO_PROTECT: + return ENOTSUP; + default: + return EINVAL; + } } diff --git a/system/lib/libc/musl/src/thread/pthread_mutexattr_setrobust.c b/system/lib/libc/musl/src/thread/pthread_mutexattr_setrobust.c index dcfa4cf1c771c..7e181e2c0639e 100644 --- a/system/lib/libc/musl/src/thread/pthread_mutexattr_setrobust.c +++ b/system/lib/libc/musl/src/thread/pthread_mutexattr_setrobust.c @@ -1,9 +1,25 @@ #include "pthread_impl.h" +#include "syscall.h" + +static volatile int check_robust_result = -1; int pthread_mutexattr_setrobust(pthread_mutexattr_t *a, int robust) { if (robust > 1U) return EINVAL; + if (robust) { +#ifndef __EMSCRIPTEN__ + int r = check_robust_result; + if (r < 0) { + void *p; + size_t l; + r = -__syscall(SYS_get_robust_list, 0, &p, &l); + a_store(&check_robust_result, r); + } + if (r) return r; +#endif + a->__attr |= 4; + return 0; + } a->__attr &= ~4; - a->__attr |= robust*4; return 0; } diff --git a/system/lib/libc/musl/src/thread/pthread_once.c b/system/lib/libc/musl/src/thread/pthread_once.c index a8f8aeb17a039..8e8d40ae8331d 100644 --- a/system/lib/libc/musl/src/thread/pthread_once.c +++ b/system/lib/libc/musl/src/thread/pthread_once.c @@ -8,7 +8,7 @@ static void undo(void *control) __wake(control, -1, 1); } -int __pthread_once_full(pthread_once_t *control, void (*init)(void)) +hidden int __pthread_once_full(pthread_once_t *control, void (*init)(void)) { /* Try to enter initializing state. Four possibilities: * 0 - we're the first or the other cancelled; run init diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_rdlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_rdlock.c index 0800d21ffd63f..8546c07d2e790 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_rdlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_rdlock.c @@ -1,6 +1,8 @@ #include "pthread_impl.h" -int pthread_rwlock_rdlock(pthread_rwlock_t *rw) +int __pthread_rwlock_rdlock(pthread_rwlock_t *rw) { - return pthread_rwlock_timedrdlock(rw, 0); + return __pthread_rwlock_timedrdlock(rw, 0); } + +weak_alias(__pthread_rwlock_rdlock, pthread_rwlock_rdlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_timedrdlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_timedrdlock.c index 0d5d0d6c05fe8..8cdd8ecf1775c 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_timedrdlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_timedrdlock.c @@ -1,6 +1,6 @@ #include "pthread_impl.h" -int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at) +int __pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at) { int r, t; @@ -10,7 +10,7 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct times int spins = 100; while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin(); - while ((r=pthread_rwlock_tryrdlock(rw))==EBUSY) { + while ((r=__pthread_rwlock_tryrdlock(rw))==EBUSY) { if (!(r=rw->_rw_lock) || (r&0x7fffffff)!=0x7fffffff) continue; t = r | 0x80000000; a_inc(&rw->_rw_waiters); @@ -21,3 +21,5 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct times } return r; } + +weak_alias(__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c index 15a8acc1cacf1..60a2902ba8730 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c @@ -1,6 +1,6 @@ #include "pthread_impl.h" -int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at) +int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at) { #ifdef __EMSCRIPTEN__ /// XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, which we do here to avoid hangs. @@ -15,7 +15,7 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times int spins = 100; while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin(); - while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) { + while ((r=__pthread_rwlock_trywrlock(rw))==EBUSY) { if (!(r=rw->_rw_lock)) continue; t = r | 0x80000000; a_inc(&rw->_rw_waiters); @@ -31,3 +31,5 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times #endif return r; } + +weak_alias(__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_tryrdlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_tryrdlock.c index fa271fcc6a156..c13bc9cc19791 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_tryrdlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_tryrdlock.c @@ -1,6 +1,6 @@ #include "pthread_impl.h" -int pthread_rwlock_tryrdlock(pthread_rwlock_t *rw) +int __pthread_rwlock_tryrdlock(pthread_rwlock_t *rw) { int val, cnt; do { @@ -11,3 +11,5 @@ int pthread_rwlock_tryrdlock(pthread_rwlock_t *rw) } while (a_cas(&rw->_rw_lock, val, val+1) != val); return 0; } + +weak_alias(__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c index cf0f2c648e386..d03cad43169dc 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c @@ -1,6 +1,6 @@ #include "pthread_impl.h" -int pthread_rwlock_trywrlock(pthread_rwlock_t *rw) +int __pthread_rwlock_trywrlock(pthread_rwlock_t *rw) { if (a_cas(&rw->_rw_lock, 0, 0x7fffffff)) return EBUSY; #ifdef __EMSCRIPTEN__ @@ -10,3 +10,5 @@ int pthread_rwlock_trywrlock(pthread_rwlock_t *rw) #endif return 0; } + +weak_alias(__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c index 15b363dcafc41..34879145df875 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c @@ -1,6 +1,6 @@ #include "pthread_impl.h" -int pthread_rwlock_unlock(pthread_rwlock_t *rw) +int __pthread_rwlock_unlock(pthread_rwlock_t *rw) { int val, cnt, waiters, new, priv = rw->_rw_shared^128; @@ -22,3 +22,5 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rw) return 0; } + +weak_alias(__pthread_rwlock_unlock, pthread_rwlock_unlock); diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_wrlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_wrlock.c index 7f33535c7d9bb..46a3b3a5b0af0 100644 --- a/system/lib/libc/musl/src/thread/pthread_rwlock_wrlock.c +++ b/system/lib/libc/musl/src/thread/pthread_rwlock_wrlock.c @@ -1,6 +1,8 @@ #include "pthread_impl.h" -int pthread_rwlock_wrlock(pthread_rwlock_t *rw) +int __pthread_rwlock_wrlock(pthread_rwlock_t *rw) { - return pthread_rwlock_timedwrlock(rw, 0); + return __pthread_rwlock_timedwrlock(rw, 0); } + +weak_alias(__pthread_rwlock_wrlock, pthread_rwlock_wrlock); diff --git a/system/lib/libc/musl/src/thread/pthread_self.c b/system/lib/libc/musl/src/thread/pthread_self.c index 241a6202d2ea5..bd3bf95bb708a 100644 --- a/system/lib/libc/musl/src/thread/pthread_self.c +++ b/system/lib/libc/musl/src/thread/pthread_self.c @@ -1,6 +1,5 @@ #include "pthread_impl.h" #include -#include "libc.h" static pthread_t __pthread_self_internal() { diff --git a/system/lib/libc/musl/src/thread/pthread_setattr_default_np.c b/system/lib/libc/musl/src/thread/pthread_setattr_default_np.c new file mode 100644 index 0000000000000..58486220e026c --- /dev/null +++ b/system/lib/libc/musl/src/thread/pthread_setattr_default_np.c @@ -0,0 +1,37 @@ +#define _GNU_SOURCE +#include "pthread_impl.h" +#include + +#define MIN(a,b) ((a)<(b) ? (a) : (b)) +#define MAX(a,b) ((a)>(b) ? (a) : (b)) + +int pthread_setattr_default_np(const pthread_attr_t *attrp) +{ + /* Reject anything in the attr object other than stack/guard size. */ + pthread_attr_t tmp = *attrp, zero = { 0 }; + tmp._a_stacksize = 0; + tmp._a_guardsize = 0; + if (memcmp(&tmp, &zero, sizeof tmp)) + return EINVAL; + + unsigned stack = MIN(attrp->_a_stacksize, DEFAULT_STACK_MAX); + unsigned guard = MIN(attrp->_a_guardsize, DEFAULT_GUARD_MAX); + + __inhibit_ptc(); + __default_stacksize = MAX(__default_stacksize, stack); + __default_guardsize = MAX(__default_guardsize, guard); + __release_ptc(); + + return 0; +} + +int pthread_getattr_default_np(pthread_attr_t *attrp) +{ + __acquire_ptc(); + *attrp = (pthread_attr_t) { + ._a_stacksize = __default_stacksize, + ._a_guardsize = __default_guardsize, + }; + __release_ptc(); + return 0; +} diff --git a/system/lib/libc/musl/src/thread/pthread_setname_np.c b/system/lib/libc/musl/src/thread/pthread_setname_np.c new file mode 100644 index 0000000000000..82d35e17eda7b --- /dev/null +++ b/system/lib/libc/musl/src/thread/pthread_setname_np.c @@ -0,0 +1,26 @@ +#define _GNU_SOURCE +#include +#include +#include +#include + +#include "pthread_impl.h" + +int pthread_setname_np(pthread_t thread, const char *name) +{ + int fd, cs, status = 0; + char f[sizeof "/proc/self/task//comm" + 3*sizeof(int)]; + size_t len; + + if ((len = strnlen(name, 16)) > 15) return ERANGE; + + if (thread == pthread_self()) + return prctl(PR_SET_NAME, (unsigned long)name, 0UL, 0UL, 0UL) ? errno : 0; + + snprintf(f, sizeof f, "/proc/self/task/%d/comm", thread->tid); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); + if ((fd = open(f, O_WRONLY)) < 0 || write(fd, name, len) < 0) status = errno; + if (fd >= 0) close(fd); + pthread_setcancelstate(cs, 0); + return status; +} diff --git a/system/lib/libc/musl/src/thread/pthread_setschedparam.c b/system/lib/libc/musl/src/thread/pthread_setschedparam.c index 203a625e1a5bf..396aff5a33be0 100644 --- a/system/lib/libc/musl/src/thread/pthread_setschedparam.c +++ b/system/lib/libc/musl/src/thread/pthread_setschedparam.c @@ -1,4 +1,5 @@ #include "pthread_impl.h" +#include "lock.h" int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *param) { @@ -7,9 +8,12 @@ int pthread_setschedparam(pthread_t t, int policy, const struct sched_param *par return 0; #else int r; - __lock(t->killlock); - r = t->dead ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param); - __unlock(t->killlock); + sigset_t set; + __block_app_sigs(&set); + LOCK(t->killlock); + r = !t->tid ? ESRCH : -__syscall(SYS_sched_setscheduler, t->tid, policy, param); + UNLOCK(t->killlock); + __restore_sigs(&set); return r; #endif } diff --git a/system/lib/libc/musl/src/thread/pthread_setschedprio.c b/system/lib/libc/musl/src/thread/pthread_setschedprio.c index ed9b2d66f80ea..b8d53698683a7 100644 --- a/system/lib/libc/musl/src/thread/pthread_setschedprio.c +++ b/system/lib/libc/musl/src/thread/pthread_setschedprio.c @@ -1,4 +1,5 @@ #include "pthread_impl.h" +#include "lock.h" int pthread_setschedprio(pthread_t t, int prio) { @@ -7,9 +8,12 @@ int pthread_setschedprio(pthread_t t, int prio) return 0; #else int r; - __lock(t->killlock); - r = t->dead ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio); - __unlock(t->killlock); + sigset_t set; + __block_app_sigs(&set); + LOCK(t->killlock); + r = !t->tid ? ESRCH : -__syscall(SYS_sched_setparam, t->tid, &prio); + UNLOCK(t->killlock); + __restore_sigs(&set); return r; #endif } diff --git a/system/lib/libc/musl/src/thread/pthread_sigmask.c b/system/lib/libc/musl/src/thread/pthread_sigmask.c index 88c333f6b682b..f188782a3277e 100644 --- a/system/lib/libc/musl/src/thread/pthread_sigmask.c +++ b/system/lib/libc/musl/src/thread/pthread_sigmask.c @@ -5,7 +5,7 @@ int pthread_sigmask(int how, const sigset_t *restrict set, sigset_t *restrict old) { int ret; - if ((unsigned)how - SIG_BLOCK > 2U) return EINVAL; + if (set && (unsigned)how - SIG_BLOCK > 2U) return EINVAL; ret = -__syscall(SYS_rt_sigprocmask, how, set, old, _NSIG/8); if (!ret && old) { if (sizeof old->__bits[0] == 8) { diff --git a/system/lib/libc/musl/src/thread/pthread_testcancel.c b/system/lib/libc/musl/src/thread/pthread_testcancel.c index ee48e6d8af6dc..d772449d94156 100644 --- a/system/lib/libc/musl/src/thread/pthread_testcancel.c +++ b/system/lib/libc/musl/src/thread/pthread_testcancel.c @@ -1,5 +1,4 @@ #include "pthread_impl.h" -#include "libc.h" static void dummy() { diff --git a/system/lib/libc/musl/src/thread/sem_open.c b/system/lib/libc/musl/src/thread/sem_open.c index fda0acd35c717..0ad29de96cc16 100644 --- a/system/lib/libc/musl/src/thread/sem_open.c +++ b/system/lib/libc/musl/src/thread/sem_open.c @@ -11,16 +11,21 @@ #include #include #include -#include "libc.h" +#include "lock.h" +#include "fork_impl.h" -char *__shm_mapname(const char *, char *); +#define malloc __libc_malloc +#define calloc __libc_calloc +#define realloc undef +#define free undef static struct { ino_t ino; sem_t *sem; int refcnt; } *semtab; -static volatile int lock[2]; +static volatile int lock[1]; +volatile int *const __sem_open_lockptr = lock; #define FLAGS (O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK) @@ -165,10 +170,12 @@ int sem_close(sem_t *sem) int i; LOCK(lock); for (i=0; i__val+1)); r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]); pthread_cleanup_pop(1); - if (r && r != EINTR) { + if (r) { #ifdef __EMSCRIPTEN__ if (r == ECANCELED) r = EINTR; #endif diff --git a/system/lib/libc/musl/src/thread/synccall.c b/system/lib/libc/musl/src/thread/synccall.c index 000ec4e353a47..d58c851fcff4a 100644 --- a/system/lib/libc/musl/src/thread/synccall.c +++ b/system/lib/libc/musl/src/thread/synccall.c @@ -1,45 +1,42 @@ #include "pthread_impl.h" #include -#include -#include #include -#include -#include "futex.h" -#include "atomic.h" -#include "../dirent/__dirent.h" - -static struct chain { - struct chain *next; - int tid; - sem_t target_sem, caller_sem; -} *volatile head; - -static volatile int synccall_lock[2]; -static volatile int target_tid; + +static void dummy_0(void) +{ +} + +weak_alias(dummy_0, __tl_lock); +weak_alias(dummy_0, __tl_unlock); + +static int target_tid; static void (*callback)(void *), *context; -static volatile int dummy = 0; -weak_alias(dummy, __block_new_threads); +static sem_t target_sem, caller_sem; + +static void dummy(void *p) +{ +} static void handler(int sig) { - struct chain ch; - int old_errno = errno; + if (__pthread_self()->tid != target_tid) return; - sem_init(&ch.target_sem, 0, 0); - sem_init(&ch.caller_sem, 0, 0); + int old_errno = errno; - ch.tid = __syscall(SYS_gettid); + /* Inform caller we have received signal and wait for + * the caller to let us make the callback. */ + sem_post(&caller_sem); + sem_wait(&target_sem); - do ch.next = head; - while (a_cas_p(&head, ch.next, &ch) != ch.next); + callback(context); - if (a_cas(&target_tid, ch.tid, 0) == (ch.tid | 0x80000000)) - __syscall(SYS_futex, &target_tid, FUTEX_UNLOCK_PI|FUTEX_PRIVATE); + /* Inform caller we've complered the callback and wait + * for the caller to release us to return. */ + sem_post(&caller_sem); + sem_wait(&target_sem); - sem_wait(&ch.target_sem); - callback(context); - sem_post(&ch.caller_sem); - sem_wait(&ch.target_sem); + /* Inform caller we are returning and state is destroyable. */ + sem_post(&caller_sem); errno = old_errno; } @@ -47,12 +44,10 @@ static void handler(int sig) void __synccall(void (*func)(void *), void *ctx) { sigset_t oldmask; - int cs, i, r, pid, self;; - DIR dir = {0}; - struct dirent *de; - struct sigaction sa = { .sa_flags = 0, .sa_handler = handler }; - struct chain *cp, *next; - struct timespec ts; + int cs, i, r; + struct sigaction sa = { .sa_flags = SA_RESTART, .sa_handler = handler }; + pthread_t self = __pthread_self(), td; + int count = 0; /* Blocking signals in two steps, first only app-level signals * before taking the lock, then all signals after taking the lock, @@ -61,98 +56,46 @@ void __synccall(void (*func)(void *), void *ctx) * any until after the lock would allow re-entry in the same thread * with the lock already held. */ __block_app_sigs(&oldmask); - LOCK(synccall_lock); + __tl_lock(); __block_all_sigs(0); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); - head = 0; + sem_init(&target_sem, 0, 0); + sem_init(&caller_sem, 0, 0); - if (!libc.threaded) goto single_threaded; + if (!libc.threads_minus_1 || __syscall(SYS_gettid) != self->tid) + goto single_threaded; callback = func; context = ctx; - /* This atomic store ensures that any signaled threads will see the - * above stores, and prevents more than a bounded number of threads, - * those already in pthread_create, from creating new threads until - * the value is cleared to zero again. */ - a_store(&__block_new_threads, 1); - /* Block even implementation-internal signals, so that nothing * interrupts the SIGSYNCCALL handlers. The main possible source * of trouble is asynchronous cancellation. */ memset(&sa.sa_mask, -1, sizeof sa.sa_mask); __libc_sigaction(SIGSYNCCALL, &sa, 0); - pid = __syscall(SYS_getpid); - self = __syscall(SYS_gettid); - - /* Since opendir is not AS-safe, the DIR needs to be setup manually - * in automatic storage. Thankfully this is easy. */ - dir.fd = open("/proc/self/task", O_RDONLY|O_DIRECTORY|O_CLOEXEC); - if (dir.fd < 0) goto out; - - /* Initially send one signal per counted thread. But since we can't - * synchronize with thread creation/exit here, there could be too - * few signals. This initial signaling is just an optimization, not - * part of the logic. */ - for (i=libc.threads_minus_1; i; i--) - __syscall(SYS_kill, pid, SIGSYNCCALL); - - /* Loop scanning the kernel-provided thread list until it shows no - * threads that have not already replied to the signal. */ - for (;;) { - int miss_cnt = 0; - while ((de = readdir(&dir))) { - if (!isdigit(de->d_name[0])) continue; - int tid = atoi(de->d_name); - if (tid == self || !tid) continue; - - /* Set the target thread as the PI futex owner before - * checking if it's in the list of caught threads. If it - * adds itself to the list after we check for it, then - * it will see its own tid in the PI futex and perform - * the unlock operation. */ - a_store(&target_tid, tid); - - /* Thread-already-caught is a success condition. */ - for (cp = head; cp && cp->tid != tid; cp=cp->next); - if (cp) continue; - - r = -__syscall(SYS_tgkill, pid, tid, SIGSYNCCALL); - - /* Target thread exit is a success condition. */ - if (r == ESRCH) continue; - - /* The FUTEX_LOCK_PI operation is used to loan priority - * to the target thread, which otherwise may be unable - * to run. Timeout is necessary because there is a race - * condition where the tid may be reused by a different - * process. */ - clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_nsec += 10000000; - if (ts.tv_nsec >= 1000000000) { - ts.tv_sec++; - ts.tv_nsec -= 1000000000; - } - r = -__syscall(SYS_futex, &target_tid, - FUTEX_LOCK_PI|FUTEX_PRIVATE, 0, &ts); - - /* Obtaining the lock means the thread responded. ESRCH - * means the target thread exited, which is okay too. */ - if (!r || r == ESRCH) continue; - - miss_cnt++; + + for (td=self->next; td!=self; td=td->next) { + target_tid = td->tid; + while ((r = -__syscall(SYS_tkill, td->tid, SIGSYNCCALL)) == EAGAIN); + if (r) { + /* If we failed to signal any thread, nop out the + * callback to abort the synccall and just release + * any threads already caught. */ + callback = func = dummy; + break; } - if (!miss_cnt) break; - rewinddir(&dir); + sem_wait(&caller_sem); + count++; } - close(dir.fd); + target_tid = 0; - /* Serialize execution of callback in caught threads. */ - for (cp=head; cp; cp=cp->next) { - sem_post(&cp->target_sem); - sem_wait(&cp->caller_sem); + /* Serialize execution of callback in caught threads, or just + * release them all if synccall is being aborted. */ + for (i=0; inext; - sem_post(&cp->target_sem); - } + for (i=0; i - -_Noreturn void __pthread_exit(void *); +#include +#include _Noreturn void thrd_exit(int result) { diff --git a/system/lib/libc/musl/src/thread/thrd_join.c b/system/lib/libc/musl/src/thread/thrd_join.c index ac6678939f6b3..abcdbc1aaeac2 100644 --- a/system/lib/libc/musl/src/thread/thrd_join.c +++ b/system/lib/libc/musl/src/thread/thrd_join.c @@ -1,12 +1,15 @@ #include #include - -int __pthread_join(thrd_t, void**); +#include int thrd_join(thrd_t t, int *res) { void *pthread_res; - __pthread_join(t, &pthread_res); + int rtn = __pthread_join(t, &pthread_res); + // XXX Emscripten added handling of error case + if (rtn) { + return thrd_error; + } if (res) *res = (int)(intptr_t)pthread_res; return thrd_success; } diff --git a/system/lib/libc/musl/src/thread/thrd_sleep.c b/system/lib/libc/musl/src/thread/thrd_sleep.c index 37af3e21668cb..97de53455ede4 100644 --- a/system/lib/libc/musl/src/thread/thrd_sleep.c +++ b/system/lib/libc/musl/src/thread/thrd_sleep.c @@ -1,14 +1,11 @@ #include +#include #include #include "syscall.h" int thrd_sleep(const struct timespec *req, struct timespec *rem) { -#ifdef __EMSCRIPTEN__ - int ret = nanosleep(req, rem); -#else - int ret = __syscall(SYS_nanosleep, req, rem); -#endif + int ret = -__clock_nanosleep(CLOCK_REALTIME, 0, req, rem); switch (ret) { case 0: return 0; case -EINTR: return -1; /* value specified by C11 */ diff --git a/system/lib/libc/musl/src/thread/tss_create.c b/system/lib/libc/musl/src/thread/tss_create.c index 251d22b9abe52..6d6ef96b4c9fb 100644 --- a/system/lib/libc/musl/src/thread/tss_create.c +++ b/system/lib/libc/musl/src/thread/tss_create.c @@ -1,6 +1,5 @@ #include - -int __pthread_key_create(tss_t *, void (*)(void *)); +#include int tss_create(tss_t *tss, tss_dtor_t dtor) { diff --git a/system/lib/libc/musl/src/thread/tss_delete.c b/system/lib/libc/musl/src/thread/tss_delete.c index 35db1032dc4aa..6f51b07eb9e8f 100644 --- a/system/lib/libc/musl/src/thread/tss_delete.c +++ b/system/lib/libc/musl/src/thread/tss_delete.c @@ -1,6 +1,5 @@ #include - -int __pthread_key_delete(tss_t k); +#include void tss_delete(tss_t key) { diff --git a/system/lib/libc/musl/src/thread/vmlock.c b/system/lib/libc/musl/src/thread/vmlock.c index 75f3cb76190fe..fa0a8e3c2ed63 100644 --- a/system/lib/libc/musl/src/thread/vmlock.c +++ b/system/lib/libc/musl/src/thread/vmlock.c @@ -1,6 +1,8 @@ #include "pthread_impl.h" +#include "fork_impl.h" static volatile int vmlock[2]; +volatile int *const __vmlock_lockptr = vmlock; void __vm_wait() { diff --git a/system/lib/libc/musl/src/time/__asctime.c b/system/lib/libc/musl/src/time/__asctime.c deleted file mode 100644 index e7e7f07e2e8ec..0000000000000 --- a/system/lib/libc/musl/src/time/__asctime.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include -#include "atomic.h" - -const char *__nl_langinfo(nl_item); - -char *__asctime(const struct tm *restrict tm, char *restrict buf) -{ - /* FIXME: change __nl_langinfo to __nl_langinfo_l with explicit C - * locale once we have locales */ - if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", - __nl_langinfo(ABDAY_1+tm->tm_wday), - __nl_langinfo(ABMON_1+tm->tm_mon), - tm->tm_mday, tm->tm_hour, - tm->tm_min, tm->tm_sec, - 1900 + tm->tm_year) >= 26) - { - /* ISO C requires us to use the above format string, - * even if it will not fit in the buffer. Thus asctime_r - * is _supposed_ to crash if the fields in tm are too large. - * We follow this behavior and crash "gracefully" to warn - * application developers that they may not be so lucky - * on other implementations (e.g. stack smashing..). - */ - a_crash(); - } - return buf; -} diff --git a/system/lib/libc/musl/src/time/__map_file.c b/system/lib/libc/musl/src/time/__map_file.c index de8f7a1e1a8f9..95b7fe07def0a 100644 --- a/system/lib/libc/musl/src/time/__map_file.c +++ b/system/lib/libc/musl/src/time/__map_file.c @@ -2,16 +2,15 @@ #include #include #include "syscall.h" - -void *__mmap(void *, size_t, int, int, int, off_t); +#include "kstat.h" const char unsigned *__map_file(const char *pathname, size_t *size) { - struct stat st; + struct kstat st; const unsigned char *map = MAP_FAILED; - int fd = __sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK); + int fd = sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK); if (fd < 0) return 0; - if (!__syscall(SYS_fstat, fd, &st)) { + if (!syscall(SYS_fstat, fd, &st)) { map = __mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); *size = st.st_size; } diff --git a/system/lib/libc/musl/src/time/__secs_to_tm.c b/system/lib/libc/musl/src/time/__secs_to_tm.c index 3a3123a1b457b..093d9021ae010 100644 --- a/system/lib/libc/musl/src/time/__secs_to_tm.c +++ b/system/lib/libc/musl/src/time/__secs_to_tm.c @@ -60,15 +60,16 @@ int __secs_to_tm(long long t, struct tm *tm) for (months=0; days_in_month[months] <= remdays; months++) remdays -= days_in_month[months]; + if (months >= 10) { + months -= 12; + years++; + } + if (years+100 > INT_MAX || years+100 < INT_MIN) return -1; tm->tm_year = years + 100; tm->tm_mon = months + 2; - if (tm->tm_mon >= 12) { - tm->tm_mon -=12; - tm->tm_year++; - } tm->tm_mday = remdays + 1; tm->tm_wday = wday; tm->tm_yday = yday; diff --git a/system/lib/libc/musl/src/time/__tz.c b/system/lib/libc/musl/src/time/__tz.c index 8b84b9bd12cf9..09a6317e6b2fb 100644 --- a/system/lib/libc/musl/src/time/__tz.c +++ b/system/lib/libc/musl/src/time/__tz.c @@ -3,7 +3,15 @@ #include #include #include +#include #include "libc.h" +#include "lock.h" +#include "fork_impl.h" + +#define malloc __libc_malloc +#define calloc undef +#define realloc undef +#define free undef long __timezone = 0; int __daylight = 0; @@ -15,7 +23,7 @@ weak_alias(__tzname, tzname); static char std_name[TZNAME_MAX+1]; static char dst_name[TZNAME_MAX+1]; -const char __gmt[] = "GMT"; +const char __utc[] = "UTC"; static int dst_off; static int r0[5], r1[5]; @@ -27,7 +35,8 @@ static char old_tz_buf[32]; static char *old_tz = old_tz_buf; static size_t old_tz_size = sizeof old_tz_buf; -static volatile int lock[2]; +static volatile int lock[1]; +volatile int *const __timezone_lockptr = lock; static int getint(const char **p) { @@ -84,15 +93,15 @@ static void getname(char *d, const char **p) int i; if (**p == '<') { ++*p; - for (i=0; **p!='>' && i PATH_MAX+1) s = __gmt, i = 3; + if (i > PATH_MAX+1) s = __utc, i = 3; if (i >= old_tz_size) { old_tz_size *= 2; if (i >= old_tz_size) old_tz_size = i+1; @@ -165,18 +174,18 @@ static void do_tzset() } } } - if (!map) s = __gmt; + if (!map) s = __utc; } if (map && (map_size < 44 || memcmp(map, "TZif", 4))) { __munmap((void *)map, map_size); map = 0; - s = __gmt; + s = __utc; } zi = map; if (map) { int scale = 2; - if (sizeof(time_t) > 4 && map[4]=='2') { + if (map[4]!='1') { size_t skip = zi_dotprod(zi+20, VEC(1,1,8,5,6,1), 6); trans = zi+skip+44+44; scale++; @@ -194,7 +203,6 @@ static void do_tzset() const unsigned char *p; __tzname[0] = __tzname[1] = 0; __daylight = __timezone = dst_off = 0; - for (i=0; i<5; i++) r0[i] = r1[i] = 0; for (p=types; p= t0 && t < t1) goto dst; goto std; } else { - if (!local) { - t1 += __timezone; - t0 += dst_off; - } if (t >= t1 && t < t0) goto std; goto dst; } @@ -403,7 +407,7 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo UNLOCK(lock); } -void __tzset() +static void __tzset() { LOCK(lock); do_tzset(); @@ -417,7 +421,7 @@ const char *__tm_to_tzname(const struct tm *tm) const void *p = tm->__tm_zone; LOCK(lock); do_tzset(); - if (p != __gmt && p != __tzname[0] && p != __tzname[1] && + if (p != __utc && p != __tzname[0] && p != __tzname[1] && (!zi || (uintptr_t)p-(uintptr_t)abbrevs >= abbrevs_end - abbrevs)) p = ""; UNLOCK(lock); diff --git a/system/lib/libc/musl/src/time/asctime.c b/system/lib/libc/musl/src/time/asctime.c index 3102eb87388c0..1febe54409e4c 100644 --- a/system/lib/libc/musl/src/time/asctime.c +++ b/system/lib/libc/musl/src/time/asctime.c @@ -1,9 +1,7 @@ #include -char *__asctime(const struct tm *, char *); - char *asctime(const struct tm *tm) { static char buf[26]; - return __asctime(tm, buf); + return __asctime_r(tm, buf); } diff --git a/system/lib/libc/musl/src/time/asctime_r.c b/system/lib/libc/musl/src/time/asctime_r.c index 7dfbb1210371b..26809ca267692 100644 --- a/system/lib/libc/musl/src/time/asctime_r.c +++ b/system/lib/libc/musl/src/time/asctime_r.c @@ -1,8 +1,28 @@ #include +#include +#include +#include "locale_impl.h" +#include "atomic.h" -char *__asctime(const struct tm *restrict, char *restrict); - -char *asctime_r(const struct tm *restrict tm, char *restrict buf) +char *__asctime_r(const struct tm *restrict tm, char *restrict buf) { - return __asctime(tm, buf); + if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", + __nl_langinfo_l(ABDAY_1+tm->tm_wday, C_LOCALE), + __nl_langinfo_l(ABMON_1+tm->tm_mon, C_LOCALE), + tm->tm_mday, tm->tm_hour, + tm->tm_min, tm->tm_sec, + 1900 + tm->tm_year) >= 26) + { + /* ISO C requires us to use the above format string, + * even if it will not fit in the buffer. Thus asctime_r + * is _supposed_ to crash if the fields in tm are too large. + * We follow this behavior and crash "gracefully" to warn + * application developers that they may not be so lucky + * on other implementations (e.g. stack smashing..). + */ + a_crash(); + } + return buf; } + +weak_alias(__asctime_r, asctime_r); diff --git a/system/lib/libc/musl/src/time/clock.c b/system/lib/libc/musl/src/time/clock.c index c348e39836cae..6724012b92ef6 100644 --- a/system/lib/libc/musl/src/time/clock.c +++ b/system/lib/libc/musl/src/time/clock.c @@ -1,8 +1,6 @@ #include #include -int __clock_gettime(clockid_t, struct timespec *); - clock_t clock() { struct timespec ts; diff --git a/system/lib/libc/musl/src/time/clock_getres.c b/system/lib/libc/musl/src/time/clock_getres.c index 36a0d695b02e2..81c6703761d44 100644 --- a/system/lib/libc/musl/src/time/clock_getres.c +++ b/system/lib/libc/musl/src/time/clock_getres.c @@ -3,5 +3,19 @@ int clock_getres(clockid_t clk, struct timespec *ts) { +#ifdef SYS_clock_getres_time64 + /* On a 32-bit arch, use the old syscall if it exists. */ + if (SYS_clock_getres != SYS_clock_getres_time64) { + long ts32[2]; + int r = __syscall(SYS_clock_getres, clk, ts32); + if (!r && ts) { + ts->tv_sec = ts32[0]; + ts->tv_nsec = ts32[1]; + } + return __syscall_ret(r); + } +#endif + /* If reaching this point, it's a 64-bit arch or time64-only + * 32-bit arch and we can get result directly into timespec. */ return syscall(SYS_clock_getres, clk, ts); } diff --git a/system/lib/libc/musl/src/time/clock_gettime.c b/system/lib/libc/musl/src/time/clock_gettime.c index bada2563aae22..a5cb0a87a718b 100644 --- a/system/lib/libc/musl/src/time/clock_gettime.c +++ b/system/lib/libc/musl/src/time/clock_gettime.c @@ -2,18 +2,47 @@ #include #include #include "syscall.h" -#include "libc.h" #include "atomic.h" #ifdef VDSO_CGT_SYM -void *__vdsosym(const char *, const char *); - static void *volatile vdso_func; +#ifdef VDSO_CGT32_SYM +static void *volatile vdso_func_32; +static int cgt_time32_wrap(clockid_t clk, struct timespec *ts) +{ + long ts32[2]; + int (*f)(clockid_t, long[2]) = + (int (*)(clockid_t, long[2]))vdso_func_32; + int r = f(clk, ts32); + if (!r) { + /* Fallback to syscalls if time32 overflowed. Maybe + * we lucked out and somehow migrated to a kernel with + * time64 syscalls available. */ + if (ts32[0] < 0) { + a_cas_p(&vdso_func, (void *)cgt_time32_wrap, 0); + return -ENOSYS; + } + ts->tv_sec = ts32[0]; + ts->tv_nsec = ts32[1]; + } + return r; +} +#endif + static int cgt_init(clockid_t clk, struct timespec *ts) { void *p = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM); +#ifdef VDSO_CGT32_SYM + if (!p) { + void *q = __vdsosym(VDSO_CGT32_VER, VDSO_CGT32_SYM); + if (q) { + a_cas_p(&vdso_func_32, 0, q); + p = cgt_time32_wrap; + } + } +#endif int (*f)(clockid_t, struct timespec *) = (int (*)(clockid_t, struct timespec *))p; a_cas_p(&vdso_func, (void *)cgt_init, p); @@ -56,6 +85,25 @@ int __clock_gettime(clockid_t clk, struct timespec *ts) } #endif +#ifdef SYS_clock_gettime64 + r = -ENOSYS; + if (sizeof(time_t) > 4) + r = __syscall(SYS_clock_gettime64, clk, ts); + if (SYS_clock_gettime == SYS_clock_gettime64 || r!=-ENOSYS) + return __syscall_ret(r); + long ts32[2]; + r = __syscall(SYS_clock_gettime, clk, ts32); + if (r==-ENOSYS && clk==CLOCK_REALTIME) { + r = __syscall(SYS_gettimeofday, ts32, 0); + ts32[1] *= 1000; + } + if (!r) { + ts->tv_sec = ts32[0]; + ts->tv_nsec = ts32[1]; + return r; + } + return __syscall_ret(r); +#else r = __syscall(SYS_clock_gettime, clk, ts); if (r == -ENOSYS) { if (clk == CLOCK_REALTIME) { @@ -66,6 +114,7 @@ int __clock_gettime(clockid_t clk, struct timespec *ts) r = -EINVAL; } return __syscall_ret(r); +#endif } #endif //__EMSCRIPTEN__ diff --git a/system/lib/libc/musl/src/time/clock_nanosleep.c b/system/lib/libc/musl/src/time/clock_nanosleep.c index ec87b9e33252c..434fc4939e146 100644 --- a/system/lib/libc/musl/src/time/clock_nanosleep.c +++ b/system/lib/libc/musl/src/time/clock_nanosleep.c @@ -1,8 +1,50 @@ #include +#include #include "syscall.h" -#include "libc.h" +#if __EMSCRIPTEN__ +#include +#include +#endif -int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem) +#define IS32BIT(x) !((x)+0x80000000ULL>>32) +#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63)) + +int __clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem) { + if (clk == CLOCK_THREAD_CPUTIME_ID) return EINVAL; +#if __EMSCRIPTEN__ + if (!req || req->tv_nsec < 0 || req->tv_nsec > 999999999L || req->tv_sec < 0) { + return EINVAL; + } + emscripten_thread_sleep(req->tv_sec * 1000.0 + req->tv_nsec / 1e6); + return 0; +#else +#ifdef SYS_clock_nanosleep_time64 + time_t s = req->tv_sec; + long ns = req->tv_nsec; + int r = -ENOSYS; + if (SYS_clock_nanosleep == SYS_clock_nanosleep_time64 || !IS32BIT(s)) + r = __syscall_cp(SYS_clock_nanosleep_time64, clk, flags, + ((long long[]){s, ns}), rem); + if (SYS_clock_nanosleep == SYS_clock_nanosleep_time64 || r!=-ENOSYS) + return -r; + long long extra = s - CLAMP(s); + long ts32[2] = { CLAMP(s), ns }; + if (clk == CLOCK_REALTIME && !flags) + r = __syscall_cp(SYS_nanosleep, &ts32, &ts32); + else + r = __syscall_cp(SYS_clock_nanosleep, clk, flags, &ts32, &ts32); + if (r==-EINTR && rem && !(flags & TIMER_ABSTIME)) { + rem->tv_sec = ts32[0] + extra; + rem->tv_nsec = ts32[1]; + } + return -r; +#else + if (clk == CLOCK_REALTIME && !flags) + return -__syscall_cp(SYS_nanosleep, req, rem); return -__syscall_cp(SYS_clock_nanosleep, clk, flags, req, rem); +#endif +#endif } + +weak_alias(__clock_nanosleep, clock_nanosleep); diff --git a/system/lib/libc/musl/src/time/clock_settime.c b/system/lib/libc/musl/src/time/clock_settime.c index d3d94174e6a71..ed0182fff664c 100644 --- a/system/lib/libc/musl/src/time/clock_settime.c +++ b/system/lib/libc/musl/src/time/clock_settime.c @@ -1,16 +1,33 @@ #include +#include #include "syscall.h" #ifdef __EMSCRIPTEN__ #include #endif +#define IS32BIT(x) !((x)+0x80000000ULL>>32) + int clock_settime(clockid_t clk, const struct timespec *ts) { #ifdef __EMSCRIPTEN__ // JS and wasm VMs do not allow setting the time. errno = EPERM; return -1; +#else +#ifdef SYS_clock_settime64 + time_t s = ts->tv_sec; + long ns = ts->tv_nsec; + int r = -ENOSYS; + if (SYS_clock_settime == SYS_clock_settime64 || !IS32BIT(s)) + r = __syscall(SYS_clock_settime64, clk, + ((long long[]){s, ns})); + if (SYS_clock_settime == SYS_clock_settime64 || r!=-ENOSYS) + return __syscall_ret(r); + if (!IS32BIT(s)) + return __syscall_ret(-ENOTSUP); + return syscall(SYS_clock_settime, clk, ((long[]){s, ns})); #else return syscall(SYS_clock_settime, clk, ts); #endif +#endif } diff --git a/system/lib/libc/musl/src/time/ctime.c b/system/lib/libc/musl/src/time/ctime.c index 185ec5543b958..36029315128f2 100644 --- a/system/lib/libc/musl/src/time/ctime.c +++ b/system/lib/libc/musl/src/time/ctime.c @@ -2,5 +2,7 @@ char *ctime(const time_t *t) { - return asctime(localtime(t)); + struct tm *tm = localtime(t); + if (!tm) return 0; + return asctime(tm); } diff --git a/system/lib/libc/musl/src/time/ctime_r.c b/system/lib/libc/musl/src/time/ctime_r.c index d2260a165a2e8..3e24aa681beea 100644 --- a/system/lib/libc/musl/src/time/ctime_r.c +++ b/system/lib/libc/musl/src/time/ctime_r.c @@ -2,7 +2,6 @@ char *ctime_r(const time_t *t, char *buf) { - struct tm tm; - localtime_r(t, &tm); - return asctime_r(&tm, buf); + struct tm tm, *tm_p = localtime_r(t, &tm); + return tm_p ? asctime_r(tm_p, buf) : 0; } diff --git a/system/lib/libc/musl/src/time/getdate.c b/system/lib/libc/musl/src/time/getdate.c index 89f2169912565..420cd8e4126bc 100644 --- a/system/lib/libc/musl/src/time/getdate.c +++ b/system/lib/libc/musl/src/time/getdate.c @@ -37,7 +37,8 @@ struct tm *getdate(const char *s) } } - getdate_err = 7; + if (ferror(f)) getdate_err = 5; + else getdate_err = 7; out: if (f) fclose(f); pthread_setcancelstate(cs, 0); diff --git a/system/lib/libc/musl/src/time/gmtime.c b/system/lib/libc/musl/src/time/gmtime.c index 3791b24c66375..6320b6377e623 100644 --- a/system/lib/libc/musl/src/time/gmtime.c +++ b/system/lib/libc/musl/src/time/gmtime.c @@ -1,8 +1,6 @@ #include "time_impl.h" #include -struct tm *__gmtime_r(const time_t *restrict, struct tm *restrict); - struct tm *gmtime(const time_t *t) { static struct tm tm; diff --git a/system/lib/libc/musl/src/time/gmtime_r.c b/system/lib/libc/musl/src/time/gmtime_r.c index 8cbdadcb5d021..22aec2c2e2ef2 100644 --- a/system/lib/libc/musl/src/time/gmtime_r.c +++ b/system/lib/libc/musl/src/time/gmtime_r.c @@ -1,8 +1,5 @@ #include "time_impl.h" #include -#include "libc.h" - -extern const char __gmt[]; struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm) { @@ -12,7 +9,7 @@ struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm) } tm->tm_isdst = 0; tm->__tm_gmtoff = 0; - tm->__tm_zone = __gmt; + tm->__tm_zone = __utc; return tm; } diff --git a/system/lib/libc/musl/src/time/localtime.c b/system/lib/libc/musl/src/time/localtime.c index bb6718c33ff27..5210423230ca2 100644 --- a/system/lib/libc/musl/src/time/localtime.c +++ b/system/lib/libc/musl/src/time/localtime.c @@ -1,7 +1,5 @@ #include "time_impl.h" -struct tm *__localtime_r(const time_t *restrict, struct tm *restrict); - struct tm *localtime(const time_t *t) { static struct tm tm; diff --git a/system/lib/libc/musl/src/time/localtime_r.c b/system/lib/libc/musl/src/time/localtime_r.c index 4804a465487fb..874c0b69856ec 100644 --- a/system/lib/libc/musl/src/time/localtime_r.c +++ b/system/lib/libc/musl/src/time/localtime_r.c @@ -1,6 +1,6 @@ #include "time_impl.h" #include -#include "libc.h" +#include struct tm *__localtime_r(const time_t *restrict t, struct tm *restrict tm) { diff --git a/system/lib/libc/musl/src/time/nanosleep.c b/system/lib/libc/musl/src/time/nanosleep.c index 4fd31e64b0567..bc9f7895fa087 100644 --- a/system/lib/libc/musl/src/time/nanosleep.c +++ b/system/lib/libc/musl/src/time/nanosleep.c @@ -1,21 +1,7 @@ #include #include "syscall.h" -#include "libc.h" -#if __EMSCRIPTEN__ -#include -#include -#endif int nanosleep(const struct timespec *req, struct timespec *rem) { -#if __EMSCRIPTEN__ - if (!req || req->tv_nsec < 0 || req->tv_nsec > 999999999L || req->tv_sec < 0) { - errno = EINVAL; - return -1; - } - emscripten_thread_sleep(req->tv_sec * 1000.0 + req->tv_nsec / 1e6); - return 0; -#else - return syscall_cp(SYS_nanosleep, req, rem); -#endif + return __syscall_ret(-__clock_nanosleep(CLOCK_REALTIME, 0, req, rem)); } diff --git a/system/lib/libc/musl/src/time/strftime.c b/system/lib/libc/musl/src/time/strftime.c index e21a3513c165b..cc53d5369ca71 100644 --- a/system/lib/libc/musl/src/time/strftime.c +++ b/system/lib/libc/musl/src/time/strftime.c @@ -6,11 +6,8 @@ #include #include #include "locale_impl.h" -#include "libc.h" #include "time_impl.h" -const char *__nl_langinfo_l(nl_item, locale_t); - static int is_leap(int y) { /* Avoid overflow */ @@ -45,15 +42,12 @@ static int week_num(const struct tm *tm) return val; } -const char *__tm_to_tzname(const struct tm *); -size_t __strftime_l(char *restrict, size_t, const char *restrict, const struct tm *restrict, locale_t); - -const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc) +const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc, int pad) { nl_item item; long long val; const char *fmt = "-"; - int width = 2; + int width = 2, def_pad = '0'; switch (f) { case 'a': @@ -79,15 +73,14 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * case 'C': val = (1900LL+tm->tm_year) / 100; goto number; + case 'e': + def_pad = '_'; case 'd': val = tm->tm_mday; goto number; case 'D': fmt = "%m/%d/%y"; goto recu_strftime; - case 'e': - *l = snprintf(*s, sizeof *s, "%2d", tm->tm_mday); - return *s; case 'F': fmt = "%Y-%m-%d"; goto recu_strftime; @@ -166,7 +159,8 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * item = T_FMT; goto nl_strftime; case 'y': - val = tm->tm_year % 100; + val = (tm->tm_year + 1900LL) % 100; + if (val < 0) val = -val; goto number; case 'Y': val = tm->tm_year + 1900LL; @@ -181,9 +175,8 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * *l = 0; return ""; } - *l = snprintf(*s, sizeof *s, "%+.2ld%.2d", // XXX EMSCRIPTEN: %d => %ld - (tm->__tm_gmtoff)/3600, - abs(tm->__tm_gmtoff%3600)/60); + *l = snprintf(*s, sizeof *s, "%+.4ld", + tm->__tm_gmtoff/3600*100 + tm->__tm_gmtoff%3600/60); return *s; case 'Z': if (tm->tm_isdst < 0) { @@ -199,7 +192,12 @@ const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm * return 0; } number: - *l = snprintf(*s, sizeof *s, "%0*lld", width, val); + switch (pad ? pad : def_pad) { + case '-': *l = snprintf(*s, sizeof *s, "%lld", val); break; + case '_': *l = snprintf(*s, sizeof *s, "%*lld", width, val); break; + case '0': + default: *l = snprintf(*s, sizeof *s, "%0*lld", width, val); break; + } return *s; nl_strcat: fmt = __nl_langinfo_l(item, loc); @@ -220,7 +218,7 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st char buf[100]; char *p; const char *t; - int plus; + int pad, plus; unsigned long width; for (l=0; ltm_year >= 10000-1900) - s[l++] = '+'; - else if (tm->tm_year < -1900) + /* Trim off any sign and leading zeros, then + * count remaining digits to determine behavior + * for the + flag. */ + if (*t=='+' || *t=='-') t++, k--; + for (; *t=='0' && t[1]-'0'<10U; t++, k--); + if (width < k) width = k; + size_t d; + for (d=0; t[d]-'0'<10U; d++); + if (tm->tm_year < -1900) { s[l++] = '-'; - else - width++; + width--; + } else if (plus && d+(width-k) >= (*p=='C'?3:5)) { + s[l++] = '+'; + width--; + } for (; width > k && l < n; width--) s[l++] = '0'; } diff --git a/system/lib/libc/musl/src/time/strptime.c b/system/lib/libc/musl/src/time/strptime.c index f41f55f24cf4b..c54a0d8c4c52e 100644 --- a/system/lib/libc/musl/src/time/strptime.c +++ b/system/lib/libc/musl/src/time/strptime.c @@ -11,7 +11,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri int i, w, neg, adj, min, range, *dest, dummy; const char *ex; size_t len; - int want_century = 0, century = 0; + int want_century = 0, century = 0, relyear = 0; while (*f) { if (*f != '%') { if (isspace(*f)) for (; *s && isspace(*s); s++); @@ -22,8 +22,13 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri } f++; if (*f == '+') f++; - if (isdigit(*f)) w=strtoul(f, (void *)&f, 10); - else w=-1; + if (isdigit(*f)) { + char *new_f; + w=strtoul(f, &new_f, 10); + f = new_f; + } else { + w=-1; + } adj=0; switch (*f++) { case 'a': case 'A': @@ -68,6 +73,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri dest = &tm->tm_yday; min = 1; range = 366; + adj = 1; goto numeric_range; case 'm': dest = &tm->tm_mon; @@ -88,6 +94,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri len = strlen(ex); if (!strncasecmp(s, ex, len)) { tm->tm_hour %= 12; + s += len; break; } ex = nl_langinfo(PM_STR); @@ -95,6 +102,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri if (!strncasecmp(s, ex, len)) { tm->tm_hour %= 12; tm->tm_hour += 12; + s += len; break; } return 0; @@ -136,7 +144,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri if (!s) return 0; break; case 'y': - dest = &tm->tm_year; + dest = &relyear; w = 2; want_century |= 1; goto numeric_digits; @@ -190,6 +198,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri } } if (want_century) { + tm->tm_year = relyear; if (want_century & 2) tm->tm_year += century * 100 - 1900; else if (tm->tm_year <= 68) tm->tm_year += 100; } diff --git a/system/lib/libc/musl/src/time/time.c b/system/lib/libc/musl/src/time/time.c index 4b95e7527d440..ad0480f9ea942 100644 --- a/system/lib/libc/musl/src/time/time.c +++ b/system/lib/libc/musl/src/time/time.c @@ -1,8 +1,6 @@ #include #include "syscall.h" -int __clock_gettime(clockid_t, struct timespec *); - time_t time(time_t *t) { struct timespec ts; diff --git a/system/lib/libc/musl/src/time/time_impl.h b/system/lib/libc/musl/src/time/time_impl.h index 2e9a2c096e0fc..f26d80053f59a 100644 --- a/system/lib/libc/musl/src/time/time_impl.h +++ b/system/lib/libc/musl/src/time/time_impl.h @@ -1,9 +1,11 @@ #include -int __days_in_month(int, int); -int __month_to_secs(int, int); -long long __year_to_secs(long long, int *); -long long __tm_to_secs(const struct tm *); -int __secs_to_tm(long long, struct tm *); -void __secs_to_zone(long long, int, int *, long *, long *, const char **); -const unsigned char *__map_file(const char *, size_t *); +hidden int __days_in_month(int, int); +hidden int __month_to_secs(int, int); +hidden long long __year_to_secs(long long, int *); +hidden long long __tm_to_secs(const struct tm *); +hidden const char *__tm_to_tzname(const struct tm *); +hidden int __secs_to_tm(long long, struct tm *); +hidden void __secs_to_zone(long long, int, int *, long *, long *, const char **); +hidden const char *__strftime_fmt_1(char (*)[100], size_t *, int, const struct tm *, locale_t, int); +extern hidden const char __utc[]; diff --git a/system/lib/libc/musl/src/time/timegm.c b/system/lib/libc/musl/src/time/timegm.c index b5dae8b648eca..4e5907d7f5602 100644 --- a/system/lib/libc/musl/src/time/timegm.c +++ b/system/lib/libc/musl/src/time/timegm.c @@ -2,8 +2,6 @@ #include "time_impl.h" #include -extern const char __gmt[]; - time_t timegm(struct tm *tm) { struct tm new; @@ -15,6 +13,6 @@ time_t timegm(struct tm *tm) *tm = new; tm->tm_isdst = 0; tm->__tm_gmtoff = 0; - tm->__tm_zone = __gmt; + tm->__tm_zone = __utc; return t; } diff --git a/system/lib/libc/musl/src/time/timer_create.c b/system/lib/libc/musl/src/time/timer_create.c index b54a524ce85bb..4bef23905103e 100644 --- a/system/lib/libc/musl/src/time/timer_create.c +++ b/system/lib/libc/musl/src/time/timer_create.c @@ -1,6 +1,8 @@ #include #include +#include #include "pthread_impl.h" +#include "atomic.h" struct ksigevent { union sigval sigev_value; @@ -14,73 +16,50 @@ struct start_args { struct sigevent *sev; }; -static void dummy_1(pthread_t self) +static void dummy_0() { } -weak_alias(dummy_1, __pthread_tsd_run_dtors); - -void __reset_tls(); +weak_alias(dummy_0, __pthread_tsd_run_dtors); static void cleanup_fromsig(void *p) { pthread_t self = __pthread_self(); - __pthread_tsd_run_dtors(self); + __pthread_tsd_run_dtors(); self->cancel = 0; self->cancelbuf = 0; self->canceldisable = 0; self->cancelasync = 0; - self->unblock_cancel = 0; __reset_tls(); longjmp(p, 1); } -static void timer_handler(int sig, siginfo_t *si, void *ctx) -{ - pthread_t self = __pthread_self(); - jmp_buf jb; - void (*notify)(union sigval) = (void (*)(union sigval))self->start; - union sigval val = { .sival_ptr = self->start_arg }; - - if (!setjmp(jb) && si->si_code == SI_TIMER) { - pthread_cleanup_push(cleanup_fromsig, jb); - notify(val); - pthread_cleanup_pop(1); - } -} - -static void install_handler() -{ - struct sigaction sa = { - .sa_sigaction = timer_handler, - .sa_flags = SA_SIGINFO | SA_RESTART - }; - __libc_sigaction(SIGTIMER, &sa, 0); -} - static void *start(void *arg) { pthread_t self = __pthread_self(); struct start_args *args = arg; - int id; + jmp_buf jb; - /* Reuse no-longer-needed thread structure fields to avoid - * needing the timer address in the signal handler. */ - self->start = (void *(*)(void *))args->sev->sigev_notify_function; - self->start_arg = args->sev->sigev_value.sival_ptr; + void (*notify)(union sigval) = args->sev->sigev_notify_function; + union sigval val = args->sev->sigev_value; pthread_barrier_wait(&args->b); - if ((id = self->timer_id) >= 0) { - __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, - SIGTIMER_SET, 0, _NSIG/8); - __wait(&self->timer_id, 0, id, 1); - __syscall(SYS_timer_delete, id); + for (;;) { + siginfo_t si; + while (sigwaitinfo(SIGTIMER_SET, &si) < 0); + if (si.si_code == SI_TIMER && !setjmp(jb)) { + pthread_cleanup_push(cleanup_fromsig, jb); + notify(val); + pthread_cleanup_pop(1); + } + if (self->timer_id < 0) break; } + __syscall(SYS_timer_delete, self->timer_id & INT_MAX); return 0; } int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res) { - static pthread_once_t once = PTHREAD_ONCE_INIT; + volatile static int init = 0; pthread_t td; pthread_attr_t attr; int r; @@ -92,11 +71,15 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) { case SIGEV_NONE: case SIGEV_SIGNAL: + case SIGEV_THREAD_ID: if (evp) { ksev.sigev_value = evp->sigev_value; ksev.sigev_signo = evp->sigev_signo; ksev.sigev_notify = evp->sigev_notify; - ksev.sigev_tid = 0; + if (evp->sigev_notify == SIGEV_THREAD_ID) + ksev.sigev_tid = evp->sigev_notify_thread_id; + else + ksev.sigev_tid = 0; ksevp = &ksev; } if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0) @@ -104,7 +87,11 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict *res = (void *)(intptr_t)timerid; break; case SIGEV_THREAD: - pthread_once(&once, install_handler); + if (!init) { + struct sigaction sa = { .sa_handler = SIG_DFL }; + __libc_sigaction(SIGTIMER, &sa, 0); + a_store(&init, 1); + } if (evp->sigev_notify_attributes) attr = *evp->sigev_notify_attributes; else @@ -114,6 +101,7 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict args.sev = evp; __block_app_sigs(&set); + __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGTIMER_SET, 0, _NSIG/8); r = pthread_create(&td, &attr, start, &args); __restore_sigs(&set); if (r) { @@ -123,7 +111,7 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict ksev.sigev_value.sival_ptr = 0; ksev.sigev_signo = SIGTIMER; - ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */ + ksev.sigev_notify = SIGEV_THREAD_ID; ksev.sigev_tid = td->tid; if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0) timerid = -1; diff --git a/system/lib/libc/musl/src/time/timer_delete.c b/system/lib/libc/musl/src/time/timer_delete.c index 7c97eeb1a1d83..b0bfac0968a74 100644 --- a/system/lib/libc/musl/src/time/timer_delete.c +++ b/system/lib/libc/musl/src/time/timer_delete.c @@ -7,7 +7,7 @@ int timer_delete(timer_t t) if ((intptr_t)t < 0) { pthread_t td = (void *)((uintptr_t)t << 1); a_store(&td->timer_id, td->timer_id | INT_MIN); - __wake(&td->timer_id, 1, 1); + __syscall(SYS_tkill, td->tid, SIGTIMER); return 0; } return __syscall(SYS_timer_delete, t); diff --git a/system/lib/libc/musl/src/time/timer_gettime.c b/system/lib/libc/musl/src/time/timer_gettime.c index ed6d8d65ce1ac..21c9d32c3fe52 100644 --- a/system/lib/libc/musl/src/time/timer_gettime.c +++ b/system/lib/libc/musl/src/time/timer_gettime.c @@ -8,5 +8,21 @@ int timer_gettime(timer_t t, struct itimerspec *val) pthread_t td = (void *)((uintptr_t)t << 1); t = (void *)(uintptr_t)(td->timer_id & INT_MAX); } +#ifdef SYS_timer_gettime64 + int r = -ENOSYS; + if (sizeof(time_t) > 4) + r = __syscall(SYS_timer_gettime64, t, val); + if (SYS_timer_gettime == SYS_timer_gettime64 || r!=-ENOSYS) + return __syscall_ret(r); + long val32[4]; + r = __syscall(SYS_timer_gettime, t, val32); + if (!r) { + val->it_interval.tv_sec = val32[0]; + val->it_interval.tv_nsec = val32[1]; + val->it_value.tv_sec = val32[2]; + val->it_value.tv_nsec = val32[3]; + } + return __syscall_ret(r); +#endif return syscall(SYS_timer_gettime, t, val); } diff --git a/system/lib/libc/musl/src/time/timer_settime.c b/system/lib/libc/musl/src/time/timer_settime.c index 62631aa49cda7..373f00ced7f28 100644 --- a/system/lib/libc/musl/src/time/timer_settime.c +++ b/system/lib/libc/musl/src/time/timer_settime.c @@ -2,11 +2,36 @@ #include #include "pthread_impl.h" +#define IS32BIT(x) !((x)+0x80000000ULL>>32) + int timer_settime(timer_t t, int flags, const struct itimerspec *restrict val, struct itimerspec *restrict old) { if ((intptr_t)t < 0) { pthread_t td = (void *)((uintptr_t)t << 1); t = (void *)(uintptr_t)(td->timer_id & INT_MAX); } +#ifdef SYS_timer_settime64 + time_t is = val->it_interval.tv_sec, vs = val->it_value.tv_sec; + long ins = val->it_interval.tv_nsec, vns = val->it_value.tv_nsec; + int r = -ENOSYS; + if (SYS_timer_settime == SYS_timer_settime64 + || !IS32BIT(is) || !IS32BIT(vs) || (sizeof(time_t)>4 && old)) + r = __syscall(SYS_timer_settime64, t, flags, + ((long long[]){is, ins, vs, vns}), old); + if (SYS_timer_settime == SYS_timer_settime64 || r!=-ENOSYS) + return __syscall_ret(r); + if (!IS32BIT(is) || !IS32BIT(vs)) + return __syscall_ret(-ENOTSUP); + long old32[4]; + r = __syscall(SYS_timer_settime, t, flags, + ((long[]){is, ins, vs, vns}), old32); + if (!r && old) { + old->it_interval.tv_sec = old32[0]; + old->it_interval.tv_nsec = old32[1]; + old->it_value.tv_sec = old32[2]; + old->it_value.tv_nsec = old32[3]; + } + return __syscall_ret(r); +#endif return syscall(SYS_timer_settime, t, flags, val, old); } diff --git a/system/lib/libc/musl/src/time/timespec_get.c b/system/lib/libc/musl/src/time/timespec_get.c index 03c5a77b7b099..40ea9c1c32682 100644 --- a/system/lib/libc/musl/src/time/timespec_get.c +++ b/system/lib/libc/musl/src/time/timespec_get.c @@ -1,7 +1,5 @@ #include -int __clock_gettime(clockid_t, struct timespec *); - /* There is no other implemented value than TIME_UTC; all other values * are considered erroneous. */ int timespec_get(struct timespec * ts, int base) diff --git a/system/lib/libc/musl/src/time/wcsftime.c b/system/lib/libc/musl/src/time/wcsftime.c index 638e64f6b4457..8e1437b33f9ce 100644 --- a/system/lib/libc/musl/src/time/wcsftime.c +++ b/system/lib/libc/musl/src/time/wcsftime.c @@ -2,9 +2,7 @@ #include #include #include "locale_impl.h" -#include "libc.h" - -const char *__strftime_fmt_1(char (*s)[100], size_t *l, int f, const struct tm *tm, locale_t loc); +#include "time_impl.h" size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, const struct tm *restrict tm, locale_t loc) { @@ -14,7 +12,7 @@ size_t __wcsftime_l(wchar_t *restrict s, size_t n, const wchar_t *restrict f, co wchar_t *p; const char *t_mb; const wchar_t *t; - int plus; + int pad, plus; unsigned long width; for (l=0; l #include "syscall.h" -#include "libc.h" int acct(const char *filename) { diff --git a/system/lib/libc/musl/src/unistd/alarm.c b/system/lib/libc/musl/src/unistd/alarm.c index 2e3263ac59860..a5e0c822a0555 100644 --- a/system/lib/libc/musl/src/unistd/alarm.c +++ b/system/lib/libc/musl/src/unistd/alarm.c @@ -4,7 +4,7 @@ unsigned alarm(unsigned seconds) { - struct itimerval it = { .it_value.tv_sec = seconds }; - __syscall(SYS_setitimer, ITIMER_REAL, &it, &it); - return it.it_value.tv_sec + !!it.it_value.tv_usec; + struct itimerval it = { .it_value.tv_sec = seconds }, old = { 0 }; + setitimer(ITIMER_REAL, &it, &old); + return old.it_value.tv_sec + !!old.it_value.tv_usec; } diff --git a/system/lib/libc/musl/src/unistd/close.c b/system/lib/libc/musl/src/unistd/close.c index 9cee18ef69326..5a453ff3324da 100644 --- a/system/lib/libc/musl/src/unistd/close.c +++ b/system/lib/libc/musl/src/unistd/close.c @@ -1,7 +1,7 @@ #include #include +#include "aio_impl.h" #include "syscall.h" -#include "libc.h" static int dummy(int fd) { diff --git a/system/lib/libc/musl/src/unistd/dup3.c b/system/lib/libc/musl/src/unistd/dup3.c index bb48dbe9b0213..c895d5cc5f48f 100644 --- a/system/lib/libc/musl/src/unistd/dup3.c +++ b/system/lib/libc/musl/src/unistd/dup3.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" int __dup3(int old, int new, int flags) { diff --git a/system/lib/libc/musl/src/unistd/faccessat.c b/system/lib/libc/musl/src/unistd/faccessat.c index 3c310ad43d20c..69d6a53a506a1 100644 --- a/system/lib/libc/musl/src/unistd/faccessat.c +++ b/system/lib/libc/musl/src/unistd/faccessat.c @@ -1,6 +1,5 @@ #include #include -#include #include #include "syscall.h" #include "pthread_impl.h" @@ -10,26 +9,19 @@ struct ctx { int fd; const char *filename; int amode; -}; - -static const int errors[] = { - 0, -EACCES, -ELOOP, -ENAMETOOLONG, -ENOENT, -ENOTDIR, - -EROFS, -EBADF, -EINVAL, -ETXTBSY, - -EFAULT, -EIO, -ENOMEM, - -EBUSY + int p; }; static int checker(void *p) { struct ctx *c = p; int ret; - int i; if (__syscall(SYS_setregid, __syscall(SYS_getegid), -1) || __syscall(SYS_setreuid, __syscall(SYS_geteuid), -1)) __syscall(SYS_exit, 1); ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, 0); - for (i=0; i < sizeof errors/sizeof *errors - 1 && ret!=errors[i]; i++); - return i; + __syscall(SYS_write, c->p, &ret, sizeof ret); + return 0; } #endif @@ -38,29 +30,35 @@ int faccessat(int fd, const char *filename, int amode, int flag) #ifdef __EMSCRIPTEN__ return syscall(SYS_faccessat, fd, filename, amode, flag); #else - if (!flag || (flag==AT_EACCESS && getuid()==geteuid() && getgid()==getegid())) - return syscall(SYS_faccessat, fd, filename, amode, flag); + if (flag) { + int ret = __syscall(SYS_faccessat2, fd, filename, amode, flag); + if (ret != -ENOSYS) return __syscall_ret(ret); + } - if (flag != AT_EACCESS) + if (flag & ~AT_EACCESS) return __syscall_ret(-EINVAL); + if (!flag || (getuid()==geteuid() && getgid()==getegid())) + return syscall(SYS_faccessat, fd, filename, amode); + char stack[1024]; sigset_t set; pid_t pid; - int ret = -EBUSY; - struct ctx c = { .fd = fd, .filename = filename, .amode = amode }; + int status; + int ret, p[2]; + + if (pipe2(p, O_CLOEXEC)) return __syscall_ret(-EBUSY); + struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1] }; __block_all_sigs(&set); pid = __clone(checker, stack+sizeof stack, 0, &c); - if (pid > 0) { - int status; - do { - __syscall(SYS_wait4, pid, &status, __WCLONE, 0); - } while (!WIFEXITED(status) && !WIFSIGNALED(status)); - if (WIFEXITED(status)) - ret = errors[WEXITSTATUS(status)]; - } + __syscall(SYS_close, p[1]); + + if (pid<0 || __syscall(SYS_read, p[0], &ret, sizeof ret) != sizeof(ret)) + ret = -EBUSY; + __syscall(SYS_close, p[0]); + __syscall(SYS_wait4, pid, &status, __WCLONE, 0); __restore_sigs(&set); diff --git a/system/lib/libc/musl/src/unistd/fchdir.c b/system/lib/libc/musl/src/unistd/fchdir.c index 6da9530eecc31..bcbd0fc9cc9cd 100644 --- a/system/lib/libc/musl/src/unistd/fchdir.c +++ b/system/lib/libc/musl/src/unistd/fchdir.c @@ -6,8 +6,6 @@ #include #include "syscall.h" -void __procfdname(char *, unsigned); - int fchdir(int fd) { int ret = __syscall(SYS_fchdir, fd); diff --git a/system/lib/libc/musl/src/unistd/fchown.c b/system/lib/libc/musl/src/unistd/fchown.c index c73b2896ae873..e8959b1d49e2f 100644 --- a/system/lib/libc/musl/src/unistd/fchown.c +++ b/system/lib/libc/musl/src/unistd/fchown.c @@ -6,8 +6,6 @@ #include #include "syscall.h" -void __procfdname(char *, unsigned); - int fchown(int fd, uid_t uid, gid_t gid) { int ret = __syscall(SYS_fchown, fd, uid, gid); @@ -24,7 +22,7 @@ int fchown(int fd, uid_t uid, gid_t gid) #ifdef SYS_chown return syscall(SYS_chown, buf, uid, gid); #else - return syscall(SYS_fchownat, AT_FDCWD, buf, uid, gid); + return syscall(SYS_fchownat, AT_FDCWD, buf, uid, gid, 0); #endif } diff --git a/system/lib/libc/musl/src/unistd/ftruncate.c b/system/lib/libc/musl/src/unistd/ftruncate.c index 467135f009971..b41be0fa6f9ec 100644 --- a/system/lib/libc/musl/src/unistd/ftruncate.c +++ b/system/lib/libc/musl/src/unistd/ftruncate.c @@ -1,10 +1,9 @@ #include #include "syscall.h" -#include "libc.h" int ftruncate(int fd, off_t length) { return syscall(SYS_ftruncate, fd, __SYSCALL_LL_O(length)); } -LFS64(ftruncate); +weak_alias(ftruncate, ftruncate64); diff --git a/system/lib/libc/musl/src/unistd/getcwd.c b/system/lib/libc/musl/src/unistd/getcwd.c index a7b925d2dbee5..f407ffe07ed60 100644 --- a/system/lib/libc/musl/src/unistd/getcwd.c +++ b/system/lib/libc/musl/src/unistd/getcwd.c @@ -6,14 +6,20 @@ char *getcwd(char *buf, size_t size) { - char tmp[PATH_MAX]; + char tmp[buf ? 1 : PATH_MAX]; if (!buf) { buf = tmp; - size = PATH_MAX; + size = sizeof tmp; } else if (!size) { errno = EINVAL; return 0; } - if (syscall(SYS_getcwd, buf, size) < 0) return 0; + long ret = syscall(SYS_getcwd, buf, size); + if (ret < 0) + return 0; + if (ret == 0 || buf[0] != '/') { + errno = ENOENT; + return 0; + } return buf == tmp ? strdup(buf) : buf; } diff --git a/system/lib/libc/musl/src/unistd/gethostname.c b/system/lib/libc/musl/src/unistd/gethostname.c index f984b7dd2f9a8..633ef571a4011 100644 --- a/system/lib/libc/musl/src/unistd/gethostname.c +++ b/system/lib/libc/musl/src/unistd/gethostname.c @@ -8,6 +8,6 @@ int gethostname(char *name, size_t len) if (uname(&uts)) return -1; if (len > sizeof uts.nodename) len = sizeof uts.nodename; for (i=0; i #endif #include +#include #include #include "syscall.h" @@ -25,6 +26,9 @@ int isatty(int fd) return 1; #else struct winsize wsz; - return !syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); + unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); + if (r == 0) return 1; + if (errno != EBADF) errno = ENOTTY; + return 0; #endif } diff --git a/system/lib/libc/musl/src/unistd/lseek.c b/system/lib/libc/musl/src/unistd/lseek.c index d2425e725fb34..aafb6f62d2d5c 100644 --- a/system/lib/libc/musl/src/unistd/lseek.c +++ b/system/lib/libc/musl/src/unistd/lseek.c @@ -1,8 +1,7 @@ #include #include "syscall.h" -#include "libc.h" -off_t lseek(int fd, off_t offset, int whence) +off_t __lseek(int fd, off_t offset, int whence) { #ifdef __EMSCRIPTEN__ off_t result; @@ -17,4 +16,5 @@ off_t lseek(int fd, off_t offset, int whence) #endif // __EMSCRIPTEN__ } -LFS64(lseek); +weak_alias(__lseek, lseek); +weak_alias(__lseek, lseek64); diff --git a/system/lib/libc/musl/src/unistd/nice.c b/system/lib/libc/musl/src/unistd/nice.c index da56996776e26..6c25c8c326a72 100644 --- a/system/lib/libc/musl/src/unistd/nice.c +++ b/system/lib/libc/musl/src/unistd/nice.c @@ -1,12 +1,16 @@ #include #include +#include #include "syscall.h" int nice(int inc) { -#ifdef SYS_nice - return syscall(SYS_nice, inc); -#else - return setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0)+inc); -#endif + int prio = inc; + // Only query old priority if it can affect the result. + // This also avoids issues with integer overflow. + if (inc > -2*NZERO && inc < 2*NZERO) + prio += getpriority(PRIO_PROCESS, 0); + if (prio > NZERO-1) prio = NZERO-1; + if (prio < -NZERO) prio = -NZERO; + return setpriority(PRIO_PROCESS, 0, prio) ? -1 : prio; } diff --git a/system/lib/libc/musl/src/unistd/pause.c b/system/lib/libc/musl/src/unistd/pause.c index 56eb171e0ac48..90bbf4ca8ab53 100644 --- a/system/lib/libc/musl/src/unistd/pause.c +++ b/system/lib/libc/musl/src/unistd/pause.c @@ -1,7 +1,5 @@ #include -#include #include "syscall.h" -#include "libc.h" int pause(void) { diff --git a/system/lib/libc/musl/src/unistd/pread.c b/system/lib/libc/musl/src/unistd/pread.c index a1278b38056c7..f05bbe6e8b98e 100644 --- a/system/lib/libc/musl/src/unistd/pread.c +++ b/system/lib/libc/musl/src/unistd/pread.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t pread(int fd, void *buf, size_t size, off_t ofs) { @@ -15,8 +14,8 @@ ssize_t pread(int fd, void *buf, size_t size, off_t ofs) } return num; #else - return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_O(ofs)); + return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_PRW(ofs)); #endif } -LFS64(pread); +weak_alias(pread, pread64); diff --git a/system/lib/libc/musl/src/unistd/preadv.c b/system/lib/libc/musl/src/unistd/preadv.c index 8cdf66131ec4c..018c7dd2454ee 100644 --- a/system/lib/libc/musl/src/unistd/preadv.c +++ b/system/lib/libc/musl/src/unistd/preadv.c @@ -2,7 +2,6 @@ #include #include #include "syscall.h" -#include "libc.h" ssize_t preadv(int fd, const struct iovec *iov, int count, off_t ofs) { @@ -18,4 +17,4 @@ ssize_t preadv(int fd, const struct iovec *iov, int count, off_t ofs) #endif } -LFS64(preadv); +weak_alias(preadv, preadv64); diff --git a/system/lib/libc/musl/src/unistd/pwrite.c b/system/lib/libc/musl/src/unistd/pwrite.c index 7e83fec7116fc..f0964fb016bec 100644 --- a/system/lib/libc/musl/src/unistd/pwrite.c +++ b/system/lib/libc/musl/src/unistd/pwrite.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs) { @@ -15,8 +14,8 @@ ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs) } return num; #else - return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_O(ofs)); + return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_PRW(ofs)); #endif } -LFS64(pwrite); +weak_alias(pwrite, pwrite64); diff --git a/system/lib/libc/musl/src/unistd/pwritev.c b/system/lib/libc/musl/src/unistd/pwritev.c index 1c3e31390359a..845be153a92ba 100644 --- a/system/lib/libc/musl/src/unistd/pwritev.c +++ b/system/lib/libc/musl/src/unistd/pwritev.c @@ -2,7 +2,6 @@ #include #include #include "syscall.h" -#include "libc.h" ssize_t pwritev(int fd, const struct iovec *iov, int count, off_t ofs) { @@ -18,4 +17,4 @@ ssize_t pwritev(int fd, const struct iovec *iov, int count, off_t ofs) #endif } -LFS64(pwritev); +weak_alias(pwritev, pwritev64); diff --git a/system/lib/libc/musl/src/unistd/read.c b/system/lib/libc/musl/src/unistd/read.c index 12835fe8f1c14..f079439c9d302 100644 --- a/system/lib/libc/musl/src/unistd/read.c +++ b/system/lib/libc/musl/src/unistd/read.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t read(int fd, void *buf, size_t count) { diff --git a/system/lib/libc/musl/src/unistd/readlink.c b/system/lib/libc/musl/src/unistd/readlink.c index a152d52492ed7..32f4537f972b0 100644 --- a/system/lib/libc/musl/src/unistd/readlink.c +++ b/system/lib/libc/musl/src/unistd/readlink.c @@ -4,9 +4,16 @@ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize) { + char dummy[1]; + if (!bufsize) { + buf = dummy; + bufsize = 1; + } #ifdef SYS_readlink - return syscall(SYS_readlink, path, buf, bufsize); + int r = __syscall(SYS_readlink, path, buf, bufsize); #else - return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize); + int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize); #endif + if (buf == dummy && r > 0) r = 0; + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/unistd/readlinkat.c b/system/lib/libc/musl/src/unistd/readlinkat.c index 9af45cd5a47d1..f79d3d14280ec 100644 --- a/system/lib/libc/musl/src/unistd/readlinkat.c +++ b/system/lib/libc/musl/src/unistd/readlinkat.c @@ -3,5 +3,12 @@ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize) { - return syscall(SYS_readlinkat, fd, path, buf, bufsize); + char dummy[1]; + if (!bufsize) { + buf = dummy; + bufsize = 1; + } + int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize); + if (buf == dummy && r > 0) r = 0; + return __syscall_ret(r); } diff --git a/system/lib/libc/musl/src/unistd/readv.c b/system/lib/libc/musl/src/unistd/readv.c index ea736a2a00fa2..bb0760da6e147 100644 --- a/system/lib/libc/musl/src/unistd/readv.c +++ b/system/lib/libc/musl/src/unistd/readv.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t readv(int fd, const struct iovec *iov, int count) { diff --git a/system/lib/libc/musl/src/unistd/renameat.c b/system/lib/libc/musl/src/unistd/renameat.c index 125748221f13c..c3b40a258b282 100644 --- a/system/lib/libc/musl/src/unistd/renameat.c +++ b/system/lib/libc/musl/src/unistd/renameat.c @@ -3,5 +3,9 @@ int renameat(int oldfd, const char *old, int newfd, const char *new) { +#ifdef SYS_renameat return syscall(SYS_renameat, oldfd, old, newfd, new); +#else + return syscall(SYS_renameat2, oldfd, old, newfd, new, 0); +#endif } diff --git a/system/lib/libc/musl/src/unistd/setxid.c b/system/lib/libc/musl/src/unistd/setxid.c index 3d1786c4cfc38..6fb4ec48ba00e 100644 --- a/system/lib/libc/musl/src/unistd/setxid.c +++ b/system/lib/libc/musl/src/unistd/setxid.c @@ -1,8 +1,7 @@ #include -#include +#include #include "syscall.h" #include "libc.h" -#include "pthread_impl.h" #ifdef __EMSCRIPTEN__ int __setxid_emscripten() { @@ -12,15 +11,15 @@ int __setxid_emscripten() { #else struct ctx { int id, eid, sid; - int nr, err; + int nr, ret; }; static void do_setxid(void *p) { struct ctx *c = p; - if (c->err>0) return; - int ret = -__syscall(c->nr, c->id, c->eid, c->sid); - if (ret && !c->err) { + if (c->ret<0) return; + int ret = __syscall(c->nr, c->id, c->eid, c->sid); + if (ret && !c->ret) { /* If one thread fails to set ids after another has already * succeeded, forcibly killing the process is the only safe * thing to do. State is inconsistent and dangerous. Use @@ -33,14 +32,10 @@ static void do_setxid(void *p) int __setxid(int nr, int id, int eid, int sid) { - /* err is initially nonzero so that failure of the first thread does not + /* ret is initially nonzero so that failure of the first thread does not * trigger the safety kill above. */ - struct ctx c = { .nr = nr, .id = id, .eid = eid, .sid = sid, .err = -1 }; + struct ctx c = { .nr = nr, .id = id, .eid = eid, .sid = sid, .ret = 1 }; __synccall(do_setxid, &c); - if (c.err) { - if (c.err>0) errno = c.err; - return -1; - } - return 0; + return __syscall_ret(c.ret); } #endif diff --git a/system/lib/libc/musl/src/unistd/truncate.c b/system/lib/libc/musl/src/unistd/truncate.c index 8e65655cd2bd1..9729680076572 100644 --- a/system/lib/libc/musl/src/unistd/truncate.c +++ b/system/lib/libc/musl/src/unistd/truncate.c @@ -1,10 +1,9 @@ #include #include "syscall.h" -#include "libc.h" int truncate(const char *path, off_t length) { return syscall(SYS_truncate, path, __SYSCALL_LL_O(length)); } -LFS64(truncate); +weak_alias(truncate, truncate64); diff --git a/system/lib/libc/musl/src/unistd/ttyname_r.c b/system/lib/libc/musl/src/unistd/ttyname_r.c index 8bac7b2f3ab10..82acb75e19d60 100644 --- a/system/lib/libc/musl/src/unistd/ttyname_r.c +++ b/system/lib/libc/musl/src/unistd/ttyname_r.c @@ -1,22 +1,28 @@ #include #include - -void __procfdname(char *, unsigned); +#include +#include "syscall.h" int ttyname_r(int fd, char *name, size_t size) { + struct stat st1, st2; char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2]; ssize_t l; - if (!isatty(fd)) return ENOTTY; + if (!isatty(fd)) return errno; __procfdname(procname, fd); l = readlink(procname, name, size); if (l < 0) return errno; else if (l == size) return ERANGE; - else { - name[l] = 0; - return 0; - } + + name[l] = 0; + + if (stat(name, &st1) || fstat(fd, &st2)) + return errno; + if (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) + return ENODEV; + + return 0; } diff --git a/system/lib/libc/musl/src/unistd/ualarm.c b/system/lib/libc/musl/src/unistd/ualarm.c index 855504bca42c7..2985855c72afd 100644 --- a/system/lib/libc/musl/src/unistd/ualarm.c +++ b/system/lib/libc/musl/src/unistd/ualarm.c @@ -7,7 +7,7 @@ unsigned ualarm(unsigned value, unsigned interval) struct itimerval it = { .it_interval.tv_usec = interval, .it_value.tv_usec = value - }; - setitimer(ITIMER_REAL, &it, &it); - return it.it_value.tv_sec*1000000 + it.it_value.tv_usec; + }, it_old; + setitimer(ITIMER_REAL, &it, &it_old); + return it_old.it_value.tv_sec*1000000 + it_old.it_value.tv_usec; } diff --git a/system/lib/libc/musl/src/unistd/write.c b/system/lib/libc/musl/src/unistd/write.c index f78d06c1aca44..53742cd4fd972 100644 --- a/system/lib/libc/musl/src/unistd/write.c +++ b/system/lib/libc/musl/src/unistd/write.c @@ -1,6 +1,5 @@ #include #include "syscall.h" -#include "libc.h" ssize_t write(int fd, const void *buf, size_t count) { diff --git a/system/lib/libc/musl/src/unistd/writev.c b/system/lib/libc/musl/src/unistd/writev.c index c68b50f9f153c..443d14f35d1be 100644 --- a/system/lib/libc/musl/src/unistd/writev.c +++ b/system/lib/libc/musl/src/unistd/writev.c @@ -1,7 +1,8 @@ #include #include "syscall.h" -#include "libc.h" +#if __EMSCRIPTEN__ #include +#endif ssize_t writev(int fd, const struct iovec *iov, int count) { diff --git a/system/lib/pthread/emscripten_thread_state.S b/system/lib/pthread/emscripten_thread_state.S index c7b2d8c3a9627..7b3d8f7d3c925 100644 --- a/system/lib/pthread/emscripten_thread_state.S +++ b/system/lib/pthread/emscripten_thread_state.S @@ -5,9 +5,9 @@ #endif .globaltype __tls_base, PTR -.globaltype thread_id, PTR +.globaltype thread_ptr, PTR -thread_id: +thread_ptr: .globaltype is_main_thread, i32 is_main_thread: @@ -15,17 +15,17 @@ is_main_thread: .globaltype is_runtime_thread, i32 is_runtime_thread: -.globl __pthread_self -__pthread_self: - .functype __pthread_self () -> (PTR) - global.get thread_id +.globl __get_tp +__get_tp: + .functype __get_tp () -> (PTR) + global.get thread_ptr end_function .globl _emscripten_thread_init _emscripten_thread_init: .functype _emscripten_thread_init (PTR, i32, i32) -> () local.get 0 - global.set thread_id + global.set thread_ptr local.get 1 global.set is_main_thread local.get 2 diff --git a/system/lib/pthread/library_pthread.c b/system/lib/pthread/library_pthread.c index 144cc25b154b1..e292e73c312f3 100644 --- a/system/lib/pthread/library_pthread.c +++ b/system/lib/pthread/library_pthread.c @@ -836,11 +836,14 @@ void __emscripten_init_main_thread(void) { // The pthread struct has a field that points to itself - this is used as // a magic ID to detect whether the pthread_t structure is 'alive'. __main_pthread.self = &__main_pthread; + __main_pthread.detach_state = DT_JOINABLE; // pthread struct robust_list head should point to itself. __main_pthread.robust_list.head = &__main_pthread.robust_list.head; // Main thread ID is always 1. It can't be 0 because musl assumes // tid is always non-zero. __main_pthread.tid = getpid(); __main_pthread.locale = &libc.global_locale; + // TODO(sbc): Implement circular list of threads + //__main_pthread.next = __main_pthread.prev = &__main_pthread; __main_pthread.tsd = (void **)__pthread_tsd_main; } diff --git a/system/lib/pthread/pthread_create.c b/system/lib/pthread/pthread_create.c index 0f01d6e37ae76..0038eeae9e34f 100644 --- a/system/lib/pthread/pthread_create.c +++ b/system/lib/pthread/pthread_create.c @@ -68,7 +68,10 @@ static long dummy_getpid() { } weak_alias(dummy_getpid, __syscall_getpid); -int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp, void *(*entry)(void *), void *restrict arg) { +int __pthread_create(pthread_t* restrict res, + const pthread_attr_t* restrict attrp, + void* (*entry)(void*), + void* restrict arg) { // Note on LSAN: lsan intercepts/wraps calls to pthread_create so any // allocation we we do here should be considered leaks. // See: lsan_interceptors.cpp. @@ -92,6 +95,8 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att libc.threaded = 1; } + struct pthread *self = __pthread_self(); + // Allocate thread block (pthread_t structure). struct pthread *new = malloc(sizeof(struct pthread)); // zero-initialize thread structure. @@ -111,8 +116,26 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att new->tsd = malloc(PTHREAD_KEYS_MAX * sizeof(void*)); memset(new->tsd, 0, PTHREAD_KEYS_MAX * sizeof(void*)); + //printf("start __pthread_create: %p\n", self); + int rtn = __pthread_create_js(new, attrp, entry, arg); + if (rtn != 0) + return rtn; + + // TODO(sbc): Implement circular list of threads + /* + __tl_lock(); + + new->next = self->next; + new->prev = self; + new->next->prev = new; + new->prev->next = new; + + __tl_unlock(); + */ + *res = new; - return __pthread_create_js(new, attrp, entry, arg); + //printf("done __pthread_create self=%p next=%p prev=%p new=%p\n", self, self->next, self->prev, new); + return 0; } static void free_tls_data() { @@ -141,7 +164,16 @@ void _emscripten_thread_exit(void* result) { free_tls_data(); - __lock(self->exitlock); + // TODO(sbc): Implement circular list of threads + /* + __tl_lock(); + + self->next->prev = self->prev; + self->prev->next = self->next; + self->prev = self->next = self; + + __tl_unlock(); + */ if (self == emscripten_main_browser_thread_id()) { exit(0); @@ -156,18 +188,20 @@ void _emscripten_thread_exit(void* result) { // Not hosting a pthread anymore in this worker set __pthread_self to NULL _emscripten_thread_init(0, 0, 0); - // Cache deteched state since once we set threadStatus to 1, the `self` struct - // could be freed and reused. - int detatched = self->detached; - - // Mark the thread as no longer running so it can be joined. - // Once we publish this, any threads that are waiting to join with us can - // proceed and this worker can be recycled and used on another thread. - self->threadStatus = 1; - emscripten_futex_wake(&self->threadStatus, INT_MAX); // wake all threads + /* This atomic potentially competes with a concurrent pthread_detach + * call; the loser is responsible for freeing thread resources. */ + int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING); - if (detatched) { + // Mark the thread as no longer running. + // When we publish this, the main thread is free to deallocate the thread + // object and we are done. + if (state == DT_DETACHED) { + self->detach_state = DT_EXITED; __pthread_detached_exit(); + } else { + self->detach_state = DT_EXITING; + // wake any threads that might be waiting for us to exit + emscripten_futex_wake(&self->detach_state, INT_MAX); } } diff --git a/system/lib/pthread/pthread_self_stub.c b/system/lib/pthread/pthread_self_stub.c index 886d4e30715e1..ef4ed1e6e92d6 100644 --- a/system/lib/pthread/pthread_self_stub.c +++ b/system/lib/pthread/pthread_self_stub.c @@ -10,8 +10,8 @@ static struct pthread __main_pthread; -pthread_t __pthread_self(void) { - return &__main_pthread; +uintptr_t __get_tp(void) { + return (uintptr_t)&__main_pthread; } // In case the stub syscall is not linked it diff --git a/system/lib/pthread/pthread_testcancel.c b/system/lib/pthread/pthread_testcancel.c index fa6f59c9c26df..3fd6da5745fd2 100644 --- a/system/lib/pthread/pthread_testcancel.c +++ b/system/lib/pthread/pthread_testcancel.c @@ -9,7 +9,7 @@ #include int _pthread_isduecanceled(struct pthread* pthread_ptr) { - return pthread_ptr->threadStatus == 2 /*canceled*/; + return pthread_ptr->cancel != 0; } void __pthread_testcancel() { diff --git a/system/lib/standalone/__main_argc_argv.c b/system/lib/standalone/__main_argc_argv.c index c41be2bec3876..d56f532540177 100644 --- a/system/lib/standalone/__main_argc_argv.c +++ b/system/lib/standalone/__main_argc_argv.c @@ -15,7 +15,7 @@ int main(int argc, char *argv[]); -__attribute__((weak)) +__attribute__((__weak__)) int __main_argc_argv(int argc, char *argv[]) { return main(argc, argv); } diff --git a/system/lib/update_musl.py b/system/lib/update_musl.py index ed3d3135e9d11..d37252af22fec 100755 --- a/system/lib/update_musl.py +++ b/system/lib/update_musl.py @@ -20,7 +20,6 @@ import os import sys import shutil -import subprocess script_dir = os.path.abspath(os.path.dirname(__file__)) local_src = os.path.join(script_dir, 'libc', 'musl') @@ -32,7 +31,7 @@ # Arch-specific code we don't use 'arm', 'x32', 'sh', 'i386', 'x86_64', 'aarch64', 'riscv64', 's390x', 'mips', 'mips64', 'mipsn32', 'powerpc', 'powerpc64', - 'm68k', 'microblaze', 'or1k', 'generic') + 'm68k', 'microblaze', 'or1k') musl_dir = os.path.abspath(sys.argv[1]) @@ -55,6 +54,11 @@ def main(): # Copy new version into place shutil.copytree(musl_dir, local_src, ignore=ignore) + # Create version.h + version = open(os.path.join(local_src, 'VERSION')).read().strip() + with open(os.path.join(local_src, 'src', 'internal', 'version.h'), 'w') as f: + f.write('#define VERSION "%s"\n' % version) + if __name__ == '__main__': main() diff --git a/tests/code_size/hello_webgl2_wasm.json b/tests/code_size/hello_webgl2_wasm.json index 97582974b0232..dc9a1292d85bc 100644 --- a/tests/code_size/hello_webgl2_wasm.json +++ b/tests/code_size/hello_webgl2_wasm.json @@ -3,8 +3,8 @@ "a.html.gz": 379, "a.js": 5000, "a.js.gz": 2422, - "a.wasm": 10304, - "a.wasm.gz": 6641, - "total": 15873, - "total_gz": 9442 + "a.wasm": 10447, + "a.wasm.gz": 6675, + "total": 16016, + "total_gz": 9476 } diff --git a/tests/code_size/hello_webgl2_wasm2js.json b/tests/code_size/hello_webgl2_wasm2js.json index 8b0ccdd738263..252385d8f37ad 100644 --- a/tests/code_size/hello_webgl2_wasm2js.json +++ b/tests/code_size/hello_webgl2_wasm2js.json @@ -1,10 +1,10 @@ { "a.html": 594, "a.html.gz": 389, - "a.js": 19899, - "a.js.gz": 8159, + "a.js": 20105, + "a.js.gz": 8205, "a.mem": 3171, "a.mem.gz": 2714, - "total": 23664, - "total_gz": 11262 + "total": 23870, + "total_gz": 11308 } diff --git a/tests/code_size/hello_webgl_wasm.json b/tests/code_size/hello_webgl_wasm.json index 6550631f1b61e..1d50f364c6b58 100644 --- a/tests/code_size/hello_webgl_wasm.json +++ b/tests/code_size/hello_webgl_wasm.json @@ -3,8 +3,8 @@ "a.html.gz": 379, "a.js": 4486, "a.js.gz": 2249, - "a.wasm": 10304, - "a.wasm.gz": 6641, - "total": 15359, - "total_gz": 9269 + "a.wasm": 10447, + "a.wasm.gz": 6675, + "total": 15502, + "total_gz": 9303 } diff --git a/tests/code_size/hello_webgl_wasm2js.json b/tests/code_size/hello_webgl_wasm2js.json index 0c6ab4d004aed..9d410eb8b8579 100644 --- a/tests/code_size/hello_webgl_wasm2js.json +++ b/tests/code_size/hello_webgl_wasm2js.json @@ -1,10 +1,10 @@ { "a.html": 594, "a.html.gz": 389, - "a.js": 19384, - "a.js.gz": 7996, + "a.js": 19590, + "a.js.gz": 8041, "a.mem": 3171, "a.mem.gz": 2714, - "total": 23149, - "total_gz": 11099 + "total": 23355, + "total_gz": 11144 } diff --git a/tests/code_size/random_printf_wasm.json b/tests/code_size/random_printf_wasm.json index acfbb06af6b5a..16cd5dd7530b6 100644 --- a/tests/code_size/random_printf_wasm.json +++ b/tests/code_size/random_printf_wasm.json @@ -1,6 +1,6 @@ { - "a.html": 12496, - "a.html.gz": 6718, - "total": 12496, - "total_gz": 6718 + "a.html": 12992, + "a.html.gz": 7003, + "total": 12992, + "total_gz": 7003 } diff --git a/tests/code_size/random_printf_wasm2js.json b/tests/code_size/random_printf_wasm2js.json index 9e1bec3663df3..47ff45a885beb 100644 --- a/tests/code_size/random_printf_wasm2js.json +++ b/tests/code_size/random_printf_wasm2js.json @@ -1,6 +1,6 @@ { - "a.html": 17240, - "a.html.gz": 7441, - "total": 17240, - "total_gz": 7441 + "a.html": 17893, + "a.html.gz": 7665, + "total": 17893, + "total_gz": 7665 } diff --git a/tests/core/test_dlfcn_self.exports b/tests/core/test_dlfcn_self.exports index 8f47936304e68..4f1b5fe93fc17 100644 --- a/tests/core/test_dlfcn_self.exports +++ b/tests/core/test_dlfcn_self.exports @@ -1,30 +1,17 @@ __THREW__ ___environ -__c_dot_utf8 -__c_dot_utf8_locale -__c_locale __data_end -__env_map __environ __optpos __optreset -__pio2_hi -__pio2_lo __progname __progname_full -__seed48 __sig_actions __sig_pending __signgam -__stderr_used -__stdin_used -__stdout_used __threwValue _environ _ns_flagdata -aT -atanhi -atanlo daylight environ global diff --git a/tests/core/test_float_builtins.out b/tests/core/test_float_builtins.out index d4df8780b396b..987a82b9dad36 100644 --- a/tests/core/test_float_builtins.out +++ b/tests/core/test_float_builtins.out @@ -2,7 +2,7 @@ 0.567800 : 1.010100 : 21.320100 0.123400 : 0.101010 : 12.012300 0.123400 : 0.101010 : 12.012300 -0.304824 : 1.001016 : 104168858480774546980864.000000 +0.304824 : 1.001016 : 104168858480774530203648.000000 0.000000 : 2.421390 : 101648962858951235671184182497867417669061891127967232769386628692937206561802464554722378383360.000000 inf : 3.091515 : 3.091515 : 1 sqrt(x) = 4.000000 diff --git a/tests/core/test_istream.cpp b/tests/core/test_istream.cpp index 74870f477c7ed..587ae7e5e90d9 100644 --- a/tests/core/test_istream.cpp +++ b/tests/core/test_istream.cpp @@ -16,5 +16,5 @@ int main() { is >> one >> two >> three; - printf("%i %i %i", one, two, three); + printf("%i %i %i\n", one, two, three); } diff --git a/tests/core/test_setlocale.out b/tests/core/test_setlocale.out index e01346ffaa09b..2fb14af4d0cd4 100644 --- a/tests/core/test_setlocale.out +++ b/tests/core/test_setlocale.out @@ -1,2 +1,2 @@ -done setlocale 'C': 'C;C;C;C;C;C' -done setlocale 'waka': 'waka;waka;waka;waka;waka;waka' +done setlocale 'C': 'C' +done setlocale 'waka': 'waka' diff --git a/tests/other/metadce/hello_libcxx_O2.size b/tests/other/metadce/hello_libcxx_O2.size index 0439e33adf98b..2ff8aadc51ea9 100644 --- a/tests/other/metadce/hello_libcxx_O2.size +++ b/tests/other/metadce/hello_libcxx_O2.size @@ -1 +1 @@ -124478 +124971 diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions.imports index 4bcbb0d06aaf4..01f234d0ce710 100644 --- a/tests/other/metadce/hello_libcxx_O2_fexceptions.imports +++ b/tests/other/metadce/hello_libcxx_O2_fexceptions.imports @@ -19,6 +19,7 @@ env.invoke_ii env.invoke_iii env.invoke_iiii env.invoke_iiiii +env.invoke_iiiiii env.invoke_iiiiiii env.invoke_iiiiiiii env.invoke_iiiiiiiiiiii diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.size b/tests/other/metadce/hello_libcxx_O2_fexceptions.size index c28fe730f5e5e..acf66b44fceef 100644 --- a/tests/other/metadce/hello_libcxx_O2_fexceptions.size +++ b/tests/other/metadce/hello_libcxx_O2_fexceptions.size @@ -1 +1 @@ -165774 +166331 diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports index 4bcbb0d06aaf4..01f234d0ce710 100644 --- a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports +++ b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports @@ -19,6 +19,7 @@ env.invoke_ii env.invoke_iii env.invoke_iiii env.invoke_iiiii +env.invoke_iiiiii env.invoke_iiiiiii env.invoke_iiiiiiii env.invoke_iiiiiiiiiiii diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.size b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.size index 0112cfab4fda4..dd4d6136af011 100644 --- a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.size +++ b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.size @@ -1 +1 @@ -225898 +226452 diff --git a/tests/other/metadce/hello_world.funcs b/tests/other/metadce/hello_world.funcs index 3daa58519aae5..35fa40dd4b4db 100644 --- a/tests/other/metadce/hello_world.funcs +++ b/tests/other/metadce/hello_world.funcs @@ -3,16 +3,18 @@ $__ashlti3 $__emscripten_stdout_close $__emscripten_stdout_seek $__errno_location -$__fflush_unlocked $__fwritex +$__get_tp $__lock $__lockfile +$__lseek $__lshrti3 $__memcpy $__ofl_lock $__ofl_unlock $__original_main -$__pthread_self +$__stdio_close +$__stdio_seek $__stdio_write $__syscall_getpid $__towrite @@ -22,6 +24,7 @@ $__unlockfile $__vfprintf_internal $__wasi_syscall_ret $__wasm_call_ctors +$dummy $dynCall_jiji $emscripten_stack_get_end $emscripten_stack_get_free @@ -36,6 +39,7 @@ $getint $getpid $init_pthread_self $isdigit +$legalfunc$__wasi_fd_seek $legalstub$dynCall_jiji $main $memchr @@ -49,6 +53,7 @@ $printf_core $stackAlloc $stackRestore $stackSave +$strnlen $vfprintf $wcrtomb $wctomb diff --git a/tests/other/metadce/hello_world.imports b/tests/other/metadce/hello_world.imports index 729e3403870a0..31c12fdfab836 100644 --- a/tests/other/metadce/hello_world.imports +++ b/tests/other/metadce/hello_world.imports @@ -1,3 +1,5 @@ env.emscripten_memcpy_big env.setTempRet0 +wasi_snapshot_preview1.fd_close +wasi_snapshot_preview1.fd_seek wasi_snapshot_preview1.fd_write diff --git a/tests/other/metadce/hello_world.sent b/tests/other/metadce/hello_world.sent index e7fb5d6ed5b84..fbcaf9b1ffefc 100644 --- a/tests/other/metadce/hello_world.sent +++ b/tests/other/metadce/hello_world.sent @@ -1,3 +1,5 @@ emscripten_memcpy_big +fd_close +fd_seek fd_write setTempRet0 diff --git a/tests/other/metadce/hello_world.size b/tests/other/metadce/hello_world.size index bda9fb842a43d..2671d9d501c96 100644 --- a/tests/other/metadce/hello_world.size +++ b/tests/other/metadce/hello_world.size @@ -1 +1 @@ -11479 +12419 diff --git a/tests/other/metadce/hello_world_O1.size b/tests/other/metadce/hello_world_O1.size index a0198be084430..2f097f031198d 100644 --- a/tests/other/metadce/hello_world_O1.size +++ b/tests/other/metadce/hello_world_O1.size @@ -1 +1 @@ -2400 +2397 diff --git a/tests/other/metadce/hello_world_O2.size b/tests/other/metadce/hello_world_O2.size index 78bed88929ed3..d541811d08bf4 100644 --- a/tests/other/metadce/hello_world_O2.size +++ b/tests/other/metadce/hello_world_O2.size @@ -1 +1 @@ -2023 +2030 diff --git a/tests/other/metadce/hello_world_O3.size b/tests/other/metadce/hello_world_O3.size index 1d25bf7a627cf..a894381fc572f 100644 --- a/tests/other/metadce/hello_world_O3.size +++ b/tests/other/metadce/hello_world_O3.size @@ -1 +1 @@ -1702 +1721 diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.size b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.size index afb3cc870bc97..cdf5ccdefffc5 100644 --- a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.size +++ b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.size @@ -1 +1 @@ -10141 +10127 diff --git a/tests/other/metadce/hello_world_Os.size b/tests/other/metadce/hello_world_Os.size index 1d25bf7a627cf..058fbb17e4dbb 100644 --- a/tests/other/metadce/hello_world_Os.size +++ b/tests/other/metadce/hello_world_Os.size @@ -1 +1 @@ -1702 +1713 diff --git a/tests/other/metadce/hello_world_Oz.size b/tests/other/metadce/hello_world_Oz.size index 6bbc2a3cd457b..4b809f8d5b608 100644 --- a/tests/other/metadce/hello_world_Oz.size +++ b/tests/other/metadce/hello_world_Oz.size @@ -1 +1 @@ -1257 +1276 diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.size b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.size index 05723a1f1f206..a71d72e90967e 100644 --- a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.size +++ b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.size @@ -1 +1 @@ -6295 +6305 diff --git a/tests/other/metadce/mem_O3_STANDALONE_WASM.size b/tests/other/metadce/mem_O3_STANDALONE_WASM.size index db4950bc29488..26ce5fe233906 100644 --- a/tests/other/metadce/mem_O3_STANDALONE_WASM.size +++ b/tests/other/metadce/mem_O3_STANDALONE_WASM.size @@ -1 +1 @@ -6218 +6228 diff --git a/tests/other/metadce/minimal.funcs b/tests/other/metadce/minimal.funcs index 6bd57c99366d4..77affb0070f33 100644 --- a/tests/other/metadce/minimal.funcs +++ b/tests/other/metadce/minimal.funcs @@ -1,5 +1,4 @@ $__errno_location -$__fflush_unlocked $__lock $__lockfile $__ofl_lock diff --git a/tests/other/metadce/minimal.size b/tests/other/metadce/minimal.size index 0c2b7810b5ff9..7438337bf96d8 100644 --- a/tests/other/metadce/minimal.size +++ b/tests/other/metadce/minimal.size @@ -1 +1 @@ -789 +812 diff --git a/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.funcs b/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.funcs index 0da1a9503b0bc..e416673d5bf54 100644 --- a/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.funcs +++ b/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.funcs @@ -5,9 +5,11 @@ $__errno_location $__pthread_mutex_lock $__pthread_mutex_trylock $__pthread_mutex_unlock +$__pthread_rwlock_tryrdlock $__pthread_self_internal $__pthread_setcancelstate $__stdio_write +$__timedwait $__wasi_syscall_ret $__wasm_call_ctors $__wasm_init_memory @@ -19,6 +21,9 @@ $_emscripten_thread_init $_main_thread $_pthread_isduecanceled $a_cas +$a_dec +$a_inc.1 +$a_swap $add $dispatch_to_thread_helper $dispose_chunk diff --git a/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.size b/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.size index 64222630ee594..cf1aae5406345 100644 --- a/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.size +++ b/tests/other/metadce/minimal_main_Oz_USE_PTHREADS_PROXY_TO_PTHREAD.size @@ -1 +1 @@ -17020 +17584 diff --git a/tests/other/test_proxy_to_pthread_stack.c b/tests/other/test_proxy_to_pthread_stack.c index 05f60cb3832bb..f1ea8ae6abfca 100644 --- a/tests/other/test_proxy_to_pthread_stack.c +++ b/tests/other/test_proxy_to_pthread_stack.c @@ -9,9 +9,11 @@ int main(void) { pthread_attr_t attr; - pthread_getattr_np(pthread_self(), &attr); + int rtn = pthread_getattr_np(pthread_self(), &attr); + assert(rtn == 0); size_t stacksize = 0; - pthread_attr_getstacksize(&attr, &stacksize); + rtn = pthread_attr_getstacksize(&attr, &stacksize); + assert(rtn == 0); printf("stack size %zd\n", stacksize); // This test is run with TOTAL_STACK=128k so we always expect that to be diff --git a/tests/pthread/test_pthread_c11_threads.c b/tests/pthread/test_pthread_c11_threads.c index ac7a4631ea31a..cc4572422bf89 100644 --- a/tests/pthread/test_pthread_c11_threads.c +++ b/tests/pthread/test_pthread_c11_threads.c @@ -86,9 +86,13 @@ int main(int argc, char* argv[]) { assert(cnd_wait(&cond, &mutex) == thrd_success); assert(thrd_join(t1, &result) == thrd_success); + printf("t1 joined\n"); assert(thrd_join(t2, &result) == thrd_success); + printf("t2 joined\n"); assert(thrd_join(t3, &result) == thrd_success); + printf("t3 joined\n"); assert(thrd_join(t4, &result) == thrd_success); + printf("t4 joined\n"); assert(result == 42); assert(once_counter == 1); diff --git a/tests/pthread/test_pthread_locale.c b/tests/pthread/test_pthread_locale.c index 46a1fb13d0284..dca27ef1342b2 100644 --- a/tests/pthread/test_pthread_locale.c +++ b/tests/pthread/test_pthread_locale.c @@ -10,6 +10,10 @@ #include #include #include +// This is really rather naughty, we shouldn't be including +// musl-internal headers like this. +#define weak __attribute__(__weak__) +#define hidden __attribute__((__visibility__("hidden"))) #include "../../system/lib/libc/musl/src/internal/pthread_impl.h" #define NUM_THREADS 1 @@ -36,17 +40,15 @@ int main (int argc, char *argv[]) { locale_t main_loc = do_test(); locale_t child_loc; - if (!emscripten_has_threading_support()) { - child_loc = main_loc; - } else { + if (emscripten_has_threading_support()) { long id = 1; pthread_t thread; pthread_create(&thread, NULL, thread_test, (void *)id); pthread_join(thread, (void**)&child_loc); + assert(main_loc == child_loc); } - assert(main_loc == child_loc); return 0; } diff --git a/tests/pthread/test_pthread_thread_local_storage.cpp b/tests/pthread/test_pthread_thread_local_storage.cpp index 8bdcf711467ec..39ec50ed3fc6b 100644 --- a/tests/pthread/test_pthread_thread_local_storage.cpp +++ b/tests/pthread/test_pthread_thread_local_storage.cpp @@ -116,5 +116,6 @@ int main() for(int i = 0; i < NUM_KEYS; ++i) pthread_key_delete(keys[i]); + printf("done\n"); return 0; } diff --git a/tests/reference_struct_info.json b/tests/reference_struct_info.json index e730df150a1a5..1d2a7b042db9b 100644 --- a/tests/reference_struct_info.json +++ b/tests/reference_struct_info.json @@ -19,7 +19,10 @@ "CLOCK_MONOTONIC": 1, "CLOCK_MONOTONIC_RAW": 4, "CLOCK_REALTIME": 0, - "DEFAULT_STACK_SIZE": 2097152, + "DT_DETACHED": 3, + "DT_EXITED": 0, + "DT_EXITING": 1, + "DT_JOINABLE": 2, "E2BIG": 1, "EACCES": 2, "EADDRINUSE": 3, @@ -263,16 +266,16 @@ "F_DUPFD": 0, "F_GETFD": 1, "F_GETFL": 3, - "F_GETLK": 12, - "F_GETLK64": 12, + "F_GETLK": 5, + "F_GETLK64": 5, "F_GETOWN": 9, "F_GETOWN_EX": 16, "F_SETFD": 2, "F_SETFL": 4, - "F_SETLK": 13, - "F_SETLK64": 13, - "F_SETLKW": 14, - "F_SETLKW64": 14, + "F_SETLK": 6, + "F_SETLK64": 6, + "F_SETLKW": 7, + "F_SETLKW64": 7, "F_SETOWN": 8, "F_UNLCK": 2, "INADDR_LOOPBACK": 2130706433, @@ -1324,19 +1327,24 @@ "p_proto": 8 }, "pthread": { - "__size__": 224, - "attr": 100, - "detached": 60, - "profilerBlock": 4, - "result": 88, - "self": 8, - "stack": 72, - "stack_size": 76, - "threadStatus": 0 + "__size__": 108, + "cancel": 28, + "cancelasync": 33, + "canceldisable": 32, + "detach_state": 24, + "locale": 88, + "profilerBlock": 104, + "result": 56, + "robust_list": 68, + "self": 0, + "stack": 44, + "stack_size": 48, + "tid": 16, + "tsd": 64 }, "pthread_attr_t": { - "__size__": 44, - "_a_transferredcanvases": 40 + "__size__": 40, + "_a_transferredcanvases": 36 }, "sockaddr": { "__size__": 16, diff --git a/tests/test_other.py b/tests/test_other.py index 2bdf1de9f8288..62945c4b1ebb6 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -4868,10 +4868,10 @@ def test_bad_locale(self): #include #include -int main(const int argc, const char * const * const argv) { - const char * const locale = (argc > 1 ? argv[1] : "C"); - const char * const actual = setlocale(LC_ALL, locale); - if(actual == NULL) { +int main(int argc, char **argv) { + const char *locale = (argc > 1 ? argv[1] : "C"); + const char *actual = setlocale(LC_ALL, locale); + if (actual == NULL) { printf("%s locale not supported\n", locale); return 0; } @@ -4880,9 +4880,9 @@ def test_bad_locale(self): ''') self.run_process([EMXX, 'src.cpp']) - self.assertContained('locale set to C: C;C;C;C;C;C', + self.assertContained('locale set to C: C', self.run_js('a.out.js', args=['C'])) - self.assertContained('locale set to waka: waka;waka;waka;waka;waka;waka', + self.assertContained('locale set to waka: waka', self.run_js('a.out.js', args=['waka'])) def test_browser_language_detection(self): @@ -9209,7 +9209,7 @@ def test(code): print(f'int:{i} float:{f} double:{lf}: both{both}') # iprintf is much smaller than printf with float support - self.assertGreater(i, f - 3400) + self.assertGreater(i, f - 3500) self.assertLess(i, f - 3000) # __small_printf is somewhat smaller than printf with long double support self.assertGreater(f, lf - 900) diff --git a/tests/test_posixtest.py b/tests/test_posixtest.py index 28ad5555cb243..f3faa2b0b47a6 100644 --- a/tests/test_posixtest.py +++ b/tests/test_posixtest.py @@ -129,6 +129,7 @@ def get_pthread_tests(): 'test_pthread_cond_signal_1_1': 'flaky: https://github.com/emscripten-core/emscripten/issues/13283', 'test_pthread_barrier_wait_2_1': 'flaky: https://github.com/emscripten-core/emscripten/issues/14508', 'test_pthread_rwlock_unlock_3_1': 'Test fail: writer did not get write lock, when main release the lock', + 'test_pthread_mutex_init_1_2': 'flaky: https://github.com/emscripten-core/posixtestsuite/pull/9', } # Mark certain tests as disabled. These are tests that are either flaky or never return. diff --git a/tools/gen_struct_info.py b/tools/gen_struct_info.py index 7d5433926680b..5d1fa29337a6a 100755 --- a/tools/gen_struct_info.py +++ b/tools/gen_struct_info.py @@ -426,6 +426,7 @@ def main(args): internal_cflags = [ '-I' + utils.path_from_root('system/lib/libc/musl/src/internal'), + '-I' + utils.path_from_root('system/lib/libc/musl/src/include'), ] cxxflags = [ diff --git a/tools/system_libs.py b/tools/system_libs.py index 9d29bf18af174..b2846f15b4ddd 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -652,9 +652,13 @@ def get_default_variation(cls, **kwargs): class MuslInternalLibrary(Library): - includes = ['system/lib/libc/musl/src/internal'] + includes = [ + 'system/lib/libc/musl/src/internal', + 'system/lib/libc/musl/src/include', + ] cflags = [ + '-std=c99', '-D_XOPEN_SOURCE=700', '-Wno-unused-result', # system call results are often ignored in musl, and in wasi that warns ] @@ -732,7 +736,7 @@ def get_files(self): ignore = [ 'ipc', 'passwd', 'signal', 'sched', 'time', 'linux', 'aio', 'exit', 'legacy', 'mq', 'setjmp', 'env', - 'ldso' + 'ldso', 'malloc' ] # individual files @@ -743,8 +747,10 @@ def get_files(self): 'gethostbyname2_r.c', 'gethostbyname_r.c', 'gethostbyname2.c', 'alarm.c', 'syscall.c', 'popen.c', 'pclose.c', 'getgrouplist.c', 'initgroups.c', 'wordexp.c', 'timer_create.c', + 'getentropy.c', # 'process' exclusion - 'fork.c', 'vfork.c', 'posix_spawn.c', 'posix_spawnp.c', 'execve.c', 'waitid.c', 'system.c' + 'fork.c', 'vfork.c', 'posix_spawn.c', 'posix_spawnp.c', 'execve.c', 'waitid.c', 'system.c', + '_Fork.c', ] ignore += LIBC_SOCKETS @@ -760,11 +766,9 @@ def get_files(self): # Empty files, simply ignore them. 'syscall_cp.c', 'tls.c', # TODO: Comment out (or support) within upcoming musl upgrade. See #12216. - # 'pthread_setname_np.c', + 'pthread_setname_np.c', # TODO: No longer exists in the latest musl version. '__futex.c', - # TODO: Could be supported in the upcoming musl upgrade - 'lock_ptc.c', # 'pthread_setattr_default_np.c', # TODO: These could be moved away from JS in the upcoming musl upgrade. 'pthread_cancel.c', @@ -843,12 +847,17 @@ def get_files(self): 'ctime.c', 'gmtime.c', 'localtime.c', - 'nanosleep.c' + 'nanosleep.c', + 'clock_nanosleep.c', ]) libc_files += files_in_path( path='system/lib/libc/musl/src/legacy', filenames=['getpagesize.c', 'err.c']) + libc_files += files_in_path( + path='system/lib/libc/musl/src/linux', + filenames=['getdents.c']) + libc_files += files_in_path( path='system/lib/libc/musl/src/env', filenames=['__environ.c', 'getenv.c', 'putenv.c', 'setenv.c', 'unsetenv.c']) @@ -872,6 +881,7 @@ def get_files(self): libc_files += files_in_path( path='system/lib/libc/musl/src/signal', filenames=[ + 'block.c', 'getitimer.c', 'killpg.c', 'setitimer.c', @@ -931,7 +941,7 @@ def can_use(self): class libsockets(MuslInternalLibrary, MTLibrary): name = 'libsockets' - cflags = ['-Os', '-fno-builtin'] + cflags = ['-Os', '-fno-builtin', '-Wno-shift-op-parentheses'] def get_files(self): return files_in_path(