These are all functions which are invoked from elsewhere, so annotate them as global using the new SYM_FUNC_START and their ENDPROC's by SYM_FUNC_END. Now, ENTRY/ENDPROC can be forced to be undefined on X86, so do so.
Unified · Split
| @@ -24,7 +24,7 @@ · 23 unmodified lines | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | .text | 26 | .text |
| 27 | ENTRY(efi_call_phys) | 27 | SYM_FUNC_START(efi_call_phys) |
| 28 | /* | 28 | /* |
| 29 | * 0. The function can only be called in Linux kernel. So CS has been | 29 | * 0. The function can only be called in Linux kernel. So CS has been |
| 30 | * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found | 30 | * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found |
| @@ -77,7 +77,7 @@ ENTRY(efi_call_phys) · 46 unmodified lines | |||
| 77 | movl saved_return_addr(%edx), %ecx | 77 | movl saved_return_addr(%edx), %ecx |
| 78 | pushl %ecx | 78 | pushl %ecx |
| 79 | ret | 79 | ret |
| 80 | ENDPROC(efi_call_phys) | 80 | SYM_FUNC_END(efi_call_phys) |
| 81 | .previous | 81 | .previous |
| 82 | 82 | ||
| 83 | .data | 83 | .data |
| @@ -61,7 +61,7 @@ · 60 unmodified lines | |||
| 61 | .hidden _egot | 61 | .hidden _egot |
| 62 | 62 | ||
| 63 | __HEAD | 63 | __HEAD |
| 64 | ENTRY(startup_32) | 64 | SYM_FUNC_START(startup_32) |
| 65 | cld | 65 | cld |
| 66 | /* | 66 | /* |
| 67 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking | 67 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking |
| @@ -142,14 +142,14 @@ ENTRY(startup_32) · 74 unmodified lines | |||
| 142 | */ | 142 | */ |
| 143 | leal .Lrelocated(%ebx), %eax | 143 | leal .Lrelocated(%ebx), %eax |
| 144 | jmp *%eax | 144 | jmp *%eax |
| 145 | ENDPROC(startup_32) | 145 | SYM_FUNC_END(startup_32) |
| 146 | 146 | ||
| 147 | #ifdef CONFIG_EFI_STUB | 147 | #ifdef CONFIG_EFI_STUB |
| 148 | /* | 148 | /* |
| 149 | * We don't need the return address, so set up the stack so efi_main() can find | 149 | * We don't need the return address, so set up the stack so efi_main() can find |
| 150 | * its arguments. | 150 | * its arguments. |
| 151 | */ | 151 | */ |
| 152 | ENTRY(efi_pe_entry) | 152 | SYM_FUNC_START(efi_pe_entry) |
| 153 | add $0x4, %esp | 153 | add $0x4, %esp |
| 154 | 154 | ||
| 155 | call 1f | 155 | call 1f |
| @@ -174,9 +174,9 @@ ENTRY(efi_pe_entry) · 18 unmodified lines | |||
| 174 | pushl %eax | 174 | pushl %eax |
| 175 | pushl %ecx | 175 | pushl %ecx |
| 176 | jmp 2f /* Skip efi_config initialization */ | 176 | jmp 2f /* Skip efi_config initialization */ |
| 177 | ENDPROC(efi_pe_entry) | 177 | SYM_FUNC_END(efi_pe_entry) |
| 178 | 178 | ||
| 179 | ENTRY(efi32_stub_entry) | 179 | SYM_FUNC_START(efi32_stub_entry) |
| 180 | add $0x4, %esp | 180 | add $0x4, %esp |
| 181 | popl %ecx | 181 | popl %ecx |
| 182 | popl %edx | 182 | popl %edx |
| @@ -205,7 +205,7 @@ fail: · 22 unmodified lines | |||
| 205 | movl BP_code32_start(%esi), %eax | 205 | movl BP_code32_start(%esi), %eax |
| 206 | leal startup_32(%eax), %eax | 206 | leal startup_32(%eax), %eax |
| 207 | jmp *%eax | 207 | jmp *%eax |
| 208 | ENDPROC(efi32_stub_entry) | 208 | SYM_FUNC_END(efi32_stub_entry) |
| 209 | #endif | 209 | #endif |
| 210 | 210 | ||
| 211 | .text | 211 | .text |
| @@ -497,7 +497,7 @@ · 496 unmodified lines | |||
| 497 | pxor t0, x3; \ | 497 | pxor t0, x3; \ |
| 498 | movdqu x3, (3*4*4)(out); | 498 | movdqu x3, (3*4*4)(out); |
| 499 | 499 | ||
| 500 | ENTRY(__serpent_enc_blk_4way) | 500 | SYM_FUNC_START(__serpent_enc_blk_4way) |
| 501 | /* input: | 501 | /* input: |
| 502 | * arg_ctx(%esp): ctx, CTX | 502 | * arg_ctx(%esp): ctx, CTX |
| 503 | * arg_dst(%esp): dst | 503 | * arg_dst(%esp): dst |
| @@ -559,9 +559,9 @@ ENTRY(__serpent_enc_blk_4way) · 55 unmodified lines | |||
| 559 | xor_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE); | 559 | xor_blocks(%eax, RA, RB, RC, RD, RT0, RT1, RE); |
| 560 | 560 | ||
| 561 | ret; | 561 | ret; |
| 562 | ENDPROC(__serpent_enc_blk_4way) | 562 | SYM_FUNC_END(__serpent_enc_blk_4way) |
| 563 | 563 | ||
| 564 | ENTRY(serpent_dec_blk_4way) | 564 | SYM_FUNC_START(serpent_dec_blk_4way) |
| 565 | /* input: | 565 | /* input: |
| 566 | * arg_ctx(%esp): ctx, CTX | 566 | * arg_ctx(%esp): ctx, CTX |
| 567 | * arg_dst(%esp): dst | 567 | * arg_dst(%esp): dst |
| @@ -613,4 +613,4 @@ ENTRY(serpent_dec_blk_4way) · 45 unmodified lines | |||
| 613 | write_blocks(%eax, RC, RD, RB, RE, RT0, RT1, RA); | 613 | write_blocks(%eax, RC, RD, RB, RE, RT0, RT1, RA); |
| 614 | 614 | ||
| 615 | ret; | 615 | ret; |
| 616 | ENDPROC(serpent_dec_blk_4way) | 616 | SYM_FUNC_END(serpent_dec_blk_4way) |
| @@ -207,7 +207,7 @@ · 206 unmodified lines | |||
| 207 | xor %esi, d ## D;\ | 207 | xor %esi, d ## D;\ |
| 208 | ror $1, d ## D; | 208 | ror $1, d ## D; |
| 209 | 209 | ||
| 210 | ENTRY(twofish_enc_blk) | 210 | SYM_FUNC_START(twofish_enc_blk) |
| 211 | push %ebp /* save registers according to calling convention*/ | 211 | push %ebp /* save registers according to calling convention*/ |
| 212 | push %ebx | 212 | push %ebx |
| 213 | push %esi | 213 | push %esi |
| @@ -261,9 +261,9 @@ ENTRY(twofish_enc_blk) · 47 unmodified lines | |||
| 261 | pop %ebp | 261 | pop %ebp |
| 262 | mov $1, %eax | 262 | mov $1, %eax |
| 263 | ret | 263 | ret |
| 264 | ENDPROC(twofish_enc_blk) | 264 | SYM_FUNC_END(twofish_enc_blk) |
| 265 | 265 | ||
| 266 | ENTRY(twofish_dec_blk) | 266 | SYM_FUNC_START(twofish_dec_blk) |
| 267 | push %ebp /* save registers according to calling convention*/ | 267 | push %ebp /* save registers according to calling convention*/ |
| 268 | push %ebx | 268 | push %ebx |
| 269 | push %esi | 269 | push %esi |
| @@ -318,4 +318,4 @@ ENTRY(twofish_dec_blk) · 48 unmodified lines | |||
| 318 | pop %ebp | 318 | pop %ebp |
| 319 | mov $1, %eax | 319 | mov $1, %eax |
| 320 | ret | 320 | ret |
| 321 | ENDPROC(twofish_dec_blk) | 321 | SYM_FUNC_END(twofish_dec_blk) |
| @@ -757,7 +757,7 @@ SYM_CODE_END(__switch_to_asm) · 756 unmodified lines | |||
| 757 | * asmlinkage function so its argument has to be pushed on the stack. This | 757 | * asmlinkage function so its argument has to be pushed on the stack. This |
| 758 | * wrapper creates a proper "end of stack" frame header before the call. | 758 | * wrapper creates a proper "end of stack" frame header before the call. |
| 759 | */ | 759 | */ |
| 760 | ENTRY(schedule_tail_wrapper) | 760 | SYM_FUNC_START(schedule_tail_wrapper) |
| 761 | FRAME_BEGIN | 761 | FRAME_BEGIN |
| 762 | 762 | ||
| 763 | pushl %eax | 763 | pushl %eax |
| @@ -766,7 +766,7 @@ ENTRY(schedule_tail_wrapper) · 2 unmodified lines | |||
| 766 | 766 | ||
| 767 | FRAME_END | 767 | FRAME_END |
| 768 | ret | 768 | ret |
| 769 | ENDPROC(schedule_tail_wrapper) | 769 | SYM_FUNC_END(schedule_tail_wrapper) |
| 770 | /* | 770 | /* |
| 771 | * A newly forked process directly context switches into this address. | 771 | * A newly forked process directly context switches into this address. |
| 772 | * | 772 | * |
| @@ -885,7 +885,7 @@ SYM_CODE_END(xen_sysenter_target) · 112 unmodified lines | |||
| 885 | * ebp user stack | 885 | * ebp user stack |
| 886 | * 0(%ebp) arg6 | 886 | * 0(%ebp) arg6 |
| 887 | */ | 887 | */ |
| 888 | ENTRY(entry_SYSENTER_32) | 888 | SYM_FUNC_START(entry_SYSENTER_32) |
| 889 | /* | 889 | /* |
| 890 | * On entry-stack with all userspace-regs live - save and | 890 | * On entry-stack with all userspace-regs live - save and |
| 891 | * restore eflags and %eax to use it as scratch-reg for the cr3 | 891 | * restore eflags and %eax to use it as scratch-reg for the cr3 |
| @@ -1013,7 +1013,7 @@ ENTRY(entry_SYSENTER_32) · 121 unmodified lines | |||
| 1013 | popfl | 1013 | popfl |
| 1014 | jmp .Lsysenter_flags_fixed | 1014 | jmp .Lsysenter_flags_fixed |
| 1015 | SYM_ENTRY(__end_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE) | 1015 | SYM_ENTRY(__end_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE) |
| 1016 | ENDPROC(entry_SYSENTER_32) | 1016 | SYM_FUNC_END(entry_SYSENTER_32) |
| 1017 | 1017 | ||
| 1018 | /* | 1018 | /* |
| 1019 | * 32-bit legacy system call entry. | 1019 | * 32-bit legacy system call entry. |
| @@ -1043,7 +1043,7 @@ ENDPROC(entry_SYSENTER_32) · 23 unmodified lines | |||
| 1043 | * edi arg5 | 1043 | * edi arg5 |
| 1044 | * ebp arg6 | 1044 | * ebp arg6 |
| 1045 | */ | 1045 | */ |
| 1046 | ENTRY(entry_INT80_32) | 1046 | SYM_FUNC_START(entry_INT80_32) |
| 1047 | ASM_CLAC | 1047 | ASM_CLAC |
| 1048 | pushl %eax /* pt_regs->orig_ax */ | 1048 | pushl %eax /* pt_regs->orig_ax */ |
| 1049 | 1049 | ||
| @@ -1120,7 +1120,7 @@ SYM_CODE_START(iret_exc) · 70 unmodified lines | |||
| 1120 | SYM_CODE_END(iret_exc) | 1120 | SYM_CODE_END(iret_exc) |
| 1121 | .previous | 1121 | .previous |
| 1122 | _ASM_EXTABLE(.Lirq_return, iret_exc) | 1122 | _ASM_EXTABLE(.Lirq_return, iret_exc) |
| 1123 | ENDPROC(entry_INT80_32) | 1123 | SYM_FUNC_END(entry_INT80_32) |
| 1124 | 1124 | ||
| 1125 | .macro FIXUP_ESPFIX_STACK | 1125 | .macro FIXUP_ESPFIX_STACK |
| 1126 | /* | 1126 | /* |
| @@ -1213,7 +1213,7 @@ SYM_CODE_START_LOCAL(common_interrupt) · 86 unmodified lines | |||
| 1213 | SYM_CODE_END(common_interrupt) | 1213 | SYM_CODE_END(common_interrupt) |
| 1214 | 1214 | ||
| 1215 | #define BUILD_INTERRUPT3(name, nr, fn) \ | 1215 | #define BUILD_INTERRUPT3(name, nr, fn) \ |
| 1216 | ENTRY(name) \ | 1216 | SYM_FUNC_START(name) \ |
| 1217 | ASM_CLAC; \ | 1217 | ASM_CLAC; \ |
| 1218 | pushl $~(nr); \ | 1218 | pushl $~(nr); \ |
| 1219 | SAVE_ALL switch_stacks=1; \ | 1219 | SAVE_ALL switch_stacks=1; \ |
| @@ -1222,7 +1222,7 @@ ENTRY(name) \ · 2 unmodified lines | |||
| 1222 | movl %esp, %eax; \ | 1222 | movl %esp, %eax; \ |
| 1223 | call fn; \ | 1223 | call fn; \ |
| 1224 | jmp ret_from_intr; \ | 1224 | jmp ret_from_intr; \ |
| 1225 | ENDPROC(name) | 1225 | SYM_FUNC_END(name) |
| 1226 | 1226 | ||
| 1227 | #define BUILD_INTERRUPT(name, nr) \ | 1227 | #define BUILD_INTERRUPT(name, nr) \ |
| 1228 | BUILD_INTERRUPT3(name, nr, smp_##name); \ | 1228 | BUILD_INTERRUPT3(name, nr, smp_##name); \ |
| @@ -1341,7 +1341,7 @@ SYM_CODE_START(spurious_interrupt_bug) · 112 unmodified lines | |||
| 1341 | SYM_CODE_END(spurious_interrupt_bug) | 1341 | SYM_CODE_END(spurious_interrupt_bug) |
| 1342 | 1342 | ||
| 1343 | #ifdef CONFIG_XEN_PV | 1343 | #ifdef CONFIG_XEN_PV |
| 1344 | ENTRY(xen_hypervisor_callback) | 1344 | SYM_FUNC_START(xen_hypervisor_callback) |
| 1345 | pushl $-1 /* orig_ax = -1 => not a system call */ | 1345 | pushl $-1 /* orig_ax = -1 => not a system call */ |
| 1346 | SAVE_ALL | 1346 | SAVE_ALL |
| 1347 | ENCODE_FRAME_POINTER | 1347 | ENCODE_FRAME_POINTER |
| @@ -1369,7 +1369,7 @@ SYM_INNER_LABEL_ALIGN(xen_do_upcall, SYM_L_GLOBAL) · 21 unmodified lines | |||
| 1369 | call xen_maybe_preempt_hcall | 1369 | call xen_maybe_preempt_hcall |
| 1370 | #endif | 1370 | #endif |
| 1371 | jmp ret_from_intr | 1371 | jmp ret_from_intr |
| 1372 | ENDPROC(xen_hypervisor_callback) | 1372 | SYM_FUNC_END(xen_hypervisor_callback) |
| 1373 | 1373 | ||
| 1374 | /* | 1374 | /* |
| 1375 | * Hypervisor uses this for application faults while it executes. | 1375 | * Hypervisor uses this for application faults while it executes. |
| @@ -1383,7 +1383,7 @@ ENDPROC(xen_hypervisor_callback) · 7 unmodified lines | |||
| 1383 | * to pop the stack frame we end up in an infinite loop of failsafe callbacks. | 1383 | * to pop the stack frame we end up in an infinite loop of failsafe callbacks. |
| 1384 | * We distinguish between categories by maintaining a status value in EAX. | 1384 | * We distinguish between categories by maintaining a status value in EAX. |
| 1385 | */ | 1385 | */ |
| 1386 | ENTRY(xen_failsafe_callback) | 1386 | SYM_FUNC_START(xen_failsafe_callback) |
| 1387 | pushl %eax | 1387 | pushl %eax |
| 1388 | movl $1, %eax | 1388 | movl $1, %eax |
| 1389 | 1: mov 4(%esp), %ds | 1389 | 1: mov 4(%esp), %ds |
| @@ -1420,7 +1420,7 @@ ENTRY(xen_failsafe_callback) · 30 unmodified lines | |||
| 1420 | _ASM_EXTABLE(2b, 7b) | 1420 | _ASM_EXTABLE(2b, 7b) |
| 1421 | _ASM_EXTABLE(3b, 8b) | 1421 | _ASM_EXTABLE(3b, 8b) |
| 1422 | _ASM_EXTABLE(4b, 9b) | 1422 | _ASM_EXTABLE(4b, 9b) |
| 1423 | ENDPROC(xen_failsafe_callback) | 1423 | SYM_FUNC_END(xen_failsafe_callback) |
| 1424 | #endif /* CONFIG_XEN_PV */ | 1424 | #endif /* CONFIG_XEN_PV */ |
| 1425 | 1425 | ||
| 1426 | #ifdef CONFIG_XEN_PVHVM | 1426 | #ifdef CONFIG_XEN_PVHVM |
| @@ -180,12 +180,12 @@ SYM_CODE_END(startup_32) · 179 unmodified lines | |||
| 180 | * up already except stack. We just set up stack here. Then call | 180 | * up already except stack. We just set up stack here. Then call |
| 181 | * start_secondary(). | 181 | * start_secondary(). |
| 182 | */ | 182 | */ |
| 183 | ENTRY(start_cpu0) | 183 | SYM_FUNC_START(start_cpu0) |
| 184 | movl initial_stack, %ecx | 184 | movl initial_stack, %ecx |
| 185 | movl %ecx, %esp | 185 | movl %ecx, %esp |
| 186 | call *(initial_code) | 186 | call *(initial_code) |
| 187 | 1: jmp 1b | 187 | 1: jmp 1b |
| 188 | ENDPROC(start_cpu0) | 188 | SYM_FUNC_END(start_cpu0) |
| 189 | #endif | 189 | #endif |
| 190 | 190 | ||
| 191 | /* | 191 | /* |
| @@ -196,7 +196,7 @@ ENDPROC(start_cpu0) · 4 unmodified lines | |||
| 196 | * If cpu hotplug is not supported then this code can go in init section | 196 | * If cpu hotplug is not supported then this code can go in init section |
| 197 | * which will be freed later | 197 | * which will be freed later |
| 198 | */ | 198 | */ |
| 199 | ENTRY(startup_32_smp) | 199 | SYM_FUNC_START(startup_32_smp) |
| 200 | cld | 200 | cld |
| 201 | movl $(__BOOT_DS),%eax | 201 | movl $(__BOOT_DS),%eax |
| 202 | movl %eax,%ds | 202 | movl %eax,%ds |
| @@ -363,7 +363,7 @@ ENTRY(startup_32_smp) · 160 unmodified lines | |||
| 363 | 363 | ||
| 364 | call *(initial_code) | 364 | call *(initial_code) |
| 365 | 1: jmp 1b | 365 | 1: jmp 1b |
| 366 | ENDPROC(startup_32_smp) | 366 | SYM_FUNC_END(startup_32_smp) |
| 367 | 367 | ||
| 368 | #include "verify_cpu.S" | 368 | #include "verify_cpu.S" |
| 369 | 369 | ||
| @@ -393,7 +393,7 @@ setup_once: · 23 unmodified lines | |||
| 393 | andl $0,setup_once_ref /* Once is enough, thanks */ | 393 | andl $0,setup_once_ref /* Once is enough, thanks */ |
| 394 | ret | 394 | ret |
| 395 | 395 | ||
| 396 | ENTRY(early_idt_handler_array) | 396 | SYM_FUNC_START(early_idt_handler_array) |
| 397 | # 36(%esp) %eflags | 397 | # 36(%esp) %eflags |
| 398 | # 32(%esp) %cs | 398 | # 32(%esp) %cs |
| 399 | # 28(%esp) %eip | 399 | # 28(%esp) %eip |
| @@ -408,7 +408,7 @@ ENTRY(early_idt_handler_array) · 8 unmodified lines | |||
| 408 | i = i + 1 | 408 | i = i + 1 |
| 409 | .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc | 409 | .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc |
| 410 | .endr | 410 | .endr |
| 411 | ENDPROC(early_idt_handler_array) | 411 | SYM_FUNC_END(early_idt_handler_array) |
| 412 | 412 | ||
| 413 | SYM_CODE_START_LOCAL(early_idt_handler_common) | 413 | SYM_CODE_START_LOCAL(early_idt_handler_common) |
| 414 | /* | 414 | /* |
| @@ -464,7 +464,7 @@ SYM_CODE_START_LOCAL(early_idt_handler_common) · 49 unmodified lines | |||
| 464 | SYM_CODE_END(early_idt_handler_common) | 464 | SYM_CODE_END(early_idt_handler_common) |
| 465 | 465 | ||
| 466 | /* This is the default interrupt "handler" :-) */ | 466 | /* This is the default interrupt "handler" :-) */ |
| 467 | ENTRY(early_ignore_irq) | 467 | SYM_FUNC_START(early_ignore_irq) |
| 468 | cld | 468 | cld |
| 469 | #ifdef CONFIG_PRINTK | 469 | #ifdef CONFIG_PRINTK |
| 470 | pushl %eax | 470 | pushl %eax |
| @@ -499,7 +499,7 @@ ENTRY(early_ignore_irq) · 28 unmodified lines | |||
| 499 | hlt_loop: | 499 | hlt_loop: |
| 500 | hlt | 500 | hlt |
| 501 | jmp hlt_loop | 501 | jmp hlt_loop |
| 502 | ENDPROC(early_ignore_irq) | 502 | SYM_FUNC_END(early_ignore_irq) |
| 503 | 503 | ||
| 504 | __INITDATA | 504 | __INITDATA |
| 505 | .align 4 | 505 | .align 4 |
| @@ -20,10 +20,10 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #define BEGIN(op) \ | 21 | #define BEGIN(op) \ |
| 22 | .macro endp; \ | 22 | .macro endp; \ |
| 23 | ENDPROC(atomic64_##op##_386); \ | 23 | SYM_FUNC_END(atomic64_##op##_386); \ |
| 24 | .purgem endp; \ | 24 | .purgem endp; \ |
| 25 | .endm; \ | 25 | .endm; \ |
| 26 | ENTRY(atomic64_##op##_386); \ | 26 | SYM_FUNC_START(atomic64_##op##_386); \ |
| 27 | LOCK v; | 27 | LOCK v; |
| 28 | 28 | ||
| 29 | #define ENDP endp | 29 | #define ENDP endp |
| @@ -16,12 +16,12 @@ · 15 unmodified lines | |||
| 16 | cmpxchg8b (\reg) | 16 | cmpxchg8b (\reg) |
| 17 | .endm | 17 | .endm |
| 18 | 18 | ||
| 19 | ENTRY(atomic64_read_cx8) | 19 | SYM_FUNC_START(atomic64_read_cx8) |
| 20 | read64 %ecx | 20 | read64 %ecx |
| 21 | ret | 21 | ret |
| 22 | ENDPROC(atomic64_read_cx8) | 22 | SYM_FUNC_END(atomic64_read_cx8) |
| 23 | 23 | ||
| 24 | ENTRY(atomic64_set_cx8) | 24 | SYM_FUNC_START(atomic64_set_cx8) |
| 25 | 1: | 25 | 1: |
| 26 | /* we don't need LOCK_PREFIX since aligned 64-bit writes | 26 | /* we don't need LOCK_PREFIX since aligned 64-bit writes |
| 27 | * are atomic on 586 and newer */ | 27 | * are atomic on 586 and newer */ |
| @@ -29,19 +29,19 @@ ENTRY(atomic64_set_cx8) · 1 unmodified line | |||
| 29 | jne 1b | 29 | jne 1b |
| 30 | 30 | ||
| 31 | ret | 31 | ret |
| 32 | ENDPROC(atomic64_set_cx8) | 32 | SYM_FUNC_END(atomic64_set_cx8) |
| 33 | 33 | ||
| 34 | ENTRY(atomic64_xchg_cx8) | 34 | SYM_FUNC_START(atomic64_xchg_cx8) |
| 35 | 1: | 35 | 1: |
| 36 | LOCK_PREFIX | 36 | LOCK_PREFIX |
| 37 | cmpxchg8b (%esi) | 37 | cmpxchg8b (%esi) |
| 38 | jne 1b | 38 | jne 1b |
| 39 | 39 | ||
| 40 | ret | 40 | ret |
| 41 | ENDPROC(atomic64_xchg_cx8) | 41 | SYM_FUNC_END(atomic64_xchg_cx8) |
| 42 | 42 | ||
| 43 | .macro addsub_return func ins insc | 43 | .macro addsub_return func ins insc |
| 44 | ENTRY(atomic64_\func\()_return_cx8) | 44 | SYM_FUNC_START(atomic64_\func\()_return_cx8) |
| 45 | pushl %ebp | 45 | pushl %ebp |
| 46 | pushl %ebx | 46 | pushl %ebx |
| 47 | pushl %esi | 47 | pushl %esi |
| @@ -69,14 +69,14 @@ ENTRY(atomic64_\func\()_return_cx8) · 21 unmodified lines | |||
| 69 | popl %ebx | 69 | popl %ebx |
| 70 | popl %ebp | 70 | popl %ebp |
| 71 | ret | 71 | ret |
| 72 | ENDPROC(atomic64_\func\()_return_cx8) | 72 | SYM_FUNC_END(atomic64_\func\()_return_cx8) |
| 73 | .endm | 73 | .endm |
| 74 | 74 | ||
| 75 | addsub_return add add adc | 75 | addsub_return add add adc |
| 76 | addsub_return sub sub sbb | 76 | addsub_return sub sub sbb |
| 77 | 77 | ||
| 78 | .macro incdec_return func ins insc | 78 | .macro incdec_return func ins insc |
| 79 | ENTRY(atomic64_\func\()_return_cx8) | 79 | SYM_FUNC_START(atomic64_\func\()_return_cx8) |
| 80 | pushl %ebx | 80 | pushl %ebx |
| 81 | 81 | ||
| 82 | read64 %esi | 82 | read64 %esi |
| @@ -94,13 +94,13 @@ ENTRY(atomic64_\func\()_return_cx8) · 11 unmodified lines | |||
| 94 | movl %ecx, %edx | 94 | movl %ecx, %edx |
| 95 | popl %ebx | 95 | popl %ebx |
| 96 | ret | 96 | ret |
| 97 | ENDPROC(atomic64_\func\()_return_cx8) | 97 | SYM_FUNC_END(atomic64_\func\()_return_cx8) |
| 98 | .endm | 98 | .endm |
| 99 | 99 | ||
| 100 | incdec_return inc add adc | 100 | incdec_return inc add adc |
| 101 | incdec_return dec sub sbb | 101 | incdec_return dec sub sbb |
| 102 | 102 | ||
| 103 | ENTRY(atomic64_dec_if_positive_cx8) | 103 | SYM_FUNC_START(atomic64_dec_if_positive_cx8) |
| 104 | pushl %ebx | 104 | pushl %ebx |
| 105 | 105 | ||
| 106 | read64 %esi | 106 | read64 %esi |
| @@ -119,9 +119,9 @@ ENTRY(atomic64_dec_if_positive_cx8) · 12 unmodified lines | |||
| 119 | movl %ecx, %edx | 119 | movl %ecx, %edx |
| 120 | popl %ebx | 120 | popl %ebx |
| 121 | ret | 121 | ret |
| 122 | ENDPROC(atomic64_dec_if_positive_cx8) | 122 | SYM_FUNC_END(atomic64_dec_if_positive_cx8) |
| 123 | 123 | ||
| 124 | ENTRY(atomic64_add_unless_cx8) | 124 | SYM_FUNC_START(atomic64_add_unless_cx8) |
| 125 | pushl %ebp | 125 | pushl %ebp |
| 126 | pushl %ebx | 126 | pushl %ebx |
| 127 | /* these just push these two parameters on the stack */ | 127 | /* these just push these two parameters on the stack */ |
| @@ -155,9 +155,9 @@ ENTRY(atomic64_add_unless_cx8) · 27 unmodified lines | |||
| 155 | jne 2b | 155 | jne 2b |
| 156 | xorl %eax, %eax | 156 | xorl %eax, %eax |
| 157 | jmp 3b | 157 | jmp 3b |
| 158 | ENDPROC(atomic64_add_unless_cx8) | 158 | SYM_FUNC_END(atomic64_add_unless_cx8) |
| 159 | 159 | ||
| 160 | ENTRY(atomic64_inc_not_zero_cx8) | 160 | SYM_FUNC_START(atomic64_inc_not_zero_cx8) |
| 161 | pushl %ebx | 161 | pushl %ebx |
| 162 | 162 | ||
| 163 | read64 %esi | 163 | read64 %esi |
| @@ -177,4 +177,4 @@ ENTRY(atomic64_inc_not_zero_cx8) · 13 unmodified lines | |||
| 177 | 3: | 177 | 3: |
| 178 | popl %ebx | 178 | popl %ebx |
| 179 | ret | 179 | ret |
| 180 | ENDPROC(atomic64_inc_not_zero_cx8) | 180 | SYM_FUNC_END(atomic64_inc_not_zero_cx8) |
| @@ -46,7 +46,7 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) · 45 unmodified lines | |||
| 46 | * Fortunately, it is easy to convert 2-byte alignment to 4-byte | 46 | * Fortunately, it is easy to convert 2-byte alignment to 4-byte |
| 47 | * alignment for the unrolled loop. | 47 | * alignment for the unrolled loop. |
| 48 | */ | 48 | */ |
| 49 | ENTRY(csum_partial) | 49 | SYM_FUNC_START(csum_partial) |
| 50 | pushl %esi | 50 | pushl %esi |
| 51 | pushl %ebx | 51 | pushl %ebx |
| 52 | movl 20(%esp),%eax # Function arg: unsigned int sum | 52 | movl 20(%esp),%eax # Function arg: unsigned int sum |
| @@ -128,13 +128,13 @@ ENTRY(csum_partial) · 75 unmodified lines | |||
| 128 | popl %ebx | 128 | popl %ebx |
| 129 | popl %esi | 129 | popl %esi |
| 130 | ret | 130 | ret |
| 131 | ENDPROC(csum_partial) | 131 | SYM_FUNC_END(csum_partial) |
| 132 | 132 | ||
| 133 | #else | 133 | #else |
| 134 | 134 | ||
| 135 | /* Version for PentiumII/PPro */ | 135 | /* Version for PentiumII/PPro */ |
| 136 | 136 | ||
| 137 | ENTRY(csum_partial) | 137 | SYM_FUNC_START(csum_partial) |
| 138 | pushl %esi | 138 | pushl %esi |
| 139 | pushl %ebx | 139 | pushl %ebx |
| 140 | movl 20(%esp),%eax # Function arg: unsigned int sum | 140 | movl 20(%esp),%eax # Function arg: unsigned int sum |
| @@ -246,7 +246,7 @@ ENTRY(csum_partial) · 105 unmodified lines | |||
| 246 | popl %ebx | 246 | popl %ebx |
| 247 | popl %esi | 247 | popl %esi |
| 248 | ret | 248 | ret |
| 249 | ENDPROC(csum_partial) | 249 | SYM_FUNC_END(csum_partial) |
| 250 | 250 | ||
| 251 | #endif | 251 | #endif |
| 252 | EXPORT_SYMBOL(csum_partial) | 252 | EXPORT_SYMBOL(csum_partial) |
| @@ -75,7 +75,7 @@ FPU_result_1: · 74 unmodified lines | |||
| 75 | 75 | ||
| 76 | 76 | ||
| 77 | .text | 77 | .text |
| 78 | ENTRY(div_Xsig) | 78 | SYM_FUNC_START(div_Xsig) |
| 79 | pushl %ebp | 79 | pushl %ebp |
| 80 | movl %esp,%ebp | 80 | movl %esp,%ebp |
| 81 | #ifndef NON_REENTRANT_FPU | 81 | #ifndef NON_REENTRANT_FPU |
| @@ -364,4 +364,4 @@ L_bugged_2: · 282 unmodified lines | |||
| 364 | pop %ebx | 364 | pop %ebx |
| 365 | jmp L_exit | 365 | jmp L_exit |
| 366 | #endif /* PARANOID */ | 366 | #endif /* PARANOID */ |
| 367 | ENDPROC(div_Xsig) | 367 | SYM_FUNC_END(div_Xsig) |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | |||
| 19 | #include "fpu_emu.h" | 19 | #include "fpu_emu.h" |
| 20 | 20 | ||
| 21 | .text | 21 | .text |
| 22 | ENTRY(FPU_div_small) | 22 | SYM_FUNC_START(FPU_div_small) |
| 23 | pushl %ebp | 23 | pushl %ebp |
| 24 | movl %esp,%ebp | 24 | movl %esp,%ebp |
| 25 | 25 | ||
| @@ -45,4 +45,4 @@ ENTRY(FPU_div_small) · 19 unmodified lines | |||
| 45 | 45 | ||
| 46 | leave | 46 | leave |
| 47 | ret | 47 | ret |
| 48 | ENDPROC(FPU_div_small) | 48 | SYM_FUNC_END(FPU_div_small) |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "fpu_emu.h" | 25 | #include "fpu_emu.h" |
| 26 | 26 | ||
| 27 | .text | 27 | .text |
| 28 | ENTRY(mul32_Xsig) | 28 | SYM_FUNC_START(mul32_Xsig) |
| 29 | pushl %ebp | 29 | pushl %ebp |
| 30 | movl %esp,%ebp | 30 | movl %esp,%ebp |
| 31 | subl $16,%esp | 31 | subl $16,%esp |
| @@ -63,10 +63,10 @@ ENTRY(mul32_Xsig) · 31 unmodified lines | |||
| 63 | popl %esi | 63 | popl %esi |
| 64 | leave | 64 | leave |
| 65 | ret | 65 | ret |
| 66 | ENDPROC(mul32_Xsig) | 66 | SYM_FUNC_END(mul32_Xsig) |
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | ENTRY(mul64_Xsig) | 69 | SYM_FUNC_START(mul64_Xsig) |
| 70 | pushl %ebp | 70 | pushl %ebp |
| 71 | movl %esp,%ebp | 71 | movl %esp,%ebp |
| 72 | subl $16,%esp | 72 | subl $16,%esp |
| @@ -116,11 +116,11 @@ ENTRY(mul64_Xsig) · 43 unmodified lines | |||
| 116 | popl %esi | 116 | popl %esi |
| 117 | leave | 117 | leave |
| 118 | ret | 118 | ret |
| 119 | ENDPROC(mul64_Xsig) | 119 | SYM_FUNC_END(mul64_Xsig) |
| 120 | 120 | ||
| 121 | 121 | ||
| 122 | 122 | ||
| 123 | ENTRY(mul_Xsig_Xsig) | 123 | SYM_FUNC_START(mul_Xsig_Xsig) |
| 124 | pushl %ebp | 124 | pushl %ebp |
| 125 | movl %esp,%ebp | 125 | movl %esp,%ebp |
| 126 | subl $16,%esp | 126 | subl $16,%esp |
| @@ -176,4 +176,4 @@ ENTRY(mul_Xsig_Xsig) · 49 unmodified lines | |||
| 176 | popl %esi | 176 | popl %esi |
| 177 | leave | 177 | leave |
| 178 | ret | 178 | ret |
| 179 | ENDPROC(mul_Xsig_Xsig) | 179 | SYM_FUNC_END(mul_Xsig_Xsig) |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | |||
| 37 | #define OVERFLOWED -16(%ebp) /* addition overflow flag */ | 37 | #define OVERFLOWED -16(%ebp) /* addition overflow flag */ |
| 38 | 38 | ||
| 39 | .text | 39 | .text |
| 40 | ENTRY(polynomial_Xsig) | 40 | SYM_FUNC_START(polynomial_Xsig) |
| 41 | pushl %ebp | 41 | pushl %ebp |
| 42 | movl %esp,%ebp | 42 | movl %esp,%ebp |
| 43 | subl $32,%esp | 43 | subl $32,%esp |
| @@ -134,4 +134,4 @@ L_accum_done: · 90 unmodified lines | |||
| 134 | popl %esi | 134 | popl %esi |
| 135 | leave | 135 | leave |
| 136 | ret | 136 | ret |
| 137 | ENDPROC(polynomial_Xsig) | 137 | SYM_FUNC_END(polynomial_Xsig) |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | .text | 24 | .text |
| 25 | ENTRY(FPU_normalize) | 25 | SYM_FUNC_START(FPU_normalize) |
| 26 | pushl %ebp | 26 | pushl %ebp |
| 27 | movl %esp,%ebp | 27 | movl %esp,%ebp |
| 28 | pushl %ebx | 28 | pushl %ebx |
| @@ -95,12 +95,12 @@ L_overflow: · 66 unmodified lines | |||
| 95 | call arith_overflow | 95 | call arith_overflow |
| 96 | pop %ebx | 96 | pop %ebx |
| 97 | jmp L_exit | 97 | jmp L_exit |
| 98 | ENDPROC(FPU_normalize) | 98 | SYM_FUNC_END(FPU_normalize) |
| 99 | 99 | ||
| 100 | 100 | ||
| 101 | 101 | ||
| 102 | /* Normalise without reporting underflow or overflow */ | 102 | /* Normalise without reporting underflow or overflow */ |
| 103 | ENTRY(FPU_normalize_nuo) | 103 | SYM_FUNC_START(FPU_normalize_nuo) |
| 104 | pushl %ebp | 104 | pushl %ebp |
| 105 | movl %esp,%ebp | 105 | movl %esp,%ebp |
| 106 | pushl %ebx | 106 | pushl %ebx |
| @@ -147,4 +147,4 @@ L_exit_nuo_zero: · 40 unmodified lines | |||
| 147 | popl %ebx | 147 | popl %ebx |
| 148 | leave | 148 | leave |
| 149 | ret | 149 | ret |
| 150 | ENDPROC(FPU_normalize_nuo) | 150 | SYM_FUNC_END(FPU_normalize_nuo) |
| @@ -109,7 +109,7 @@ FPU_denormal: · 108 unmodified lines | |||
| 109 | .globl fpu_Arith_exit | 109 | .globl fpu_Arith_exit |
| 110 | 110 | ||
| 111 | /* Entry point when called from C */ | 111 | /* Entry point when called from C */ |
| 112 | ENTRY(FPU_round) | 112 | SYM_FUNC_START(FPU_round) |
| 113 | pushl %ebp | 113 | pushl %ebp |
| 114 | movl %esp,%ebp | 114 | movl %esp,%ebp |
| 115 | pushl %esi | 115 | pushl %esi |
| @@ -708,4 +708,4 @@ L_exception_exit: · 592 unmodified lines | |||
| 708 | jmp fpu_reg_round_special_exit | 708 | jmp fpu_reg_round_special_exit |
| 709 | #endif /* PARANOID */ | 709 | #endif /* PARANOID */ |
| 710 | 710 | ||
| 711 | ENDPROC(FPU_round) | 711 | SYM_FUNC_END(FPU_round) |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "control_w.h" | 32 | #include "control_w.h" |
| 33 | 33 | ||
| 34 | .text | 34 | .text |
| 35 | ENTRY(FPU_u_add) | 35 | SYM_FUNC_START(FPU_u_add) |
| 36 | pushl %ebp | 36 | pushl %ebp |
| 37 | movl %esp,%ebp | 37 | movl %esp,%ebp |
| 38 | pushl %esi | 38 | pushl %esi |
| @@ -166,4 +166,4 @@ L_exit: · 127 unmodified lines | |||
| 166 | leave | 166 | leave |
| 167 | ret | 167 | ret |
| 168 | #endif /* PARANOID */ | 168 | #endif /* PARANOID */ |
| 169 | ENDPROC(FPU_u_add) | 169 | SYM_FUNC_END(FPU_u_add) |
| @@ -75,7 +75,7 @@ FPU_ovfl_flag: · 74 unmodified lines | |||
| 75 | #define DEST PARAM3 | 75 | #define DEST PARAM3 |
| 76 | 76 | ||
| 77 | .text | 77 | .text |
| 78 | ENTRY(FPU_u_div) | 78 | SYM_FUNC_START(FPU_u_div) |
| 79 | pushl %ebp | 79 | pushl %ebp |
| 80 | movl %esp,%ebp | 80 | movl %esp,%ebp |
| 81 | #ifndef NON_REENTRANT_FPU | 81 | #ifndef NON_REENTRANT_FPU |
| @@ -471,4 +471,4 @@ L_exit: · 389 unmodified lines | |||
| 471 | ret | 471 | ret |
| 472 | #endif /* PARANOID */ | 472 | #endif /* PARANOID */ |
| 473 | 473 | ||
| 474 | ENDPROC(FPU_u_div) | 474 | SYM_FUNC_END(FPU_u_div) |
| @@ -45,7 +45,7 @@ FPU_accum_1: · 44 unmodified lines | |||
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | .text | 47 | .text |
| 48 | ENTRY(FPU_u_mul) | 48 | SYM_FUNC_START(FPU_u_mul) |
| 49 | pushl %ebp | 49 | pushl %ebp |
| 50 | movl %esp,%ebp | 50 | movl %esp,%ebp |
| 51 | #ifndef NON_REENTRANT_FPU | 51 | #ifndef NON_REENTRANT_FPU |
| @@ -147,4 +147,4 @@ L_exit: · 95 unmodified lines | |||
| 147 | ret | 147 | ret |
| 148 | #endif /* PARANOID */ | 148 | #endif /* PARANOID */ |
| 149 | 149 | ||
| 150 | ENDPROC(FPU_u_mul) | 150 | SYM_FUNC_END(FPU_u_mul) |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | #include "control_w.h" | 33 | #include "control_w.h" |
| 34 | 34 | ||
| 35 | .text | 35 | .text |
| 36 | ENTRY(FPU_u_sub) | 36 | SYM_FUNC_START(FPU_u_sub) |
| 37 | pushl %ebp | 37 | pushl %ebp |
| 38 | movl %esp,%ebp | 38 | movl %esp,%ebp |
| 39 | pushl %esi | 39 | pushl %esi |
| @@ -271,4 +271,4 @@ L_exit: · 231 unmodified lines | |||
| 271 | popl %esi | 271 | popl %esi |
| 272 | leave | 272 | leave |
| 273 | ret | 273 | ret |
| 274 | ENDPROC(FPU_u_sub) | 274 | SYM_FUNC_END(FPU_u_sub) |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | .text | 25 | .text |
| 26 | ENTRY(round_Xsig) | 26 | SYM_FUNC_START(round_Xsig) |
| 27 | pushl %ebp | 27 | pushl %ebp |
| 28 | movl %esp,%ebp | 28 | movl %esp,%ebp |
| 29 | pushl %ebx /* Reserve some space */ | 29 | pushl %ebx /* Reserve some space */ |
| @@ -79,11 +79,11 @@ L_exit: · 49 unmodified lines | |||
| 79 | popl %ebx | 79 | popl %ebx |
| 80 | leave | 80 | leave |
| 81 | ret | 81 | ret |
| 82 | ENDPROC(round_Xsig) | 82 | SYM_FUNC_END(round_Xsig) |
| 83 | 83 | ||
| 84 | 84 | ||
| 85 | 85 | ||
| 86 | ENTRY(norm_Xsig) | 86 | SYM_FUNC_START(norm_Xsig) |
| 87 | pushl %ebp | 87 | pushl %ebp |
| 88 | movl %esp,%ebp | 88 | movl %esp,%ebp |
| 89 | pushl %ebx /* Reserve some space */ | 89 | pushl %ebx /* Reserve some space */ |
| @@ -139,4 +139,4 @@ L_n_exit: · 49 unmodified lines | |||
| 139 | popl %ebx | 139 | popl %ebx |
| 140 | leave | 140 | leave |
| 141 | ret | 141 | ret |
| 142 | ENDPROC(norm_Xsig) | 142 | SYM_FUNC_END(norm_Xsig) |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "fpu_emu.h" | 22 | #include "fpu_emu.h" |
| 23 | 23 | ||
| 24 | .text | 24 | .text |
| 25 | ENTRY(shr_Xsig) | 25 | SYM_FUNC_START(shr_Xsig) |
| 26 | push %ebp | 26 | push %ebp |
| 27 | movl %esp,%ebp | 27 | movl %esp,%ebp |
| 28 | pushl %esi | 28 | pushl %esi |
| @@ -86,4 +86,4 @@ L_more_than_95: · 57 unmodified lines | |||
| 86 | popl %esi | 86 | popl %esi |
| 87 | leave | 87 | leave |
| 88 | ret | 88 | ret |
| 89 | ENDPROC(shr_Xsig) | 89 | SYM_FUNC_END(shr_Xsig) |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | | Results returned in the 64 bit arg and eax. | | 33 | | Results returned in the 64 bit arg and eax. | |
| 34 | +---------------------------------------------------------------------------*/ | 34 | +---------------------------------------------------------------------------*/ |
| 35 | 35 | ||
| 36 | ENTRY(FPU_shrx) | 36 | SYM_FUNC_START(FPU_shrx) |
| 37 | push %ebp | 37 | push %ebp |
| 38 | movl %esp,%ebp | 38 | movl %esp,%ebp |
| 39 | pushl %esi | 39 | pushl %esi |
| @@ -93,7 +93,7 @@ L_more_than_95: · 53 unmodified lines | |||
| 93 | popl %esi | 93 | popl %esi |
| 94 | leave | 94 | leave |
| 95 | ret | 95 | ret |
| 96 | ENDPROC(FPU_shrx) | 96 | SYM_FUNC_END(FPU_shrx) |
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | /*---------------------------------------------------------------------------+ | 99 | /*---------------------------------------------------------------------------+ |
| @@ -112,7 +112,7 @@ ENDPROC(FPU_shrx) · 12 unmodified lines | |||
| 112 | | part which has been shifted out of the arg. | | 112 | | part which has been shifted out of the arg. | |
| 113 | | Results returned in the 64 bit arg and eax. | | 113 | | Results returned in the 64 bit arg and eax. | |
| 114 | +---------------------------------------------------------------------------*/ | 114 | +---------------------------------------------------------------------------*/ |
| 115 | ENTRY(FPU_shrxs) | 115 | SYM_FUNC_START(FPU_shrxs) |
| 116 | push %ebp | 116 | push %ebp |
| 117 | movl %esp,%ebp | 117 | movl %esp,%ebp |
| 118 | pushl %esi | 118 | pushl %esi |
| @@ -204,4 +204,4 @@ Ls_more_than_95: · 85 unmodified lines | |||
| 204 | popl %esi | 204 | popl %esi |
| 205 | leave | 205 | leave |
| 206 | ret | 206 | ret |
| 207 | ENDPROC(FPU_shrxs) | 207 | SYM_FUNC_END(FPU_shrxs) |
| @@ -75,7 +75,7 @@ FPU_fsqrt_arg_0: · 74 unmodified lines | |||
| 75 | 75 | ||
| 76 | 76 | ||
| 77 | .text | 77 | .text |
| 78 | ENTRY(wm_sqrt) | 78 | SYM_FUNC_START(wm_sqrt) |
| 79 | pushl %ebp | 79 | pushl %ebp |
| 80 | movl %esp,%ebp | 80 | movl %esp,%ebp |
| 81 | #ifndef NON_REENTRANT_FPU | 81 | #ifndef NON_REENTRANT_FPU |
| @@ -469,4 +469,4 @@ sqrt_more_prec_large: · 387 unmodified lines | |||
| 469 | /* Our estimate is too large */ | 469 | /* Our estimate is too large */ |
| 470 | movl $0x7fffff00,%eax | 470 | movl $0x7fffff00,%eax |
| 471 | jmp sqrt_round_result | 471 | jmp sqrt_round_result |
| 472 | ENDPROC(wm_sqrt) | 472 | SYM_FUNC_END(wm_sqrt) |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | .text | 24 | .text |
| 25 | ENTRY(efi_call_phys) | 25 | SYM_FUNC_START(efi_call_phys) |
| 26 | /* | 26 | /* |
| 27 | * 0. The function can only be called in Linux kernel. So CS has been | 27 | * 0. The function can only be called in Linux kernel. So CS has been |
| 28 | * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found | 28 | * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found |
| @@ -114,7 +114,7 @@ ENTRY(efi_call_phys) · 85 unmodified lines | |||
| 114 | movl (%edx), %ecx | 114 | movl (%edx), %ecx |
| 115 | pushl %ecx | 115 | pushl %ecx |
| 116 | ret | 116 | ret |
| 117 | ENDPROC(efi_call_phys) | 117 | SYM_FUNC_END(efi_call_phys) |
| 118 | .previous | 118 | .previous |
| 119 | 119 | ||
| 120 | .data | 120 | .data |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | |||
| 16 | 16 | ||
| 17 | .text | 17 | .text |
| 18 | 18 | ||
| 19 | ENTRY(swsusp_arch_suspend) | 19 | SYM_FUNC_START(swsusp_arch_suspend) |
| 20 | movl %esp, saved_context_esp | 20 | movl %esp, saved_context_esp |
| 21 | movl %ebx, saved_context_ebx | 21 | movl %ebx, saved_context_ebx |
| 22 | movl %ebp, saved_context_ebp | 22 | movl %ebp, saved_context_ebp |
| @@ -33,7 +33,7 @@ ENTRY(swsusp_arch_suspend) · 10 unmodified lines | |||
| 33 | call swsusp_save | 33 | call swsusp_save |
| 34 | FRAME_END | 34 | FRAME_END |
| 35 | ret | 35 | ret |
| 36 | ENDPROC(swsusp_arch_suspend) | 36 | SYM_FUNC_END(swsusp_arch_suspend) |
| 37 | 37 | ||
| 38 | SYM_CODE_START(restore_image) | 38 | SYM_CODE_START(restore_image) |
| 39 | /* prepare to jump to the image kernel */ | 39 | /* prepare to jump to the image kernel */ |
| @@ -82,7 +82,7 @@ SYM_CODE_END(core_restore_code) · 42 unmodified lines | |||
| 82 | 82 | ||
| 83 | /* code below belongs to the image kernel */ | 83 | /* code below belongs to the image kernel */ |
| 84 | .align PAGE_SIZE | 84 | .align PAGE_SIZE |
| 85 | ENTRY(restore_registers) | 85 | SYM_FUNC_START(restore_registers) |
| 86 | /* go back to the original page tables */ | 86 | /* go back to the original page tables */ |
| 87 | movl %ebp, %cr3 | 87 | movl %ebp, %cr3 |
| 88 | movl mmu_cr4_features, %ecx | 88 | movl mmu_cr4_features, %ecx |
| @@ -109,4 +109,4 @@ ENTRY(restore_registers) · 20 unmodified lines | |||
| 109 | movl %eax, in_suspend | 109 | movl %eax, in_suspend |
| 110 | 110 | ||
| 111 | ret | 111 | ret |
| 112 | ENDPROC(restore_registers) | 112 | SYM_FUNC_END(restore_registers) |
| @@ -112,15 +112,13 @@ · 111 unmodified lines | |||
| 112 | .globl name ASM_NL \ | 112 | .globl name ASM_NL \ |
| 113 | name: | 113 | name: |
| 114 | #endif | 114 | #endif |
| 115 | #endif | ||
| 116 | 115 | ||
| 117 | #ifndef CONFIG_X86_64 | ||
| 118 | #ifndef ENTRY | 116 | #ifndef ENTRY |
| 119 | /* deprecated, use SYM_FUNC_START */ | 117 | /* deprecated, use SYM_FUNC_START */ |
| 120 | #define ENTRY(name) \ | 118 | #define ENTRY(name) \ |
| 121 | SYM_FUNC_START(name) | 119 | SYM_FUNC_START(name) |
| 122 | #endif | 120 | #endif |
| 123 | #endif /* CONFIG_X86_64 */ | 121 | #endif /* CONFIG_X86 */ |
| 124 | #endif /* LINKER_SCRIPT */ | 122 | #endif /* LINKER_SCRIPT */ |
| 125 | 123 | ||
| 126 | #ifndef WEAK | 124 | #ifndef WEAK |
| @@ -135,9 +133,7 @@ · 8 unmodified lines | |||
| 135 | #define END(name) \ | 133 | #define END(name) \ |
| 136 | .size name, .-name | 134 | .size name, .-name |
| 137 | #endif | 135 | #endif |
| 138 | #endif /* CONFIG_X86 */ | ||
| 139 | 136 | ||
| 140 | #ifndef CONFIG_X86_64 | ||
| 141 | /* If symbol 'name' is treated as a subroutine (gets called, and returns) | 137 | /* If symbol 'name' is treated as a subroutine (gets called, and returns) |
| 142 | * then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of | 138 | * then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of |
| 143 | * static analysis tools such as stack depth analyzer. | 139 | * static analysis tools such as stack depth analyzer. |
| @@ -147,7 +143,7 @@ · 3 unmodified lines | |||
| 147 | #define ENDPROC(name) \ | 143 | #define ENDPROC(name) \ |
| 148 | SYM_FUNC_END(name) | 144 | SYM_FUNC_END(name) |
| 149 | #endif | 145 | #endif |
| 150 | #endif /* CONFIG_X86_64 */ | 146 | #endif /* CONFIG_X86 */ |
| 151 | 147 | ||
| 152 | /* === generic annotations === */ | 148 | /* === generic annotations === */ |
| 153 | 149 | ||