mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-23 13:52:28 +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:
Justine Tunney
parent
3dc86ce154
commit
f7ae50462a
118 changed files with 342 additions and 392 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __big5_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __cp932ext_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __cp949_encmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __cp949ext_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __cp950ext_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __gb18030ext_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __gb18030ext_encmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __gb2312_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __gbcommon_encmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __gbkext_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __jisx0208_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __jisx0212_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __jisx0213_1_bmp_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __jisx0213_2_bmp_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __jisx0213_pair_decmap_ptr;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "libc/x/x.h"
|
||||
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
|
||||
/* clang-format off */
|
||||
|
||||
static _Atomic(void *) __ksx1001_decmap_ptr;
|
||||
|
|
|
|||
77
third_party/python/Modules/cjkcodecs/xloadzd.c
vendored
Normal file
77
third_party/python/Modules/cjkcodecs/xloadzd.c
vendored
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/*-*- 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;
|
||||
}
|
||||
11
third_party/python/Modules/cjkcodecs/xloadzd.h
vendored
Normal file
11
third_party/python/Modules/cjkcodecs/xloadzd.h
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_
|
||||
#define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_
|
||||
#if !(__ASSEMBLER__ + __LINKER__ + 0)
|
||||
COSMOPOLITAN_C_START_
|
||||
|
||||
void *xloadzd(_Atomic(void *) *, const void *, size_t, size_t, size_t, size_t,
|
||||
uint32_t);
|
||||
|
||||
COSMOPOLITAN_C_END_
|
||||
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
|
||||
#endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_ */
|
||||
1
third_party/python/Modules/faulthandler.c
vendored
1
third_party/python/Modules/faulthandler.c
vendored
|
|
@ -6,6 +6,7 @@
|
|||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/sigaltstack.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/sysv/consts/rlimit.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
|
|
|
|||
2
third_party/python/python.mk
vendored
2
third_party/python/python.mk
vendored
|
|
@ -188,6 +188,7 @@ THIRD_PARTY_PYTHON_HDRS = \
|
|||
third_party/python/Modules/_sqlite/row.h \
|
||||
third_party/python/Modules/_sqlite/statement.h \
|
||||
third_party/python/Modules/_sqlite/util.h \
|
||||
third_party/python/Modules/cjkcodecs/xloadzd.h \
|
||||
third_party/python/Modules/cjkcodecs/cjkcodecs.h \
|
||||
third_party/python/Modules/cjkcodecs/multibytecodec.h \
|
||||
third_party/python/Modules/cjkcodecs/somanyencodings.h \
|
||||
|
|
@ -586,6 +587,7 @@ THIRD_PARTY_PYTHON_STAGE2_A_SRCS = \
|
|||
third_party/python/Modules/atexitmodule.c \
|
||||
third_party/python/Modules/audioop.c \
|
||||
third_party/python/Modules/binascii.c \
|
||||
third_party/python/Modules/cjkcodecs/xloadzd.c \
|
||||
third_party/python/Modules/cjkcodecs/_codecs_cn.c \
|
||||
third_party/python/Modules/cjkcodecs/_codecs_hk.c \
|
||||
third_party/python/Modules/cjkcodecs/_codecs_iso2022.c \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue