Support for accessing arrays in the debugger

src/vm/session.cc

 // Copyright (c) 2014, the Dartino project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE.md file.
 
 #ifdef DARTINO_ENABLE_DEBUGGING
 
 #include "src/vm/session.h"
 
 #include "src/shared/bytecodes.h"
 #include "src/shared/connection.h"
@@ skipping 1019 matching lines @@
     buffer.WriteInt64(ClassMessage(Class::cast(value)));
     connection_->Send(Connection::kClass, buffer);
   } else if (value->IsTwoByteString()) {
     // TODO(ager): We should send the character data as 16-bit values
     // instead of 32-bit values.
     TwoByteString* str = TwoByteString::cast(value);
     for (int i = 0; i < str->length(); i++) {
       buffer.WriteInt(str->get_code_unit(i));
     }
     connection_->Send(Connection::kString, buffer);
+  } else if (value->IsArray()) {
+    Array* array = Array::cast(value);
+    buffer.WriteInt(array->length());
+    connection_->Send(Connection::kArray, buffer);
   } else {
+    ASSERT(value->IsInstance());
     buffer.WriteInt64(ClassMessage(HeapObject::cast(value)->get_class()));
     connection_->Send(Connection::kInstance, buffer);
   }
 }
 
 void Session::SendInstanceStructure(Instance* instance) {
   WriteBuffer buffer;
   Class* klass = instance->get_class();
   buffer.WriteInt64(ClassMessage(klass));
   int fields = klass->NumberOfInstanceFields();
   buffer.WriteInt(fields);
   connection_->Send(Connection::kInstanceStructure, buffer);
   for (int i = 0; i < fields; i++) {
     SendDartValue(instance->GetInstanceField(i));
   }
 }
 
+void Session::SendArrayStructure(Array* array) {
+  int length = array->length();
+  WriteBuffer buffer;
+  buffer.WriteInt(length);
+  connection_->Send(Connection::kArrayStructure, buffer);
+  for (int i = 0; i < length; i++) {
+    SendDartValue(array->get(i));
+  }
+}
+
+void Session::SendStructure(Object* object) {
+  if (object->IsArray()) {
+    SendArrayStructure(Array::cast(object));
+  } else if (object->IsInstance()) {
+    SendInstanceStructure(Instance::cast(object));
+  } else {
+    SendDartValue(object);
+  }
+}
+
 void Session::SendProgramInfo(ClassOffsetsType* class_offsets,
     FunctionOffsetsType* function_offsets) {
   ASSERT(maps_[class_map_id_] != NULL);
   ASSERT(maps_[method_map_id_] != NULL);
 
   WriteBuffer buffer;
 
   // Write the hashtag for the program.
   buffer.WriteInt(program()->snapshot_hash());
 
@@ skipping 269 matching lines @@
     case Connection::kProcessFiberBacktraceRequest: {
       int64 fiber_id = connection()->ReadInt64();
       Stack* stack = Stack::cast(session()->MapLookupById(
           session()->fibers_map_id_, fiber_id));
       session()->SendStackTrace(stack);
       break;
     }
 
     case Connection::kProcessUncaughtExceptionRequest: {
       Object* exception = process()->exception();
-      if (exception->IsInstance()) {
-        session()->SendInstanceStructure(Instance::cast(exception));
-      } else {
-        session()->SendDartValue(exception);
-      }
+      session()->SendStructure(exception);
       break;
     }
 
     case Connection::kProcessInstance:
     case Connection::kProcessInstanceStructure: {
       int frame_index = connection()->ReadInt();
       int slot = connection()->ReadInt();
       int fieldAccessCount = connection()->ReadInt();
       Stack* stack = process()->stack();
       Frame frame(stack);
       for (int i = 0; i <= frame_index; i++) frame.MovePrevious();
       word index = frame.FirstLocalIndex() - slot;
-      if (index < frame.LastLocalIndex()) FATAL("Illegal slot offset");
+      if (index < frame.LastLocalIndex()) {
+        session()->SendError(Connection::kInvalidInstanceAccess);
+        break;
+      }
       Object* object = stack->get(index);
       for (int i = 0; i < fieldAccessCount; i++) {
-        if (!object->IsInstance()) {
+        if (object->IsArray()) {
+          Array* array = Array::cast(object);
+          int index = connection()->ReadInt();
+          if (index < 0 || index >= array->length()) {
+            session()->SendError(Connection::kInvalidInstanceAccess);
+            break;
+          }
+          object = array->get(index);
+        } else if (object->IsInstance()) {
+          Instance* instance = Instance::cast(object);
+          Class* klass = instance->get_class();
+          int fieldAccess = connection()->ReadInt();
+          if (fieldAccess < 0 ||
+             fieldAccess >= klass->NumberOfInstanceFields()) {
+            session()->SendError(Connection::kInvalidInstanceAccess);
+            break;
+          }
+          object = instance->GetInstanceField(fieldAccess);
+        } else {
           session()->SendError(Connection::kInvalidInstanceAccess);
+          break;
         }
-        Instance* instance = Instance::cast(object);
-        Class* klass = instance->get_class();
-        int fieldAccess = connection()->ReadInt();
-        if (fieldAccess < 0 || fieldAccess >= klass->NumberOfInstanceFields()) {
-          session()->SendError(Connection::kInvalidInstanceAccess);
-        }
-        object = instance->GetInstanceField(fieldAccess);
       }
-      if (opcode == Connection::kProcessInstanceStructure &&
-          object->IsInstance()) {
-        session()->SendInstanceStructure(Instance::cast(object));
+      if (opcode == Connection::kProcessInstanceStructure) {
+        session()->SendStructure(object);
       } else {
         session()->SendDartValue(object);
       }
       break;
     }
 
     case Connection::kProcessRestartFrame: {
       int frame_index = connection()->ReadInt();
       RestartFrame(frame_index);
       process()->set_exception(program()->null_object());
@@ skipping 861 matching lines @@
   if (program()->was_loaded_from_snapshot()) {
     return program()->OffsetOf(HeapObject::cast(klass));
   } else {
     return MapLookupByObject(class_map_id_, klass);
   }
 }
 
 }  // namespace dartino
 
 #endif  // DARTINO_ENABLE_DEBUGGING