Fix/implement new write barrier for x64.

src/x64/codegen-x64.cc

 // Copyright 2010 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 244 matching lines @@
           ASSERT(!scope()->is_global_scope());
           frame_->PushParameterAt(i);
           Result value = frame_->Pop();
           value.ToRegister();
 
           // SlotOperand loads context.reg() with the context object
           // stored to, used below in RecordWrite.
           Result context = allocator_->Allocate();
           ASSERT(context.is_valid());
           __ movq(SlotOperand(slot, context.reg()), value.reg());
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
           int offset = FixedArray::kHeaderSize + slot->index() * kPointerSize;
           Result scratch = allocator_->Allocate();
           ASSERT(scratch.is_valid());
           frame_->Spill(context.reg());
           frame_->Spill(value.reg());
-          __ RecordWrite(context.reg(), offset, value.reg(), scratch.reg());
-#endif
+          __ RecordWrite(context.reg(),
+                         offset,
+                         value.reg(),
+                         scratch.reg(),
+                         kDontSaveFPRegs);
         }
       }
     }
 
     // Store the arguments object.  This must happen after context
     // initialization because the arguments object may be stored in
     // the context.
     if (ArgumentsMode() != NO_ARGUMENTS_ALLOCATION) {
       StoreArgumentsObject(true);
     }
@@ skipping 4365 matching lines @@
       //
       // The use of SlotOperand below is safe for an unspilled frame
       // because the slot is a context slot.
       ASSERT(slot->type() == Slot::CONTEXT);
       frame_->Dup();
       Result value = frame_->Pop();
       value.ToRegister();
       Result start = allocator_->Allocate();
       ASSERT(start.is_valid());
       __ movq(SlotOperand(slot, start.reg()), value.reg());
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
       // RecordWrite may destroy the value registers.
       //
       // TODO(204): Avoid actually spilling when the value is not
       // needed (probably the common case).
       frame_->Spill(value.reg());
       int offset = FixedArray::kHeaderSize + slot->index() * kPointerSize;
       Result temp = allocator_->Allocate();
       ASSERT(temp.is_valid());
-      __ RecordWrite(start.reg(), offset, value.reg(), temp.reg());
-#endif
+      __ RecordWrite(start.reg(),
+                     offset,
+                     value.reg(),
+                     temp.reg(),
+                     kDontSaveFPRegs);
       // The results start, value, and temp are unused by going out of
       // scope.
     }
 
     exit.Bind();
   }
 }
 
 
 void CodeGenerator::VisitSlot(Slot* node) {
@@ skipping 330 matching lines @@
     // Get the elements FixedArray.
     __ movq(elements.reg(),
             FieldOperand(elements.reg(), JSObject::kElementsOffset));
 
     // Write to the indexed properties array.
     int offset = i * kPointerSize + FixedArray::kHeaderSize;
     __ movq(FieldOperand(elements.reg(), offset), prop_value.reg());
 
     // Update the write barrier for the array address.
     frame_->Spill(prop_value.reg());  // Overwritten by the write barrier.
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
     Result scratch = allocator_->Allocate();
     ASSERT(scratch.is_valid());
-    __ RecordWrite(elements.reg(), offset, prop_value.reg(), scratch.reg());
-#endif
+    __ RecordWrite(elements.reg(),
+                   offset,
+                   prop_value.reg(),
+                   scratch.reg(),
+                   kDontSaveFPRegs);
   }
 }
 
 
 void CodeGenerator::VisitCatchExtensionObject(CatchExtensionObject* node) {
   ASSERT(!in_spilled_code());
   // Call runtime routine to allocate the catch extension object and
   // assign the exception value to the catch variable.
   Comment cmnt(masm_, "[ CatchExtensionObject");
   Load(node->key());
@@ skipping 1307 matching lines @@
   // Store the value.
   __ movq(FieldOperand(object.reg(), JSValue::kValueOffset), value.reg());
   // Update the write barrier.  Save the value as it will be
   // overwritten by the write barrier code and is needed afterward.
   Result duplicate_value = allocator_->Allocate();
   ASSERT(duplicate_value.is_valid());
   __ movq(duplicate_value.reg(), value.reg());
   // The object register is also overwritten by the write barrier and
   // possibly aliased in the frame.
   frame_->Spill(object.reg());
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
-  __ RecordWrite(object.reg(), JSValue::kValueOffset, duplicate_value.reg(),
-                 scratch.reg());
-#endif
+  __ RecordWrite(object.reg(),
+                 JSValue::kValueOffset,
+                 duplicate_value.reg(),
+                 scratch.reg(),
+                 kDontSaveFPRegs);
   object.Unuse();
   scratch.Unuse();
   duplicate_value.Unuse();
 
   // Leave.
   leave.Bind(&value);
   frame_->Push(&value);
 }
 
 
