PPC: Minor improvements to MathMaxMin.

src/ppc/builtins-ppc.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_PPC
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 138 matching lines @@
                                      : 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 r4 and the double value in d1.
   __ LoadRoot(r4, root_index);
   __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
 
   // Setup state for loop
   // r5: address of arg[0] + kPointerSize
-  // r6: number of arguments
+  // r6: number of slots to drop at exit (arguments + receiver)
   __ ShiftLeftImm(r5, r3, Operand(kPointerSizeLog2));
   __ add(r5, sp, r5);
-  __ mr(r6, r3);
+  __ addi(r6, r3, Operand(1));
 
   Label done_loop, loop;
   __ bind(&loop);
   {
     // Check if all parameters done.
     __ cmpl(r5, sp);
     __ ble(&done_loop);
 
     // Load the next parameter tagged value into r3.
     __ LoadPU(r3, MemOperand(r5, -kPointerSize));
 
     // Load the double value of the parameter into d2, maybe converting the
     // parameter to a number first using the ToNumberStub if necessary.
     Label convert, convert_smi, convert_number, done_convert;
     __ bind(&convert);
     __ JumpIfSmi(r3, &convert_smi);
     __ LoadP(r7, FieldMemOperand(r3, HeapObject::kMapOffset));
     __ JumpIfRoot(r7, Heap::kHeapNumberMapRootIndex, &convert_number);
     {
       // Parameter is not a Number, use the ToNumberStub to convert it.
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
       __ SmiTag(r6);
       __ Push(r4, r5, r6);
       ToNumberStub stub(masm->isolate());
       __ CallStub(&stub);
       __ Pop(r4, r5, r6);
       __ SmiUntag(r6);
       {
         // Restore the double accumulator value (d1).
-        Label restore_smi, done_restore;
-        __ JumpIfSmi(r4, &restore_smi);
+        Label done_restore;
+        __ SmiToDouble(d1, r4);
+        __ JumpIfSmi(r4, &done_restore);
         __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
-        __ b(&done_restore);
-        __ bind(&restore_smi);
-        __ SmiToDouble(d1, r4);
         __ bind(&done_restore);
       }
     }
     __ b(&convert);
     __ bind(&convert_number);
     __ lfd(d2, FieldMemOperand(r3, HeapNumber::kValueOffset));
     __ b(&done_convert);
     __ bind(&convert_smi);
     __ SmiToDouble(d2, r3);
     __ bind(&done_convert);
@@ skipping 20 matching lines @@
     // We still need to visit the rest of the arguments.
     __ bind(&compare_nan);
     __ LoadRoot(r4, Heap::kNanValueRootIndex);
     __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
     __ b(&loop);
   }
 
   __ bind(&done_loop);
   __ mr(r3, r4);
   __ Drop(r6);
-  __ Ret(1);
+  __ Ret();
 }
 
 // static
 void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3                     : number of arguments
   //  -- r4                     : constructor function
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
   //  -- sp[argc * 4]           : receiver
@@ skipping 2522 matching lines @@
     __ bkpt(0);
   }
 }
 
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC