samsonium/libffi
1
0
Fork 0
mirror of https://github.com/partic2/libffi synced 2026-11-10 10:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390: Avoid aliasing warnings

Browse Source
This commit is contained in:
Richard Henderson
2014-12-18 16:01:15 -05:00
parent c860ca9ac0
commit 97512ded05
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/s390/ffi.c
+16 -17
View File
@@ -762,29 +762,28 @@ ffi_prep_closure_loc (ffi_closure *closure,
void *user_data, void *user_data,
void *codeloc) void *codeloc)
{ {
static unsigned short const template[] = {
0x0d10, /* basr %r1,0 */
#ifndef __s390x__
0x9801, 0x1006, /* lm %r0,%r1,6(%r1) */
#else
0xeb01, 0x100e, 0x0004, /* lmg %r0,%r1,14(%r1) */
#endif
0x07f1 /* br %r1 */
};
unsigned long *tramp = (unsigned long *)&closure->tramp;
if (cif->abi != FFI_SYSV) if (cif->abi != FFI_SYSV)
return FFI_BAD_ABI; return FFI_BAD_ABI;
#ifndef __s390x__ memcpy (tramp, template, sizeof(template));
*(short *)&closure->tramp [0] = 0x0d10; /* basr %r1,0 */ tramp[2] = (unsigned long)codeloc;
*(short *)&closure->tramp [2] = 0x9801; /* lm %r0,%r1,6(%r1) */ tramp[3] = (unsigned long)&ffi_closure_SYSV;
*(short *)&closure->tramp [4] = 0x1006;
*(short *)&closure->tramp [6] = 0x07f1; /* br %r1 */
*(long *)&closure->tramp [8] = (long)codeloc;
*(long *)&closure->tramp[12] = (long)&ffi_closure_SYSV;
#else
*(short *)&closure->tramp [0] = 0x0d10; /* basr %r1,0 */
*(short *)&closure->tramp [2] = 0xeb01; /* lmg %r0,%r1,14(%r1) */
*(short *)&closure->tramp [4] = 0x100e;
*(short *)&closure->tramp [6] = 0x0004;
*(short *)&closure->tramp [8] = 0x07f1; /* br %r1 */
*(long *)&closure->tramp[16] = (long)codeloc;
*(long *)&closure->tramp[24] = (long)&ffi_closure_SYSV;
#endif
closure->cif = cif; closure->cif = cif;
closure->user_data = user_data;
closure->fun = fun; closure->fun = fun;
closure->user_data = user_data;
return FFI_OK; return FFI_OK;
} }