@@ skipping 260 matching lines @@
       FieldOperand(rcx, JSFunctionResultCache::kCacheSizeOffset), rbx);
 
   // Update the cache itself.
   // r9 holds the index as int32.
   __ bind(&update_cache);
   __ pop(rbx);  // restore the key
   __ Integer32ToSmiField(
       FieldOperand(rcx, JSFunctionResultCache::kFingerOffset), r9);
   // Store key.
   __ movq(ArrayElement(rcx, r9), rbx);
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
-  __ RecordWrite(rcx, 0, rbx, r9);
-#endif
+  __ RecordWrite(rcx, 0, rbx, r9, kDontSaveFPRegs);
 
   // Store value.
   __ pop(rcx);  // restore the cache.
   __ SmiToInteger32(rdx,
                     FieldOperand(rcx, JSFunctionResultCache::kFingerOffset));
   __ incl(rdx);
   // Backup rax, because the RecordWrite macro clobbers its arguments.
   __ movq(rbx, rax);
   __ movq(ArrayElement(rcx, rdx), rax);
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
-  __ RecordWrite(rcx, 0, rbx, rdx);
-#endif
+  __ RecordWrite(rcx, 0, rbx, rdx, kDontSaveFPRegs);
 
   if (!dst_.is(rax)) {
     __ movq(dst_, rax);
   }
 }
 
 
 void CodeGenerator::GenerateGetFromCache(ZoneList<Expression*>* args) {
   ASSERT_EQ(2, args->length());
 
@@ skipping 152 matching lines @@
                                     index2.reg(),
                                     times_pointer_size,
                                     FixedArray::kHeaderSize));
 
   // Swap elements.
   __ movq(object.reg(), Operand(index1.reg(), 0));
   __ movq(tmp2.reg(), Operand(index2.reg(), 0));
   __ movq(Operand(index2.reg(), 0), object.reg());
   __ movq(Operand(index1.reg(), 0), tmp2.reg());
 
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
   Label done;
   __ InNewSpace(tmp1.reg(), tmp2.reg(), equal, &done);
   // Possible optimization: do a check that both values are Smis
   // (or them and test against Smi mask.)
 
   __ movq(tmp2.reg(), tmp1.reg());
-  __ RecordWriteHelper(tmp1.reg(), index1.reg(), object.reg());
-  __ RecordWriteHelper(tmp2.reg(), index2.reg(), object.reg());
+  __ RecordWriteHelper(tmp1.reg(), index1.reg(), object.reg(), kDontSaveFPRegs);
+  __ RecordWriteHelper(tmp2.reg(), index2.reg(), object.reg(), kDontSaveFPRegs);
   __ bind(&done);
