ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-08 14:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tail comparisons

Browse Source
This commit is contained in:
Nikita Smith
2026-06-19 20:12:25 -07:00
committed by Ryan Fleury
parent c81c072018
commit 6ea9bfc5a3
2 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/base/base_strings.c
+3 -1
View File
@@ -3,8 +3,9 @@
//////////////////////////////// ////////////////////////////////
#if !defined(MEM_STATIC) #ifndef MEM_STATIC
# define MEM_STATIC # define MEM_STATIC
# define MEM_API ASAN_NO_ADDR static inline
# include "third_party/martins_memfun/memfun.h" # include "third_party/martins_memfun/memfun.h"
#endif #endif
@@ -3087,6 +3088,7 @@ str8_compar(String8 a, String8 b, B32 ignore_case)
else else
{ {
cmp = MemCompare(a.str, b.str, size); cmp = MemCompare(a.str, b.str, size);
cmp = cmp > 0 ? 1 : cmp < 0 ? -1 : 0;
} }
// shorter prefix must precede longer prefixes // shorter prefix must precede longer prefixes
src/third_party/martins_memfun/memfun.h
Vendored
+49 -40
View File
@@ -457,34 +457,43 @@ int MemCompareI_sse2(const void* ptr1, const void* ptr2, size_t size)
{ {
return MemToLower1(p1[0]) - MemToLower1(p2[0]); return MemToLower1(p1[0]) - MemToLower1(p2[0]);
} }
else if (size < 4) // 2 <= size < 4
uint64_t a0, b0, a1, b1;
if (size < 4) // 2 <= size < 4
{ {
a0 = MEM_PTR16U(p1); uint16_t a0 = MEM_GET16BE(p1);
b0 = MEM_PTR16U(p2); uint16_t b0 = MEM_GET16BE(p2);
a1 = MEM_PTR16U(p1 + size - 2); uint16_t a1 = MEM_GET16BE(p1 + size - 2);
b1 = MEM_PTR16U(p2 + size - 2); uint16_t b1 = MEM_GET16BE(p2 + size - 2);
uint64_t tmp = ((uint64_t)a1 << 48) | ((uint64_t)a0 << 32) | ((uint64_t)b1 << 16) | ((uint64_t)b0);
tmp = MemToLower8(tmp);
uint32_t a = (uint32_t)(tmp >> 32);
uint32_t b = (uint32_t)(tmp >> 0);
return (a > b) - (a < b);
} }
else if (size < 8) // 4 <= size < 8 else if (size < 8) // 4 <= size < 8
{ {
a0 = MEM_PTR32U(p1); uint32_t a0 = MEM_GET32BE(p1);
b0 = MEM_PTR32U(p2); uint32_t b0 = MEM_GET32BE(p2);
a1 = MEM_PTR32U(p1 + size - 4); uint32_t a1 = MEM_GET32BE(p1 + size - 4);
b1 = MEM_PTR32U(p2 + size - 4); uint32_t b1 = MEM_GET32BE(p2 + size - 4);
uint64_t a = MemToLower8(((uint64_t)a1 << 32) | a0);
uint64_t b = MemToLower8(((uint64_t)b1 << 32) | b0);
return (a > b) - (a < b);
} }
else // 8 <= size <= 16 else // 8 <= size <= 16
{ {
a0 = MEM_PTR64U(p1); uint64_t a0 = MEM_GET64BE(p1);
b0 = MEM_PTR64U(p2); uint64_t b0 = MEM_GET64BE(p2);
a1 = MEM_PTR64U(p1 + size - 8); uint64_t a1 = MEM_GET64BE(p1 + size - 8);
b1 = MEM_PTR64U(p2 + size - 8); uint64_t b1 = MEM_GET64BE(p2 + size - 8);
} a0 = MemToLower8(a0);
b0 = MemToLower8(b0);
uint64_t a = MemToLower8(MEM_BSWAP64(a0 != b0 ? a0 : a1)); a1 = MemToLower8(a1);
uint64_t b = MemToLower8(MEM_BSWAP64(a0 != b0 ? b0 : b1)); b1 = MemToLower8(b1);
uint64_t a = (a0 != b0 ? a0 : a1);
uint64_t b = (a0 != b0 ? b0 : b1);
return (a > b) - (a < b); return (a > b) - (a < b);
} }
}
while (size >= 64) while (size >= 64)
{ {
@@ -1096,16 +1105,15 @@ int MemCompareI_avx2(const void* ptr1, const void* ptr2, size_t size)
} }
else if (size < 4) // 2 <= size < 4 else if (size < 4) // 2 <= size < 4
{ {
uint32_t a0 = MEM_GET16BE(p1); uint16_t a0 = MEM_GET16BE(p1);
uint32_t b0 = MEM_GET16BE(p2); uint16_t b0 = MEM_GET16BE(p2);
uint32_t a1 = MEM_GET16BE(p1 + size - 2); uint16_t a1 = MEM_GET16BE(p1 + size - 2);
uint32_t b1 = MEM_GET16BE(p2 + size - 2); uint16_t b1 = MEM_GET16BE(p2 + size - 2);
uint32_t a = (a0 != b0 ? a0 : a1); uint64_t tmp = ((uint64_t)a1 << 48) | ((uint64_t)a0 << 32) | ((uint64_t)b1 << 16) | ((uint64_t)b0);
uint32_t b = (a0 != b0 ? b0 : b1); tmp = MemToLower8(tmp);
uint64_t tmp = MemToLower8(((uint64_t)a << 32) | b); uint32_t a = (uint32_t)(tmp >> 32);
a = (uint32_t)(tmp >> 32); uint32_t b = (uint32_t)(tmp >> 0);
b = (uint32_t)(tmp); return (a > b) - (a < b);
return a - b;
} }
else if (size < 8) // 4 <= size < 8 else if (size < 8) // 4 <= size < 8
{ {
@@ -1113,11 +1121,8 @@ int MemCompareI_avx2(const void* ptr1, const void* ptr2, size_t size)
uint32_t b0 = MEM_GET32BE(p2); uint32_t b0 = MEM_GET32BE(p2);
uint32_t a1 = MEM_GET32BE(p1 + size - 4); uint32_t a1 = MEM_GET32BE(p1 + size - 4);
uint32_t b1 = MEM_GET32BE(p2 + size - 4); uint32_t b1 = MEM_GET32BE(p2 + size - 4);
uint32_t a = (a0 != b0 ? a0 : a1); uint64_t a = MemToLower8(((uint64_t)a1 << 32) | a0);
uint32_t b = (a0 != b0 ? b0 : b1); uint64_t b = MemToLower8(((uint64_t)b1 << 32) | b0);
uint64_t tmp = MemToLower8(((uint64_t)a << 32) | b);
a = (uint32_t)(tmp >> 32);
b = (uint32_t)(tmp);
return (a > b) - (a < b); return (a > b) - (a < b);
} }
else if (size <= 16) // 8 <= size <= 16 else if (size <= 16) // 8 <= size <= 16
@@ -1126,8 +1131,12 @@ int MemCompareI_avx2(const void* ptr1, const void* ptr2, size_t size)
uint64_t b0 = MEM_GET64BE(p2); uint64_t b0 = MEM_GET64BE(p2);
uint64_t a1 = MEM_GET64BE(p1 + size - 8); uint64_t a1 = MEM_GET64BE(p1 + size - 8);
uint64_t b1 = MEM_GET64BE(p2 + size - 8); uint64_t b1 = MEM_GET64BE(p2 + size - 8);
uint64_t a = MemToLower8(a0 != b0 ? a0 : a1); a0 = MemToLower8(a0);
uint64_t b = MemToLower8(a0 != b0 ? b0 : b1); b0 = MemToLower8(b0);
a1 = MemToLower8(a1);
b1 = MemToLower8(b1);
uint64_t a = (a0 != b0 ? a0 : a1);
uint64_t b = (a0 != b0 ? b0 : b1);
return (a > b) - (a < b); return (a > b) - (a < b);
} }
else // 16 < size <= 32 else // 16 < size <= 32
@@ -2592,7 +2601,7 @@ static int MemCPUID(void)
#endif // MEM_ARCH_X64 #endif // MEM_ARCH_X64
int MemCompare(const void* ptr1, const void* ptr2, size_t size) MEM_API int MemCompare(const void* ptr1, const void* ptr2, size_t size)
{ {
#if MEM_ARCH_X64 #if MEM_ARCH_X64
int cpuid = MemCPUID(); int cpuid = MemCPUID();
@@ -2614,7 +2623,7 @@ int MemCompare(const void* ptr1, const void* ptr2, size_t size)
#endif #endif
} }
int MemCompareI(const void* ptr1, const void* ptr2, size_t size) MEM_API int MemCompareI(const void* ptr1, const void* ptr2, size_t size)
{ {
#if MEM_ARCH_X64 #if MEM_ARCH_X64
int cpuid = MemCPUID(); int cpuid = MemCPUID();
@@ -2636,7 +2645,7 @@ int MemCompareI(const void* ptr1, const void* ptr2, size_t size)
#endif #endif
} }
bool MemIsEqual(const void* ptr1, const void* ptr2, size_t size) MEM_API bool MemIsEqual(const void* ptr1, const void* ptr2, size_t size)
{ {
#if MEM_ARCH_X64 #if MEM_ARCH_X64
int cpuid = MemCPUID(); int cpuid = MemCPUID();
@@ -2658,7 +2667,7 @@ bool MemIsEqual(const void* ptr1, const void* ptr2, size_t size)
#endif #endif
} }
size_t MemFind(const void* ptr, size_t size, uint8_t value) MEM_API size_t MemFind(const void* ptr, size_t size, uint8_t value)
{ {
#if MEM_ARCH_X64 #if MEM_ARCH_X64
int cpuid = MemCPUID(); int cpuid = MemCPUID();