Skip to content

V
vlc-gpu
Commit 5077a231 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* src/misc/cpu.c: Fixed the use of cpuid() on amd64 (thanks to Aison on 

   IRC).
parent d1667dd5
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 14 deletions
src/misc/cpu.c
View file @ 5077a231
...@@ -84,17 +84,31 @@ uint32_t CPUCapabilities( void ) ...@@ -84,17 +84,31 @@ uint32_t CPUCapabilities( void )
volatile vlc_bool_t b_amd; volatile vlc_bool_t b_amd;
/* Needed for x86 CPU capabilities detection */ /* Needed for x86 CPU capabilities detection */
# define cpuid( reg ) \ # if defined( __x86_64__ )
asm volatile ( "push %%ebx\n\t" \ # define cpuid( reg ) \
"cpuid\n\t" \ asm volatile ( "push %%rbx\n\t" \
"movl %%ebx,%1\n\t" \ "cpuid\n\t" \
"pop %%ebx\n\t" \ "movl %%ebx,%1\n\t" \
: "=a" ( i_eax ), \ "pop %%rbx\n\t" \
"=r" ( i_ebx ), \ : "=a" ( i_eax ), \
"=c" ( i_ecx ), \ "=r" ( i_ebx ), \
"=d" ( i_edx ) \ "=c" ( i_ecx ), \
: "a" ( reg ) \ "=d" ( i_edx ) \
: "cc" ); : "a" ( reg ) \
: "cc" );
# else
# define cpuid( reg ) \
asm volatile ( "push %%ebx\n\t" \
"cpuid\n\t" \
"movl %%ebx,%1\n\t" \
"pop %%ebx\n\t" \
: "=a" ( i_eax ), \
"=r" ( i_ebx ), \
"=c" ( i_ecx ), \
"=d" ( i_edx ) \
: "a" ( reg ) \
: "cc" );
# endif
# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \ # if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
&& defined( HAVE_SIGNAL_H ) && defined( HAVE_SIGNAL_H )
...@@ -103,6 +117,8 @@ uint32_t CPUCapabilities( void ) ...@@ -103,6 +117,8 @@ uint32_t CPUCapabilities( void )
i_capabilities |= CPU_CAPABILITY_FPU; i_capabilities |= CPU_CAPABILITY_FPU;
# if defined( __i386__ )
/* check if cpuid instruction is supported */
asm volatile ( "push %%ebx\n\t" asm volatile ( "push %%ebx\n\t"
"pushf\n\t" "pushf\n\t"
"pop %%eax\n\t" "pop %%eax\n\t"
...@@ -121,12 +137,15 @@ uint32_t CPUCapabilities( void ) ...@@ -121,12 +137,15 @@ uint32_t CPUCapabilities( void )
if( i_eax == i_ebx ) if( i_eax == i_ebx )
{ {
# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \ # if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
&& defined( HAVE_SIGNAL_H ) && defined( HAVE_SIGNAL_H )
signal( SIGILL, pf_sigill ); signal( SIGILL, pf_sigill );
# endif # endif
return i_capabilities; return i_capabilities;
} }
# else
/* x86_64 supports cpuid instruction, so we dont need to check it */
# endif
i_capabilities |= CPU_CAPABILITY_486; i_capabilities |= CPU_CAPABILITY_486;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment