Mercurial > sdl-ios-xcode
changeset 4372:ca91f36ef3de SDL-1.2
1.2 branch: fixed assembly code register clobbering.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 01 Nov 2009 17:51:39 +0000 |
| parents | 6f74b80cca1d |
| children | ab06accf1b96 |
| files | src/cpuinfo/SDL_cpuinfo.c |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpuinfo/SDL_cpuinfo.c Wed Oct 28 19:42:16 2009 +0000 +++ b/src/cpuinfo/SDL_cpuinfo.c Sun Nov 01 17:51:39 2009 +0000 @@ -148,7 +148,7 @@ int features = 0; #if defined(__GNUC__) && defined(i386) __asm__ ( -" movl %%ebx,%%edi\n" +" pushl %%ebx\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" @@ -158,14 +158,14 @@ " cpuid # Get family/model/stepping/features\n" " movl %%edx,%0 \n" "1: \n" -" movl %%edi,%%ebx\n" +" popl %%ebx\n" : "=m" (features) : - : "%eax", "%ecx", "%edx", "%edi" + : "%eax", "%ecx", "%edx" ); #elif defined(__GNUC__) && defined(__x86_64__) __asm__ ( -" movq %%rbx,%%rdi\n" +" pushq %%rbx\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" @@ -175,10 +175,10 @@ " cpuid # Get family/model/stepping/features\n" " movl %%edx,%0 \n" "1: \n" -" movq %%rdi,%%rbx\n" +" popq %%rbx\n" : "=m" (features) : - : "%rax", "%rbx", "%rcx", "%rdx", "%rdi" + : "%rax", "%rcx", "%rdx" ); #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) __asm { @@ -194,7 +194,7 @@ } #elif defined(__sun) && (defined(__i386) || defined(__amd64)) __asm( -" movl %ebx,%edi\n" +" pushl %ebx\n" " xorl %eax,%eax \n" " cpuid \n" " cmpl $1,%eax \n" @@ -208,7 +208,7 @@ " movl %edx,-8(%rbp) \n" #endif "1: \n" -" movl %edi,%ebx\n" ); +" popl %ebx\n" ); #endif return features; } @@ -218,7 +218,7 @@ int features = 0; #if defined(__GNUC__) && defined(i386) __asm__ ( -" movl %%ebx,%%edi\n" +" pushl %%ebx\n" " movl $0x80000000,%%eax # Query for extended functions \n" " cpuid # Get extended function limit \n" " cmpl $0x80000001,%%eax \n" @@ -227,14 +227,14 @@ " cpuid # and get the information \n" " movl %%edx,%0 \n" "1: \n" -" movl %%edi,%%ebx\n" +" popl %%ebx\n" : "=m" (features) : - : "%eax", "%ecx", "%edx", "%edi" + : "%eax", "%ecx", "%edx" ); #elif defined(__GNUC__) && defined (__x86_64__) __asm__ ( -" movq %%rbx,%%rdi\n" +" pushq %%rbx\n" " movl $0x80000000,%%eax # Query for extended functions \n" " cpuid # Get extended function limit \n" " cmpl $0x80000001,%%eax \n" @@ -243,10 +243,10 @@ " cpuid # and get the information \n" " movl %%edx,%0 \n" "1: \n" -" movq %%rdi,%%rbx\n" +" popq %%rbx\n" : "=m" (features) : - : "%rax", "%rbx", "%rcx", "%rdx", "%rdi" + : "%rax", "%rcx", "%rdx" ); #elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__) __asm { @@ -261,7 +261,7 @@ } #elif defined(__sun) && ( defined(__i386) || defined(__amd64) ) __asm ( -" movl %ebx,%edi\n" +" pushl %ebx\n" " movl $0x80000000,%eax \n" " cpuid \n" " cmpl $0x80000001,%eax \n" @@ -274,7 +274,7 @@ " movl %edx,-8(%rbp) \n" #endif "1: \n" -" movl %edi,%ebx\n" +" popl %ebx\n" ); #endif return features;