Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 343b0322f771e2c1ef5af6e3ae91d07be0e042e9..dbcf4e4157d3f0399d88ddb80927ae6d527b625f 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -1818,7 +1818,7 @@ void LCodeGen::DoSubI(LSubI* instr) { |
LOperand* right = instr->right(); |
LOperand* result = instr->result(); |
bool can_overflow = instr->hydrogen()->CheckFlag(HValue::kCanOverflow); |
- SBit set_cond = can_overflow ? SetCC : LeaveCC; |
+ SBitMode set_cond = can_overflow ? SetCC : DontCareCC; |
if (right->IsStackSlot() || right->IsArgument()) { |
Register right_reg = EmitLoadRegister(right, ip); |
@@ -1839,7 +1839,7 @@ void LCodeGen::DoRSubI(LRSubI* instr) { |
LOperand* right = instr->right(); |
LOperand* result = instr->result(); |
bool can_overflow = instr->hydrogen()->CheckFlag(HValue::kCanOverflow); |
- SBit set_cond = can_overflow ? SetCC : LeaveCC; |
+ SBitMode set_cond = can_overflow ? SetCC : DontCareCC; |
if (right->IsStackSlot() || right->IsArgument()) { |
Register right_reg = EmitLoadRegister(right, ip); |
@@ -2016,7 +2016,7 @@ void LCodeGen::DoAddI(LAddI* instr) { |
LOperand* right = instr->right(); |
LOperand* result = instr->result(); |
bool can_overflow = instr->hydrogen()->CheckFlag(HValue::kCanOverflow); |
- SBit set_cond = can_overflow ? SetCC : LeaveCC; |
+ SBitMode set_cond = can_overflow ? SetCC : DontCareCC; |
if (right->IsStackSlot() || right->IsArgument()) { |
Register right_reg = EmitLoadRegister(right, ip); |
@@ -2863,7 +2863,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
Label before_push_delta; |
__ bind(&before_push_delta); |
__ BlockConstPoolFor(kAdditionalDelta); |
- __ mov(temp, Operand(delta)); |
+ __ movw(temp, delta); |
// The mov above can generate one or two instructions. The delta was computed |
// for two instructions, so we need to pad here in case of one instruction. |
if (masm_->SizeOfCodeGeneratedSince(&before_push_delta) != 8) { |
@@ -3425,7 +3425,7 @@ void LCodeGen::DoArgumentsLength(LArgumentsLength* instr) { |
// If no arguments adaptor frame the number of arguments is fixed. |
__ cmp(fp, elem); |
- __ mov(result, Operand(scope()->num_parameters())); |
+ __ mov(result, Operand(scope()->num_parameters()), LeaveCC); |
__ b(eq, &done); |
// Arguments adaptor frame present. Get argument length from there. |