From: Rodger Combs Date: Mon, 27 Jul 2015 22:53:21 +0000 (-0500) Subject: Fix crash when the OS doesn't support AVX2 X-Git-Tag: 0.13.0~30 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc78d6a0ce5a95a112b96d3b029172bb64d83252;p=libass Fix crash when the OS doesn't support AVX2 --- diff --git a/libass/ass_utils.c b/libass/ass_utils.c index a6a063b..94edf80 100644 --- a/libass/ass_utils.c +++ b/libass/ass_utils.c @@ -48,6 +48,9 @@ int has_avx(void) if(!(ecx & (1 << 27))) // not OSXSAVE return 0; uint32_t misc = ecx; + ass_get_xgetbv(0, &eax, &edx); + if((eax & 0x6) != 0x6) + return 0; eax = 0; ass_get_cpuid(&eax, &ebx, &ecx, &edx); return (ecx & 0x6) == 0x6 ? (misc >> 28) & 0x1 : 0; // check high bits are relevant, then AVX support diff --git a/libass/x86/cpuid.asm b/libass/x86/cpuid.asm index 13b2a2d..9ecf835 100644 --- a/libass/x86/cpuid.asm +++ b/libass/x86/cpuid.asm @@ -46,3 +46,19 @@ cglobal get_cpuid, 4, 5, 0 mov [r4], edx pop rbx RET + +;----------------------------------------------------------------------------- +; void get_xgetbv( uint32_t op, uint32_t *eax, uint32_t *edx ) +;----------------------------------------------------------------------------- + +INIT_XMM +cglobal get_xgetbv, 3, 7, 0 + push r2 + push r1 + mov ecx, r0d + xgetbv + pop r4 + mov [r4], eax + pop r4 + mov [r4], edx + RET diff --git a/libass/x86/cpuid.h b/libass/x86/cpuid.h index 34e4b19..4dc0e22 100644 --- a/libass/x86/cpuid.h +++ b/libass/x86/cpuid.h @@ -15,10 +15,11 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - + #ifndef INTEL_CPUID_H #define INTEL_CPUID_H - + void ass_get_cpuid( uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); - +void ass_get_xgetbv( uint32_t op, uint32_t *eax, uint32_t *edx ); + #endif