// boehm.cc - interface between libjava and Boehm GC.
-/* Copyright (C) 1998, 1999 Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation
This file is part of libgcj.
#include <config.h>
#include <stdio.h>
+#include <limits.h>
#include <jvm.h>
#include <gcj/cni.h>
#include <java/lang/Class.h>
+#include <java/lang/reflect/Modifier.h>
#include <java-interp.h>
// More nastiness: the GC wants to define TRUE and FALSE. We don't
extern "C"
{
-#include <gc_priv.h>
-#include <gc_mark.h>
+#include <private/gc_pmark.h>
+#include <gc_gcj.h>
+
+#ifdef THREAD_LOCAL_ALLOC
+# define GC_REDIRECT_TO_LOCAL
+# include <gc_local_alloc.h>
+#endif
// These aren't declared in any Boehm GC header.
void GC_finalize_all (void);
ptr_t GC_debug_generic_malloc (size_t size, int k, GC_EXTRA_PARAMS);
};
-// FIXME: this should probably be defined in some GC header.
-#ifdef GC_DEBUG
-# define GC_GENERIC_MALLOC(Size, Type) \
- GC_debug_generic_malloc (Size, Type, GC_EXTRAS)
-#else
-# define GC_GENERIC_MALLOC(Size, Type) GC_generic_malloc (Size, Type)
-#endif
-
-// We must check for plausibility ourselves.
#define MAYBE_MARK(Obj, Top, Limit, Source, Exit) \
- if ((ptr_t) (Obj) >= GC_least_plausible_heap_addr \
- && (ptr_t) (Obj) <= GC_greatest_plausible_heap_addr) \
- PUSH_CONTENTS (Obj, Top, Limit, Source, Exit)
-
-#define ObjectClass _CL_Q34java4lang6Object
-extern java::lang::Class ObjectClass;
-#define ClassClass _CL_Q34java4lang5Class
-extern java::lang::Class ClassClass;
-
-\f
-
-// Nonzero if this module has been initialized.
-static int initialized = 0;
-
-// `kind' index used when allocating Java objects.
-static int obj_kind_x;
+ Top=GC_MARK_AND_PUSH((GC_PTR)Obj, Top, Limit, (GC_PTR *)Source)
// `kind' index used when allocating Java arrays.
static int array_kind_x;
-// Freelist used for Java objects.
-static ptr_t *obj_free_list;
-
// Freelist used for Java arrays.
static ptr_t *array_free_list;
+// Lock used to protect access to Boehm's GC_enable/GC_disable functions.
+static _Jv_Mutex_t disable_gc_mutex;
+
\f
// This is called by the GC during the mark phase. It marks a Java
// object. We use `void *' arguments and return, and not what the
// Boehm GC wants, to avoid pollution in our headers.
void *
-_Jv_MarkObj (void *addr, void *msp, void *msl, void * /*env*/)
+_Jv_MarkObj (void *addr, void *msp, void *msl, void * /* env */)
{
mse *mark_stack_ptr = (mse *) msp;
mse *mark_stack_limit = (mse *) msl;
jobject obj = (jobject) addr;
+ // FIXME: if env is 1, this object was allocated through the debug
+ // interface, and addr points to the beginning of the debug header.
+ // In that case, we should really add the size of the header to addr.
+
_Jv_VTable *dt = *(_Jv_VTable **) addr;
- // We check this in case a GC occurs before the vtbl is set. FIXME:
- // should use allocation lock while initializing object.
- if (! dt)
+ // The object might not yet have its vtable set, or it might
+ // really be an object on the freelist. In either case, the vtable slot
+ // will either be 0, or it will point to a cleared object.
+ // This assumes Java objects have size at least 3 words,
+ // including the header. But this should remain true, since this
+ // should only be used with debugging allocation or with large objects.
+ if (__builtin_expect (! dt || !(dt -> get_finalizer()), false))
return mark_stack_ptr;
jclass klass = dt->clas;
+ ptr_t p;
- // Every object has a sync_info pointer.
- word w = (word) obj->sync_info;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, obj, o1label);
+# ifndef JV_HASH_SYNCHRONIZATION
+ // Every object has a sync_info pointer.
+ p = (ptr_t) obj->sync_info;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj, o1label);
+# endif
// Mark the object's class.
- w = (word) klass;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, obj, o2label);
+ p = (ptr_t) klass;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj, o2label);
- if (klass == &ClassClass)
+ if (__builtin_expect (klass == &java::lang::Class::class$, false))
{
+ // Currently we allocate some of the memory referenced from class objects
+ // as pointerfree memory, and then mark it more intelligently here.
+ // We ensure that the ClassClass mark descriptor forces invocation of
+ // this procedure.
+ // Correctness of this is subtle, but it looks OK to me for now. For the incremental
+ // collector, we need to make sure that the class object is written whenever
+ // any of the subobjects are altered and may need rescanning. This may be tricky
+ // during construction, and this may not be the right way to do this with
+ // incremental collection.
+ // If we overflow the mark stack, we will rescan the class object, so we should
+ // be OK. The same applies if we redo the mark phase because win32 unmapped part
+ // of our root set. - HB
jclass c = (jclass) addr;
-#if 0
- // The next field should probably not be marked, since this is
- // only used in the class hash table. Marking this field
- // basically prohibits class unloading. --Kresten
- w = (word) c->next;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c2label);
-#endif
-
- w = (word) c->name;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c3label);
- w = (word) c->superclass;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c4label);
+ p = (ptr_t) c->name;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c3label);
+ p = (ptr_t) c->superclass;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c4label);
for (int i = 0; i < c->constants.size; ++i)
{
/* FIXME: We could make this more precise by using the tags -KKT */
- w = (word) c->constants.data[i].p;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c5label);
+ p = (ptr_t) c->constants.data[i].p;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c5label);
}
#ifdef INTERPRETER
if (_Jv_IsInterpretedClass (c))
{
- w = (word) c->constants.tags;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c5alabel);
- w = (word) c->constants.data;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c5blabel);
+ p = (ptr_t) c->constants.tags;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c5alabel);
+ p = (ptr_t) c->constants.data;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c5blabel);
+ p = (ptr_t) c->vtable;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c5clabel);
}
#endif
// If the class is an array, then the methods field holds a
// pointer to the element class. If the class is primitive,
// then the methods field holds a pointer to the array class.
- w = (word) c->methods;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c6label);
+ p = (ptr_t) c->methods;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c6label);
+ // The vtable might have been set, but the rest of the class
+ // could still be uninitialized. If this is the case, then
+ // c.isArray will SEGV. We check for this, and if it is the
+ // case we just return.
+ if (__builtin_expect (c->name == NULL, false))
+ return mark_stack_ptr;
if (! c->isArray() && ! c->isPrimitive())
{
// points to a methods structure.
for (int i = 0; i < c->method_count; ++i)
{
- w = (word) c->methods[i].name;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c,
+ p = (ptr_t) c->methods[i].name;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c,
cm1label);
- w = (word) c->methods[i].signature;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c,
+ p = (ptr_t) c->methods[i].signature;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c,
cm2label);
-
- // FIXME: `ncode' entry?
-
-#ifdef INTERPRETER
- // The interpreter installs a heap-allocated
- // trampoline here, so we'll mark it.
- if (_Jv_IsInterpretedClass (c))
- {
- w = (word) c->methods[i].ncode;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c,
- cm3label);
- }
-#endif
}
}
// Mark all the fields.
- w = (word) c->fields;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c8label);
+ p = (ptr_t) c->fields;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c8label);
for (int i = 0; i < c->field_count; ++i)
{
_Jv_Field* field = &c->fields[i];
#ifndef COMPACT_FIELDS
- w = (word) field->name;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c8alabel);
+ p = (ptr_t) field->name;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c8alabel);
#endif
- w = (word) field->type;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c8blabel);
+ p = (ptr_t) field->type;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c8blabel);
// For the interpreter, we also need to mark the memory
// containing static members
- if (field->flags & 0x0008)
+ if ((field->flags & java::lang::reflect::Modifier::STATIC))
{
- w = (word) field->u.addr;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c8clabel);
+ p = (ptr_t) field->u.addr;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c8clabel);
// also, if the static member is a reference,
// mark also the value pointed to. We check for isResolved
if (JvFieldIsRef (field) && field->isResolved())
{
jobject val = *(jobject*) field->u.addr;
- w = (word) val;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit,
+ p = (ptr_t) val;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit,
c, c8elabel);
}
}
}
- w = (word) c->vtable;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, c9label);
- w = (word) c->interfaces;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, cAlabel);
+ p = (ptr_t) c->vtable;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c9label);
+ p = (ptr_t) c->interfaces;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cAlabel);
for (int i = 0; i < c->interface_count; ++i)
{
- w = (word) c->interfaces[i];
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, cClabel);
+ p = (ptr_t) c->interfaces[i];
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cClabel);
}
- w = (word) c->loader;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, c, cBlabel);
+ p = (ptr_t) c->loader;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cBlabel);
+ p = (ptr_t) c->arrayclass;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cDlabel);
+ p = (ptr_t) c->protectionDomain;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cPlabel);
+ p = (ptr_t) c->hack_signers;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cSlabel);
#ifdef INTERPRETER
if (_Jv_IsInterpretedClass (c))
{
- _Jv_InterpClass* ic = (_Jv_InterpClass*)c;
+ _Jv_InterpClass* ic = (_Jv_InterpClass*) c;
- w = (word) ic->interpreted_methods;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, ic, cElabel);
+ p = (ptr_t) ic->interpreted_methods;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic, cElabel);
for (int i = 0; i < c->method_count; i++)
{
- w = (word) ic->interpreted_methods[i];
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, ic, \
+ p = (ptr_t) ic->interpreted_methods[i];
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic, \
cFlabel);
+
+ // Mark the direct-threaded code.
+ if ((c->methods[i].accflags
+ & java::lang::reflect::Modifier::NATIVE) == 0)
+ {
+ _Jv_InterpMethod *im
+ = (_Jv_InterpMethod *) ic->interpreted_methods[i];
+ if (im)
+ {
+ p = (ptr_t) im->prepared;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic, \
+ cFlabel);
+ }
+ }
+
+ // The interpreter installs a heap-allocated trampoline
+ // here, so we'll mark it.
+ p = (ptr_t) c->methods[i].ncode;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c,
+ cm3label);
}
- w = (word) ic->field_initializers;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, ic, cGlabel);
+ p = (ptr_t) ic->field_initializers;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, ic, cGlabel);
}
#endif
// Note: occasionally `klass' can be null. For instance, this
// can happen if a GC occurs between the point where an object
// is allocated and where the vtbl slot is set.
- while (klass && klass != &ObjectClass)
+ while (klass && klass != &java::lang::Object::class$)
{
jfieldID field = JvGetFirstInstanceField (klass);
jint max = JvNumInstanceFields (klass);
if (JvFieldIsRef (field))
{
jobject val = JvGetObjectField (obj, field);
- w = (word) val;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit,
+ p = (ptr_t) val;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit,
obj, elabel);
}
- field = field->getNextInstanceField ();
+ field = field->getNextField ();
}
klass = klass->getSuperclass();
}
jobjectArray array = (jobjectArray) addr;
_Jv_VTable *dt = *(_Jv_VTable **) addr;
- // We check this in case a GC occurs before the vtbl is set. FIXME:
- // should use allocation lock while initializing object.
- if (! dt)
+ // Assumes size >= 3 words. That's currently true since arrays have
+ // a vtable, sync pointer, and size. If the sync pointer goes away,
+ // we may need to round up the size.
+ if (__builtin_expect (! dt || !(dt -> get_finalizer()), false))
return mark_stack_ptr;
jclass klass = dt->clas;
+ ptr_t p;
- // Every object has a sync_info pointer.
- word w = (word) array->sync_info;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, array, e1label);
+# ifndef JV_HASH_SYNCHRONIZATION
+ // Every object has a sync_info pointer.
+ p = (ptr_t) array->sync_info;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array, e1label);
+# endif
// Mark the object's class.
- w = (word) klass;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, obj, o2label);
+ p = (ptr_t) klass;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, &(dt -> clas), o2label);
for (int i = 0; i < JvGetArrayLength (array); ++i)
{
jobject obj = elements (array)[i];
- w = (word) obj;
- MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit, array, e2label);
+ p = (ptr_t) obj;
+ MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array, e2label);
}
return mark_stack_ptr;
}
-// Allocate space for a new Java object. FIXME: this might be the
-// wrong interface; we might prefer to pass in the object type as
-// well. It isn't important for this collector, but it might be for
-// other collectors.
+// Generate a GC marking descriptor for a class.
+//
+// We assume that the gcj mark proc has index 0. This is a dubious assumption,
+// since another one could be registered first. But the compiler also
+// knows this, so in that case everything else will break, too.
+#define GCJ_DEFAULT_DESCR GC_MAKE_PROC(GC_GCJ_RESERVED_MARK_PROC_INDEX,0)
+
void *
-_Jv_AllocObj (jsize size)
+_Jv_BuildGCDescr(jclass self)
{
- return GC_GENERIC_MALLOC (size, obj_kind_x);
+ jlong desc = 0;
+ jint bits_per_word = CHAR_BIT * sizeof (void *);
+
+ // Note: for now we only consider a bitmap mark descriptor. We
+ // could also handle the case where the first N fields of a type are
+ // references. However, this is not very likely to be used by many
+ // classes, and it is easier to compute things this way.
+
+ // The vtable pointer.
+ desc |= 1ULL << (bits_per_word - 1);
+#ifndef JV_HASH_SYNCHRONIZATION
+ // The sync_info field.
+ desc |= 1ULL << (bits_per_word - 2);
+#endif
+
+ for (jclass klass = self; klass != NULL; klass = klass->getSuperclass())
+ {
+ jfieldID field = JvGetFirstInstanceField(klass);
+ int count = JvNumInstanceFields(klass);
+
+ for (int i = 0; i < count; ++i)
+ {
+ if (field->isRef())
+ {
+ unsigned int off = field->getOffset();
+ // If we run into a weird situation, we bail.
+ if (off % sizeof (void *) != 0)
+ return (void *) (GCJ_DEFAULT_DESCR);
+ off /= sizeof (void *);
+ // If we find a field outside the range of our bitmap,
+ // fall back to procedure marker. The bottom 2 bits are
+ // reserved.
+ if (off >= bits_per_word - 2)
+ return (void *) (GCJ_DEFAULT_DESCR);
+ desc |= 1ULL << (bits_per_word - off - 1);
+ }
+
+ field = field->getNextField();
+ }
+ }
+
+ // For bitmap mark type, bottom bits are 01.
+ desc |= 1;
+ // Bogus warning avoidance (on many platforms).
+ return (void *) (unsigned long) desc;
}
-// Allocate space for a new Java array. FIXME: again, this might be
-// the wrong interface.
+// Allocate some space that is known to be pointer-free.
void *
-_Jv_AllocArray (jsize size)
+_Jv_AllocBytes (jsize size)
{
- return GC_GENERIC_MALLOC (size, array_kind_x);
+ void *r = GC_MALLOC_ATOMIC (size);
+ // We have to explicitly zero memory here, as the GC doesn't
+ // guarantee that PTRFREE allocations are zeroed. Note that we
+ // don't have to do this for other allocation types because we set
+ // the `ok_init' flag in the type descriptor.
+ memset (r, 0, size);
+ return r;
}
-// Allocate some space that is known to be pointer-free.
+// Allocate space for a new Java array.
+// Used only for arrays of objects.
void *
-_Jv_AllocBytes (jsize size)
+_Jv_AllocArray (jsize size, jclass klass)
+{
+ void *obj;
+ const jsize min_heap_addr = 16*1024;
+ // A heuristic. If size is less than this value, the size
+ // stored in the array can't possibly be misinterpreted as
+ // a pointer. Thus we lose nothing by scanning the object
+ // completely conservatively, since no misidentification can
+ // take place.
+
+#ifdef GC_DEBUG
+ // There isn't much to lose by scanning this conservatively.
+ // If we didn't, the mark proc would have to understand that
+ // it needed to skip the header.
+ obj = GC_MALLOC(size);
+#else
+ if (size < min_heap_addr)
+ obj = GC_MALLOC(size);
+ else
+ obj = GC_generic_malloc (size, array_kind_x);
+#endif
+ *((_Jv_VTable **) obj) = klass->vtable;
+ return obj;
+}
+
+/* Allocate space for a new non-Java object, which does not have the usual
+ Java object header but may contain pointers to other GC'ed objects. */
+void *
+_Jv_AllocRawObj (jsize size)
{
- return GC_GENERIC_MALLOC (size, PTRFREE);
+ return (void *) GC_MALLOC (size);
}
static void
GC_set_max_heap_size ((GC_word) size);
}
+// From boehm's misc.c
+extern "C" void GC_enable();
+extern "C" void GC_disable();
+
void
-_Jv_InitGC (void)
+_Jv_DisableGC (void)
{
- int proc;
- DCL_LOCK_STATE;
+ _Jv_MutexLock (&disable_gc_mutex);
+ GC_disable();
+ _Jv_MutexUnlock (&disable_gc_mutex);
+}
- DISABLE_SIGNALS ();
- LOCK ();
+void
+_Jv_EnableGC (void)
+{
+ _Jv_MutexLock (&disable_gc_mutex);
+ GC_enable();
+ _Jv_MutexUnlock (&disable_gc_mutex);
+}
- if (initialized)
- {
- UNLOCK ();
- ENABLE_SIGNALS ();
- return;
- }
- initialized = 1;
+static void * handle_out_of_memory(size_t)
+{
+ _Jv_ThrowNoMemory();
+}
- GC_java_finalization = 1;
+void
+_Jv_InitGC (void)
+{
+ int proc;
- // Set up state for marking and allocation of Java objects.
- obj_free_list = (ptr_t *) GC_generic_malloc_inner ((MAXOBJSZ + 1)
- * sizeof (ptr_t),
- PTRFREE);
- memset (obj_free_list, 0, (MAXOBJSZ + 1) * sizeof (ptr_t));
+ // Ignore pointers that do not point to the start of an object.
+ GC_all_interior_pointers = 0;
- proc = GC_n_mark_procs++;
- GC_mark_procs[proc] = (mark_proc) _Jv_MarkObj;
+ // Configure the collector to use the bitmap marking descriptors that we
+ // stash in the class vtable.
+ GC_init_gcj_malloc (0, (void *) _Jv_MarkObj);
- obj_kind_x = GC_n_kinds++;
- GC_obj_kinds[obj_kind_x].ok_freelist = obj_free_list;
- GC_obj_kinds[obj_kind_x].ok_reclaim_list = 0;
- GC_obj_kinds[obj_kind_x].ok_descriptor = MAKE_PROC (proc, 0);
- GC_obj_kinds[obj_kind_x].ok_relocate_descr = FALSE;
- GC_obj_kinds[obj_kind_x].ok_init = TRUE;
+ // Cause an out of memory error to be thrown from the allocators,
+ // instead of returning 0. This is cheaper than checking on allocation.
+ GC_oom_fn = handle_out_of_memory;
- // Set up state for marking and allocation of arrays of Java
- // objects.
+ GC_java_finalization = 1;
+
+ // We use a different mark procedure for object arrays. This code
+ // configures a different object `kind' for object array allocation and
+ // marking. FIXME: see above.
array_free_list = (ptr_t *) GC_generic_malloc_inner ((MAXOBJSZ + 1)
* sizeof (ptr_t),
PTRFREE);
memset (array_free_list, 0, (MAXOBJSZ + 1) * sizeof (ptr_t));
proc = GC_n_mark_procs++;
- GC_mark_procs[proc] = (mark_proc) _Jv_MarkArray;
+ GC_mark_procs[proc] = (GC_mark_proc) _Jv_MarkArray;
array_kind_x = GC_n_kinds++;
GC_obj_kinds[array_kind_x].ok_freelist = array_free_list;
GC_obj_kinds[array_kind_x].ok_reclaim_list = 0;
- GC_obj_kinds[array_kind_x].ok_descriptor = MAKE_PROC (proc, 0);
+ GC_obj_kinds[array_kind_x].ok_descriptor = GC_MAKE_PROC (proc, 0);
GC_obj_kinds[array_kind_x].ok_relocate_descr = FALSE;
GC_obj_kinds[array_kind_x].ok_init = TRUE;
- UNLOCK ();
- ENABLE_SIGNALS ();
+ _Jv_MutexInit (&disable_gc_mutex);
+}
+
+#ifdef JV_HASH_SYNCHRONIZATION
+// Allocate an object with a fake vtable pointer, which causes only
+// the first field (beyond the fake vtable pointer) to be traced.
+// Eventually this should probably be generalized.
+
+static _Jv_VTable trace_one_vtable = {
+ 0, // class pointer
+ (void *)(2 * sizeof(void *)),
+ // descriptor; scan 2 words incl. vtable ptr.
+ // Least significant bits must be zero to
+ // identify this as a length descriptor
+ {0} // First method
+};
+
+void *
+_Jv_AllocTraceOne (jsize size /* includes vtable slot */)
+{
+ return GC_GCJ_MALLOC (size, &trace_one_vtable);
+}
+
+// Ditto for two words.
+// the first field (beyond the fake vtable pointer) to be traced.
+// Eventually this should probably be generalized.
+
+static _Jv_VTable trace_two_vtable =
+{
+ 0, // class pointer
+ (void *)(3 * sizeof(void *)),
+ // descriptor; scan 3 words incl. vtable ptr.
+ {0} // First method
+};
+
+void *
+_Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
+{
+ return GC_GCJ_MALLOC (size, &trace_two_vtable);
+}
+
+#endif /* JV_HASH_SYNCHRONIZATION */
+
+void
+_Jv_GCInitializeFinalizers (void (*notifier) (void))
+{
+ GC_finalize_on_demand = 1;
+ GC_finalizer_notifier = notifier;
+}
+
+void
+_Jv_GCRegisterDisappearingLink (jobject *objp)
+{
+ GC_general_register_disappearing_link ((GC_PTR *) objp, (GC_PTR) *objp);
+}
+
+jboolean
+_Jv_GCCanReclaimSoftReference (jobject)
+{
+ // For now, always reclaim soft references. FIXME.
+ return true;
}
OSDN Git Service
