edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update sdefl and sinfl

Browse Source
This commit is contained in:
luboslenco
2025-09-25 12:25:39 +02:00
parent 0cff051a68
commit d46a3e3810
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/libs/sdefl.h
+10 -1
View File
@@ -180,6 +180,10 @@ extern int zsdeflate(struct sdefl *s, void *o, const void *i, int n, int lvl);
#include <string.h> /* memcpy */
#include <limits.h> /* CHAR_BIT */
#ifdef __cplusplus
extern "C" {
#endif
#define SDEFL_NIL (-1)
#define SDEFL_MAX_MATCH 258
#define SDEFL_MAX_CODE_LEN (15)
@@ -784,7 +788,12 @@ zsdeflate(struct sdefl *s, void *out, const void *in, int n, int lvl) {
extern int
sdefl_bound(int len) {
int max_blocks = 1 + sdefl_div_round_up(len, SDEFL_RAW_BLK_SIZE);
int bound = 5 * max_blocks + len + 1 + 4 + 8;
int bound = 5 * max_blocks + len + 1 + 4 + 8 + 3;
return bound;
}
#ifdef __cplusplus
}
#endif
#endif /* SDEFL_IMPLEMENTATION */
base/sources/libs/sinfl.h
+27 -19
View File
@@ -142,6 +142,10 @@ extern int zsinflate(void *out, int cap, const void *in, int size);
#include <string.h> /* memcpy, memset */
#include <assert.h> /* assert */
#ifdef __cplusplus
extern "C" {
#endif
#if defined(__GNUC__) || defined(__clang__)
#define sinfl_likely(x) __builtin_expect((x),1)
#define sinfl_unlikely(x) __builtin_expect((x),0)
@@ -151,29 +155,30 @@ extern int zsinflate(void *out, int cap, const void *in, int size);
#endif
#ifndef SINFL_NO_SIMD
#if defined(__x86_64__) || defined(_WIN32) || defined(_WIN64)
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64)
#include <arm_neon.h>
#define sinfl_char16 uint8x16_t
#define sinfl_char16_ld(p) vld1q_u8((const unsigned char*)(p))
#define sinfl_char16_str(d, v) vst1q_u8((unsigned char*)(d), v)
#define sinfl_char16_char(c) vdupq_n_u8(c)
#elif defined(__x86_64__) || defined(_WIN32) || defined(_WIN64)
#include <emmintrin.h>
#define sinfl_char16 __m128i
#define sinfl_char16_ld(p) _mm_loadu_si128((const __m128i *)(void*)(p))
#define sinfl_char16_str(d,v) _mm_storeu_si128((__m128i*)(void*)(d), v)
#define sinfl_char16_char(c) _mm_set1_epi8(c)
#elif defined(__arm__) || defined(__aarch64__)
#include <arm_neon.h>
#define sinfl_char16 uint8x16_t
#define sinfl_char16_ld(p) vld1q_u8((const unsigned char*)(p))
#define sinfl_char16_str(d,v) vst1q_u8((unsigned char*)(d), v)
#define sinfl_char16_char(c) vdupq_n_u8(c)
#else
#define SINFL_NO_SIMD
#endif
#endif
static int
sinfl_bsr(unsigned n) {
sinfl_bsr(unsigned long n) {
#ifdef _MSC_VER
_BitScanReverse(&n, n);
return n;
#elif defined(__GNUC__) || defined(__clang__)
unsigned long r = 0;
_BitScanReverse(&r, n);
return (int)(r);
#else // defined(__GNUC__) || defined(__clang__) || defined(__TINYC__)
return 31 - __builtin_clz(n);
#endif
}
@@ -409,9 +414,10 @@ sinfl_decompress(unsigned char *out, int cap, const unsigned char *in, int size)
if ((unsigned short)len != (unsigned short)~nlen)
return (int)(out-o);
if (len > (e - s.bitptr) || !len)
if (len > (e - s.bitptr))
return (int)(out-o);
if (sinfl_unlikely(out + len > oe)) return -2;
memcpy(out, s.bitptr, (size_t)len);
s.bitptr += len, out += len;
if (last) return (int)(out-o);
@@ -468,12 +474,11 @@ sinfl_decompress(unsigned char *out, int cap, const unsigned char *in, int size)
sym = sinfl_decode(&s, s.lits, 10);
if (sym < 256) {
/* literal */
if (sinfl_unlikely(out >= oe)) {
return (int)(out-o);
}
if (sinfl_unlikely(out >= oe)) return -2;
*out++ = (unsigned char)sym;
sym = sinfl_decode(&s, s.lits, 10);
if (sym < 256) {
if (sinfl_unlikely(out >= oe)) return -2;
*out++ = (unsigned char)sym;
continue;
}
@@ -494,10 +499,8 @@ sinfl_decompress(unsigned char *out, int cap, const unsigned char *in, int size)
int dsym = sinfl_decode(&s, s.dsts, 8);
int offs = sinfl__get(&s, dbits[dsym]) + dbase[dsym];
unsigned char *dst = out, *src = out - offs;
if (sinfl_unlikely(offs > (int)(out-o))) {
return (int)(out-o);
}
out = out + len;
if (sinfl_unlikely(out > oe)) return -2;
#ifndef SINFL_NO_SIMD
if (sinfl_likely(oe - out >= 16 * 3)) {
@@ -601,7 +604,8 @@ zsinflate(void *out, int cap, const void *mem, int size) {
const unsigned char *in = (const unsigned char*)mem;
if (size >= 6) {
const unsigned char *eob = in + size - 4;
int n = sinfl_decompress((unsigned char*)out, cap, in + 2u, size);
int n = sinfl_decompress((unsigned char*)out, cap, in + 2, size - 6);
if (n < 0) return -2;
unsigned a = sinfl_adler32(1u, (unsigned char*)out, n);
unsigned h = eob[0] << 24 | eob[1] << 16 | eob[2] << 8 | eob[3] << 0;
return a == h ? n : -1;
@@ -609,5 +613,9 @@ zsinflate(void *out, int cap, const void *mem, int size) {
return -1;
}
}
#ifdef __cplusplus
}
#endif
#endif /* SINFL_IMPLEMENTATION */