@@@ man wip

[mLib] / utils / t / bits-test.c

diff --git a/utils/t/bits-test.c b/utils/t/bits-test.c
index 743ad0e..4967fd6 100644 (file)
--- 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, tvec_runtest, test_LSL },
-  { "lsr64", shift_regs, 0, tvec_runtest, test_LSR },
-  { "rol64", shift_regs, 0, tvec_runtest, test_ROL },
-  { "ror64", shift_regs, 0, tvec_runtest, test_ROR },
-  { "add64", arith_regs, 0, tvec_runtest, test_ADD },
-  { "sub64", arith_regs, 0, tvec_runtest, test_SUB },
-  { 0, 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 -------------------------------------------------*/