static int java_demangled_signature_length (char *);
static void java_demangled_signature_copy (char *, char *);
-static struct symtab *get_java_class_symtab (void);
+static struct symtab *get_java_class_symtab (struct gdbarch *gdbarch);
static char *get_java_utf8_name (struct obstack *obstack, struct value *name);
static int java_class_is_primitive (struct value *clas);
static struct value *java_value_string (char *ptr, int len);
static char *java_class_name_from_physname (const char *physname);
+static const struct objfile_data *jv_dynamics_objfile_data_key;
+static const struct objfile_data *jv_type_objfile_data_key;
+
/* This objfile contains symtabs that have been dynamically created
to record dynamically loaded Java classes and dynamically
compiled java methods. */
static struct objfile *dynamics_objfile = NULL;
+/* symtab contains classes read from the inferior. */
+
+static struct symtab *class_symtab = NULL;
+
static struct type *java_link_class_type (struct gdbarch *,
struct type *, struct value *);
+/* A function called when the dynamics_objfile is freed. We use this
+ to clean up some internal state. */
+static void
+jv_per_objfile_free (struct objfile *objfile, void *ignore)
+{
+ gdb_assert (objfile == dynamics_objfile);
+ /* Clean up all our cached state. These objects are all allocated
+ in the dynamics_objfile, so we don't need to actually free
+ anything. */
+ dynamics_objfile = NULL;
+ class_symtab = NULL;
+}
+
/* FIXME: carlton/2003-02-04: This is the main or only caller of
allocate_objfile with first argument NULL; as a result, this code
breaks every so often. Somebody should write a test case that
dynamic library) after this code has been called. */
static struct objfile *
-get_dynamics_objfile (void)
+get_dynamics_objfile (struct gdbarch *gdbarch)
{
if (dynamics_objfile == NULL)
{
- dynamics_objfile = allocate_objfile (NULL, 0);
+ /* Mark it as shared so that it is cleared when the inferior is
+ re-run. */
+ dynamics_objfile = allocate_objfile (NULL, OBJF_SHARED);
+ dynamics_objfile->gdbarch = gdbarch;
+ /* We don't have any data to store, but this lets us get a
+ notification when the objfile is destroyed. Since we have to
+ store a non-NULL value, we just pick something arbitrary and
+ safe. */
+ set_objfile_data (dynamics_objfile, jv_dynamics_objfile_data_key,
+ &dynamics_objfile);
}
return dynamics_objfile;
}
-#if 1
-/* symtab contains classes read from the inferior. */
-
-static struct symtab *class_symtab = NULL;
-
static void free_class_block (struct symtab *symtab);
static struct symtab *
-get_java_class_symtab (void)
+get_java_class_symtab (struct gdbarch *gdbarch)
{
if (class_symtab == NULL)
{
- struct objfile *objfile = get_dynamics_objfile ();
+ struct objfile *objfile = get_dynamics_objfile (gdbarch);
struct blockvector *bv;
struct block *bl;
class_symtab = allocate_symtab ("<java-classes>", objfile);
static void
add_class_symtab_symbol (struct symbol *sym)
{
- struct symtab *symtab = get_java_class_symtab ();
+ struct symtab *symtab
+ = get_java_class_symtab (get_objfile_arch (SYMBOL_SYMTAB (sym)->objfile));
struct blockvector *bv = BLOCKVECTOR (symtab);
dict_add_symbol (BLOCK_DICT (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)), sym);
}
-static struct symbol *add_class_symbol (struct type *type, CORE_ADDR addr);
-
static struct symbol *
add_class_symbol (struct type *type, CORE_ADDR addr)
{
dict_free (BLOCK_DICT (bl));
}
-#endif
struct type *
java_lookup_class (char *name)
}
#endif
- objfile = get_dynamics_objfile ();
+ objfile = get_dynamics_objfile (gdbarch);
if (java_class_is_primitive (clas))
{
struct value *sig;
if (type != NULL)
return type;
- /* Do not use the "fake" dynamics objfile to own dynamically generated
- types, as it does not provide an architecture, and it would not help
- manage the lifetime of these types anyway. */
- type = alloc_type_arch (gdbarch);
+ type = alloc_type (objfile);
TYPE_CODE (type) = TYPE_CODE_STRUCT;
INIT_CPLUS_SPECIFIC (type);
/* Fill in class TYPE with data from the CLAS value. */
-struct type *
+static struct type *
java_link_class_type (struct gdbarch *gdbarch,
struct type *type, struct value *clas)
{
struct value *method = NULL;
struct value *field = NULL;
int i, j;
- struct objfile *objfile = get_dynamics_objfile ();
+ struct objfile *objfile = get_dynamics_objfile (gdbarch);
struct type *tsuper;
gdb_assert (name != NULL);
static struct type *java_object_type;
+/* A free function that is attached to the objfile defining
+ java_object_type. This is used to clear the cached type whenever
+ its owning objfile is destroyed. */
+static void
+jv_clear_object_type (struct objfile *objfile, void *ignore)
+{
+ java_object_type = NULL;
+}
+
+static void
+set_java_object_type (struct type *type)
+{
+ struct objfile *owner;
+
+ gdb_assert (java_object_type == NULL);
+
+ owner = TYPE_OBJFILE (type);
+ if (owner)
+ set_objfile_data (owner, jv_type_objfile_data_key, &java_object_type);
+ java_object_type = type;
+}
+
struct type *
get_java_object_type (void)
{
sym = lookup_symbol ("java.lang.Object", NULL, STRUCT_DOMAIN, NULL);
if (sym == NULL)
error (_("cannot find java.lang.Object"));
- java_object_type = SYMBOL_TYPE (sym);
+ set_java_object_type (SYMBOL_TYPE (sym));
}
return java_object_type;
}
if (name != NULL && strcmp (name, "vtable") == 0)
{
if (java_object_type == NULL)
- java_object_type = type;
+ set_java_object_type (type);
return 1;
}
}
void
_initialize_java_language (void)
{
+ jv_dynamics_objfile_data_key
+ = register_objfile_data_with_cleanup (NULL, jv_per_objfile_free);
+ jv_type_objfile_data_key
+ = register_objfile_data_with_cleanup (NULL, jv_clear_object_type);
+
java_type_data = gdbarch_data_register_post_init (build_java_types);
add_language (&java_language_defn);
projects / binutils-gdb.git / commitdiff