Index: runtime/vm/stub_code_mips.cc |
=================================================================== |
--- runtime/vm/stub_code_mips.cc (revision 40250) |
+++ runtime/vm/stub_code_mips.cc (working copy) |
@@ -718,8 +718,8 @@ |
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. |
@@ -729,7 +729,7 @@ |
// 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); |
@@ -737,7 +737,7 @@ |
// 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. |
@@ -1011,7 +1011,9 @@ |
// 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); |
@@ -1020,7 +1022,7 @@ |
// 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); |
@@ -1036,7 +1038,7 @@ |
// 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. |
@@ -1051,7 +1053,7 @@ |
// 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())); |
@@ -1215,14 +1217,15 @@ |
// 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); |
@@ -1232,7 +1235,7 @@ |
// 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. |