pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed CPU feature detection on x86_64 platform

Browse source 
(registers were being corrupted, causing crashes)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403377
This commit is contained in:
Sam Lantinga 2008-12-24 13:13:38 +00:00
parent 4f65eb9602
commit 92f0abc075
1 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/cpuinfo/SDL_cpuinfo.c
View file

@ -152,7 +152,7 @@ CPU_getCPUIDFeatures(void)
{ {
int features = 0; int features = 0;
/* *INDENT-OFF* */ /* *INDENT-OFF* */
#if defined(__GNUC__) && ( defined(i386) || defined(__x86_64__) ) #if defined(__GNUC__) && defined(i386)
__asm__ ( __asm__ (
" movl %%ebx,%%edi\n" " movl %%ebx,%%edi\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n" " xorl %%eax,%%eax # Set up for CPUID instruction \n"
@ -169,6 +169,23 @@ CPU_getCPUIDFeatures(void)
: :
: "%eax", "%ecx", "%edx", "%edi" : "%eax", "%ecx", "%edx", "%edi"
); );
#elif defined(__GNUC__) && defined(__x86_64__)
__asm__ (
" movq %%rbx,%%rdi\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n"
" cpuid # Get and save vendor ID \n"
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
" jl 1f # We dont have the CPUID instruction\n"
" xorl %%eax,%%eax \n"
" incl %%eax \n"
" cpuid # Get family/model/stepping/features\n"
" movl %%edx,%0 \n"
"1: \n"
" movq %%rdi,%%rbx\n"
: "=m" (features)
:
: "%rax", "%rcx", "%rdx", "%rdi"
);
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {
xor eax, eax ; Set up for CPUID instruction xor eax, eax ; Set up for CPUID instruction
@ -208,7 +225,7 @@ CPU_getCPUIDFeaturesExt(void)
{ {
int features = 0; int features = 0;
/* *INDENT-OFF* */ /* *INDENT-OFF* */
#if defined(__GNUC__) && (defined(i386) || defined (__x86_64__) ) #if defined(__GNUC__) && defined(i386)
__asm__ ( __asm__ (
" movl %%ebx,%%edi\n" " movl %%ebx,%%edi\n"
" movl $0x80000000,%%eax # Query for extended functions \n" " movl $0x80000000,%%eax # Query for extended functions \n"
@ -224,6 +241,22 @@ CPU_getCPUIDFeaturesExt(void)
: :
: "%eax", "%ecx", "%edx", "%edi" : "%eax", "%ecx", "%edx", "%edi"
); );
#elif defined(__GNUC__) && defined (__x86_64__)
__asm__ (
" movq %%rbx,%%rdi\n"
" movl $0x80000000,%%eax # Query for extended functions \n"
" cpuid # Get extended function limit \n"
" cmpl $0x80000001,%%eax \n"
" jl 1f # Nope, we dont have function 800000001h\n"
" movl $0x80000001,%%eax # Setup extended function 800000001h\n"
" cpuid # and get the information \n"
" movl %%edx,%0 \n"
"1: \n"
" movq %%rdi,%%rbx\n"
: "=m" (features)
:
: "%rax", "%rcx", "%rdx", "%rdi"
);
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {
mov eax,80000000h ; Query for extended functions mov eax,80000000h ; Query for extended functions