From 5549179ffbab093da7b35296973c2a287ad60f20 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 13 Jul 2004 21:06:33 +0000 Subject: [PATCH] interpret.cc (run): Correctly access libffi return values of integral smaller-than-int type... * interpret.cc (run): Correctly access libffi return values of integral smaller-than-int type; these are implicitly promoted. From-SVN: r84645 --- libjava/ChangeLog | 5 +++++ libjava/interpret.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 476795a111d..5460fae445a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-07-13 Ulrich Weigand + + * interpret.cc (run): Correctly access libffi return values of + integral smaller-than-int type; these are implicitly promoted. + 2004-07-13 Bryce McKinlay PR libgcj/7587 diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 40c7cbaac5a..109ee10ff8b 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -1207,15 +1207,15 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args) switch (rtype) { case FFI_TYPE_SINT8: - PUSHI (rvalue.byte_value); + PUSHI ((jbyte)(rvalue.int_value & 0xff)); break; case FFI_TYPE_SINT16: - PUSHI (rvalue.short_value); + PUSHI ((jshort)(rvalue.int_value & 0xffff)); break; case FFI_TYPE_UINT16: - PUSHI (rvalue.char_value); + PUSHI (rvalue.int_value & 0xffff); break; case FFI_TYPE_FLOAT: -- 2.30.2