Overview
Comment: | Merge trunk into branch "tagged-pointers" |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tagged-pointers |
Files: | files | file ages | folders |
SHA3-256: |
c4a12e3fa16a0f9c7559fab039c8eb69 |
User & Date: | js on 2020-06-30 20:52:57 |
Other Links: | branch diff | manifest | tags |
Context
2020-06-30
| ||
21:12 | lookup-asm-x86_64-win64.S: Support tagged pointers check-in: 2cec2f2e8d user: js tags: tagged-pointers | |
20:52 | Merge trunk into branch "tagged-pointers" check-in: c4a12e3fa1 user: js tags: tagged-pointers | |
20:50 | Convert all x86_64/Win64 ASM to Intel syntax check-in: b177aa1b8b user: js tags: trunk | |
00:29 | lookup-asm-x86-elf.S: Support tagged pointers check-in: 7f493d2446 user: js tags: tagged-pointers | |
Changes
Modified configure.ac from [ffd0b1674a] to [a08bfedbde].
︙ | ︙ | |||
248 249 250 251 252 253 254 255 256 257 258 259 260 261 | dnl accept everything used in ObjFW's assembly files. dnl Therefore, use the integrated assembler for ObjC dnl files, but not for assembly files. mips*-*-*) flag="-integrated-as" OBJCFLAGS="$OBJCFLAGS $flag" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flag" ;; dnl Many older Clang versions don't support jmp short. i?86-*-* | x86_64-*-*) ASFLAGS="$ASFLAGS -no-integrated-as" ;; dnl Clang's assembler on Windows is not complete yet dnl and cannot compile all .S files. | > > > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | dnl accept everything used in ObjFW's assembly files. dnl Therefore, use the integrated assembler for ObjC dnl files, but not for assembly files. mips*-*-*) flag="-integrated-as" OBJCFLAGS="$OBJCFLAGS $flag" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flag" ;; dnl Don't use -no-integrated-as on Darwin. It breaks dnl building for the iOS simulator. i?86-*-darwin* | x86_64-*-darwin*) ;; dnl Many older Clang versions don't support jmp short. i?86-*-* | x86_64-*-*) ASFLAGS="$ASFLAGS -no-integrated-as" ;; dnl Clang's assembler on Windows is not complete yet dnl and cannot compile all .S files. |
︙ | ︙ |
Modified src/forwarding/forwarding-x86-elf.S from [2e098aafbd] to [294c10a12e].
︙ | ︙ | |||
29 30 31 32 33 34 35 | push ebp mov ebp, esp push ebx sub esp, 20 call get_eip | < | < | < | | < | | | < < > | < | < | < | | < | | | < < > | < | < | 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 | push ebp mov ebp, esp push ebx sub esp, 20 call get_eip 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] 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] mov [esp+4], eax call objc_msg_lookup@PLT mov edx, [ebp+8] mov [esp], edx lea edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], edx mov edx, [ebp+12] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+8] je short 0f mov [ebp+8], eax mov [esp], eax mov eax, [ebp+12] mov [esp+4], eax call objc_msg_lookup@PLT add esp, 20 pop ebx pop ebp jmp eax 0: lea eax, [ebx+of_method_not_found@GOTOFF] add esp, 20 pop ebx pop ebp jmp eax .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: push ebp mov ebp, esp push ebx sub esp, 20 call get_eip 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] 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] mov [esp+4], eax call objc_msg_lookup@PLT mov edx, [ebp+12] mov [esp], edx lea edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], edx mov edx, [ebp+16] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+12] je short 0f mov [ebp+12], eax mov [esp], eax mov eax, [ebp+16] mov [esp+4], eax call objc_msg_lookup_stret@PLT add esp, 20 pop ebx pop ebp jmp eax 0: lea eax, [ebx+of_method_not_found_stret@GOTOFF] add esp, 20 pop ebx pop ebp jmp eax .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: push ebp mov ebp, esp push ebx sub esp, 4 call get_eip add ebx, offset _GLOBAL_OFFSET_TABLE_ lea eax, [ebx+module@GOTOFF] mov [esp], eax call __objc_exec_class@PLT add esp, 4 pop ebx pop ebp ret get_eip: |
︙ | ︙ |
Modified src/forwarding/forwarding-x86-win32.S from [2062a9ecd0] to [38023e4835].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 | * 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 _of_forward .globl _of_forward_stret .section .text _of_forward: | > > | > > > | > > > | > > > > | > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < | < < < < < < | > > > | > > > | > > > > | > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < | < < < < < < | | | | < < | | | < | | | < < < < | 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 | * 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" .intel_syntax noprefix .globl _of_forward .globl _of_forward_stret .section .text _of_forward: push ebp mov ebp, esp push ebx sub esp, 20 mov eax, [ebp+8] mov [esp], eax call _object_getClass mov [esp], eax mov eax, offset sel_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 [esp+4], eax call _objc_msg_lookup mov edx, [ebp+8] mov [esp], edx mov edx, offset sel_forwardingTargetForSelector_ mov [esp+4], edx mov edx, [ebp+12] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+8] je short 0f mov [ebp+8], eax mov [esp], eax mov eax, [ebp+12] mov [esp+4], eax call _objc_msg_lookup add esp, 20 pop ebx pop ebp jmp eax 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found _of_forward_stret: push ebp mov ebp, esp push ebx sub esp, 20 mov eax, [ebp+12] mov [esp], eax call _object_getClass mov [esp], eax mov eax, offset sel_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 [esp+4], eax call _objc_msg_lookup mov edx, [ebp+12] mov [esp], edx mov edx, offset sel_forwardingTargetForSelector_ mov [esp+4], edx mov edx, [ebp+16] mov [esp+8], edx call eax test eax, eax jz short 0f cmp eax, [ebp+12] je short 0f mov [ebp+12], eax mov [esp], eax mov eax, [ebp+16] mov [esp+4], eax call _objc_msg_lookup_stret add esp, 20 pop ebx pop ebp jmp eax 0: add esp, 20 pop ebx pop ebp jmp _of_method_not_found_stret init: push ebp mov ebp, esp push ebx sub esp, 4 mov eax, offset module mov [esp], eax call ___objc_exec_class add esp, 4 pop ebx pop ebp ret .section .ctors, "aw" .long init .section .rodata str_forwardingTargetForSelector_: |
︙ | ︙ |
Modified src/forwarding/forwarding-x86_64-win64.S from [ec2efee322] to [b1b62864b4].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 | * 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 of_forward .globl of_forward_stret .section .text of_forward: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | * 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" .intel_syntax noprefix .globl of_forward .globl of_forward_stret .section .text of_forward: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0x90 /* 16-byte alignment */ mov [rbp-0x28], rax mov [rbp-0x30], rcx mov [rbp-0x38], rdx mov [rbp-0x40], r8 mov [rbp-0x48], r9 movaps [rbp-0x60], xmm0 movaps [rbp-0x70], xmm1 movaps [rbp-0x80], xmm2 movaps [rbp-0x90], xmm3 call object_getClass mov rcx, rax mov rdx, offset sel_forwardingTargetForSelector_ call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp-0x30] mov rdx, offset sel_forwardingTargetForSelector_ call objc_msg_lookup mov rcx, [rbp-0x30] mov rdx, offset sel_forwardingTargetForSelector_ mov r8, [rbp-0x38] call rax test rax, rax jz short 0f cmp rax, [rbp-0x30] je short 0f mov [rbp-0x30], rax mov rcx, rax mov rdx, [rbp-0x38] call objc_msg_lookup mov r11, rax /* Restore all arguments */ movaps xmm3, [rbp-0x90] movaps xmm2, [rbp-0x80] movaps xmm1, [rbp-0x70] movaps xmm0, [rbp-0x60] mov r9, [rbp-0x48] mov r8, [rbp-0x40] mov rdx, [rbp-0x38] mov rcx, [rbp-0x30] mov rax, [rbp-0x28] mov rsp, rbp pop rbp jmp r11 0: mov rcx, [rbp-0x30] mov rdx, [rbp-0x38] mov rsp, rbp pop rbp jmp of_method_not_found of_forward_stret: push rbp mov rbp, rsp /* Save all arguments */ sub rsp, 0x90 /* 16-byte alignment */ mov [rbp-0x28], rax mov [rbp-0x30], rcx mov [rbp-0x38], rdx mov [rbp-0x40], r8 mov [rbp-0x48], r9 movaps [rbp-0x60], xmm0 movaps [rbp-0x70], xmm1 movaps [rbp-0x80], xmm2 movaps [rbp-0x90], xmm3 mov rcx, rdx call object_getClass mov rcx, rax mov rdx, offset sel_forwardingTargetForSelector_ call class_respondsToSelector test rax, rax jz short 0f mov rcx, [rbp-0x38] mov rdx, offset sel_forwardingTargetForSelector_ call objc_msg_lookup mov rcx, [rbp-0x38] mov rdx, offset sel_forwardingTargetForSelector_ mov r8, [rbp-0x40] call rax test rax, rax jz short 0f cmp rax, [rbp-0x38] je short 0f mov [rbp-0x38], rax mov rcx, rax mov rdx, [rbp-0x40] call objc_msg_lookup_stret mov r11, rax /* Restore all arguments */ movaps xmm3, [rbp-0x90] movaps xmm2, [rbp-0x80] movaps xmm1, [rbp-0x70] movaps xmm0, [rbp-0x60] mov r9, [rbp-0x48] mov r8, [rbp-0x40] mov rdx, [rbp-0x38] mov rcx, [rbp-0x30] mov rax, [rbp-0x28] mov rsp, rbp pop rbp jmp r11 0: mov rcx, [rbp-0x30] mov rdx, [rbp-0x38] mov r8, [rbp-0x40] mov rsp, rbp pop rbp jmp of_method_not_found_stret init: mov rcx, offset module jmp __objc_exec_class .section .ctors, "aw" .quad init .section .rodata str_forwardingTargetForSelector_: |
︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-x86-elf.S from [9f1f33cd94] to [c25a1420f7].
︙ | ︙ | |||
54 55 56 57 58 59 60 | test eax, eax jz short 0f ret 0: call get_eip | < | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | test eax, eax jz short 0f ret 0: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ lea eax, [eax+\not_found@GOTOFF] jmp eax .Ltagged_pointer_\name: movzx edx, dl shr edx, 1 call get_eip |
︙ | ︙ | |||
97 98 99 100 101 102 103 | generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: call get_eip | < > | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ lea eax, [eax+nil_method@GOTOFF] ret nil_method: xor eax, eax ret get_eip: mov eax, [esp] ret #ifdef OF_LINUX .section .note.GNU-stack, "", %progbits #endif |
Modified src/runtime/lookup-asm/lookup-asm-x86-win32.S from [4aa81a0136] to [44cfb2c923].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * 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 .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | < < | < | | | | | | | | < < | | < < < < | 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 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 | * 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" .intel_syntax noprefix .globl _objc_msg_lookup .globl _objc_msg_lookup_stret .globl _objc_msg_lookup_super .globl _objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: mov edx, [esp+4] test edx, edx jz short ret_nil mov edx, [edx] mov edx, [edx+32] .Lmain_\name: mov eax, [esp+8] #ifdef OF_SELUID24 movzx ecx, byte ptr [eax+2] mov edx, [edx+ecx*4] #endif movzx ecx, byte ptr [eax+1] mov edx, [edx+ecx*4] movzx ecx, byte ptr [eax] mov eax, [edx+ecx*4] test eax, eax jz short 0f ret 0: jmp \not_found .endm .macro generate_lookup_super name lookup \name: mov edx, [esp+4] mov eax, [edx] test eax, eax jz short ret_nil mov [esp+4], eax mov edx, [edx+4] mov edx, [edx+32] jmp short .Lmain_\lookup .endm generate_lookup _objc_msg_lookup _objc_method_not_found generate_lookup _objc_msg_lookup_stret _objc_method_not_found_stret generate_lookup_super _objc_msg_lookup_super _objc_msg_lookup generate_lookup_super _objc_msg_lookup_super_stret _objc_msg_lookup_stret ret_nil: mov eax, offset nil_method ret nil_method: xor eax, eax ret |
Modified src/runtime/lookup-asm/lookup-asm-x86_64-elf.S from [37f4b60ca1] to [14d6290458].
︙ | ︙ | |||
41 42 43 44 45 46 47 | .Lmain_\name: mov rax, [rsi] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 | | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | .Lmain_\name: mov rax, [rsi] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8+rax*8] #endif mov r8, [r8+rcx*8] mov rax, [r8+rdx*8] test rax, rax jz short \not_found@PLT ret |
︙ | ︙ | |||
69 70 71 72 73 74 75 | .endm .macro generate_lookup_super name lookup \name: mov r8, rdi mov rdi, [rdi] test rdi, rdi | | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | .endm .macro generate_lookup_super name lookup \name: mov r8, rdi mov rdi, [rdi] test rdi, rdi jz short ret_nil mov r8, [r8+8] mov r8, [r8+64] jmp short .Lmain_\lookup .type \name, %function .size \name, .-\name .endm generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup |
︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-x86_64-win64.S from [71fe436f5b] to [47f8ccf7d6].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * 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 .macro generate_lookup name not_found \name: | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | * 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" .intel_syntax noprefix .globl objc_msg_lookup .globl objc_msg_lookup_stret .globl objc_msg_lookup_super .globl objc_msg_lookup_super_stret .section .text .macro generate_lookup name not_found \name: test %rcx, %rcx jz short ret_nil mov r8, [rcx] mov r8, [r8+56] .Lmain_\name: mov r10, rcx mov r11, rdx mov rax, [rdx] movzx ecx, ah movzx edx, al #ifdef OF_SELUID24 shr eax, 16 mov r8, [r8+rax*8] #endif mov r8, [r8+rcx*8] mov rax, [r8+rdx*8] test rax, rax jz short 0f ret 0: mov rcx, r10 mov rdx, r11 jmp \not_found .endm .macro generate_lookup_super name lookup \name: mov r8, rcx mov rcx, [rcx] test rcx, rcx jz short ret_nil mov r8, [r8+8] mov r8, [r8+56] jmp short .Lmain_\lookup .endm generate_lookup objc_msg_lookup objc_method_not_found generate_lookup objc_msg_lookup_stret objc_method_not_found_stret generate_lookup_super objc_msg_lookup_super objc_msg_lookup generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret ret_nil: mov rax, offset nil_method ret nil_method: xor rax, rax ret |