@@ -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