Skip to content
Snippets Groups Projects
  • Alexandre Oliva's avatar
    18fa3240
    ffi.h.in (ffi_closure_alloc, [...]): New. · 18fa3240
    Alexandre Oliva authored
    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
    18fa3240
    History
    ffi.h.in (ffi_closure_alloc, [...]): New.
    Alexandre Oliva authored
    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