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

Unified Diff: runtime/vm/stub_code_x64.cc

Issue 2951333002: Moves the top_ and end_ words of the Scavenger into mutator thread. (Closed)
Patch Set: Full removal of heap's top/end offsets. Changed allocs in other archs. Created 3 years, 6 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_x64.cc
diff --git a/runtime/vm/stub_code_x64.cc b/runtime/vm/stub_code_x64.cc
index 322f0d82b456d059d9f9d3211b9060c463f6ff11..c9bcf8e1e5055d5b7913ee3b834d3d662a29c566 100644
--- a/runtime/vm/stub_code_x64.cc
+++ b/runtime/vm/stub_code_x64.cc
@@ -664,8 +664,7 @@ void StubCode::GenerateAllocateArrayStub(Assembler* assembler) {
const intptr_t cid = kArrayCid;
Heap::Space space = Heap::kNew;
- __ movq(R13, Address(THR, Thread::heap_offset()));
- __ movq(RAX, Address(R13, Heap::TopOffset(space)));
+ __ movq(RAX, Address(THR, Thread::top_offset()));
// RDI: allocation size.
__ movq(RCX, RAX);
@@ -677,12 +676,12 @@ void StubCode::GenerateAllocateArrayStub(Assembler* assembler) {
// RCX: potential next object start.
// RDI: allocation size.
// R13: heap.
- __ cmpq(RCX, Address(R13, Heap::EndOffset(space)));
+ __ cmpq(RCX, Address(THR, Thread::end_offset()));
__ j(ABOVE_EQUAL, &slow_case);
// Successfully allocated the object(s), now update top to point to
// next object start and initialize the object.
- __ movq(Address(R13, Heap::TopOffset(space)), RCX);
+ __ movq(Address(THR, Thread::top_offset()), RCX);
__ addq(RAX, Immediate(kHeapObjectTag));
NOT_IN_PRODUCT(__ UpdateAllocationStatsWithSize(cid, RDI, space));
// Initialize the tags.
@@ -913,15 +912,14 @@ void StubCode::GenerateAllocateContextStub(Assembler* assembler) {
// R10: number of context variables.
const intptr_t cid = kContextCid;
Heap::Space space = Heap::kNew;
- __ movq(RCX, Address(THR, Thread::heap_offset()));
- __ movq(RAX, Address(RCX, Heap::TopOffset(space)));
+ __ movq(RAX, Address(THR, Thread::top_offset()));
__ addq(R13, RAX);
// Check if the allocation fits into the remaining space.
// RAX: potential new object.
// R13: potential next object start.
// R10: number of context variables.
// RCX: heap.
- __ cmpq(R13, Address(RCX, Heap::EndOffset(space)));
+ __ cmpq(R13, Address(THR, Thread::end_offset()));
if (FLAG_use_slow_path) {
__ jmp(&slow_case);
} else {
@@ -934,7 +932,7 @@ void StubCode::GenerateAllocateContextStub(Assembler* assembler) {
// R13: next object start.
// R10: number of context variables.
// RCX: heap.
- __ movq(Address(RCX, Heap::TopOffset(space)), R13);
+ __ movq(Address(THR, Thread::top_offset()), R13);
// R13: Size of allocation in bytes.
__ subq(R13, RAX);
__ addq(RAX, Immediate(kHeapObjectTag));
@@ -1112,20 +1110,19 @@ void StubCode::GenerateAllocationStubForClass(Assembler* assembler,
// next object start and initialize the allocated object.
// RDX: instantiated type arguments (if is_cls_parameterized).
Heap::Space space = Heap::kNew;
- __ movq(RCX, Address(THR, Thread::heap_offset()));
- __ movq(RAX, Address(RCX, Heap::TopOffset(space)));
+ __ movq(RAX, Address(THR, Thread::top_offset()));
__ leaq(RBX, Address(RAX, instance_size));
// Check if the allocation fits into the remaining space.
// RAX: potential new object start.
// RBX: potential next object start.
// RCX: heap.
- __ cmpq(RBX, Address(RCX, Heap::EndOffset(space)));
+ __ cmpq(RBX, Address(THR, Thread::end_offset()));
if (FLAG_use_slow_path) {
__ jmp(&slow_case);
} else {
__ j(ABOVE_EQUAL, &slow_case);
}
- __ movq(Address(RCX, Heap::TopOffset(space)), RBX);
+ __ movq(Address(THR, Thread::top_offset()), RBX);
NOT_IN_PRODUCT(__ UpdateAllocationStats(cls.id(), space));
// RAX: new object start (untagged).

Powered by Google App Engine
This is Rietveld 408576698