diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c index a5914c9120..632a304177 100644 --- a/src/test/test_ptr_slow.c +++ b/src/test/test_ptr_slow.c @@ -10,46 +10,65 @@ #include #include -/** Check that all values of int can be cast to void * and back. */ +/** Assert that a can be cast to void * and back. */ +static void +assert_int_voidptr_roundtrip(int a) +{ + intptr_t ap = (intptr_t)a; + void *b = (void *)ap; + intptr_t c = (intptr_t)b; + void *d = (void *)c; + + tt_assert(ap == c); + tt_assert(b == d); + + done: + return; +} + static void test_int_voidstar_interop(void *arg) { int a; (void)arg; - for (a = INT_MIN; a < INT_MAX; a++) { - intptr_t ap = (intptr_t)a; - void *b = (void *)ap; - intptr_t c = (intptr_t)b; - void *d = (void *)c; - - tt_assert(ap == c); - tt_assert(b == d); + for (a = 0; a <= 1024; a++) { + assert_int_voidptr_roundtrip(a); } + for (a = INT_MAX-1024; a < INT_MAX; a++) { + assert_int_voidptr_roundtrip(a); + } +} + +static void +assert_uint_voidptr_roundtrip(unsigned int a) +{ + intptr_t ap = (intptr_t)a; + void *b = (void *)ap; + intptr_t c = (intptr_t)b; + void *d = (void *)c; + + tt_assert(ap == c); + tt_assert(b == d); + done: return; } -/** Check that all values of unsigned int can be cast to void * and back. */ static void test_uint_voidstar_interop(void *arg) { unsigned int a; (void)arg; - for (a = 0; a < UINT_MAX; a++) { - intptr_t ap = (intptr_t)a; - void *b = (void *)ap; - intptr_t c = (intptr_t)b; - void *d = (void *)c; - - tt_assert(ap == c); - tt_assert(b == d); + for (a = 0; a <= 1024; a++) { + assert_uint_voidptr_roundtrip(a); } - done: - return; + for (a = UINT_MAX-1024; a < UINT_MAX; a++) { + assert_uint_voidptr_roundtrip(a); + } } struct testcase_t slow_ptr_tests[] = {