[x264-devel] x86: correctly check stack alignment for Atom hadamard_ac

[Jason Garrett-Glaser]

x264 | branch: master | Jason Garrett-Glaser <jason at x264.com> | Sat Mar  2 01:22:29 2013 -0800| [580cc69707f6996dad8544d6ef0d5a8bbc1b5864] | committer: Jason Garrett-Glaser

x86: correctly check stack alignment for Atom hadamard_ac

Regression in r2265 (only affected compilers with broken stack alignment,
like ICL on win32).

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=580cc69707f6996dad8544d6ef0d5a8bbc1b5864
---

 common/pixel.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/pixel.c b/common/pixel.c
index 4588a69..cc1ad0a 100644
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -1155,7 +1155,10 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
             pixf->satd[PIXEL_4x16]  = x264_pixel_satd_4x16_ssse3_atom;
             INIT6( satd_x3, _ssse3_atom );
             INIT6( satd_x4, _ssse3_atom );
-            INIT4( hadamard_ac, _ssse3_atom );
+            if( !(cpu&X264_CPU_STACK_MOD4) )
+            {
+                INIT4( hadamard_ac, _ssse3_atom );
+            }
 #if ARCH_X86_64
             pixf->sa8d_satd[PIXEL_16x16] = x264_pixel_sa8d_satd_16x16_ssse3_atom;
 #endif