/*****************************************************************************
* cpu.h: cpu detection
*****************************************************************************
- * Copyright (C) 2004-2011 x264 project
+ * Copyright (C) 2004-2013 x264 project
*
* Authors: Loren Merritt <lorenm@u.washington.edu>
*
void x264_cpu_emms( void );
void x264_cpu_sfence( void );
#if HAVE_MMX
+/* There is no way to forbid the compiler from using float instructions
+ * before the emms so miscompilation could theoretically occur in the
+ * unlikely event that the compiler reorders emms and float instructions. */
+#if HAVE_X86_INLINE_ASM
+/* Clobbering memory makes the compiler less likely to reorder code. */
+#define x264_emms() asm volatile( "emms":::"memory","st","st(1)","st(2)", \
+ "st(3)","st(4)","st(5)","st(6)","st(7)" )
+#else
#define x264_emms() x264_cpu_emms()
+#endif
#else
#define x264_emms()
#endif
#define x264_sfence x264_cpu_sfence
void x264_cpu_mask_misalign_sse( void );
+void x264_safe_intel_cpu_indicator_init( void );
/* kluge:
* gcc can't give variables any greater alignment than the stack frame has.