key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / math / mpx-mul4-test.c

diff --git a/math/mpx-mul4-test.c b/math/mpx-mul4-test.c
index 883c4fc..414974b 100644 (file)
--- a/math/mpx-mul4-test.c
+++ b/math/mpx-mul4-test.c
@@ -80,7 +80,9 @@ typedef struct { mpd w[6]; } carry;
   _(dmul4, NIL,  CARRY, P128, P128, P128, P128, P128, NIL,  CARRY)     \
   _(dmla4, P128, CARRY, P128, P128, P128, P128, P128, NIL,  CARRY)     \
   _(mul4,  NIL,         CARRY, NIL,  P128, NIL,  P128, P128, NIL,  CARRY)      \
+  _(mul4zc,NIL,         NIL,   NIL,  P128, NIL,  P128, P128, NIL,  CARRY)      \
   _(mla4,  P128, CARRY, NIL,  P128, NIL,  P128, P128, NIL,  CARRY)     \
+  _(mla4zc,P128, NIL,  NIL,  P128, NIL,  P128, P128, NIL,  CARRY)      \
   _(mmul4, NIL,         NIL,   P128, P128, P128, P128, P128, X128, CARRY)      \
   _(mmla4, P128, NIL,  P128, P128, P128, P128, P128, X128, CARRY)      \
   _(mont4, P128, NIL,  NIL,  P128, NIL,  P128, P128, X128, CARRY)
@@ -116,7 +118,7 @@ TESTOPS(DECLSTUB)
                                                                        \
     type_hex.cvt(buf, &dd);                                            \
     if (dd.len != N(x->w)*nby) die(1, "invalid length for " #ty);      \
-    dstr_ensure(d, sizeof(*x));                                                \
+    dstr_ensure(d, sizeof(*x)); d->len = sizeof(*x);                   \
     x = (ty *)d->buf; p = (const octet *)dd.buf;                       \
     for (i = 0; i < N(x->w); i++) { x->w[i] = ld(p); p += nby; }       \
     dstr_destroy(&dd);                                                 \
@@ -284,7 +286,7 @@ int main(int argc, char *argv[])
   sub_init();
   if (!cpu_features_p())
     { fprintf(stderr, "required cpu feature not available\n"); exit(77); }
-  test_run(argc, argv, tests, SRCDIR "/t/mul4");
+  test_run(argc, argv, tests, SRCDIR "/t/mpx-mul4");
   return (0);
 }