[FFmpeg-cvslog] avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
ffmpeg | branch: release/2.4 | Michael Niedermayer michae...@gmx.at | Thu Feb 19 16:25:29 2015 +0100| [88c06ca25149f141c7e0f07616ccd0b3f1704c8f] | committer: Michael Niedermayer avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86() Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 - 4509 dezicycles Reviewed-by: Ramiro Polla ramiro.po...@gmail.com Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88c06ca25149f141c7e0f07616ccd0b3f1704c8f --- libavcodec/x86/mlpdsp.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index f090fd7..a6da229 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -132,8 +132,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, FIRMUL (ff_mlp_firorder_6, 0x14 ) FIRMUL (ff_mlp_firorder_5, 0x10 ) FIRMUL (ff_mlp_firorder_4, 0x0c ) -FIRMULREG(ff_mlp_firorder_3, 0x08,10) -FIRMULREG(ff_mlp_firorder_2, 0x04, 9) +FIRMUL (ff_mlp_firorder_3, 0x08 ) +FIRMUL (ff_mlp_firorder_2, 0x04 ) FIRMULREG(ff_mlp_firorder_1, 0x00, 8) LABEL_MANGLE(ff_mlp_firorder_0):\n\t jmp *%6 \n\t @@ -162,8 +162,6 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, : /* 4*/r((x86_reg)mask), /* 5*/r(firjump), /* 6*/r(iirjump) , /* 7*/c(filter_shift) , /* 8*/r((int64_t)coeff[0]) -, /* 9*/r((int64_t)coeff[1]) -, /*10*/r((int64_t)coeff[2]) : rax, rdx, rsi #else /* ARCH_X86_32 */ /* 3*/+m(blocksize) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
ffmpeg | branch: release/2.5 | Michael Niedermayer michae...@gmx.at | Thu Feb 19 16:25:29 2015 +0100| [cb1c9294f3c20622effb63593822ce3be3fc0436] | committer: Michael Niedermayer avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86() Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 - 4509 dezicycles Reviewed-by: Ramiro Polla ramiro.po...@gmail.com Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb1c9294f3c20622effb63593822ce3be3fc0436 --- libavcodec/x86/mlpdsp_init.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/mlpdsp_init.c b/libavcodec/x86/mlpdsp_init.c index dc0bc58..e9d9b1b 100644 --- a/libavcodec/x86/mlpdsp_init.c +++ b/libavcodec/x86/mlpdsp_init.c @@ -148,8 +148,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, FIRMUL (ff_mlp_firorder_6, 0x14 ) FIRMUL (ff_mlp_firorder_5, 0x10 ) FIRMUL (ff_mlp_firorder_4, 0x0c ) -FIRMULREG(ff_mlp_firorder_3, 0x08,10) -FIRMULREG(ff_mlp_firorder_2, 0x04, 9) +FIRMUL (ff_mlp_firorder_3, 0x08 ) +FIRMUL (ff_mlp_firorder_2, 0x04 ) FIRMULREG(ff_mlp_firorder_1, 0x00, 8) LABEL_MANGLE(ff_mlp_firorder_0):\n\t jmp *%6 \n\t @@ -178,8 +178,6 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, : /* 4*/r((x86_reg)mask), /* 5*/r(firjump), /* 6*/r(iirjump) , /* 7*/c(filter_shift) , /* 8*/r((int64_t)coeff[0]) -, /* 9*/r((int64_t)coeff[1]) -, /*10*/r((int64_t)coeff[2]) : rax, rdx, rsi #else /* ARCH_X86_32 */ /* 3*/+m(blocksize) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
ffmpeg | branch: release/2.2 | Michael Niedermayer michae...@gmx.at | Thu Feb 19 16:25:29 2015 +0100| [1a396d1ee0d6114af4397c6335877fb28f897d37] | committer: Michael Niedermayer avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86() Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 - 4509 dezicycles Reviewed-by: Ramiro Polla ramiro.po...@gmail.com Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a396d1ee0d6114af4397c6335877fb28f897d37 --- libavcodec/x86/mlpdsp.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 94849b7..a3ac207 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -132,8 +132,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, FIRMUL (ff_mlp_firorder_6, 0x14 ) FIRMUL (ff_mlp_firorder_5, 0x10 ) FIRMUL (ff_mlp_firorder_4, 0x0c ) -FIRMULREG(ff_mlp_firorder_3, 0x08,10) -FIRMULREG(ff_mlp_firorder_2, 0x04, 9) +FIRMUL (ff_mlp_firorder_3, 0x08 ) +FIRMUL (ff_mlp_firorder_2, 0x04 ) FIRMULREG(ff_mlp_firorder_1, 0x00, 8) LABEL_MANGLE(ff_mlp_firorder_0):\n\t jmp *%6 \n\t @@ -162,8 +162,6 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, : /* 4*/r((x86_reg)mask), /* 5*/r(firjump), /* 6*/r(iirjump) , /* 7*/c(filter_shift) , /* 8*/r((int64_t)coeff[0]) -, /* 9*/r((int64_t)coeff[1]) -, /*10*/r((int64_t)coeff[2]) : rax, rdx, rsi #else /* ARCH_X86_32 */ /* 3*/+m(blocksize) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
ffmpeg | branch: release/0.7 | Michael Niedermayer michae...@gmx.at | Thu Feb 19 16:25:29 2015 +0100| [2ddabbb40f0c7b9f43a4c0db3d45938f56d3b21c] | committer: Michael Niedermayer avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86() Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 - 4509 dezicycles Reviewed-by: Ramiro Polla ramiro.po...@gmail.com Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 03f39fbb2a558153a3c464edec1378d637a755fe) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ddabbb40f0c7b9f43a4c0db3d45938f56d3b21c --- libavcodec/x86/mlpdsp.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 486a927..77e3df6 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -129,8 +129,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, FIRMUL (ff_mlp_firorder_6, 0x14 ) FIRMUL (ff_mlp_firorder_5, 0x10 ) FIRMUL (ff_mlp_firorder_4, 0x0c ) -FIRMULREG(ff_mlp_firorder_3, 0x08,10) -FIRMULREG(ff_mlp_firorder_2, 0x04, 9) +FIRMUL (ff_mlp_firorder_3, 0x08 ) +FIRMUL (ff_mlp_firorder_2, 0x04 ) FIRMULREG(ff_mlp_firorder_1, 0x00, 8) LABEL_MANGLE(ff_mlp_firorder_0):\n\t jmp *%6 \n\t @@ -159,8 +159,6 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, : /* 4*/r((x86_reg)mask), /* 5*/r(firjump), /* 6*/r(iirjump) , /* 7*/c(filter_shift) , /* 8*/r((int64_t)coeff[0]) -, /* 9*/r((int64_t)coeff[1]) -, /*10*/r((int64_t)coeff[2]) : rax, rdx, rsi #else /* ARCH_X86_32 */ /* 3*/+m(blocksize) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Thu Feb 19 16:25:29 2015 +0100| [03f39fbb2a558153a3c464edec1378d637a755fe] | committer: Michael Niedermayer avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86() Based on patch by Francisco Blas Izquierdo Riera Commit message partly taken from carl fixes a compilation error in mlpdsp_init.c with -fstack-check and some gcc compilers (I reproduced the issue with gcc 4.7.3) by simplifying the code. See also https://bugs.gentoo.org/show_bug.cgi?id=471756 $ make libavcodec/x86/mlpdsp_init.o libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’: libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible constraints 4551 - 4509 dezicycles Reviewed-by: Ramiro Polla ramiro.po...@gmail.com Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03f39fbb2a558153a3c464edec1378d637a755fe --- libavcodec/x86/mlpdsp_init.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/mlpdsp_init.c b/libavcodec/x86/mlpdsp_init.c index dc0bc58..e9d9b1b 100644 --- a/libavcodec/x86/mlpdsp_init.c +++ b/libavcodec/x86/mlpdsp_init.c @@ -148,8 +148,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, FIRMUL (ff_mlp_firorder_6, 0x14 ) FIRMUL (ff_mlp_firorder_5, 0x10 ) FIRMUL (ff_mlp_firorder_4, 0x0c ) -FIRMULREG(ff_mlp_firorder_3, 0x08,10) -FIRMULREG(ff_mlp_firorder_2, 0x04, 9) +FIRMUL (ff_mlp_firorder_3, 0x08 ) +FIRMUL (ff_mlp_firorder_2, 0x04 ) FIRMULREG(ff_mlp_firorder_1, 0x00, 8) LABEL_MANGLE(ff_mlp_firorder_0):\n\t jmp *%6 \n\t @@ -178,8 +178,6 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, : /* 4*/r((x86_reg)mask), /* 5*/r(firjump), /* 6*/r(iirjump) , /* 7*/c(filter_shift) , /* 8*/r((int64_t)coeff[0]) -, /* 9*/r((int64_t)coeff[1]) -, /*10*/r((int64_t)coeff[2]) : rax, rdx, rsi #else /* ARCH_X86_32 */ /* 3*/+m(blocksize) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog