@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2022 Jonathan Schleifer + * Copyright (c) 2008-2024 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -25,11 +25,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: movl 4(%esp), %edx testl %edx, %edx - jz returnNilMethod + jz .LreturnNilMethod testb $1, %dl jnz .LtaggedPointer_\name movl (%edx), %edx @@ -51,25 +51,25 @@ jz 0f ret 0: - call getEIP + call .LgetEIP addl $_GLOBAL_OFFSET_TABLE_, %eax - lea \notFound@GOTOFF(%eax), %eax + movl \notFound@GOT(%eax), %eax jmp *%eax .LtaggedPointer_\name: - call getEIP + call .LgetEIP addl $_GLOBAL_OFFSET_TABLE_, %eax - leal objc_taggedPointerSecret@GOTOFF(%eax), %ecx + movl objc_taggedPointerSecret@GOT(%eax), %ecx xorl (%ecx), %edx andb $0xE, %dl movzbl %dl, %edx - leal objc_taggedPointerClasses@GOTOFF(%eax), %eax + movl objc_taggedPointerClasses@GOT(%eax), %eax movl (%eax,%edx,2), %edx movl 32(%edx), %edx jmp .Lmain_\name .type \name, %function @@ -79,11 +79,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: movl 4(%esp), %edx movl (%edx), %eax testl %eax, %eax - jz returnNilMethod + jz .LreturnNilMethod movl %eax, 4(%esp) mov 4(%edx), %edx mov 32(%edx), %edx jmp .Lmain_\lookup @@ -94,22 +94,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 addl $_GLOBAL_OFFSET_TABLE_, %eax - leal nilMethod@GOTOFF(%eax), %eax + leal .LnilMethod@GOTOFF(%eax), %eax ret -nilMethod: +.LnilMethod: xorl %eax, %eax ret -getEIP: +.LgetEIP: movl (%esp), %eax ret -#ifdef OF_LINUX +#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", %progbits #endif