/* Handle exceptions for GNU compiler for the Java(TM) language.
- Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 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 "java-except.h"
#include "toplev.h"
-static void expand_start_java_handler PARAMS ((struct eh_range *));
-static void expand_end_java_handler PARAMS ((struct eh_range *));
-static struct eh_range *find_handler_in_range PARAMS ((int, struct eh_range *,
- struct eh_range *));
-static void link_handler PARAMS ((struct eh_range *, struct eh_range *));
-static void check_start_handlers PARAMS ((struct eh_range *, int));
-static void free_eh_ranges PARAMS ((struct eh_range *range));
-
-extern struct obstack permanent_obstack;
+static void expand_start_java_handler (struct eh_range *);
+static struct eh_range *find_handler_in_range (int, struct eh_range *,
+ struct eh_range *);
+static void link_handler (struct eh_range *, struct eh_range *);
+static void check_start_handlers (struct eh_range *, int);
+static void free_eh_ranges (struct eh_range *range);
struct eh_range *current_method_handlers;
struct eh_range whole_range;
#if defined(DEBUG_JAVA_BINDING_LEVELS)
-int binding_depth;
-int is_class_level;
-int current_pc;
+extern int binding_depth;
+extern int is_class_level;
+extern int current_pc;
extern void indent ();
#endif
previous children have end_pc values that are too low. */
static struct eh_range *
-find_handler_in_range (pc, range, child)
- int pc;
- struct eh_range *range;
- register struct eh_range *child;
+find_handler_in_range (int pc, struct eh_range *range, struct eh_range *child)
{
for (; child != NULL; child = child->next_sibling)
{
/* Find the inner-most handler that contains PC. */
struct eh_range *
-find_handler (pc)
- int pc;
+find_handler (int pc)
{
struct eh_range *h;
if (pc >= cache_range_start)
/* Recursive helper routine for check_nested_ranges. */
static void
-link_handler (range, outer)
- struct eh_range *range, *outer;
+link_handler (struct eh_range *range, struct eh_range *outer)
{
struct eh_range **ptr;
range->next_sibling = NULL;
range->first_child = outer;
{
+ struct eh_range *p = outer;
struct eh_range **pr = &(outer->outer->first_child);
while (*pr != outer)
pr = &(*pr)->next_sibling;
*pr = range;
+
+ while (p)
+ {
+ p->outer = range;
+ p = p->next_sibling;
+ }
}
- outer->outer = range;
return;
}
/* Handle overlapping ranges by splitting the new range. */
if (range->start_pc < outer->start_pc || range->end_pc > outer->end_pc)
{
- struct eh_range *h
- = (struct eh_range *) xmalloc (sizeof (struct eh_range));
+ struct eh_range *h = xmalloc (sizeof (struct eh_range));
if (range->start_pc < outer->start_pc)
{
h->start_pc = range->start_pc;
h->handlers = build_tree_list (TREE_PURPOSE (range->handlers),
TREE_VALUE (range->handlers));
h->next_sibling = NULL;
+ h->expanded = 0;
+ h->stmt = NULL;
/* Restart both from the top to avoid having to make this
function smart about reentrancy. */
link_handler (h, &whole_range);
ensure that exception ranges are properly nested. */
void
-handle_nested_ranges ()
+handle_nested_ranges (void)
{
struct eh_range *ptr, *next;
/* Free RANGE as well as its children and siblings. */
static void
-free_eh_ranges (range)
- struct eh_range *range;
+free_eh_ranges (struct eh_range *range)
{
while (range)
{
/* Called to re-initialize the exception machinery for a new method. */
void
-method_init_exceptions ()
+method_init_exceptions (void)
{
free_eh_ranges (&whole_range);
whole_range.start_pc = 0;
what the sorting counteracts. */
void
-add_handler (start_pc, end_pc, handler, type)
- int start_pc, end_pc;
- tree handler;
- tree type;
+add_handler (int start_pc, int end_pc, tree handler, tree type)
{
struct eh_range *ptr, *prev = NULL, *h;
prev = ptr;
}
- h = (struct eh_range *) xmalloc (sizeof (struct eh_range));
+ h = xmalloc (sizeof (struct eh_range));
h->start_pc = start_pc;
h->end_pc = end_pc;
h->first_child = NULL;
h->handlers = build_tree_list (type, handler);
h->next_sibling = NULL;
h->expanded = 0;
+ h->stmt = NULL;
if (prev == NULL)
whole_range.first_child = h;
prev->next_sibling = h;
}
-
/* if there are any handlers for this range, issue start of region */
static void
-expand_start_java_handler (range)
- struct eh_range *range;
+expand_start_java_handler (struct eh_range *range)
{
#if defined(DEBUG_JAVA_BINDING_LEVELS)
indent ();
fprintf (stderr, "expand start handler pc %d --> %d\n",
current_pc, range->end_pc);
#endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */
+ pushlevel (0);
+ register_exception_range (range, range->start_pc, range->end_pc);
range->expanded = 1;
- expand_eh_region_start ();
}
tree
-prepare_eh_table_type (type)
- tree type;
+prepare_eh_table_type (tree type)
{
tree exp;
+ tree *slot;
+ const char *name;
+ char *buf;
+ tree decl;
+ tree utf8_ref;
- /* The "type" (metch_info) in a (Java) exception table is one:
+ /* The "type" (match_info) in a (Java) exception table is a pointer to:
* a) NULL - meaning match any type in a try-finally.
- * b) a pointer to a (ccmpiled) class (low-order bit 0).
- * c) a pointer to the Utf8Const name of the class, plus one
- * (which yields a value with low-order bit 1). */
+ * b) a pointer to a pointer to a class.
+ * c) a pointer to a pointer to a utf8_ref. The pointer is
+ * rewritten to point to the appropriate class. */
if (type == NULL_TREE)
- exp = NULL_TREE;
- else if (is_compiled_class (type))
- exp = build_class_ref (type);
+ return NULL_TREE;
+
+ if (TYPE_TO_RUNTIME_MAP (output_class) == NULL)
+ TYPE_TO_RUNTIME_MAP (output_class) = java_treetreehash_create (10, 1);
+
+ slot = java_treetreehash_new (TYPE_TO_RUNTIME_MAP (output_class), type);
+ if (*slot != NULL)
+ return TREE_VALUE (*slot);
+
+ if (is_compiled_class (type) && !flag_indirect_dispatch)
+ {
+ name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
+ buf = alloca (strlen (name) + 5);
+ sprintf (buf, "%s_ref", name);
+ decl = build_decl (VAR_DECL, get_identifier (buf), ptr_type_node);
+ TREE_STATIC (decl) = 1;
+ DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
+ TREE_READONLY (decl) = 1;
+ TREE_THIS_VOLATILE (decl) = 0;
+ DECL_INITIAL (decl) = build_class_ref (type);
+ layout_decl (decl, 0);
+ pushdecl (decl);
+ exp = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (decl)), decl);
+ }
else
- exp = fold (build
- (PLUS_EXPR, ptr_type_node,
- build_utf8_ref (build_internal_class_name (type)),
- size_one_node));
+ {
+ utf8_ref = build_utf8_ref (DECL_NAME (TYPE_NAME (type)));
+ name = IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (utf8_ref, 0)));
+ buf = alloca (strlen (name) + 5);
+ sprintf (buf, "%s_ref", name);
+ decl = build_decl (VAR_DECL, get_identifier (buf), utf8const_ptr_type);
+ TREE_STATIC (decl) = 1;
+ DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
+ TREE_READONLY (decl) = 1;
+ TREE_THIS_VOLATILE (decl) = 0;
+ layout_decl (decl, 0);
+ pushdecl (decl);
+ exp = build1 (ADDR_EXPR, build_pointer_type (utf8const_ptr_type), decl);
+ TYPE_CATCH_CLASSES (output_class) =
+ tree_cons (NULL, make_catch_class_record (exp, utf8_ref),
+ TYPE_CATCH_CLASSES (output_class));
+ }
+
+ exp = convert (ptr_type_node, exp);
+
+ *slot = tree_cons (type, exp, NULL_TREE);
+
return exp;
}
+static int
+expand_catch_class (void **entry, void *x ATTRIBUTE_UNUSED)
+{
+ struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry;
+ tree addr = TREE_VALUE ((tree)ite->value);
+ tree decl;
+ STRIP_NOPS (addr);
+ decl = TREE_OPERAND (addr, 0);
+ rest_of_decl_compilation (decl, global_bindings_p (), 0);
+ return true;
+}
+
+/* For every class in the TYPE_TO_RUNTIME_MAP, expand the
+ corresponding object that is used by the runtime type matcher. */
+
+void
+java_expand_catch_classes (tree this_class)
+{
+ if (TYPE_TO_RUNTIME_MAP (this_class))
+ htab_traverse
+ (TYPE_TO_RUNTIME_MAP (this_class),
+ expand_catch_class, NULL);
+}
/* Build a reference to the jthrowable object being carried in the
exception header. */
tree
-build_exception_object_ref (type)
- tree type;
+build_exception_object_ref (tree type)
{
tree obj;
/* Java only passes object via pointer and doesn't require adjusting.
The java object is immediately before the generic exception header. */
- obj = build (EXC_PTR_EXPR, build_pointer_type (type));
- obj = build (MINUS_EXPR, TREE_TYPE (obj), obj,
- TYPE_SIZE_UNIT (TREE_TYPE (obj)));
+ obj = build0 (EXC_PTR_EXPR, build_pointer_type (type));
+ obj = build2 (MINUS_EXPR, TREE_TYPE (obj), obj,
+ TYPE_SIZE_UNIT (TREE_TYPE (obj)));
obj = build1 (INDIRECT_REF, type, obj);
return obj;
/* If there are any handlers for this range, isssue end of range,
and then all handler blocks */
-static void
-expand_end_java_handler (range)
- struct eh_range *range;
+void
+expand_end_java_handler (struct eh_range *range)
{
tree handler = range->handlers;
- force_poplevels (range->start_pc);
- expand_start_all_catch ();
+
for ( ; handler != NULL_TREE; handler = TREE_CHAIN (handler))
{
- expand_start_catch (TREE_PURPOSE (handler));
- expand_goto (TREE_VALUE (handler));
- expand_end_catch ();
+ /* For bytecode we treat exceptions a little unusually. A
+ `finally' clause looks like an ordinary exception handler for
+ Throwable. The reason for this is that the bytecode has
+ already expanded the finally logic, and we would have to do
+ extra (and difficult) work to get this to look like a
+ gcc-style finally clause. */
+ tree type = TREE_PURPOSE (handler);
+ if (type == NULL)
+ type = throwable_type_node;
+ type = prepare_eh_table_type (type);
+
+ {
+ tree catch_expr = build2 (CATCH_EXPR, void_type_node, type,
+ build1 (GOTO_EXPR, void_type_node,
+ TREE_VALUE (handler)));
+ tree try_catch_expr = build2 (TRY_CATCH_EXPR, void_type_node,
+ *get_stmts (), catch_expr);
+ *get_stmts () = try_catch_expr;
+ }
}
- expand_end_all_catch ();
#if defined(DEBUG_JAVA_BINDING_LEVELS)
indent ();
fprintf (stderr, "expand end handler pc %d <-- %d\n",
/* Recursive helper routine for maybe_start_handlers. */
static void
-check_start_handlers (range, pc)
- struct eh_range *range;
- int pc;
+check_start_handlers (struct eh_range *range, int pc)
{
if (range != NULL_EH_RANGE && range->start_pc == pc)
{
end_pc. */
void
-maybe_start_try (start_pc, end_pc)
- int start_pc;
- int end_pc;
+maybe_start_try (int start_pc, int end_pc)
{
struct eh_range *range;
if (! doing_eh (1))
check_start_handlers (range, start_pc);
}
-/* Emit any end-of-try-range ending at end_pc and starting before
- start_pc. */
-
-void
-maybe_end_try (start_pc, end_pc)
- int start_pc;
- int end_pc;
-{
- if (! doing_eh (1))
- return;
-
- while (current_range != NULL_EH_RANGE && current_range->end_pc <= end_pc
- && current_range->start_pc >= start_pc)
- {
- expand_end_java_handler (current_range);
- current_range = current_range->outer;
- }
-}