/* Process expressions for the GNU compiler for the Java(TM) language.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
-This file is part of GNU CC.
+This file is part of GCC.
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
+along with GCC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "tree.h"
#include "real.h"
#include "rtl.h"
#include "except.h"
#include "ggc.h"
-static void flush_quick_stack PARAMS ((void));
-static void push_value PARAMS ((tree));
-static tree pop_value PARAMS ((tree));
-static void java_stack_swap PARAMS ((void));
-static void java_stack_dup PARAMS ((int, int));
-static void build_java_athrow PARAMS ((tree));
-static void build_java_jsr PARAMS ((tree, tree));
-static void build_java_ret PARAMS ((tree));
-static void expand_java_multianewarray PARAMS ((tree, int));
-static void expand_java_arraystore PARAMS ((tree));
-static void expand_java_arrayload PARAMS ((tree));
-static void expand_java_array_length PARAMS ((void));
-static tree build_java_monitor PARAMS ((tree, tree));
-static void expand_java_pushc PARAMS ((int, tree));
-static void expand_java_return PARAMS ((tree));
-static void expand_load_internal PARAMS ((int, tree, int));
-static void expand_java_NEW PARAMS ((tree));
-static void expand_java_INSTANCEOF PARAMS ((tree));
-static void expand_java_CHECKCAST PARAMS ((tree));
-static void expand_iinc PARAMS ((unsigned int, int, int));
-static void expand_java_binop PARAMS ((tree, enum tree_code));
-static void note_label PARAMS ((int, int));
-static void expand_compare PARAMS ((enum tree_code, tree, tree, int));
-static void expand_test PARAMS ((enum tree_code, tree, int));
-static void expand_cond PARAMS ((enum tree_code, tree, int));
-static void expand_java_goto PARAMS ((int));
+static void flush_quick_stack (void);
+static void push_value (tree);
+static tree pop_value (tree);
+static void java_stack_swap (void);
+static void java_stack_dup (int, int);
+static void build_java_athrow (tree);
+static void build_java_jsr (int, int);
+static void build_java_ret (tree);
+static void expand_java_multianewarray (tree, int);
+static void expand_java_arraystore (tree);
+static void expand_java_arrayload (tree);
+static void expand_java_array_length (void);
+static tree build_java_monitor (tree, tree);
+static void expand_java_pushc (int, tree);
+static void expand_java_return (tree);
+static void expand_load_internal (int, tree, int);
+static void expand_java_NEW (tree);
+static void expand_java_INSTANCEOF (tree);
+static void expand_java_CHECKCAST (tree);
+static void expand_iinc (unsigned int, int, int);
+static void expand_java_binop (tree, enum tree_code);
+static void note_label (int, int);
+static void expand_compare (enum tree_code, tree, tree, int);
+static void expand_test (enum tree_code, tree, int);
+static void expand_cond (enum tree_code, tree, int);
+static void expand_java_goto (int);
#if 0
-static void expand_java_call PARAMS ((int, int));
-static void expand_java_ret PARAMS ((tree));
+static void expand_java_call (int, int);
+static void expand_java_ret (tree);
#endif
-static tree pop_arguments PARAMS ((tree));
-static void expand_invoke PARAMS ((int, int, int));
-static void expand_java_field_op PARAMS ((int, int, int));
-static void java_push_constant_from_pool PARAMS ((struct JCF *, int));
-static void java_stack_pop PARAMS ((int));
-static tree build_java_throw_out_of_bounds_exception PARAMS ((tree));
-static tree build_java_check_indexed_type PARAMS ((tree, tree));
-static tree java_array_data_offset PARAMS ((tree));
-static tree case_identity PARAMS ((tree, tree));
-static unsigned char peek_opcode_at_pc PARAMS ((struct JCF *, int, int));
-static bool emit_init_test_initialization PARAMS ((struct hash_entry *,
- PTR ptr));
-
-static tree operand_type[59];
-extern struct obstack permanent_obstack;
-
-static tree methods_ident = NULL_TREE;
-static tree ncode_ident = NULL_TREE;
+static tree pop_arguments (tree);
+static void expand_invoke (int, int, int);
+static void expand_java_field_op (int, int, int);
+static void java_push_constant_from_pool (struct JCF *, int);
+static void java_stack_pop (int);
+static tree build_java_throw_out_of_bounds_exception (tree);
+static tree build_java_check_indexed_type (tree, tree);
+static tree case_identity (tree, tree);
+static unsigned char peek_opcode_at_pc (struct JCF *, int, int);
+static int emit_init_test_initialization (void **entry, void * ptr);
+
+static GTY(()) tree operand_type[59];
+
+static GTY(()) tree methods_ident;
+static GTY(()) tree ncode_ident;
tree dtable_ident = NULL_TREE;
-/* Set to non-zero value in order to emit class initilization code
+/* Set to nonzero value in order to emit class initialization code
before static field references. */
int always_initialize_class_p;
If a variable is on the quick stack, it means the value of variable
when the quick stack was last flushed. Conceptually, flush_quick_stack
- saves all the the quick_stack elements in parellel. However, that is
+ saves all the the quick_stack elements in parallel. However, that is
complicated, so it actually saves them (i.e. copies each stack value
to is home virtual register) from low indexes. This allows a quick_stack
element at index i (counting from the bottom of stack the) to references
So dup cannot just add an extra element to the quick_stack, but iadd can.
*/
-static tree quick_stack = NULL_TREE;
+static GTY(()) tree quick_stack;
-/* A free-list of unused permamnet TREE_LIST nodes. */
-static tree tree_list_free_list = NULL_TREE;
+/* A free-list of unused permanent TREE_LIST nodes. */
+static GTY((deletable (""))) tree tree_list_free_list;
/* The stack pointer of the Java virtual machine.
This does include the size of the quick_stack. */
int linenumber_count;
void
-init_expr_processing()
+init_expr_processing (void)
{
operand_type[21] = operand_type[54] = int_type_node;
operand_type[22] = operand_type[55] = long_type_node;
operand_type[23] = operand_type[56] = float_type_node;
operand_type[24] = operand_type[57] = double_type_node;
operand_type[25] = operand_type[58] = ptr_type_node;
- ggc_add_tree_root (operand_type, 59);
- ggc_add_tree_root (&methods_ident, 1);
- ggc_add_tree_root (&ncode_ident, 1);
- ggc_add_tree_root (&quick_stack, 1);
- ggc_add_tree_root (&tree_list_free_list, 1);
}
tree
-truthvalue_conversion (expr)
- tree expr;
+java_truthvalue_conversion (tree expr)
{
/* It is simpler and generates better code to have only TRUTH_*_EXPR
or comparison expressions as truth values at this level.
case NEGATE_EXPR:
case ABS_EXPR:
case FLOAT_EXPR:
- case FFS_EXPR:
- /* These don't change whether an object is non-zero or zero. */
- return truthvalue_conversion (TREE_OPERAND (expr, 0));
+ /* These don't change whether an object is nonzero or zero. */
+ return java_truthvalue_conversion (TREE_OPERAND (expr, 0));
case COND_EXPR:
/* Distribute the conversion into the arms of a COND_EXPR. */
return fold (build (COND_EXPR, boolean_type_node, TREE_OPERAND (expr, 0),
- truthvalue_conversion (TREE_OPERAND (expr, 1)),
- truthvalue_conversion (TREE_OPERAND (expr, 2))));
+ java_truthvalue_conversion (TREE_OPERAND (expr, 1)),
+ java_truthvalue_conversion (TREE_OPERAND (expr, 2))));
case NOP_EXPR:
/* If this is widening the argument, we can ignore it. */
if (TYPE_PRECISION (TREE_TYPE (expr))
>= TYPE_PRECISION (TREE_TYPE (TREE_OPERAND (expr, 0))))
- return truthvalue_conversion (TREE_OPERAND (expr, 0));
+ return java_truthvalue_conversion (TREE_OPERAND (expr, 0));
/* fall through to default */
default:
}
}
-#ifdef JAVA_USE_HANDLES
-/* Given a pointer to a handle, get a pointer to an object. */
-
-tree
-unhand_expr (expr)
- tree expr;
-{
- tree field, handle_type;
- expr = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (expr)), expr);
- handle_type = TREE_TYPE (expr);
- field = TYPE_FIELDS (handle_type);
- expr = build (COMPONENT_REF, TREE_TYPE (field), expr, field);
- return expr;
-}
-#endif
-
/* Save any stack slots that happen to be in the quick_stack into their
home virtual register slots.
higher (or the same) index, but not lower. */
static void
-flush_quick_stack ()
+flush_quick_stack (void)
{
int stack_index = stack_pointer;
- register tree prev, cur, next;
+ tree prev, cur, next;
/* First reverse the quick_stack, and count the number of slots it has. */
for (cur = quick_stack, prev = NULL_TREE; cur != NULL_TREE; cur = next)
decl = find_stack_slot (stack_index, type);
if (decl != node)
- expand_assignment (decl, node, 0, 0);
+ expand_assignment (decl, node, 0);
stack_index += 1 + TYPE_IS_WIDE (type);
}
}
Return true on success, 0 on overflow. */
int
-push_type_0 (type)
- tree type;
+push_type_0 (tree type)
{
int n_words;
type = promote_type (type);
}
void
-push_type (type)
- tree type;
+push_type (tree type)
{
if (! push_type_0 (type))
abort ();
}
static void
-push_value (value)
- tree value;
+push_value (tree value)
{
tree type = TREE_TYPE (value);
if (TYPE_PRECISION (type) < 32 && INTEGRAL_TYPE_P (type))
On an error, *MESSAGEP is set to a freshly malloc'd error message. */
tree
-pop_type_0 (type, messagep)
- tree type;
- char **messagep;
+pop_type_0 (tree type, char **messagep)
{
int n_words;
tree t;
convertible to TYPE, otherwise call error. */
tree
-pop_type (type)
- tree type;
+pop_type (tree type)
{
char *message = NULL;
type = pop_type_0 (type, &message);
Handles array types and interfaces. */
int
-can_widen_reference_to (source_type, target_type)
- tree source_type, target_type;
+can_widen_reference_to (tree source_type, tree target_type)
{
if (source_type == ptr_type_node || target_type == object_ptr_type_node)
return 1;
return 1;
else
{
- source_type = HANDLE_TO_CLASS_TYPE (source_type);
- target_type = HANDLE_TO_CLASS_TYPE (target_type);
if (TYPE_ARRAY_P (source_type) || TYPE_ARRAY_P (target_type))
{
HOST_WIDE_INT source_length, target_length;
if (TYPE_ARRAY_P (source_type) != TYPE_ARRAY_P (target_type))
- return 0;
+ {
+ /* An array implements Cloneable and Serializable. */
+ tree name = DECL_NAME (TYPE_NAME (target_type));
+ return (name == java_lang_cloneable_identifier_node
+ || name == java_io_serializable_identifier_node);
+ }
target_length = java_array_type_length (target_type);
if (target_length >= 0)
{
}
static tree
-pop_value (type)
- tree type;
+pop_value (tree type)
{
type = pop_type (type);
if (quick_stack)
}
-/* Pop and discrad the top COUNT stack slots. */
+/* Pop and discard the top COUNT stack slots. */
static void
-java_stack_pop (count)
- int count;
+java_stack_pop (int count)
{
while (count > 0)
{
/* Implement the 'swap' operator (to swap two top stack slots). */
static void
-java_stack_swap ()
+java_stack_swap (void)
{
tree type1, type2;
rtx temp;
decl1 = find_stack_slot (stack_pointer - 1, type1);
decl2 = find_stack_slot (stack_pointer - 2, type2);
temp = copy_to_reg (DECL_RTL (decl1));
- emit_move_insn (DECL_RTL (decl1), DECL_RTL (decl2));
- emit_move_insn (DECL_RTL (decl2), temp);
+ emit_move_insn (DECL_RTL (find_stack_slot (stack_pointer - 1, type2)),
+ DECL_RTL (decl2));
+ emit_move_insn (DECL_RTL (find_stack_slot (stack_pointer - 2, type1)), temp);
stack_type_map[stack_pointer - 1] = type2;
stack_type_map[stack_pointer - 2] = type1;
}
static void
-java_stack_dup (size, offset)
- int size, offset;
+java_stack_dup (int size, int offset)
{
int low_index = stack_pointer - size - offset;
int dst_index;
value stack. */
static void
-build_java_athrow (node)
- tree node;
+build_java_athrow (tree node)
{
tree call;
/* Implementation for jsr/ret */
static void
-build_java_jsr (where, ret)
- tree where;
- tree ret;
+build_java_jsr (int target_pc, int return_pc)
{
+ tree where = lookup_label (target_pc);
+ tree ret = lookup_label (return_pc);
tree ret_label = fold (build1 (ADDR_EXPR, return_address_type_node, ret));
push_value (ret_label);
flush_quick_stack ();
emit_jump (label_rtx (where));
expand_label (ret);
+ if (instruction_bits [return_pc] & BCODE_VERIFIED)
+ load_type_state (ret);
}
static void
-build_java_ret (location)
- tree location;
+build_java_ret (tree location)
{
expand_computed_goto (location);
}
/* Implementation of operations on array: new, load, store, length */
-/* Array core info access macros */
-
-#define JAVA_ARRAY_LENGTH_OFFSET(A) \
- byte_position (TREE_CHAIN (TYPE_FIELDS (TREE_TYPE (TREE_TYPE (A)))))
-
tree
-decode_newarray_type (atype)
- int atype;
+decode_newarray_type (int atype)
{
switch (atype)
{
/* Map primitive type to the code used by OPCODE_newarray. */
int
-encode_newarray_type (type)
- tree type;
+encode_newarray_type (tree type)
{
if (type == boolean_type_node)
return 4;
ArrayIndexOfBoundsException exception handler. */
static tree
-build_java_throw_out_of_bounds_exception (index)
- tree index;
+build_java_throw_out_of_bounds_exception (tree index)
{
tree node = build (CALL_EXPR, int_type_node,
build_address_of (soft_badarrayindex_node),
or value of the array NODE. May be used to implement some bytecodes. */
tree
-build_java_array_length_access (node)
- tree node;
+build_java_array_length_access (tree node)
{
tree type = TREE_TYPE (node);
+ tree array_type = TREE_TYPE (type);
HOST_WIDE_INT length;
+ /* JVM spec: If the arrayref is null, the arraylength instruction
+ throws a NullPointerException. The only way we could get a node
+ of type ptr_type_node at this point is `aconst_null; arraylength'
+ or something equivalent. */
+ if (type == ptr_type_node)
+ return build (CALL_EXPR, int_type_node,
+ build_address_of (soft_nullpointer_node),
+ NULL_TREE, NULL_TREE);
+
if (!is_array_type_p (type))
abort ();
length = java_array_type_length (type);
if (length >= 0)
return build_int_2 (length, 0);
- node = build1 (INDIRECT_REF, int_type_node,
- fold (build (PLUS_EXPR, ptr_type_node,
- java_check_reference (node, 1),
- JAVA_ARRAY_LENGTH_OFFSET(node))));
+
+ node = build (COMPONENT_REF, int_type_node,
+ build_java_indirect_ref (array_type, node,
+ flag_check_references),
+ lookup_field (&array_type, get_identifier ("length")));
IS_ARRAY_LENGTH_ACCESS (node) = 1;
- return fold (node);
+ return node;
}
/* Optionally checks a reference against the NULL pointer. ARG1: the
checks if we're not generating code. */
tree
-java_check_reference (expr, check)
- tree expr;
- int check;
+java_check_reference (tree expr, int check)
{
if (!flag_syntax_only && check)
{
- tree cond;
expr = save_expr (expr);
- cond = build (COND_EXPR, void_type_node,
+ expr = build (COND_EXPR, TREE_TYPE (expr),
build (EQ_EXPR, boolean_type_node, expr, null_pointer_node),
build (CALL_EXPR, void_type_node,
build_address_of (soft_nullpointer_node),
NULL_TREE, NULL_TREE),
- empty_stmt_node);
- expr = build (COMPOUND_EXPR, TREE_TYPE (expr), cond, expr);
+ expr);
}
return expr;
/* Reference an object: just like an INDIRECT_REF, but with checking. */
tree
-build_java_indirect_ref (type, expr, check)
- tree type;
- tree expr;
- int check;
+build_java_indirect_ref (tree type, tree expr, int check)
{
return build1 (INDIRECT_REF, type, java_check_reference (expr, check));
}
-static tree
-java_array_data_offset (array)
- tree array;
-{
- tree array_type = TREE_TYPE (TREE_TYPE (array));
- tree data_fld = TREE_CHAIN (TREE_CHAIN (TYPE_FIELDS (array_type)));
-
- if (data_fld == NULL_TREE)
- return size_in_bytes (array_type);
- else
- return byte_position (data_fld);
-}
-
/* Implement array indexing (either as l-value or r-value).
Returns a tree for ARRAY[INDEX], assume TYPE is the element type.
Optionally performs bounds checking and/or test to NULL.
At this point, ARRAY should have been verified as an array. */
tree
-build_java_arrayaccess (array, type, index)
- tree array, type, index;
+build_java_arrayaccess (tree array, tree type, tree index)
{
- tree arith, node, throw = NULL_TREE;
-
- arith = fold (build (PLUS_EXPR, int_type_node,
- java_array_data_offset (array),
- fold (build (MULT_EXPR, int_type_node,
- index, size_in_bytes(type)))));
+ tree node, throw = NULL_TREE;
+ tree data_field;
+ tree ref;
+ tree array_type = TREE_TYPE (TREE_TYPE (array));
if (flag_bounds_check)
{
}
}
- /* The SAVE_EXPR is for correct evaluation order. It would be
- cleaner to use force_evaluation_order (see comment there), but
- that is difficult when we also have to deal with bounds
- checking. The SAVE_EXPR is not necessary to do that when we're
- not checking for array bounds. */
- if (TREE_SIDE_EFFECTS (index) && throw)
- throw = build (COMPOUND_EXPR, int_type_node, save_expr (array), throw);
-
- node = build1 (INDIRECT_REF, type,
- fold (build (PLUS_EXPR, ptr_type_node,
- java_check_reference (array,
- flag_check_references),
- (throw ? build (COMPOUND_EXPR, int_type_node,
- throw, arith ) : arith))));
+ /* If checking bounds, wrap the index expr with a COMPOUND_EXPR in order
+ to have the bounds check evaluated first. */
+ if (throw != NULL_TREE)
+ index = build (COMPOUND_EXPR, int_type_node, throw, index);
+
+ data_field = lookup_field (&array_type, get_identifier ("data"));
+
+ ref = build (COMPONENT_REF, TREE_TYPE (data_field),
+ build_java_indirect_ref (array_type, array,
+ flag_check_references),
+ data_field);
+
+ node = build (ARRAY_REF, type, ref, index);
return node;
}
+/* Generate code to throw an ArrayStoreException if OBJECT is not assignable
+ (at runtime) to an element of ARRAY. A NOP_EXPR is returned if it can
+ determine that no check is required. */
+
+tree
+build_java_arraystore_check (tree array, tree object)
+{
+ tree check, element_type, source;
+ tree array_type_p = TREE_TYPE (array);
+ tree object_type = TYPE_NAME (TREE_TYPE (TREE_TYPE (object)));
+
+ if (! is_array_type_p (array_type_p))
+ abort ();
+
+ /* Get the TYPE_DECL for ARRAY's element type. */
+ element_type = TYPE_NAME (TREE_TYPE (TREE_TYPE (TREE_TYPE (array_type_p))));
+
+ if (TREE_CODE (element_type) != TYPE_DECL
+ || TREE_CODE (object_type) != TYPE_DECL)
+ abort ();
+
+ if (!flag_store_check)
+ return build1 (NOP_EXPR, array_type_p, array);
+
+ /* No check is needed if the element type is final or is itself an array.
+ Also check that element_type matches object_type, since in the bytecode
+ compilation case element_type may be the actual element type of the array
+ rather than its declared type. */
+ if (element_type == object_type
+ && (TYPE_ARRAY_P (TREE_TYPE (element_type))
+ || CLASS_FINAL (element_type)))
+ return build1 (NOP_EXPR, array_type_p, array);
+
+ /* OBJECT might be wrapped by a SAVE_EXPR. */
+ if (TREE_CODE (object) == SAVE_EXPR)
+ source = TREE_OPERAND (object, 0);
+ else
+ source = object;
+
+ /* Avoid the check if OBJECT was just loaded from the same array. */
+ if (TREE_CODE (source) == ARRAY_REF)
+ {
+ tree target;
+ source = TREE_OPERAND (source, 0); /* COMPONENT_REF. */
+ source = TREE_OPERAND (source, 0); /* INDIRECT_REF. */
+ source = TREE_OPERAND (source, 0); /* Source array's DECL or SAVE_EXPR. */
+ if (TREE_CODE (source) == SAVE_EXPR)
+ source = TREE_OPERAND (source, 0);
+
+ target = array;
+ if (TREE_CODE (target) == SAVE_EXPR)
+ target = TREE_OPERAND (target, 0);
+
+ if (source == target)
+ return build1 (NOP_EXPR, array_type_p, array);
+ }
+
+ /* Build an invocation of _Jv_CheckArrayStore */
+ check = build (CALL_EXPR, void_type_node,
+ build_address_of (soft_checkarraystore_node),
+ tree_cons (NULL_TREE, array,
+ build_tree_list (NULL_TREE, object)),
+ NULL_TREE);
+ TREE_SIDE_EFFECTS (check) = 1;
+
+ return check;
+}
+
/* Makes sure that INDEXED_TYPE is appropriate. If not, make it from
ARRAY_NODE. This function is used to retrieve something less vague than
a pointer type when indexing the first dimension of something like [[<t>.
As a side effect, it also makes sure that ARRAY_NODE is an array. */
static tree
-build_java_check_indexed_type (array_node, indexed_type)
- tree array_node;
- tree indexed_type;
+build_java_check_indexed_type (tree array_node, tree indexed_type)
{
tree elt_type;
of the array to create. */
tree
-build_newarray (atype_value, length)
- int atype_value;
- tree length;
+build_newarray (int atype_value, tree length)
{
tree type_arg;
of the dimension. */
tree
-build_anewarray (class_type, length)
- tree class_type;
- tree length;
+build_anewarray (tree class_type, tree length)
{
tree type
= build_java_array_type (class_type,
/* Return a node the evaluates 'new TYPE[LENGTH]'. */
tree
-build_new_array (type, length)
- tree type;
- tree length;
+build_new_array (tree type, tree length)
{
if (JPRIMITIVE_TYPE_P (type))
return build_newarray (encode_newarray_type (type), length);
dimensions. The argument list is NULL terminated. */
static void
-expand_java_multianewarray (class_type, ndim)
- tree class_type;
- int ndim;
+expand_java_multianewarray (tree class_type, int ndim)
{
int i;
tree args = build_tree_list( NULL_TREE, null_pointer_node );
ARRAY is an array type. May expand some bound checking and NULL
pointer checking. RHS_TYPE_NODE we are going to store. In the case
of the CHAR/BYTE/BOOLEAN SHORT, the type popped of the stack is an
- INT. In those cases, we make the convertion.
+ INT. In those cases, we make the conversion.
if ARRAy is a reference type, the assignment is checked at run-time
to make sure that the RHS can be assigned to the array element
type. It is not necessary to generate this code if ARRAY is final. */
static void
-expand_java_arraystore (rhs_type_node)
- tree rhs_type_node;
+expand_java_arraystore (tree rhs_type_node)
{
tree rhs_node = pop_value ((INTEGRAL_TYPE_P (rhs_type_node)
&& TYPE_PRECISION (rhs_type_node) <= 32) ?
if (TREE_CODE (rhs_type_node) == POINTER_TYPE)
{
- tree check = build (CALL_EXPR, void_type_node,
- build_address_of (soft_checkarraystore_node),
- tree_cons (NULL_TREE, array,
- build_tree_list (NULL_TREE, rhs_node)),
- NULL_TREE);
- TREE_SIDE_EFFECTS (check) = 1;
+ tree check = build_java_arraystore_check (array, rhs_node);
expand_expr_stmt (check);
}
expand_assignment (build_java_arrayaccess (array,
rhs_type_node,
index),
- rhs_node, 0, 0);
+ rhs_node, 0);
}
/* Expand the evaluation of ARRAY[INDEX]. build_java_check_indexed_type makes
*/
static void
-expand_java_arrayload (lhs_type_node )
- tree lhs_type_node;
+expand_java_arrayload (tree lhs_type_node )
{
tree load_node;
tree index_node = pop_value (int_type_node);
index_node = save_expr (index_node);
array_node = save_expr (array_node);
- lhs_type_node = build_java_check_indexed_type (array_node, lhs_type_node);
-
- load_node = build_java_arrayaccess (array_node,
- lhs_type_node,
- index_node);
-
+
+ if (TREE_TYPE (array_node) == ptr_type_node)
+ /* The only way we could get a node of type ptr_type_node at this
+ point is `aconst_null; arraylength' or something equivalent, so
+ unconditionally throw NullPointerException. */
+ load_node = build (CALL_EXPR, lhs_type_node,
+ build_address_of (soft_nullpointer_node),
+ NULL_TREE, NULL_TREE);
+ else
+ {
+ lhs_type_node = build_java_check_indexed_type (array_node, lhs_type_node);
+ load_node = build_java_arrayaccess (array_node,
+ lhs_type_node,
+ index_node);
+ }
if (INTEGRAL_TYPE_P (lhs_type_node) && TYPE_PRECISION (lhs_type_node) <= 32)
load_node = fold (build1 (NOP_EXPR, int_type_node, load_node));
push_value (load_node);
a NULL check on the array object. */
static void
-expand_java_array_length ()
+expand_java_array_length (void)
{
tree array = pop_value (ptr_type_node);
tree length = build_java_array_length_access (array);
either soft_monitorenter_node or soft_monitorexit_node. */
static tree
-build_java_monitor (call, object)
- tree call;
- tree object;
+build_java_monitor (tree call, tree object)
{
return (build (CALL_EXPR,
void_type_node,
/* Emit code for one of the PUSHC instructions. */
static void
-expand_java_pushc (ival, type)
- int ival;
- tree type;
+expand_java_pushc (int ival, tree type)
{
tree value;
if (type == ptr_type_node && ival == 0)
else if (type == float_type_node || type == double_type_node)
{
REAL_VALUE_TYPE x;
-#ifdef REAL_ARITHMETIC
REAL_VALUE_FROM_INT (x, ival, 0, TYPE_MODE (type));
-#else
- x = ival;
-#endif
value = build_real (type, x);
}
else
}
static void
-expand_java_return (type)
- tree type;
+expand_java_return (tree type)
{
if (type == void_type_node)
expand_null_return ();
}
static void
-expand_load_internal (index, type, pc)
- int index;
- tree type;
- int pc;
+expand_load_internal (int index, tree type, int pc)
{
tree copy;
tree var = find_local_variable (index, type, pc);
}
tree
-build_address_of (value)
- tree value;
+build_address_of (tree value)
{
return build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (value)), value);
}
+bool class_has_finalize_method (tree type)
+{
+ tree super = CLASSTYPE_SUPER (type);
+
+ if (super == NULL_TREE)
+ return false; /* Every class with a real finalizer inherits */
+ /* from java.lang.Object. */
+ else
+ return HAS_FINALIZER_P (type) || class_has_finalize_method (super);
+}
+
static void
-expand_java_NEW (type)
- tree type;
+expand_java_NEW (tree type)
{
+ tree alloc_node;
+
+ alloc_node = (class_has_finalize_method (type) ? alloc_object_node
+ : alloc_no_finalizer_node);
if (! CLASS_LOADED_P (type))
load_class (type, 1);
safe_layout_class (type);
push_value (build (CALL_EXPR, promote_type (type),
- build_address_of (alloc_object_node),
+ build_address_of (alloc_node),
tree_cons (NULL_TREE, build_class_ref (type),
build_tree_list (NULL_TREE,
size_in_bytes (type))),
object. */
tree
-build_get_class (value)
- tree value;
+build_get_class (tree value)
{
tree class_field = lookup_field (&dtable_type, get_identifier ("class"));
tree vtable_field = lookup_field (&object_type_node,
known. */
tree
-build_instanceof (value, type)
- tree value, type;
+build_instanceof (tree value, tree type)
{
tree expr;
tree itype = TREE_TYPE (TREE_TYPE (soft_instanceof_node));
/* Anything except `null' is an instance of Object. Likewise,
if the object is known to be an instance of the class, then
we only need to check for `null'. */
- expr = build (COND_EXPR, itype,
- value,
- boolean_true_node, boolean_false_node);
+ expr = build (NE_EXPR, itype, value, null_pointer_node);
}
else if (! TYPE_ARRAY_P (type)
&& ! TYPE_ARRAY_P (valtype)
}
static void
-expand_java_INSTANCEOF (type)
- tree type;
+expand_java_INSTANCEOF (tree type)
{
tree value = pop_value (object_ptr_type_node);
value = build_instanceof (value, type);
}
static void
-expand_java_CHECKCAST (type)
- tree type;
+expand_java_CHECKCAST (tree type)
{
tree value = pop_value (ptr_type_node);
value = build (CALL_EXPR, promote_type (type),
}
static void
-expand_iinc (local_var_index, ival, pc)
- unsigned int local_var_index;
- int ival;
- int pc;
+expand_iinc (unsigned int local_var_index, int ival, int pc)
{
tree local_var, res;
tree constant_value;
local_var = find_local_variable (local_var_index, int_type_node, pc);
constant_value = build_int_2 (ival, ival < 0 ? -1 : 0);
res = fold (build (PLUS_EXPR, int_type_node, local_var, constant_value));
- expand_assignment (local_var, res, 0, 0);
+ expand_assignment (local_var, res, 0);
}
tree
-build_java_soft_divmod (op, type, op1, op2)
- enum tree_code op;
- tree type, op1, op2;
+build_java_soft_divmod (enum tree_code op, tree type, tree op1, tree op2)
{
tree call = NULL;
tree arg1 = convert (type, op1);
}
tree
-build_java_binop (op, type, arg1, arg2)
- enum tree_code op;
- tree type, arg1, arg2;
+build_java_binop (enum tree_code op, tree type, tree arg1, tree arg2)
{
tree mask;
switch (op)
{
case URSHIFT_EXPR:
{
- tree u_type = unsigned_type (type);
+ tree u_type = java_unsigned_type (type);
arg1 = convert (u_type, arg1);
arg1 = build_java_binop (RSHIFT_EXPR, u_type, arg1, arg2);
return convert (type, arg1);
}
static void
-expand_java_binop (type, op)
- tree type; enum tree_code op;
+expand_java_binop (tree type, enum tree_code op)
{
tree larg, rarg;
tree ltype = type;
class containing the field. */
tree
-lookup_field (typep, name)
- tree *typep;
- tree name;
+lookup_field (tree *typep, tree name)
{
if (CLASS_P (*typep) && !CLASS_LOADED_P (*typep))
{
if (DECL_NAME (field) == name)
return field;
- /* If *typep is an innerclass, lookup the field in its enclosing
- contexts */
- if (INNER_CLASS_TYPE_P (*typep))
- {
- tree outer_type = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (*typep)));
-
- if ((field = lookup_field (&outer_type, name)))
- return field;
- }
-
/* Process implemented interfaces. */
basetype_vec = TYPE_BINFO_BASETYPES (*typep);
n = TREE_VEC_LENGTH (basetype_vec);
SELF_VALUE is NULL_TREE if looking for a static field. */
tree
-build_field_ref (self_value, self_class, name)
- tree self_value, self_class, name;
+build_field_ref (tree self_value, tree self_class, tree name)
{
tree base_class = self_class;
tree field_decl = lookup_field (&base_class, name);
}
else
{
- tree base_handle_type = promote_type (base_class);
- if (base_handle_type != TREE_TYPE (self_value))
- self_value = fold (build1 (NOP_EXPR, base_handle_type, self_value));
-#ifdef JAVA_USE_HANDLES
- self_value = unhand_expr (self_value);
-#endif
+ int check = (flag_check_references
+ && ! (DECL_P (self_value)
+ && DECL_NAME (self_value) == this_identifier_node));
+
+ tree base_type = promote_type (base_class);
+ if (base_type != TREE_TYPE (self_value))
+ self_value = fold (build1 (NOP_EXPR, base_type, self_value));
+ if (flag_indirect_dispatch
+ && output_class != self_class)
+ /* FIXME: output_class != self_class is not exactly the right
+ test. What we really want to know is whether self_class is
+ in the same translation unit as output_class. If it is,
+ we can make a direct reference. */
+ {
+ tree otable_index =
+ build_int_2 (get_symbol_table_index
+ (field_decl, &TYPE_OTABLE_METHODS (output_class)), 0);
+ tree field_offset =
+ build (ARRAY_REF, integer_type_node, TYPE_OTABLE_DECL (output_class),
+ otable_index);
+ tree address
+ = fold (build (PLUS_EXPR,
+ build_pointer_type (TREE_TYPE (field_decl)),
+ self_value, field_offset));
+ return fold (build1 (INDIRECT_REF, TREE_TYPE (field_decl), address));
+ }
+
self_value = build_java_indirect_ref (TREE_TYPE (TREE_TYPE (self_value)),
- self_value, flag_check_references);
+ self_value, check);
return fold (build (COMPONENT_REF, TREE_TYPE (field_decl),
self_value, field_decl));
}
}
tree
-lookup_label (pc)
- int pc;
+lookup_label (int pc)
{
tree name;
char buf[32];
labels, and try-catch-finally blocks label or temporary variables. */
tree
-generate_name ()
+generate_name (void)
{
static int l_number = 0;
char buff [32];
}
tree
-create_label_decl (name)
- tree name;
+create_label_decl (tree name)
{
tree decl;
decl = build_decl (LABEL_DECL, name,
char *instruction_bits;
static void
-note_label (current_pc, target_pc)
- int current_pc ATTRIBUTE_UNUSED, target_pc;
+note_label (int current_pc ATTRIBUTE_UNUSED, int target_pc)
{
lookup_label (target_pc);
instruction_bits [target_pc] |= BCODE_JUMP_TARGET;
where CONDITION is one of one the compare operators. */
static void
-expand_compare (condition, value1, value2, target_pc)
- enum tree_code condition;
- tree value1, value2;
- int target_pc;
+expand_compare (enum tree_code condition, tree value1, tree value2,
+ int target_pc)
{
tree target = lookup_label (target_pc);
tree cond = fold (build (condition, boolean_type_node, value1, value2));
- expand_start_cond (truthvalue_conversion (cond), 0);
+ expand_start_cond (java_truthvalue_conversion (cond), 0);
expand_goto (target);
expand_end_cond ();
}
/* Emit code for a TEST-type opcode. */
static void
-expand_test (condition, type, target_pc)
- enum tree_code condition;
- tree type;
- int target_pc;
+expand_test (enum tree_code condition, tree type, int target_pc)
{
tree value1, value2;
flush_quick_stack ();
/* Emit code for a COND-type opcode. */
static void
-expand_cond (condition, type, target_pc)
- enum tree_code condition;
- tree type;
- int target_pc;
+expand_cond (enum tree_code condition, tree type, int target_pc)
{
tree value1, value2;
flush_quick_stack ();
}
static void
-expand_java_goto (target_pc)
- int target_pc;
+expand_java_goto (int target_pc)
{
tree target_label = lookup_label (target_pc);
flush_quick_stack ();
#if 0
static void
-expand_java_call (target_pc, return_address)
+expand_java_call (int target_pc, int return_address)
int target_pc, return_address;
{
tree target_label = lookup_label (target_pc);
}
static void
-expand_java_ret (return_address)
- tree return_address ATTRIBUTE_UNUSED;
+expand_java_ret (tree return_address ATTRIBUTE_UNUSED)
{
warning ("ret instruction not implemented");
#if 0
#endif
static tree
-pop_arguments (arg_types)
- tree arg_types;
+pop_arguments (tree arg_types)
{
if (arg_types == end_params_node)
return NULL_TREE;
(if it is needed) and then calls EXPR. */
tree
-build_class_init (clas, expr)
- tree clas, expr;
+build_class_init (tree clas, tree expr)
{
tree init;
- struct init_test_hash_entry *ite;
- if (inherits_from_p (current_class, clas))
+
+ /* An optimization: if CLAS is a superclass of the class we're
+ compiling, we don't need to initialize it. However, if CLAS is
+ an interface, it won't necessarily be initialized, even if we
+ implement it. */
+ if ((! CLASS_INTERFACE (TYPE_NAME (clas))
+ && inherits_from_p (current_class, clas))
+ || current_class == clas)
return expr;
if (always_initialize_class_p)
}
else
{
- ite = (struct init_test_hash_entry *)
- hash_lookup (&DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl),
- (const hash_table_key) clas,
- TRUE, NULL);
-
- if (ite->init_test_decl == 0)
+ tree *init_test_decl;
+ init_test_decl = java_treetreehash_new
+ (DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl), clas);
+
+ if (*init_test_decl == NULL)
{
/* Build a declaration and mark it as a flag used to track
static class initializations. */
- ite->init_test_decl = build_decl (VAR_DECL, NULL_TREE,
- boolean_type_node);
- MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (ite->init_test_decl);
- LOCAL_CLASS_INITIALIZATION_FLAG (ite->init_test_decl) = 1;
- DECL_CONTEXT (ite->init_test_decl) = current_function_decl;
-
+ *init_test_decl = build_decl (VAR_DECL, NULL_TREE,
+ boolean_type_node);
+ MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (*init_test_decl);
+ LOCAL_CLASS_INITIALIZATION_FLAG (*init_test_decl) = 1;
+ DECL_CONTEXT (*init_test_decl) = current_function_decl;
+ DECL_FUNCTION_INIT_TEST_CLASS (*init_test_decl) = clas;
/* Tell the check-init code to ignore this decl when not
optimizing class initialization. */
if (!STATIC_CLASS_INIT_OPT_P ())
- DECL_BIT_INDEX(ite->init_test_decl) = -1;
+ DECL_BIT_INDEX(*init_test_decl) = -1;
+ /* Don't emit any symbolic debugging info for this decl. */
+ DECL_IGNORED_P (*init_test_decl) = 1;
}
init = build (CALL_EXPR, void_type_node,
TREE_SIDE_EFFECTS (init) = 1;
init = build (COND_EXPR, void_type_node,
build (EQ_EXPR, boolean_type_node,
- ite->init_test_decl, boolean_false_node),
+ *init_test_decl, boolean_false_node),
init, integer_zero_node);
TREE_SIDE_EFFECTS (init) = 1;
init = build (COMPOUND_EXPR, TREE_TYPE (expr), init,
build (MODIFY_EXPR, boolean_type_node,
- ite->init_test_decl, boolean_true_node));
+ *init_test_decl, boolean_true_node));
TREE_SIDE_EFFECTS (init) = 1;
}
}
tree
-build_known_method_ref (method, method_type, self_type, method_signature, arg_list)
- tree method, method_type ATTRIBUTE_UNUSED, self_type,
- method_signature ATTRIBUTE_UNUSED, arg_list ATTRIBUTE_UNUSED;
+build_known_method_ref (tree method, tree method_type ATTRIBUTE_UNUSED,
+ tree self_type, tree method_signature ATTRIBUTE_UNUSED,
+ tree arg_list ATTRIBUTE_UNUSED)
{
tree func;
if (is_compiled_class (self_type))
{
- make_decl_rtl (method, NULL);
- func = build1 (ADDR_EXPR, method_ptr_type_node, method);
+ if (!flag_indirect_dispatch
+ || (!TREE_PUBLIC (method) && DECL_CONTEXT (method)))
+ {
+ make_decl_rtl (method, NULL);
+ func = build1 (ADDR_EXPR, method_ptr_type_node, method);
+ }
+ else
+ {
+ tree table_index =
+ build_int_2 (get_symbol_table_index
+ (method, &TYPE_ATABLE_METHODS (output_class)), 0);
+ func =
+ build (ARRAY_REF, method_ptr_type_node,
+ TYPE_ATABLE_DECL (output_class), table_index);
+ }
}
else
{
/* We don't know whether the method has been (statically) compiled.
Compile this code to get a reference to the method's code:
-
+
SELF_TYPE->methods[METHOD_INDEX].ncode
-
- This is guaranteed to work (assuming SELF_TYPE has
- been initialized), since if the method is not compiled yet,
- its ncode points to a trampoline that forces compilation. */
-
+
+ */
+
int method_index = 0;
- tree meth;
- tree ref = build_class_ref (self_type);
+ tree meth, ref;
+
+ /* The method might actually be declared in some superclass, so
+ we have to use its class context, not the caller's notion of
+ where the method is. */
+ self_type = DECL_CONTEXT (method);
+ ref = build_class_ref (self_type);
ref = build1 (INDIRECT_REF, class_type_node, ref);
if (ncode_ident == NULL_TREE)
ncode_ident = get_identifier ("ncode");
methods_ident = get_identifier ("methods");
ref = build (COMPONENT_REF, method_ptr_type_node, ref,
lookup_field (&class_type_node, methods_ident));
- for (meth = TYPE_METHODS (CLASS_TO_HANDLE_TYPE (self_type));
+ for (meth = TYPE_METHODS (self_type);
; meth = TREE_CHAIN (meth))
{
if (method == meth)
}
tree
-invoke_build_dtable (is_invoke_interface, arg_list)
- int is_invoke_interface;
- tree arg_list;
+invoke_build_dtable (int is_invoke_interface, tree arg_list)
{
tree dtable, objectref;
return dtable;
}
+/* Determine the index in SYMBOL_TABLE for a reference to the decl
+ T. If this decl has not been seen before, it will be added to the
+ otable_methods. If it has, the existing table slot will be
+ reused. */
+
+int
+get_symbol_table_index (tree t, tree *symbol_table)
+{
+ int i = 1;
+ tree method_list;
+
+ if (*symbol_table == NULL_TREE)
+ {
+ *symbol_table = build_tree_list (t, t);
+ return 1;
+ }
+
+ method_list = *symbol_table;
+
+ while (1)
+ {
+ tree value = TREE_VALUE (method_list);
+ if (value == t)
+ return i;
+ i++;
+ if (TREE_CHAIN (method_list) == NULL_TREE)
+ break;
+ else
+ method_list = TREE_CHAIN (method_list);
+ }
+
+ TREE_CHAIN (method_list) = build_tree_list (t, t);
+ return i;
+}
+
tree
-build_invokevirtual (dtable, method)
- tree dtable, method;
+build_invokevirtual (tree dtable, tree method)
{
tree func;
tree nativecode_ptr_ptr_type_node
= build_pointer_type (nativecode_ptr_type_node);
- tree method_index = convert (sizetype, DECL_VINDEX (method));
+ tree method_index;
+ tree otable_index;
- /* Add one to skip "class" field of dtable, and one to skip unused
- vtable entry (for C++ compatibility). */
- method_index = size_binop (PLUS_EXPR, method_index, size_int (2));
- method_index = size_binop (MULT_EXPR, method_index,
- TYPE_SIZE_UNIT (nativecode_ptr_ptr_type_node));
+ if (flag_indirect_dispatch)
+ {
+ otable_index
+ = build_int_2 (get_symbol_table_index
+ (method, &TYPE_OTABLE_METHODS (output_class)), 0);
+ method_index = build (ARRAY_REF, integer_type_node,
+ TYPE_OTABLE_DECL (output_class),
+ otable_index);
+ }
+ else
+ {
+ method_index = convert (sizetype, DECL_VINDEX (method));
- if (TARGET_VTABLE_USES_DESCRIPTORS)
- method_index = size_binop (MULT_EXPR, method_index,
- size_int (TARGET_VTABLE_USES_DESCRIPTORS));
+ if (TARGET_VTABLE_USES_DESCRIPTORS)
+ /* Add one to skip bogus descriptor for class and GC descriptor. */
+ method_index = size_binop (PLUS_EXPR, method_index, size_int (1));
+ else
+ /* Add 1 to skip "class" field of dtable, and 1 to skip GC descriptor. */
+ method_index = size_binop (PLUS_EXPR, method_index, size_int (2));
+
+ method_index = size_binop (MULT_EXPR, method_index,
+ TYPE_SIZE_UNIT (nativecode_ptr_ptr_type_node));
+
+ if (TARGET_VTABLE_USES_DESCRIPTORS)
+ method_index = size_binop (MULT_EXPR, method_index,
+ size_int (TARGET_VTABLE_USES_DESCRIPTORS));
+ }
func = fold (build (PLUS_EXPR, nativecode_ptr_ptr_type_node, dtable,
convert (nativecode_ptr_ptr_type_node, method_index)));
return func;
}
+static GTY(()) tree class_ident;
tree
-build_invokeinterface (dtable, method)
- tree dtable, method;
+build_invokeinterface (tree dtable, tree method)
{
- static tree class_ident = NULL_TREE;
tree lookup_arg;
tree interface;
tree idx;
tree meth;
+ tree otable_index;
int i;
/* We expand invokeinterface here. _Jv_LookupInterfaceMethod() will
abstract nor static. */
if (class_ident == NULL_TREE)
- {
- class_ident = get_identifier ("class");
- ggc_add_tree_root (&class_ident, 1);
- }
+ class_ident = get_identifier ("class");
- dtable = build_java_indirect_ref (dtable_type, dtable, flag_check_references);
+ dtable = build_java_indirect_ref (dtable_type, dtable,
+ flag_check_references);
dtable = build (COMPONENT_REF, class_ptr_type, dtable,
lookup_field (&dtable_type, class_ident));
interface = DECL_CONTEXT (method);
+ if (! CLASS_INTERFACE (TYPE_NAME (interface)))
+ abort ();
layout_class_methods (interface);
- i = 1;
- for (meth = TYPE_METHODS (interface); ; meth = TREE_CHAIN (meth), i++)
+ if (flag_indirect_dispatch)
{
- if (meth == method)
- {
- idx = build_int_2 (i, 0);
- break;
+ otable_index =
+ build_int_2 (get_symbol_table_index
+ (method, &TYPE_OTABLE_METHODS (output_class)), 0);
+ idx =
+ build (ARRAY_REF, integer_type_node, TYPE_OTABLE_DECL (output_class),
+ otable_index);
+ }
+ else
+ {
+ i = 1;
+ for (meth = TYPE_METHODS (interface); ; meth = TREE_CHAIN (meth), i++)
+ {
+ if (meth == method)
+ {
+ idx = build_int_2 (i, 0);
+ break;
+ }
+ if (meth == NULL_TREE)
+ abort ();
}
- if (meth == NULL_TREE)
- abort ();
}
lookup_arg = tree_cons (NULL_TREE, dtable,
NARGS is the number of arguments, or -1 if not specified. */
static void
-expand_invoke (opcode, method_ref_index, nargs)
- int opcode;
- int method_ref_index;
- int nargs ATTRIBUTE_UNUSED;
+expand_invoke (int opcode, int method_ref_index, int nargs ATTRIBUTE_UNUSED)
{
tree method_signature = COMPONENT_REF_SIGNATURE(¤t_jcf->cpool, method_ref_index);
tree method_name = COMPONENT_REF_NAME (¤t_jcf->cpool, method_ref_index);
layout_class_methods (self_type);
if (ID_INIT_P (method_name))
- method = lookup_java_constructor (CLASS_TO_HANDLE_TYPE (self_type),
- method_signature);
+ method = lookup_java_constructor (self_type, method_signature);
else
- method = lookup_java_method (CLASS_TO_HANDLE_TYPE (self_type),
- method_name, method_signature);
+ method = lookup_java_method (self_type, method_name, method_signature);
if (method == NULL_TREE)
{
error ("class '%s' has no method named '%s' matching signature '%s'",
method's `this'. In other cases we just rely on an
optimization pass to eliminate redundant checks. FIXME:
Unfortunately there doesn't seem to be a way to determine
- what the current method is right now. */
+ what the current method is right now.
+ We do omit the check if we're calling <init>. */
/* We use a SAVE_EXPR here to make sure we only evaluate
the new `self' expression once. */
tree save_arg = save_expr (TREE_VALUE (arg_list));
TREE_VALUE (arg_list) = save_arg;
- check = java_check_reference (save_arg, 1);
+ check = java_check_reference (save_arg, ! DECL_INIT_P (method));
func = build_known_method_ref (method, method_type, self_type,
method_signature, arg_list);
}
func = build_invokeinterface (dtable, method);
}
func = build1 (NOP_EXPR, build_pointer_type (method_type), func);
+
call = build (CALL_EXPR, TREE_TYPE (method_type), func, arg_list, NULL_TREE);
TREE_SIDE_EFFECTS (call) = 1;
+ call = check_for_builtin (method, call);
if (check != NULL_TREE)
{
a JNI function. */
tree
-build_jni_stub (method)
- tree method;
+build_jni_stub (tree method)
{
tree jnifunc, call, args, body, lookup_arg, method_sig, arg_types;
tree jni_func_type, tem;
tree method_args, res_type;
tree meth_var;
+ int args_size = 0;
+
tree klass = DECL_CONTEXT (method);
int from_class = ! CLASS_FROM_SOURCE_P (klass);
klass = build_class_ref (klass);
TREE_PUBLIC (meth_var) = 0;
DECL_EXTERNAL (meth_var) = 0;
DECL_CONTEXT (meth_var) = method;
+ DECL_ARTIFICIAL (meth_var) = 1;
+ DECL_INITIAL (meth_var) = null_pointer_node;
+ TREE_USED (meth_var) = 1;
+ chainon (env_var, meth_var);
+ layout_decl (meth_var, 0);
make_decl_rtl (meth_var, NULL);
- meth_var = pushdecl_top_level (meth_var);
+ rest_of_decl_compilation (meth_var, NULL, 0, 0);
/* One strange way that the front ends are different is that they
store arguments differently. */
special way, we would do that here. */
args = NULL_TREE;
for (tem = method_args; tem != NULL_TREE; tem = TREE_CHAIN (tem))
- args = tree_cons (NULL_TREE, tem, args);
+ {
+ int arg_bits = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (TREE_TYPE (tem)));
+#ifdef PARM_BOUNDARY
+ arg_bits = (((arg_bits + PARM_BOUNDARY - 1) / PARM_BOUNDARY)
+ * PARM_BOUNDARY);
+#endif
+ args_size += (arg_bits / BITS_PER_UNIT);
+
+ args = tree_cons (NULL_TREE, tem, args);
+ }
args = nreverse (args);
arg_types = TYPE_ARG_TYPES (TREE_TYPE (method));
available in the argument list. */
if (METHOD_STATIC (method))
{
+ args_size += int_size_in_bytes (TREE_TYPE (klass));
args = tree_cons (NULL_TREE, klass, args);
arg_types = tree_cons (NULL_TREE, object_ptr_type_node, arg_types);
}
/* The JNIEnv structure is the first argument to the JNI function. */
+ args_size += int_size_in_bytes (TREE_TYPE (env_var));
args = tree_cons (NULL_TREE, env_var, args);
arg_types = tree_cons (NULL_TREE, ptr_type_node, arg_types);
/* We call _Jv_LookupJNIMethod to find the actual underlying
function pointer. _Jv_LookupJNIMethod will throw the appropriate
exception if this function is not found at runtime. */
+ tem = build_tree_list (NULL_TREE, build_int_2 (args_size, 0));
method_sig = build_java_signature (TREE_TYPE (method));
- lookup_arg =
- build_tree_list (NULL_TREE,
- build_utf8_ref (unmangle_classname
- (IDENTIFIER_POINTER (method_sig),
- IDENTIFIER_LENGTH (method_sig))));
+ lookup_arg = tree_cons (NULL_TREE,
+ build_utf8_ref (unmangle_classname
+ (IDENTIFIER_POINTER (method_sig),
+ IDENTIFIER_LENGTH (method_sig))),
+ tem);
tem = DECL_NAME (method);
lookup_arg
= tree_cons (NULL_TREE, klass,
tree_cons (NULL_TREE, build_utf8_ref (tem), lookup_arg));
+
+ tem = build_function_type (TREE_TYPE (TREE_TYPE (method)), arg_types);
+
+#ifdef MODIFY_JNI_METHOD_CALL
+ tem = MODIFY_JNI_METHOD_CALL (tem);
+#endif
- jni_func_type
- = build_pointer_type (build_function_type (TREE_TYPE (TREE_TYPE (method)),
- arg_types));
+ jni_func_type = build_pointer_type (tem);
jnifunc = build (COND_EXPR, ptr_type_node,
meth_var, meth_var,
FIELD_REF_INDEX is an index into the constant pool. */
static void
-expand_java_field_op (is_static, is_putting, field_ref_index)
- int is_static;
- int is_putting;
- int field_ref_index;
+expand_java_field_op (int is_static, int is_putting, int field_ref_index)
{
tree self_type =
get_class_constant (current_jcf,
if (FIELD_FINAL (field_decl))
{
if (DECL_CONTEXT (field_decl) != current_class)
- error_with_decl (field_decl,
- "assignment to final field `%s' not in field's class");
+ error ("%Jassignment to final field '%D' not in field's class",
+ field_decl, field_decl);
else if (FIELD_STATIC (field_decl))
{
if (!DECL_CLINIT_P (current_function_decl))
- warning_with_decl (field_decl,
- "assignment to final static field `%s' not in class initializer");
+ warning ("%Jassignment to final static field `%D' not in "
+ "class initializer", field_decl, field_decl);
}
else
{
tree cfndecl_name = DECL_NAME (current_function_decl);
if (! DECL_CONSTRUCTOR_P (current_function_decl)
&& !ID_FINIT_P (cfndecl_name))
- warning_with_decl (field_decl, "assignment to final field `%s' not in constructor");
+ warning ("%Jassignment to final field '%D' not in constructor",
+ field_decl, field_decl);
}
}
- expand_assignment (field_ref, new_value, 0, 0);
+ expand_assignment (field_ref, new_value, 0);
}
else
push_value (field_ref);
}
void
-load_type_state (label)
- tree label;
+load_type_state (tree label)
{
int i;
tree vec = LABEL_TYPE_STATE (label);
}
/* Do the expansion of a Java switch. With Gcc, switches are front-end
- dependant things, but they rely on gcc routines. This function is
+ dependent things, but they rely on gcc routines. This function is
placed here because it uses things defined locally in parse.y. */
static tree
-case_identity (t, v)
- tree t __attribute__ ((__unused__));
- tree v;
+case_identity (tree t __attribute__ ((__unused__)), tree v)
{
return v;
}
}
struct rtx_def *
-java_lang_expand_expr (exp, target, tmode, modifier)
- register tree exp;
- rtx target;
- enum machine_mode tmode;
- enum expand_modifier modifier;
+java_expand_expr (tree exp, rtx target, enum machine_mode tmode,
+ int modifier /* Actually an enum expand_modifier. */,
+ rtx *alt_rtl ATTRIBUTE_UNUSED)
{
tree current;
DECL_INITIAL (init_decl) = value;
DECL_IGNORED_P (init_decl) = 1;
TREE_READONLY (init_decl) = 1;
+ /* Hash synchronization requires at least 64-bit alignment. */
+ if (flag_hash_synchronization && POINTER_SIZE < 64)
+ DECL_ALIGN (init_decl) = 64;
rest_of_decl_compilation (init_decl, NULL, 1, 0);
TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (init_decl)) = 1;
init = build1 (ADDR_EXPR, TREE_TYPE (exp), init_decl);
expand_decl (array_decl);
tmp = expand_assignment (array_decl,
build_new_array (element_type, length),
- 1, 0);
+ 1);
if (TREE_CONSTANT (init)
&& ilength >= 10 && JPRIMITIVE_TYPE_P (element_type))
{
expand_assignment (build (COMPONENT_REF, TREE_TYPE (data_fld),
build_java_indirect_ref (array_type,
array_decl, flag_check_references),
- data_fld), init, 0, 0);
+ data_fld), init, 0);
return tmp;
}
case BLOCK:
if (BLOCK_EXPR_BODY (exp))
{
tree local;
+ rtx last;
tree body = BLOCK_EXPR_BODY (exp);
/* Set to 1 or more when we found a static class
initialization flag. */
if (! always_initialize_class_p
&& current_function_decl
&& found_class_initialization_flag)
- hash_traverse
- (&DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl),
+ htab_traverse
+ (DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl),
emit_init_test_initialization, NULL);
/* Avoid deep recursion for long block. */
emit_queue ();
body = TREE_OPERAND (body, 1);
}
- expand_expr (body, const0_rtx, VOIDmode, 0);
+ last = expand_expr (body, NULL_RTX, VOIDmode, 0);
emit_queue ();
expand_end_bindings (getdecls (), 1, 0);
poplevel (1, 1, 0);
- return const0_rtx;
+ return last;
}
return const0_rtx;
tree decl = BLOCK_EXPR_DECLS (catch);
tree type = (decl ? TREE_TYPE (TREE_TYPE (decl)) : NULL_TREE);
- expand_start_catch (type);
+ expand_start_catch (prepare_eh_table_type (type));
expand_expr_stmt (TREE_OPERAND (current, 0));
expand_end_catch ();
}
return expand_expr (build_exception_object_ref (TREE_TYPE (exp)),
target, tmode, modifier);
+ case LABEL_EXPR:
+ /* Used only by expanded inline functions. */
+ expand_label (TREE_OPERAND (exp, 0));
+ return const0_rtx;
+
default:
internal_error ("can't expand %s", tree_code_name [TREE_CODE (exp)]);
}
instruction_bits[]. */
void
-note_instructions (jcf, method)
- JCF *jcf;
- tree method;
+note_instructions (JCF *jcf, tree method)
{
int PC;
unsigned char* byte_ops;
jint INT_temp;
#undef RET /* Defined by config/i386/i386.h */
-#undef AND /* Causes problems with opcodes for iand and land. */
#undef PTR
#define BCODE byte_ops
#define BYTE_type_node byte_type_node
if (!saw_index) NOTE_LABEL(oldpc + INT_temp);
#define PRE_JSR(OPERAND_TYPE, OPERAND_VALUE) \
saw_index = 0; INT_temp = (OPERAND_VALUE); \
+ NOTE_LABEL (PC); \
if (!saw_index) NOTE_LABEL(oldpc + INT_temp);
#define PRE_RET(OPERAND_TYPE, OPERAND_VALUE) (void)(OPERAND_VALUE)
}
void
-expand_byte_code (jcf, method)
- JCF *jcf;
- tree method;
+expand_byte_code (JCF *jcf, tree method)
{
int PC;
int i;
if (dead_code_index != -1)
{
/* We've just reached the end of a region of dead code. */
- warning ("unreachable bytecode from %d to before %d",
- dead_code_index, PC);
+ if (extra_warnings)
+ warning ("unreachable bytecode from %d to before %d",
+ dead_code_index, PC);
dead_code_index = -1;
}
}
linenumber_pointer += 4;
if (pc == PC)
{
- lineno = GET_u2 (linenumber_pointer - 2);
- emit_line_note (input_filename, lineno);
+ input_line = GET_u2 (linenumber_pointer - 2);
+ emit_line_note (input_location);
if (!(instruction_bits[PC] & BCODE_HAS_MULTI_LINENUMBERS))
break;
}
if (dead_code_index != -1)
{
/* We've just reached the end of a region of dead code. */
- warning ("unreachable bytecode from %d to the end of the method",
- dead_code_index);
+ if (extra_warnings)
+ warning ("unreachable bytecode from %d to the end of the method",
+ dead_code_index);
}
}
static void
-java_push_constant_from_pool (jcf, index)
- JCF *jcf;
- int index;
+java_push_constant_from_pool (JCF *jcf, int index)
{
tree c;
if (JPOOL_TAG (jcf, index) == CONSTANT_String)
}
int
-process_jvm_instruction (PC, byte_ops, length)
- int PC;
- const unsigned char* byte_ops;
- long length ATTRIBUTE_UNUSED;
+process_jvm_instruction (int PC, const unsigned char* byte_ops,
+ long length ATTRIBUTE_UNUSED)
{
const char *opname; /* Temporary ??? */
int oldpc = PC; /* PC at instruction start. */
build_java_ret (find_local_variable (index, ptr_type_node, oldpc)); \
}
-#define JSR(OPERAND_TYPE, OPERAND_VALUE) \
- { \
- tree where = lookup_label (oldpc+OPERAND_VALUE); \
- tree ret = lookup_label (PC); \
- build_java_jsr (where, ret); \
- load_type_state (ret); \
+#define JSR(OPERAND_TYPE, OPERAND_VALUE) \
+ { \
+ /* OPERAND_VALUE may have side-effects on PC */ \
+ int opvalue = OPERAND_VALUE; \
+ build_java_jsr (oldpc + opvalue, PC); \
}
/* Push a constant onto the stack. */
type = TREE_TYPE (value); \
decl = find_local_variable (var, type, oldpc); \
set_local_type (var, type ); \
- expand_assignment (decl, value, 0, 0); \
+ expand_assignment (decl, value, 0); \
}
#define STORE(OPERAND_TYPE, OPERAND_VALUE) \
CODE_OFFSET. */
static unsigned char
-peek_opcode_at_pc (jcf, code_offset, pc)
- JCF *jcf;
- int code_offset, pc;
+peek_opcode_at_pc (JCF *jcf, int code_offset, int pc)
{
unsigned char opcode;
long absolute_offset = (long)JCF_TELL (jcf);
have allocated and filled properly. */
int
-maybe_adjust_start_pc (jcf, code_offset, start_pc, slot)
- struct JCF *jcf;
- int code_offset, start_pc, slot;
+maybe_adjust_start_pc (struct JCF *jcf, int code_offset,
+ int start_pc, int slot)
{
int first, index, opcode;
int pc, insn_pc;
*/
tree
-force_evaluation_order (node)
- tree node;
+force_evaluation_order (tree node)
{
if (flag_syntax_only)
return node;
- if (TREE_CODE_CLASS (TREE_CODE (node)) == '2')
- {
- if (TREE_SIDE_EFFECTS (TREE_OPERAND (node, 1)))
- TREE_OPERAND (node, 0) = save_expr (TREE_OPERAND (node, 0));
- }
- else if (TREE_CODE (node) == CALL_EXPR
- || TREE_CODE (node) == NEW_CLASS_EXPR
- || (TREE_CODE (node) == COMPOUND_EXPR
- && TREE_CODE (TREE_OPERAND (node, 0)) == CALL_EXPR
- && TREE_CODE (TREE_OPERAND (node, 1)) == SAVE_EXPR))
+ if (TREE_CODE (node) == CALL_EXPR
+ || TREE_CODE (node) == NEW_CLASS_EXPR
+ || (TREE_CODE (node) == COMPOUND_EXPR
+ && TREE_CODE (TREE_OPERAND (node, 0)) == CALL_EXPR
+ && TREE_CODE (TREE_OPERAND (node, 1)) == SAVE_EXPR))
{
tree arg, cmp;
/* Called for every element in DECL_FUNCTION_INIT_TEST_TABLE of a
method in order to emit initialization code for each test flag. */
-static bool
-emit_init_test_initialization (entry, key)
- struct hash_entry *entry;
- hash_table_key key ATTRIBUTE_UNUSED;
+static int
+emit_init_test_initialization (void **entry, void *x ATTRIBUTE_UNUSED)
{
- struct init_test_hash_entry *ite = (struct init_test_hash_entry *) entry;
- tree klass = build_class_ref ((tree) entry->key);
+ struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry;
+ tree klass = build_class_ref (ite->key);
tree rhs;
/* If the DECL_INITIAL of the test flag is set to true, it
means that the class is already initialized the time it
is in use. */
- if (DECL_INITIAL (ite->init_test_decl) == boolean_true_node)
+ if (DECL_INITIAL (ite->value) == boolean_true_node)
rhs = boolean_true_node;
/* Otherwise, we initialize the class init check variable by looking
at the `state' field of the class to see if it is already
build_int_2 (JV_STATE_DONE, 0));
expand_expr_stmt (build (MODIFY_EXPR, boolean_type_node,
- ite->init_test_decl, rhs));
+ ite->value, rhs));
return true;
}
+
+#include "gt-java-expr.h"
+
OSDN Git Service
