| Index: runtime/vm/intermediate_language_arm.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_arm.cc (revision 30070)
|
| +++ runtime/vm/intermediate_language_arm.cc (working copy)
|
| @@ -2279,6 +2279,14 @@
|
| summary->set_out(Location::RequiresRegister());
|
| return summary;
|
| }
|
| + if (op_kind() == Token::kMOD) {
|
| + summary->set_in(0, Location::RequiresRegister());
|
| + summary->set_in(1, Location::RequiresRegister());
|
| + summary->AddTemp(Location::RequiresRegister());
|
| + summary->AddTemp(Location::RequiresFpuRegister());
|
| + summary->set_out(Location::RequiresRegister());
|
| + return summary;
|
| + }
|
| summary->set_in(0, Location::RequiresRegister());
|
| summary->set_in(1, Location::RegisterOrSmiConstant(right()));
|
| if (((op_kind() == Token::kSHL) && !is_truncating()) ||
|
| @@ -2507,6 +2515,38 @@
|
| __ SmiTag(result);
|
| break;
|
| }
|
| + case Token::kMOD: {
|
| + // Handle divide by zero in runtime.
|
| + __ cmp(right, ShifterOperand(0));
|
| + __ b(deopt, EQ);
|
| + Register temp = locs()->temp(0).reg();
|
| + DRegister dtemp = EvenDRegisterOf(locs()->temp(1).fpu_reg());
|
| + __ Asr(temp, left, kSmiTagSize); // SmiUntag left into temp.
|
| + __ Asr(IP, right, kSmiTagSize); // SmiUntag right into IP.
|
| +
|
| + __ IntegerDivide(result, temp, IP, dtemp, DTMP);
|
| +
|
| + __ Asr(IP, right, kSmiTagSize); // SmiUntag right into IP.
|
| + __ mls(result, IP, result, temp); // result <- left - right * result
|
| + __ SmiTag(result);
|
| + // res = left % right;
|
| + // if (res < 0) {
|
| + // if (right < 0) {
|
| + // res = res - right;
|
| + // } else {
|
| + // res = res + right;
|
| + // }
|
| + // }
|
| + Label done;
|
| + __ cmp(result, ShifterOperand(0));
|
| + __ b(&done, GE);
|
| + // Result is negative, adjust it.
|
| + __ cmp(right, ShifterOperand(0));
|
| + __ sub(result, result, ShifterOperand(right), LT);
|
| + __ add(result, result, ShifterOperand(right), GE);
|
| + __ Bind(&done);
|
| + break;
|
| + }
|
| case Token::kSHR: {
|
| if (CanDeoptimize()) {
|
| __ CompareImmediate(right, 0);
|
| @@ -2533,11 +2573,6 @@
|
| UNREACHABLE();
|
| break;
|
| }
|
| - case Token::kMOD: {
|
| - // TODO(srdjan): Implement.
|
| - UNREACHABLE();
|
| - break;
|
| - }
|
| case Token::kOR:
|
| case Token::kAND: {
|
| // Flow graph builder has dissected this operation to guarantee correct
|
|
|