mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-26 22:34:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

java-interp.h (_Jv_JNI_conversion_call): Declare.

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,5 +1,12 @@
2000-02-01 Tom Tromey <tromey@cygnus.com>
* 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>.
* include/jni.h (class _Jv_JNIEnv): Corrected calls using `...'.
* include/jni.h (class _Jv_JNIEnv): Added all C++ inline methods.

5
libjava/include/java-interp.h
View File

@ -1,6 +1,6 @@
// java-interp.h - Header file for the bytecode interpreter. -*- c++ -*-
/* Copyright (C) 1999 Red Hat, Inc.
/* Copyright (C) 1999, 2000 Red Hat, Inc.
This file is part of libgcj.
@ -121,6 +121,9 @@ class _Jv_InterpMethod {
friend class gnu::gcj::runtime::MethodInvocation;
friend void _Jv_PrepareClass(jclass);
// This function is used when making a JNI call from the interpreter.
friend void _Jv_JNI_conversion_call (ffi_cif *, void *, ffi_raw *, void *);
};
class _Jv_InterpMethodInvocation {

1
libjava/include/jvm.h
View File

@ -204,5 +204,4 @@ extern void _Jv_ThisExecutable (const char *);
/* Initialize JNI. */
extern void _Jv_JNI_Init (void);
#endif /* __JAVA_JVM_H__ */

29
libjava/jni.cc
View File

@ -45,6 +45,8 @@ details. */
#include <gcj/method.h>
#include <gcj/field.h>
#include <java-interp.h>
#define ClassClass _CL_Q34java4lang5Class
extern java::lang::Class ClassClass;
#define ObjectClass _CL_Q34java4lang6Object
@ -1204,11 +1206,14 @@ _Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method)
// This function is the stub which is used to turn an ordinary (CNI)
// method call into a JNI call.
#if 0
template<typename T>
static T
_Jv_JNI_conversion_call (fixme)
void
_Jv_JNI_conversion_call (ffi_cif *cif,
void *ret,
ffi_raw *args,
void *__this)
{
_Jv_InterpMethod* _this = (_Jv_InterpMethod*)__this;
JNIEnv env;
_Jv_JNI_LocalFrame *frame
= (_Jv_JNI_LocalFrame *) alloca (sizeof (_Jv_JNI_LocalFrame)
@ -1216,7 +1221,7 @@ _Jv_JNI_conversion_call (fixme)
env.p = &_Jv_JNIFunctions;
env.ex = NULL;
env.klass = FIXME;
env.klass = _this->defining_class;
env.locals = frame;
frame->marker = true;
@ -1225,20 +1230,24 @@ _Jv_JNI_conversion_call (fixme)
for (int i = 0; i < frame->size; ++i)
frame->vec[i] = NULL;
T result = FIXME_ffi_call (args);
// FIXME: we should mark every reference parameter as a local. For
// now we assume a conservative GC, and we assume that the
// references are on the stack somewhere.
ffi_raw_call (cif,
NULL, // FIXME: function pointer.
ret,
args);
do
{
_Jv_JNI_PopLocalFrame (&env, result);
_Jv_JNI_PopLocalFrame (&env, NULL);
}
while (env.locals != frame);
if (env.ex)
JvThrow (env.ex);
return T;
}
#endif

8
libjava/resolve.cc
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;