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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1a73a9b32c4cddafef843d5e49e3e27d8172e2af..87c2fc5b2e8697f1bbaf75ba7305a01d739e43f1 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-20  Keith Seitz  <keiths@redhat.com>
+
+       * 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.
+
 2007-06-18  Keith Seitz  <keiths@redhat.com>
 
        * gnu/gcj/jvmti/Breakpoint.java: Make abstract.

diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class
index f62976a99f52472e00030c64e3ad368ea7401af8..c3bedb71e3498e4df9f715c3c12bdbc03a3e2b9b 100644 (file)
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class and b/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class differ

diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class
index 962c347734be20ac18de3652318638fb47414a21..3f713adf7ce2359ab0d62382dbeab9b6789ac111 100644 (file)
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class and b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class differ

diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class
index 8004557e409925938c09e4abf9785b9829f403cc..093ff57353e201b6a1b990c18c7ac2e18bda0ca2 100644 (file)
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class and b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class differ

diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class
index 1e077c6a48cbe4223de597b92394e12c3afc506b..6ceb5fd9a1f23e187614f982501a3b587e52c64b 100644 (file)
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class and b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class differ

diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class b/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class
index 09f765c4338420ea2d490286fbc27cef8859d38e..6a34d87b0c2d8eba37331cf2d9aadadc42f6a052 100644 (file)
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class and b/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class differ

diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
index 91e9965d0e24bcb5045390b56c196fead1849593..4431e0f6a4765895efe09edd5eebb172db352172 100644 (file)
--- 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 db33781378e54ed2429239788aa8f67191b24839..ba123539e17d8dd266d7189681d52703fcbc79bf 100644 (file)
--- 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;
 }