-#endif
 
   deferred->BindExit();
   frame_->Push(Factory::undefined_value());
 }
 
 
 void CodeGenerator::GenerateCallFunction(ZoneList<Expression*>* args) {
   Comment cmnt(masm_, "[ GenerateCallFunction");
 
   ASSERT(args->length() >= 2);
@@ skipping 1474 matching lines @@
     // If the receiver and the value share a register allocate a new
     // register for the receiver.
     if (receiver.reg().is(value.reg())) {
       receiver = allocator()->Allocate();
       ASSERT(receiver.is_valid());
       __ movq(receiver.reg(), value.reg());
     }
 
     // Update the write barrier. To save instructions in the inlined
     // version we do not filter smis.
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
     Label skip_write_barrier;
     __ InNewSpace(receiver.reg(), value.reg(), equal, &skip_write_barrier);
     int delta_to_record_write = masm_->SizeOfCodeGeneratedSince(&patch_site);
     __ lea(scratch.reg(), Operand(receiver.reg(), offset));
-    __ RecordWriteHelper(receiver.reg(), scratch.reg(), value.reg());
+    __ RecordWriteHelper(receiver.reg(),
+                         scratch.reg(),
+                         value.reg(),
+                         kDontSaveFPRegs);
     if (FLAG_debug_code) {
       __ movq(receiver.reg(), BitCast<int64_t>(kZapValue), RelocInfo::NONE);
       __ movq(value.reg(), BitCast<int64_t>(kZapValue), RelocInfo::NONE);
       __ movq(scratch.reg(), BitCast<int64_t>(kZapValue), RelocInfo::NONE);
     }
     __ bind(&skip_write_barrier);
-#else
-    // Use dummy delta to record write value to ensure proper
-    // testl encoding.
-    int delta_to_record_write = 0x0001;
-#endif
     value.Unuse();
     scratch.Unuse();
     receiver.Unuse();
     done.Jump(&result);
 
     slow.Bind(&value, &receiver);
     frame()->Push(&receiver);
     frame()->Push(&value);
     result = frame()->CallStoreIC(name, is_contextual);
     // Encode the offset to the map check instruction and the offset
@@ skipping 117 matching lines @@
     // Get the receiver, key and value into registers.
     result = frame()->Pop();
     Result key = frame()->Pop();
     Result receiver = frame()->Pop();
 
     Result tmp = allocator_->Allocate();
     ASSERT(tmp.is_valid());
     Result tmp2 = allocator_->Allocate();
     ASSERT(tmp2.is_valid());
 
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
     // Determine whether the value is a constant before putting it in a
     // register.
     bool value_is_constant = result.is_constant();
-#endif
 
     // Make sure that value, key and receiver are in registers.
     result.ToRegister();
     key.ToRegister();
     receiver.ToRegister();
 
     DeferredReferenceSetKeyedValue* deferred =
         new DeferredReferenceSetKeyedValue(result.reg(),
                                            key.reg(),
                                            receiver.reg());
@@ skipping 19 matching lines @@
     deferred->Branch(below_equal);
 
     // Get the elements array from the receiver and check that it is not a
     // dictionary.
     __ movq(tmp.reg(),
             FieldOperand(receiver.reg(), JSArray::kElementsOffset));
 
     // Check whether it is possible to omit the write barrier. If the elements
     // array is in new space or the value written is a smi we can safely update
     // the elements array without write barrier.
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
     Label in_new_space;
     __ InNewSpace(tmp.reg(), tmp2.reg(), equal, &in_new_space);
     if (!value_is_constant) {
       __ JumpIfNotSmi(result.reg(), deferred->entry_label());
     }
 
     __ bind(&in_new_space);
-#endif
 
     // Bind the deferred code patch site to be able to locate the fixed
     // array map comparison.  When debugging, we patch this comparison to
     // always fail so that we will hit the IC call in the deferred code
     // which will allow the debugger to break for fast case stores.
     __ bind(deferred->patch_site());
     // Avoid using __ to ensure the distance from patch_site
     // to the map address is always the same.
     masm()->movq(kScratchRegister, Factory::fixed_array_map(),
                RelocInfo::EMBEDDED_OBJECT);
@@ skipping 285 matching lines @@
 }
 
 #endif
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64