From c30df49e157c7bfc8e19e3f8a72b9464fe225e54 Mon Sep 17 00:00:00 2001 From: green Date: Fri, 1 Feb 2008 21:13:55 +0000 Subject: [PATCH] Revert my broken changes to twall's patch. --- libffi/ChangeLog.libffi | 6 ++++++ libffi/src/x86/ffi.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi index c81c2350..3b733938 100644 --- a/libffi/ChangeLog.libffi +++ b/libffi/ChangeLog.libffi @@ -1,3 +1,9 @@ +2008-02-01 Anthony Green + + * src/x86/ffi.c (FFI_INIT_TRAMPOLINE_STDCALL, + FFI_INIT_TRAMPOLINE): Revert my broken changes to twall's last + patch. + 2008-01-31 Anthony Green * Makefile.am (EXTRA_DIST): Add missing files. diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c index eef8382c..886a2e0e 100644 --- a/libffi/src/x86/ffi.c +++ b/libffi/src/x86/ffi.c @@ -314,7 +314,7 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, void **avalue, ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ unsigned int __fun = (unsigned int)(FUN); \ unsigned int __ctx = (unsigned int)(CTX); \ - unsigned int __dis = __fun - (__ctx + FFI_TRAMPOLINE_SIZE); \ + unsigned int __dis = __fun - (__ctx + 10); \ *(unsigned char*) &__tramp[0] = 0xb8; \ *(unsigned int*) &__tramp[1] = __ctx; /* movl __ctx, %eax */ \ *(unsigned char *) &__tramp[5] = 0xe9; \ @@ -325,7 +325,7 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, void **avalue, ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ unsigned int __fun = (unsigned int)(FUN); \ unsigned int __ctx = (unsigned int)(CTX); \ - unsigned int __dis = __fun - ((unsigned int) __tramp + FFI_TRAMPOLINE_SIZE); \ + unsigned int __dis = __fun - ((unsigned int) __tramp + 10); \ unsigned short __size = (unsigned short)(SIZE); \ *(unsigned char*) &__tramp[0] = 0xb8; \ *(unsigned int*) &__tramp[1] = __ctx; /* movl __ctx, %eax */ \