[vmkit-commits] [PATCH] Impl JVM_InvokeMethod, use existing proceedMethod from Classpath

[Nicolas Geoffray]

Looks good!

On Mon, Nov 7, 2011 at 9:25 PM, Will Dietz <wdietz2 at illinois.edu> wrote:

> >From 4dee86c7d7a61ef8b6e2cd911126ee5b72e517c4 Mon Sep 17 00:00:00 2001
> From: Will Dietz <w at wdtz.org>
> Date: Sun, 6 Nov 2011 22:04:20 -0600
> Subject: [PATCH 1/3] Impl JVM_InvokeMethod, use existing proceedMethod from
>  Classpath
>
> ---
>  lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   25 +++++++++++++++++++++++--
>  1 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> index 92c646d..e625a9f 100644
> --- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> +++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> @@ -1515,8 +1515,29 @@ JVM_GetClassAccessFlags(JNIEnv *env, jclass cls) {
>  * java.lang.reflect.Method
>  */
>  JNIEXPORT jobject JNICALL
> -JVM_InvokeMethod(JNIEnv *env, jobject method, jobject _obj,
> jobjectArray args0) {
> -  NYI();
> +JVM_InvokeMethod(JNIEnv *env, jobject _m, jobject _obj, jobjectArray
> args0) {
> +  JavaObject * ret = 0;
> +  JavaObjectMethod * m = 0;
> +  llvm_gcroot(ret, 0);
> +  llvm_gcroot(m, 0);
> +
> +  BEGIN_JNI_EXCEPTION
> +
> +  Jnjvm* vm = JavaThread::get()->getJVM();
> +
> +  m = *(JavaObjectMethod**)_m;
> +
> +  ret = proceedMethod(
> +    m,
> +    _obj ? *(JavaObject**)_obj : 0,
> +    args0? *(ArrayObject**)args0 : 0,
> +    JavaObjectMethod::getClass(m)->getDelegatee(),
> +    0 /* unused */ );
> +
> +  RETURN_FROM_JNI((jobject)th->pushJNIRef(ret));
> +  END_JNI_EXCEPTION
> +
> +  return 0;
>  }
>
>  /*
> --
> 1.7.5.1
> _______________________________________________
> vmkit-commits mailing list
> vmkit-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111108/eed0f7dc/attachment.html>