A64: Synchronize with r15545.

src/a64/lithium-gap-resolver-a64.cc

 // Copyright 2013 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 138 matching lines @@
 
   // This move is no longer blocked.
   EmitMove(index);
 }
 
 
 void LGapResolver::Verify() {
   TODO_UNIMPLEMENTED("LGapResolver::Verify");
 }
 
+
 void LGapResolver::BreakCycle(int index) {
   ASSERT(moves_[index].destination()->Equals(moves_[root_index_].source()));
   ASSERT(!in_cycle_);
 
   // We use a register which is not allocatable by crankshaft to break the cycle
   // to be sure it doesn't interfere with the moves we are resolving.
   ASSERT(!kSavedValue.IsAllocatable());
   need_to_restore_root_ = true;
 
   // We save in a register the source of that move and we remember its
@@ skipping 57 matching lines @@
   // combinations are possible.
 
   if (source->IsRegister()) {
     Register source_register = cgen_->ToRegister(source);
     if (destination->IsRegister()) {
       __ Mov(cgen_->ToRegister(destination), source_register);
     } else {
       ASSERT(destination->IsStackSlot());
       __ Str(source_register, cgen_->ToMemOperand(destination));
     }
+
   } else if (source->IsStackSlot()) {
     MemOperand source_operand = cgen_->ToMemOperand(source);
     if (destination->IsRegister()) {
       __ Ldr(cgen_->ToRegister(destination), source_operand);
     } else {
       ASSERT(destination->IsStackSlot());
       EmitStackSlotMove(index);
     }
+
   } else if (source->IsConstantOperand()) {
     LConstantOperand* constant_source = LConstantOperand::cast(source);
     if (destination->IsRegister()) {
       Register dst = cgen_->ToRegister(destination);
       if (cgen_->IsSmi(constant_source)) {
         __ Mov(dst, Operand(cgen_->ToSmi(constant_source)));
       } else if (cgen_->IsInteger32Constant(constant_source)) {
         __ Mov(dst, cgen_->ToInteger32(constant_source));
       } else {
         __ LoadObject(dst, cgen_->ToHandle(constant_source));
       }
+    } else if (source->IsDoubleRegister()) {
+      DoubleRegister result = cgen_->ToDoubleRegister(destination);
+      __ Fmov(result, cgen_->ToDouble(constant_source));
     } else {
       ASSERT(destination->IsStackSlot());
       ASSERT(!in_cycle_);  // Constant moves happen after all cycles are gone.
       need_to_restore_root_ = true;
       if (cgen_->IsSmi(constant_source)) {
         __ Mov(kSavedValue, Operand(cgen_->ToSmi(constant_source)));
       } else if (cgen_->IsInteger32Constant(constant_source)) {
         __ Mov(kSavedValue, cgen_->ToInteger32(constant_source));
       } else {
         __ LoadObject(kSavedValue, cgen_->ToHandle(constant_source));
       }
       __ Str(kSavedValue, cgen_->ToMemOperand(destination));
     }
+
   } else if (source->IsDoubleRegister()) {
     DoubleRegister src = cgen_->ToDoubleRegister(source);
     if (destination->IsDoubleRegister()) {
       __ Fmov(cgen_->ToDoubleRegister(destination), src);
     } else {
       ASSERT(destination->IsDoubleStackSlot());
       __ Str(src, cgen_->ToMemOperand(destination));
     }
+
   } else if (source->IsDoubleStackSlot()) {
     MemOperand src = cgen_->ToMemOperand(source);
     if (destination->IsDoubleRegister()) {
       __ Ldr(cgen_->ToDoubleRegister(destination), src);
     } else {
       // TODO(all): double stack slot to double stack slot move.
       UNIMPLEMENTED();
     }
+
   } else {
     UNREACHABLE();
   }
 
   // The move has been emitted, we can eliminate it.
   moves_[index].Eliminate();
 }
 
 
 void LGapResolver::EmitStackSlotMove(int index) {
   // We need a temp register to perform a stack slot to stack slot move, and
   // the register must not be involved in breaking cycles.
 
   // Use the Crankshaft double scratch register as the temporary.
   DoubleRegister temp = crankshaft_fp_scratch;
 
   LOperand* src = moves_[index].source();
   LOperand* dst = moves_[index].destination();
 
   ASSERT(src->IsStackSlot());
   ASSERT(dst->IsStackSlot());
   __ Ldr(temp, cgen_->ToMemOperand(src));
   __ Str(temp, cgen_->ToMemOperand(dst));
 }
 
 } }  // namespace v8::internal