X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/e63124bc579bfd97cfe2f620ddd84df9f20477d8..d056fbdff1c5a26be055c38eee4c273ee6a0cba7:/utils/t/bits-test.c?ds=sidebyside diff --git a/utils/t/bits-test.c b/utils/t/bits-test.c index c87fec5..4967fd6 100644 --- a/utils/t/bits-test.c +++ b/utils/t/bits-test.c @@ -72,32 +72,32 @@ TARITH(SUB) static const struct tvec_urange ur_eight = { 8, 8 }; static const struct tvec_urange ur_shift = { 0, 63 }; static const struct tvec_regdef shift_regs[] = { - { "x", RX, &tvty_bytes, 0, { &ur_eight } }, - { "n", RN, &tvty_uint, 0, { &ur_shift } }, - { "z", RZ, &tvty_bytes, 0, { &ur_eight } }, - { 0, 0, 0, 0 } + { "x", &tvty_bytes, RX, 0, { &ur_eight } }, + { "n", &tvty_uint, RN, 0, { &ur_shift } }, + { "z", &tvty_bytes, RZ, 0, { &ur_eight } }, + TVEC_ENDREGS }; static const struct tvec_regdef arith_regs[] = { - { "x", RX, &tvty_bytes, 0, { &ur_eight } }, - { "y", RY, &tvty_bytes, 0, { &ur_eight } }, - { "z", RZ, &tvty_bytes, 0, { &ur_eight } }, - { 0, 0, 0, 0 } + { "x", &tvty_bytes, RX, 0, { &ur_eight } }, + { "y", &tvty_bytes, RY, 0, { &ur_eight } }, + { "z", &tvty_bytes, RZ, 0, { &ur_eight } }, + TVEC_ENDREGS }; static const struct tvec_test tests[] = { - { "lsl64", shift_regs, 0, test_LSL }, - { "lsr64", shift_regs, 0, test_LSR }, - { "rol64", shift_regs, 0, test_ROL }, - { "ror64", shift_regs, 0, test_ROR }, - { "add64", arith_regs, 0, test_ADD }, - { "sub64", arith_regs, 0, test_SUB }, - { 0, 0, 0, 0 } + { "lsl64", shift_regs, 0, test_LSL }, + { "lsr64", shift_regs, 0, test_LSR }, + { "rol64", shift_regs, 0, test_ROL }, + { "ror64", shift_regs, 0, test_ROR }, + { "add64", arith_regs, 0, test_ADD }, + { "sub64", arith_regs, 0, test_SUB }, + TVEC_ENDTESTS }; -static const struct tvec_info testinfo = +static const struct tvec_config testconfig = { tests, NROUT, NREG, sizeof(struct tvec_reg) }; int main(int argc, char *argv[]) - { return (tvec_main(argc, argv, &testinfo, 0)); } + { return (tvec_main(argc, argv, &testconfig, 0)); } /*----- That's all, folks -------------------------------------------------*/