Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: runtime/vm/stub_code_arm64.cc

Issue 1263513002: VM: Load allocation-top and -end via Thread. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: fixed cc tests Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/stub_code_arm64.cc
diff --git a/runtime/vm/stub_code_arm64.cc b/runtime/vm/stub_code_arm64.cc
index 36847aeb7ed5f5639e4cebf7d7b9b4812fbd8a18..8ec0d15621eb0945c3b13ee6a074190430664910 100644
--- a/runtime/vm/stub_code_arm64.cc
+++ b/runtime/vm/stub_code_arm64.cc
@@ -1107,24 +1107,23 @@ void StubCode::GenerateAllocationStubForClass(
// Allocate the object and update top to point to
// next object start and initialize the allocated object.
// R1: instantiated type arguments (if is_cls_parameterized).
- Heap* heap = Isolate::Current()->heap();
Heap::Space space = Heap::SpaceForAllocation(cls.id());
- __ LoadImmediate(R5, heap->TopAddress(space));
- __ ldr(R2, Address(R5));
+ __ ldr(R5, Address(THR, Thread::heap_offset()));
+ __ ldr(R2, Address(R5, Heap::TopOffset(space)));
__ AddImmediate(R3, R2, instance_size);
// Check if the allocation fits into the remaining space.
// R2: potential new object start.
// R3: potential next object start.
- __ LoadImmediate(TMP, heap->EndAddress(space));
- __ ldr(TMP, Address(TMP));
+ // R5: heap.
+ __ ldr(TMP, Address(R5, Heap::EndOffset(space)));
__ CompareRegisters(R3, TMP);
if (FLAG_use_slow_path) {
__ b(&slow_case);
} else {
__ b(&slow_case, CS); // Unsigned higher or equal.
}
- __ str(R3, Address(R5));
- __ UpdateAllocationStats(cls.id(), space);
+ __ str(R3, Address(R5, Heap::TopOffset(space)));
+ __ UpdateAllocationStats(cls.id(), space, /* inline_isolate = */ false);
// R2: new object start.
// R3: next object start.

Powered by Google App Engine
This is Rietveld 408576698