| Index: runtime/vm/intrinsifier_mips.cc
|
| ===================================================================
|
| --- runtime/vm/intrinsifier_mips.cc (revision 40250)
|
| +++ runtime/vm/intrinsifier_mips.cc (working copy)
|
| @@ -277,8 +277,8 @@
|
| __ LoadImmediate(TMP, -kObjectAlignment); \
|
| __ and_(T2, T2, TMP); \
|
| Heap* heap = Isolate::Current()->heap(); \
|
| - \
|
| - __ LoadImmediate(V0, heap->TopAddress()); \
|
| + Heap::Space space = heap->SpaceForAllocation(cid); \
|
| + __ LoadImmediate(V0, heap->TopAddress(space)); \
|
| __ lw(V0, Address(V0, 0)); \
|
| \
|
| /* T2: allocation size. */ \
|
| @@ -289,16 +289,16 @@
|
| /* V0: potential new object start. */ \
|
| /* T1: potential next object start. */ \
|
| /* T2: allocation size. */ \
|
| - __ LoadImmediate(T3, heap->EndAddress()); \
|
| + __ LoadImmediate(T3, heap->EndAddress(space)); \
|
| __ lw(T3, Address(T3, 0)); \
|
| __ BranchUnsignedGreaterEqual(T1, T3, &fall_through); \
|
| \
|
| /* Successfully allocated the object(s), now update top to point to */ \
|
| /* next object start and initialize the object. */ \
|
| - __ LoadImmediate(T3, heap->TopAddress()); \
|
| + __ LoadImmediate(T3, heap->TopAddress(space)); \
|
| __ sw(T1, Address(T3, 0)); \
|
| __ AddImmediate(V0, kHeapObjectTag); \
|
| - __ UpdateAllocationStatsWithSize(cid, T2, T4); \
|
| + __ UpdateAllocationStatsWithSize(cid, T2, T4, space); \
|
| /* Initialize the tags. */ \
|
| /* V0: new object start as a tagged pointer. */ \
|
| /* T1: new object end address. */ \
|
| @@ -1432,8 +1432,8 @@
|
|
|
| Isolate* isolate = Isolate::Current();
|
| Heap* heap = isolate->heap();
|
| -
|
| - __ LoadImmediate(T3, heap->TopAddress());
|
| + Heap::Space space = heap->SpaceForAllocation(kOneByteStringCid);
|
| + __ LoadImmediate(T3, heap->TopAddress(space));
|
| __ lw(V0, Address(T3, 0));
|
|
|
| // length_reg: allocation size.
|
| @@ -1444,8 +1444,8 @@
|
| // V0: potential new object start.
|
| // T1: potential next object start.
|
| // T2: allocation size.
|
| - // T3: heap->TopAddress().
|
| - __ LoadImmediate(T4, heap->EndAddress());
|
| + // T3: heap->TopAddress(space).
|
| + __ LoadImmediate(T4, heap->EndAddress(space));
|
| __ lw(T4, Address(T4, 0));
|
| __ BranchUnsignedGreaterEqual(T1, T4, failure);
|
|
|
| @@ -1454,7 +1454,7 @@
|
| __ sw(T1, Address(T3, 0));
|
| __ AddImmediate(V0, kHeapObjectTag);
|
|
|
| - __ UpdateAllocationStatsWithSize(kOneByteStringCid, T2, T3);
|
| + __ UpdateAllocationStatsWithSize(kOneByteStringCid, T2, T3, space);
|
|
|
| // Initialize the tags.
|
| // V0: new object start as a tagged pointer.
|
|
|