VMVirtualMachine.java (executeMethod): Update from reference implementation.

        * gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod):
        Update from reference implementation.
        * gnu/classpath/jdwp/natVMVirtualMachine.cc (executeMethod):
        Update parameter list to match new VMVirtualMachine interface.
        * classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class:
        Regenerate.
        * classpath/lib/gnu/classpath/jdwp/processor/
        ObjectReferenceCommandSet.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/util/MethodResult.class: Regenerate.

From-SVN: r125896

2 files changed, 12 insertions, 10 deletions

diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
index 91e9965..4431e0f 100644
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
+++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
@@ -46,8 +46,8 @@ import gnu.classpath.jdwp.exception.InvalidMethodException;
 import gnu.classpath.jdwp.exception.JdwpException;
 import gnu.classpath.jdwp.util.MethodResult;
 import gnu.classpath.jdwp.util.MonitorInfo;
+import gnu.classpath.jdwp.value.Value;
 
-import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -296,21 +296,23 @@ public class VMVirtualMachine
     throws JdwpException;
 
   /**
-   * Executes a method in the virtual machine
+   * Executes a method in the virtual machine. The thread must already
+   * be suspended by a previous event. When the method invocation is
+   * complete, the thread (or all threads if INVOKE_SINGLE_THREADED is
+   * not set in options) must be suspended before this method returns.
    *
    * @param  obj         instance in which to invoke method (null for static)
    * @param  thread      the thread in which to invoke the method
    * @param  clazz       the class in which the method is defined
    * @param  method      the method to invoke
    * @param  values      arguments to pass to method
-   * @param  nonVirtual  "otherwise, normal virtual invoke
-   *                     (instance methods only) "
+   * @param  options     invocation options
    * @return a result object containing the results of the invocation
    */
   public static native MethodResult executeMethod (Object obj, Thread thread,
-					    Class clazz, Method method,
-					    Object[] values,
-					    boolean nonVirtual)
+					    Class clazz, VMMethod method,
+					    Value[] values,
+					    int options)
     throws JdwpException;
 
   /**
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index db33781..ba12353 100644
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -695,9 +695,9 @@ getLoadRequests (MAYBE_UNUSED ClassLoader *cl)
 MethodResult *
 gnu::classpath::jdwp::VMVirtualMachine::
 executeMethod (MAYBE_UNUSED jobject obj, MAYBE_UNUSED Thread *thread,
-	       MAYBE_UNUSED jclass clazz, MAYBE_UNUSED reflect::Method *method,
-	       MAYBE_UNUSED jobjectArray values,
-	       MAYBE_UNUSED jboolean nonVirtual)
+	       MAYBE_UNUSED jclass clazz, MAYBE_UNUSED VMMethod *method,
+	       MAYBE_UNUSED JArray<value::Value *> *values,
+	       MAYBE_UNUSED jint options)
 {
   return NULL;
 }