diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2004-07-11 11:45:39 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2004-07-11 11:45:39 +0000 |
| commit | 8ed5b12037206177fa8b5c834010e0204e66296e (patch) | |
| tree | ffcf91dcf4e4fcde395484b3635490cc3f088097 /libffi | |
| parent | a28e67e4f6f576a5cd45d0b290573ae9cafa34d6 (diff) | |
* src/s390/ffi.c (ffi_prep_args): Fix C aliasing violation.
(ffi_check_float_struct): Remove unused prototype.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@84505 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | libffi/src/s390/ffi.c | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index b76047f7e4e..30d95482cd9 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2004-07-11 Ulrich Weigand <uweigand@de.ibm.com> + + * src/s390/ffi.c (ffi_prep_args): Fix C aliasing violation. + (ffi_check_float_struct): Remove unused prototype. + 2004-06-30 Geoffrey Keating <geoffk@apple.com> * src/powerpc/ffi_darwin.c (flush_icache): ';' is a comment diff --git a/libffi/src/s390/ffi.c b/libffi/src/s390/ffi.c index d672b3c0ef3..399fa2a91d9 100644 --- a/libffi/src/s390/ffi.c +++ b/libffi/src/s390/ffi.c @@ -69,7 +69,6 @@ /*====================================================================*/ static void ffi_prep_args (unsigned char *, extended_cif *); -static int ffi_check_float_struct (ffi_type *); void #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) __attribute__ ((visibility ("hidden"))) @@ -222,15 +221,7 @@ ffi_prep_args (unsigned char *stack, extended_cif *ecif) } } - /* Pointers are passed like UINTs of the same size. */ - if (type == FFI_TYPE_POINTER) -#ifdef __s390x__ - type = FFI_TYPE_UINT64; -#else - type = FFI_TYPE_UINT32; -#endif - - /* Now handle all primitive int/float data types. */ + /* Now handle all primitive int/pointer/float data types. */ switch (type) { case FFI_TYPE_DOUBLE: @@ -251,6 +242,13 @@ ffi_prep_args (unsigned char *stack, extended_cif *ecif) else p_ov[n_ov++] = *(unsigned int *) arg; break; + + case FFI_TYPE_POINTER: + if (n_gpr < MAX_GPRARGS) + p_gpr[n_gpr++] = (unsigned long)*(unsigned char **) arg; + else + p_ov[n_ov++] = (unsigned long)*(unsigned char **) arg; + break; case FFI_TYPE_UINT64: case FFI_TYPE_SINT64: |