Support old-space allocation in generated code (bump block only for now).

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 219 matching lines @@
   if (scale_factor == TIMES_16) {                                              \
     /* double length of array. */                                              \
     __ addq(RDI, RDI);                                                         \
     /* only scale by 8. */                                                     \
     scale_factor = TIMES_8;                                                    \
   }                                                                            \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ leaq(RDI, Address(RDI, scale_factor, fixed_size));                        \
   __ andq(RDI, Immediate(-kObjectAlignment));                                  \
   Heap* heap = Isolate::Current()->heap();                                     \
-                                                                               \
-  __ movq(RAX, Immediate(heap->TopAddress()));                                 \
+  Heap::Space space = heap->SpaceForAllocation(cid);                           \
+  __ movq(RAX, Immediate(heap->TopAddress(space)));                            \
   __ movq(RAX, Address(RAX, 0));                                               \
   __ movq(RCX, RAX);                                                           \
                                                                                \
   /* RDI: allocation size. */                                                  \
   __ addq(RCX, RDI);                                                           \
   __ j(CARRY, &fall_through);                                                  \
                                                                                \
   /* Check if the allocation fits into the remaining space. */                 \
   /* RAX: potential new object start. */                                       \
   /* RCX: potential next object start. */                                      \
   /* RDI: allocation size. */                                                  \
   /* R13: scratch register. */                                                 \
-  __ movq(R13, Immediate(heap->EndAddress()));                                 \
+  __ movq(R13, Immediate(heap->EndAddress(space)));                            \
   __ cmpq(RCX, Address(R13, 0));                                               \
   __ j(ABOVE_EQUAL, &fall_through);                                            \
                                                                                \
   /* Successfully allocated the object(s), now update top to point to */       \
   /* next object start and initialize the object. */                           \
-  __ movq(R13, Immediate(heap->TopAddress()));                                 \
+  __ movq(R13, Immediate(heap->TopAddress(space)));                            \
   __ movq(Address(R13, 0), RCX);                                               \
   __ addq(RAX, Immediate(kHeapObjectTag));                                     \
-  __ UpdateAllocationStatsWithSize(cid, RDI);                                  \
+  __ UpdateAllocationStatsWithSize(cid, RDI, space);                           \
   /* 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::kSizeTagPos - kObjectAlignmentLog2));    \
@@ skipping 1025 matching lines @@
   }
   Label pop_and_fail;
   __ pushq(RDI);  // Preserve length.
   __ SmiUntag(RDI);
   const intptr_t fixed_size = sizeof(RawString) + kObjectAlignment - 1;
   __ leaq(RDI, Address(RDI, TIMES_1, fixed_size));  // RDI is a Smi.
   __ andq(RDI, Immediate(-kObjectAlignment));
 
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
-
-  __ movq(RAX, Immediate(heap->TopAddress()));
+  Heap::Space space = heap->SpaceForAllocation(kOneByteStringCid);
+  __ movq(RAX, Immediate(heap->TopAddress(space)));
   __ movq(RAX, Address(RAX, 0));
 
   // RDI: allocation size.
   __ movq(RCX, RAX);
   __ addq(RCX, RDI);
   __ j(CARRY,  &pop_and_fail);
 
   // Check if the allocation fits into the remaining space.
   // RAX: potential new object start.
   // RCX: potential next object start.
   // RDI: allocation size.
-  __ movq(R13, Immediate(heap->EndAddress()));
+  __ movq(R13, Immediate(heap->EndAddress(space)));
   __ cmpq(RCX, Address(R13, 0));
   __ j(ABOVE_EQUAL, &pop_and_fail);
 
   // Successfully allocated the object(s), now update top to point to
   // next object start and initialize the object.
-  __ movq(R13, Immediate(heap->TopAddress()));
+  __ movq(R13, Immediate(heap->TopAddress(space)));
   __ movq(Address(R13, 0), RCX);
   __ addq(RAX, Immediate(kHeapObjectTag));
-  __ UpdateAllocationStatsWithSize(kOneByteStringCid, RDI);
+  __ UpdateAllocationStatsWithSize(kOneByteStringCid, RDI, space);
 
   // 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::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());

[Ivan Posva, 2014/09/19 18:45:55]

Maybe just define a cid local variable above and avoid going the long way around
here.

[koda, 2014/09/19 20:48:29]

Done.

     __ orq(RDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
     __ movq(FieldAddress(RAX, String::tags_offset()), RDI);  // Tags.
   }
 
   // Set the length field.
   __ popq(RDI);
   __ StoreIntoObjectNoBarrier(RAX,
                               FieldAddress(RAX, String::length_offset()),
                               RDI);
   // Clear hash.
@@ skipping 189 matching lines @@
   // Set return value to Isolate::current_tag_.
   __ movq(RAX, Address(RBX, Isolate::current_tag_offset()));
   __ ret();
 }
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64