[deoptimizer] Fill the single precision registers in the deoptimizer entry stub.

src/arm64/deoptimizer-arm64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/api.h"
 #include "src/arm64/assembler-arm64-inl.h"
 #include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
@@ skipping 79 matching lines @@
 
 #define __ masm()->
 
 void Deoptimizer::TableEntryGenerator::Generate() {
   GeneratePrologue();
 
   // TODO(all): This code needs to be revisited. We probably only need to save
   // caller-saved registers here. Callee-saved registers can be stored directly
   // in the input frame.
 
-  // Save all allocatable floating point registers.
-  CPURegList saved_fp_registers(
+  // Save all allocatable double registers.
+  CPURegList saved_double_registers(
       CPURegister::kFPRegister, kDRegSizeInBits,
       RegisterConfiguration::Crankshaft()->allocatable_double_codes_mask());
-  __ PushCPURegList(saved_fp_registers);
+  __ PushCPURegList(saved_double_registers);
+
+  // Save all allocatable float registers.
+  CPURegList saved_float_registers(
+      CPURegister::kFPRegister, kSRegSizeInBits,
+      RegisterConfiguration::Crankshaft()->allocatable_float_codes_mask());
+  __ PushCPURegList(saved_float_registers);
 
   // We save all the registers expcept jssp, sp and lr.
   CPURegList saved_registers(CPURegister::kRegister, kXRegSizeInBits, 0, 27);
   saved_registers.Combine(fp);
   __ PushCPURegList(saved_registers);
 
   __ Mov(x3, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate())));
   __ Str(fp, MemOperand(x3));
 
   const int kSavedRegistersAreaSize =
       (saved_registers.Count() * kXRegSize) +
-      (saved_fp_registers.Count() * kDRegSize);
+      (saved_double_registers.Count() * kDRegSize) +
+      (saved_float_registers.Count() * kSRegSize);
 
   // Floating point registers are saved on the stack above core registers.
-  const int kFPRegistersOffset = saved_registers.Count() * kXRegSize;
+  const int kFloatRegistersOffset = saved_registers.Count() * kXRegSize;
+  const int kDoubleRegistersOffset =
+      kFloatRegistersOffset + saved_float_registers.Count() * kSRegSize;
 
   // Get the bailout id from the stack.
   Register bailout_id = x2;
   __ Peek(bailout_id, kSavedRegistersAreaSize);
 
   Register code_object = x3;
   Register fp_to_sp = x4;
   // Get the address of the location in the code object. This is the return
   // address for lazy deoptimization.
   __ Mov(code_object, lr);
@@ skipping 31 matching lines @@
   // Copy core registers into the input frame.
   CPURegList copy_to_input = saved_registers;
   for (int i = 0; i < saved_registers.Count(); i++) {
     __ Peek(x2, i * kPointerSize);
     CPURegister current_reg = copy_to_input.PopLowestIndex();
     int offset = (current_reg.code() * kPointerSize) +
         FrameDescription::registers_offset();
     __ Str(x2, MemOperand(x1, offset));
   }
 
-  // Copy FP registers to the input frame.
-  CPURegList copy_fp_to_input = saved_fp_registers;
-  for (int i = 0; i < saved_fp_registers.Count(); i++) {
-    int src_offset = kFPRegistersOffset + (i * kDoubleSize);
+  // Copy double registers to the input frame.
+  CPURegList copy_double_to_input = saved_double_registers;
+  for (int i = 0; i < saved_double_registers.Count(); i++) {
+    int src_offset = kDoubleRegistersOffset + (i * kDoubleSize);
     __ Peek(x2, src_offset);
-    CPURegister reg = copy_fp_to_input.PopLowestIndex();
+    CPURegister reg = copy_double_to_input.PopLowestIndex();
     int dst_offset = FrameDescription::double_registers_offset() +
                      (reg.code() * kDoubleSize);
     __ Str(x2, MemOperand(x1, dst_offset));
   }
 
+  // Copy float registers to the input frame.
+  CPURegList copy_float_to_input = saved_float_registers;
+  for (int i = 0; i < saved_float_registers.Count(); i++) {
+    int src_offset = kFloatRegistersOffset + (i * kFloatSize);
+    __ Peek(w2, src_offset);
+    CPURegister reg = copy_float_to_input.PopLowestIndex();
+    int dst_offset =
+        FrameDescription::float_registers_offset() + (reg.code() * kFloatSize);
+    __ Str(w2, MemOperand(x1, dst_offset));
+  }
+
   // Remove the bailout id and the saved registers from the stack.
   __ Drop(1 + (kSavedRegistersAreaSize / kXRegSize));
 
   // Compute a pointer to the unwinding limit in register x2; that is
   // the first stack slot not part of the input frame.
   Register unwind_limit = x2;
   __ Ldr(unwind_limit, MemOperand(x1, FrameDescription::frame_size_offset()));
   __ Add(unwind_limit, unwind_limit, __ StackPointer());
 
   // Unwind the stack down to - but not including - the unwinding
@@ skipping 45 matching lines @@
   __ Push(x7);
   __ Bind(&inner_loop_header);
   __ Cbnz(x3, &inner_push_loop);
 
   __ Add(x0, x0, kPointerSize);
   __ Bind(&outer_loop_header);
   __ Cmp(x0, x1);
   __ B(lt, &outer_push_loop);
 
   __ Ldr(x1, MemOperand(x4, Deoptimizer::input_offset()));
-  DCHECK(!saved_fp_registers.IncludesAliasOf(crankshaft_fp_scratch) &&
-         !saved_fp_registers.IncludesAliasOf(fp_zero) &&
-         !saved_fp_registers.IncludesAliasOf(fp_scratch));
-  while (!saved_fp_registers.IsEmpty()) {
-    const CPURegister reg = saved_fp_registers.PopLowestIndex();
+  DCHECK(!saved_double_registers.IncludesAliasOf(crankshaft_fp_scratch) &&
+         !saved_double_registers.IncludesAliasOf(fp_zero) &&
+         !saved_double_registers.IncludesAliasOf(fp_scratch));
+  while (!saved_double_registers.IsEmpty()) {
+    const CPURegister reg = saved_double_registers.PopLowestIndex();
     int src_offset = FrameDescription::double_registers_offset() +
                      (reg.code() * kDoubleSize);
     __ Ldr(reg, MemOperand(x1, src_offset));
   }
 
   // Push state from the last output frame.
   __ Ldr(x6, MemOperand(current_frame, FrameDescription::state_offset()));
   __ Push(x6);
 
   // TODO(all): ARM copies a lot (if not all) of the last output frame onto the
@@ skipping 80 matching lines @@
 void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
   // No embedded constant pool support.
   UNREACHABLE();
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8