From 532e9fe7d3d2e59bd4a9bb51c784feb931b5c6bd Mon Sep 17 00:00:00 2001 From: Kyle Galloway Date: Wed, 21 Feb 2007 18:09:24 +0000 Subject: [PATCH 1/1] jvmti.cc (_Jv_JVMTI_GetArgumentsSize): New function. 2007-02-21 Kyle Galloway * jvmti.cc (_Jv_JVMTI_GetArgumentsSize): New function. * testsuite/libjava.jvmti/interp/getargssize.java: New test. * testsuite/libjava.jvmti/interp/getargssize.h: Ditto. * testsuite/libjava.jvmti/interp/getargssize.jar: Ditto. * testsuite/libjava.jvmti/interp/getargssize.out: Ditto. * testsuite/libjava.jvmti/interp/natgetargssize.cc: Ditto. From-SVN: r122201 --- libjava/ChangeLog | 9 +++ libjava/jvmti.cc | 41 ++++++++++++- .../libjava.jvmti/interp/getargssize.h | 19 ++++++ .../libjava.jvmti/interp/getargssize.jar | Bin 0 -> 1111 bytes .../libjava.jvmti/interp/getargssize.java | 36 +++++++++++ .../libjava.jvmti/interp/getargssize.out | 5 ++ .../libjava.jvmti/interp/natgetargssize.cc | 58 ++++++++++++++++++ 7 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 libjava/testsuite/libjava.jvmti/interp/getargssize.h create mode 100644 libjava/testsuite/libjava.jvmti/interp/getargssize.jar create mode 100644 libjava/testsuite/libjava.jvmti/interp/getargssize.java create mode 100644 libjava/testsuite/libjava.jvmti/interp/getargssize.out create mode 100644 libjava/testsuite/libjava.jvmti/interp/natgetargssize.cc diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 34c18cffcfd..c3ff95a2c54 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2007-02-21 Kyle Galloway + + * jvmti.cc (_Jv_JVMTI_GetArgumentsSize): New function. + * testsuite/libjava.jvmti/interp/getargssize.java: New test. + * testsuite/libjava.jvmti/interp/getargssize.h: Ditto. + * testsuite/libjava.jvmti/interp/getargssize.jar: Ditto. + * testsuite/libjava.jvmti/interp/getargssize.out: Ditto. + * testsuite/libjava.jvmti/interp/natgetargssize.cc: Ditto. + 2007-02-21 Gary Benson * java/util/GregorianCalendar.java: Removed. diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index 51f9d1d02b5..faa7401c1ce 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -1085,6 +1085,45 @@ _Jv_JVMTI_GetMaxLocals (jvmtiEnv *env, jmethodID method, jint *max_locals) return JVMTI_ERROR_NONE; } +static jvmtiError JNICALL +_Jv_JVMTI_GetArgumentsSize (jvmtiEnv *env, jmethodID method, jint *size) +{ + REQUIRE_PHASE (env, JVMTI_PHASE_START | JVMTI_PHASE_LIVE); + NULL_CHECK (size); + + CHECK_FOR_NATIVE_METHOD (method); + + jvmtiError jerr; + char *sig; + jint num_slots = 0; + + jerr = env->GetMethodName (method, NULL, &sig, NULL); + if (jerr != JVMTI_ERROR_NONE) + return jerr; + + // If the method is non-static add a slot for the "this" pointer. + if ((method->accflags & java::lang::reflect::Modifier::STATIC) == 0) + num_slots++; + + for (int i = 0; sig[i] != ')'; i++) + { + if (sig[i] == 'Z' || sig[i] == 'B' || sig[i] == 'C' || sig[i] == 'S' + || sig[i] == 'I' || sig[i] == 'F') + num_slots++; + else if (sig[i] == 'J' || sig[i] == 'D') + num_slots+=2; + else if (sig[i] == 'L') + { + num_slots++; + while (sig[i] != ';') + i++; + } + } + + *size = num_slots; + return JVMTI_ERROR_NONE; +} + static jvmtiError JNICALL _Jv_JVMTI_GetMethodDeclaringClass (MAYBE_UNUSED jvmtiEnv *env, jmethodID method, @@ -2011,7 +2050,7 @@ struct _Jv_jvmtiEnv _Jv_JVMTI_Interface = _Jv_JVMTI_GetMethodModifiers, // GetMethodModifers RESERVED, // reserved67 _Jv_JVMTI_GetMaxLocals, // GetMaxLocals - UNIMPLEMENTED, // GetArgumentsSize + _Jv_JVMTI_GetArgumentsSize, // GetArgumentsSize _Jv_JVMTI_GetLineNumberTable, // GetLineNumberTable UNIMPLEMENTED, // GetMethodLocation _Jv_JVMTI_GetLocalVariableTable, // GetLocalVariableTable diff --git a/libjava/testsuite/libjava.jvmti/interp/getargssize.h b/libjava/testsuite/libjava.jvmti/interp/getargssize.h new file mode 100644 index 00000000000..e1e1767616f --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/interp/getargssize.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __getargssize__ +#define __getargssize__ + +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +JNIEXPORT jint JNICALL Java_getargssize_do_1getargssize_1tests (JNIEnv *env, jclass); + +#ifdef __cplusplus +} +#endif + +#endif /* __getargssize__ */ diff --git a/libjava/testsuite/libjava.jvmti/interp/getargssize.jar b/libjava/testsuite/libjava.jvmti/interp/getargssize.jar new file mode 100644 index 0000000000000000000000000000000000000000..4b92216fcd156c708a31398bcfc7c528d50b0aa3 GIT binary patch literal 1111 zcmWIWW@h1H0D-BYp=MwPl;C6#W$<+kan$wnbJGtE;bdTbm2t-vghMM>7+x^HU=9H4 z6#=T|0PC$()l@YA@{E931X-`Iqo1dnYjB93uNzilKKq_I?c=ShcahgySL@uF^P7VV zt{6Wk()04w@$|h|x@t?1MzhC@Y0svLEnikp$jE?dZD#zQkZdLfhRG}p41z#w(^E?l zi_(jWGpkbdl5-M^i?Q078<^{VIY6W?@A$2?B@M|7ept0VGMn1@-ik$-^W?OJY7=I@ zV868Xdf=t4OLotAkblYL?}8)z{}}40e7tj;sq~H6OI!W(pXU^x|M~g*^?ZiY5vB_a zd%o}3aQI%rgStm-$0U}0d(&TbcJtr3x25U*<*d$WOJDEYryV94^wev1;+xb5A9yzL z2=CJs;!-;{(Kz9+`sPv#fj#+&Op`;-bLT97TIOVJlQKhdyO4$8uDbPl+&WRx>+JMdD)g{1%XdZV-BVMGLAWTHDayjKE2|b`p#LCz1DVZRNR^!q8K#W zU2~mk>E#nijMtOz2HDKo94qGMHt8s@&aof2KYDC=bzSjKOp=^b-XfpJCr-`PYK`vF z6uoxkbiW)lTp5|fnQ`SY zUTAI;V0h~YVj|@@R!EKutzdwffh(^;%wPoSUeaiTYz9is!($w39)dXuWZY(;aaeK` Uidn2|Kt&A9KzJWWCozL~0J}7%hyVZp literal 0 HcmV?d00001 diff --git a/libjava/testsuite/libjava.jvmti/interp/getargssize.java b/libjava/testsuite/libjava.jvmti/interp/getargssize.java new file mode 100644 index 00000000000..f5a2f25ca71 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/interp/getargssize.java @@ -0,0 +1,36 @@ +public class getargssize +{ + static + { + System.loadLibrary("natgetargssize"); + } + + public int aMethod (float fone, int ione) + { + return 0; + } + + public long bMethod (long lone, double done, int ione) + { + return 0; + } + + public static boolean cMethod () + { + return false; + } + + public static Object dMethod (Object op) + { + return op; + } + + public static native int do_getargssize_tests (); + + public static void main (String[] args) + { + System.out.println ("JVMTI getargssize Interpreted Test"); + + do_getargssize_tests (); + } +} diff --git a/libjava/testsuite/libjava.jvmti/interp/getargssize.out b/libjava/testsuite/libjava.jvmti/interp/getargssize.out new file mode 100644 index 00000000000..cd9106623d7 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/interp/getargssize.out @@ -0,0 +1,5 @@ +JVMTI getargssize Interpreted Test +Method 0 requires 3 slots for its arguments +Method 1 requires 6 slots for its arguments +Method 2 requires 0 slots for its arguments +Method 3 requires 1 slots for its arguments diff --git a/libjava/testsuite/libjava.jvmti/interp/natgetargssize.cc b/libjava/testsuite/libjava.jvmti/interp/natgetargssize.cc new file mode 100644 index 00000000000..326b5a68c57 --- /dev/null +++ b/libjava/testsuite/libjava.jvmti/interp/natgetargssize.cc @@ -0,0 +1,58 @@ +#include + +#include +#include +#include + +#include "getargssize.h" + +JNIEXPORT jint JNICALL Java_getargssize_do_1getargssize_1tests +(JNIEnv *env, jclass klass) +{ + JavaVM *vm; + jint err = env->GetJavaVM (&vm); + if (err < 0) + { + fprintf (stderr, "error getting VM\n"); + exit (1); + } + + jvmtiEnv *jvmti = NULL; + vm->GetEnv ((void **) &jvmti, JVMTI_VERSION_1_0); + + if (jvmti == NULL) + { + fprintf (stderr, "error getting jvmti environment\n"); + exit (1); + } + + jint args_size; + + jvmtiError jerr; + + jmethodID meth_ids[4]; + + meth_ids[0] = env->GetMethodID (klass, "aMethod", "(FI)I"); + meth_ids[1] = env->GetMethodID (klass, "bMethod", "(JDI)J"); + meth_ids[2] = env->GetStaticMethodID (klass, "cMethod", "()Z"); + meth_ids[3] = env->GetStaticMethodID (klass, "dMethod", + "(Ljava/lang/Object;)Ljava/lang/Object;"); + for (int i = 0; i < 4; i++) + { + jerr = jvmti->GetArgumentsSize (meth_ids[i], &args_size); + if (jerr != JVMTI_ERROR_NONE) + { + char *error_name; + jvmti->GetErrorName (jerr, &error_name); + fprintf (stderr, "JVMTI Error: %s\n", error_name); + jvmti->Deallocate (reinterpret_cast (error_name)); + } + else + { + printf ("Method %d requires %d slots for its arguments\n", i, + args_size); + } + } + + return 0; +} -- 2.30.2