diff options
| -rw-r--r-- | libjava/ChangeLog | 14 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class | bin | 4063 -> 4080 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class | bin | 5735 -> 5526 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class | bin | 6671 -> 6519 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class | bin | 1147 -> 785 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class | bin | 1009 -> 1081 bytes | |||
| -rw-r--r-- | libjava/gnu/classpath/jdwp/VMVirtualMachine.java | 16 | ||||
| -rw-r--r-- | libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc | 6 |
8 files changed, 26 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a73a9b..87c2fc5 100644 --- 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 Binary files differindex f62976a..c3bedb7 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class Binary files differindex 962c347..3f713ad 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class Binary files differindex 8004557..093ff57 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.class diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class Binary files differindex 1e077c6..6ceb5fd 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/util/MethodResult.class diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class b/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class Binary files differindex 09f765c..6a34d87 100644 --- a/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class +++ b/libjava/classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class 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; } |