Enums cleanup.

runtime/vm/intrinsifier_arm.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"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 61 matching lines @@
   // next object start and initialize the object.
   __ str(R1, Address(R6, 0));
   __ add(R0, R0, ShifterOperand(kHeapObjectTag));
   __ UpdateAllocationStatsWithSize(kArrayCid, R2, R4);
 
   // Initialize the tags.
   // R0: new object start as a tagged pointer.
   // R1: new object end address.
   // R2: allocation size.
   {
-    const intptr_t shift = RawObject::kSizeTagBit - kObjectAlignmentLog2;
+    const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     const Class& cls = Class::Handle(isolate->object_store()->array_class());
 
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag);
     __ mov(R2, ShifterOperand(R2, LSL, shift), LS);
     __ mov(R2, ShifterOperand(0), HI);
 
     // Get the class index and insert it into the tags.
     // R2: size and bit tags.
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cls.id()));
     __ orr(R2, R2, ShifterOperand(TMP));
@@ skipping 399 matching lines @@
   __ str(R1, Address(R3, 0));                                                  \
   __ AddImmediate(R0, kHeapObjectTag);                                         \
   __ UpdateAllocationStatsWithSize(cid, R2, R4);                               \
   /* Initialize the tags. */                                                   \
   /* R0: new object start as a tagged pointer. */                              \
   /* R1: new object end address. */                                            \
   /* R2: allocation size. */                                                   \
   {                                                                            \
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag);                  \
     __ mov(R2, ShifterOperand(R2, LSL,                                         \
-        RawObject::kSizeTagBit - kObjectAlignmentLog2), LS);                   \
+        RawObject::kSizeTagPos - kObjectAlignmentLog2), LS);                   \
     __ mov(R2, ShifterOperand(0), HI);                                         \
                                                                                \
     /* Get the class index and insert it into the tags. */                     \
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cid));                 \
     __ orr(R2, R2, ShifterOperand(TMP));                                       \
     __ str(R2, FieldAddress(R0, type_name::tags_offset()));  /* Tags. */       \
   }                                                                            \
   /* Set the length field. */                                                  \
   /* R0: new object start as a tagged pointer. */                              \
   /* R1: new object end address. */                                            \
@@ skipping 1011 matching lines @@
   // next object start and initialize the object.
   __ str(R1, Address(R3, 0));
   __ AddImmediate(R0, kHeapObjectTag);
   __ UpdateAllocationStatsWithSize(kOneByteStringCid, R2, R3);
 
   // Initialize the tags.
   // R0: new object start as a tagged pointer.
   // R1: new object end address.
   // R2: allocation size.
   {
-    const intptr_t shift = RawObject::kSizeTagBit - kObjectAlignmentLog2;
+    const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     const Class& cls =
         Class::Handle(isolate->object_store()->one_byte_string_class());
 
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag);
     __ mov(R2, ShifterOperand(R2, LSL, shift), LS);
     __ mov(R2, ShifterOperand(0), HI);
 
     // Get the class index and insert it into the tags.
     // R2: size and bit tags.
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cls.id()));
@@ skipping 215 matching lines @@
   __ str(R2, Address(R1, Isolate::current_tag_offset()));
   // Clear Isolate::user_tag_.
   __ eor(R2, R2, ShifterOperand(R2));
   __ str(R2, Address(R1, Isolate::user_tag_offset()));
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM