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

Unified Diff: runtime/vm/intrinsifier_mips.cc

Issue 578443003: Support old-space allocation in generated code (bump block only for now). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 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/intrinsifier_mips.cc
===================================================================
--- runtime/vm/intrinsifier_mips.cc (revision 40518)
+++ 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. */ \
@@ -1437,8 +1437,9 @@
Isolate* isolate = Isolate::Current();
Heap* heap = isolate->heap();
-
- __ LoadImmediate(T3, heap->TopAddress());
+ const intptr_t cid = kOneByteStringCid;
+ Heap::Space space = heap->SpaceForAllocation(cid);
+ __ LoadImmediate(T3, heap->TopAddress(space));
__ lw(V0, Address(T3, 0));
// length_reg: allocation size.
@@ -1449,8 +1450,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);
@@ -1459,7 +1460,7 @@
__ sw(T1, Address(T3, 0));
__ AddImmediate(V0, kHeapObjectTag);
- __ UpdateAllocationStatsWithSize(kOneByteStringCid, T2, T3);
+ __ UpdateAllocationStatsWithSize(cid, T2, T3, space);
// Initialize the tags.
// V0: new object start as a tagged pointer.
@@ -1468,8 +1469,6 @@
{
Label overflow, done;
const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
- const Class& cls =
- Class::Handle(isolate->object_store()->one_byte_string_class());
__ BranchUnsignedGreater(T2, RawObject::SizeTag::kMaxSizeTag, &overflow);
__ b(&done);
@@ -1480,7 +1479,7 @@
// Get the class index and insert it into the tags.
// T2: size and bit tags.
- __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cls.id()));
+ __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cid));
__ or_(T2, T2, TMP);
__ sw(T2, FieldAddress(V0, String::tags_offset())); // Store tags.
}

Powered by Google App Engine
This is Rietveld 408576698