diff options
author | Kyle Galloway <kgallowa@redhat.com> | 2007-03-06 21:09:22 +0000 |
---|---|---|
committer | Kyle Galloway <kgallowa@gcc.gnu.org> | 2007-03-06 21:09:22 +0000 |
commit | 009403e6f03f53353ded4c57c40e72bf74d5f0e8 (patch) | |
tree | 25678aef2a45acd45c767382e46815681d2d1b06 /libjava/gnu | |
parent | 205dcd71cdb44b74068fb4a655faf2fcdba1f894 (diff) | |
download | gcc-009403e6f03f53353ded4c57c40e72bf74d5f0e8.zip gcc-009403e6f03f53353ded4c57c40e72bf74d5f0e8.tar.gz gcc-009403e6f03f53353ded4c57c40e72bf74d5f0e8.tar.bz2 |
AbsentInformationException.java: New file.
2007-03-06 Kyle Galloway <kgallowa@redhat.com>
* classpath/gnu/classpath/jdwp/exception/AbsentInformationException.java: New file.
* classpath/lib/gnu/classpath/jdwp/exception/AbsentInformationException.class: Ditto.
* gnu/classpath/jdwp/exception/AbsentInformationException.h: Ditto.
* gnu/classpath/jdwp/natVMMethod.cc: Add CHECK_INTERP_CLASS macro.
(VMMethod::getLineTable): Use new macro.
(VMMethod::getVariableTable): Implement.
* sources.am: Regenerated.
* Makefile.in: Ditto.
From-SVN: r122639
Diffstat (limited to 'libjava/gnu')
-rw-r--r-- | libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h | 35 | ||||
-rw-r--r-- | libjava/gnu/classpath/jdwp/natVMMethod.cc | 97 |
2 files changed, 125 insertions, 7 deletions
diff --git a/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h b/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h new file mode 100644 index 0000000..bb4c699 --- /dev/null +++ b/libjava/gnu/classpath/jdwp/exception/AbsentInformationException.h @@ -0,0 +1,35 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_classpath_jdwp_exception_AbsentInformationException__ +#define __gnu_classpath_jdwp_exception_AbsentInformationException__ + +#pragma interface + +#include <gnu/classpath/jdwp/exception/JdwpException.h> +extern "Java" +{ + namespace gnu + { + namespace classpath + { + namespace jdwp + { + namespace exception + { + class AbsentInformationException; + } + } + } + } +} + +class gnu::classpath::jdwp::exception::AbsentInformationException : public ::gnu::classpath::jdwp::exception::JdwpException +{ + +public: + AbsentInformationException(::java::lang::String *); + static ::java::lang::Class class$; +}; + +#endif // __gnu_classpath_jdwp_exception_AbsentInformationException__ diff --git a/libjava/gnu/classpath/jdwp/natVMMethod.cc b/libjava/gnu/classpath/jdwp/natVMMethod.cc index 07d5622..76fd0a6 100644 --- a/libjava/gnu/classpath/jdwp/natVMMethod.cc +++ b/libjava/gnu/classpath/jdwp/natVMMethod.cc @@ -15,10 +15,25 @@ details. */ #include "jvmti-int.h" #include <gnu/classpath/jdwp/VMMethod.h> +#include <gnu/classpath/jdwp/exception/AbsentInformationException.h> +#include <gnu/classpath/jdwp/exception/InvalidMethodException.h> #include <gnu/classpath/jdwp/exception/JdwpInternalErrorException.h> #include <gnu/classpath/jdwp/util/LineTable.h> #include <gnu/classpath/jdwp/util/VariableTable.h> +using namespace java::lang; + +#define CHECK_INTERP_CLASS() \ +do \ + { \ + if (!_Jv_IsInterpretedClass (getDeclaringClass ())) \ + { \ + ::java::lang::String *msg = JvNewStringLatin1 ("native class"); \ + throw new exception::JdwpInternalErrorException (msg); \ + } \ + } \ +while (0) + jstring gnu::classpath::jdwp::VMMethod::getName () { @@ -56,12 +71,7 @@ gnu::classpath::jdwp::VMMethod::getModifiers () gnu::classpath::jdwp::util::LineTable * gnu::classpath::jdwp::VMMethod::getLineTable () { - if (!_Jv_IsInterpretedClass (getDeclaringClass ())) - { - // this should not happen - ::java::lang::String *msg = JvNewStringLatin1 ("native class"); - throw new exception::JdwpInternalErrorException (msg); - } + CHECK_INTERP_CLASS (); jmethodID desired_method = reinterpret_cast<jmethodID> (_methodId); @@ -97,5 +107,78 @@ gnu::classpath::jdwp::VMMethod::getLineTable () gnu::classpath::jdwp::util::VariableTable* gnu::classpath::jdwp::VMMethod::getVariableTable () { - return NULL; + using namespace gnu::classpath::jdwp::util; + + jvmtiEnv *env = _Jv_GetJDWP_JVMTIEnv (); + + CHECK_INTERP_CLASS (); + + jmethodID meth = reinterpret_cast<jmethodID> (_methodId); + jvmtiLocalVariableEntry *var_table; + jint num_slots, args_len; + + jvmtiError jerr = env->GetLocalVariableTable (meth, &num_slots, &var_table); + + if (jerr != JVMTI_ERROR_NONE) + goto error; + + jerr = env->GetArgumentsSize (meth, &args_len); + + if (jerr != JVMTI_ERROR_NONE) + { + error: + using namespace gnu::classpath::jdwp::exception; + char *error; + env->GetErrorName (jerr, &error); + String *msg = JvNewStringUTF (error); + env->Deallocate (reinterpret_cast<unsigned char *> (error)); + + if (jerr == JVMTI_ERROR_NATIVE_METHOD) + throw new AbsentInformationException (msg); + else if (jerr == JVMTI_ERROR_INVALID_METHODID) + throw new InvalidMethodException (_methodId); + else + throw new JdwpInternalErrorException (msg); + } + + jlongArray start_pcs = JvNewLongArray (num_slots); + jlong *start_pcs_ptr = elements (start_pcs); + jintArray lengths = JvNewIntArray (num_slots); + jint *lengths_ptr = elements (lengths); + jintArray slots = JvNewIntArray (num_slots); + jint *slots_ptr = elements (slots); + JArray<String *> *names = reinterpret_cast<JArray<String *> *> + (JvNewObjectArray (num_slots, + &String::class$, NULL)); + jstring *names_ptr = elements (names); + JArray<String *> *signatures = reinterpret_cast<JArray<String *> *> + (JvNewObjectArray (num_slots, + &String::class$, NULL)); + jstring *signatures_ptr = elements (signatures); + + // Get the information out of the JVMTI strucutre and Deallocate the strings. + for (int i = 0; i < num_slots; i++) + { + start_pcs_ptr[i] = var_table[i].start_location; + lengths_ptr[i] = var_table[i].length; + slots_ptr[i] = var_table[i].slot; + names_ptr[i] = JvNewStringUTF (var_table[i].name); + env->Deallocate (reinterpret_cast<unsigned char *> + (var_table[i].name)); + signatures_ptr[i] = JvNewStringUTF (var_table[i].signature); + env->Deallocate (reinterpret_cast<unsigned char *> + (var_table[i].signature)); + env->Deallocate (reinterpret_cast<unsigned char *> + (var_table[i].generic_signature)); + } + + // Now Deallocate the table since it's strings have already been freed. + env->Deallocate (reinterpret_cast<unsigned char *> (var_table)); + + // Create the new JDWP VariableTable to return with the now filled arrays. + VariableTable* jdwp_vtable = new VariableTable (args_len, num_slots, + start_pcs, names, signatures, + lengths, slots); + + return jdwp_vtable; } |