Fix crash when using libx264.dll compiled with ICL for X86_64

diff --git a/common/cpu.h b/common/cpu.h
index c92f93eaf083c9a402edd55ab23f6122be349e69..ed1a8bcac47136ebfae7b4338210b23c629f1119 100644 (file)
--- a/common/cpu.h
+++ b/common/cpu.h
@@ -46,6 +46,7 @@ void     x264_cpu_sfence( void );
 #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.

diff --git a/common/osdep.c b/common/osdep.c
index 0a97bc713102e38480b86e5df18364a2b178abf2..97911d09bd6259c9ecc8f79c86e2ab623c647a10 100644 (file)
--- a/common/osdep.c
+++ b/common/osdep.c
@@ -90,6 +90,7 @@ int x264_threading_init( void )
 }
 #endif
 
+#if HAVE_MMX
 #ifdef __INTEL_COMPILER
 /* Agner's patch to Intel's CPU dispatcher from pages 131-132 of
  * http://agner.org/optimize/optimizing_cpp.pdf (2011-01-30)
@@ -98,7 +99,7 @@ int x264_threading_init( void )
 // Global variable indicating cpu
 int __intel_cpu_indicator = 0;
 // CPU dispatcher function
-void __intel_cpu_indicator_init( void )
+void x264_intel_cpu_indicator_init( void )
 {
     unsigned int cpu = x264_cpu_detect();
     if( cpu&X264_CPU_AVX )
@@ -120,4 +121,16 @@ void __intel_cpu_indicator_init( void )
     else
         __intel_cpu_indicator = 1;
 }
+
+/* __intel_cpu_indicator_init appears to have a non-standard calling convention that
+ * assumes certain registers aren't preserved, so we'll route it through a function
+ * that backs up all the registers. */
+void __intel_cpu_indicator_init( void )
+{
+    x264_safe_intel_cpu_indicator_init();
+}
+#else
+void x264_intel_cpu_indicator_init( void )
+{}
+#endif
 #endif

diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm
index fcc4e511f2febeb596f16cb37db3f436e4faed29..9babccbbb0e34cc7b21aba6ec99a18ebafcce98e 100644 (file)
--- a/common/x86/cpu-a.asm
+++ b/common/x86/cpu-a.asm
@@ -139,3 +139,50 @@ cglobal cpu_mask_misalign_sse
     ldmxcsr [rsp]
     add   rsp, 4
     ret
+
+cextern intel_cpu_indicator_init
+
+;-----------------------------------------------------------------------------
+; void safe_intel_cpu_indicator_init( void );
+;-----------------------------------------------------------------------------
+cglobal safe_intel_cpu_indicator_init
+    push r0
+    push r1
+    push r2
+    push r3
+    push r4
+    push r5
+    push r6
+%if ARCH_X86_64
+    push r7
+    push r8
+    push r9
+    push r10
+    push r11
+    push r12
+    push r13
+    push r14
+%endif
+    push rbp
+    mov  rbp, rsp
+    and  rsp, ~15
+    call intel_cpu_indicator_init
+    leave
+%if ARCH_X86_64
+    pop r14
+    pop r13
+    pop r12
+    pop r11
+    pop r10
+    pop r9
+    pop r8
+    pop r7
+%endif
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+    pop r2
+    pop r1
+    pop r0
+    ret