Overview
Comment: | Minor cleanup of x86/ELF ASM |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b194a9a226b40bdb1f46873c7d7266d0 |
User & Date: | js on 2020-06-30 00:37:18 |
Other Links: | manifest | tags |
Context
2020-06-30
| ||
01:08 | Remove unnecessary PIC from x86/Win32 ASM check-in: 9ccac85bb4 user: js tags: trunk | |
00:37 | Minor cleanup of x86/ELF ASM check-in: b194a9a226 user: js tags: trunk | |
00:11 | Make use of @PLT in x86/ELF ASM check-in: 0b417fb86f user: js tags: trunk | |
Changes
Modified src/forwarding/forwarding-x86-elf.S from [1b2ac8ff28] 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 | 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 |
︙ | ︙ | |||
106 107 108 109 110 111 112 | mov [esp], eax lea eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF] mov [esp+4], eax call class_respondsToSelector@PLT test eax, eax | | | | < > | | 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 | 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 |
︙ | ︙ |
Modified src/runtime/lookup-asm/lookup-asm-x86-elf.S from [1aba078652] to [582b619bd5].
︙ | ︙ | |||
52 53 54 55 56 57 58 | jz short 0f ret 0: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | jz short 0f ret 0: call get_eip add eax, offset _GLOBAL_OFFSET_TABLE_ lea eax, [eax+\not_found@GOTOFF] jmp eax .type \name, %function .size \name, .-\name .endm .macro generate_lookup_super name lookup \name: |
︙ | ︙ | |||
81 82 83 84 85 86 87 | 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_ | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | 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 |