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

Unified Diff: src/ia32/stub-cache-ia32.cc

Issue 5736008: Provide baseline for experimental GC implementation. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 10 years 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: src/ia32/stub-cache-ia32.cc
diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc
index 352eae1f927577d815d76c7089df232c6dfdb627..c106afaab33ba411de0e21110a8ab751770418e4 100644
--- a/src/ia32/stub-cache-ia32.cc
+++ b/src/ia32/stub-cache-ia32.cc
@@ -818,10 +818,12 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
int offset = object->map()->instance_size() + (index * kPointerSize);
__ mov(FieldOperand(receiver_reg, offset), eax);
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
// Update the write barrier for the array address.
// Pass the value being stored in the now unused name_reg.
__ mov(name_reg, Operand(eax));
__ RecordWrite(receiver_reg, offset, name_reg, scratch);
+#endif
} else {
// Write to the properties array.
int offset = index * kPointerSize + FixedArray::kHeaderSize;
@@ -829,10 +831,12 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm,
__ mov(scratch, FieldOperand(receiver_reg, JSObject::kPropertiesOffset));
__ mov(FieldOperand(scratch, offset), eax);
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
// Update the write barrier for the array address.
// Pass the value being stored in the now unused name_reg.
__ mov(name_reg, Operand(eax));
__ RecordWrite(scratch, offset, name_reg, receiver_reg);
+#endif
}
// Return the value (register eax).
@@ -1478,7 +1482,10 @@ MaybeObject* CallStubCompiler::CompileArrayPushCall(Object* object,
__ j(not_equal, &call_builtin);
if (argc == 1) { // Otherwise fall through to call builtin.
- Label exit, with_write_barrier, attempt_to_grow_elements;
+ Label exit, attempt_to_grow_elements;
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
+ Label with_write_barrier;
+#endif
// Get the array's length into eax and calculate new length.
__ mov(eax, FieldOperand(edx, JSArray::kLengthOffset));
@@ -1503,19 +1510,23 @@ MaybeObject* CallStubCompiler::CompileArrayPushCall(Object* object,
__ mov(ecx, Operand(esp, argc * kPointerSize));
__ mov(Operand(edx, 0), ecx);
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
// Check if value is a smi.
__ test(ecx, Immediate(kSmiTagMask));
__ j(not_zero, &with_write_barrier);
+#endif
__ bind(&exit);
__ ret((argc + 1) * kPointerSize);
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
__ bind(&with_write_barrier);
__ InNewSpace(ebx, ecx, equal, &exit);
__ RecordWriteHelper(ebx, edx, ecx);
__ ret((argc + 1) * kPointerSize);
+#endif
__ bind(&attempt_to_grow_elements);
if (!FLAG_inline_new) {
@@ -2683,7 +2694,9 @@ MaybeObject* KeyedStoreStubCompiler::CompileStoreSpecialized(
// the value in register eax.
__ mov(edx, Operand(eax));
__ mov(FieldOperand(edi, ecx, times_2, FixedArray::kHeaderSize), eax);
+#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
__ RecordWrite(edi, 0, edx, ecx);
+#endif
// Done.
__ ret(0);
« src/globals.h ('K') | « src/ia32/macro-assembler-ia32.cc ('k') | src/mark-compact.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698