Enums cleanup.

runtime/vm/intrinsifier_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 68 matching lines @@
   __ movq(Address(R13, 0), RCX);
   __ addq(RAX, Immediate(kHeapObjectTag));
   __ UpdateAllocationStatsWithSize(kArrayCid, RDI);
   // Initialize the tags.
   // RAX: new object start as a tagged pointer.
   // RDI: allocation size.
   {
     Label size_tag_overflow, done;
     __ cmpq(RDI, Immediate(RawObject::SizeTag::kMaxSizeTag));
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-    __ shlq(RDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+    __ shlq(RDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
     __ movq(RDI, Immediate(0));
     __ Bind(&done);
 
     // Get the class index and insert it into the tags.
     const Class& cls = Class::Handle(isolate->object_store()->array_class());
     __ orq(RDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
     __ movq(FieldAddress(RAX, Array::tags_offset()), RDI);  // Tags.
@@ skipping 350 matching lines @@
   __ UpdateAllocationStatsWithSize(cid, RDI);                                  \
   /* Initialize the tags. */                                                   \
   /* RAX: new object start as a tagged pointer. */                             \
   /* RCX: new object end address. */                                           \
   /* RDI: allocation size. */                                                  \
   /* R13: scratch register. */                                                 \
   {                                                                            \
     Label size_tag_overflow, done;                                             \
     __ cmpq(RDI, Immediate(RawObject::SizeTag::kMaxSizeTag));                  \
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);                     \
-    __ shlq(RDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));    \
+    __ shlq(RDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));    \
     __ jmp(&done, Assembler::kNearJump);                                       \
                                                                                \
     __ Bind(&size_tag_overflow);                                               \
     __ movq(RDI, Immediate(0));                                                \
     __ Bind(&done);                                                            \
                                                                                \
     /* Get the class index and insert it into the tags. */                     \
     __ orq(RDI, Immediate(RawObject::ClassIdTag::encode(cid)));                \
     __ movq(FieldAddress(RAX, type_name::tags_offset()), RDI);  /* Tags. */    \
   }                                                                            \
@@ skipping 1001 matching lines @@
   __ addq(RAX, Immediate(kHeapObjectTag));
   __ UpdateAllocationStatsWithSize(kOneByteStringCid, RDI);
 
   // Initialize the tags.
   // RAX: new object start as a tagged pointer.
   // RDI: allocation size.
   {
     Label size_tag_overflow, done;
     __ cmpq(RDI, Immediate(RawObject::SizeTag::kMaxSizeTag));
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-    __ shlq(RDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+    __ shlq(RDI, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
     __ xorq(RDI, RDI);
     __ Bind(&done);
 
     // Get the class index and insert it into the tags.
     const Class& cls =
         Class::Handle(isolate->object_store()->one_byte_string_class());
     __ orq(RDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
@@ skipping 202 matching lines @@
   // Clear Isolate::user_tag_.
   __ movq(Address(RBX, Isolate::user_tag_offset()), Immediate(0));
   __ ret();
 }
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64