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

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 268 matching lines @@
   if (scale_factor == TIMES_16) {                                              \
     /* double length of array. */                                              \
     __ addl(EDI, EDI);                                                         \
     /* only scale by 8. */                                                     \
     scale_factor = TIMES_8;                                                    \
   }                                                                            \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ leal(EDI, Address(EDI, scale_factor, fixed_size));                        \
   __ andl(EDI, Immediate(-kObjectAlignment));                                  \
   Heap* heap = Isolate::Current()->heap();                                     \
-                                                                               \
-  __ movl(EAX, Address::Absolute(heap->TopAddress()));                         \
+  Heap::Space space = heap->SpaceForAllocation(cid);                           \
+  __ movl(EAX, Address::Absolute(heap->TopAddress(space)));                    \
   __ movl(EBX, EAX);                                                           \
                                                                                \
   /* EDI: allocation size. */                                                  \
   __ addl(EBX, EDI);                                                           \
   __ j(CARRY, &fall_through);                                                  \
                                                                                \
   /* Check if the allocation fits into the remaining space. */                 \
   /* EAX: potential new object start. */                                       \
   /* EBX: potential next object start. */                                      \
   /* EDI: allocation size. */                                                  \
-  __ cmpl(EBX, Address::Absolute(heap->EndAddress()));                         \
+  __ cmpl(EBX, Address::Absolute(heap->EndAddress(space)));                    \
   __ j(ABOVE_EQUAL, &fall_through);                                            \
                                                                                \
   /* Successfully allocated the object(s), now update top to point to */       \
   /* next object start and initialize the object. */                           \
-  __ movl(Address::Absolute(heap->TopAddress()), EBX);                         \
+  __ movl(Address::Absolute(heap->TopAddress(space)), EBX);                    \
   __ addl(EAX, Immediate(kHeapObjectTag));                                     \
-  __ UpdateAllocationStatsWithSize(cid, EDI, kNoRegister);                     \
+  __ UpdateAllocationStatsWithSize(cid, EDI, kNoRegister, space);              \
                                                                                \
   /* 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::kSizeTagPos - kObjectAlignmentLog2));    \
@@ skipping 1176 matching lines @@
   }
   Label pop_and_fail;
   __ pushl(EDI);  // Preserve length.
   __ SmiUntag(EDI);
   const intptr_t fixed_size = sizeof(RawString) + kObjectAlignment - 1;
   __ leal(EDI, Address(EDI, TIMES_1, fixed_size));  // EDI is untagged.
   __ andl(EDI, Immediate(-kObjectAlignment));
 
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
-
-  __ movl(EAX, Address::Absolute(heap->TopAddress()));
+  const intptr_t cid = kOneByteStringCid;
+  Heap::Space space = heap->SpaceForAllocation(cid);
+  __ movl(EAX, Address::Absolute(heap->TopAddress(space)));
   __ movl(EBX, EAX);
 
   // EDI: allocation size.
   __ addl(EBX, EDI);
   __ j(CARRY, &pop_and_fail, Assembler::kNearJump);
 
   // Check if the allocation fits into the remaining space.
   // EAX: potential new object start.
   // EBX: potential next object start.
   // EDI: allocation size.
-  __ cmpl(EBX, Address::Absolute(heap->EndAddress()));
+  __ cmpl(EBX, Address::Absolute(heap->EndAddress(space)));
   __ j(ABOVE_EQUAL, &pop_and_fail, Assembler::kNearJump);
 
   // Successfully allocated the object(s), now update top to point to
   // next object start and initialize the object.
-  __ movl(Address::Absolute(heap->TopAddress()), EBX);
+  __ movl(Address::Absolute(heap->TopAddress(space)), EBX);
   __ addl(EAX, Immediate(kHeapObjectTag));
 
-  __ UpdateAllocationStatsWithSize(kOneByteStringCid, EDI, kNoRegister);
+  __ UpdateAllocationStatsWithSize(cid, EDI, kNoRegister, space);
 
   // 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::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())));
+    __ orl(EDI, Immediate(RawObject::ClassIdTag::encode(cid)));
     __ movl(FieldAddress(EAX, String::tags_offset()), EDI);  // Tags.
   }
 
   // Set the length field.
   __ popl(EDI);
   __ StoreIntoObjectNoBarrier(EAX,
                               FieldAddress(EAX, String::length_offset()),
                               EDI);
   // Clear hash.
   __ movl(FieldAddress(EAX, String::hash_offset()), Immediate(0));
@@ skipping 186 matching lines @@
                         Isolate::current_tag_offset());
   // Set return value to Isolate::current_tag_.
   __ movl(EAX, current_tag_addr);
   __ ret();
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32