Overview
Comment: | Fix -[forwardingTargetForSelector:] on AMD64. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
a7409be2c4c294cd97251de19ee4cfd1 |
User & Date: | js on 2013-07-25 22:41:59 |
Other Links: | manifest | tags |
Context
2013-07-25
| ||
22:54 | More -[forwardingTargetForSelector:] tests. check-in: 37ea76ea9d user: js tags: trunk | |
22:41 | Fix -[forwardingTargetForSelector:] on AMD64. check-in: a7409be2c4 user: js tags: trunk | |
00:46 | lookup-asm-*.S: Reorder functions. check-in: ad2abaf3be user: js tags: trunk | |
Changes
Modified src/apple-forwarding-x86_64.S from [fbc56f85c8] to [5bfd2f984d].
︙ | ︙ | |||
31 32 33 34 35 36 37 | .section __TEXT, __text, regular, pure_instructions _of_forward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | .section __TEXT, __text, regular, pure_instructions _of_forward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ movq %rax, -0x8(%rbp) movq %rdi, -0x10(%rbp) movq %rsi, -0x18(%rbp) movq %rdx, -0x20(%rbp) movq %rcx, -0x28(%rbp) movq %r8, -0x30(%rbp) movq %r9, -0x38(%rbp) movdqa %xmm0, -0x50(%rbp) movdqa %xmm1, -0x60(%rbp) movdqa %xmm2, -0x70(%rbp) movdqa %xmm3, -0x80(%rbp) movdqa %xmm4, -0x90(%rbp) movdqa %xmm5, -0xA0(%rbp) movdqa %xmm6, -0xB0(%rbp) movdqa %xmm7, -0xC0(%rbp) call _object_getClass movq %rax, %rdi movq L_sel_forwardingTargetForSelector(%rip), %rsi call _class_respondsToSelector testq %rax, %rax jz fail movq -0x10(%rbp), %rdi movq L_sel_forwardingTargetForSelector(%rip), %rsi movq -0x18(%rbp), %rdx call _objc_msgSend movq %rax, %rdi testq %rdi, %rdi jz fail cmpq -0x10(%rbp), %rdi je fail /* Restore all arguments, except %rdi */ movdqa -0xC0(%rbp), %xmm7 movdqa -0xB0(%rbp), %xmm6 movdqa -0xA0(%rbp), %xmm5 movdqa -0x90(%rbp), %xmm4 movdqa -0x80(%rbp), %xmm3 movdqa -0x70(%rbp), %xmm2 movdqa -0x60(%rbp), %xmm1 movdqa -0x50(%rbp), %xmm0 movq -0x38(%rbp), %r9 movq -0x30(%rbp), %r8 movq -0x28(%rbp), %rcx movq -0x20(%rbp), %rdx movq -0x18(%rbp), %rsi movq -0x8(%rbp), %rax movq %rbp, %rsp popq %rbp jmp _objc_msgSend fail: movq -0x10(%rbp), %rdi movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp jmp _of_method_not_found _of_forward_stret: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ movq %rax, -0x8(%rbp) movq %rdi, -0x10(%rbp) movq %rsi, -0x18(%rbp) movq %rdx, -0x20(%rbp) movq %rcx, -0x28(%rbp) movq %r8, -0x30(%rbp) movq %r9, -0x38(%rbp) movdqa %xmm0, -0x50(%rbp) movdqa %xmm1, -0x60(%rbp) movdqa %xmm2, -0x70(%rbp) movdqa %xmm3, -0x80(%rbp) movdqa %xmm4, -0x90(%rbp) movdqa %xmm5, -0xA0(%rbp) movdqa %xmm6, -0xB0(%rbp) movdqa %xmm7, -0xC0(%rbp) movq %rsi, %rdi call _object_getClass movq %rax, %rdi movq L_sel_forwardingTargetForSelector(%rip), %rsi call _class_respondsToSelector testq %rax, %rax jz fail_stret movq -0x18(%rbp), %rdi movq L_sel_forwardingTargetForSelector(%rip), %rsi movq -0x20(%rbp), %rdx call _objc_msgSend movq %rax, %rsi testq %rsi, %rsi jz fail_stret cmpq -0x18(%rbp), %rsi je fail_stret /* Restore all arguments, except %rsi */ movdqa -0xC0(%rbp), %xmm7 movdqa -0xB0(%rbp), %xmm6 movdqa -0xA0(%rbp), %xmm5 movdqa -0x90(%rbp), %xmm4 movdqa -0x80(%rbp), %xmm3 movdqa -0x70(%rbp), %xmm2 movdqa -0x60(%rbp), %xmm1 movdqa -0x50(%rbp), %xmm0 movq -0x38(%rbp), %r9 movq -0x30(%rbp), %r8 movq -0x28(%rbp), %rcx movq -0x20(%rbp), %rdx movq -0x10(%rbp), %rdi movq -0x8(%rbp), %rax movq %rbp, %rsp popq %rbp jmp _objc_msgSend_stret fail_stret: movq -0x18(%rbp), %rdi movq -0x20(%rbp), %rsi movq %rbp, %rsp popq %rbp jmp _of_method_not_found |
Modified src/forwarding-amd64-elf.S from [6c622f93eb] to [1e1ff32102].
︙ | ︙ | |||
19 20 21 22 23 24 25 | .section .text of_forward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | | 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 | .section .text of_forward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ movq %rax, -0x8(%rbp) movq %rdi, -0x10(%rbp) movq %rsi, -0x18(%rbp) movq %rdx, -0x20(%rbp) movq %rcx, -0x28(%rbp) movq %r8, -0x30(%rbp) movq %r9, -0x38(%rbp) movdqa %xmm0, -0x50(%rbp) movdqa %xmm1, -0x60(%rbp) movdqa %xmm2, -0x70(%rbp) movdqa %xmm3, -0x80(%rbp) movdqa %xmm4, -0x90(%rbp) movdqa %xmm5, -0xA0(%rbp) movdqa %xmm6, -0xB0(%rbp) movdqa %xmm7, -0xC0(%rbp) leaq sel_forwardingTargetForSelector_(%rip), %rsi call objc_msg_lookup@PLT movq -0x10(%rbp), %rdi leaq sel_forwardingTargetForSelector_(%rip), %rsi movq -0x18(%rbp), %rdx call *%rax movq %rax, -0x10(%rbp) movq %rax, %rdi movq -0x18(%rbp), %rsi call objc_msg_lookup@PLT movq %rax, %r11 /* Restore all arguments */ movdqa -0xC0(%rbp), %xmm7 movdqa -0xB0(%rbp), %xmm6 movdqa -0xA0(%rbp), %xmm5 movdqa -0x90(%rbp), %xmm4 movdqa -0x80(%rbp), %xmm3 movdqa -0x70(%rbp), %xmm2 movdqa -0x60(%rbp), %xmm1 movdqa -0x50(%rbp), %xmm0 movq -0x38(%rbp), %r9 movq -0x30(%rbp), %r8 movq -0x28(%rbp), %rcx movq -0x20(%rbp), %rdx movq -0x10(%rbp), %rdi movq -0x8(%rbp), %rax movq %rbp, %rsp popq %rbp jmpq *%r11 .type of_forward, %function .size of_forward, .-of_forward init: leaq module(%rip), %rdi jmp __objc_exec_class@PLT |
︙ | ︙ |
Modified src/forwarding-x86-elf.S from [a73786acf5] to [58a26639e3].
︙ | ︙ | |||
22 23 24 25 26 27 28 | movl %esp, %ebp pushl %ebx subl $20, %esp call get_eip .L0: | < | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | movl %esp, %ebp pushl %ebx subl $20, %esp call get_eip .L0: movl 8(%ebp), %eax movl %eax, (%esp) leal sel_forwardingTargetForSelector_-.L0(%ebx), %eax movl %eax, 4(%esp) leal objc_msg_lookup-.L0(%ebx), %eax call *%eax |
︙ | ︙ | |||
50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax .type of_forward, %function .size of_forward, .-of_forward init: pushl %ebp movl %esp, %ebp pushl %ebx subl $4, %esp call get_eip .L1: | > > > > < < < < < | 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 | call *%eax addl $20, %esp popl %ebx popl %ebp jmp *%eax get_eip: movl (%esp), %ebx ret .type of_forward, %function .size of_forward, .-of_forward init: pushl %ebp movl %esp, %ebp pushl %ebx subl $4, %esp call get_eip .L1: leal module-.L1(%ebx), %eax movl %eax, (%esp) leal __objc_exec_class-.L1(%ebx), %eax call *%eax addl $4, %esp popl %ebx popl %ebp ret .section .ctors, "a", %progbits .long init .section .rodata str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" |
︙ | ︙ |