Differences From Artifact [e88d4f78e5]:
- File src/runtime/lookup-asm/lookup-asm-amd64-macho.S — part of check-in [75d88e0f6e] at 2024-02-24 20:50:51 on branch trunk — Add endbr32 / endbr64 (user: js, size: 1923) [annotate] [blame] [check-ins using]
To Artifact [ef9ad4248e]:
- File
src/runtime/lookup-asm/lookup-asm-amd64-macho.S
— part of check-in
[0b441e52d6]
at
2024-02-26 20:32:38
on branch trunk
— Use <cet.h> and _CET_ENDBR macro
This only uses endbr32/endbr64 when actually needed and emits the
necessary .note.gnu.property. (user: js, size: 1945) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section __TEXT, __text, regular, pure_instructions .macro GENERATE_LOOKUP $0: | > > > > > > | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #ifdef HAVE_CET_H # include <cet.h> #else # define _CET_ENDBR #endif .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section __TEXT, __text, regular, pure_instructions .macro GENERATE_LOOKUP $0: _CET_ENDBR testq %rdi, %rdi jz LreturnNilMethod testb $$1, %dil jnz LtaggedPointer_$0 |
| ︙ | ︙ | |||
64 65 66 67 68 69 70 | movq 64(%r8), %r8 jmp Lmain_$0 .endmacro .macro GENERATE_LOOKUP_SUPER $0: | | < < | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | movq 64(%r8), %r8 jmp Lmain_$0 .endmacro .macro GENERATE_LOOKUP_SUPER $0: _CET_ENDBR movq %rdi, %r8 movq (%rdi), %rdi testq %rdi, %rdi jz LreturnNilMethod movq 8(%r8), %r8 |
| ︙ | ︙ |