From 941524f895daa9308b87d82f7c20e8ea3d28f19f Mon Sep 17 00:00:00 2001 From: "balazs.kilvady" Date: Mon, 6 Jun 2016 09:05:22 -0700 Subject: [PATCH] MIPS: Fix '[debug] implement intuitive semantics for stepping over await call.' Port 8d90210a1e68b141b1b2345b7b898f6920df3a3d BUG= Review-Url: https://codereview.chromium.org/2045553002 Cr-Commit-Position: refs/heads/master@{#36759} --- src/mips/builtins-mips.cc | 2 +- src/mips64/builtins-mips64.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc index 54377088e7..19de5d953f 100644 --- a/src/mips/builtins-mips.cc +++ b/src/mips/builtins-mips.cc @@ -854,7 +854,7 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) { ExternalReference::debug_suspended_generator_address(masm->isolate()); __ li(t1, Operand(debug_suspended_generator)); __ lw(t1, MemOperand(t1)); - __ Branch(&prepare_step_in_suspended_generator, eq, t1, Operand(zero_reg)); + __ Branch(&prepare_step_in_suspended_generator, eq, a1, Operand(t1)); __ bind(&stepping_prepared); // Push receiver. diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc index 0c11b17b0f..0bc416c7bf 100644 --- a/src/mips64/builtins-mips64.cc +++ b/src/mips64/builtins-mips64.cc @@ -710,16 +710,16 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) { Label stepping_prepared; ExternalReference step_in_enabled = ExternalReference::debug_step_in_enabled_address(masm->isolate()); - __ li(t1, Operand(step_in_enabled)); - __ lb(t1, MemOperand(t1)); - __ Branch(&prepare_step_in_if_stepping, ne, t1, Operand(zero_reg)); + __ li(a5, Operand(step_in_enabled)); + __ lb(a5, MemOperand(a5)); + __ Branch(&prepare_step_in_if_stepping, ne, a5, Operand(zero_reg)); // Flood function if we need to continue stepping in the suspended generator. ExternalReference debug_suspended_generator = ExternalReference::debug_suspended_generator_address(masm->isolate()); - __ li(t1, Operand(debug_suspended_generator)); - __ lw(t1, MemOperand(t1)); - __ Branch(&prepare_step_in_suspended_generator, eq, t1, Operand(zero_reg)); + __ li(a5, Operand(debug_suspended_generator)); + __ lw(a5, MemOperand(a5)); + __ Branch(&prepare_step_in_suspended_generator, eq, a1, Operand(a5)); __ bind(&stepping_prepared); // Push receiver.