From 0675eb8c07c440a4d3811ddc95001cc129a9dc17 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 16 May 2019 16:58:48 -0400 Subject: [PATCH] Extend test_bitfield coverage MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit test_bitfield was mainly testing various write unit size. Add variations of read unit size as well. Previously, the test was only covering input from a 32-bit integer. Additionally test source and destination of 64-bit. Signed-off-by: Mathieu Desnoyers Change-Id: Ic2b7849140e04fe7cca3de576e31bfef8f0a03ae Signed-off-by: Jérémie Galarneau Reviewed-on: https://review.lttng.org/c/babeltrace/+/1305 Tested-by: jenkins --- tests/lib/test_bitfield.c | 526 +++++++++++++++++++++++++++++++------- 1 file changed, 435 insertions(+), 91 deletions(-) diff --git a/tests/lib/test_bitfield.c b/tests/lib/test_bitfield.c index efbbc30e..5ba566f6 100644 --- a/tests/lib/test_bitfield.c +++ b/tests/lib/test_bitfield.c @@ -3,7 +3,7 @@ * * BabelTrace - bitfield test program * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2019 - Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,39 +40,56 @@ void fct(void) /* Test array size, in bytes */ #define TEST_LEN 128 #define NR_TESTS 10 -#define SIGNED_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed" -#define UNSIGNED_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned" +#define SIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int dest, varying read unit size" +#define SIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, signed int source, varying write unit size" +#define SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long dest, varying read unit size" +#define SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, signed long long source, varying write unit size" +#define UNSIGNED_INT_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int dest, varying read unit size" +#define UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int source, varying write unit size" +#define UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long dest, varying read unit size" +#define UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long source, varying write unit size" #define DIAG_FMT_STR "Failed reading value written \"%s\"-wise, with start=%i" \ " and length=%i. Read %llX" -unsigned int srcrand; - -#if defined(__i386) || defined(__x86_64) - -static inline int fls(int x) +static +unsigned int fls_u64(uint64_t x) { - int r; - asm("bsrl %1,%0\n\t" - "cmovzl %2,%0" - : "=&r" (r) : "rm" (x), "rm" (-1)); - return r + 1; -} + unsigned int r = 64; -#elif defined(__PPC__) - -static __inline__ int fls(unsigned int x) -{ - int lz; + if (!x) + return 0; - asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x)); - return 32 - lz; + if (!(x & 0xFFFFFFFF00000000ULL)) { + x <<= 32; + r -= 32; + } + if (!(x & 0xFFFF000000000000ULL)) { + x <<= 16; + r -= 16; + } + if (!(x & 0xFF00000000000000ULL)) { + x <<= 8; + r -= 8; + } + if (!(x & 0xF000000000000000ULL)) { + x <<= 4; + r -= 4; + } + if (!(x & 0xC000000000000000ULL)) { + x <<= 2; + r -= 2; + } + if (!(x & 0x8000000000000000ULL)) { + x <<= 1; + r -= 1; + } + return r; } -#else - -static int fls(unsigned int x) +static +unsigned int fls_u32(uint32_t x) { - int r = 32; + unsigned int r = 32; if (!x) return 0; @@ -99,8 +116,6 @@ static int fls(unsigned int x) return r; } -#endif - #define print_byte_array(c, len) \ do { \ unsigned long i; \ @@ -122,7 +137,7 @@ do { \ } while (0) #define check_result(ref, val, buffer, typename, start, len, \ - desc_fmt_str) \ + desc_fmt_str) \ ({ \ if ((val) != (ref)) { \ fail(desc_fmt_str, ref); \ @@ -133,9 +148,9 @@ do { \ (val) != (ref); \ }) -void run_test_unsigned(void) +void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) { - unsigned int src, nrbits; + unsigned int nrbits_ui, nrbits_ull; union { unsigned char c[TEST_LEN]; unsigned short s[TEST_LEN/sizeof(unsigned short)]; @@ -146,59 +161,222 @@ void run_test_unsigned(void) unsigned long long readval; unsigned int s, l; - src = srcrand; - nrbits = fls(src); + nrbits_ui = fls_u32(src_ui); + /* Write from unsigned integer src input. */ for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { - for (l = nrbits; l < (CHAR_BIT * TEST_LEN) - s; l++) { + for (l = nrbits_ui; l < (CHAR_BIT * TEST_LEN) - s; l++) { init_byte_array(target.c, TEST_LEN, 0xFF); - bt_bitfield_write(target.c, unsigned char, s, l, src); + bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); - if (check_result(src, readval, target.c, unsigned char, - s, l, UNSIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_ui, readval, target.c, unsigned char, + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0xFF); - bt_bitfield_write(target.s, unsigned short, s, l, src); + bt_bitfield_write(target.s, unsigned short, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); - if (check_result(src, readval, target.c, unsigned short, - s, l, UNSIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_ui, readval, target.c, unsigned short, + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0xFF); - bt_bitfield_write(target.i, unsigned int, s, l, src); + bt_bitfield_write(target.i, unsigned int, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); - if (check_result(src, readval, target.c, unsigned int, - s, l, UNSIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_ui, readval, target.c, unsigned int, + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0xFF); - bt_bitfield_write(target.l, unsigned long, s, l, src); + bt_bitfield_write(target.l, unsigned long, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); - if (check_result(src, readval, target.c, unsigned long, - s, l, UNSIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_ui, readval, target.c, unsigned long, + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0xFF); - bt_bitfield_write(target.ll, unsigned long long, s, l, src); + bt_bitfield_write(target.ll, unsigned long long, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); - if (check_result(src, readval, target.c, unsigned long long, - s, l, UNSIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_ui, readval, target.c, unsigned long long, + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } } } + pass(UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_ui); + + nrbits_ull = fls_u64(src_ull); + + /* Write from unsigned long long src input. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_ull; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.c, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval); + if (check_result(src_ull, readval, target.c, unsigned char, + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } - pass(UNSIGNED_TEST_DESC_FMT_STR, src); + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.s, unsigned short, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval); + if (check_result(src_ull, readval, target.c, unsigned short, + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.i, unsigned int, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval); + if (check_result(src_ull, readval, target.c, unsigned int, + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.l, unsigned long, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval); + if (check_result(src_ull, readval, target.c, unsigned long, + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.ll, unsigned long long, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval); + if (check_result(src_ull, readval, target.c, unsigned long long, + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ull); } -void run_test_signed(void) +void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) { - int src, nrbits; + unsigned int nrbits_ui, nrbits_ull, readval_ui; + union { + unsigned char c[TEST_LEN]; + unsigned short s[TEST_LEN/sizeof(unsigned short)]; + unsigned int i[TEST_LEN/sizeof(unsigned int)]; + unsigned long l[TEST_LEN/sizeof(unsigned long)]; + unsigned long long ll[TEST_LEN/sizeof(unsigned long long)]; + } target; + unsigned long long readval_ull; + unsigned int s, l; + + nrbits_ui = fls_u32(src_ui); + + /* Read to unsigned integer readval output. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_ui; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.c, unsigned char, s, l, src_ui); + bt_bitfield_read(target.c, unsigned char, s, l, &readval_ui); + if (check_result(src_ui, readval_ui, target.c, unsigned char, + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.s, unsigned char, s, l, src_ui); + bt_bitfield_read(target.c, unsigned short, s, l, &readval_ui); + if (check_result(src_ui, readval_ui, target.c, unsigned short, + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.i, unsigned char, s, l, src_ui); + bt_bitfield_read(target.c, unsigned int, s, l, &readval_ui); + if (check_result(src_ui, readval_ui, target.c, unsigned int, + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.l, unsigned char, s, l, src_ui); + bt_bitfield_read(target.c, unsigned long, s, l, &readval_ui); + if (check_result(src_ui, readval_ui, target.c, unsigned long, + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.ll, unsigned char, s, l, src_ui); + bt_bitfield_read(target.c, unsigned long long, s, l, &readval_ui); + if (check_result(src_ui, readval_ui, target.c, unsigned long long, + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(UNSIGNED_INT_READ_TEST_DESC_FMT_STR, src_ui); + + nrbits_ull = fls_u64(src_ull); + + /* Read to unsigned long long readval output. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_ull; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.c, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned char, s, l, &readval_ull); + if (check_result(src_ull, readval_ull, target.c, unsigned char, + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.s, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned short, s, l, &readval_ull); + if (check_result(src_ull, readval_ull, target.c, unsigned short, + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.i, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned int, s, l, &readval_ull); + if (check_result(src_ull, readval_ull, target.c, unsigned int, + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.l, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned long, s, l, &readval_ull); + if (check_result(src_ull, readval_ull, target.c, unsigned long, + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.ll, unsigned char, s, l, src_ull); + bt_bitfield_read(target.c, unsigned long long, s, l, &readval_ull); + if (check_result(src_ull, readval_ull, target.c, unsigned long long, + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ull); +} + +void run_test_unsigned(unsigned int src_ui, unsigned long long src_ull) +{ + run_test_unsigned_write(src_ui, src_ull); + run_test_unsigned_read(src_ui, src_ull); +} + +void run_test_signed_write(int src_i, long long src_ll) +{ + int nrbits_i, nrbits_ll; union { signed char c[TEST_LEN]; short s[TEST_LEN/sizeof(short)]; @@ -209,87 +387,253 @@ void run_test_signed(void) long long readval; unsigned int s, l; - src = srcrand; - if (src & 0x80000000U) - nrbits = fls(~src) + 1; /* Find least significant bit conveying sign */ + if (src_i & 0x80000000U) + nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */ else - nrbits = fls(src) + 1; /* Keep sign at 0 */ + nrbits_i = fls_u32(src_i) + 1; /* Keep sign at 0 */ + /* Write from signed integer src input. */ for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { - for (l = nrbits; l < (CHAR_BIT * TEST_LEN) - s; l++) { + for (l = nrbits_i; l < (CHAR_BIT * TEST_LEN) - s; l++) { init_byte_array(target.c, TEST_LEN, 0x0); - bt_bitfield_write(target.c, signed char, s, l, src); + bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); - if (check_result(src, readval, target.c, signed char, - s, l, SIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_i, readval, target.c, signed char, + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0x0); - bt_bitfield_write(target.s, short, s, l, src); + bt_bitfield_write(target.s, short, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); - if (check_result(src, readval, target.c, short, - s, l, SIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_i, readval, target.c, short, + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0x0); - bt_bitfield_write(target.i, int, s, l, src); + bt_bitfield_write(target.i, int, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); - if (check_result(src, readval, target.c, int, - s, l, SIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_i, readval, target.c, int, + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0x0); - bt_bitfield_write(target.l, long, s, l, src); + bt_bitfield_write(target.l, long, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); - if (check_result(src, readval, target.c, long, - s, l, SIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_i, readval, target.c, long, + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } init_byte_array(target.c, TEST_LEN, 0x0); - bt_bitfield_write(target.ll, long long, s, l, src); + bt_bitfield_write(target.ll, long long, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); - if (check_result(src, readval, target.c, long long, - s, l, SIGNED_TEST_DESC_FMT_STR)) { + if (check_result(src_i, readval, target.c, long long, + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { return; } } } + pass(SIGNED_INT_WRITE_TEST_DESC_FMT_STR, src_i); + + if (src_ll & 0x8000000000000000ULL) + nrbits_ll = fls_u64(~src_ll) + 1; /* Find least significant bit conveying sign */ + else + nrbits_ll = fls_u64(src_ll) + 1; /* Keep sign at 0 */ + + /* Write from signed long long src input. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_ll; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0x0); + bt_bitfield_write(target.c, signed char, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval); + if (check_result(src_ll, readval, target.c, signed char, + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0x0); + bt_bitfield_write(target.s, short, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval); + if (check_result(src_ll, readval, target.c, short, + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0x0); + bt_bitfield_write(target.i, int, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval); + if (check_result(src_ll, readval, target.c, int, + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } - pass(SIGNED_TEST_DESC_FMT_STR, src); + init_byte_array(target.c, TEST_LEN, 0x0); + bt_bitfield_write(target.l, long, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval); + if (check_result(src_ll, readval, target.c, long, + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0x0); + bt_bitfield_write(target.ll, long long, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval); + if (check_result(src_ll, readval, target.c, long long, + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ll); } -void run_test(void) +void run_test_signed_read(int src_i, long long src_ll) { - int i; - plan_tests(NR_TESTS * 2 + 6); + int nrbits_i, nrbits_ll, readval_i; + union { + unsigned char c[TEST_LEN]; + unsigned short s[TEST_LEN/sizeof(unsigned short)]; + unsigned int i[TEST_LEN/sizeof(unsigned int)]; + unsigned long l[TEST_LEN/sizeof(unsigned long)]; + unsigned long long ll[TEST_LEN/sizeof(unsigned long long)]; + } target; + long long readval_ll; + unsigned int s, l; - srand(time(NULL)); + if (src_i & 0x80000000U) + nrbits_i = fls_u32(~src_i) + 1; /* Find least significant bit conveying sign */ + else + nrbits_i = fls_u32(src_i) + 1; /* Keep sign at 0 */ - srcrand = 0; - run_test_unsigned(); - srcrand = 0; - run_test_signed(); + /* Read to signed integer readval output. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_i; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.c, signed char, s, l, src_i); + bt_bitfield_read(target.c, signed char, s, l, &readval_i); + if (check_result(src_i, readval_i, target.c, signed char, + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } - srcrand = 1; - run_test_unsigned(); + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.s, signed char, s, l, src_i); + bt_bitfield_read(target.c, short, s, l, &readval_i); + if (check_result(src_i, readval_i, target.c, short, + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } - srcrand = ~0U; - run_test_unsigned(); + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.i, signed char, s, l, src_i); + bt_bitfield_read(target.c, int, s, l, &readval_i); + if (check_result(src_i, readval_i, target.c, int, + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } - srcrand = -1; - run_test_signed(); + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.l, signed char, s, l, src_i); + bt_bitfield_read(target.c, long, s, l, &readval_i); + if (check_result(src_i, readval_i, target.c, long, + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } - srcrand = (int)0x80000000U; - run_test_signed(); + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.ll, signed char, s, l, src_i); + bt_bitfield_read(target.c, long long, s, l, &readval_i); + if (check_result(src_i, readval_i, target.c, long long, + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(SIGNED_INT_READ_TEST_DESC_FMT_STR, src_i); + + if (src_ll & 0x8000000000000000ULL) + nrbits_ll = fls_u64(~src_ll) + 1; /* Find least significant bit conveying sign */ + else + nrbits_ll = fls_u64(src_ll) + 1; /* Keep sign at 0 */ + + /* Read to signed long long readval output. */ + for (s = 0; s < CHAR_BIT * TEST_LEN; s++) { + for (l = nrbits_ll; l < (CHAR_BIT * TEST_LEN) - s; l++) { + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.c, signed char, s, l, src_ll); + bt_bitfield_read(target.c, signed char, s, l, &readval_ll); + if (check_result(src_ll, readval_ll, target.c, signed char, + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.s, signed char, s, l, src_ll); + bt_bitfield_read(target.c, short, s, l, &readval_ll); + if (check_result(src_ll, readval_ll, target.c, short, + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.i, signed char, s, l, src_ll); + bt_bitfield_read(target.c, int, s, l, &readval_ll); + if (check_result(src_ll, readval_ll, target.c, int, + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.l, signed char, s, l, src_ll); + bt_bitfield_read(target.c, long, s, l, &readval_ll); + if (check_result(src_ll, readval_ll, target.c, long, + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + + init_byte_array(target.c, TEST_LEN, 0xFF); + bt_bitfield_write(target.ll, signed char, s, l, src_ll); + bt_bitfield_read(target.c, long long, s, l, &readval_ll); + if (check_result(src_ll, readval_ll, target.c, long long, + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + return; + } + } + } + pass(SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ll); +} + +void run_test_signed(int src_i, long long src_ll) +{ + run_test_signed_write(src_i, src_ll); + run_test_signed_read(src_i, src_ll); +} + +void run_test(void) +{ + int i; + + plan_tests(NR_TESTS * 8 + 24); + + srand(time(NULL)); + + run_test_unsigned(0, 0); + run_test_signed(0, 0); + run_test_unsigned(1, 1); + run_test_unsigned(~0U, ~0ULL); + run_test_signed(-1U, -1ULL); + run_test_signed(0x80000000U, 0x8000000000000000ULL); for (i = 0; i < NR_TESTS; i++) { - srcrand = rand(); - run_test_unsigned(); - run_test_signed(); + unsigned int src_ui = rand(); + unsigned long long src_ull = ((unsigned long long) (unsigned int) rand() << 32) | + (unsigned long long) (unsigned int) rand(); + + run_test_unsigned(src_ui, src_ull); + run_test_signed((int) src_ui, (long long) src_ull); } } -- 2.34.1