Merge branch 'parpar' into turbo

animetosho · May 25, 2023 · e190704 · e190704
2 parents df3f194 + c2a5915
commit e190704
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/parpar/gf16/gf16_global.h b/parpar/gf16/gf16_global.h
@@ -99,7 +99,7 @@ static HEDLEY_ALWAYS_INLINE void gf16_prepare_packed(
 
 	size_t partLeft = partLen;
 	if(partOffset + partLen == srcLen)
-		partLeft = ~0; // if we're completing the slice, ensure that we never exit early
+		partLeft = ~(size_t)0; // if we're completing the slice, ensure that we never exit early
 
 	size_t dataChunkLen = chunkLen;
 	if(dataChunkLen > sliceLen) dataChunkLen = sliceLen;

diff --git a/parpar/gf16/gf16_xor_sse2.c b/parpar/gf16/gf16_xor_sse2.c
@@ -267,7 +267,7 @@ static HEDLEY_ALWAYS_INLINE void STOREU_XMM(void* dest, __m128i xmm) {
 		"cmovnz %[s], %[d]\n" \
 		: [d]"+r"(dst): [c]"r"(cond), [s]"r"(src))
 #else
-	//#define CMOV(c,d,s) (d) = ((c) & (s)) | (~(c) & (d));
+	//#define CMOV(c,d,s) (d) = ((c) & (s)) | (~(uintptr_t)(c) & (d));
 	#define CMOV(c, d, s) if(c) (d) = (s)
 #endif