- Add a class index to the classes.

vm/raw_object.h

 // Copyright (c) 2012, the Dart 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 file.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 67 matching lines @@
 
 // Forward declarations.
 class Isolate;
 #define DEFINE_FORWARD_DECLARATION(clazz)                                      \
   class Raw##clazz;
 CLASS_LIST(DEFINE_FORWARD_DECLARATION)
 #undef DEFINE_FORWARD_DECLARATION
 
 
 enum ObjectKind {
+  kIllegalObjectKind = 0,
 #define DEFINE_OBJECT_KIND(clazz)                                              \
   k##clazz,
 CLASS_LIST(DEFINE_OBJECT_KIND)
 #undef DEFINE_OBJECT_KIND
   // The following entry does not describe a real object, but instead it
   // identifies free list elements in the heap.
   kFreeListElement,
-  kNumOfObjectKinds = kFreeListElement
+  // The following entries do not describe a real object, but instead are used
+  // to allocate class indexes for pre-allocated instance classes such as the
+  // Null, Void, Dynamic and other similar classes.
+  kNullClassIndex,
+  kDynamicClassIndex,
+  kVoidClassIndex,
+  kNumPredefinedKinds = 100
 };
 
 enum ObjectAlignment {
   // Alignment offsets are used to determine object age.
   kNewObjectAlignmentOffset = kWordSize,
   kOldObjectAlignmentOffset = 0,
   // Object sizes are aligned to kObjectAlignment.
   kObjectAlignment = 2 * kWordSize,
   kObjectAlignmentLog2 = kWordSizeLog2 + 1,
   kObjectAlignmentMask = kObjectAlignment - 1,
@@ skipping 47 matching lines @@
     kFreeBit = 0,
     kMarkBit = 1,
     kCanonicalBit = 2,
     kFromSnapshotBit = 3,
     kReservedBit10K = 4,
     kReservedBit100K = 5,
     kReservedBit1M = 6,
     kReservedBit10M = 7,
     kSizeTagBit = 8,
     kSizeTagSize = 8,
+    kClassTagBit = kSizeTagBit + kSizeTagSize,
+    kClassTagSize = 16
   };
 
   // Encodes the object size in the tag in units of object alignment.
   class SizeTag {
    public:
     static const intptr_t kMaxSizeTag =
         ((1 << RawObject::kSizeTagSize) - 1) << kObjectAlignmentLog2;
 
     static uword encode(intptr_t size) {
       return SizeBits::encode(SizeToTagValue(size));
@@ skipping 13 matching lines @@
 
     static intptr_t SizeToTagValue(intptr_t size) {
       ASSERT(Utils::IsAligned(size, kObjectAlignment));
       return  (size > kMaxSizeTag) ? 0 : (size >> kObjectAlignmentLog2);
     }
     static intptr_t TagValueToSize(intptr_t value) {
       return value << kObjectAlignmentLog2;
     }
   };
 
+  class ClassTag : public BitField<intptr_t, kClassTagBit, kClassTagSize> {};
+
   bool IsHeapObject() const {
     uword value = reinterpret_cast<uword>(this);
     return (value & kSmiTagMask) == kHeapObjectTag;
   }
 
   bool IsNewObject() const {
     uword addr = reinterpret_cast<uword>(this);
     return (addr & kNewObjectAlignmentOffset) == kNewObjectAlignmentOffset;
   }
   bool IsOldObject() const {
@@ skipping 128 matching lines @@
   RawArray* constants_;  // Canonicalized values of this class.
   RawArray* canonical_types_;  // Canonicalized types of this class.
   RawCode* allocation_stub_;  // Stub code for allocation of instances.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->allocation_stub_);
   }
 
   cpp_vtable handle_vtable_;
   intptr_t instance_size_;
   ObjectKind instance_kind_;
+  intptr_t index_;  // Index in the class table.
   intptr_t type_arguments_instance_field_offset_;  // May be kNoTypeArguments.
   intptr_t next_field_offset_;  // Offset of then next instance field.
   intptr_t num_native_fields_;  // Number of native fields in class.
   intptr_t token_index_;
   int8_t class_state_;  // Of type ClassState.
   bool is_const_;
   bool is_interface_;
 
   friend class Object;
   friend class RawInstance;
@@ skipping 833 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_