[RFA] Add ArrayValue to JDWP

[RFA] Add ArrayValue to JDWP

[Kyle Galloway]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

This patch, already applied to upstream classpath, adds another type of 
Value for JDWP.  Since regular Object values and Array values have 
different tags, this patch adds the 
classpath/gnu/classpath/jdwp/value/ArrayValue class to handle Array 
values for JDWP.  This also adds checks in natVMFrame.cc to use these 
new Values when getting and setting array objects.

ChangeLog
2007-04-09  Kyle Galloway  <kgallowa@redhat.com>

    * classpath/gnu/classpath/jdwp/value/ArrayValue.java: New file.
    * classpath/lib/gnu/classpath/jdwp/value/ArrayValue.class: New file.
    * gnu/classpath/jdwp/ArrayValue.h: New file.
    * gnu/classpath/jdwp/natVMFrame.cc (getValue): Add array case.
    (setValue): Ditto.

Questions/comments/concerns?

Thanks,
Kyle

[-- Attachment #2: arrayval.patch --]
[-- Type: text/x-patch, Size: 6252 bytes --]

Index: classpath/gnu/classpath/jdwp/value/ArrayValue.java
===================================================================
--- classpath/gnu/classpath/jdwp/value/ArrayValue.java	(revision 0)
+++ classpath/gnu/classpath/jdwp/value/ArrayValue.java	(revision 0)
@@ -0,0 +1,92 @@
+/* ArrayValue.java -- JDWP wrapper class for an Object value
+   Copyright (C) 2007 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.classpath.jdwp.value;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ObjectId;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Wrapper for an Array value.
+ * 
+ * @author Kyle Galloway <kgallowa@redhat.com>
+ */
+public class ArrayValue
+    extends Value
+{
+  // The Array wrapped by this class represented as a Object
+  Object _value;
+
+  /**
+   * Create a new ArrayValue from an Object
+   * 
+   * @param value the Object to wrap
+   */
+  public ArrayValue(Object value)
+  {
+    super(JdwpConstants.Tag.ARRAY);
+    _value = value;
+  }
+  
+  /**
+   * Return an object representing this type
+   * 
+   * @return an Object represntation of this value
+   */
+  @Override
+  protected Object getObject()
+  {
+    return _value;
+  }
+
+  /**
+   * Write the wrapped object to the given DataOutputStream.
+   * 
+   * @param os the output stream to write to
+   */
+  @Override
+  protected void write(DataOutputStream os)
+    throws IOException
+  {
+    ObjectId oid = VMIdManager.getDefault().getObjectId(_value);
+    oid.write(os);
+  }
+}
Index: classpath/lib/gnu/classpath/jdwp/value/ArrayValue.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: classpath/lib/gnu/classpath/jdwp/value/ArrayValue.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: gnu/classpath/jdwp/natVMFrame.cc
===================================================================
--- gnu/classpath/jdwp/natVMFrame.cc	(revision 123678)
+++ gnu/classpath/jdwp/natVMFrame.cc	(working copy)
@@ -24,6 +24,7 @@
 #include <gnu/classpath/jdwp/exception/JdwpInternalErrorException.h>
 #include <gnu/classpath/jdwp/exception/TypeMismatchException.h>
 #include <gnu/classpath/jdwp/util/NullObject.h>
+#include <gnu/classpath/jdwp/value/ArrayValue.h>
 #include <gnu/classpath/jdwp/value/ByteValue.h>
 #include <gnu/classpath/jdwp/value/BooleanValue.h>
 #include <gnu/classpath/jdwp/value/CharValue.h>
@@ -240,6 +241,14 @@
     case 'V':
       value = new VoidValue ();
       break;
+    case '[':
+      {
+        Object *obj = getObjectJVMTI (env, thread, slot, depth, sig);
+        if (obj == NULL)
+          obj = new util::NullObject ();
+        value = new ArrayValue (obj);
+        break;
+      }
     default:
       Object *obj = getObjectJVMTI (env, thread, slot, depth, sig);
       if (obj == NULL)
@@ -313,6 +322,12 @@
       }
     case 'V':
       break;
+    case '[':
+      {
+        ArrayValue *val = reinterpret_cast<ArrayValue *> (value);
+        setObjectJVMTI (env, thread, slot, depth, sig, val->getObject ());
+        break;
+      }
     default:
       {
         ObjectValue *val = reinterpret_cast<ObjectValue *> (value);
Index: gnu/classpath/jdwp/value/ArrayValue.h
===================================================================
--- gnu/classpath/jdwp/value/ArrayValue.h	(revision 0)
+++ gnu/classpath/jdwp/value/ArrayValue.h	(revision 0)
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_classpath_jdwp_value_ArrayValue__
+#define __gnu_classpath_jdwp_value_ArrayValue__
+
+#pragma interface
+
+#include <gnu/classpath/jdwp/value/Value.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace classpath
+    {
+      namespace jdwp
+      {
+        namespace value
+        {
+            class ArrayValue;
+        }
+      }
+    }
+  }
+}
+
+class gnu::classpath::jdwp::value::ArrayValue : public ::gnu::classpath::jdwp::value::Value
+{
+
+public:
+  ArrayValue(::java::lang::Object *);
+public: // actually protected
+  virtual ::java::lang::Object * getObject();
+  virtual void write(::java::io::DataOutputStream *);
+public: // actually package-private
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::classpath::jdwp::value::Value)))) _value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_classpath_jdwp_value_ArrayValue__

Re: [RFA] Add ArrayValue to JDWP

[Tom Tromey]

>>>>> "Kyle" == Kyle Galloway <kgallowa@redhat.com> writes:

Kyle> This patch, already applied to upstream classpath, adds another type
Kyle> of Value for JDWP.

Ok.  Thanks.

Tom

Re: [RFA] Add ArrayValue to JDWP

[Kyle Galloway]

Tom Tromey wrote:
>>>>>> "Kyle" == Kyle Galloway <kgallowa@redhat.com> writes:
>>>>>>             
>
> Kyle> This patch, already applied to upstream classpath, adds another type
> Kyle> of Value for JDWP.
>
> Ok.  Thanks.
>   
Committed.

- Kyle