Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

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/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
@@ skipping 691 matching lines @@
       __ cmpl(ECX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shll(ECX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       __ movl(ECX, Immediate(0));
       __ Bind(&done);
 
       // Get the class index and insert it into the tags.
-      __ orl(ECX, Immediate(RawObject::ClassIdTag::encode(kArray)));
+      __ orl(ECX, Immediate(RawObject::ClassIdTag::encode(kArrayCid)));
       __ 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.
@@ skipping 519 matching lines @@
       // EDI: new object type arguments.
     }
 
     // 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.
     // Set the tags.
     uword tags = 0;
     tags = RawObject::SizeTag::update(instance_size, tags);
-    ASSERT(cls.id() != kIllegalObjectKind);
+    ASSERT(cls.id() != kIllegalCid);
     tags = RawObject::ClassIdTag::update(cls.id(), 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.
@@ skipping 372 matching lines @@
   // EBX: points directly to the first ic data array element.
   Label loop, found;
   if (num_args == 1) {
     __ call(&get_class_id_as_smi);
     // EAX: receiver's class id Smi.
     __ Bind(&loop);
     __ movl(EDI, Address(EBX, 0));  // Get class id (Smi) to check.
     __ cmpl(EAX, EDI);  // Class id match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ addl(EBX, Immediate(kWordSize * 2));  // Next element (class + target).
-    __ cmpl(EDI, Immediate(Smi::RawValue(kIllegalObjectKind)));  // Done?
+    __ cmpl(EDI, Immediate(Smi::RawValue(kIllegalCid)));  // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   } else if (num_args == 2) {
     // EDI: class to check.
     Label no_match;
     __ Bind(&loop);
     // Get class id from IC data to check.
     // Get receiver using argument descriptor in EDX.
     __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
     __ movl(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX (arg. count) is Smi.
     __ call(&get_class_id_as_smi);
     __ movl(EDI, Address(EBX, 0));
     __ cmpl(EAX, EDI);  // Class id match?
     __ j(NOT_EQUAL, &no_match, Assembler::kNearJump);
     // Check second class/argument.
     // Get class id from IC data to check.
     // Get next argument.
     __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
     __ movl(EAX, Address(ESP, EAX, TIMES_2, -kWordSize));
     // EAX (argument count) is Smi.
     __ call(&get_class_id_as_smi);
     __ movl(EDI, Address(EBX, kWordSize));
     __ cmpl(EAX, EDI);  // Class id match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ Bind(&no_match);
     // Each test entry has (1 + num_args) array elements.
     __ addl(EBX, Immediate(kWordSize * (1 + num_args)));  // Next element.
-    __ cmpl(EDI, Immediate(Smi::RawValue(kIllegalObjectKind)));  // Done?
+    __ cmpl(EDI, Immediate(Smi::RawValue(kIllegalCid)));  // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   }
 
   __ Bind(&ic_miss);
   // Compute address of arguments (first read number of arguments from argument
   // descriptor array and then compute address on the stack).
   __ movl(EAX, FieldAddress(EDX, Array::data_offset()));
   __ leal(EAX, Address(ESP, EAX, TIMES_2, 0));  // EAX is Smi.
   // Create a stub frame as we are pushing some objects on the stack before
   // calling into the runtime.
@@ skipping 36 matching lines @@
   __ movl(EAX, FieldAddress(EAX, Function::code_offset()));
   __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(EAX);
 
   __ Bind(&get_class_id_as_smi);
   Label not_smi;
   // Test if Smi -> load Smi class for comparison.
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &not_smi, Assembler::kNearJump);
-  __ movl(EAX, Immediate(Smi::RawValue(kSmi)));
+  __ movl(EAX, Immediate(Smi::RawValue(kSmiCid)));
   __ ret();
 
   __ Bind(&not_smi);
   __ LoadClassId(EAX, EAX);
   __ SmiTag(EAX);
   __ ret();
 }
 
 
 // Use inline cache data array to invoke the target or continue in inline
@@ skipping 234 matching lines @@
   __ movl(EAX, Address(ESP, 4 * kWordSize));  // Load error object.
   __ movl(EBP, Address(ESP, 3 * kWordSize));  // Load target frame_pointer.
   __ movl(EBX, Address(ESP, 1 * kWordSize));  // Load target PC into EBX.
   __ movl(ESP, Address(ESP, 2 * kWordSize));  // Load target stack_pointer.
   __ jmp(EBX);  // Jump to the exception handler code.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32