| Index: runtime/vm/intrinsifier_arm.cc
|
| ===================================================================
|
| --- runtime/vm/intrinsifier_arm.cc (revision 40250)
|
| +++ runtime/vm/intrinsifier_arm.cc (working copy)
|
| @@ -277,8 +277,8 @@
|
| __ AddImmediate(R2, fixed_size); \
|
| __ bic(R2, R2, Operand(kObjectAlignment - 1)); \
|
| Heap* heap = Isolate::Current()->heap(); \
|
| - \
|
| - __ LoadImmediate(R0, heap->TopAddress()); \
|
| + Heap::Space space = heap->SpaceForAllocation(cid); \
|
| + __ LoadImmediate(R0, heap->TopAddress(space)); \
|
| __ ldr(R0, Address(R0, 0)); \
|
| \
|
| /* R2: allocation size. */ \
|
| @@ -289,17 +289,17 @@
|
| /* R0: potential new object start. */ \
|
| /* R1: potential next object start. */ \
|
| /* R2: allocation size. */ \
|
| - __ LoadImmediate(R3, heap->EndAddress()); \
|
| + __ LoadImmediate(R3, heap->EndAddress(space)); \
|
| __ ldr(R3, Address(R3, 0)); \
|
| __ cmp(R1, Operand(R3)); \
|
| __ b(&fall_through, CS); \
|
| \
|
| /* Successfully allocated the object(s), now update top to point to */ \
|
| /* next object start and initialize the object. */ \
|
| - __ LoadImmediate(R3, heap->TopAddress()); \
|
| + __ LoadImmediate(R3, heap->TopAddress(space)); \
|
| __ str(R1, Address(R3, 0)); \
|
| __ AddImmediate(R0, kHeapObjectTag); \
|
| - __ UpdateAllocationStatsWithSize(cid, R2, R4); \
|
| + __ UpdateAllocationStatsWithSize(cid, R2, R4, space); \
|
| /* Initialize the tags. */ \
|
| /* R0: new object start as a tagged pointer. */ \
|
| /* R1: new object end address. */ \
|
| @@ -1379,8 +1379,8 @@
|
|
|
| Isolate* isolate = Isolate::Current();
|
| Heap* heap = isolate->heap();
|
| -
|
| - __ LoadImmediate(R3, heap->TopAddress());
|
| + Heap::Space space = heap->SpaceForAllocation(kOneByteStringCid);
|
| + __ LoadImmediate(R3, heap->TopAddress(space));
|
| __ ldr(R0, Address(R3, 0));
|
|
|
| // length_reg: allocation size.
|
| @@ -1391,8 +1391,8 @@
|
| // R0: potential new object start.
|
| // R1: potential next object start.
|
| // R2: allocation size.
|
| - // R3: heap->Top->Address().
|
| - __ LoadImmediate(R7, heap->EndAddress());
|
| + // R3: heap->TopAddress(space).
|
| + __ LoadImmediate(R7, heap->EndAddress(space));
|
| __ ldr(R7, Address(R7, 0));
|
| __ cmp(R1, Operand(R7));
|
| __ b(&fail, CS);
|
| @@ -1401,7 +1401,7 @@
|
| // next object start and initialize the object.
|
| __ str(R1, Address(R3, 0));
|
| __ AddImmediate(R0, kHeapObjectTag);
|
| - __ UpdateAllocationStatsWithSize(kOneByteStringCid, R2, R3);
|
| + __ UpdateAllocationStatsWithSize(kOneByteStringCid, R2, R3, space);
|
|
|
| // Initialize the tags.
|
| // R0: new object start as a tagged pointer.
|
|
|