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

runtime/vm/stub_code_mips.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_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 700 matching lines @@
   __ sll(T3, T3, 1);  // T3 is  a Smi.
   __ addu(T2, T2, T3);
   ASSERT(kSmiTagShift == 1);
   __ LoadImmediate(T3, ~(kObjectAlignment - 1));
   __ and_(T2, T2, T3);
 
   // T2: Allocation size.
 
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
-
-  __ LoadImmediate(T3, heap->TopAddress());
+  Heap::Space space = heap->SpaceForAllocation(kArrayCid);
+  __ LoadImmediate(T3, heap->TopAddress(space));
   __ lw(T0, Address(T3, 0));  // Potential new object start.
 
   __ AdduDetectOverflow(T1, T0, T2, CMPRES1);  // Potential next object start.
   __ bltz(CMPRES1, &slow_case);  // CMPRES1 < 0 on overflow.
 
   // Check if the allocation fits into the remaining space.
   // T0: potential new object start.
   // T1: potential next object start.
   // T2: allocation size.
-  __ LoadImmediate(T4, heap->EndAddress());
+  __ LoadImmediate(T4, heap->EndAddress(space));
   __ lw(T4, Address(T4, 0));
   __ BranchUnsignedGreaterEqual(T1, T4, &slow_case);
 
   // Successfully allocated the object(s), now update top to point to
   // next object start and initialize the object.
   __ sw(T1, Address(T3, 0));
   __ addiu(T0, T0, Immediate(kHeapObjectTag));
-  __ UpdateAllocationStatsWithSize(kArrayCid, T2, T4);
+  __ UpdateAllocationStatsWithSize(kArrayCid, T2, T4, space);
 
   // Initialize the tags.
   // T0: new object start as a tagged pointer.
   // T1: new object end address.
   // T2: allocation size.
   {
     Label overflow, done;
     const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     const Class& cls = Class::Handle(isolate->object_store()->array_class());
 
@@ skipping 253 matching lines @@
     __ LoadImmediate(T2, fixed_size);
     __ sll(T0, T1, 2);
     __ addu(T2, T2, T0);
     ASSERT(kSmiTagShift == 1);
     __ LoadImmediate(T0, ~((kObjectAlignment) - 1));
     __ and_(T2, T2, T0);
 
     // Now allocate the object.
     // T1: number of context variables.
     // T2: object size.
-    __ LoadImmediate(T5, heap->TopAddress());
+    intptr_t cid = context_class.id();
+    Heap::Space space = heap->SpaceForAllocation(cid);
+    __ LoadImmediate(T5, heap->TopAddress(space));
     __ lw(V0, Address(T5, 0));
     __ addu(T3, T2, V0);
 
     // Check if the allocation fits into the remaining space.
     // V0: potential new object.
     // T1: number of context variables.
     // T2: object size.
     // T3: potential next object start.
-    __ LoadImmediate(TMP, heap->EndAddress());
+    __ LoadImmediate(TMP, heap->EndAddress(space));
     __ lw(CMPRES1, Address(TMP, 0));
     if (FLAG_use_slow_path) {
       __ b(&slow_case);
     } else {
       __ BranchUnsignedGreaterEqual(T3, CMPRES1, &slow_case);
     }
 
     // Successfully allocated the object, now update top to point to
     // next object start and initialize the object.
     // V0: new object.
     // T1: number of context variables.
     // T2: object size.
     // T3: next object start.
     __ sw(T3, Address(T5, 0));
     __ addiu(V0, V0, Immediate(kHeapObjectTag));
-    __ UpdateAllocationStatsWithSize(context_class.id(), T2, T5);
+    __ UpdateAllocationStatsWithSize(cid, T2, T5, space);
 
     // Calculate the size tag.
     // V0: new object.
     // T1: number of context variables.
     // T2: object size.
     const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     __ LoadImmediate(TMP, RawObject::SizeTag::kMaxSizeTag);
     __ sltu(CMPRES1, TMP, T2);  // CMPRES1 = T2 > TMP ? 1 : 0.
     __ movn(T2, ZR, CMPRES1);  // T2 = CMPRES1 != 0 ? 0 : T2.
     __ sll(TMP, T2, shift);  // TMP = T2 << shift.
     __ movz(T2, TMP, CMPRES1);  // T2 = CMPRES1 == 0 ? TMP : T2.
 
     // Get the class index and insert it into the tags.
     // T2: size and bit tags.
-    __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(context_class.id()));
+    __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cid));
     __ or_(T2, T2, TMP);
     __ sw(T2, FieldAddress(V0, Context::tags_offset()));
 
     // Setup up number of context variables field.
     // V0: new object.
     // T1: number of context variables as integer value (not object).
     __ sw(T1, FieldAddress(V0, Context::num_variables_offset()));
 
     // Setup isolate field.
     // Load Isolate pointer from Context structure into R2.
@@ skipping 143 matching lines @@
   if (is_cls_parameterized) {
     __ lw(T1, Address(SP, 0 * kWordSize));
     // T1: type arguments.
   }
   if (FLAG_inline_alloc && Heap::IsAllocatableInNewSpace(instance_size)) {
     Label slow_case;
     // Allocate the object and update top to point to
     // next object start and initialize the allocated object.
     // T1: instantiated type arguments (if is_cls_parameterized).
     Heap* heap = Isolate::Current()->heap();
-    __ LoadImmediate(T5, heap->TopAddress());
+    Heap::Space space = heap->SpaceForAllocation(cls.id());
+    __ LoadImmediate(T5, heap->TopAddress(space));
     __ lw(T2, Address(T5));
     __ LoadImmediate(T4, instance_size);
     __ addu(T3, T2, T4);
     // Check if the allocation fits into the remaining space.
     // T2: potential new object start.
     // T3: potential next object start.
-    __ LoadImmediate(TMP, heap->EndAddress());
+    __ LoadImmediate(TMP, heap->EndAddress(space));
     __ lw(CMPRES1, Address(TMP));
     if (FLAG_use_slow_path) {
       __ b(&slow_case);
     } else {
       __ BranchUnsignedGreaterEqual(T3, CMPRES1, &slow_case);
     }
     // Successfully allocated the object(s), now update top to point to
     // next object start and initialize the object.
     __ sw(T3, Address(T5));
-    __ UpdateAllocationStats(cls.id(), T5);
+    __ UpdateAllocationStats(cls.id(), T5, space);
 
     // T2: new object start.
     // T3: next object start.
     // T1: new object type arguments (if is_cls_parameterized).
     // Set the tags.
     uword tags = 0;
     tags = RawObject::SizeTag::update(instance_size, tags);
     ASSERT(cls.id() != kIllegalCid);
     tags = RawObject::ClassIdTag::update(cls.id(), tags);
     __ LoadImmediate(T0, tags);
@@ skipping 982 matching lines @@
   const Register right = T0;
   __ lw(left, Address(SP, 1 * kWordSize));
   __ lw(right, Address(SP, 0 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp1, temp2);
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS