Make x64 to use the RecordWrite stub. This is a step towards getting

src/x64/full-codegen-x64.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 176 matching lines @@
     for (int i = 0; i < num_parameters; i++) {
       Slot* slot = scope()->parameter(i)->AsSlot();
       if (slot != NULL && slot->type() == Slot::CONTEXT) {
         int parameter_offset = StandardFrameConstants::kCallerSPOffset +
             (num_parameters - 1 - i) * kPointerSize;
         // Load parameter from stack.
         __ movq(rax, Operand(rbp, parameter_offset));
         // Store it in the context.
         int context_offset = Context::SlotOffset(slot->index());
         __ movq(Operand(rsi, context_offset), rax);
-        // Update the write barrier. This clobbers all involved
-        // registers, so we have use a third register to avoid
-        // clobbering rsi.
-        __ movq(rcx, rsi);
-        __ RecordWrite(rcx, context_offset, rax, rbx, kDontSaveFPRegs);
+        // Update the write barrier.  This clobbers rax and rbx.
+        __ RecordWriteContextSlot(
+            rsi, context_offset, rax, rbx, kDontSaveFPRegs);
       }
     }
   }
 
   // Possibly allocate an arguments object.
   Variable* arguments = scope()->arguments();
   if (arguments != NULL) {
     // Arguments object must be allocated after the context object, in
     // case the "arguments" or ".arguments" variables are in the context.
     Comment cmnt(masm_, "[ Allocate arguments object");
@@ skipping 407 matching lines @@
 
 
 void FullCodeGenerator::Move(Slot* dst,
                              Register src,
                              Register scratch1,
                              Register scratch2) {
   ASSERT(dst->type() != Slot::LOOKUP);  // Not yet implemented.
   ASSERT(!scratch1.is(src) && !scratch2.is(src));
   MemOperand location = EmitSlotSearch(dst, scratch1);
   __ movq(location, src);
+
   // Emit the write barrier code if the location is in the heap.
   if (dst->type() == Slot::CONTEXT) {
-    int offset = FixedArray::kHeaderSize + dst->index() * kPointerSize;
-    __ RecordWrite(scratch1, offset, src, scratch2, kDontSaveFPRegs);
+    int offset = Context::SlotOffset(dst->index());
+    __ RecordWriteContextSlot(scratch1, offset, src, scratch2, kDontSaveFPRegs);
   }
 }
 
 
 void FullCodeGenerator::PrepareForBailoutBeforeSplit(State state,
                                                      bool should_normalize,
                                                      Label* if_true,
                                                      Label* if_false) {
   // Only prepare for bailouts before splits if we're in a test
   // context. Otherwise, we let the Visit function deal with the
@@ skipping 52 matching lines @@
         }
         if (mode == Variable::CONST) {
           __ LoadRoot(kScratchRegister, Heap::kTheHoleValueRootIndex);
           __ movq(ContextOperand(rsi, slot->index()), kScratchRegister);
           // No write barrier since the hole value is in old space.
         } else if (function != NULL) {
           VisitForAccumulatorValue(function);
           __ movq(ContextOperand(rsi, slot->index()), result_register());
           int offset = Context::SlotOffset(slot->index());
           // We know that we have written a function, which is not a smi.
-          // TODO(gc): Make sure we omit Smi check here.
-          __ RecordWrite(rsi, offset, result_register(), rcx, kDontSaveFPRegs);
+          __ RecordWriteContextSlot(rsi,
+                                    offset,
+                                    result_register(),
+                                    rcx,
+                                    kDontSaveFPRegs,
+                                    EMIT_REMEMBERED_SET,
+                                    OMIT_SMI_CHECK);
         }
         break;
 
       case Slot::LOOKUP: {
         __ push(rsi);
         __ Push(variable->name());
         // Declaration nodes are always introduced in one of two modes.
         ASSERT(mode == Variable::VAR || mode == Variable::CONST);
         PropertyAttributes attr = (mode == Variable::VAR) ? NONE : READ_ONLY;
         __ Push(Smi::FromInt(attr));
@@ skipping 787 matching lines @@
     }
     VisitForAccumulatorValue(subexpr);
 
     // Store the subexpression value in the array's elements.
     __ movq(rbx, Operand(rsp, 0));  // Copy of array literal.
     __ movq(rbx, FieldOperand(rbx, JSObject::kElementsOffset));
     int offset = FixedArray::kHeaderSize + (i * kPointerSize);
     __ movq(FieldOperand(rbx, offset), result_register());
 
     // Update the write barrier for the array store.
-    __ RecordWrite(rbx, offset, result_register(), rcx, kDontSaveFPRegs);
+    __ RecordWriteField(rbx, offset, result_register(), rcx, kDontSaveFPRegs);
 
     PrepareForBailoutForId(expr->GetIdForElement(i), NO_REGISTERS);
   }
 
   if (result_saved) {
     context()->PlugTOS();
   } else {
     context()->Plug(rax);
   }
 }
