[vmkit-commits] [PATCH] Impl JVM_GetClass{Modifiers, GetClassAccessFlags}

[Nicolas Geoffray]

Looks good!

On Thu, Nov 3, 2011 at 3:27 PM, Will Dietz <wdietz2 at illinois.edu> wrote:

> Inlined below.
>
> Thanks!
>
> ~Will
>
> >From 162150b6387d3f750eca94a85dbcd9345cb3ccdc Mon Sep 17 00:00:00 2001
> From: Will Dietz <w at wdtz.org>
> Date: Wed, 2 Nov 2011 22:14:42 -0500
> Subject: [PATCH 07/17] Impl JVM_GetClass{Modifiers,GetClassAccessFlags}
>
> ---
>  lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   40
> +++++++++++++++++++++++++++++++++-
>  1 files changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> index 3d157ed..8e4e737 100644
> --- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> +++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
> @@ -1223,7 +1223,27 @@ JVM_GetComponentType(JNIEnv *env, jclass cls) {
>
>  JNIEXPORT jint JNICALL
>  JVM_GetClassModifiers(JNIEnv *env, jclass cls) {
> -  NYI();
> +  JavaObject * Cl = 0;
> +  llvm_gcroot(Cl, 0);
> +  BEGIN_JNI_EXCEPTION
> +
> +  Cl = *(JavaObject**)cls;
> +
> +  Jnjvm* vm = JavaThread::get()->getJVM();
> +  UserClass* cl = UserCommonClass::resolvedImplClass(vm, Cl,
> false)->asClass();;
> +
> +  jint res = cl->getAccess();
> +
> +  if (isEnum(res) && cl->getSuper() != vm->upcalls->EnumClass) {
> +    // javac may put that flag to inner classes of enum classes.
> +    res &= ~ACC_ENUM;
> +  }
> +
> +  RETURN_FROM_JNI(res);
> +
> +  END_JNI_EXCEPTION
> +
> +  return 0;
>  }
>
>  JNIEXPORT jobjectArray JNICALL
> @@ -1495,7 +1515,23 @@ JVM_GetClassDeclaredConstructors(JNIEnv *env,
> jclass ofClass, jboolean publicOnl
>    valid. */
>  JNIEXPORT jint JNICALL
>  JVM_GetClassAccessFlags(JNIEnv *env, jclass cls) {
> -  NYI();
> +  JavaObject * Cl = 0;
> +  llvm_gcroot(Cl, 0);
> +  BEGIN_JNI_EXCEPTION
> +
> +  Cl = *(JavaObject**)cls;
> +
> +  Jnjvm* vm = JavaThread::get()->getJVM();
> +  UserCommonClass* cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
> +  assert(cl->isClass());
> +
> +  // TODO: Verify this is doing what this function is supposed to do
> +  // (In particular regarding the comment block above)
> +  RETURN_FROM_JNI(cl->asClass()->access);
> +
> +  END_JNI_EXCEPTION
> +
> +  return 0;
>  }
>
>  /* The following two reflection routines are still needed due to
> startup time issues */
> --
> 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/20111104/343d3140/attachment.html>