18fa3240db
libffi/ChangeLog: * include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New. (ffi_prep_closure_loc): New. (ffi_prep_raw_closure_loc): New. (ffi_prep_java_raw_closure_loc): New. * src/closures.c: New file. * src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment): Replace sflags with exec_offset. [FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset, sub_segment_exec_offset): New macros. (get_segment_flags, set_segment_flags, check_segment_merge): New macros. (is_mmapped_segment, is_extern_segment): Use get_segment_flags. (add_segment, sys_alloc, create_mspace, create_mspace_with_base, destroy_mspace): Use new macros. (sys_alloc): Silence warning. * Makefile.am (libffi_la_SOURCES): Add src/closures.c. * Makefile.in: Rebuilt. * src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in terms of ffi_prep_closure_loc. * src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted from... (ffi_prep_raw_closure): ... this. Re-implement in terms of the renamed version. * src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and adjusted from... (ffi_prep_java_raw_closure): ... this. Re-implement in terms of the renamed version. * src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from (ffi_prep_closure): ... this. * src/pa/ffi.c: Likewise. * src/cris/ffi.c: Likewise. Adjust. * src/frv/ffi.c: Likewise. * src/ia64/ffi.c: Likewise. * src/mips/ffi.c: Likewise. * src/powerpc/ffi_darwin.c: Likewise. * src/s390/ffi.c: Likewise. * src/sh/ffi.c: Likewise. * src/sh64/ffi.c: Likewise. * src/sparc/ffi.c: Likewise. * src/x86/ffi64.c: Likewise. * src/x86/ffi.c: Likewise. (FFI_INIT_TRAMPOLINE): Adjust. (ffi_prep_raw_closure_loc): Renamed and adjusted from... (ffi_prep_raw_closure): ... this. * src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from (ffi_prep_closure): ... this. (flush_icache): Adjust. boehm-gc/ChangeLog: * include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New. (GC_register_finalizer_unreachable): Declare. (GC_debug_register_finalizer_unreachable): Declare. * finalize.c (GC_unreachable_finalize_mark_proc): New. (GC_register_finalizer_unreachable): New. (GC_finalize): Handle it. * dbg_mlc.c (GC_debug_register_finalizer_unreachable): New. (GC_debug_register_finalizer_no_order): Fix whitespace. libjava/ChangeLog: * include/jvm.h (_Jv_ClosureListFinalizer): New. (_Jv_Linker::create_error_method): Adjust. * boehm.cc (_Jv_ClosureListFinalizer): New. * nogc.cc (_Jv_ClosureListFinalizer): New. * java/lang/Class.h (class _Jv_ClosureList): New. (class java::lang::Class): Declare it as friend. * java/lang/natClass.cc (_Jv_ClosureList::releaseClosures): New. (_Jv_ClosureList::registerClousure): New. * include/execution.h (_Jv_ExecutionEngine): Add get_closure_list. (_Jv_CompiledEngine::do_get_closure_list): New. (_Jv_CompiledEngine::_Jv_CompiledEngine): Use it. (_Jv_IndirectCompiledClass): Add closures. (_Jv_IndirectCompiledEngine::get_aux_info): New. (_Jv_IndirectCompiledEngine::do_allocate_field_initializers): Use it. (_Jv_IndirectCompiledEngine::do_get_closure_list): New. (_Jv_IndirectCompiledEngine::_Jv_IndirectCompiledEngine): Use it. (_Jv_InterpreterEngine::do_get_closure_list): Declare. (_Jv_InterpreterEngine::_Jv_InterpreterEngine): Use it. * interpret.cc (FFI_PREP_RAW_CLOSURE): Use _loc variants. (node_closure): Add closure list. (_Jv_InterpMethod::ncode): Add jclass argument. Use ffi_closure_alloc and the separate code pointer. Register the closure for finalization. (_Jv_JNIMethod::ncode): Likewise. (_Jv_InterpreterEngine::do_create_ncode): Pass klass to ncode. (_Jv_InterpreterEngine::do_get_closure_list): New. * include/java-interp.h (_Jv_InterpMethod::ncode): Adjust. (_Jv_InterpClass): Add closures field. (_Jv_JNIMethod::ncode): Adjust. * defineclass.cc (_Jv_ClassReader::handleCodeAttribute): Adjust. (_Jv_ClassReader::handleMethodsEnd): Likewise. * link.cc (struct method_closure): Add closure list. (_Jv_Linker::create_error_method): Add jclass argument. Use ffi_closure_alloc and the separate code pointer. Register the closure for finalization. (_Jv_Linker::link_symbol_table): Remove outdated comment about sharing of otable and atable. Adjust. * java/lang/reflect/natVMProxy.cc (ncode_closure): Add closure list. (ncode): Add jclass argument. Use ffi_closure_alloc and the separate code pointer. Register the closure for finalization. (java::lang::reflect::VMProxy::generateProxyClass): Adjust. * testsuite/libjava.jar/TestClosureGC.java: New. * testsuite/libjava.jar/TestClosureGC.out: New. * testsuite/libjava.jar/TestClosureGC.xfail: New. * testsuite/libjava.jar/TestClosureGC.jar: New. From-SVN: r122652
274 lines
6.6 KiB
C++
274 lines
6.6 KiB
C++
// execution.h - Execution engines. -*- c++ -*-
|
|
|
|
/* Copyright (C) 2004, 2006, 2007 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __JAVA_EXECUTION_H__
|
|
#define __JAVA_EXECUTION_H__
|
|
|
|
// This represents one execution engine. Note that we use function
|
|
// pointers and not virtual methods to avoid calls to
|
|
// __cxa_call_unexpected and the like.
|
|
struct _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
void (*unregister) (jclass);
|
|
// FIXME: probably should handle this elsewhere, see how
|
|
// interpreter does it.
|
|
bool (*need_resolve_string_fields) ();
|
|
void (*verify) (jclass);
|
|
void (*allocate_static_fields) (jclass, int, int);
|
|
void (*allocate_field_initializers) (jclass);
|
|
void (*create_ncode) (jclass);
|
|
_Jv_ResolvedMethod *(*resolve_method) (_Jv_Method *, jclass,
|
|
jboolean);
|
|
void (*post_miranda_hook) (jclass);
|
|
_Jv_ClosureList **(*get_closure_list) (jclass);
|
|
};
|
|
|
|
// This handles gcj-compiled code except that compiled with
|
|
// -findirect-classes.
|
|
struct _Jv_CompiledEngine : public _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
static void do_unregister (jclass)
|
|
{
|
|
}
|
|
|
|
static bool do_need_resolve_string_fields ()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static void do_verify (jclass klass)
|
|
{
|
|
_Jv_Linker::verify_type_assertions (klass);
|
|
}
|
|
|
|
static _Jv_ResolvedMethod *do_resolve_method (_Jv_Method *, jclass,
|
|
jboolean)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static void do_allocate_static_fields (jclass,
|
|
int,
|
|
int)
|
|
{
|
|
}
|
|
|
|
static void do_allocate_field_initializers (jclass)
|
|
{
|
|
}
|
|
|
|
static void do_create_ncode (jclass)
|
|
{
|
|
// Not needed.
|
|
}
|
|
|
|
static void do_post_miranda_hook (jclass)
|
|
{
|
|
// Not needed.
|
|
}
|
|
|
|
static _Jv_ClosureList **do_get_closure_list (jclass)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
_Jv_CompiledEngine ()
|
|
{
|
|
unregister = do_unregister;
|
|
need_resolve_string_fields = do_need_resolve_string_fields;
|
|
verify = do_verify;
|
|
allocate_static_fields = do_allocate_static_fields;
|
|
allocate_field_initializers = do_allocate_field_initializers;
|
|
create_ncode = do_create_ncode;
|
|
resolve_method = do_resolve_method;
|
|
post_miranda_hook = do_post_miranda_hook;
|
|
get_closure_list = do_get_closure_list;
|
|
}
|
|
|
|
// These operators make it so we don't have to link in libstdc++.
|
|
void *operator new (size_t bytes)
|
|
{
|
|
return _Jv_Malloc(bytes);
|
|
}
|
|
|
|
void operator delete (void *mem)
|
|
{
|
|
_Jv_Free(mem);
|
|
}
|
|
};
|
|
|
|
class _Jv_IndirectCompiledClass
|
|
{
|
|
public:
|
|
void **field_initializers;
|
|
_Jv_ClosureList **closures;
|
|
};
|
|
|
|
// This handles gcj-compiled code compiled with -findirect-classes.
|
|
struct _Jv_IndirectCompiledEngine : public _Jv_CompiledEngine
|
|
{
|
|
_Jv_IndirectCompiledEngine () : _Jv_CompiledEngine ()
|
|
{
|
|
allocate_static_fields = do_allocate_static_fields;
|
|
allocate_field_initializers = do_allocate_field_initializers;
|
|
get_closure_list = do_get_closure_list;
|
|
}
|
|
|
|
static _Jv_IndirectCompiledClass *get_aux_info (jclass klass)
|
|
{
|
|
_Jv_IndirectCompiledClass *aux =
|
|
(_Jv_IndirectCompiledClass*)klass->aux_info;
|
|
if (!aux)
|
|
{
|
|
aux = (_Jv_IndirectCompiledClass*)
|
|
_Jv_AllocRawObj (sizeof (_Jv_IndirectCompiledClass));
|
|
klass->aux_info = aux;
|
|
}
|
|
|
|
return aux;
|
|
}
|
|
|
|
static void do_allocate_field_initializers (jclass klass)
|
|
{
|
|
_Jv_IndirectCompiledClass *aux = get_aux_info (klass);
|
|
if (!aux)
|
|
{
|
|
aux = (_Jv_IndirectCompiledClass*)
|
|
_Jv_AllocRawObj (sizeof (_Jv_IndirectCompiledClass));
|
|
klass->aux_info = aux;
|
|
}
|
|
|
|
aux->field_initializers = (void **)_Jv_Malloc (klass->field_count
|
|
* sizeof (void*));
|
|
|
|
for (int i = 0; i < klass->field_count; i++)
|
|
{
|
|
_Jv_Field *field = &klass->fields[i];
|
|
if (field->flags & java::lang::reflect::Modifier::STATIC)
|
|
{
|
|
aux->field_initializers[i] = field->u.addr;
|
|
field->u.addr = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void do_allocate_static_fields (jclass klass,
|
|
int pointer_size,
|
|
int other_size)
|
|
{
|
|
// Splitting the allocations here lets us scan reference fields
|
|
// and avoid scanning non-reference fields.
|
|
char *reference_fields = (char *) _Jv_AllocRawObj (pointer_size);
|
|
char *non_reference_fields = (char *) _Jv_AllocBytes (other_size);
|
|
|
|
_Jv_IndirectCompiledClass *aux
|
|
= (_Jv_IndirectCompiledClass*)klass->aux_info;
|
|
|
|
for (int i = 0; i < klass->field_count; i++)
|
|
{
|
|
_Jv_Field *field = &klass->fields[i];
|
|
|
|
if ((field->flags & java::lang::reflect::Modifier::STATIC) == 0)
|
|
continue;
|
|
|
|
char *base = field->isRef() ? reference_fields : non_reference_fields;
|
|
field->u.addr = base + field->u.boffset;
|
|
|
|
if (aux->field_initializers[i])
|
|
{
|
|
int field_size;
|
|
if (! field->isRef ())
|
|
field_size = field->type->size ();
|
|
else
|
|
field_size = sizeof (jobject);
|
|
|
|
memcpy (field->u.addr, aux->field_initializers[i], field_size);
|
|
}
|
|
}
|
|
_Jv_Free (aux->field_initializers);
|
|
}
|
|
|
|
static _Jv_ClosureList **do_get_closure_list (jclass klass)
|
|
{
|
|
_Jv_IndirectCompiledClass *aux = get_aux_info (klass);
|
|
|
|
if (!aux->closures)
|
|
aux->closures = _Jv_ClosureListFinalizer ();
|
|
|
|
return aux->closures;
|
|
}
|
|
};
|
|
|
|
|
|
|
|
// This handles interpreted code.
|
|
class _Jv_InterpreterEngine : public _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
static void do_verify (jclass);
|
|
static void do_allocate_static_fields (jclass, int, int);
|
|
static void do_create_ncode (jclass);
|
|
static _Jv_ResolvedMethod *do_resolve_method (_Jv_Method *, jclass,
|
|
jboolean);
|
|
|
|
static bool do_need_resolve_string_fields ()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static void do_unregister(jclass klass)
|
|
{
|
|
_Jv_UnregisterClass(klass);
|
|
}
|
|
|
|
static void do_allocate_field_initializers (jclass)
|
|
{
|
|
}
|
|
|
|
static void do_post_miranda_hook (jclass);
|
|
|
|
static _Jv_ClosureList **do_get_closure_list (jclass klass);
|
|
|
|
_Jv_InterpreterEngine ()
|
|
{
|
|
unregister = do_unregister;
|
|
need_resolve_string_fields = do_need_resolve_string_fields;
|
|
verify = do_verify;
|
|
allocate_static_fields = do_allocate_static_fields;
|
|
allocate_field_initializers = do_allocate_field_initializers;
|
|
create_ncode = do_create_ncode;
|
|
resolve_method = do_resolve_method;
|
|
post_miranda_hook = do_post_miranda_hook;
|
|
get_closure_list = do_get_closure_list;
|
|
}
|
|
|
|
// These operators make it so we don't have to link in libstdc++.
|
|
void *operator new (size_t bytes)
|
|
{
|
|
return _Jv_Malloc(bytes);
|
|
}
|
|
|
|
void operator delete (void *mem)
|
|
{
|
|
_Jv_Free(mem);
|
|
}
|
|
};
|
|
|
|
|
|
extern _Jv_InterpreterEngine _Jv_soleInterpreterEngine;
|
|
extern _Jv_CompiledEngine _Jv_soleCompiledEngine;
|
|
extern _Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine;
|
|
#endif // __JAVA_EXECUTION_H__
|