From 82dd92351d0535330981f39070f3e012a3bf0fb7 Mon Sep 17 00:00:00 2001 From: theraven Date: Sun, 9 Oct 2011 21:38:44 +0000 Subject: [PATCH] Actually commit the files I thought I committed in the last commit --- block_trampolines.S | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block_trampolines.S b/block_trampolines.S index b8ef4a8..fe65402 100644 --- a/block_trampolines.S +++ b/block_trampolines.S @@ -21,12 +21,14 @@ .globl __objc_block_trampoline_end #if __x86_64 __objc_block_trampoline: -next: - mov -14(%rip), %esi # Load the block pointer into the second argument - xchg %edi, %esi # Swap the first and second arguments - jmp *-30(%rip) # Call the block function + mov -15(%rip), %rsi # Load the block pointer into the second argument + xchg %rdi, %rsi # Swap the first and second arguments + jmp *-32(%rip) # Call the block function __objc_block_trampoline_end: __objc_block_trampoline_sret: + mov -15(%rip), %rdx # Load the block pointer into the second argument + xchg %rdx, %rsi # Swap the first and second arguments + jmp *-32(%rip) # Call the block function __objc_block_trampoline_end_sret: #elif __i386 __objc_block_trampoline: