Enums cleanup.

runtime/vm/stub_code_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.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 668 matching lines @@
     // EAX: new object start as a tagged pointer.
     // 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));
+      __ shll(ECX, Immediate(RawObject::kSizeTagPos - 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(kArrayCid)));
       __ movl(FieldAddress(EAX, Array::tags_offset()), ECX);
     }
@@ skipping 235 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));
+      __ shll(EBX, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       // Set overflow size tag value.
       __ movl(EBX, Immediate(0));
 
       __ Bind(&done);
       // EAX: new object.
       // EDX: number of context variables.
       // EBX: size and bit tags.
@@ skipping 964 matching lines @@
   const Register temp = ECX;
   __ movl(left, Address(ESP, 2 * kWordSize));
   __ movl(right, Address(ESP, 1 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32