Overview
Comment: | Move x86/Mach-O assembly to Intel syntax
A workaround for the assembler bugs has been found. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
18c524e13d3e573306688211e86e3928 |
User & Date: | js on 2023-10-28 18:04:09 |
Other Links: | manifest | tags |
Context
2023-10-28
| ||
18:35 | Use more local labels in assembly check-in: cb18f26404 user: js tags: trunk | |
18:04 | Move x86/Mach-O assembly to Intel syntax check-in: 18c524e13d user: js tags: trunk | |
17:05 | Move x86/Mach-O assembly to Intel syntax check-in: 54ee8929f0 user: js tags: trunk | |
Changes
Modified src/forwarding/apple-forwarding-amd64.S from [9954d86ee8] to [5acd78427e].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | * file. */ #include "config.h" .globl _OFForward .globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip sel_forwardingTargetForSelector_: .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions _OFForward: | > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | * file. */ #include "config.h" .globl _OFForward .globl _OFForward_stret .intel_syntax noprefix /* Work around assembler bugs. */ .macro call .att_syntax /* Use uppercase instruction to avoid recursion. */ CALL $0 .intel_syntax noprefix .endmacro .macro jmp .att_syntax /* Use uppercase instruction to avoid recursion. */ JMP $0 .intel_syntax noprefix .endmacro .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" .section __DATA, __objc_selrefs, literal_pointers, no_dead_strip sel_forwardingTargetForSelector_: .quad str_forwardingTargetForSelector_ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions _OFForward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp - 0x08], rax mov [rbp - 0x10], rdi mov [rbp - 0x18], rsi mov [rbp - 0x20], rdx mov [rbp - 0x28], rcx mov [rbp - 0x30], r8 mov [rbp - 0x38], r9 movaps [rbp - 0x50], xmm0 movaps [rbp - 0x60], xmm1 movaps [rbp - 0x70], xmm2 movaps [rbp - 0x80], xmm3 movaps [rbp - 0x90], xmm4 movaps [rbp - 0xA0], xmm5 movaps [rbp - 0xB0], xmm6 movaps [rbp - 0xC0], xmm7 call _object_getClass mov rdi, rax mov rsi, [rip + sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x10] mov rsi, [rip + sel_forwardingTargetForSelector_] mov rdx, [rbp - 0x18] call _objc_msgSend test rax, rax jz 0f cmp rax, [rbp - 0x10] je 0f mov rdi, rax /* Restore all arguments, except %rdi */ movaps xmm7, [rbp - 0xC0] movaps xmm6, [rbp - 0xB0] movaps xmm5, [rbp - 0xA0] movaps xmm4, [rbp - 0x90] movaps xmm3, [rbp - 0x80] movaps xmm2, [rbp - 0x70] movaps xmm1, [rbp - 0x60] movaps xmm0, [rbp - 0x50] mov r9, [rbp - 0x38] mov r8, [rbp - 0x30] mov rcx, [rbp - 0x28] mov rdx, [rbp - 0x20] mov rsi, [rbp - 0x18] mov rax, [rbp - 0x08] mov rsp, rbp pop rbp jmp _objc_msgSend 0: mov rdi, [rbp - 0x10] mov rsi, [rbp - 0x18] mov rsp, rbp pop rbp jmp _OFMethodNotFound _OFForward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ movq [rbp - 0x08], rax movq [rbp - 0x10], rdi movq [rbp - 0x18], rsi movq [rbp - 0x20], rdx movq [rbp - 0x28], rcx movq [rbp - 0x30], r8 movq [rbp - 0x38], r9 movaps [rbp - 0x50], xmm0 movaps [rbp - 0x60], xmm1 movaps [rbp - 0x70], xmm2 movaps [rbp - 0x80], xmm3 movaps [rbp - 0x90], xmm4 movaps [rbp - 0xA0], xmm5 movaps [rbp - 0xB0], xmm6 movaps [rbp - 0xC0], xmm7 mov rdi, rsi call _object_getClass mov rdi, rax mov rsi, [rip + sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x18] mov rsi, [rip + sel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call _objc_msgSend test rax, rax jz 0f cmp rax, [rbp - 0x18] je 0f mov rsi, rax /* Restore all arguments, except %rsi */ movaps xmm7, [rbp - 0xC0] movaps xmm6, [rbp - 0xB0] movaps xmm5, [rbp - 0xA0] movaps xmm4, [rbp - 0x90] movaps xmm3, [rbp - 0x80] movaps xmm2, [rbp - 0x70] movaps xmm1, [rbp - 0x60] movaps xmm0, [rbp - 0x50] mov r9, [rbp - 0x38] mov r8, [rbp - 0x30] mov rcx, [rbp - 0x28] mov rdx, [rbp - 0x20] mov rdi, [rbp - 0x10] mov rax, [rbp - 0x08] mov rsp, rbp pop rbp jmp _objc_msgSend_stret 0: mov rdi, [rbp - 0x10] mov rsi, [rbp - 0x18] mov rdx, [rbp - 0x20] mov rsp, rbp pop rbp jmp _OFMethodNotFound_stret |
Modified src/forwarding/forwarding-amd64-macho.S from [3f0c2bdab8] to [0969f9a066].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 | #include "config.h" #include "platform.h" .globl _OFForward .globl _OFForward_stret .section __TEXT, __text, regular, pure_instructions _OFForward: | > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | #include "config.h" #include "platform.h" .globl _OFForward .globl _OFForward_stret .intel_syntax noprefix /* Work around assembler bugs. */ .macro call .att_syntax /* Use uppercase instruction to avoid recursion. */ CALL $0 .intel_syntax noprefix .endmacro .macro jmp .att_syntax /* Use uppercase instruction to avoid recursion. */ JMP $0 .intel_syntax noprefix .endmacro .section __TEXT, __text, regular, pure_instructions _OFForward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ movq [rbp - 0x08], rax movq [rbp - 0x10], rdi movq [rbp - 0x18], rsi movq [rbp - 0x20], rdx movq [rbp - 0x28], rcx movq [rbp - 0x30], r8 movq [rbp - 0x38], r9 movaps [rbp - 0x50], xmm0 movaps [rbp - 0x60], xmm1 movaps [rbp - 0x70], xmm2 movaps [rbp - 0x80], xmm3 movaps [rbp - 0x90], xmm4 movaps [rbp - 0xA0], xmm5 movaps [rbp - 0xB0], xmm6 movaps [rbp - 0xC0], xmm7 call _object_getClass mov rdi, rax lea rsi, [rip + sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x10] lea rsi, [rip + sel_forwardingTargetForSelector_] call _objc_msg_lookup movq rdi, [rbp - 0x10] leaq rsi, [rip + sel_forwardingTargetForSelector_] movq rdx, [rbp - 0x18] call *%rax test rax, rax jz 0f cmp rax, [rbp - 0x10] je 0f mov [rbp - 0x10], rax mov rdi, rax mov rsi, [rbp - 0x18] call _objc_msg_lookup mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp - 0xC0] movaps xmm6, [rbp - 0xB0] movaps xmm5, [rbp - 0xA0] movaps xmm4, [rbp - 0x90] movaps xmm3, [rbp - 0x80] movaps xmm2, [rbp - 0x70] movaps xmm1, [rbp - 0x60] movaps xmm0, [rbp - 0x50] mov r9, [rbp - 0x38] mov r8, [rbp - 0x30] mov rcx, [rbp - 0x28] mov rdx, [rbp - 0x20] mov rsi, [rbp - 0x18] mov rdi, [rbp - 0x10] mov rax, [rbp - 0x08] mov rsp, rbp pop rbp jmp *%r11 0: mov rdi, [rbp - 0x10] mov rsi, [rbp - 0x18] mov rsp, rbp pop rbp jmp _OFMethodNotFound _OFForward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0xC0 /* 16-byte alignment */ mov [rbp - 0x08], rax mov [rbp - 0x10], rdi mov [rbp - 0x18], rsi mov [rbp - 0x20], rdx mov [rbp - 0x28], rcx mov [rbp - 0x30], r8 mov [rbp - 0x38], r9 movaps [rbp - 0x50], xmm0 movaps [rbp - 0x60], xmm1 movaps [rbp - 0x70], xmm2 movaps [rbp - 0x80], xmm3 movaps [rbp - 0x90], xmm4 movaps [rbp - 0xA0], xmm5 movaps [rbp - 0xB0], xmm6 movaps [rbp - 0xC0], xmm7 mov rdi, rsi call _object_getClass mov rdi, rax lea rsi, [rip + sel_forwardingTargetForSelector_] call _class_respondsToSelector test rax, rax jz 0f mov rdi, [rbp - 0x18] lea rsi, [rip + sel_forwardingTargetForSelector_] call _objc_msg_lookup mov rdi, [rbp - 0x18] lea rsi, [rip + sel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call *%rax test rax, rax jz 0f cmp rax, [rbp - 0x18] je 0f mov [rbp - 0x18], rax mov rdi, rax mov rsi, [rbp - 0x20] call _objc_msg_lookup_stret mov r11, rax /* Restore all arguments */ movaps xmm7, [rbp - 0xC0] movaps xmm6, [rbp - 0xB0] movaps xmm5, [rbp - 0xA0] movaps xmm4, [rbp - 0x90] movaps xmm3, [rbp - 0x80] movaps xmm2, [rbp - 0x70] movaps xmm1, [rbp - 0x60] movaps xmm0, [rbp - 0x50] mov r9, [rbp - 0x38] mov r8, [rbp - 0x30] mov rcx, [rbp - 0x28] mov rdx, [rbp - 0x20] mov rsi, [rbp - 0x18] mov rdi, [rbp - 0x10] mov rax, [rbp - 0x08] mov rsp, rbp pop rbp jmp *%r11 0: mov rdi, [rbp - 0x10] mov rsi, [rbp - 0x18] mov rdx, [rbp - 0x20] mov rsp, rbp pop rbp jmp _OFMethodNotFound_stret init: lea rdi, [rip + module] jmp ___objc_exec_class .section __DATA, __mod_init_func, mod_init_funcs .quad init .section __TEXT, __cstring, cstring_literals str_forwardingTargetForSelector_: |
︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-amd64-macho.S from [f313fe156e] to [ca53a90db3].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 | #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: | > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | #include "config.h" .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .intel_syntax /* Work around assembler bugs. */ .macro jmp .att_syntax /* Use uppercase instruction to avoid recursion. */ JMP $0 .intel_syntax noprefix .endmacro .macro jz .att_syntax /* Use uppercase instruction to avoid recursion. */ JZ $0 .intel_syntax noprefix .endmacro .section __TEXT, __text, regular, pure_instructions .macro GENERATE_LOOKUP $0: test rdi, rdi jz returnNilMethod test dil, 1 jnz LtaggedPointer_$0 mov r8, [rdi] mov r8, [r8 + 64] Lmain_$0: mov rax, [rsi] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8 + 8 * rax] #endif movq r8, [r8 + 8 * rcx] movq rax, [r8 + 8 * rdx] test rax, rax jz $1 ret LtaggedPointer_$0: mov rax, [rip + _objc_taggedPointerSecret@GOTPCREL] xor rdi, [rax] andb dil, 0xE movzx r8d, dil mov rax, [rip + _objc_taggedPointerClasses@GOTPCREL] mov r8, [rax + 4 * r8] mov r8, [r8 + 64] jmp Lmain_$0 .endmacro .macro GENERATE_LOOKUP_SUPER $0: mov r8, rdi mov rdi, [rdi] test rdi, rdi jz returnNilMethod movq r8, [r8 + 8] movq r8, [r8 + 64] jmp Lmain_$1 .endmacro 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] ret nilMethod: xor rax, rax ret |