2007-01-09 19:58:05 +00:00
|
|
|
// natVMProxy.cc -- Implementation of VMProxy methods.
|
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
/* Copyright (C) 2006, 2007
|
2007-01-09 19:58:05 +00:00
|
|
|
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. */
|
|
|
|
|
|
|
|
// The idea of behind this code is to utilize libffi's ability to
|
|
|
|
// create closures to provide a fast "cut-through" way to generate
|
|
|
|
// proxy classes. Instead of generating bytecode and then
|
|
|
|
// interpreting that, we copy the method definitions for each of the
|
|
|
|
// methods we're supposed to be prxying and generate a libffi closure
|
|
|
|
// for each one.
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <platform.h>
|
|
|
|
#include <sysdep/descriptor.h>
|
|
|
|
|
|
|
|
#include <limits.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include <gcj/cni.h>
|
|
|
|
#include <gcj/javaprims.h>
|
|
|
|
#include <jvm.h>
|
|
|
|
#include <jni.h>
|
|
|
|
#include <java-threads.h>
|
|
|
|
#include <java-interp.h>
|
|
|
|
#include <ffi.h>
|
|
|
|
#include <execution.h>
|
|
|
|
#include <gcj/method.h>
|
|
|
|
|
|
|
|
#include <gnu/gcj/runtime/BootClassLoader.h>
|
|
|
|
#include <java/lang/Class.h>
|
|
|
|
#include <java/lang/ClassCastException.h>
|
|
|
|
#include <java/lang/Error.h>
|
|
|
|
#include <java/lang/IllegalArgumentException.h>
|
|
|
|
#include <java/lang/Integer.h>
|
|
|
|
#include <java/lang/StringBuffer.h>
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 16:17:21 +00:00
|
|
|
#include <java/lang/UnsupportedOperationException.h>
|
2007-01-09 19:58:05 +00:00
|
|
|
#include <java/lang/VMClassLoader.h>
|
|
|
|
#include <java/lang/VMCompiler.h>
|
|
|
|
#include <java/lang/reflect/InvocationHandler.h>
|
|
|
|
#include <java/lang/reflect/Method.h>
|
|
|
|
#include <java/lang/reflect/Proxy$ClassFactory.h>
|
|
|
|
#include <java/lang/reflect/Proxy$ProxyData.h>
|
|
|
|
#include <java/lang/reflect/Proxy.h>
|
|
|
|
#include <java/lang/reflect/UndeclaredThrowableException.h>
|
|
|
|
#include <java/lang/reflect/VMProxy.h>
|
|
|
|
|
|
|
|
#include <java/lang/Byte.h>
|
|
|
|
#include <java/lang/Short.h>
|
|
|
|
#include <java/lang/Integer.h>
|
|
|
|
#include <java/lang/Long.h>
|
|
|
|
#include <java/lang/Float.h>
|
|
|
|
#include <java/lang/Double.h>
|
|
|
|
#include <java/lang/Boolean.h>
|
|
|
|
#include <java/lang/Character.h>
|
|
|
|
|
|
|
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
using namespace java::lang;
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 16:17:21 +00:00
|
|
|
#ifndef INTERPRETER
|
|
|
|
jclass
|
|
|
|
java::lang::reflect::VMProxy::generateProxyClass
|
|
|
|
(ClassLoader *, Proxy$ProxyData *)
|
|
|
|
{
|
|
|
|
throw new UnsupportedOperationException (
|
|
|
|
JvNewStringLatin1 ("Interpreter not available"));
|
|
|
|
}
|
|
|
|
#else
|
2007-01-09 19:58:05 +00:00
|
|
|
typedef void (*closure_fun) (ffi_cif*, void*, void**, void*);
|
2007-04-18 17:10:32 +00:00
|
|
|
static void *ncode (int method_index, jclass klass, _Jv_Method *self, closure_fun fun);
|
2007-01-09 19:58:05 +00:00
|
|
|
static void run_proxy (ffi_cif*, void*, void**, void*);
|
|
|
|
|
|
|
|
typedef jobject invoke_t (jobject, Proxy *, Method *, JArray< jobject > *);
|
|
|
|
|
|
|
|
// True if pc points to a proxy frame.
|
|
|
|
|
|
|
|
bool
|
|
|
|
_Jv_is_proxy (void *pc)
|
|
|
|
{
|
|
|
|
return pc == UNWRAP_FUNCTION_DESCRIPTOR ((void*)&run_proxy);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Generate a proxy class by using libffi closures for each entry
|
|
|
|
// point.
|
|
|
|
|
|
|
|
jclass
|
|
|
|
java::lang::reflect::VMProxy::generateProxyClass
|
|
|
|
(ClassLoader *loader, Proxy$ProxyData *d)
|
|
|
|
{
|
|
|
|
// If we're precompiling, generate bytecode and allow VMCompiler to
|
|
|
|
// precompile it.
|
|
|
|
if (VMCompiler::precompiles ())
|
|
|
|
return (new Proxy$ClassFactory(d))->generate(loader);
|
|
|
|
|
|
|
|
jclass klass = new Class ();
|
|
|
|
|
|
|
|
// Synchronize on the class, so that it is not attempted initialized
|
|
|
|
// until we're done.
|
|
|
|
JvSynchronize sync (klass);
|
|
|
|
|
2007-04-18 17:10:32 +00:00
|
|
|
klass->superclass = &Proxy::class$;
|
|
|
|
klass->engine = &_Jv_soleIndirectCompiledEngine;
|
|
|
|
klass->size_in_bytes = -1;
|
|
|
|
klass->vtable_method_count = -1;
|
|
|
|
|
|
|
|
// Declare private static transient java.lang.reflect.Method[] $Proxy0.m
|
|
|
|
klass->field_count = klass->static_field_count = 1;
|
|
|
|
klass->fields = (_Jv_Field*)_Jv_AllocRawObj (sizeof (_Jv_Field));
|
|
|
|
klass->fields[0].name = _Jv_makeUtf8Const ("m");
|
|
|
|
klass->fields[0].type = d->methods->getClass();
|
|
|
|
klass->fields[0].flags = (Modifier::PRIVATE | Modifier::STATIC
|
|
|
|
| Modifier::TRANSIENT);
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
// Record the defining loader. For the bootstrap class loader,
|
|
|
|
// we record NULL.
|
|
|
|
if (loader != VMClassLoader::bootLoader)
|
|
|
|
klass->loader = loader;
|
|
|
|
|
|
|
|
{
|
|
|
|
StringBuffer *sb = new StringBuffer();
|
|
|
|
sb->append(JvNewStringLatin1 ("$Proxy"));
|
|
|
|
sb->append(Integer::toString (d->id));
|
|
|
|
klass->name = _Jv_makeUtf8Const (sb->toString());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Allocate space for the interfaces.
|
|
|
|
klass->interface_count = d->interfaces->length;
|
|
|
|
klass->interfaces = (jclass*) _Jv_AllocRawObj (klass->interface_count
|
|
|
|
*sizeof (jclass));
|
|
|
|
for (int i = 0; i < klass->interface_count; i++)
|
|
|
|
klass->interfaces[i] = elements(d->interfaces)[i];
|
|
|
|
|
|
|
|
size_t count = d->methods->length;
|
|
|
|
|
|
|
|
{
|
|
|
|
size_t total_count = count + Proxy::class$.method_count + 1;
|
|
|
|
if (total_count >= 65536)
|
|
|
|
throw new IllegalArgumentException ();
|
|
|
|
// Allocate space for the methods. This is a worst case
|
|
|
|
// estimate.
|
|
|
|
klass->methods
|
|
|
|
= (_Jv_Method *) _Jv_AllocRawObj (sizeof (_Jv_Method)
|
|
|
|
* total_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
jshort &method_count = klass->method_count;
|
|
|
|
|
|
|
|
// Copy all reachable methods from Proxy.
|
|
|
|
for (int i = 0; i < Proxy::class$.method_count; i++)
|
|
|
|
{
|
|
|
|
if (_Jv_CheckAccess (klass, &Proxy::class$,
|
|
|
|
Proxy::class$.methods[i].accflags))
|
|
|
|
{
|
|
|
|
klass->methods[method_count] = Proxy::class$.methods[i];
|
|
|
|
method_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_Jv_Method *init_method
|
|
|
|
= (_Jv_Linker::search_method_in_class
|
|
|
|
(klass, klass,
|
|
|
|
_Jv_makeUtf8Const ("<init>"),
|
|
|
|
_Jv_makeUtf8Const ("(Ljava.lang.reflect.InvocationHandler;)V"),
|
|
|
|
false));
|
|
|
|
init_method->accflags |= Modifier::PUBLIC;
|
|
|
|
|
|
|
|
// Create the methods for all of the interfaces.
|
|
|
|
for (size_t i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
_Jv_Method &method = klass->methods[method_count++];
|
2007-04-18 17:10:32 +00:00
|
|
|
const _Jv_Method &imethod
|
|
|
|
= *_Jv_FromReflectedMethod (elements(d->methods)[i]);
|
2007-01-09 19:58:05 +00:00
|
|
|
// We use a shallow copy of IMETHOD rather than a deep copy;
|
|
|
|
// this means that the pointer fields of METHOD point into the
|
|
|
|
// interface. As long as this subclass of Proxy is reachable,
|
|
|
|
// the interfaces of which it is a proxy will also be reachable,
|
|
|
|
// so this is safe.
|
|
|
|
method = imethod;
|
2007-04-18 17:10:32 +00:00
|
|
|
method.ncode = ncode (i, klass, &method, run_proxy);
|
2007-01-09 19:58:05 +00:00
|
|
|
method.accflags &= ~Modifier::ABSTRACT;
|
|
|
|
}
|
|
|
|
|
|
|
|
_Jv_Linker::layout_vtable_methods (klass);
|
|
|
|
_Jv_RegisterInitiatingLoader (klass, klass->loader);
|
|
|
|
|
2007-04-18 17:10:32 +00:00
|
|
|
// Set $Proxy0.m to point to the methods arrray
|
|
|
|
java::lang::reflect::Field *f
|
|
|
|
= klass->getDeclaredField (JvNewStringLatin1 ("m"));
|
|
|
|
f->flag = true;
|
|
|
|
f->set(NULL, d->methods);
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
return klass;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Box things with primitive types.
|
|
|
|
static inline jobject
|
|
|
|
box (void *thing, jclass klass, FFI_TYPE type)
|
|
|
|
{
|
|
|
|
jobject o;
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case FFI_TYPE_VOID:
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
case FFI_TYPE_POINTER:
|
|
|
|
o = *(jobject*)thing;
|
|
|
|
return o;
|
|
|
|
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (klass == JvPrimClass (byte))
|
|
|
|
o = new Byte (*(jbyte*)thing);
|
|
|
|
else if (klass == JvPrimClass (short))
|
|
|
|
o = new Short (*(jshort*)thing);
|
|
|
|
else if (klass == JvPrimClass (int))
|
|
|
|
o = new Integer (*(jint*)thing);
|
|
|
|
else if (klass == JvPrimClass (long))
|
|
|
|
o = new Long (*(jlong*)thing);
|
|
|
|
else if (klass == JvPrimClass (float))
|
|
|
|
o = new Float (*(jfloat*)thing);
|
|
|
|
else if (klass == JvPrimClass (double))
|
|
|
|
o = new Double (*(jdouble*)thing);
|
|
|
|
else if (klass == JvPrimClass (boolean))
|
|
|
|
o = new Boolean (*(jboolean*)thing);
|
|
|
|
else if (klass == JvPrimClass (char))
|
|
|
|
o = new Character (*(jchar*)thing);
|
|
|
|
else
|
|
|
|
JvFail ("Bad ffi type in proxy");
|
|
|
|
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Unbox things with primitive types.
|
|
|
|
static inline void
|
|
|
|
unbox (jobject o, jclass klass, void *rvalue, FFI_TYPE type)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case FFI_TYPE_VOID:
|
|
|
|
return;
|
|
|
|
|
|
|
|
case FFI_TYPE_POINTER:
|
|
|
|
_Jv_CheckCast (klass, o);
|
|
|
|
*(jobject*)rvalue = o;
|
|
|
|
return;
|
|
|
|
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the value returned ... is null and the interface method's
|
|
|
|
// return type is primitive, then a NullPointerException will be
|
|
|
|
// thrown ...
|
|
|
|
if (klass == JvPrimClass (byte))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Byte::class$, o);
|
|
|
|
*(jbyte*)rvalue = ((Byte*)o)->byteValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (short))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Short::class$, o);
|
|
|
|
*(jshort*)rvalue = ((Short*)o)->shortValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (int))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Integer::class$, o);
|
|
|
|
*(jint*)rvalue = ((Integer*)o)->intValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (long))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Long::class$, o);
|
|
|
|
*(jlong*)rvalue = ((Long*)o)->longValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (float))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Float::class$, o);
|
|
|
|
*(jfloat*)rvalue = ((Float*)o)->floatValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (double))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Double::class$, o);
|
|
|
|
*(jdouble*)rvalue = ((Double*)o)->doubleValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (boolean))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Boolean::class$, o);
|
|
|
|
*(jboolean*)rvalue = ((Boolean*)o)->booleanValue();
|
|
|
|
}
|
|
|
|
else if (klass == JvPrimClass (char))
|
|
|
|
{
|
|
|
|
_Jv_CheckCast (&Character::class$, o);
|
|
|
|
*(jchar*)rvalue = ((Character*)o)->charValue();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
JvFail ("Bad ffi type in proxy");
|
|
|
|
}
|
|
|
|
|
2007-07-13 14:07:16 +00:00
|
|
|
// _Jv_getFieldInternal is declared as a friend of reflect.Field in
|
|
|
|
// libjava/headers.txt. This gives us a way to call the private
|
|
|
|
// method Field.get (Class caller, Object obj).
|
|
|
|
extern inline jobject
|
|
|
|
_Jv_getFieldInternal (java::lang::reflect::Field *f, jclass c, jobject o)
|
|
|
|
{
|
|
|
|
return f->get(c, o);
|
|
|
|
}
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
// run_proxy is the entry point for all proxy methods. It boxes up
|
|
|
|
// all the arguments and then invokes the invocation handler's invoke()
|
|
|
|
// method. Exceptions are caught and propagated.
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ffi_closure closure;
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
_Jv_ClosureList list;
|
2007-01-09 19:58:05 +00:00
|
|
|
ffi_cif cif;
|
|
|
|
_Jv_Method *self;
|
2007-04-18 17:10:32 +00:00
|
|
|
int method_index;
|
2007-01-09 19:58:05 +00:00
|
|
|
ffi_type *arg_types[0];
|
|
|
|
} ncode_closure;
|
|
|
|
|
|
|
|
static void
|
|
|
|
run_proxy (ffi_cif *cif,
|
|
|
|
void *rvalue,
|
|
|
|
void **args,
|
|
|
|
void*user_data)
|
|
|
|
{
|
2007-04-02 16:36:52 +00:00
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
Proxy *proxy = *(Proxy**)args[0];
|
|
|
|
ncode_closure *self = (ncode_closure *) user_data;
|
|
|
|
|
2007-04-18 17:10:32 +00:00
|
|
|
jclass proxyClass = proxy->getClass();
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
// FRAME_DESC registers this particular invocation as the top-most
|
|
|
|
// interpreter frame. This lets the stack tracing code (for
|
|
|
|
// Throwable) print information about the Proxy being run rather
|
|
|
|
// than about Proxy.class itself. FRAME_DESC has a destructor so it
|
|
|
|
// cleans up automatically when this proxy invocation returns.
|
|
|
|
Thread *thread = Thread::currentThread();
|
2008-09-23 13:51:58 +00:00
|
|
|
_Jv_InterpFrame frame_desc (self->self, thread, proxyClass,
|
|
|
|
NULL, frame_proxy);
|
2007-04-18 17:10:32 +00:00
|
|
|
|
|
|
|
// The method to invoke is saved in $Proxy0.m[method_index].
|
|
|
|
// FIXME: We could somewhat improve efficiency by storing a pointer
|
|
|
|
// to the method (rather than its index) in ncode_closure. This
|
|
|
|
// would avoid the lookup, but it probably wouldn't make a huge
|
|
|
|
// difference. We'd still have to save the method array because
|
|
|
|
// ncode structs are not scanned by the gc.
|
|
|
|
Field *f = proxyClass->getDeclaredField (JvNewStringLatin1 ("m"));
|
2007-07-13 14:07:16 +00:00
|
|
|
JArray<Method*> *methods
|
|
|
|
= (JArray<Method*>*)_Jv_getFieldInternal (f, proxyClass, NULL);
|
2007-04-18 17:10:32 +00:00
|
|
|
Method *meth = elements(methods)[self->method_index];
|
2007-01-09 19:58:05 +00:00
|
|
|
|
2007-03-05 16:06:27 +00:00
|
|
|
JArray<jclass> *parameter_types = meth->internalGetParameterTypes ();
|
|
|
|
JArray<jclass> *exception_types = meth->internalGetExceptionTypes ();
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
InvocationHandler *handler = proxy->h;
|
2007-04-02 16:36:52 +00:00
|
|
|
JArray<jobject> *argsArray = NULL;
|
|
|
|
jobject *jargs = NULL;
|
|
|
|
if (parameter_types->length)
|
|
|
|
{
|
|
|
|
void *poo
|
|
|
|
= _Jv_NewObjectArray (parameter_types->length, &Object::class$, NULL);
|
|
|
|
argsArray = (JArray<jobject> *) poo;
|
|
|
|
jargs = elements(argsArray);
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
|
|
|
|
// FIXME: It must be possible to use fast interface dispatch here,
|
|
|
|
// but I've not quite figured out how to do it.
|
|
|
|
invoke_t *invoke
|
|
|
|
= (invoke_t *)(_Jv_LookupInterfaceMethod
|
|
|
|
(handler->getClass (),
|
|
|
|
_Jv_makeUtf8Const ("invoke"),
|
|
|
|
(_Jv_makeUtf8Const
|
|
|
|
("(Ljava.lang.Object;Ljava.lang.reflect.Method;[Ljava.lang.Object;)"
|
|
|
|
"Ljava.lang.Object;"))));
|
|
|
|
|
|
|
|
// Copy and box all the args.
|
|
|
|
int index = 1;
|
2007-03-05 16:06:27 +00:00
|
|
|
for (int i = 0; i < parameter_types->length; i++, index++)
|
|
|
|
jargs[i] = box (args[index], elements(parameter_types)[i],
|
2007-01-09 19:58:05 +00:00
|
|
|
cif->arg_types[index]->type);
|
|
|
|
|
|
|
|
jobject ret;
|
|
|
|
try
|
|
|
|
{
|
2007-03-05 16:06:27 +00:00
|
|
|
ret = invoke (handler, proxy, meth, argsArray);
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
catch (Throwable *t)
|
|
|
|
{
|
|
|
|
if (_Jv_IsInstanceOf (t, &RuntimeException::class$)
|
|
|
|
|| _Jv_IsInstanceOf (t, &Error::class$))
|
|
|
|
throw t;
|
|
|
|
|
2007-03-05 16:06:27 +00:00
|
|
|
Class **throwables = elements (exception_types);
|
|
|
|
for (int i = 0; i < exception_types->length; i++)
|
2007-01-09 19:58:05 +00:00
|
|
|
if (_Jv_IsInstanceOf (t, throwables[i]))
|
|
|
|
throw t;
|
|
|
|
|
|
|
|
throw new UndeclaredThrowableException (t);
|
|
|
|
}
|
|
|
|
|
2007-03-05 16:06:27 +00:00
|
|
|
unbox (ret, meth->return_type, rvalue, cif->rtype->type);
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Given a method and a closure function, create libffi CIF and return
|
|
|
|
// the address of its closure.
|
|
|
|
|
|
|
|
static void *
|
2007-04-18 17:10:32 +00:00
|
|
|
ncode (int method_index, jclass klass, _Jv_Method *self, closure_fun fun)
|
2007-01-09 19:58:05 +00:00
|
|
|
{
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
|
|
jboolean staticp = (self->accflags & Modifier::STATIC) != 0;
|
|
|
|
int arg_count = _Jv_count_arguments (self->signature, staticp);
|
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
void *code;
|
2007-01-09 19:58:05 +00:00
|
|
|
ncode_closure *closure =
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
(ncode_closure*)ffi_closure_alloc (sizeof (ncode_closure)
|
|
|
|
+ arg_count * sizeof (ffi_type*),
|
|
|
|
&code);
|
2007-04-18 17:10:32 +00:00
|
|
|
closure->method_index = method_index;
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
closure->list.registerClosure (klass, closure);
|
2007-01-09 19:58:05 +00:00
|
|
|
|
|
|
|
_Jv_init_cif (self->signature,
|
|
|
|
arg_count,
|
|
|
|
staticp,
|
|
|
|
&closure->cif,
|
|
|
|
&closure->arg_types[0],
|
|
|
|
NULL);
|
|
|
|
closure->self = self;
|
|
|
|
|
|
|
|
JvAssert ((self->accflags & Modifier::NATIVE) == 0);
|
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
ffi_prep_closure_loc (&closure->closure,
|
|
|
|
&closure->cif,
|
|
|
|
fun,
|
|
|
|
code,
|
|
|
|
code);
|
2007-01-09 19:58:05 +00:00
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
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
2007-03-07 07:27:25 +00:00
|
|
|
self->ncode = code;
|
2007-01-09 19:58:05 +00:00
|
|
|
return self->ncode;
|
|
|
|
}
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 16:17:21 +00:00
|
|
|
|
|
|
|
#endif // INTERPRETER
|