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

Fixed bug #734

Browse source 
Save and restore the PIC register %ebx/%rbx using push/pop instead of %edi/%rdi

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404145
This commit is contained in:
Sam Lantinga 2009-10-30 04:45:01 +00:00
parent ef88f68a9d
commit a0fd7e1cba
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/cpuinfo/SDL_cpuinfo.c
View file

@ -153,7 +153,7 @@ CPU_getCPUIDFeatures(void)
/* *INDENT-OFF* */ /* *INDENT-OFF* */
#if defined(__GNUC__) && defined(i386) #if defined(__GNUC__) && defined(i386)
__asm__ ( __asm__ (
" movl %%ebx,%%edi\n" " pushl %%ebx\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n" " xorl %%eax,%%eax # Set up for CPUID instruction \n"
" cpuid # Get and save vendor ID \n" " cpuid # Get and save vendor ID \n"
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" " cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
@ -163,14 +163,14 @@ CPU_getCPUIDFeatures(void)
" cpuid # Get family/model/stepping/features\n" " cpuid # Get family/model/stepping/features\n"
" movl %%edx,%0 \n" " movl %%edx,%0 \n"
"1: \n" "1: \n"
" movl %%edi,%%ebx\n" " popl %%ebx\n"
: "=m" (features) : "=m" (features)
: :
: "%eax", "%ecx", "%edx", "%edi" : "%eax", "%ecx", "%edx", "cc"
); );
#elif defined(__GNUC__) && defined(__x86_64__) #elif defined(__GNUC__) && defined(__x86_64__)
__asm__ ( __asm__ (
" movq %%rbx,%%rdi\n" " pushq %%rbx\n"
" xorl %%eax,%%eax # Set up for CPUID instruction \n" " xorl %%eax,%%eax # Set up for CPUID instruction \n"
" cpuid # Get and save vendor ID \n" " cpuid # Get and save vendor ID \n"
" cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n" " cmpl $1,%%eax # Make sure 1 is valid input for CPUID\n"
@ -180,10 +180,10 @@ CPU_getCPUIDFeatures(void)
" cpuid # Get family/model/stepping/features\n" " cpuid # Get family/model/stepping/features\n"
" movl %%edx,%0 \n" " movl %%edx,%0 \n"
"1: \n" "1: \n"
" movq %%rdi,%%rbx\n" " popq %%rbx\n"
: "=m" (features) : "=m" (features)
: :
: "%rax", "%rbx", "%rcx", "%rdx", "%rdi" : "%rax", "%rcx", "%rdx", "cc"
); );
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {
@ -226,7 +226,7 @@ CPU_getCPUIDFeaturesExt(void)
/* *INDENT-OFF* */ /* *INDENT-OFF* */
#if defined(__GNUC__) && defined(i386) #if defined(__GNUC__) && defined(i386)
__asm__ ( __asm__ (
" movl %%ebx,%%edi\n" " pushl %%ebx\n"
" movl $0x80000000,%%eax # Query for extended functions \n" " movl $0x80000000,%%eax # Query for extended functions \n"
" cpuid # Get extended function limit \n" " cpuid # Get extended function limit \n"
" cmpl $0x80000001,%%eax \n" " cmpl $0x80000001,%%eax \n"
@ -235,14 +235,14 @@ CPU_getCPUIDFeaturesExt(void)
" cpuid # and get the information \n" " cpuid # and get the information \n"
" movl %%edx,%0 \n" " movl %%edx,%0 \n"
"1: \n" "1: \n"
" movl %%edi,%%ebx\n" " popl %%ebx\n"
: "=m" (features) : "=m" (features)
: :
: "%eax", "%ecx", "%edx", "%edi" : "%eax", "%ecx", "%edx", "cc"
); );
#elif defined(__GNUC__) && defined (__x86_64__) #elif defined(__GNUC__) && defined (__x86_64__)
__asm__ ( __asm__ (
" movq %%rbx,%%rdi\n" " pushq %%rbx\n"
" movl $0x80000000,%%eax # Query for extended functions \n" " movl $0x80000000,%%eax # Query for extended functions \n"
" cpuid # Get extended function limit \n" " cpuid # Get extended function limit \n"
" cmpl $0x80000001,%%eax \n" " cmpl $0x80000001,%%eax \n"
@ -251,10 +251,10 @@ CPU_getCPUIDFeaturesExt(void)
" cpuid # and get the information \n" " cpuid # and get the information \n"
" movl %%edx,%0 \n" " movl %%edx,%0 \n"
"1: \n" "1: \n"
" movq %%rdi,%%rbx\n" " popq %%rbx\n"
: "=m" (features) : "=m" (features)
: :
: "%rax", "%rbx", "%rcx", "%rdx", "%rdi" : "%rax", "%rcx", "%rdx", "cc"
); );
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {