doylet/intc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intc: Revert incorrect hi/lo intc_u128_init_cstring bug-fix

Browse Source
This commit is contained in:
doyle 2022-12-18 16:57:59 +11:00
parent 7495153d9e
commit 8b6c8d80df
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intc.h
View File

@ -684,7 +684,7 @@ INTC_API bool INTC_API_PREFIX(128_init_cstring)(char const *string, int size, st
if (bits4 == 0xFF) if (bits4 == 0xFF)
return false; return false;
intc_u64 *word = (bits_written >= (int)(sizeof(dest->lo) * 8)) ? &dest->hi : &dest->lo; intc_u64 *word = (bits_written >= (int)(sizeof(dest->lo) * 8)) ? &dest->lo : &dest->hi;
*word = (*word << 4) | bits4; *word = (*word << 4) | bits4;
} }
@ -1357,7 +1357,7 @@ INTC_API bool INTC_API_PREFIX(256_init_cstring)(char const *string, int size, st
int half_buffer_size = sizeof(buffer) / 2; int half_buffer_size = sizeof(buffer) / 2;
bool result = INTC_API_PREFIX(128_init_cstring)(buffer, half_buffer_size, &dest->hi); bool result = INTC_API_PREFIX(128_init_cstring)(buffer, half_buffer_size, &dest->hi);
result |= INTC_API_PREFIX(128_init_cstring)(buffer + half_buffer_size, half_buffer_size, &dest->lo); result |= INTC_API_PREFIX(128_init_cstring)(buffer + half_buffer_size, half_buffer_size, &dest->lo);
return result; return result;
} }

40
intc_tests.c
View File

