| Index: runtime/vm/intermediate_language_mips.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_mips.cc (revision 39909)
|
| +++ runtime/vm/intermediate_language_mips.cc (working copy)
|
| @@ -88,6 +88,13 @@
|
| __ TraceSimMsg("ReturnInstr");
|
| Register result = locs()->in(0).reg();
|
| ASSERT(result == V0);
|
| +
|
| + if (compiler->intrinsic_mode()) {
|
| + // Intrinsics don't have a frame.
|
| + __ Ret();
|
| + return;
|
| + }
|
| +
|
| #if defined(DEBUG)
|
| Label stack_ok;
|
| __ Comment("Stack Check");
|
| @@ -1675,7 +1682,8 @@
|
| public:
|
| BoxAllocationSlowPath(Instruction* instruction,
|
| const Class& cls,
|
| - Register result)
|
| + Register result,
|
| + bool is_intrinsic)
|
| : instruction_(instruction),
|
| cls_(cls),
|
| result_(result) { }
|
| @@ -1706,7 +1714,6 @@
|
| __ mov(result_, V0);
|
| }
|
| compiler->RestoreLiveRegisters(locs);
|
| -
|
| __ b(exit_label());
|
| }
|
|
|
| @@ -1715,21 +1722,28 @@
|
| const Class& cls,
|
| Register result,
|
| Register temp) {
|
| - BoxAllocationSlowPath* slow_path =
|
| - new BoxAllocationSlowPath(instruction, cls, result);
|
| - compiler->AddSlowPathCode(slow_path);
|
| + if (compiler->intrinsic_mode()) {
|
| + __ TryAllocate(cls,
|
| + compiler->intrinsic_slow_path_label(),
|
| + result,
|
| + temp);
|
| + } else {
|
| + BoxAllocationSlowPath* slow_path =
|
| + new BoxAllocationSlowPath(instruction, cls, result);
|
| + compiler->AddSlowPathCode(slow_path);
|
|
|
| - __ TryAllocate(cls,
|
| - slow_path->entry_label(),
|
| - result,
|
| - temp);
|
| - __ Bind(slow_path->exit_label());
|
| + __ TryAllocate(cls,
|
| + slow_path->entry_label(),
|
| + result,
|
| + temp);
|
| + __ Bind(slow_path->exit_label());
|
| + }
|
| }
|
|
|
| private:
|
| Instruction* instruction_;
|
| const Class& cls_;
|
| - Register result_;
|
| + const Register result_;
|
| };
|
|
|
|
|
|
|