PPC/s390: [builtins] Fix MathMaxMin on arm and arm64

src/s390/builtins-s390.cc

 // Copyright 2014 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.
 
 #if V8_TARGET_ARCH_S390
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 101 matching lines @@
   // Run the native code for the Array function called as a normal function.
   // tail call a stub
   __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
   ArrayConstructorStub stub(masm->isolate());
   __ TailCallStub(&stub);
 }
 
 // static
 void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
   // ----------- S t a t e -------------
-  //  -- r2                 : number of arguments
-  //  -- r3                 : function
-  //  -- cp                 : context
-  //  -- lr                 : return address
-  //  -- sp[(argc - n) * 8] : arg[n] (zero-based)
-  //  -- sp[(argc + 1) * 8] : receiver
+  //  -- r2                     : number of arguments
+  //  -- r3                     : function
+  //  -- cp                     : context
+  //  -- lr                     : return address
+  //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
+  //  -- sp[argc * 4]           : receiver
   // -----------------------------------
   Condition const cond_done = (kind == MathMaxMinKind::kMin) ? lt : gt;
   Heap::RootListIndex const root_index =
       (kind == MathMaxMinKind::kMin) ? Heap::kInfinityValueRootIndex
                                      : Heap::kMinusInfinityValueRootIndex;
   DoubleRegister const reg = (kind == MathMaxMinKind::kMin) ? d2 : d1;
 
   // Load the accumulator with the default return value (either -Infinity or
   // +Infinity), with the tagged value in r7 and the double value in d1.
   __ LoadRoot(r7, root_index);
   __ LoadDouble(d1, FieldMemOperand(r7, HeapNumber::kValueOffset));
 
   // Setup state for loop
   // r4: address of arg[0] + kPointerSize
   // r5: number of slots to drop at exit (arguments + receiver)
   __ AddP(r6, r2, Operand(1));
 
   Label done_loop, loop;
+  __ LoadRR(r6, r2);
   __ bind(&loop);
   {
     // Check if all parameters done.
-    __ SubP(r2, Operand(1));
+    __ SubP(r6, Operand(1));
     __ blt(&done_loop);
 
     // Load the next parameter tagged value into r2.
-    __ ShiftLeftP(r1, r2, Operand(kPointerSizeLog2));
+    __ ShiftLeftP(r1, r6, Operand(kPointerSizeLog2));
     __ LoadP(r4, MemOperand(sp, r1));
 
     // Load the double value of the parameter into d2, maybe converting the
     // parameter to a number first using the ToNumber builtin if necessary.
     Label convert, convert_smi, convert_number, done_convert;
     __ bind(&convert);
     __ JumpIfSmi(r4, &convert_smi);
     __ LoadP(r5, FieldMemOperand(r4, HeapObject::kMapOffset));
     __ JumpIfRoot(r5, Heap::kHeapNumberMapRootIndex, &convert_number);
     {
@@ skipping 48 matching lines @@
 
     // At least one side is NaN, which means that the result will be NaN too.
     // We still need to visit the rest of the arguments.
     __ bind(&compare_nan);
     __ LoadRoot(r7, Heap::kNanValueRootIndex);
     __ LoadDouble(d1, FieldMemOperand(r7, HeapNumber::kValueOffset));
     __ b(&loop);
   }
 
   __ bind(&done_loop);
+  // Drop all slots, including the receiver.
+  __ AddP(r2, Operand(1));
+  __ Drop(r2);
   __ LoadRR(r2, r7);
-  __ Drop(r6);
   __ Ret();
 }
 
 // static
 void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2                     : number of arguments
   //  -- r3                     : constructor function
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
@@ skipping 2725 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390