java-interp.h (_Jv_JNI_conversion_call): Declare.

* include/java-interp.h (_Jv_JNI_conversion_call): Declare.
	* resolve.cc (ncode): Use _Jv_JNI_conversion_call when
	constructing the closure if the function is native.
	* jni.cc (_Jv_JNI_conversion_call): Now returns `void'.  No longer
	a template function, #if'd out, or static.
	Include <java-interp.h>.

From-SVN: r31746
This commit is contained in:
Tom Tromey 2000-02-02 01:55:03 +00:00 committed by Tom Tromey
parent 8928191114
commit ee6713e782
5 changed files with 37 additions and 13 deletions

View file

@ -1022,7 +1022,13 @@ _Jv_InterpMethod::ncode ()
args_raw_size = ffi_raw_size (&closure->cif);
if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
if ((self->accflags & Modifier::NATIVE) != 0)
{
// FIXME: for now we assume that all native methods for
// interpreted code use JNI.
fun = (ffi_closure_fun) &_Jv_JNI_conversion_call;
}
else if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
{
if (staticp)
fun = (ffi_closure_fun)&_Jv_InterpMethod::run_synch_class;