diff options
| author | Andrew Haley <aph@redhat.com> | 2011-07-11 17:50:04 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2011-07-11 17:50:04 +0000 |
| commit | 4d4a9b72beceb6e1bf6233f4e2496a6e34b6332f (patch) | |
| tree | 93bc1f6b304a1edd1c502f2bd9d82ce03e22ae43 | |
| parent | 0f509bb7d5a6e6ddc05fce24bc46880c901b44ab (diff) | |
| download | gcc-4d4a9b72beceb6e1bf6233f4e2496a6e34b6332f.zip gcc-4d4a9b72beceb6e1bf6233f4e2496a6e34b6332f.tar.gz gcc-4d4a9b72beceb6e1bf6233f4e2496a6e34b6332f.tar.bz2 | |
ffi.c (FFI_INIT_TRAMPOLINE): Clear icache.
2011-07-11 Andrew Haley <aph@redhat.com>
* src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Clear icache.
From-SVN: r176172
| -rw-r--r-- | libffi/ChangeLog | 4 | ||||
| -rw-r--r-- | libffi/src/arm/ffi.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 12afae6..1bbcf9e 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2011-07-11 Andrew Haley <aph@redhat.com> + + * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Clear icache. + 2011-06-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * testsuite/libffi.call/cls_double_va.c: Move PR number to comment. diff --git a/libffi/src/arm/ffi.c b/libffi/src/arm/ffi.c index 9a0a53c..4e72c3b 100644 --- a/libffi/src/arm/ffi.c +++ b/libffi/src/arm/ffi.c @@ -341,12 +341,16 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ unsigned int __fun = (unsigned int)(FUN); \ unsigned int __ctx = (unsigned int)(CTX); \ + unsigned char *insns = (unsigned char *)(CTX); \ *(unsigned int*) &__tramp[0] = 0xe92d000f; /* stmfd sp!, {r0-r3} */ \ *(unsigned int*) &__tramp[4] = 0xe59f0000; /* ldr r0, [pc] */ \ *(unsigned int*) &__tramp[8] = 0xe59ff000; /* ldr pc, [pc] */ \ *(unsigned int*) &__tramp[12] = __ctx; \ *(unsigned int*) &__tramp[16] = __fun; \ - __clear_cache((&__tramp[0]), (&__tramp[19])); \ + __clear_cache((&__tramp[0]), (&__tramp[19])); /* Clear data mapping. */ \ + __clear_cache(insns, insns + 3 * sizeof (unsigned int)); \ + /* Clear instruction \ + mapping. */ \ }) |