Enums cleanup.

runtime/vm/intrinsifier_ia32.cc

 // Copyright (c) 2013, 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.
 //
 // The intrinsic code below is executed before a method has built its frame.
 // The return address is on the stack and the arguments below it.
 // Registers EDX (arguments descriptor) and ECX (function) must be preserved.
 // Each intrinsification method returns true if the corresponding
 // Dart method was intrinsified.
 
@@ skipping 68 matching lines @@
   __ UpdateAllocationStatsWithSize(kArrayCid, EDI, kNoRegister);
 
   // Initialize the tags.
   // EAX: new object start as a tagged pointer.
   // EBX: new object end address.
   // EDI: allocation size.
   {
     Label size_tag_overflow, done;
     __ cmpl(EDI, Immediate(RawObject::SizeTag::kMaxSizeTag));
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-    __ shll(EDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+    __ shll(EDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
     __ movl(EDI, Immediate(0));
     __ Bind(&done);
 
     // Get the class index and insert it into the tags.
     const Class& cls = Class::Handle(isolate->object_store()->array_class());
     __ orl(EDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
     __ movl(FieldAddress(EAX, Array::tags_offset()), EDI);  // Tags.
@@ skipping 394 matching lines @@
   __ UpdateAllocationStatsWithSize(cid, EDI, kNoRegister);                     \
                                                                                \
   /* Initialize the tags. */                                                   \
   /* EAX: new object start as a tagged pointer. */                             \
   /* EBX: new object end address. */                                           \
   /* EDI: allocation size. */                                                  \
   {                                                                            \
     Label size_tag_overflow, done;                                             \
     __ cmpl(EDI, Immediate(RawObject::SizeTag::kMaxSizeTag));                  \
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);                     \
-    __ shll(EDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));    \
+    __ shll(EDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));    \
     __ jmp(&done, Assembler::kNearJump);                                       \
                                                                                \
     __ Bind(&size_tag_overflow);                                               \
     __ movl(EDI, Immediate(0));                                                \
     __ Bind(&done);                                                            \
                                                                                \
     /* Get the class index and insert it into the tags. */                     \
     __ orl(EDI, Immediate(RawObject::ClassIdTag::encode(cid)));                \
     __ movl(FieldAddress(EAX, type_name::tags_offset()), EDI);  /* Tags. */    \
   }                                                                            \
@@ skipping 1049 matching lines @@
   __ UpdateAllocationStatsWithSize(kOneByteStringCid, EDI, kNoRegister);
 
   // Initialize the tags.
   // EAX: new object start as a tagged pointer.
   // EBX: new object end address.
   // EDI: allocation size.
   {
     Label size_tag_overflow, done;
     __ cmpl(EDI, Immediate(RawObject::SizeTag::kMaxSizeTag));
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-    __ shll(EDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+    __ shll(EDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
     __ xorl(EDI, EDI);
     __ Bind(&done);
 
     // Get the class index and insert it into the tags.
     const Class& cls =
         Class::Handle(isolate->object_store()->one_byte_string_class());
     __ orl(EDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
@@ skipping 207 matching lines @@
   __ movl(current_tag_addr, raw_null);
   // Clear Isolate::user_tag_.
   __ movl(user_tag_addr, Immediate(0));
   __ ret();
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32