- Add a class index to the classes.

vm/stub_code_ia32.cc

 // Copyright (c) 2011, 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_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
@@ skipping 662 matching lines @@
     // EBX: new object end address.
     // EDX: Array length as Smi.
     {
       Label size_tag_overflow, done;
       __ leal(ECX, Address(EDX, TIMES_2, fixed_size));  // EDX is Smi.
       ASSERT(kSmiTagShift == 1);
       __ andl(ECX, Immediate(-kObjectAlignment));
       __ cmpl(ECX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shll(ECX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
-      __ movl(FieldAddress(EAX, Array::tags_offset()), ECX);
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
-      __ movl(FieldAddress(EAX, Array::tags_offset()), Immediate(0));
+      __ movl(ECX, Immediate(0));
       __ Bind(&done);
+
+      // Get the class index and insert it into the tags.
+      __ orl(ECX, Immediate(RawObject::ClassTag::encode(kArray)));
+      __ movl(FieldAddress(EAX, Array::tags_offset()), ECX);
     }
 
     // Initialize all array elements to raw_null.
     // EAX: new object start as a tagged pointer.
     // EBX: new object end address.
     // EDX: Array length as Smi.
     __ leal(ECX, FieldAddress(EAX, Array::data_offset()));
     // ECX: iterator which initially points to the start of the variable
     // data area to be initialized.
     Label done;
@@ skipping 294 matching lines @@
     // Calculate the size tag.
     // EAX: new object.
     // EDX: number of context variables.
     {
       Label size_tag_overflow, done;
       __ leal(EBX, Address(EDX, TIMES_4, fixed_size));
       __ andl(EBX, Immediate(-kObjectAlignment));
       __ cmpl(EBX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shll(EBX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
-      __ movl(FieldAddress(EAX, Context::tags_offset()), EBX);  // Tags.
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       // Set overflow size tag value.
-      __ movl(FieldAddress(EAX, Context::tags_offset()), Immediate(0));
+      __ movl(EBX, Immediate(0));
+
       __ Bind(&done);
+      // EAX: new object.
+      // EDX: number of context variables.
+      // EBX: size and bit tags.
+      __ orl(EBX,
+             Immediate(RawObject::ClassTag::encode(context_class.index())));
+      __ movl(FieldAddress(EAX, Context::tags_offset()), EBX);  // Tags.
     }
 
     // Setup up number of context variables field.
     // EAX: new object.
     // EDX: number of context variables as integer value (not object).
     __ movl(FieldAddress(EAX, Context::num_variables_offset()), EDX);
 
     // Setup isolate field.
     // Load Isolate pointer from Context structure into EBX.
     // EAX: new object.
@@ skipping 136 matching lines @@
       // EDI: new object type arguments.
     }
 
     // Initialize the class field in the object.
     // EAX: new object start.
     // EBX: next object start.
     // EDI: new object type arguments (if is_cls_parameterized).
     __ LoadObject(EDX, cls);  // Load class of object to be allocated.
     __ movl(Address(EAX, Instance::class_offset()), EDX);
     // Set the tags.
-    __ movl(Address(EAX, 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);
+    __ movl(Address(EAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the remaining words of the object.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
     // EAX: new object start.
     // EBX: next object start.
     // EDX: class of the object to be allocated.
     // First try inlining the initialization without a loop.
     if (instance_size < (kInlineInstanceSize * kWordSize) &&
@@ skipping 128 matching lines @@
     // Successfully allocated the object, now update top to point to
     // next object start and initialize the object.
     __ movl(Address::Absolute(heap->TopAddress()), EBX);
 
     // Initialize the class field in the object.
     // EAX: new closure object.
     // ECX: new context object (only if is_implicit_closure).
     __ LoadObject(EDX, cls);  // Load signature class of closure.
     __ movl(Address(EAX, Closure::class_offset()), EDX);
     // Set the tags.
-    __ movl(Address(EAX, 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);
+    __ movl(Address(EAX, Closure::tags_offset()), Immediate(tags));
 
     // Initialize the function field in the object.
     // EAX: new closure object.
     // ECX: new context object (only if is_implicit_closure).
     // EBX: next object start.
     __ LoadObject(EDX, func);  // Load function of closure to be allocated.
     __ movl(Address(EAX, Closure::function_offset()), EDX);
 
     // 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(EDX, empty_context);
       __ movl(Address(EAX, Closure::context_offset()), EDX);
     } else if (is_implicit_instance_closure) {
       // Initialize the new context capturing the receiver.
 
       // Set the class field to the Context class.
-      __ LoadObject(EBX, Class::ZoneHandle(Object::context_class()));
+      const Class& context_class = Class::ZoneHandle(Object::context_class());
+      __ LoadObject(EBX, context_class);
       __ movl(Address(ECX, Context::class_offset()), EBX);
       // Set the tags.
-      __ movl(Address(ECX, 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);
+      __ movl(Address(ECX, Context::tags_offset()), Immediate(tags));
 
       // Set number of variables field to 1 (for captured receiver).
       __ movl(Address(ECX, Context::num_variables_offset()), Immediate(1));
 
       // Set isolate field to isolate of current context.
       __ movl(EDX, FieldAddress(CTX, Context::isolate_offset()));
       __ movl(Address(ECX, Context::isolate_offset()), EDX);
 
       // Set the parent field to null.
       __ movl(Address(ECX, Context::parent_offset()), raw_null);
@@ skipping 440 matching lines @@
   __ j(EQUAL, &not_found, Assembler::kNearJump);
   __ movl(ECX, FieldAddress(ECX, Type::type_class_offset()));
   __ cmpl(EDX, ECX);
   __ j(NOT_EQUAL, &super_loop, Assembler::kNearJump);
   __ jmp(&found, Assembler::kNearJump);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32