diff options
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/expr.c | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 73f2054..e3b1992 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 03 02:16:00 PST 1999 Pekka Nikander <pekka.nikander@hut.fi> + + * decl.c (INT_TYPE_SIZE): Define if necessary. + (expand_java_return): Handle the case of a native integer smaller + than a JVM integer. + 2000-02-18 Martin von Loewis <loewis@informatik.hu-berlin.de> * gjavah.c (help): Use GCCBUGURL. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 3c1c0ff..f25b194 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -981,6 +981,10 @@ expand_java_pushc (ival, type) push_value (value); } +#ifndef INT_TYPE_SIZE +#define INT_TYPE_SIZE BITS_PER_WORD +#endif + static void expand_java_return (type) tree type; @@ -992,6 +996,16 @@ expand_java_return (type) tree retval = pop_value (type); tree res = DECL_RESULT (current_function_decl); retval = build (MODIFY_EXPR, TREE_TYPE (res), res, retval); + + /* Handle the situation where the native integer type is smaller + than the JVM integer. It can happen for many cross compilers. + The whole if expression just goes away if INT_TYPE_SIZE < 32 + is false. */ + if (INT_TYPE_SIZE < 32 + && (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (res))) + < GET_MODE_SIZE (TYPE_MODE (type)))) + retval = build1(NOP_EXPR, TREE_TYPE(res), retval); + TREE_SIDE_EFFECTS (retval) = 1; expand_return (retval); } |