- Add a class index to the classes.

vm/stub_code_x64.cc

 // 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.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
@@ skipping 657 matching lines @@
     // R12: new object end address.
     // R10: Array length as Smi.
     {
       Label size_tag_overflow, done;
       __ leaq(RBX, Address(R10, TIMES_4, fixed_size));  // R10 is Smi.
       ASSERT(kSmiTagShift == 1);
       __ andq(RBX, Immediate(-kObjectAlignment));
       __ cmpq(RBX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shlq(RBX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
-      __ movq(FieldAddress(RAX, Array::tags_offset()), RBX);
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
-      __ movq(FieldAddress(RAX, Array::tags_offset()), Immediate(0));
+      __ movq(RBX, Immediate(0));
       __ Bind(&done);
+
+      // Get the class index and insert it into the tags.
+      __ orq(RBX, Immediate(RawObject::ClassTag::encode(kArray)));
+      __ movq(FieldAddress(RAX, Array::tags_offset()), RBX);
     }
 
     // Initialize all array elements to raw_null.
     // RAX: new object start as a tagged pointer.
     // R12: new object end address.
     __ leaq(RBX, FieldAddress(RAX, Array::data_offset()));
     // RBX: iterator which initially points to the start of the variable
     // data area to be initialized.
     Label done;
     Label init_loop;
@@ skipping 295 matching lines @@
     // Calculate the size tag.
     // RAX: new object.
     // R10: number of context variables.
     {
       Label size_tag_overflow, done;
       __ leaq(R13, Address(R10, TIMES_8, fixed_size));
       __ andq(R13, Immediate(-kObjectAlignment));
       __ cmpq(R13, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shlq(R13, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
-      __ movq(FieldAddress(RAX, Context::tags_offset()), R13);  // Tags.
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       // Set overflow size tag value.
-      __ movq(FieldAddress(RAX, Context::tags_offset()), Immediate(0));
+      __ movq(R13, Immediate(0));
+
       __ Bind(&done);
+      // RAX: new object.
+      // R10: number of context variables.
+      // R13: size and bit tags.
+      __ orq(R13,
+             Immediate(RawObject::ClassTag::encode(context_class.index())));
+      __ movq(FieldAddress(RAX, Context::tags_offset()), R13);  // Tags.
     }
 
     // Setup up number of context variables field.
     // RAX: new object.
     // R10: number of context variables as integer value (not object).
     __ movq(FieldAddress(RAX, Context::num_variables_offset()), R10);
 
     // Setup isolate field.
     // Load Isolate pointer from Context structure into R13.
     // RAX: new object.
@@ skipping 138 matching lines @@
       // RDI: new object type arguments.
     }
 
     // Initialize the class field in the object.
     // RAX: new object start.
     // RBX: next object start.
     // RDI: new object type arguments (if is_cls_parameterized).
     __ LoadObject(RDX, cls);  // Load class of object to be allocated.
     __ movq(Address(RAX, Instance::class_offset()), RDX);
     // Set the tags.
-    __ movq(Address(RAX, Instance::tags_offset()),
-            Immediate(RawObject::SizeTag::encode(instance_size)));
+    intptr_t tags = 0;
+    tags = RawObject::SizeTag::update(instance_size, tags);
+    ASSERT(cls.index() != kIllegalObjectKind);
+    tags = RawObject::ClassTag::update(cls.index(), tags);
+    __ movq(Address(RAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the remaining words of the object.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
     // RAX: new object start.
     // RBX: next object start.
     // RDX: class of the object to be allocated.
     // First try inlining the initialization without a loop.
     if (instance_size < (kInlineInstanceSize * kWordSize) &&
@@ skipping 130 matching lines @@
     // next object start and initialize the object.
     __ movq(RDI, Immediate(heap->TopAddress()));
     __ movq(Address(RDI, 0), R13);
 
     // Initialize the class field in the object.
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     __ LoadObject(R10, cls);  // Load signature class of closure.
     __ movq(Address(RAX, Closure::class_offset()), R10);
     // Set the tags.
-    __ movq(Address(RAX, Closure::tags_offset()),
-            Immediate(RawObject::SizeTag::encode(closure_size)));
+    intptr_t tags = 0;
+    tags = RawObject::SizeTag::update(closure_size, tags);
+    tags = RawObject::ClassTag::update(cls.index(), tags);
+    __ movq(Address(RAX, Closure::tags_offset()), Immediate(tags));
 
     // Initialize the function field in the object.
     // RAX: new closure object.
     // RBX: new context object (only if is_implicit_closure).
     // R13: next object start.
     __ LoadObject(R10, func);  // Load function of closure to be allocated.
     __ movq(Address(RAX, Closure::function_offset()), R10);
 
     // Setup the context for this closure.
     if (is_implicit_static_closure) {
       ObjectStore* object_store = Isolate::Current()->object_store();
       ASSERT(object_store != NULL);
       const Context& empty_context =
           Context::ZoneHandle(object_store->empty_context());
       __ LoadObject(R10, empty_context);
       __ movq(Address(RAX, Closure::context_offset()), R10);
     } else if (is_implicit_instance_closure) {
       // Initialize the new context capturing the receiver.
 
       // Set the class field to the Context class.
-      __ LoadObject(R13, Class::ZoneHandle(Object::context_class()));
+      const Class& context_class = Class::ZoneHandle(Object::context_class());
+      __ LoadObject(R13, context_class);
       __ movq(Address(RBX, Context::class_offset()), R13);
       // Set the tags.
-      __ movq(Address(RBX, Context::tags_offset()),
-              Immediate(RawObject::SizeTag::encode(context_size)));
+      intptr_t tags = 0;
+      tags = RawObject::SizeTag::update(context_size, tags);
+      tags = RawObject::ClassTag::update(context_class.index(), tags);
+      __ movq(Address(RBX, Context::tags_offset()), Immediate(tags));
 
       // Set number of variables field to 1 (for captured receiver).
       __ movq(Address(RBX, Context::num_variables_offset()), Immediate(1));
 
       // Set isolate field to isolate of current context.
       __ movq(R10, FieldAddress(CTX, Context::isolate_offset()));
       __ movq(Address(RBX, Context::isolate_offset()), R10);
 
       // Set the parent field to null.
       __ movq(Address(RBX, Context::parent_offset()), raw_null);
@@ skipping 426 matching lines @@
   __ j(EQUAL, &not_found, Assembler::kNearJump);
   __ movq(R10, FieldAddress(R10, Type::type_class_offset()));
   __ cmpq(RCX, R10);
   __ j(NOT_EQUAL, &super_loop, Assembler::kNearJump);
   __ jmp(&found, Assembler::kNearJump);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64