Index: src/forwarding/apple-forwarding-arm.S ================================================================== --- src/forwarding/apple-forwarding-arm.S +++ src/forwarding/apple-forwarding-arm.S @@ -16,16 +16,16 @@ .globl _of_forward .globl _of_forward_stret .section __TEXT, __objc_methname, cstring_literals -L_str_forwardingTargetForSelector_: +str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -L_sel_forwardingTargetForSelector_: - .long L_str_forwardingTargetForSelector_ +sel_forwardingTargetForSelector_: + .long str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -33,50 +33,50 @@ .align 2 _of_forward: stmfd sp!, {r0-r4, lr} fstmfdd sp!, {d0-d7} - ldr r4, L_sel_forwardingTargetForSelector_$indirect_L0 + ldr r4, sel_forwardingTargetForSelector_$indirect_L0 L0: ldr r4, [pc, r4] blx _object_getClass mov r1, r4 blx _class_respondsToSelector cmp r0, #0 - beq fail + beq 0f ldr r0, [sp, #64] mov r1, r4 ldr r2, [sp, #68] blx _objc_msgSend cmp r0, #0 - beq fail + beq 0f ldr r1, [sp, #64] cmp r0, r1 - beq fail + beq 0f fldmfdd sp!, {d0-d7} add sp, sp, #4 @ throw away r0 ldmfd sp!, {r1-r4, lr} b _objc_msgSend -fail: +0: fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b _of_method_not_found .align 2 _of_forward_stret: stmfd sp!, {r0-r4, lr} fstmfdd sp!, {d0-d7} - ldr r4, L_sel_forwardingTargetForSelector_$indirect_L1 + ldr r4, sel_forwardingTargetForSelector_$indirect_L1 L1: ldr r4, [pc, r4] mov r0, r1 blx _object_getClass @@ -83,22 +83,22 @@ mov r1, r4 blx _class_respondsToSelector cmp r0, #0 - beq fail_stret + beq 0f ldr r0, [sp, #68] mov r1, r4 ldr r2, [sp, #72] blx _objc_msgSend cmp r0, #0 - beq fail_stret + beq 0f ldr r1, [sp, #68] cmp r0, r1 - beq fail_stret + beq 0f mov r1, r0 fldmfdd sp!, {d0-d7} ldmfd sp!, {r0} @@ -105,16 +105,16 @@ add sp, sp, #4 @ throw away r1 ldmfd sp!, {r2-r4, lr} b _objc_msgSend_stret -fail_stret: +0: fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b _of_method_not_found_stret .data_region -L_sel_forwardingTargetForSelector_$indirect_L0: - .long L_sel_forwardingTargetForSelector_-(L0+8) -L_sel_forwardingTargetForSelector_$indirect_L1: - .long L_sel_forwardingTargetForSelector_-(L1+8) +sel_forwardingTargetForSelector_$indirect_L0: + .long sel_forwardingTargetForSelector_-(L0+8) +sel_forwardingTargetForSelector_$indirect_L1: + .long sel_forwardingTargetForSelector_-(L1+8) .end_data_region Index: src/forwarding/apple-forwarding-arm64.S ================================================================== --- src/forwarding/apple-forwarding-arm64.S +++ src/forwarding/apple-forwarding-arm64.S @@ -16,16 +16,16 @@ .globl _of_forward .globl _of_forward_stret .section __TEXT, __objc_methname, cstring_literals -L_str_forwardingTargetForSelector_: +str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -L_sel_forwardingTargetForSelector_: - .quad L_str_forwardingTargetForSelector_ +sel_forwardingTargetForSelector_: + .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -48,27 +48,27 @@ stp q4, q5, [sp, #144] stp q6, q7, [sp, #176] bl _object_getClass - adrp x19, L_sel_forwardingTargetForSelector_@PAGE - add x19, x19, L_sel_forwardingTargetForSelector_@PAGEOFF + adrp x19, sel_forwardingTargetForSelector_@PAGE + add x19, x19, sel_forwardingTargetForSelector_@PAGEOFF ldr x19, [x19] mov x1, x19 bl _class_respondsToSelector - cbz x0, fail + cbz x0, 0f ldp x0, x2, [sp] mov x1, x19 bl _objc_msgSend - cbz x0, fail + cbz x0, 0f ldr x1, [sp] cmp x0, x1 - b.eq fail + b.eq 0f /* Restore all arguments, x8 and x19, but not x0 */ ldr x1, [sp, #8] ldp x2, x3, [sp, #16] ldp x4, x5, [sp, #32] @@ -84,13 +84,13 @@ mov sp, fp ldp fp, lr, [sp], #208 b _objc_msgSend -fail: +0: ldp x0, x1, [sp] ldr x19, [sp, #72] mov sp, fp ldp fp, lr, [sp], #208 b _of_method_not_found Index: src/forwarding/apple-forwarding-i386.S ================================================================== --- src/forwarding/apple-forwarding-i386.S +++ src/forwarding/apple-forwarding-i386.S @@ -16,16 +16,16 @@ .globl _of_forward .globl _of_forward_stret .section __TEXT, __cstring, cstring_literals -L_str_forwardingTargetForSelector_: +str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __OBJC, __message_refs, literal_pointers, no_dead_strip -L_sel_forwardingTargetForSelector_: - .long L_str_forwardingTargetForSelector_ +sel_forwardingTargetForSelector_: + .long str_forwardingTargetForSelector_ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -35,46 +35,46 @@ pushl %ebx subl $20, %esp call get_eip -.L0: +0: movl 8(%ebp), %eax movl %eax, (%esp) call _object_getClass movl %eax, (%esp) - movl L_sel_forwardingTargetForSelector_-.L0(%ebx), %eax + movl sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) call _class_respondsToSelector testl %eax, %eax - jz fail + jz 0f movl 8(%ebp), %eax movl %eax, (%esp) - movl L_sel_forwardingTargetForSelector_-.L0(%ebx), %eax + movl sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) movl 12(%ebp), %eax movl %eax, 8(%esp) call _objc_msgSend testl %eax, %eax - jz fail + jz 0f cmpl 8(%ebp), %eax - je fail + je 0f movl %eax, 8(%ebp) addl $20, %esp popl %ebx popl %ebp jmp _objc_msgSend -fail: +0: addl $20, %esp popl %ebx popl %ebp jmp _of_method_not_found @@ -85,50 +85,50 @@ pushl %ebx subl $20, %esp call get_eip -.L1: +0: movl 12(%ebp), %eax movl %eax, (%esp) call _object_getClass movl %eax, (%esp) - movl L_sel_forwardingTargetForSelector_-.L1(%ebx), %eax + movl sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) call _class_respondsToSelector testl %eax, %eax - jz fail_stret + jz 0f movl 12(%ebp), %eax movl %eax, (%esp) - movl L_sel_forwardingTargetForSelector_-.L1(%ebx), %eax + movl sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) movl 16(%ebp), %eax movl %eax, 8(%esp) call _objc_msgSend testl %eax, %eax - jz fail_stret + jz 0f cmpl 12(%ebp), %eax - je fail_stret + je 0f movl %eax, 12(%ebp) addl $20, %esp popl %ebx popl %ebp jmp _objc_msgSend_stret -fail_stret: +0: addl $20, %esp popl %ebx popl %ebp jmp _of_method_not_found_stret get_eip: movl (%esp), %ebx ret Index: src/forwarding/apple-forwarding-ppc.S ================================================================== --- src/forwarding/apple-forwarding-ppc.S +++ src/forwarding/apple-forwarding-ppc.S @@ -16,16 +16,16 @@ .globl _of_forward .globl _of_forward_stret .section __TEXT, __cstring, cstring_literals -L_str_forwardingTargetForSelector_: +str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __OBJC, __message_refs, literal_pointers, no_dead_strip -L_sel_forwardingTargetForSelector_: - .long L_str_forwardingTargetForSelector_ +sel_forwardingTargetForSelector_: + .long str_forwardingTargetForSelector_ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -65,32 +65,32 @@ stfd f12, 176(r1) stfd f13, 184(r1) bl _object_getClass - bl L0 -L0: + bl 0f +0: mflr r13 - addis r13, r13, ha16(L_sel_forwardingTargetForSelector_-L0) - lwz r13, lo16(L_sel_forwardingTargetForSelector_-L0)(r13) + addis r13, r13, ha16(sel_forwardingTargetForSelector_-0b) + lwz r13, lo16(sel_forwardingTargetForSelector_-0b)(r13) mr r4, r13 bl _class_respondsToSelector cmpwi r3, 0 - beq- fail + beq- 0f lwz r3, 216(r1) mr r4, r13 lwz r5, 220(r1) bl _objc_msgSend cmpwi r3, 0 - beq- fail + beq- 0f lwz r4, 216(r1) cmpw r3, r4 - beq- fail + beq- 0f /* Restore all arguments and r13, except r3 */ lwz r4, 220(r1) lwz r5, 56(r1) lwz r6, 60(r1) @@ -119,11 +119,11 @@ lwz r0, 8(r1) mtlr r0 b _objc_msgSend -fail: +0: lwz r3, 216(r1) lwz r4, 220(r1) addi r1, r1, 192 lwz r0, 8(r1) @@ -168,32 +168,32 @@ stfd f13, 176(r1) mr r3, r4 bl _object_getClass - bl L1 -L1: + bl 0f +0: mflr r13 - addis r13, r13, ha16(L_sel_forwardingTargetForSelector_-L1) - lwz r13, lo16(L_sel_forwardingTargetForSelector_-L1)(r13) + addis r13, r13, ha16(sel_forwardingTargetForSelector_-0b) + lwz r13, lo16(sel_forwardingTargetForSelector_-0b)(r13) mr r4, r13 bl _class_respondsToSelector cmpwi r3, 0 - beq- fail_stret + beq- 0f lwz r3, 212(r1) mr r4, r13 lwz r5, 216(r1) bl _objc_msgSend cmpwi r3, 0 - beq- fail_stret + beq- 0f lwz r4, 212(r1) cmpw r3, r4 - beq- fail_stret + beq- 0f mr r4, r3 /* Restore all arguments and r13, except r4 */ lwz r3, 208(r1) @@ -224,15 +224,15 @@ lwz r0, 8(r1) mtlr r0 b _objc_msgSend_stret -fail_stret: +0: lwz r3, 208(r1) lwz r4, 212(r1) lwz r5, 216(r1) addi r1, r1, 184 lwz r0, 8(r1) mtlr r0 b _of_method_not_found_stret Index: src/forwarding/apple-forwarding-x86_64.S ================================================================== --- src/forwarding/apple-forwarding-x86_64.S +++ src/forwarding/apple-forwarding-x86_64.S @@ -16,16 +16,16 @@ .globl _of_forward .globl _of_forward_stret .section __TEXT, __objc_methname, cstring_literals -L_str_forwardingTargetForSelector_: +str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -L_sel_forwardingTargetForSelector_: - .quad L_str_forwardingTargetForSelector_ +sel_forwardingTargetForSelector_: + .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -52,25 +52,25 @@ movdqa %xmm7, -0xC0(%rbp) call _object_getClass movq %rax, %rdi - movq L_sel_forwardingTargetForSelector_(%rip), %rsi + movq sel_forwardingTargetForSelector_(%rip), %rsi call _class_respondsToSelector testq %rax, %rax - jz fail + jz 0f movq -0x10(%rbp), %rdi - movq L_sel_forwardingTargetForSelector_(%rip), %rsi + movq sel_forwardingTargetForSelector_(%rip), %rsi movq -0x18(%rbp), %rdx call _objc_msgSend testq %rax, %rax - jz fail + jz 0f cmpq -0x10(%rbp), %rax - je fail + je 0f movq %rax, %rdi /* Restore all arguments, except %rdi */ movdqa -0xC0(%rbp), %xmm7 @@ -91,11 +91,11 @@ movq %rbp, %rsp popq %rbp jmp _objc_msgSend -fail: +0: movq -0x10(%rbp), %rdi movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp @@ -126,24 +126,24 @@ movq %rsi, %rdi call _object_getClass movq %rax, %rdi - movq L_sel_forwardingTargetForSelector_(%rip), %rsi + movq sel_forwardingTargetForSelector_(%rip), %rsi call _class_respondsToSelector testq %rax, %rax - jz fail_stret + jz 0f movq -0x18(%rbp), %rdi - movq L_sel_forwardingTargetForSelector_(%rip), %rsi + movq sel_forwardingTargetForSelector_(%rip), %rsi movq -0x20(%rbp), %rdx call _objc_msgSend testq %rax, %rax - jz fail_stret + jz 0f cmpq -0x18(%rbp), %rax - je fail_stret + je 0f movq %rax, %rsi /* Restore all arguments, except %rsi */ movdqa -0xC0(%rbp), %xmm7 @@ -164,14 +164,14 @@ movq %rbp, %rsp popq %rbp jmp _objc_msgSend_stret -fail_stret: +0: movq -0x10(%rbp), %rdi movq -0x18(%rbp), %rsi movq -0x20(%rbp), %rdx movq %rbp, %rsp popq %rbp jmp _of_method_not_found_stret Index: src/forwarding/forwarding-amd64-elf.S ================================================================== --- src/forwarding/forwarding-amd64-elf.S +++ src/forwarding/forwarding-amd64-elf.S @@ -45,11 +45,11 @@ movq %rax, %rdi leaq sel_forwardingTargetForSelector_(%rip), %rsi call class_respondsToSelector@PLT testq %rax, %rax - jz fail + jz 0f movq -0x10(%rbp), %rdi leaq sel_forwardingTargetForSelector_(%rip), %rsi call objc_msg_lookup@PLT @@ -57,13 +57,13 @@ leaq sel_forwardingTargetForSelector_(%rip), %rsi movq -0x18(%rbp), %rdx call *%rax testq %rax, %rax - jz fail + jz 0f cmpq -0x10(%rbp), %rax - je fail + je 0f movq %rax, -0x10(%rbp) movq %rax, %rdi movq -0x18(%rbp), %rsi @@ -90,11 +90,11 @@ movq %rbp, %rsp popq %rbp jmpq *%r11 -fail: +0: movq -0x10(%rbp), %rdi movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp @@ -131,11 +131,11 @@ movq %rax, %rdi leaq sel_forwardingTargetForSelector_(%rip), %rsi call class_respondsToSelector@PLT testq %rax, %rax - jz fail_stret + jz 0f movq -0x18(%rbp), %rdi leaq sel_forwardingTargetForSelector_(%rip), %rsi call objc_msg_lookup@PLT @@ -143,13 +143,13 @@ leaq sel_forwardingTargetForSelector_(%rip), %rsi movq -0x20(%rbp), %rdx call *%rax testq %rax, %rax - jz fail_stret + jz 0f cmpq -0x18(%rbp), %rax - je fail_stret + je 0f movq %rax, -0x18(%rbp) movq %rax, %rdi movq -0x20(%rbp), %rsi @@ -176,11 +176,11 @@ movq %rbp, %rsp popq %rbp jmpq *%r11 -fail_stret: +0: movq -0x10(%rbp), %rdi movq -0x18(%rbp), %rsi movq -0x20(%rbp), %rdx movq %rbp, %rsp Index: src/forwarding/forwarding-arm-elf.S ================================================================== --- src/forwarding/forwarding-arm-elf.S +++ src/forwarding/forwarding-arm-elf.S @@ -20,21 +20,21 @@ .section .text of_forward: stmfd sp!, {r0-r4, lr} fstmfdd sp!, {d0-d7} - ldr r4, sel_forwardingTargetForSelector_$indirect_L0 + ldr r4, sel_forwardingTargetForSelector_$indirect_.L0 .L0: add r4, pc bl object_getClass(PLT) mov r1, r4 bl class_respondsToSelector(PLT) cmp r0, #0 - beq fail + beq 0f ldr r0, [sp, #64] mov r1, r4 bl objc_msg_lookup(PLT) @@ -43,14 +43,14 @@ mov r1, r4 ldr r2, [sp, #68] blx r12 cmp r0, #0 - beq fail + beq 0f ldr r1, [sp, #64] cmp r0, r1 - beq fail + beq 0f str r0, [sp, #64] ldr r1, [sp, #68] bl objc_msg_lookup(PLT) @@ -58,11 +58,11 @@ fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} bx r12 -fail: +0: fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b of_method_not_found(PLT) .type of_forward, %function .size of_forward, .-of_forward @@ -69,11 +69,11 @@ of_forward_stret: stmfd sp!, {r0-r4, lr} fstmfdd sp!, {d0-d7} - ldr r4, sel_forwardingTargetForSelector_$indirect_L1 + ldr r4, sel_forwardingTargetForSelector_$indirect_.L1 .L1: add r4, pc mov r0, r1 bl object_getClass(PLT) @@ -80,11 +80,11 @@ mov r1, r4 bl class_respondsToSelector(PLT) cmp r0, #0 - beq fail_stret + beq 0f ldr r0, [sp, #68] mov r1, r4 bl objc_msg_lookup(PLT) @@ -93,14 +93,14 @@ mov r1, r4 ldr r2, [sp, #72] blx r12 cmp r0, #0 - beq fail_stret + beq 0f ldr r1, [sp, #68] cmp r0, r1 - beq fail_stret + beq 0f str r0, [sp, #68] ldr r1, [sp, #72] bl objc_msg_lookup_stret(PLT) @@ -108,28 +108,28 @@ fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} bx r12 -fail_stret: +0: fldmfdd sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b of_method_not_found_stret(PLT) .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: - ldr r0, module_indirect_L2 + ldr r0, module$indirect_.L2 .L2: add r0, pc b __objc_exec_class(PLT) -sel_forwardingTargetForSelector_$indirect_L0: +sel_forwardingTargetForSelector_$indirect_.L0: .long sel_forwardingTargetForSelector_-(.L0+8) -sel_forwardingTargetForSelector_$indirect_L1: +sel_forwardingTargetForSelector_$indirect_.L1: .long sel_forwardingTargetForSelector_-(.L1+8) -module_indirect_L2: +module$indirect_.L2: .long module-(.L2+8) .section .ctors, "aw", %progbits .long init Index: src/forwarding/forwarding-mips-elf.S ================================================================== --- src/forwarding/forwarding-mips-elf.S +++ src/forwarding/forwarding-mips-elf.S @@ -89,11 +89,11 @@ move $gp, $s0 move $a0, $v0 move $a1, $s1 jal_pic class_respondsToSelector - beqz $v0, fail + beqz $v0, 0f move $gp, $s0 lw $a0, 28($sp) move $a1, $s1 jal_pic objc_msg_lookup @@ -103,13 +103,13 @@ move $a1, $s1 lw $a2, 32($sp) move $t9, $v0 jalr $t9 - beqz $v0, fail + beqz $v0, 0f lw $t0, 28($sp) - beq $v0, $t0, fail + beq $v0, $t0, 0f sw $v0, 28($sp) move $gp, $s0 move $a0, $v0 @@ -143,11 +143,11 @@ addiu $sp, $sp, 96 move $t9, $v0 jr $t9 -fail: +0: move $gp, $s0 lw $a1, 32($sp) lw $a0, 28($sp) lw $s1, 24($sp) @@ -214,11 +214,11 @@ move $gp, $s0 move $a0, $v0 move $a1, $s1 jal_pic class_respondsToSelector - beqz $v0, fail_stret + beqz $v0, 0f move $gp, $s0 lw $a0, 32($sp) move $a1, $s1 jal_pic objc_msg_lookup @@ -228,13 +228,13 @@ move $a1, $s1 lw $a2, 36($sp) move $t9, $v0 jalr $t9 - beqz $v0, fail_stret + beqz $v0, 0f lw $t0, 32($sp) - beq $v0, $t0, fail_stret + beq $v0, $t0, 0f sw $v0, 32($sp) move $gp, $s0 move $a0, $v0 @@ -268,11 +268,11 @@ addiu $sp, $sp, 96 move $t9, $v0 jr $t9 -fail_stret: +0: move $gp, $s0 lw $a2, 36($sp) lw $a1, 32($sp) lw $a0, 28($sp) Index: src/forwarding/forwarding-ppc-elf.S ================================================================== --- src/forwarding/forwarding-ppc-elf.S +++ src/forwarding/forwarding-ppc-elf.S @@ -48,11 +48,11 @@ lis %r4, sel_forwardingTargetForSelector_@ha la %r4, sel_forwardingTargetForSelector_@l(%r4) bl class_respondsToSelector@plt cmpwi %r3, 0 - beq- fail + beq- 0f lwz %r3, 8(%r1) lis %r4, sel_forwardingTargetForSelector_@ha la %r4, sel_forwardingTargetForSelector_@l(%r4) bl objc_msg_lookup@plt @@ -63,14 +63,14 @@ la %r4, sel_forwardingTargetForSelector_@l(%r4) lwz %r5, 12(%r1) bctrl cmpwi %r3, 0 - beq- fail + beq- 0f lwz %r4, 8(%r1) cmpw %r3, %r4 - beq- fail + beq- 0f stw %r3, 8(%r1) lwz %r4, 12(%r1) bl objc_msg_lookup@plt @@ -99,11 +99,11 @@ lwz %r0, 116(%r1) mtlr %r0 addi %r1, %r1, 112 bctr -fail: +0: lwz %r3, 8(%r1) lwz %r4, 12(%r1) lwz %r0, 116(%r1) mtlr %r0 @@ -144,11 +144,11 @@ lis %r4, sel_forwardingTargetForSelector_@ha la %r4, sel_forwardingTargetForSelector_@l(%r4) bl class_respondsToSelector@plt cmpwi %r3, 0 - beq- fail_stret + beq- 0f lwz %r3, 12(%r1) lis %r4, sel_forwardingTargetForSelector_@ha la %r4, sel_forwardingTargetForSelector_@l(%r4) bl objc_msg_lookup@plt @@ -159,14 +159,14 @@ la %r4, sel_forwardingTargetForSelector_@l(%r4) lwz %r5, 16(%r1) bctrl cmpwi %r3, 0 - beq- fail_stret + beq- 0f lwz %r4, 12(%r1) cmpw %r3, %r4 - beq- fail_stret + beq- 0f stw %r3, 12(%r1) lwz %r4, 16(%r1) bl objc_msg_lookup_stret@plt @@ -195,11 +195,11 @@ lwz %r0, 116(%r1) mtlr %r0 addi %r1, %r1, 112 bctr -fail_stret: +0: lwz %r3, 8(%r1) lwz %r4, 12(%r1) lwz %r5, 16(%r1) lwz %r0, 116(%r1) Index: src/forwarding/forwarding-x86-elf.S ================================================================== --- src/forwarding/forwarding-x86-elf.S +++ src/forwarding/forwarding-x86-elf.S @@ -24,61 +24,61 @@ pushl %ebx subl $20, %esp call get_eip -.L0: +0: movl 8(%ebp), %eax movl %eax, (%esp) - leal object_getClass-.L0(%ebx), %eax + leal object_getClass-0b(%ebx), %eax call *%eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal class_respondsToSelector-.L0(%ebx), %eax + leal class_respondsToSelector-0b(%ebx), %eax call *%eax testl %eax, %eax - jz fail + jz 1f movl 8(%ebp), %eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal objc_msg_lookup-.L0(%ebx), %eax + leal objc_msg_lookup-0b(%ebx), %eax call *%eax movl 8(%ebp), %edx movl %edx, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %edx + leal sel_forwardingTargetForSelector_-0b(%ebx), %edx movl %edx, 4(%esp) movl 12(%ebp), %edx movl %edx, 8(%esp) call *%eax testl %eax, %eax - jz fail + jz 1f cmpl 8(%ebp), %eax - je fail + je 1f movl %eax, 8(%ebp) movl %eax, (%esp) movl 12(%ebp), %eax movl %eax, 4(%esp) - leal objc_msg_lookup-.L0(%ebx), %eax + leal objc_msg_lookup-0b(%ebx), %eax call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax -fail: - leal of_method_not_found-.L0(%ebx), %eax +1: + leal of_method_not_found-0b(%ebx), %eax addl $20, %esp popl %ebx popl %ebp @@ -92,61 +92,61 @@ pushl %ebx subl $20, %esp call get_eip -.L1: +0: movl 12(%ebp), %eax movl %eax, (%esp) - leal object_getClass-.L1(%ebx), %eax + leal object_getClass-0b(%ebx), %eax call *%eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal class_respondsToSelector-.L1(%ebx), %eax + leal class_respondsToSelector-0b(%ebx), %eax call *%eax testl %eax, %eax - jz fail_stret + jz 1f movl 12(%ebp), %eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal objc_msg_lookup-.L1(%ebx), %eax + leal objc_msg_lookup-0b(%ebx), %eax call *%eax movl 12(%ebp), %edx movl %edx, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %edx + leal sel_forwardingTargetForSelector_-0b(%ebx), %edx movl %edx, 4(%esp) movl 16(%ebp), %edx movl %edx, 8(%esp) call *%eax testl %eax, %eax - jz fail_stret + jz 1f cmpl 12(%ebp), %eax - je fail_stret + je 1f movl %eax, 12(%ebp) movl %eax, (%esp) movl 16(%ebp), %eax movl %eax, 4(%esp) - leal objc_msg_lookup_stret-.L1(%ebx), %eax + leal objc_msg_lookup_stret-0b(%ebx), %eax call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax -fail_stret: - leal of_method_not_found_stret-.L1(%ebx), %eax +1: + leal of_method_not_found_stret-0b(%ebx), %eax addl $20, %esp popl %ebx popl %ebp @@ -160,14 +160,14 @@ pushl %ebx subl $4, %esp call get_eip -.L2: - leal module-.L2(%ebx), %eax +0: + leal module-0b(%ebx), %eax movl %eax, (%esp) - leal __objc_exec_class-.L2(%ebx), %eax + leal __objc_exec_class-0b(%ebx), %eax call *%eax addl $4, %esp popl %ebx popl %ebp Index: src/forwarding/forwarding-x86-win32.S ================================================================== --- src/forwarding/forwarding-x86-win32.S +++ src/forwarding/forwarding-x86-win32.S @@ -24,61 +24,61 @@ pushl %ebx subl $20, %esp call get_eip -.L0: +0: movl 8(%ebp), %eax movl %eax, (%esp) - leal _object_getClass-.L0(%ebx), %eax + leal _object_getClass-0b(%ebx), %eax call *%eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal _class_respondsToSelector-.L0(%ebx), %eax + leal _class_respondsToSelector-0b(%ebx), %eax call *%eax testl %eax, %eax - jz fail + jz 1f movl 8(%ebp), %eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal _objc_msg_lookup-.L0(%ebx), %eax + leal _objc_msg_lookup-0b(%ebx), %eax call *%eax movl 8(%ebp), %edx movl %edx, (%esp) - leal sel_forwardingTargetForSelector_-.L0(%ebx), %edx + leal sel_forwardingTargetForSelector_-0b(%ebx), %edx movl %edx, 4(%esp) movl 12(%ebp), %edx movl %edx, 8(%esp) call *%eax testl %eax, %eax - jz fail + jz 1f cmpl 8(%ebp), %eax - je fail + je 1f movl %eax, 8(%ebp) movl %eax, (%esp) movl 12(%ebp), %eax movl %eax, 4(%esp) - leal _objc_msg_lookup-.L0(%ebx), %eax + leal _objc_msg_lookup-0b(%ebx), %eax call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax -fail: - leal _of_method_not_found-.L0(%ebx), %eax +1: + leal _of_method_not_found-0b(%ebx), %eax addl $20, %esp popl %ebx popl %ebp @@ -90,61 +90,61 @@ pushl %ebx subl $20, %esp call get_eip -.L1: +0: movl 12(%ebp), %eax movl %eax, (%esp) - leal _object_getClass-.L1(%ebx), %eax + leal _object_getClass-0b(%ebx), %eax call *%eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal _class_respondsToSelector-.L1(%ebx), %eax + leal _class_respondsToSelector-0b(%ebx), %eax call *%eax testl %eax, %eax - jz fail_stret + jz 1f movl 12(%ebp), %eax movl %eax, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %eax + leal sel_forwardingTargetForSelector_-0b(%ebx), %eax movl %eax, 4(%esp) - leal _objc_msg_lookup-.L1(%ebx), %eax + leal _objc_msg_lookup-0b(%ebx), %eax call *%eax movl 12(%ebp), %edx movl %edx, (%esp) - leal sel_forwardingTargetForSelector_-.L1(%ebx), %edx + leal sel_forwardingTargetForSelector_-0b(%ebx), %edx movl %edx, 4(%esp) movl 16(%ebp), %edx movl %edx, 8(%esp) call *%eax testl %eax, %eax - jz fail_stret + jz 1f cmpl 12(%ebp), %eax - je fail_stret + je 1f movl %eax, 12(%ebp) movl %eax, (%esp) movl 16(%ebp), %eax movl %eax, 4(%esp) - leal _objc_msg_lookup_stret-.L1(%ebx), %eax + leal _objc_msg_lookup_stret-0b(%ebx), %eax call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax -fail_stret: - leal _of_method_not_found_stret-.L1(%ebx), %eax +1: + leal _of_method_not_found_stret-0b(%ebx), %eax addl $20, %esp popl %ebx popl %ebp @@ -156,14 +156,14 @@ pushl %ebx subl $4, %esp call get_eip -.L2: - leal module-.L2(%ebx), %eax +0: + leal module-0b(%ebx), %eax movl %eax, (%esp) - leal ___objc_exec_class-.L2(%ebx), %eax + leal ___objc_exec_class-0b(%ebx), %eax call *%eax addl $4, %esp popl %ebx popl %ebp Index: src/forwarding/forwarding.S ================================================================== --- src/forwarding/forwarding.S +++ src/forwarding/forwarding.S @@ -37,11 +37,11 @@ # elif defined(__arm__) || defined(__ARM__) # include "forwarding-arm-elf.S" # elif defined(__ppc__) || defined(__PPC__) # include "forwarding-ppc-elf.S" # elif (defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32) || \ - (defined(__mips_eabi) && _MIPS_SZPTR == 32) + (defined(__mips_eabi) && _MIPS_SZPTR == 32) # include "forwarding-mips-elf.S" # endif # elif defined(_WIN32) && defined(__i386__) # include "forwarding-x86-win32.S" # endif