eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: avoid undefined signed overflow

Browse source
This commit is contained in:
Anonymous Maarten 2024-12-28 19:06:59 +01:00 • committed by Anonymous Maarten
parent 156b3b4a8c
commit efba42a67b
4 changed files with 52 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/test/SDL_test_fuzzer.c
View file

@ -142,9 +142,13 @@ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max)
max = temp; max = temp;
} }
Sint32 range = (max - min); Uint64 range = (Sint64)max - (Sint64)min;
SDL_assert(range < SDL_MAX_SINT32); if (range < SDL_MAX_SINT32) {
return min + SDL_rand_r(&rndContext, range + 1); return min + (Sint32) SDL_rand_r(&rndContext, (Sint32) range + 1);
} else {
Uint64 add = SDL_rand_bits_r(&rndContext) | ((Uint64) SDL_rand_bits_r(&rndContext) << 32);
return (Sint32) (min + (Sint64) (add % (range + 1)));
}
} }
/** /**

84
test/testautomation_intrinsics.c
View file

@ -19,13 +19,13 @@
/* Helper functions */ /* Helper functions */
static int allocate_random_int_arrays(Sint32 **dest, Sint32 **a, Sint32 **b, size_t *size) { static int allocate_random_uint_arrays(Uint32 **dest, Uint32 **a, Uint32 **b, size_t *size) {
size_t i; size_t i;
*size = (size_t)SDLTest_RandomIntegerInRange(127, 999); *size = (size_t)SDLTest_RandomIntegerInRange(127, 999);
*dest = SDL_malloc(sizeof(Sint32) * *size); *dest = SDL_malloc(sizeof(Uint32) * *size);
*a = SDL_malloc(sizeof(Sint32) * *size); *a = SDL_malloc(sizeof(Uint32) * *size);
*b = SDL_malloc(sizeof(Sint32) * *size); *b = SDL_malloc(sizeof(Uint32) * *size);
if (!*dest || !*a || !*b) { if (!*dest || !*a || !*b) {
SDLTest_AssertCheck(false, "SDL_malloc failed"); SDLTest_AssertCheck(false, "SDL_malloc failed");
@ -33,8 +33,8 @@ static int allocate_random_int_arrays(Sint32 **dest, Sint32 **a, Sint32 **b, siz
} }
for (i = 0; i < *size; ++i) { for (i = 0; i < *size; ++i) {
(*a)[i] = SDLTest_RandomSint32(); (*a)[i] = SDLTest_RandomUint32();
(*b)[i] = SDLTest_RandomSint32(); (*b)[i] = SDLTest_RandomUint32();
} }
return 0; return 0;
} }
@ -90,12 +90,12 @@ static void free_arrays(void *dest, void *a, void *b) {
/** /**
* Verify element-wise addition of 2 int arrays. * Verify element-wise addition of 2 int arrays.
*/ */
static void verify_ints_addition(const Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size, const char *desc) { static void verify_uints_addition(const Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size, const char *desc) {
size_t i; size_t i;
int all_good = 1; int all_good = 1;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
Sint32 expected = a[i] + b[i]; Uint32 expected = a[i] + b[i];
if (dest[i] != expected) { if (dest[i] != expected) {
SDLTest_AssertCheck(false, "%" SDL_PRIs32 " + %" SDL_PRIs32 " = %" SDL_PRIs32 ", expected %" SDL_PRIs32 " ([%" SDL_PRIu32 "/%" SDL_PRIu32 "] %s)", SDLTest_AssertCheck(false, "%" SDL_PRIs32 " + %" SDL_PRIs32 " = %" SDL_PRIs32 ", expected %" SDL_PRIs32 " ([%" SDL_PRIu32 "/%" SDL_PRIu32 "] %s)",
a[i], b[i], dest[i], expected, (Uint32)i, (Uint32)size, desc); a[i], b[i], dest[i], expected, (Uint32)i, (Uint32)size, desc);
@ -108,16 +108,16 @@ static void verify_ints_addition(const Sint32 *dest, const Sint32 *a, const Sint
} }
/** /**
* Verify element-wise multiplication of 2 int arrays. * Verify element-wise multiplication of 2 uint arrays.
*/ */
static void verify_ints_multiplication(const Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size, const char *desc) { static void verify_uints_multiplication(const Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size, const char *desc) {
size_t i; size_t i;
int all_good = 1; int all_good = 1;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
Sint32 expected = a[i] * b[i]; Uint32 expected = a[i] * b[i];
if (dest[i] != expected) { if (dest[i] != expected) {
SDLTest_AssertCheck(false, "%" SDL_PRIs32 " * %" SDL_PRIs32 " = %" SDL_PRIs32 ", expected %" SDL_PRIs32 " ([%" SDL_PRIu32 "/%" SDL_PRIu32 "] %s)", SDLTest_AssertCheck(false, "%" SDL_PRIu32 " * %" SDL_PRIu32 " = %" SDL_PRIu32 ", expected %" SDL_PRIu32 " ([%" SDL_PRIu32 "/%" SDL_PRIu32 "] %s)",
a[i], b[i], dest[i], expected, (Uint32)i, (Uint32)size, desc); a[i], b[i], dest[i], expected, (Uint32)i, (Uint32)size, desc);
all_good = 0; all_good = 0;
} }
@ -171,13 +171,13 @@ static void verify_doubles_addition(const double *dest, const double *a, const d
/* Intrinsic kernels */ /* Intrinsic kernels */
static void kernel_ints_add_cpu(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { static void kernel_uints_add_cpu(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size; --size, ++dest, ++a, ++b) { for (; size; --size, ++dest, ++a, ++b) {
*dest = *a + *b; *dest = *a + *b;
} }
} }
static void kernel_ints_mul_cpu(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { static void kernel_uints_mul_cpu(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size; --size, ++dest, ++a, ++b) { for (; size; --size, ++dest, ++a, ++b) {
*dest = *a * *b; *dest = *a * *b;
} }
@ -196,7 +196,7 @@ static void kernel_doubles_add_cpu(double *dest, const double *a, const double *
} }
#ifdef SDL_MMX_INTRINSICS #ifdef SDL_MMX_INTRINSICS
SDL_TARGETING("mmx") static void kernel_ints_add_mmx(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { SDL_TARGETING("mmx") static void kernel_uints_add_mmx(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size >= 2; size -= 2, dest += 2, a += 2, b += 2) { for (; size >= 2; size -= 2, dest += 2, a += 2, b += 2) {
*(__m64*)dest = _mm_add_pi32(*(__m64*)a, *(__m64*)b); *(__m64*)dest = _mm_add_pi32(*(__m64*)a, *(__m64*)b);
} }
@ -230,7 +230,7 @@ SDL_TARGETING("sse2") static void kernel_doubles_add_sse2(double *dest, const do
#endif #endif
#ifdef SDL_SSE3_INTRINSICS #ifdef SDL_SSE3_INTRINSICS
SDL_TARGETING("sse3") static void kernel_ints_add_sse3(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { SDL_TARGETING("sse3") static void kernel_uints_add_sse3(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size >= 4; size -= 4, dest += 4, a += 4, b += 4) { for (; size >= 4; size -= 4, dest += 4, a += 4, b += 4) {
_mm_storeu_si128((__m128i*)dest, _mm_add_epi32(_mm_lddqu_si128((__m128i*)a), _mm_lddqu_si128((__m128i*)b))); _mm_storeu_si128((__m128i*)dest, _mm_add_epi32(_mm_lddqu_si128((__m128i*)a), _mm_lddqu_si128((__m128i*)b)));
} }
@ -241,7 +241,7 @@ SDL_TARGETING("sse3") static void kernel_ints_add_sse3(Sint32 *dest, const Sint3
#endif #endif
#ifdef SDL_SSE4_1_INTRINSICS #ifdef SDL_SSE4_1_INTRINSICS
SDL_TARGETING("sse4.1") static void kernel_ints_mul_sse4_1(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { SDL_TARGETING("sse4.1") static void kernel_uints_mul_sse4_1(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size >= 4; size -= 4, dest += 4, a += 4, b += 4) { for (; size >= 4; size -= 4, dest += 4, a += 4, b += 4) {
_mm_storeu_si128((__m128i*)dest, _mm_mullo_epi32(_mm_lddqu_si128((__m128i*)a), _mm_lddqu_si128((__m128i*)b))); _mm_storeu_si128((__m128i*)dest, _mm_mullo_epi32(_mm_lddqu_si128((__m128i*)a), _mm_lddqu_si128((__m128i*)b)));
} }
@ -294,7 +294,7 @@ SDL_TARGETING("avx") static void kernel_floats_add_avx(float *dest, const float
#endif #endif
#ifdef SDL_AVX2_INTRINSICS #ifdef SDL_AVX2_INTRINSICS
SDL_TARGETING("avx2") static void kernel_ints_add_avx2(Sint32 *dest, const Sint32 *a, const Sint32 *b, size_t size) { SDL_TARGETING("avx2") static void kernel_uints_add_avx2(Uint32 *dest, const Uint32 *a, const Uint32 *b, size_t size) {
for (; size >= 8; size -= 8, dest += 8, a += 8, b += 8) { for (; size >= 8; size -= 8, dest += 8, a += 8, b += 8) {
_mm256_storeu_si256((__m256i*)dest, _mm256_add_epi32(_mm256_loadu_si256((__m256i*)a), _mm256_loadu_si256((__m256i*)b))); _mm256_storeu_si256((__m256i*)dest, _mm256_add_epi32(_mm256_loadu_si256((__m256i*)a), _mm256_loadu_si256((__m256i*)b)));
} }
@ -321,22 +321,22 @@ static int SDLCALL intrinsics_selftest(void *arg)
{ {
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_mul_cpu(dest, a, b, size); kernel_uints_mul_cpu(dest, a, b, size);
verify_ints_multiplication(dest, a, b, size, "CPU"); verify_uints_multiplication(dest, a, b, size, "CPU");
free_arrays(dest, a, b); free_arrays(dest, a, b);
} }
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_add_cpu(dest, a, b, size); kernel_uints_add_cpu(dest, a, b, size);
verify_ints_addition(dest, a, b, size, "CPU"); verify_uints_addition(dest, a, b, size, "CPU");
free_arrays(dest, a, b); free_arrays(dest, a, b);
} }
{ {
@ -369,14 +369,14 @@ static int SDLCALL intrinsics_testMMX(void *arg)
#ifdef SDL_MMX_INTRINSICS #ifdef SDL_MMX_INTRINSICS
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
SDLTest_AssertCheck(true, "Test executable uses MMX intrinsics."); SDLTest_AssertCheck(true, "Test executable uses MMX intrinsics.");
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_add_mmx(dest, a, b, size); kernel_uints_add_mmx(dest, a, b, size);
verify_ints_addition(dest, a, b, size, "MMX"); verify_uints_addition(dest, a, b, size, "MMX");
free_arrays(dest, a, b); free_arrays(dest, a, b);
return TEST_COMPLETED; return TEST_COMPLETED;
@ -453,14 +453,14 @@ static int SDLCALL intrinsics_testSSE3(void *arg)
#ifdef SDL_SSE3_INTRINSICS #ifdef SDL_SSE3_INTRINSICS
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
SDLTest_AssertCheck(true, "Test executable uses SSE3 intrinsics."); SDLTest_AssertCheck(true, "Test executable uses SSE3 intrinsics.");
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_add_sse3(dest, a, b, size); kernel_uints_add_sse3(dest, a, b, size);
verify_ints_addition(dest, a, b, size, "SSE3"); verify_uints_addition(dest, a, b, size, "SSE3");
free_arrays(dest, a, b); free_arrays(dest, a, b);
return TEST_COMPLETED; return TEST_COMPLETED;
@ -481,14 +481,14 @@ static int SDLCALL intrinsics_testSSE4_1(void *arg)
#ifdef SDL_SSE4_1_INTRINSICS #ifdef SDL_SSE4_1_INTRINSICS
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
SDLTest_AssertCheck(true, "Test executable uses SSE4.1 intrinsics."); SDLTest_AssertCheck(true, "Test executable uses SSE4.1 intrinsics.");
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_mul_sse4_1(dest, a, b, size); kernel_uints_mul_sse4_1(dest, a, b, size);
verify_ints_multiplication(dest, a, b, size, "SSE4.1"); verify_uints_multiplication(dest, a, b, size, "SSE4.1");
free_arrays(dest, a, b); free_arrays(dest, a, b);
return TEST_COMPLETED; return TEST_COMPLETED;
@ -572,14 +572,14 @@ static int SDLCALL intrinsics_testAVX2(void *arg)
#ifdef SDL_AVX2_INTRINSICS #ifdef SDL_AVX2_INTRINSICS
{ {
size_t size; size_t size;
Sint32 *dest, *a, *b; Uint32 *dest, *a, *b;
SDLTest_AssertCheck(true, "Test executable uses AVX2 intrinsics."); SDLTest_AssertCheck(true, "Test executable uses AVX2 intrinsics.");
if (allocate_random_int_arrays(&dest, &a, &b, &size) < 0) { if (allocate_random_uint_arrays(&dest, &a, &b, &size) < 0) {
return TEST_ABORTED; return TEST_ABORTED;
} }
kernel_ints_add_avx2(dest, a, b, size); kernel_uints_add_avx2(dest, a, b, size);
verify_ints_addition(dest, a, b, size, "AVX2"); verify_uints_addition(dest, a, b, size, "AVX2");
free_arrays(dest, a, b); free_arrays(dest, a, b);
return TEST_COMPLETED; return TEST_COMPLETED;

2
test/testautomation_sdltest.c
View file

@ -1073,7 +1073,7 @@ static int SDLCALL sdltest_randomIntegerInRange(void *arg)
#endif #endif
/* Range with max at integer limit */ /* Range with max at integer limit */
min = long_min - (Sint32)SDLTest_RandomSint16(); min = (Sint32)((Uint32)long_min + (Uint32)SDLTest_RandomSint16());
max = long_max; max = long_max;
result = SDLTest_RandomIntegerInRange(min, max); result = SDLTest_RandomIntegerInRange(min, max);
SDLTest_AssertPass("Call to SDLTest_RandomIntegerInRange(...,SINT32_MAX)"); SDLTest_AssertPass("Call to SDLTest_RandomIntegerInRange(...,SINT32_MAX)");

4
test/testplatform.c
View file

@ -180,8 +180,8 @@ static int TestEndian(bool verbose)
static int TST_allmul(void *a, void *b, int arg, void *result, void *expected) static int TST_allmul(void *a, void *b, int arg, void *result, void *expected)
{ {
(*(long long *)result) = ((*(long long *)a) * (*(long long *)b)); (*(unsigned long long *)result) = ((*(unsigned long long *)a) * (*(unsigned long long *)b));
return (*(long long *)result) == (*(long long *)expected); return (*(unsigned long long *)result) == (*(unsigned long long *)expected);
} }
static int TST_alldiv(void *a, void *b, int arg, void *result, void *expected) static int TST_alldiv(void *a, void *b, int arg, void *result, void *expected)