Commit d4338b9a authored by Albert Gräf's avatar Albert Gräf
Browse files

Backport rev. 5e9124e9.

parent dc2bff82
......@@ -245,13 +245,13 @@ static void andand_tilde_dsp(t_andand_tilde *UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(andand_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(andand_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(andand_tilde_perform, 4, in1, in2, out, n);
dsp_add(andand_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(andand_tilde_perf8, 4, in1, in2, out, n);
dsp_add(andand_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -268,13 +268,13 @@ static void scalarandand_tilde_dsp(t_scalarandand_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalarandand_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalarandand_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalarandand_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalarandand_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......
......@@ -202,13 +202,13 @@ static void lt_tilde_dsp(t_lt_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(lt_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if(n&7) {
dsp_add(lt_tilde_perform, 4, in1, in2, out, n);
dsp_add(lt_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(lt_tilde_perf8, 4, in1, in2, out, n);
dsp_add(lt_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -225,13 +225,13 @@ static void scalarlt_tilde_dsp(t_scalarlt_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
static void lt_tilde_help(t_object* UNUSED(x))
......
......@@ -201,13 +201,13 @@ static void eq_tilde_dsp(t_eq_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(eq_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(eq_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(eq_tilde_perform, 4, in1, in2, out, n);
dsp_add(eq_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(eq_tilde_perf8, 4, in1, in2, out, n);
dsp_add(eq_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -224,13 +224,13 @@ static void scalareq_tilde_dsp(t_scalareq_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out) &&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalareq_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalareq_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalareq_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalareq_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......
......@@ -204,13 +204,13 @@ static void gt_tilde_dsp(t_gt_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(gt_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(gt_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(gt_tilde_perform, 4, in1, in2, out, n);
dsp_add(gt_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(gt_tilde_perf8, 4, in1, in2, out, n);
dsp_add(gt_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -227,13 +227,13 @@ static void scalargt_tilde_dsp(t_scalargt_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalargt_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalargt_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalargt_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalargt_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......
......@@ -219,13 +219,13 @@ static void oror_tilde_dsp(t_oror_tilde* UNUSED(x), t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(oror_tilde_performSSE, 4, in1, in2, out, n);
dsp_add(oror_tilde_performSSE, 4, in1, in2, out, (t_int)n);
} else
#endif
if(n&7) {
dsp_add(oror_tilde_perform, 4, in1, in2, out, n);
dsp_add(oror_tilde_perform, 4, in1, in2, out, (t_int)n);
} else {
dsp_add(oror_tilde_perf8, 4, in1, in2, out, n);
dsp_add(oror_tilde_perf8, 4, in1, in2, out, (t_int)n);
}
}
......@@ -242,13 +242,13 @@ static void scalaroror_tilde_dsp(t_scalaroror_tilde *x, t_signal **sp)
Z_SIMD_CHKALIGN(out)&&
ZEXY_TYPE_EQUAL(t_sample, float)
) {
dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, (t_int)n);
} else
#endif
if (n&7) {
dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_perform, 4, in, &x->x_g, out, (t_int)n);
} else {
dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, n);
dsp_add(scalaroror_tilde_perf8, 4, in, &x->x_g, out, (t_int)n);
}
}
......
......@@ -106,12 +106,12 @@ static void sigABSGN_dsp(t_absgn* UNUSED(x), t_signal **sp)
zexy_testSSE(sigABSGN_perform, sigABSGN_performSSE, 1, 2)
) {
dsp_add(sigABSGN_performSSE, 4, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
} else
#endif
{
dsp_add(sigABSGN_perform, 4, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
}
}
......
......@@ -128,11 +128,11 @@ static void sigABS_dsp(t_abs * UNUSED(x), t_signal **sp)
sigABS_performSSE,
1, 1)
) {
dsp_add(sigABS_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(sigABS_performSSE, 3, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
} else
#endif
{
dsp_add(sigABS_perform, 3, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(sigABS_perform, 3, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
}
......
......@@ -55,7 +55,7 @@ static t_int *avg_perform(t_int *w)
static void avg_dsp(t_avg *x, t_signal **sp)
{
x->n_inv=1./sp[0]->s_n;
dsp_add(avg_perform, 3, sp[0]->s_vec, x, sp[0]->s_n);
dsp_add(avg_perform, 3, sp[0]->s_vec, x, (t_int)sp[0]->s_n);
}
static void *avg_new(void)
......
......@@ -78,7 +78,7 @@ static void blockmirror_dsp(t_blockmirror *x, t_signal **sp)
x->blocksize = sp[0]->s_n;
x->blockbuffer = getbytes(sizeof(*x->blockbuffer)*x->blocksize);
}
dsp_add(blockmirror_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(blockmirror_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
static void blockmirror_helper(t_blockmirror* UNUSED(x))
......
......@@ -116,7 +116,7 @@ static void blockshuffle_dsp(t_blockshuffle *x, t_signal **sp)
blockshuffle_buildindex(x, sp[0]->s_n);
dsp_add(blockshuffle_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec,
sp[0]->s_n);
(t_int)sp[0]->s_n);
}
static void blockshuffle_helper(t_blockshuffle* UNUSED(x))
......
......@@ -76,7 +76,7 @@ static void blockswap_dsp(t_blockswap *x, t_signal **sp)
x->blocksize = sp[0]->s_n/2;
x->blockbuffer = getbytes(sizeof(*x->blockbuffer)*x->blocksize);
}
dsp_add(blockswap_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
dsp_add(blockswap_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n);
}
static void blockswap_helper(t_blockswap* UNUSED(x))
......
......@@ -73,7 +73,7 @@ static void demux_dsp(t_demux *x, t_signal **sp)
while(n--) {
*dummy++=sp[x->n_out-n]->s_vec;
}
dsp_add(demux_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(demux_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
......
......@@ -82,7 +82,7 @@ static t_int *dfreq_perform(t_int *w)
static void dfreq_dsp(t_dfreq *x, t_signal **sp)
{
dsp_add(dfreq_perform, 4, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n,x);
dsp_add(dfreq_perform, 4, sp[0]->s_vec, sp[1]->s_vec, (t_int)sp[0]->s_n,x);
}
......
......@@ -110,9 +110,9 @@ static t_int *dirac_perf8(t_int *w)
static void dirac_dsp(t_dirac *x, t_signal **sp)
{
if (sp[0]->s_n & 7) {
dsp_add(dirac_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(dirac_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
} else {
dsp_add(dirac_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(dirac_perf8, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
}
......
......@@ -105,7 +105,7 @@ static void sigdoublepole_dsp(t_sigdoublepole *x, t_signal **sp)
{
dsp_add(sigdoublepole_perform, 4,
sp[0]->s_vec, sp[1]->s_vec,
x->x_ctl, sp[0]->s_n);
x->x_ctl, (t_int)sp[0]->s_n);
}
......
......@@ -126,7 +126,7 @@ static void sigenvrms_dsp(t_sigenvrms *x, t_signal **sp)
else {
x->x_realperiod = x->x_period;
}
dsp_add(sigenvrms_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(sigenvrms_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
if (sp[0]->s_n > MAXVSTAKEN) {
bug("sigenvrms_dsp");
}
......
......@@ -211,7 +211,7 @@ static void mline_dsp(t_mline *x, t_signal **sp)
}
x->msec2tick = sp[0]->s_sr / (1000.f * sp[0]->s_n);
dsp_add(mline_perform, 2, x, sp[0]->s_n);
dsp_add(mline_perform, 2, x, (t_int)sp[0]->s_n);
}
......
......@@ -64,7 +64,7 @@ static void mux_tilde_dsp(t_mux *x, t_signal **sp)
*dummy++=sp[n]->s_vec;
}
dsp_add(mux_tilde_perform, 3, x, sp[n]->s_vec, sp[0]->s_n);
dsp_add(mux_tilde_perform, 3, x, sp[n]->s_vec, (t_int)sp[0]->s_n);
}
static void mux_tilde_helper(void)
......
......@@ -141,7 +141,7 @@ static t_int *noish_perform(t_int *w)
static void noish_dsp(t_nois *x, t_signal **sp)
{
dsp_add(noish_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(noish_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
static void noish_helper(void)
......
......@@ -144,7 +144,7 @@ static t_int *noisi_perform(t_int *w)
static void noisi_dsp(t_nois *x, t_signal **sp)
{
dsp_add(noisi_perform, 3, x, sp[0]->s_vec, sp[0]->s_n);
dsp_add(noisi_perform, 3, x, sp[0]->s_vec, (t_int)sp[0]->s_n);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment