diff options
| -rw-r--r-- | libffi/ChangeLog | 6 | ||||
| -rw-r--r-- | libffi/src/powerpc/ffi.c | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index b8e3a30..e4a674a 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2004-02-25 Matt Kraai <kraai@alumni.cmu.edu> + + * src/powerpc/ffi.c (ffi_prep_args_SYSV): Change + ecif->cif->bytes to bytes. + (ffi_prep_cif_machdep): Add braces around nested if statement. + 2004-02-09 Alan Modra <amodra@bigpond.net.au> * src/types.c (pointer): POWERPC64 has 8 byte pointers. diff --git a/libffi/src/powerpc/ffi.c b/libffi/src/powerpc/ffi.c index 454c7ac..29f7dba 100644 --- a/libffi/src/powerpc/ffi.c +++ b/libffi/src/powerpc/ffi.c @@ -94,7 +94,7 @@ void ffi_prep_args_SYSV(extended_cif *ecif, unsigned *const stack) const unsigned flags = ecif->cif->flags; /* 'stacktop' points at the previous backchain pointer. */ - unsigned *const stacktop = stack + (ecif->cif->bytes / sizeof(unsigned)); + unsigned *const stacktop = stack + (bytes / sizeof(unsigned)); /* 'gpr_base' points at the space for gpr3, and grows upwards as we use GPR registers. */ @@ -521,13 +521,15 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) case FFI_TYPE_STRUCT: if (cif->abi != FFI_GCC_SYSV && cif->abi != FFI_LINUX64) - if (cif->rtype->size <= 4) - break; - else if (cif->rtype->size <= 8) - { - flags |= FLAG_RETURNS_64BITS; + { + if (cif->rtype->size <= 4) break; - } + else if (cif->rtype->size <= 8) + { + flags |= FLAG_RETURNS_64BITS; + break; + } + } /* else fall through. */ #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE case FFI_TYPE_LONGDOUBLE: |