| | 1 | --- detect_cpu_asm.s.orig 2006-09-13 15:51:20.000000000 -0600 |
| | 2 | +++ detect_cpu_asm.s 2008-10-21 23:25:59.000000000 -0600 |
| | 3 | @@ -52,9 +52,9 @@ |
| | 4 | check if cpuid is available |
| | 5 | */ |
| | 6 | |
| | 7 | - .globl x86_check_cpuid_flag |
| | 8 | + .globl _x86_check_cpuid_flag |
| | 9 | |
| | 10 | -x86_check_cpuid_flag: |
| | 11 | +_x86_check_cpuid_flag: |
| | 12 | /* save ecx register in the stack */ |
| | 13 | pushl %ecx |
| | 14 | |
| | 15 | @@ -109,9 +109,9 @@ |
| | 16 | returns: pointer to static buffer |
| | 17 | */ |
| | 18 | |
| | 19 | - .globl x86_exec_cpuid |
| | 20 | + .globl _x86_exec_cpuid |
| | 21 | |
| | 22 | -x86_exec_cpuid: |
| | 23 | +_x86_exec_cpuid: |
| | 24 | /* get function number */ |
| | 25 | movl 4(%esp),%eax |
| | 26 | |
| | 27 | @@ -122,10 +122,10 @@ |
| | 28 | cpuid |
| | 29 | |
| | 30 | /* copy register values */ |
| | 31 | - movl %eax,x86_cpu_reg_eax |
| | 32 | - movl %ebx,x86_cpu_reg_ebx |
| | 33 | - movl %ecx,x86_cpu_reg_ecx |
| | 34 | - movl %edx,x86_cpu_reg_edx |
| | 35 | + movl %eax,_x86_cpu_reg_eax |
| | 36 | + movl %ebx,_x86_cpu_reg_ebx |
| | 37 | + movl %ecx,_x86_cpu_reg_ecx |
| | 38 | + movl %edx,_x86_cpu_reg_edx |
| | 39 | |
| | 40 | popl %edx |
| | 41 | popl %ecx |
| | 42 | @@ -152,9 +152,9 @@ |
| | 43 | check if cpuid is available |
| | 44 | */ |
| | 45 | |
| | 46 | - .globl x86_check_cpuid_flag |
| | 47 | + .globl _x86_check_cpuid_flag |
| | 48 | |
| | 49 | -x86_check_cpuid_flag: |
| | 50 | +_x86_check_cpuid_flag: |
| | 51 | pushq %rcx /* save rcx register */ |
| | 52 | |
| | 53 | pushfq |
| | 54 | @@ -186,9 +186,9 @@ |
| | 55 | returns: pointer to static buffer |
| | 56 | */ |
| | 57 | |
| | 58 | - .globl x86_exec_cpuid |
| | 59 | + .globl _x86_exec_cpuid |
| | 60 | |
| | 61 | -x86_exec_cpuid: |
| | 62 | +_x86_exec_cpuid: |
| | 63 | /* get function number (arg0 in rdi register) */ |
| | 64 | movq %rdi,%rax |
| | 65 | |
| | 66 | @@ -199,10 +199,10 @@ |
| | 67 | cpuid |
| | 68 | |
| | 69 | /* copy register values */ |
| | 70 | - movl %eax,x86_cpu_reg_eax |
| | 71 | - movl %ebx,x86_cpu_reg_ebx |
| | 72 | - movl %ecx,x86_cpu_reg_ecx |
| | 73 | - movl %edx,x86_cpu_reg_edx |
| | 74 | + movl %eax,_x86_cpu_reg_eax |
| | 75 | + movl %ebx,_x86_cpu_reg_ebx |
| | 76 | + movl %ecx,_x86_cpu_reg_ecx |
| | 77 | + movl %edx,_x86_cpu_reg_edx |
| | 78 | |
| | 79 | popq %rdx |
| | 80 | popq %rcx |
| | 81 | @@ -218,20 +218,20 @@ |
| | 82 | |
| | 83 | .data |
| | 84 | |
| | 85 | - .globl x86_cpu_reg_eax |
| | 86 | -x86_cpu_reg_eax: |
| | 87 | + .globl _x86_cpu_reg_eax |
| | 88 | +_x86_cpu_reg_eax: |
| | 89 | .long 0 |
| | 90 | |
| | 91 | - .globl x86_cpu_reg_ebx |
| | 92 | -x86_cpu_reg_ebx: |
| | 93 | + .globl _x86_cpu_reg_ebx |
| | 94 | +_x86_cpu_reg_ebx: |
| | 95 | .long 0 |
| | 96 | |
| | 97 | - .globl x86_cpu_reg_ecx |
| | 98 | -x86_cpu_reg_ecx: |
| | 99 | + .globl _x86_cpu_reg_ecx |
| | 100 | +_x86_cpu_reg_ecx: |
| | 101 | .long 0 |
| | 102 | |
| | 103 | - .globl x86_cpu_reg_edx |
| | 104 | -x86_cpu_reg_edx: |
| | 105 | + .globl _x86_cpu_reg_edx |
| | 106 | +_x86_cpu_reg_edx: |
| | 107 | .long 0 |
| | 108 | |
| | 109 | #endif /* ARCH_X86_32 || ARCH_X86_64 */ |