@ -516,17 +516,17 @@ struct intc_test_state intc_u128_unit_tests(void)
printf("\n functions.cpp\n"); printf("\n functions.cpp\n");
{ {
{ {
INTC_TESTS_BEGIN("Function.str"); INTC_TESTS_BEGIN("Function.data");
// make sure all of the test strings create the ASCII version of the string // make sure all of the test strings create the ASCII version of the string
struct intc_u128 const original = INTC_U64_TO_U128(2216002924); struct intc_u128 const original = INTC_U64_TO_U128(2216002924);
for (int test_index = 0; test_index < (int)(sizeof(INTC_TESTS_STRING_BASE_TESTS)/sizeof(INTC_TESTS_STRING_BASE_TESTS[0])); test_index++) for (int test_index = 0; test_index < (int)(sizeof(INTC_TESTS_STRING_BASE_TESTS)/sizeof(INTC_TESTS_STRING_BASE_TESTS[0])); test_index++)
{ {
struct intc_base_to_string const *test_entry = INTC_TESTS_STRING_BASE_TESTS + test_index; struct intc_base_to_string const *test_entry = INTC_TESTS_STRING_BASE_TESTS + test_index;
struct intc_u128_string output = intc_u128_str(original, test_entry->base, 0 /*separate_every_n_chars*/, ' ' /*separate_ch*/); struct intc_u128_string output = intc_u128_str(original, test_entry->base, 0 /*separate_every_n_chars*/, ' ' /*separate_ch*/);
INTC_TESTS_ASSERT_MSG(strcmp(output.str, test_entry->expect) == 0, INTC_TESTS_ASSERT_MSG(strcmp(output.data, test_entry->expect) == 0,
"output: %s\n" "output: %s\n"
"expect: %s\n", "expect: %s\n",
output.str, output.data,
test_entry->expect); test_entry->expect);
} }
INTC_TESTS_END; INTC_TESTS_END;
@ -1205,29 +1205,29 @@ struct intc_test_state intc_u256_unit_tests(void)
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(INTC_U256_MAX).str); intc_u256_readable_hex_str(INTC_U256_MAX).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", -1 /*size*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", -1 /*size*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(INTC_U256_MAX).str); intc_u256_readable_hex_str(INTC_U256_MAX).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0", -1 /*size*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0", -1 /*size*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_ZERO), "val: %s\n", intc_u256_readable_hex_str(val).str); INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_ZERO), "val: %s\n", intc_u256_readable_hex_str(val).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0", -1 /*size*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0", -1 /*size*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_ZERO), "val: %s\n", intc_u256_readable_hex_str(val).str); INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_ZERO), "val: %s\n", intc_u256_readable_hex_str(val).data);
struct intc_u256 expect = INTC_U64_TO_U256(0x0123456789abcdefULL); struct intc_u256 expect = INTC_U64_TO_U256(0x0123456789abcdefULL);
INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0123456789abcdef", -1 /*size*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring("0x0123456789abcdef", -1 /*size*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, expect), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, expect),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(expect).str); intc_u256_readable_hex_str(expect).data);
INTC_TESTS_END; INTC_TESTS_END;
} }
@ -1238,22 +1238,22 @@ struct intc_test_state intc_u256_unit_tests(void)
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(INTC_U256_MAX).str); intc_u256_readable_hex_str(INTC_U256_MAX).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring_base("115792089237316195423570985008687907853269984665640564039457584007913129639935", -1 /*size*/, 10 /*base*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring_base("115792089237316195423570985008687907853269984665640564039457584007913129639935", -1 /*size*/, 10 /*base*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(INTC_U256_MAX).str); intc_u256_readable_hex_str(INTC_U256_MAX).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring_base("1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", -1 /*size*/, 2 /*base*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring_base("1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", -1 /*size*/, 2 /*base*/, &val));
INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX), INTC_TESTS_ASSERT_MSG(intc_u256_eq(val, INTC_U256_MAX),
"val: %s\n" "val: %s\n"
"expect: %s\n", "expect: %s\n",
intc_u256_readable_hex_str(val).str, intc_u256_readable_hex_str(val).data,
intc_u256_readable_hex_str(INTC_U256_MAX).str); intc_u256_readable_hex_str(INTC_U256_MAX).data);
INTC_TESTS_ASSERT(intc_u256_init_cstring_base("0", -1 /*size*/, 10 /*base*/, &val)); INTC_TESTS_ASSERT(intc_u256_init_cstring_base("0", -1 /*size*/, 10 /*base*/, &val));
INTC_TESTS_ASSERT(intc_u256_eq(val, INTC_U256_ZERO)); INTC_TESTS_ASSERT(intc_u256_eq(val, INTC_U256_ZERO));
@ -1383,17 +1383,17 @@ struct intc_test_state intc_u256_unit_tests(void)
printf("\n functions.cpp\n"); printf("\n functions.cpp\n");
{ {
{ {
INTC_TESTS_BEGIN("Function.str"); INTC_TESTS_BEGIN("Function.data");
// make sure all of the test strings create the ASCII version of the string // make sure all of the test strings create the ASCII version of the string
struct intc_u256 const original = INTC_U64_TO_U256(2216002924); struct intc_u256 const original = INTC_U64_TO_U256(2216002924);
for (int test_index = 0; test_index < (int)(sizeof(INTC_TESTS_STRING_BASE_TESTS)/sizeof(INTC_TESTS_STRING_BASE_TESTS[0])); test_index++) for (int test_index = 0; test_index < (int)(sizeof(INTC_TESTS_STRING_BASE_TESTS)/sizeof(INTC_TESTS_STRING_BASE_TESTS[0])); test_index++)
{ {
struct intc_base_to_string const *test_entry = INTC_TESTS_STRING_BASE_TESTS + test_index; struct intc_base_to_string const *test_entry = INTC_TESTS_STRING_BASE_TESTS + test_index;
struct intc_u256_string output = intc_u256_str(original, test_entry->base, 0 /*separate_every_n_chars*/, ' ' /*separate_ch*/); struct intc_u256_string output = intc_u256_str(original, test_entry->base, 0 /*separate_every_n_chars*/, ' ' /*separate_ch*/);
INTC_TESTS_ASSERT_MSG(strcmp(output.str, test_entry->expect) == 0, INTC_TESTS_ASSERT_MSG(strcmp(output.data, test_entry->expect) == 0,
"output: %s\n" "output: %s\n"
"expect: %s\n", "expect: %s\n",
output.str, output.data,
test_entry->expect); test_entry->expect);
} }
INTC_TESTS_END; INTC_TESTS_END;