mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-03 11:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reduce header complexity

Browse source 
- Remove most __ASSEMBLER__ __LINKER__ ifdefs
- Rename libc/intrin/bits.h to libc/serialize.h
- Block pthread cancelation in fchmodat() polyfill
- Remove `clang-format off` statements in third_party
This commit is contained in:
Justine Tunney 2023-11-28 14:24:28 -08:00
parent 96f979dfc5
commit fa20edc44d
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
3057 changed files with 410 additions and 4398 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libc/str/getzipeocd.c
View file

@ -16,7 +16,6 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/intrin/bits.h"
#include "libc/zip.internal.h"
typedef char v16qi __attribute__((__vector_size__(16)));
@ -48,8 +47,9 @@ void *GetZipEocd(const void *f, size_t n, int *e) {
do {
#if defined(__x86_64__) && defined(__GNUC__) && !defined(__llvm__) && \
!defined(__chibicc__)
v8hi pk = {READ16LE("PK"), READ16LE("PK"), READ16LE("PK"), READ16LE("PK"),
READ16LE("PK"), READ16LE("PK"), READ16LE("PK"), READ16LE("PK")};
v8hi pk = {ZIP_READ16("PK"), ZIP_READ16("PK"), ZIP_READ16("PK"),
ZIP_READ16("PK"), ZIP_READ16("PK"), ZIP_READ16("PK"),
ZIP_READ16("PK"), ZIP_READ16("PK")};
asm("" : "+x"(pk));
if (i >= 14) {
v2di x = *(const v2di *)(p + i - 14);
@ -62,9 +62,9 @@ void *GetZipEocd(const void *f, size_t n, int *e) {
}
}
#endif
while (magic = READ32LE(p + i), magic != kZipCdir64LocatorMagic &&
magic != kZipCdirHdrMagic &&
i + 0x10000 + 0x1000 >= n && i > 0) {
while (magic = ZIP_READ32(p + i), magic != kZipCdir64LocatorMagic &&
magic != kZipCdirHdrMagic &&
i + 0x10000 + 0x1000 >= n && i > 0) {
--i;
}
if (magic == kZipCdir64LocatorMagic && i + kZipCdir64LocatorSize <= n &&
@ -74,7 +74,7 @@ void *GetZipEocd(const void *f, size_t n, int *e) {
(err = IsZipEocd32(p, n, i)) == kZipOk) {
j = i;
do {
if (READ32LE(p + j) == kZipCdir64LocatorMagic &&
if (ZIP_READ32(p + j) == kZipCdir64LocatorMagic &&
j + kZipCdir64LocatorSize <= n &&
IsZipEocd64(p, n, ZIP_LOCATE64_OFFSET(p + j)) == kZipOk) {
return (void *)(p + ZIP_LOCATE64_OFFSET(p + j));