@@ skipping 320 matching lines @@
         __ movq(Operand(rbp, SlotOffset(slot)), rax);
         break;
       case Slot::CONTEXT: {
         __ movq(rcx, ContextOperand(rsi, Context::FCONTEXT_INDEX));
         __ movq(rdx, ContextOperand(rcx, slot->index()));
         __ CompareRoot(rdx, Heap::kTheHoleValueRootIndex);
         __ j(not_equal, &skip);
         __ movq(ContextOperand(rcx, slot->index()), rax);
         int offset = Context::SlotOffset(slot->index());
         __ movq(rdx, rax);  // Preserve the stored value in eax.
-        __ RecordWrite(rcx, offset, rdx, rbx, kDontSaveFPRegs);
+        __ RecordWriteContextSlot(rcx, offset, rdx, rbx, kDontSaveFPRegs);
         break;
       }
       case Slot::LOOKUP:
         __ push(rax);
         __ push(rsi);
         __ Push(var->name());
         __ CallRuntime(Runtime::kInitializeConstContextSlot, 3);
         break;
     }
     __ bind(&skip);
 
   } else if (var->mode() != Variable::CONST) {
     // Perform the assignment for non-const variables.  Const assignments
     // are simply skipped.
     Slot* slot = var->AsSlot();
     switch (slot->type()) {
       case Slot::PARAMETER:
       case Slot::LOCAL:
         // Perform the assignment.
         __ movq(Operand(rbp, SlotOffset(slot)), rax);
         break;
 
       case Slot::CONTEXT: {
         MemOperand target = EmitSlotSearch(slot, rcx);
         // Perform the assignment and issue the write barrier.
         __ movq(target, rax);
 
         // The value of the assignment is in rax.  RecordWrite clobbers its
-        // register arguments.
+        // last two register arguments.
         __ movq(rdx, rax);
         int offset = Context::SlotOffset(slot->index());
-        __ RecordWrite(rcx, offset, rdx, rbx, kDontSaveFPRegs);
+        __ RecordWriteContextSlot(rcx, offset, rdx, rbx, kDontSaveFPRegs);
         break;
       }
 
       case Slot::LOOKUP:
         // Call the runtime for the assignment.
         __ push(rax);  // Value.
         __ push(rsi);  // Context.
         __ Push(var->name());
         __ Push(Smi::FromInt(strict_mode_flag()));
         __ CallRuntime(Runtime::kStoreContextSlot, 4);
@@ skipping 953 matching lines @@
 
   // If the object is not a value type, return the value.
   __ CmpObjectType(rbx, JS_VALUE_TYPE, rcx);
   __ j(not_equal, &done);
 
   // Store the value.
   __ movq(FieldOperand(rbx, JSValue::kValueOffset), rax);
   // Update the write barrier.  Save the value as it will be
   // overwritten by the write barrier code and is needed afterward.
   __ movq(rdx, rax);
-  __ RecordWrite(rbx, JSValue::kValueOffset, rdx, rcx, kDontSaveFPRegs);
+  __ RecordWriteField(rbx, JSValue::kValueOffset, rdx, rcx, kDontSaveFPRegs);
 
   __ bind(&done);
   context()->Plug(rax);
 }
 
 
 void FullCodeGenerator::EmitNumberToString(ZoneList<Expression*>* args) {
   ASSERT_EQ(args->length(), 1);
 
   // Load the argument on the stack and call the stub.
@@ skipping 265 matching lines @@
 
   // Swap elements.  Use object and temp as scratch registers.
   __ movq(object, Operand(index_1, 0));
   __ movq(temp,   Operand(index_2, 0));
   __ movq(Operand(index_2, 0), object);
   __ movq(Operand(index_1, 0), temp);
 
   Label new_space;
   __ InNewSpace(elements, temp, equal, &new_space);
 
-  __ movq(object, elements);
-  __ RecordWriteHelper(object, index_1, temp, kDontSaveFPRegs);
-  __ RecordWriteHelper(elements, index_2, temp, kDontSaveFPRegs);
+  // Since we are swapping two objects, the incremental marker is not disturbed,
+  // so we don't call the stub that handles this.
+  __ RememberedSetHelper(
+      index_1, temp, kDontSaveFPRegs, MacroAssembler::kFallThroughAtEnd);
+  __ RememberedSetHelper(
+      index_2, temp, kDontSaveFPRegs, MacroAssembler::kFallThroughAtEnd);
 
   __ bind(&new_space);
   // We are done. Drop elements from the stack, and return undefined.
   __ addq(rsp, Immediate(3 * kPointerSize));
   __ LoadRoot(rax, Heap::kUndefinedValueRootIndex);
   __ jmp(&done);
 
   __ bind(&slow_case);
   __ CallRuntime(Runtime::kSwapElements, 3);
 
@@ skipping 1151 matching lines @@
   __ ret(0);
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64