* the feedforward step.
*/
-CPU_DISPATCH(static, (void),
- void, core, (unsigned r, const salsa20_matrix src,
- salsa20_matrix dest),
- (r, src, dest),
- pick_core, simple_core);
+CPU_DISPATCH(static, (void), void, core,
+ (unsigned r, const salsa20_matrix src, salsa20_matrix dest),
+ (r, src, dest), pick_core, simple_core);
static void simple_core(unsigned r, const salsa20_matrix src,
salsa20_matrix dest)
grand *SALSA20_DECOR(salsa20, rr, _rand) \
(const void *k, size_t ksz, const void *n) \
{ \
- grctx *g = S_CREATE(g); \
+ grctx *g = S_CREATE(grctx); \
g->r.r.ops = &grops_rand_##rr; \
g->r.ops = &grops_##rr; \
salsa20_init(&g->ctx, k, ksz, n); \
grand *SALSA20_DECOR(xsalsa20, rr, _rand) \
(const void *k, size_t ksz, const void *n) \
{ \
- grxctx_##rr *g = S_CREATE(g); \
+ grxctx_##rr *g = S_CREATE(grxctx_##rr); \
g->r.r.ops = &grxops_rand_##rr; \
g->r.ops = &grxops_##rr; \
XSALSA20_INIT(rr, &g->ctx, k, ksz, n); \