Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(931)

Unified Diff: src/mips64/builtins-mips64.cc

Issue 2120463002: MIPS: [builtins] Fix MathMaxMin. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/mips/builtins-mips.cc ('K') | « src/mips/builtins-mips.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mips64/builtins-mips64.cc
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc
index 66da9cfd499c9593b36df893eb262f10ab8703aa..7e5b30591a79ab348a381f3688b8022404820df5 100644
--- a/src/mips64/builtins-mips64.cc
+++ b/src/mips64/builtins-mips64.cc
@@ -127,12 +127,12 @@ void Builtins::Generate_ArrayCode(MacroAssembler* masm) {
// static
void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
// ----------- S t a t e -------------
- // -- a0 : number of arguments
- // -- a1 : function
- // -- cp : context
- // -- ra : return address
- // -- sp[(argc - n) * 8] : arg[n] (zero-based)
- // -- sp[(argc + 1) * 8] : receiver
+ // -- a0 : number of arguments
+ // -- a1 : function
+ // -- cp : context
+ // -- ra : return address
+ // -- sp[(argc - n - 1) * 8] : arg[n] (zero-based)
+ // -- sp[argc * 8] : receiver
// -----------------------------------
Heap::RootListIndex const root_index =
(kind == MathMaxMinKind::kMin) ? Heap::kInfinityValueRootIndex
@@ -142,17 +142,17 @@ void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
// +Infinity), with the tagged value in t1 and the double value in f0.
__ LoadRoot(t1, root_index);
__ ldc1(f0, FieldMemOperand(t1, HeapNumber::kValueOffset));
- __ Addu(a3, a0, 1);
Label done_loop, loop;
+ __ mov(a3, a0);
__ bind(&loop);
{
// Check if all parameters done.
- __ Dsubu(a0, a0, Operand(1));
- __ Branch(&done_loop, lt, a0, Operand(zero_reg));
+ __ Dsubu(a3, a3, Operand(1));
+ __ Branch(&done_loop, lt, a3, Operand(zero_reg));
// Load the next parameter tagged value into a2.
- __ Dlsa(at, sp, a0, kPointerSizeLog2);
+ __ Dlsa(at, sp, a3, kPointerSizeLog2);
__ ld(a2, MemOperand(at));
// Load the double value of the parameter into f2, maybe converting the
@@ -224,7 +224,9 @@ void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
}
__ bind(&done_loop);
- __ Dlsa(sp, sp, a3, kPointerSizeLog2);
+ // Drop all slots, including the receiver.
+ __ Daddu(a0, a0, Operand(1));
+ __ Dlsa(sp, sp, a0, kPointerSizeLog2);
__ Ret(USE_DELAY_SLOT);
__ mov(v0, t1); // In delay slot.
}
« src/mips/builtins-mips.cc ('K') | « src/mips/builtins-mips.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698