mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-15 15:20:02 +00:00
Make improvements
- Fix unused local variable errors - Remove yoinks from sigaction() header - Add nox87 and aarch64 to github actions - Fix cosmocc -fportcosmo in linking mode - It's now possible to build `make m=llvm o/llvm/libc`
This commit is contained in:
parent
3dc86ce154
commit
f7ae50462a
118 changed files with 342 additions and 392 deletions
|
@ -38,7 +38,8 @@ char16_t *utf8to16(const char *p, size_t n, size_t *z) {
|
|||
if (n == -1) n = p ? strlen(p) : 0;
|
||||
if ((q = r = malloc((n + 16) * sizeof(char16_t) * 2 + sizeof(char16_t)))) {
|
||||
for (i = 0; i < n;) {
|
||||
#if defined(__SSE2__) && defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
#if defined(__SSE2__) && defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
|
||||
!defined(__llvm__) && !defined(__chibicc__)
|
||||
if (i + 16 < n) {
|
||||
typedef char xmm_t __attribute__((__vector_size__(16), __aligned__(1)));
|
||||
xmm_t vi, vz = {0};
|
||||
|
|
|
@ -27,13 +27,10 @@ COSMOPOLITAN_C_START_
|
|||
#define xstripext __xstripext
|
||||
#define xstripexts __xstripexts
|
||||
#define xload __xload
|
||||
#define xloadzd __xloadzd
|
||||
#define rmrf __rmrf
|
||||
#define xbasename __xbasename
|
||||
#define xdirname __xdirname
|
||||
#define xjoinpaths __xjoinpaths
|
||||
#define xreadlink __xreadlink
|
||||
#define xreadlinkat __xreadlinkat
|
||||
#define xfixpath __xfixpath
|
||||
#define xslurp __xslurp
|
||||
#define xbarf __xbarf
|
||||
|
@ -84,8 +81,6 @@ char *xhomedir(void) dontdiscard;
|
|||
char *xstripext(const char *) dontdiscard;
|
||||
char *xstripexts(const char *) dontdiscard;
|
||||
void *xload(_Atomic(void *) *, const void *, size_t, size_t);
|
||||
void *xloadzd(_Atomic(void *) *, const void *, size_t, size_t, size_t, size_t,
|
||||
uint32_t);
|
||||
int rmrf(const char *);
|
||||
char *xbasename(const char *) paramsnonnull()
|
||||
returnspointerwithnoaliases dontthrow nocallback dontdiscard returnsnonnull;
|
||||
|
@ -93,10 +88,6 @@ char *xdirname(const char *) paramsnonnull()
|
|||
returnspointerwithnoaliases dontthrow nocallback dontdiscard returnsnonnull;
|
||||
char *xjoinpaths(const char *, const char *) paramsnonnull()
|
||||
returnspointerwithnoaliases dontthrow nocallback dontdiscard returnsnonnull;
|
||||
char *xreadlink(const char *) paramsnonnull()
|
||||
returnspointerwithnoaliases dontthrow nocallback dontdiscard returnsnonnull;
|
||||
char *xreadlinkat(int, const char *) paramsnonnull()
|
||||
returnspointerwithnoaliases dontthrow nocallback dontdiscard returnsnonnull;
|
||||
void xfixpath(void);
|
||||
void *xslurp(const char *, size_t *)
|
||||
paramsnonnull((1)) returnspointerwithnoaliases
|
||||
|
|
|
@ -35,8 +35,7 @@ LIBC_X_A_DIRECTDEPS = \
|
|||
LIBC_STR \
|
||||
LIBC_SYSV \
|
||||
THIRD_PARTY_GDTOA \
|
||||
THIRD_PARTY_MUSL \
|
||||
THIRD_PARTY_ZLIB
|
||||
THIRD_PARTY_MUSL
|
||||
|
||||
LIBC_X_A_DEPS := \
|
||||
$(call uniq,$(foreach x,$(LIBC_X_A_DIRECTDEPS),$($(x))))
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2021 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/assert.h"
|
||||
#include "libc/fmt/leb128.h"
|
||||
#include "libc/intrin/atomic.h"
|
||||
#include "libc/intrin/kmalloc.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/nexgen32e/crc32.h"
|
||||
#include "libc/runtime/internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/x/x.h"
|
||||
#include "third_party/zlib/zlib.h"
|
||||
|
||||
/**
|
||||
* Loads δzd encoded data once atomically.
|
||||
*
|
||||
* @param a points to your static pointer holder
|
||||
* @param p is read-only data compressed using raw deflate
|
||||
* @param n is byte length of deflated data
|
||||
* @param m is byte length of inflated data
|
||||
* @param c is number of items in array
|
||||
* @param z is byte length of items
|
||||
* @param s is crc32 checksum
|
||||
* @return pointer to decoded data
|
||||
* @threadsafe
|
||||
*/
|
||||
void *xloadzd(_Atomic(void *) *a, const void *p, size_t n, size_t m, size_t c,
|
||||
size_t z, uint32_t s) {
|
||||
size_t i;
|
||||
char *q, *b;
|
||||
void *r, *g;
|
||||
int64_t x, y;
|
||||
if ((r = atomic_load_explicit(a, memory_order_acquire))) return r;
|
||||
_unassert(z == 2 || z == 4);
|
||||
if (!(b = q = malloc(m))) return 0;
|
||||
if (__inflate(q, m, p, n)) {
|
||||
free(q);
|
||||
return 0;
|
||||
}
|
||||
if (!(r = kmalloc(c * z))) {
|
||||
free(q);
|
||||
return 0;
|
||||
}
|
||||
for (x = i = 0; i < c; ++i) {
|
||||
b += unzleb64(b, 10, &y);
|
||||
x += y;
|
||||
if (z == 2) {
|
||||
((uint16_t *)r)[i] = x;
|
||||
} else {
|
||||
((uint32_t *)r)[i] = x;
|
||||
}
|
||||
}
|
||||
free(q);
|
||||
assert(crc32_z(0, r, c * z) == s);
|
||||
g = 0;
|
||||
if (!atomic_compare_exchange_strong_explicit(a, &g, r, memory_order_relaxed,
|
||||
memory_order_relaxed)) {
|
||||
r = g;
|
||||
}
|
||||
return r;
|
||||
}
|
|
@ -1,30 +0,0 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2021 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/sysv/consts/at.h"
|
||||
#include "libc/x/x.h"
|
||||
|
||||
/**
|
||||
* Reads symbolic link.
|
||||
*
|
||||
* @return nul-terminated string, or null w/ errno
|
||||
* @see readlink()
|
||||
*/
|
||||
char *xreadlink(const char *path) {
|
||||
return xreadlinkat(AT_FDCWD, path);
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2021 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/sysv/errfuns.h"
|
||||
#include "libc/x/x.h"
|
||||
|
||||
/**
|
||||
* Reads symbolic link.
|
||||
*
|
||||
* @return nul-terminated string, or null w/ errno
|
||||
* @see readlinkat()
|
||||
*/
|
||||
char *xreadlinkat(int dirfd, const char *path) {
|
||||
ssize_t rc;
|
||||
size_t n, c;
|
||||
char *p, *q;
|
||||
c = PAGESIZE;
|
||||
p = xmalloc(c);
|
||||
if ((rc = readlinkat(dirfd, path, p, c)) != -1) {
|
||||
if ((n = rc) < c) {
|
||||
p[n] = 0;
|
||||
if ((q = realloc(p, n + 1))) p = q;
|
||||
return p;
|
||||
} else {
|
||||
enametoolong();
|
||||
}
|
||||
}
|
||||
free(p);
|
||||
return 0;
|
||||
}
|
|
@ -39,8 +39,8 @@
|
|||
* @asyncsignalsafe
|
||||
* @vforksafe
|
||||
*/
|
||||
int(xsigaction)(int sig, void *handler, uint64_t flags, uint64_t mask,
|
||||
struct sigaction *old) {
|
||||
int xsigaction(int sig, void *handler, uint64_t flags, uint64_t mask,
|
||||
struct sigaction *old) {
|
||||
/* This API is superior to sigaction() because (1) it offers feature
|
||||
parity; (2) compiler emits 1/3rd as much binary code at call-site;
|
||||
and (3) it removes typing that just whines without added safety. */
|
||||
|
|
|
@ -6,14 +6,6 @@ COSMOPOLITAN_C_START_
|
|||
|
||||
int xsigaction(int, void *, uint64_t, uint64_t, struct sigaction *);
|
||||
|
||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
#define xsigaction(SIG, HANDLER, FLAGS, MASK, OLD) \
|
||||
({ \
|
||||
__SIGACTION_YOINK(SIG); \
|
||||
xsigaction(SIG, HANDLER, FLAGS, MASK, OLD); \
|
||||
})
|
||||
#endif
|
||||
|
||||
COSMOPOLITAN_C_END_
|
||||
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
|
||||
#endif /* COSMOPOLITAN_LIBC_X_XSIGACTION_H_ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue