Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / v8 / src / x64 / deoptimizer-x64.cc

diff --git a/src/v8/src/x64/deoptimizer-x64.cc b/src/v8/src/x64/deoptimizer-x64.cc
index 2149fa5..16b0cdc 100644 (file)
--- a/src/v8/src/x64/deoptimizer-x64.cc
+++ b/src/v8/src/x64/deoptimizer-x64.cc
@@ -91,9 +91,8 @@ void Deoptimizer::FillInputFrame(Address tos, JavaScriptFrame* frame) {
   }
   input_->SetRegister(rsp.code(), reinterpret_cast<intptr_t>(frame->sp()));
   input_->SetRegister(rbp.code(), reinterpret_cast<intptr_t>(frame->fp()));
-  simd128_value_t zero = {{0.0, 0.0}};
   for (int i = 0; i < DoubleRegister::NumAllocatableRegisters(); i++) {
-    input_->SetSIMD128Register(i, zero);
+    input_->SetDoubleRegister(i, 0.0);
   }
 
   // Fill the frame content from the actual data on the frame.
@@ -114,13 +113,9 @@ void Deoptimizer::SetPlatformCompiledStubRegisters(
 
 
 void Deoptimizer::CopyDoubleRegisters(FrameDescription* output_frame) {
-}
-
-
-void Deoptimizer::CopySIMD128Registers(FrameDescription* output_frame) {
   for (int i = 0; i < XMMRegister::NumAllocatableRegisters(); ++i) {
-    simd128_value_t xmm_value = input_->GetSIMD128Register(i);
-    output_frame->SetSIMD128Register(i, xmm_value);
+    double double_value = input_->GetDoubleRegister(i);
+    output_frame->SetDoubleRegister(i, double_value);
   }
 }
 
@@ -139,14 +134,14 @@ void Deoptimizer::EntryGenerator::Generate() {
   // Save all general purpose registers before messing with them.
   const int kNumberOfRegisters = Register::kNumRegisters;
 
-  const int kXMMRegsSize = kSIMD128Size *
+  const int kDoubleRegsSize = kDoubleSize *
       XMMRegister::NumAllocatableRegisters();
-  __ subp(rsp, Immediate(kXMMRegsSize));
+  __ subp(rsp, Immediate(kDoubleRegsSize));
 
   for (int i = 0; i < XMMRegister::NumAllocatableRegisters(); ++i) {
     XMMRegister xmm_reg = XMMRegister::FromAllocationIndex(i);
-    int offset = i * kSIMD128Size;
-    __ movups(Operand(rsp, offset), xmm_reg);
+    int offset = i * kDoubleSize;
+    __ movsd(Operand(rsp, offset), xmm_reg);
   }
 
   // We push all registers onto the stack, even though we do not need
@@ -157,7 +152,7 @@ void Deoptimizer::EntryGenerator::Generate() {
   }
 
   const int kSavedRegistersAreaSize = kNumberOfRegisters * kRegisterSize +
-                                      kXMMRegsSize;
+                                      kDoubleRegsSize;
 
   // We use this to keep the value of the fifth argument temporarily.
   // Unfortunately we can't store it directly in r8 (used for passing
@@ -207,13 +202,11 @@ void Deoptimizer::EntryGenerator::Generate() {
     __ PopQuad(Operand(rbx, offset));
   }
 
-  // Fill in the xmm input registers.
-  STATIC_ASSERT(kSIMD128Size == 2 * kDoubleSize);
-  int xmm_regs_offset = FrameDescription::simd128_registers_offset();
+  // Fill in the double input registers.
+  int double_regs_offset = FrameDescription::double_registers_offset();
   for (int i = 0; i < XMMRegister::NumAllocatableRegisters(); i++) {
-    int dst_offset = i * kSIMD128Size + xmm_regs_offset;
+    int dst_offset = i * kDoubleSize + double_regs_offset;
     __ popq(Operand(rbx, dst_offset));
-    __ popq(Operand(rbx, dst_offset + kDoubleSize));
   }
 
   // Remove the bailout id and return address from the stack.
@@ -277,8 +270,8 @@ void Deoptimizer::EntryGenerator::Generate() {
 
   for (int i = 0; i < XMMRegister::NumAllocatableRegisters(); ++i) {
     XMMRegister xmm_reg = XMMRegister::FromAllocationIndex(i);
-    int src_offset = i * kSIMD128Size + xmm_regs_offset;
-    __ movups(xmm_reg, Operand(rbx, src_offset));
+    int src_offset = i * kDoubleSize + double_regs_offset;
+    __ movsd(xmm_reg, Operand(rbx, src_offset));
   }
 
   // Push state, pc, and continuation from the last output frame.
@@ -351,40 +344,6 @@ void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
 }
 
 
-double FrameDescription::GetDoubleRegister(unsigned n) const {
-  DCHECK(n < arraysize(simd128_registers_));
-  return simd128_registers_[n].d[0];
-}
-
-
-void FrameDescription::SetDoubleRegister(unsigned n, double value) {
-  DCHECK(n < arraysize(simd128_registers_));
-  simd128_registers_[n].d[0] = value;
-}
-
-
-simd128_value_t FrameDescription::GetSIMD128Register(unsigned n) const {
-  DCHECK(n < arraysize(simd128_registers_));
-  return simd128_registers_[n];
-}
-
-
-void FrameDescription::SetSIMD128Register(unsigned n, simd128_value_t value) {
-  DCHECK(n < arraysize(simd128_registers_));
-  simd128_registers_[n] = value;
-}
-
-
-int FrameDescription::double_registers_offset() {
-  return OFFSET_OF(FrameDescription, simd128_registers_);
-}
-
-
-int FrameDescription::simd128_registers_offset() {
-  return OFFSET_OF(FrameDescription, simd128_registers_);
-}
-
-
 #undef __