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

1.2 branch: fixed assembly code register clobbering.

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404147
This commit is contained in:
Ryan C. Gordon 2009-11-01 17:51:39 +00:00
parent 719e1e0185
commit 38ed2873ab
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cpuinfo/SDL_cpuinfo.c
View file

@ -148,7 +148,7 @@ static __inline__ int CPU_getCPUIDFeatures(void)
int features = 0; int features = 0;
#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"
@ -158,14 +158,14 @@ static __inline__ int 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"
); );
#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"
@ -175,10 +175,10 @@ static __inline__ int 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"
); );
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {
@ -194,7 +194,7 @@ done:
} }
#elif defined(__sun) && (defined(__i386) || defined(__amd64)) #elif defined(__sun) && (defined(__i386) || defined(__amd64))
__asm( __asm(
" movl %ebx,%edi\n" " pushl %ebx\n"
" xorl %eax,%eax \n" " xorl %eax,%eax \n"
" cpuid \n" " cpuid \n"
" cmpl $1,%eax \n" " cmpl $1,%eax \n"
@ -208,7 +208,7 @@ done:
" movl %edx,-8(%rbp) \n" " movl %edx,-8(%rbp) \n"
#endif #endif
"1: \n" "1: \n"
" movl %edi,%ebx\n" ); " popl %ebx\n" );
#endif #endif
return features; return features;
} }
@ -218,7 +218,7 @@ static __inline__ int CPU_getCPUIDFeaturesExt(void)
int features = 0; int features = 0;
#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"
@ -227,14 +227,14 @@ static __inline__ int 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"
); );
#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"
@ -243,10 +243,10 @@ static __inline__ int 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"
); );
#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
__asm { __asm {
@ -261,7 +261,7 @@ done:
} }
#elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) #elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
__asm ( __asm (
" movl %ebx,%edi\n" " pushl %ebx\n"
" movl $0x80000000,%eax \n" " movl $0x80000000,%eax \n"
" cpuid \n" " cpuid \n"
" cmpl $0x80000001,%eax \n" " cmpl $0x80000001,%eax \n"
@ -274,7 +274,7 @@ done:
" movl %edx,-8(%rbp) \n" " movl %edx,-8(%rbp) \n"
#endif #endif
"1: \n" "1: \n"
" movl %edi,%ebx\n" " popl %ebx\n"
); );
#endif #endif
return features; return features;