Index: src/forwarding/apple-forwarding-amd64.S ================================================================== --- src/forwarding/apple-forwarding-amd64.S +++ src/forwarding/apple-forwarding-amd64.S @@ -33,16 +33,16 @@ JMP $0 .intel_syntax noprefix .endmacro .section __TEXT, __objc_methname, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -sel_forwardingTargetForSelector_: - .quad str_forwardingTargetForSelector_ +Lsel_forwardingTargetForSelector_: + .quad Lstr_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -69,18 +69,18 @@ movaps [rbp - 0xC0], xmm7 call _object_getClass mov rdi, rax - mov rsi, [rip + sel_forwardingTargetForSelector_] + mov rsi, [rip + Lsel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x10] - mov rsi, [rip + sel_forwardingTargetForSelector_] + mov rsi, [rip + Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x18] call _objc_msgSend test rax, rax jz 0f @@ -143,17 +143,17 @@ mov rdi, rsi call _object_getClass mov rdi, rax - mov rsi, [rip + sel_forwardingTargetForSelector_] + mov rsi, [rip + Lsel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x18] - mov rsi, [rip + sel_forwardingTargetForSelector_] + mov rsi, [rip + Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call _objc_msgSend test rax, rax jz 0f Index: src/forwarding/apple-forwarding-arm.S ================================================================== --- src/forwarding/apple-forwarding-arm.S +++ src/forwarding/apple-forwarding-arm.S @@ -17,15 +17,15 @@ .globl _OFForward .globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -sel_forwardingTargetForSelector_: +Lsel_forwardingTargetForSelector_: .long str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 @@ -34,11 +34,11 @@ .align 2 _OFForward: stmfd sp!, {r0-r4, lr} vstmdb sp!, {d0-d7} - ldr r4, sel_forwardingTargetForSelector_$indirect_L0 + ldr r4, Lsel_forwardingTargetForSelector_$indirect_L0 L0: ldr r4, [pc, r4] blx _object_getClass @@ -69,20 +69,20 @@ vldmia sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b _OFMethodNotFound .data_region -sel_forwardingTargetForSelector_$indirect_L0: - .long sel_forwardingTargetForSelector_-(L0+8) +Lsel_forwardingTargetForSelector_$indirect_L0: + .long Lsel_forwardingTargetForSelector_-(L0+8) .end_data_region .align 2 _OFForward_stret: stmfd sp!, {r0-r4, lr} vstmdb sp!, {d0-d7} - ldr r4, sel_forwardingTargetForSelector_$indirect_L1 + ldr r4, Lsel_forwardingTargetForSelector_$indirect_L1 L1: ldr r4, [pc, r4] mov r0, r1 blx _object_getClass @@ -117,8 +117,8 @@ vldmia sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} b _OFMethodNotFound_stret .data_region -sel_forwardingTargetForSelector_$indirect_L1: - .long sel_forwardingTargetForSelector_-(L1+8) +Lsel_forwardingTargetForSelector_$indirect_L1: + .long Lsel_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 @@ -17,16 +17,16 @@ .globl _OFForward .globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip -sel_forwardingTargetForSelector_: - .quad str_forwardingTargetForSelector_ +Lsel_forwardingTargetForSelector_: + .quad Lstr_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -50,12 +50,12 @@ stp q4, q5, [sp, #144] stp q6, q7, [sp, #176] bl _object_getClass - adrp x19, sel_forwardingTargetForSelector_@PAGE - add x19, x19, sel_forwardingTargetForSelector_@PAGEOFF + adrp x19, Lsel_forwardingTargetForSelector_@PAGE + add x19, x19, Lsel_forwardingTargetForSelector_@PAGEOFF ldr x19, [x19] mov x1, x19 bl _class_respondsToSelector Index: src/forwarding/apple-forwarding-powerpc.S ================================================================== --- src/forwarding/apple-forwarding-powerpc.S +++ src/forwarding/apple-forwarding-powerpc.S @@ -17,16 +17,16 @@ .globl _OFForward .globl _OFForward_stret .section __TEXT, __cstring, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __OBJC, __message_refs -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_ +Lsel_forwardingTargetForSelector_: + .long Lstr_forwardingTargetForSelector_ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -69,12 +69,12 @@ bl _object_getClass bl 0f 0: mflr r13 - addis r13, r13, ha16(sel_forwardingTargetForSelector_-0b) - lwz r13, lo16(sel_forwardingTargetForSelector_-0b)(r13) + addis r13, r13, ha16(Lsel_forwardingTargetForSelector_-0b) + lwz r13, lo16(Lsel_forwardingTargetForSelector_-0b)(r13) mr r4, r13 bl _class_respondsToSelector cmpwi r3, 0 @@ -172,12 +172,12 @@ bl _object_getClass bl 0f 0: mflr r13 - addis r13, r13, ha16(sel_forwardingTargetForSelector_-0b) - lwz r13, lo16(sel_forwardingTargetForSelector_-0b)(r13) + addis r13, r13, ha16(Lsel_forwardingTargetForSelector_-0b) + lwz r13, lo16(Lsel_forwardingTargetForSelector_-0b)(r13) mr r4, r13 bl _class_respondsToSelector cmpwi r3, 0 Index: src/forwarding/apple-forwarding-x86.S ================================================================== --- src/forwarding/apple-forwarding-x86.S +++ src/forwarding/apple-forwarding-x86.S @@ -33,16 +33,16 @@ JMP $0 .intel_syntax noprefix .endmacro .section __TEXT, __cstring, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __OBJC, __message_refs, literal_pointers, no_dead_strip -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_ +Lsel_forwardingTargetForSelector_: + .long Lstr_forwardingTargetForSelector_ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions @@ -51,28 +51,28 @@ mov ebp, esp push ebx sub esp, 20 - call getEIP + call LgetEIP 0: mov eax, [ebp + 8] mov [esp], eax call _object_getClass mov [esp], eax - mov eax, [ebx + sel_forwardingTargetForSelector_ - 0b] + mov eax, [ebx + Lsel_forwardingTargetForSelector_ - 0b] mov [esp + 4], eax call _class_respondsToSelector test eax, eax jz 0f mov eax, [ebp + 8] mov [esp], eax - mov eax, [ebx + sel_forwardingTargetForSelector_ - 0b] + mov eax, [ebx + Lsel_forwardingTargetForSelector_ - 0b] mov [esp + 4], eax mov eax, [ebp + 12] mov [esp + 8], eax call _objc_msgSend @@ -101,28 +101,28 @@ mov ebp, esp push ebx sub esp, 20 - call getEIP + call LgetEIP 0: mov eax, [ebp + 12] mov [esp], eax call _object_getClass mov [esp], eax - mov eax, [ebx + sel_forwardingTargetForSelector_ - 0b] + mov eax, [ebx + Lsel_forwardingTargetForSelector_ - 0b] mov [esp + 4], eax call _class_respondsToSelector test eax, eax jz 0f mov eax, [ebp + 12] mov [esp], eax - mov eax, [ebx + sel_forwardingTargetForSelector_ - 0b] + mov eax, [ebx + Lsel_forwardingTargetForSelector_ - 0b] mov [esp + 4], eax mov eax, [ebp + 16] mov [esp + 8], eax call _objc_msgSend @@ -144,8 +144,8 @@ pop ebx pop ebp jmp _OFMethodNotFound_stret -getEIP: +LgetEIP: mov ebx, [esp] ret Index: src/forwarding/forwarding-amd64-elf.S ================================================================== --- src/forwarding/forwarding-amd64-elf.S +++ src/forwarding/forwarding-amd64-elf.S @@ -46,22 +46,22 @@ movaps [rbp - 0xC0], xmm7 call object_getClass@PLT mov rdi, rax - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax jz short 0f mov rdi, [rbp - 0x10] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup@PLT mov rdi, [rbp - 0x10] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x18] call rax test rax, rax jz short 0f @@ -132,22 +132,22 @@ mov rdi, rsi call object_getClass@PLT mov rdi, rax - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax jz short 0f mov rdi, [rbp - 0x18] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup@PLT mov rdi, [rbp - 0x18] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + .Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call rax test rax, rax jz short 0f @@ -193,35 +193,35 @@ jmp OFMethodNotFound_stret@PLT .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: - lea rdi, [rip + module] +.Linit: + lea rdi, [rip + .Lmodule] jmp __objc_exec_class@PLT #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif - .quad init + .quad .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .quad str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .quad .Lstr_forwardingTargetForSelector_, 0 .quad 0, 0 -symtab: - .quad 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .quad 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .quad 0 -module: - .quad 8, 32, 0, symtab +.Lmodule: + .quad 8, 32, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-amd64-macho.S ================================================================== --- src/forwarding/forwarding-amd64-macho.S +++ src/forwarding/forwarding-amd64-macho.S @@ -60,22 +60,22 @@ movaps [rbp - 0xC0], xmm7 call _object_getClass mov rdi, rax - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + Lsel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x10] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + Lsel_forwardingTargetForSelector_] call _objc_msg_lookup movq rdi, [rbp - 0x10] - leaq rsi, [rip + sel_forwardingTargetForSelector_] + leaq rsi, [rip + Lsel_forwardingTargetForSelector_] movq rdx, [rbp - 0x18] call *%rax test rax, rax jz 0f @@ -144,22 +144,22 @@ mov rdi, rsi call _object_getClass mov rdi, rax - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + Lsel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x18] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + Lsel_forwardingTargetForSelector_] call _objc_msg_lookup mov rdi, [rbp - 0x18] - lea rsi, [rip + sel_forwardingTargetForSelector_] + lea rsi, [rip + Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call *%rax test rax, rax jz 0f @@ -203,27 +203,27 @@ mov rsp, rbp pop rbp jmp _OFMethodNotFound_stret -init: - lea rdi, [rip + module] +Linit: + lea rdi, [rip + Lmodule] jmp ___objc_exec_class .section __DATA, __mod_init_func, mod_init_funcs - .quad init + .quad Linit .section __TEXT, __cstring, cstring_literals -str_forwardingTargetForSelector_: +Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __data -sel_forwardingTargetForSelector_: - .quad str_forwardingTargetForSelector_, 0 +Lsel_forwardingTargetForSelector_: + .quad Lstr_forwardingTargetForSelector_, 0 .quad 0, 0 -symtab: - .quad 0, sel_forwardingTargetForSelector_ +Lsymtab: + .quad 0, Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .quad 0 -module: - .quad 8, 32, 0, symtab +Lmodule: + .quad 8, 32, 0, Lsymtab Index: src/forwarding/forwarding-amd64-win64.S ================================================================== --- src/forwarding/forwarding-amd64-win64.S +++ src/forwarding/forwarding-amd64-win64.S @@ -38,22 +38,22 @@ movaps [rbp - 0x90], xmm3 call object_getClass mov rcx, rax - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp - 0x30] - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup mov rcx, [rbp - 0x30] - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] mov r8, [rbp - 0x38] call rax test rax, rax jz short 0f @@ -114,22 +114,22 @@ mov rcx, rdx call object_getClass mov rcx, rax - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp - 0x38] - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup mov rcx, [rbp - 0x38] - lea rdx, [rip + sel_forwardingTargetForSelector_] + lea rdx, [rip + .Lsel_forwardingTargetForSelector_] mov r8, [rbp - 0x40] call rax test rax, rax jz short 0f @@ -171,29 +171,29 @@ .def OFForward_stret .scl 2 .type 32 .endef -init: - lea rcx, [rip + module] +.Linit: + lea rcx, [rip + .Lmodule] jmp __objc_exec_class .section .ctors, "aw" - .quad init + .quad .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .quad str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .quad .Lstr_forwardingTargetForSelector_, 0 .quad 0, 0 -symtab: +.Lsymtab: .long 0, 0 - .quad sel_forwardingTargetForSelector_ + .quad .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .quad 0 -module: +.Lmodule: .long 8, 32 - .quad 0, symtab + .quad 0, .Lsymtab Index: src/forwarding/forwarding-arm-elf.S ================================================================== --- src/forwarding/forwarding-arm-elf.S +++ src/forwarding/forwarding-arm-elf.S @@ -29,11 +29,11 @@ #ifdef HAVE_VFP2 vstmdb sp!, {d0-d7} #endif stmfd sp!, {r0-r4, lr} - ldr r4, sel_forwardingTargetForSelector_$indirect_.L0 + ldr r4, .Lsel_forwardingTargetForSelector_$indirect_.L0 .L0: add r4, pc bl object_getClass(PLT) @@ -84,11 +84,11 @@ #ifdef HAVE_VFP2 vstmdb sp!, {d0-d7} #endif stmfd sp!, {r0-r4, lr} - ldr r4, sel_forwardingTargetForSelector_$indirect_.L1 + ldr r4, .Lsel_forwardingTargetForSelector_$indirect_.L1 .L1: add r4, pc mov r0, r1 bl object_getClass(PLT) @@ -134,40 +134,40 @@ #endif b OFMethodNotFound_stret(PLT) .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: - ldr r0, module$indirect_.L2 +.Linit: + ldr r0, .Lmodule$indirect_.L2 .L2: add r0, pc b __objc_exec_class(PLT) -sel_forwardingTargetForSelector_$indirect_.L0: - .long sel_forwardingTargetForSelector_-(.L0+8) -sel_forwardingTargetForSelector_$indirect_.L1: - .long sel_forwardingTargetForSelector_-(.L1+8) -module$indirect_.L2: - .long module-(.L2+8) +.Lsel_forwardingTargetForSelector_$indirect_.L0: + .long .Lsel_forwardingTargetForSelector_-(.L0+8) +.Lsel_forwardingTargetForSelector_$indirect_.L1: + .long .Lsel_forwardingTargetForSelector_-(.L1+8) +.Lmodule$indirect_.L2: + .long .Lmodule-(.L2+8) .section .init_array, "aw", %init_array - .long init + .long .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .long .Lstr_forwardingTargetForSelector_, 0 .long 0, 0 -symtab: - .long 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .long 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .long 0 -module: - .long 8, 16, 0, symtab +.Lmodule: + .long 8, 16, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-arm64-elf.S ================================================================== --- src/forwarding/forwarding-arm64-elf.S +++ src/forwarding/forwarding-arm64-elf.S @@ -40,12 +40,12 @@ stp q4, q5, [sp, #144] stp q6, q7, [sp, #176] bl object_getClass - adrp x19, sel_forwardingTargetForSelector_ - add x19, x19, :lo12:sel_forwardingTargetForSelector_ + adrp x19, .Lsel_forwardingTargetForSelector_ + add x19, x19, :lo12:.Lsel_forwardingTargetForSelector_ mov x1, x19 bl class_respondsToSelector cbz x0, 0f @@ -100,32 +100,32 @@ .type OFForward, %function .size OFForward, .-OFForward .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: - adrp x0, module - add x0, x0, :lo12:module +.Linit: + adrp x0, .Lmodule + add x0, x0, :lo12:.Lmodule b __objc_exec_class .section .init_array, "aw", %init_array - .xword init + .xword .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .xword str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .xword .Lstr_forwardingTargetForSelector_, 0 .xword 0, 0 -symtab: - .xword 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .xword 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 4 .xword 0 -module: - .xword 8, 32, 0, symtab +.Lmodule: + .xword 8, 32, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-mips-elf.S ================================================================== --- src/forwarding/forwarding-mips-elf.S +++ src/forwarding/forwarding-mips-elf.S @@ -80,15 +80,15 @@ swc1 $f19, 88($sp) #endif move $s0, $gp #ifdef OF_PIC - lw $s1, %got(sel_forwardingTargetForSelector_)($gp) + lw $s1, %got(.Lsel_forwardingTargetForSelector_)($gp) #else - lui $s1, %hi(sel_forwardingTargetForSelector_) + lui $s1, %hi(.Lsel_forwardingTargetForSelector_) #endif - addiu $s1, $s1, %lo(sel_forwardingTargetForSelector_) + addiu $s1, $s1, %lo(.Lsel_forwardingTargetForSelector_) jal_pic object_getClass move $gp, $s0 move $a0, $v0 @@ -204,15 +204,15 @@ swc1 $f19, 88($sp) #endif move $s0, $gp #ifdef OF_PIC - lw $s1, %got(sel_forwardingTargetForSelector_)($gp) + lw $s1, %got(.Lsel_forwardingTargetForSelector_)($gp) #else - lui $s1, %hi(sel_forwardingTargetForSelector_) + lui $s1, %hi(.Lsel_forwardingTargetForSelector_) #endif - addiu $s1, $s1, %lo(sel_forwardingTargetForSelector_) + addiu $s1, $s1, %lo(.Lsel_forwardingTargetForSelector_) move $a0, $a1 jal_pic object_getClass move $gp, $s0 @@ -287,43 +287,43 @@ j_pic of_method_not_found_stret .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: +.Linit: #ifdef OF_PIC lui $gp, %hi(_gp_disp) addiu $gp, $gp, %lo(_gp_disp) addu $gp, $gp, $t9 - lw $a0, %got(module)($gp) - addiu $a0, $a0, %lo(module) + lw $a0, %got(.Lmodule)($gp) + addiu $a0, $a0, %lo(.Lmodule) lw $t9, %call16(__objc_exec_class)($gp) jr $t9 #else - lui $a0, %hi(module) - addiu $a0, $a0, %lo(module) + lui $a0, %hi(.Lmodule) + addiu $a0, $a0, %lo(.Lmodule) j __objc_exec_class #endif .section .ctors, "aw", %progbits - .long init + .long .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .long .Lstr_forwardingTargetForSelector_, 0 .long 0, 0 -symtab: - .long 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .long 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .long 0 -module: - .long 8, 16, 0, symtab +.Lmodule: + .long 8, 16, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-powerpc-elf.S ================================================================== --- src/forwarding/forwarding-powerpc-elf.S +++ src/forwarding/forwarding-powerpc-elf.S @@ -61,12 +61,12 @@ lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) bl class_respondsToSelector+0x8000@plt #else bl object_getClass - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) bl class_respondsToSelector #endif cmpwi %r3, 0 beq- 0f @@ -74,22 +74,22 @@ lwz %r3, 8(%r1) #ifdef OF_PIC lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) bl objc_msg_lookup+0x8000@plt #else - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) bl objc_msg_lookup #endif mtctr %r3 lwz %r3, 8(%r1) #ifdef OF_PIC lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) #else - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) #endif lwz %r5, 12(%r1) bctrl cmpwi %r3, 0 @@ -199,12 +199,12 @@ lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) bl class_respondsToSelector+0x8000@plt #else bl object_getClass - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) bl class_respondsToSelector #endif cmpwi %r3, 0 beq- 0f @@ -212,22 +212,22 @@ lwz %r3, 12(%r1) #ifdef OF_PIC lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) bl objc_msg_lookup+0x8000@plt #else - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) bl objc_msg_lookup #endif mtctr %r3 lwz %r3, 12(%r1) #ifdef OF_PIC lwz %r4, .Lgot_sel_forwardingTargetForSelector_-.Lbiased_got2(%r30) #else - lis %r4, sel_forwardingTargetForSelector_@ha - la %r4, sel_forwardingTargetForSelector_@l(%r4) + lis %r4, .Lsel_forwardingTargetForSelector_@ha + la %r4, .Lsel_forwardingTargetForSelector_@l(%r4) #endif lwz %r5, 16(%r1) bctrl cmpwi %r3, 0 @@ -295,11 +295,11 @@ b OFMethodNotFound_stret #endif .type OFForward_stret, @function .size OFForward_stret, .-OFForward_stret -init: +.Linit: stwu %r1, -16(%r1) mflr %r0 stw %r0, 20(%r1) #ifdef OF_PIC stw %r30, 8(%r1) @@ -313,50 +313,50 @@ lwz %r3, .Lgot_module-.Lbiased_got2(%r30) bl __objc_exec_class+0x8000@plt lwz %r30, 8(%r1) #else - lis %r3, module@ha - la %r3, module@l(%r3) + lis %r3, .Lmodule@ha + la %r3, .Lmodule@l(%r3) bl __objc_exec_class #endif lwz %r0, 20(%r1) addi %r1, %r1, 16 mtlr %r0 blr .section .ctors, "aw", @progbits - .long init + .long .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .long .Lstr_forwardingTargetForSelector_, 0 .long 0, 0 -symtab: - .long 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .long 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .long 0 -module: - .long 8, 16, 0, symtab +.Lmodule: + .long 8, 16, 0, .Lsymtab #ifdef OF_PIC .section .got2, "aw" .Lbiased_got2 = .+0x8000 .Lgot_module: - .long module + .long .Lmodule .Lgot_sel_forwardingTargetForSelector_: - .long sel_forwardingTargetForSelector_ + .long .Lsel_forwardingTargetForSelector_ .Lgot_OFMethodNotFound: .long OFMethodNotFound .Lgot_OFMethodNotFound_stret: .long OFMethodNotFound_stret #endif #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", @progbits #endif Index: src/forwarding/forwarding-sparc-elf.S ================================================================== --- src/forwarding/forwarding-sparc-elf.S +++ src/forwarding/forwarding-sparc-elf.S @@ -32,12 +32,12 @@ mov %i0, %o0 call object_getClass nop - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif call class_respondsToSelector nop @@ -44,22 +44,22 @@ cmp %o0, 0 be 0f mov %i0, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif call objc_msg_lookup nop mov %o0, %l0 mov %i0, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif jmpl %l0, %o7 mov %i1, %o2 @@ -93,12 +93,12 @@ mov %i1, %o0 call object_getClass nop - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif call class_respondsToSelector nop @@ -105,22 +105,22 @@ cmp %o0, 0 be 0f mov %i1, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif call objc_msg_lookup nop mov %o0, %l0 mov %i1, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 #ifdef OF_PIC ld [%l7 + %o1], %o1 #endif jmpl %l0, %o7 mov %i2, %o2 @@ -141,21 +141,21 @@ call OFMethodNotFound_stret restore .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: +.Linit: save %sp, -96, %sp #ifdef OF_PIC sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 call add_pc add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 #endif - sethi %hi(module), %i0 - or %i0, %lo(module), %i0 + sethi %hi(.Lmodule), %i0 + or %i0, %lo(.Lmodule), %i0 #ifdef OF_PIC ld [%l7 + %i0], %i0 #endif call __objc_exec_class @@ -170,26 +170,26 @@ #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif - .word init + .word .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .word str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .word .Lstr_forwardingTargetForSelector_, 0 .word 0, 0 -symtab: - .word 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .word 0, .Lsel_forwardingTargetForSelector_ .half 0, 0 .word 0 .word 0 -module: - .word 8, 16, 0, symtab +.Lmodule: + .word 8, 16, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-sparc64-elf.S ================================================================== --- src/forwarding/forwarding-sparc64-elf.S +++ src/forwarding/forwarding-sparc64-elf.S @@ -46,36 +46,36 @@ std %f26, [%sp + BIAS + 280] std %f28, [%sp + BIAS + 288] std %f30, [%sp + BIAS + 296] sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 - call add_pc + call .LaddPC add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 mov %i0, %o0 call object_getClass nop - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop brz,pn %o0, 0f mov %i0, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i0, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i1, %o2 brz,pn %o0, 0f @@ -139,36 +139,36 @@ std %f26, [%sp + BIAS + 280] std %f28, [%sp + BIAS + 288] std %f30, [%sp + BIAS + 296] sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 - call add_pc + call .LaddPC add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 mov %i1, %o0 call object_getClass nop - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call class_respondsToSelector nop brz,pn %o0, 0f mov %i1, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 call objc_msg_lookup nop mov %o0, %l0 mov %i1, %o0 - sethi %hi(sel_forwardingTargetForSelector_), %o1 - or %o1, %lo(sel_forwardingTargetForSelector_), %o1 + sethi %hi(.Lsel_forwardingTargetForSelector_), %o1 + or %o1, %lo(.Lsel_forwardingTargetForSelector_), %o1 ldx [%l7 + %o1], %o1 jmpl %l0, %o7 mov %i2, %o2 brz,pn %o0, 0f @@ -207,49 +207,49 @@ call OFMethodNotFound_stret restore .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: +.Linit: save %sp, -176, %sp sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %l7 - call add_pc + call .LaddPC add %l7, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %l7 - sethi %hi(module), %i0 - or %i0, %lo(module), %i0 + sethi %hi(.Lmodule), %i0 + or %i0, %lo(.Lmodule), %i0 ldx [%l7 + %i0], %i0 call __objc_exec_class restore -add_pc: +.LaddPC: jmp %o7 + 8 add %l7, %o7, %l7 #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif - .xword init + .xword .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .xword str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .xword .Lstr_forwardingTargetForSelector_, 0 .xword 0, 0 -symtab: - .xword 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .xword 0, .Lsel_forwardingTargetForSelector_ .half 0, 0 .word 0 .xword 0 -module: - .xword 8, 32, 0, symtab +.Lmodule: + .xword 8, 32, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-x86-elf.S ================================================================== --- src/forwarding/forwarding-x86-elf.S +++ src/forwarding/forwarding-x86-elf.S @@ -28,34 +28,34 @@ mov ebp, esp push ebx sub esp, 20 - call getEIP + call .LgetEIP add ebx, offset _GLOBAL_OFFSET_TABLE_ mov eax, [ebp + 8] mov [esp], eax call object_getClass@PLT mov [esp], eax - lea eax, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call class_respondsToSelector@PLT test eax, eax jz short 0f mov eax, [ebp + 8] mov [esp], eax - lea eax, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call objc_msg_lookup@PLT mov edx, [ebp + 8] mov [esp], edx - lea edx, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea edx, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], edx mov edx, [ebp + 12] mov [esp + 8], edx call eax @@ -92,34 +92,34 @@ mov ebp, esp push ebx sub esp, 20 - call getEIP + call .LgetEIP add ebx, offset _GLOBAL_OFFSET_TABLE_ mov eax, [ebp + 12] mov [esp], eax call object_getClass@PLT mov [esp], eax - lea eax, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call class_respondsToSelector@PLT test eax, eax jz short 0f mov eax, [ebp + 12] mov [esp], eax - lea eax, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call objc_msg_lookup@PLT mov edx, [ebp + 12] mov [esp], edx - lea edx, [ebx + sel_forwardingTargetForSelector_@GOTOFF] + lea edx, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], edx mov edx, [ebp + 16] mov [esp + 8], edx call eax @@ -149,54 +149,54 @@ jmp eax .type OFForward_stret, %function .size OFForward_stret, .-OFForward_stret -init: +.Linit: push ebp mov ebp, esp push ebx sub esp, 4 - call getEIP + call .LgetEIP add ebx, offset _GLOBAL_OFFSET_TABLE_ - lea eax, [ebx + module@GOTOFF] + lea eax, [ebx + .Lmodule@GOTOFF] mov [esp], eax call __objc_exec_class@PLT add esp, 4 pop ebx pop ebp ret -getEIP: +.LgetEIP: mov ebx, [esp] ret #ifdef OF_SOLARIS .section .init_array, "aw" #else .section .ctors, "aw", %progbits #endif - .long init + .long .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .long .Lstr_forwardingTargetForSelector_, 0 .long 0, 0 -symtab: - .long 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .long 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .long 0 -module: - .long 8, 16, 0, symtab +.Lmodule: + .long 8, 16, 0, .Lsymtab #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/forwarding/forwarding-x86-win32.S ================================================================== --- src/forwarding/forwarding-x86-win32.S +++ src/forwarding/forwarding-x86-win32.S @@ -31,26 +31,26 @@ mov eax, [ebp + 8] mov [esp], eax call _object_getClass mov [esp], eax - mov eax, offset sel_forwardingTargetForSelector_ + mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _class_respondsToSelector test eax, eax jz short 0f mov eax, [ebp + 8] mov [esp], eax - mov eax, offset sel_forwardingTargetForSelector_ + mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _objc_msg_lookup mov edx, [ebp + 8] mov [esp], edx - mov edx, offset sel_forwardingTargetForSelector_ + mov edx, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], edx mov edx, [ebp + 12] mov [esp + 8], edx call eax @@ -92,26 +92,26 @@ mov eax, [ebp + 12] mov [esp], eax call _object_getClass mov [esp], eax - mov eax, offset sel_forwardingTargetForSelector_ + mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _class_respondsToSelector test eax, eax jz short 0f mov eax, [ebp + 12] mov [esp], eax - mov eax, offset sel_forwardingTargetForSelector_ + mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _objc_msg_lookup mov edx, [ebp + 12] mov [esp], edx - mov edx, offset sel_forwardingTargetForSelector_ + mov edx, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], edx mov edx, [ebp + 16] mov [esp + 8], edx call eax @@ -141,39 +141,39 @@ .def _OFForward_stret .scl 2 .type 32 .endef -init: +.Linit: push ebp mov ebp, esp push ebx sub esp, 4 - mov eax, offset module + mov eax, offset .Lmodule mov [esp], eax call ___objc_exec_class add esp, 4 pop ebx pop ebp ret .section .ctors, "aw" - .long init + .long .Linit .section .rodata -str_forwardingTargetForSelector_: +.Lstr_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section .data -sel_forwardingTargetForSelector_: - .long str_forwardingTargetForSelector_, 0 +.Lsel_forwardingTargetForSelector_: + .long .Lstr_forwardingTargetForSelector_, 0 .long 0, 0 -symtab: - .long 0, sel_forwardingTargetForSelector_ +.Lsymtab: + .long 0, .Lsel_forwardingTargetForSelector_ .short 0, 0 .long 0 .long 0 -module: - .long 8, 16, 0, symtab +.Lmodule: + .long 8, 16, 0, .Lsymtab Index: src/runtime/lookup-asm/lookup-asm-amd64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-amd64-elf.S +++ src/runtime/lookup-asm/lookup-asm-amd64-elf.S @@ -26,11 +26,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: test rdi, rdi - jz short returnNilMethod + jz short .LreturnNilMethod test dil, 1 jnz short .LtaggedPointer_\name mov r8, [rdi] @@ -71,11 +71,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov r8, rdi mov rdi, [rdi] test rdi, rdi - jz short returnNilMethod + jz short .LreturnNilMethod mov r8, [r8 + 8] mov r8, [r8 + 64] jmp short .Lmain_\lookup .type \name, %function @@ -85,16 +85,16 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: - lea rax, [rip + nilMethod] +.LreturnNilMethod: + lea rax, [rip + .LnilMethod] ret -nilMethod: +.LnilMethod: xor rax, rax ret #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-amd64-macho.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-amd64-macho.S +++ src/runtime/lookup-asm/lookup-asm-amd64-macho.S @@ -38,11 +38,11 @@ .section __TEXT, __text, regular, pure_instructions .macro GENERATE_LOOKUP $0: test rdi, rdi - jz returnNilMethod + jz LreturnNilMethod test dil, 1 jnz LtaggedPointer_$0 mov r8, [rdi] @@ -81,11 +81,11 @@ .macro GENERATE_LOOKUP_SUPER $0: mov r8, rdi mov rdi, [rdi] test rdi, rdi - jz returnNilMethod + jz LreturnNilMethod movq r8, [r8 + 8] movq r8, [r8 + 64] jmp Lmain_$1 .endmacro @@ -93,12 +93,12 @@ GENERATE_LOOKUP _objc_msg_lookup, _objc_methodNotFound GENERATE_LOOKUP _objc_msg_lookup_stret, _objc_methodNotFound_stret GENERATE_LOOKUP_SUPER _objc_msg_lookup_super, _objc_msg_lookup GENERATE_LOOKUP_SUPER _objc_msg_lookup_super_stret, _objc_msg_lookup_stret -returnNilMethod: - lea rax, [rip + nilMethod] +LreturnNilMethod: + lea rax, [rip + LnilMethod] ret -nilMethod: +LnilMethod: xor rax, rax ret Index: src/runtime/lookup-asm/lookup-asm-amd64-win64.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-amd64-win64.S +++ src/runtime/lookup-asm/lookup-asm-amd64-win64.S @@ -24,11 +24,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: test rcx, rcx - jz short returnNilMethod + jz short .LreturnNilMethod test cl, 1 jnz short .LtaggedPointer_\name mov r8, [rcx] @@ -78,11 +78,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov r8, rcx mov rcx, [rcx] test rcx, rcx - jz short returnNilMethod + jz short .LreturnNilMethod mov r8, [r8 + 8] mov r8, [r8 + 56] jmp short .Lmain_\lookup .def \name @@ -94,12 +94,12 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: - lea rax, [rip + nilMethod] +.LreturnNilMethod: + lea rax, [rip + .LnilMethod] ret -nilMethod: +.LnilMethod: xor rax, rax ret Index: src/runtime/lookup-asm/lookup-asm-arm-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-arm-elf.S +++ src/runtime/lookup-asm/lookup-asm-arm-elf.S @@ -24,11 +24,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: cmp r0, #0 - beq returnNilMethod + beq .LreturnNilMethod tst r0, #1 bne .LtaggedPointer_\name ldr r2, [r0, #0] @@ -90,11 +90,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov r2, r0 ldr r0, [r0, #0] cmp r0, #0 - beq returnNilMethod + beq .LreturnNilMethod ldr r2, [r2, #4] ldr r2, [r2, #32] b .Lmain_\lookup @@ -105,16 +105,16 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: - adr r0, nilMethod +.LreturnNilMethod: + adr r0, .LnilMethod bx lr -nilMethod: +.LnilMethod: mov r0, #0 bx lr #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-arm64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-arm64-elf.S +++ src/runtime/lookup-asm/lookup-asm-arm64-elf.S @@ -23,11 +23,11 @@ .globl objc_msg_lookup_super_stret .section .text .macro GENERATE_LOOKUP name notFound \name: - cbz x0, returnNilMethod + cbz x0, .LreturnNilMethod tst x0, #1 b.ne .LtaggedPointer_\name ldr x2, [x0] @@ -68,11 +68,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov x2, x0 ldr x0, [x0] - cbz x0, returnNilMethod + cbz x0, .LreturnNilMethod ldr x2, [x2, #8] ldr x2, [x2, #64] b .Lmain_\lookup @@ -83,16 +83,16 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: - adr x0, nilMethod +.LreturnNilMethod: + adr x0, .LnilMethod ret -nilMethod: +.LnilMethod: mov x0, #0 ret #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-mips-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-mips-elf.S +++ src/runtime/lookup-asm/lookup-asm-mips-elf.S @@ -72,13 +72,13 @@ move $v0, $t0 jr $ra 0: #ifdef OF_PIC - addiu $v0, $t9, nilMethod-\name + addiu $v0, $t9, .LnilMethod-\name #else - la $v0, nilMethod + la $v0, .LnilMethod #endif jr $ra #ifdef OF_PIC 1: @@ -134,13 +134,13 @@ addiu $t9, $t9, \lookup-\name b .Lmain_\lookup 0: #ifdef OF_PIC - addiu $v0, $t9, nilMethod-\name + addiu $v0, $t9, .LnilMethod-\name #else - la $v0, nilMethod + la $v0, .LnilMethod #endif jr $ra .type \name, %function .size \name, .-\name .endm @@ -148,12 +148,12 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -nilMethod: +.LnilMethod: move $v0, $zero jr $ra #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S +++ src/runtime/lookup-asm/lookup-asm-mips64-n64-elf.S @@ -70,11 +70,11 @@ 0: lui $v0, %hi(%neg(%gp_rel(\name))) daddiu $v0, $v0, %lo(%neg(%gp_rel(\name))) daddu $v0, $v0, $t9 - ld $v0, %got_disp(nilMethod)($v0) + ld $v0, %got_disp(.LnilMethod)($v0) jr $ra 1: lui $t0, %hi(%neg(%gp_rel(\name))) daddiu $t0, $t0, %lo(%neg(%gp_rel(\name))) @@ -117,11 +117,11 @@ 0: lui $v0, %hi(%neg(%gp_rel(\name))) daddiu $v0, $v0, %lo(%neg(%gp_rel(\name))) daddu $v0, $v0, $t9 - ld $v0, %got_disp(nilMethod)($v0) + ld $v0, %got_disp(.LnilMethod)($v0) jr $ra .type \name, %function .size \name, .-\name .endm @@ -128,12 +128,12 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -nilMethod: +.LnilMethod: move $v0, $zero jr $ra #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-powerpc-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-powerpc-elf.S +++ src/runtime/lookup-asm/lookup-asm-powerpc-elf.S @@ -24,11 +24,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: cmpwi %r3, 0 - beq- returnNilMethod + beq- .LreturnNilMethod andi. %r0, %r3, 1 bne- .LtaggedPointer_\name lwz %r5, 0(%r3) @@ -122,11 +122,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mr %r5, %r3 lwz %r3, 0(%r3) cmpwi %r3, 0 - beq- returnNilMethod + beq- .LreturnNilMethod lwz %r5, 4(%r5) lwz %r5, 32(%r5) b .Lmain_\lookup @@ -137,23 +137,23 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: +.LreturnNilMethod: mflr %r0 - bl getPC + bl .LgetPC mtlr %r0 0: - addi %r3, %r3, nilMethod-0b + addi %r3, %r3, .LnilMethod-0b blr -nilMethod: +.LnilMethod: li %r3, 0 blr -getPC: +.LgetPC: mflr %r3 blr #ifdef OF_PIC .section .got2, "aw" Index: src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S +++ src/runtime/lookup-asm/lookup-asm-powerpc64-elf.S @@ -132,32 +132,32 @@ GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret .LreturnNilMethod: - addis %r3, %r2, nilMethod@toc@ha - addi %r3, %r3, nilMethod@toc@l + addis %r3, %r2, .LnilMethod@toc@ha + addi %r3, %r3, .LnilMethod@toc@l blr #if defined(_CALL_ELF) && _CALL_ELF == 2 -nilMethod: - addis %r2, %r12, .TOC.-nilMethod@ha - addi %r2, %r2, .TOC.-nilMethod@l -.localentry nilMethod, .-nilMethod +.LnilMethod: + addis %r2, %r12, .TOC.-.LnilMethod@ha + addi %r2, %r2, .TOC.-.LnilMethod@l +.localentry .LnilMethod, .-.LnilMethod #else .section .opd, "aw", @progbits -nilMethod: +.LnilMethod: .p2align 3 .quad .Lbegin_nilMethod .quad .TOC.@tocbase .quad 0 .section .text #endif .Lbegin_nilMethod: li %r3, 0 blr -.type nilMethod, @function -.size nilMethod, .-.Lbegin_nilMethod +.type .LnilMethod, @function +.size .LnilMethod, .-.Lbegin_nilMethod #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", @progbits #endif Index: src/runtime/lookup-asm/lookup-asm-sparc-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-sparc-elf.S +++ src/runtime/lookup-asm/lookup-asm-sparc-elf.S @@ -24,11 +24,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: tst %o0 - bz returnNilMethod + bz .LreturnNilMethod btst 1, %o0 bnz .LtaggedPointer_\name nop ld [%o0], %o2 @@ -102,11 +102,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov %o0, %o2 ld [%o0], %o0 cmp %o0, 0 - be returnNilMethod + be .LreturnNilMethod nop ld [%o2 + 4], %o2 ba .Lmain_\lookup ld [%o2 + 32], %o2 @@ -117,33 +117,33 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: +.LreturnNilMethod: #ifdef OF_PIC mov %o7, %g1 sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %o1 call 0f add %o1, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %o1 0: add %o7, %o1, %o1 - sethi %hi(nilMethod), %o0 - or %o0, %lo(nilMethod), %o0 + sethi %hi(.LnilMethod), %o0 + or %o0, %lo(.LnilMethod), %o0 jmpl %g1 + 8, %g0 ld [%o1 + %o0], %o0 #else - sethi %hi(nilMethod), %o0 + sethi %hi(.LnilMethod), %o0 retl - or %o0, %lo(nilMethod), %o0 + or %o0, %lo(.LnilMethod), %o0 #endif -nilMethod: +.LnilMethod: retl clr %o0 #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-sparc64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-sparc64-elf.S +++ src/runtime/lookup-asm/lookup-asm-sparc64-elf.S @@ -23,11 +23,11 @@ .globl objc_msg_lookup_super_stret .section .text .macro GENERATE_LOOKUP name notFound \name: - brz,pn %o0, returnNilMethod + brz,pn %o0, .LreturnNilMethod and %o0, 1, %o2 brnz,pn %o2, .LtaggedPointer_\name nop ldx [%o0], %o2 @@ -99,11 +99,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov %o0, %o2 ldx [%o0], %o0 - brz,pn %o0, returnNilMethod + brz,pn %o0, .LreturnNilMethod nop ldx [%o2 + 8], %o2 ba .Lmain_\lookup ldx [%o2 + 64], %o2 @@ -114,33 +114,33 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: +.LreturnNilMethod: #ifdef OF_PIC mov %o7, %g1 sethi %hi(_GLOBAL_OFFSET_TABLE_ - 4), %o1 call 0f or %o1, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %o1 0: add %o7, %o1, %o1 - sethi %hi(nilMethod), %o0 - or %o0, %lo(nilMethod), %o0 + sethi %hi(.LnilMethod), %o0 + or %o0, %lo(.LnilMethod), %o0 jmpl %g1 + 8, %g0 ldx [%o1 + %o0], %o0 #else - sethi %hi(nilMethod), %o0 + sethi %hi(.LnilMethod), %o0 retl - or %o0, %lo(nilMethod), %o0 + or %o0, %lo(.LnilMethod), %o0 #endif -nilMethod: +.LnilMethod: retl clr %o0 #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-x86-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-x86-elf.S +++ src/runtime/lookup-asm/lookup-asm-x86-elf.S @@ -27,11 +27,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: mov edx, [esp + 4] test edx, edx - jz short returnNilMethod + jz short .LreturnNilMethod test dl, 1 jnz short .LtaggedPointer_\name mov edx, [edx] @@ -53,17 +53,17 @@ jz short 0f ret 0: - call getEIP + call .LgetEIP add eax, offset _GLOBAL_OFFSET_TABLE_ mov eax, [eax + \notFound@GOT] jmp eax .LtaggedPointer_\name: - call getEIP + call .LgetEIP add eax, offset _GLOBAL_OFFSET_TABLE_ mov ecx, [eax + objc_taggedPointerSecret@GOT] xor edx, [ecx] and dl, 0xE @@ -81,11 +81,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov edx, [esp + 4] mov eax, [edx] test eax, eax - jz short returnNilMethod + jz short .LreturnNilMethod mov [esp + 4], eax mov edx, [edx + 4] mov edx, [edx + 32] jmp short .Lmain_\lookup @@ -96,22 +96,22 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: - call getEIP +.LreturnNilMethod: + call .LgetEIP add eax, offset _GLOBAL_OFFSET_TABLE_ - lea eax, [eax + nilMethod@GOTOFF] + lea eax, [eax + .LnilMethod@GOTOFF] ret -nilMethod: +.LnilMethod: xor eax, eax ret -getEIP: +.LgetEIP: mov eax, [esp] ret #if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif Index: src/runtime/lookup-asm/lookup-asm-x86-win32.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-x86-win32.S +++ src/runtime/lookup-asm/lookup-asm-x86-win32.S @@ -25,11 +25,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: mov edx, [esp + 4] test edx, edx - jz short returnNilMethod + jz short .LreturnNilMethod test dl, 1 jnz short .LtaggedPointer_\name mov edx, [edx] @@ -70,11 +70,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov edx, [esp + 4] mov eax, [edx] test eax, eax - jz short returnNilMethod + jz short .LreturnNilMethod mov [esp + 4], eax mov edx, [edx + 4] mov edx, [edx + 32] jmp short .Lmain_\lookup @@ -87,12 +87,12 @@ GENERATE_LOOKUP _objc_msg_lookup _objc_methodNotFound GENERATE_LOOKUP _objc_msg_lookup_stret _objc_methodNotFound_stret GENERATE_LOOKUP_SUPER _objc_msg_lookup_super _objc_msg_lookup GENERATE_LOOKUP_SUPER _objc_msg_lookup_super_stret _objc_msg_lookup_stret -returnNilMethod: - mov eax, offset nilMethod +.LreturnNilMethod: + mov eax, offset .LnilMethod ret -nilMethod: +.LnilMethod: xor eax, eax ret