Shorter TryAllocate instruction sequence on ARM/ARM64/MIPS.

runtime/vm/intermediate_language_ia32.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 1647 matching lines @@
         Field::kUnknownLengthOffset);
 
     __ cmpl(FieldAddress(value_reg,
                          field().guarded_list_length_in_object_offset()),
             Immediate(Smi::RawValue(field().guarded_list_length())));
     __ j(NOT_EQUAL, deopt);
   }
 }
 
 
-class StoreInstanceFieldSlowPath : public SlowPathCode {
+class BoxAllocationSlowPath : public SlowPathCode {
  public:
-  StoreInstanceFieldSlowPath(StoreInstanceFieldInstr* instruction,
-                             const Class& cls)
-      : instruction_(instruction), cls_(cls) { }
+  BoxAllocationSlowPath(Instruction* instruction,
+                        const Class& cls,
+                        Register result)
+      : instruction_(instruction),
+        cls_(cls),
+        result_(result) { }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("StoreInstanceFieldSlowPath");
+    Isolate* isolate = compiler->isolate();
+    StubCode* stub_code = isolate->stub_code();
+
+    if (Assembler::EmittingComments()) {
+      __ Comment("%s slow path allocation of %s",
+                 instruction_->DebugName(),
+                 String::Handle(cls_.PrettyName()).ToCString());
+    }
     __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
+
     const Code& stub =
-        Code::Handle(isolate,
-                     isolate->stub_code()->GetAllocationStubForClass(cls_));
+        Code::Handle(isolate, stub_code->GetAllocationStubForClass(cls_));
     const ExternalLabel label(stub.EntryPoint());
 
     LocationSummary* locs = instruction_->locs();
-    locs->live_registers()->Remove(locs->temp(0));
+
+    locs->live_registers()->Remove(Location::RegisterLocation(result_));
 
     compiler->SaveLiveRegisters(locs);
     compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
                            &label,
                            RawPcDescriptors::kOther,
                            locs);
-    __ MoveRegister(locs->temp(0).reg(), EAX);
+    __ MoveRegister(result_, EAX);
     compiler->RestoreLiveRegisters(locs);
     __ jmp(exit_label());
   }
 
+  static void Allocate(FlowGraphCompiler* compiler,
+                       Instruction* instruction,
+                       const Class& cls,
+                       Register result,
+                       Register temp) {
+    BoxAllocationSlowPath* slow_path =
+        new BoxAllocationSlowPath(instruction, cls, result);
+    compiler->AddSlowPathCode(slow_path);
+
+    __ TryAllocate(cls,
+                   slow_path->entry_label(),
+                   Assembler::kFarJump,
+                   result,
+                   temp);
+    __ Bind(slow_path->exit_label());
+  }
+
  private:
-  StoreInstanceFieldInstr* instruction_;
+  Instruction* instruction_;
   const Class& cls_;
+  Register result_;
 };
 
 
 LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary(Isolate* isolate,
                                                               bool opt) const {
   const intptr_t kNumInputs = 2;
   const intptr_t kNumTemps =
       (IsUnboxedStore() && opt) ? 2 :
           ((IsPotentialUnboxedStore()) ? 3 : 0);
   LocationSummary* summary = new(isolate) LocationSummary(
@@ skipping 18 matching lines @@
                              : Location::FpuRegisterLocation(XMM1));
   } else {
     summary->set_in(1, ShouldEmitStoreBarrier()
                        ? Location::WritableRegister()
                        : Location::RegisterOrConstant(value()));
   }
   return summary;
 }
 
 
+static void EnsureMutableBox(FlowGraphCompiler* compiler,
+                             StoreInstanceFieldInstr* instruction,
+                             Register box_reg,
+                             const Class& cls,
+                             Register instance_reg,
+                             intptr_t offset,
+                             Register temp) {
+  Label done;
+  const Immediate& raw_null =
+      Immediate(reinterpret_cast<intptr_t>(Object::null()));
+  __ movl(box_reg, FieldAddress(instance_reg, offset));
+  __ cmpl(box_reg, raw_null);
+  __ j(NOT_EQUAL, &done);
+  BoxAllocationSlowPath::Allocate(compiler, instruction, cls, box_reg, temp);
+  __ movl(temp, box_reg);
+  __ StoreIntoObject(instance_reg,
+                     FieldAddress(instance_reg, offset),
+                     temp);
+
+  __ Bind(&done);
+}
+
+
 void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Label skip_store;
 
   Register instance_reg = locs()->in(0).reg();
 
   if (IsUnboxedStore() && compiler->is_optimizing()) {
     XmmRegister value = locs()->in(1).fpu_reg();
     Register temp = locs()->temp(0).reg();
     Register temp2 = locs()->temp(1).reg();
     const intptr_t cid = field().UnboxedFieldCid();
 
     if (is_initialization_) {
       const Class* cls = NULL;
       switch (cid) {
         case kDoubleCid:
           cls = &compiler->double_class();
           break;
         case kFloat32x4Cid:
           cls = &compiler->float32x4_class();
           break;
         case kFloat64x2Cid:
           cls = &compiler->float64x2_class();
           break;
         default:
           UNREACHABLE();
       }
 
-      StoreInstanceFieldSlowPath* slow_path =
-          new StoreInstanceFieldSlowPath(this, *cls);
-      compiler->AddSlowPathCode(slow_path);
-
-      __ TryAllocate(*cls,
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     temp,
-                     temp2);
-      __ Bind(slow_path->exit_label());
+      BoxAllocationSlowPath::Allocate(compiler, this, *cls, temp, temp2);
       __ movl(temp2, temp);
       __ StoreIntoObject(instance_reg,
                          FieldAddress(instance_reg, offset_in_bytes_),
                          temp2);
     } else {
       __ movl(temp, FieldAddress(instance_reg, offset_in_bytes_));
     }
     switch (cid) {
       case kDoubleCid:
         __ Comment("UnboxedDoubleStoreInstanceFieldInstr");
@@ skipping 51 matching lines @@
     __ jmp(&store_pointer);
 
 
     if (!compiler->is_optimizing()) {
       locs()->live_registers()->Add(locs()->in(0));
       locs()->live_registers()->Add(locs()->in(1));
     }
 
     {
       __ Bind(&store_double);
-      Label copy_double;
-
-      StoreInstanceFieldSlowPath* slow_path =
-          new StoreInstanceFieldSlowPath(this, compiler->double_class());
-      compiler->AddSlowPathCode(slow_path);
-
-      const Immediate& raw_null =
-          Immediate(reinterpret_cast<intptr_t>(Object::null()));
-      __ movl(temp, FieldAddress(instance_reg, offset_in_bytes_));
-      __ cmpl(temp, raw_null);
-      __ j(NOT_EQUAL, &copy_double);
-
-      __ TryAllocate(compiler->double_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     temp,
-                     temp2);
-      __ Bind(slow_path->exit_label());
-      __ movl(temp2, temp);
-      __ StoreIntoObject(instance_reg,
-                         FieldAddress(instance_reg, offset_in_bytes_),
-                         temp2);
-
-      __ Bind(&copy_double);
+      EnsureMutableBox(compiler,
+                       this,
+                       temp,
+                       compiler->double_class(),
+                       instance_reg,
+                       offset_in_bytes_,
+                       temp2);
       __ movsd(fpu_temp, FieldAddress(value_reg, Double::value_offset()));
       __ movsd(FieldAddress(temp, Double::value_offset()), fpu_temp);
       __ jmp(&skip_store);
     }
 
     {
       __ Bind(&store_float32x4);
-      Label copy_float32x4;
-
-      StoreInstanceFieldSlowPath* slow_path =
-          new StoreInstanceFieldSlowPath(this, compiler->float32x4_class());
-      compiler->AddSlowPathCode(slow_path);
-
-      const Immediate& raw_null =
-          Immediate(reinterpret_cast<intptr_t>(Object::null()));
-      __ movl(temp, FieldAddress(instance_reg, offset_in_bytes_));
-      __ cmpl(temp, raw_null);
-      __ j(NOT_EQUAL, &copy_float32x4);
-
-      __ TryAllocate(compiler->float32x4_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     temp,
-                     temp2);
-      __ Bind(slow_path->exit_label());
-      __ movl(temp2, temp);
-      __ StoreIntoObject(instance_reg,
-                         FieldAddress(instance_reg, offset_in_bytes_),
-                         temp2);
-
-      __ Bind(&copy_float32x4);
+      EnsureMutableBox(compiler,
+                       this,
+                       temp,
+                       compiler->float32x4_class(),
+                       instance_reg,
+                       offset_in_bytes_,
+                       temp2);
       __ movups(fpu_temp, FieldAddress(value_reg, Float32x4::value_offset()));
       __ movups(FieldAddress(temp, Float32x4::value_offset()), fpu_temp);
       __ jmp(&skip_store);
     }
 
     {
       __ Bind(&store_float64x2);
-      Label copy_float64x2;
-
-      StoreInstanceFieldSlowPath* slow_path =
-          new StoreInstanceFieldSlowPath(this, compiler->float64x2_class());
-      compiler->AddSlowPathCode(slow_path);
-
-      const Immediate& raw_null =
-          Immediate(reinterpret_cast<intptr_t>(Object::null()));
-      __ movl(temp, FieldAddress(instance_reg, offset_in_bytes_));
-      __ cmpl(temp, raw_null);
-      __ j(NOT_EQUAL, &copy_float64x2);
-
-      __ TryAllocate(compiler->float64x2_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     temp,
-                     temp2);
-      __ Bind(slow_path->exit_label());
-      __ movl(temp2, temp);
-      __ StoreIntoObject(instance_reg,
-                         FieldAddress(instance_reg, offset_in_bytes_),
-                         temp2);
-
-      __ Bind(&copy_float64x2);
+      EnsureMutableBox(compiler,
+                       this,
+                       temp,
+                       compiler->float64x2_class(),
+                       instance_reg,
+                       offset_in_bytes_,
+                       temp2);
       __ movups(fpu_temp, FieldAddress(value_reg, Float64x2::value_offset()));
       __ movups(FieldAddress(temp, Float64x2::value_offset()), fpu_temp);
       __ jmp(&skip_store);
     }
 
     __ Bind(&store_pointer);
   }
 
   if (ShouldEmitStoreBarrier()) {
     Register value_reg = locs()->in(1).reg();
@@ skipping 213 matching lines @@
   StubCode* stub_code = compiler->isolate()->stub_code();
   compiler->GenerateCall(token_pos(),
                          &stub_code->AllocateArrayLabel(),
                          RawPcDescriptors::kOther,
                          locs());
   __ Bind(&done);
   ASSERT(locs()->out(0).reg() == kResultReg);
 }
 
 
-class BoxDoubleSlowPath : public SlowPathCode {
- public:
-  explicit BoxDoubleSlowPath(Instruction* instruction)
-      : instruction_(instruction) { }
-
-  virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("BoxDoubleSlowPath");
-    __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
-    StubCode* stub_code = isolate->stub_code();
-    const Class& double_class = compiler->double_class();
-    const Code& stub =
-        Code::Handle(isolate,
-                     stub_code->GetAllocationStubForClass(double_class));
-    const ExternalLabel label(stub.EntryPoint());
-
-    LocationSummary* locs = instruction_->locs();
-    ASSERT(!locs->live_registers()->Contains(locs->out(0)));
-    compiler->SaveLiveRegisters(locs);
-    compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
-                           &label,
-                           RawPcDescriptors::kOther,
-                           locs);
-    __ MoveRegister(locs->out(0).reg(), EAX);
-    compiler->RestoreLiveRegisters(locs);
-
-    __ jmp(exit_label());
-  }
-
- private:
-  Instruction* instruction_;
-};
-
-
-class BoxFloat32x4SlowPath : public SlowPathCode {
- public:
-  explicit BoxFloat32x4SlowPath(Instruction* instruction)
-      : instruction_(instruction) { }
-
-  virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("BoxFloat32x4SlowPath");
-    __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
-    StubCode* stub_code = isolate->stub_code();
-    const Class& float32x4_class = compiler->float32x4_class();
-    const Code& stub =
-        Code::Handle(isolate,
-                     stub_code->GetAllocationStubForClass(float32x4_class));
-    const ExternalLabel label(stub.EntryPoint());
-
-    LocationSummary* locs = instruction_->locs();
-    ASSERT(!locs->live_registers()->Contains(locs->out(0)));
-
-    compiler->SaveLiveRegisters(locs);
-    compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
-                           &label,
-                           RawPcDescriptors::kOther,
-                           locs);
-    __ MoveRegister(locs->out(0).reg(), EAX);
-    compiler->RestoreLiveRegisters(locs);
-
-    __ jmp(exit_label());
-  }
-
- private:
-  Instruction* instruction_;
-};
-
-
-class BoxFloat64x2SlowPath : public SlowPathCode {
- public:
-  explicit BoxFloat64x2SlowPath(Instruction* instruction)
-      : instruction_(instruction) { }
-
-  virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("BoxFloat64x2SlowPath");
-    __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
-    StubCode* stub_code = isolate->stub_code();
-    const Class& float64x2_class = compiler->float64x2_class();
-    const Code& stub =
-        Code::Handle(isolate,
-                     stub_code->GetAllocationStubForClass(float64x2_class));
-    const ExternalLabel label(stub.EntryPoint());
-
-    LocationSummary* locs = instruction_->locs();
-    ASSERT(!locs->live_registers()->Contains(locs->out(0)));
-
-    compiler->SaveLiveRegisters(locs);
-    compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
-                           &label,
-                           RawPcDescriptors::kOther,
-                           locs);
-    __ MoveRegister(locs->out(0).reg(), EAX);
-    compiler->RestoreLiveRegisters(locs);
-
-    __ jmp(exit_label());
-  }
-
- private:
-  Instruction* instruction_;
-};
-
-
 LocationSummary* LoadFieldInstr::MakeLocationSummary(Isolate* isolate,
                                                      bool opt) const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps =
       (IsUnboxedLoad() && opt) ? 1 :
           ((IsPotentialUnboxedLoad()) ? 2 : 0);
 
   LocationSummary* locs = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps,
           (opt && !IsPotentialUnboxedLoad())
@@ skipping 71 matching lines @@
 
     // Fall through.
     __ jmp(&load_pointer);
 
     if (!compiler->is_optimizing()) {
       locs()->live_registers()->Add(locs()->in(0));
     }
 
     {
       __ Bind(&load_double);
-      BoxDoubleSlowPath* slow_path = new BoxDoubleSlowPath(this);
-      compiler->AddSlowPathCode(slow_path);
-
-      __ TryAllocate(compiler->double_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     result,
-                     temp);
-      __ Bind(slow_path->exit_label());
+      BoxAllocationSlowPath::Allocate(
+          compiler, this, compiler->double_class(), result, temp);
       __ movl(temp, FieldAddress(instance_reg, offset_in_bytes()));
       __ movsd(value, FieldAddress(temp, Double::value_offset()));
       __ movsd(FieldAddress(result, Double::value_offset()), value);
       __ jmp(&done);
     }
 
     {
       __ Bind(&load_float32x4);
-
-      BoxFloat32x4SlowPath* slow_path = new BoxFloat32x4SlowPath(this);
-      compiler->AddSlowPathCode(slow_path);
-
-      __ TryAllocate(compiler->float32x4_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     result,
-                     temp);
-      __ Bind(slow_path->exit_label());
+      BoxAllocationSlowPath::Allocate(
+          compiler, this, compiler->float32x4_class(), result, temp);
       __ movl(temp, FieldAddress(instance_reg, offset_in_bytes()));
       __ movups(value, FieldAddress(temp, Float32x4::value_offset()));
       __ movups(FieldAddress(result, Float32x4::value_offset()), value);
       __ jmp(&done);
     }
 
     {
       __ Bind(&load_float64x2);
-
-      BoxFloat64x2SlowPath* slow_path = new BoxFloat64x2SlowPath(this);
-      compiler->AddSlowPathCode(slow_path);
-
-      __ TryAllocate(compiler->float64x2_class(),
-                     slow_path->entry_label(),
-                     Assembler::kFarJump,
-                     result,
-                     temp);
-      __ Bind(slow_path->exit_label());
+      BoxAllocationSlowPath::Allocate(
+          compiler, this, compiler->float64x2_class(), result, temp);
       __ movl(temp, FieldAddress(instance_reg, offset_in_bytes()));
       __ movups(value, FieldAddress(temp, Float64x2::value_offset()));
       __ movups(FieldAddress(result, Float64x2::value_offset()), value);
       __ jmp(&done);
     }
 
     __ Bind(&load_pointer);
   }
   __ movl(result, FieldAddress(instance_reg, offset_in_bytes()));
   __ Bind(&done);
@@ skipping 938 matching lines @@
   const intptr_t kNumTemps = 0;
   LocationSummary* summary = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
   summary->set_in(0, Location::RequiresFpuRegister());
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
 void BoxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  BoxDoubleSlowPath* slow_path = new BoxDoubleSlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
-
   Register out_reg = locs()->out(0).reg();
   XmmRegister value = locs()->in(0).fpu_reg();
-
-  __ TryAllocate(compiler->double_class(),
-                 slow_path->entry_label(),
-                 Assembler::kFarJump,
-                 out_reg,
-                 kNoRegister);
-  __ Bind(slow_path->exit_label());
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->double_class(), out_reg, kNoRegister);
   __ movsd(FieldAddress(out_reg, Double::value_offset()), value);
 }
 
 
 LocationSummary* UnboxDoubleInstr::MakeLocationSummary(Isolate* isolate,
                                                        bool opt) const {
   const intptr_t kNumInputs = 1;
   const intptr_t value_cid = value()->Type()->ToCid();
   const bool needs_temp = ((value_cid != kSmiCid) && (value_cid != kDoubleCid));
   const bool needs_writable_input = (value_cid == kSmiCid);
@@ skipping 58 matching lines @@
       isolate, kNumInputs,
                           kNumTemps,
                           LocationSummary::kCallOnSlowPath);
   summary->set_in(0, Location::RequiresFpuRegister());
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
 void BoxFloat32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  BoxFloat32x4SlowPath* slow_path = new BoxFloat32x4SlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
-
   Register out_reg = locs()->out(0).reg();
   XmmRegister value = locs()->in(0).fpu_reg();
 
-  __ TryAllocate(compiler->float32x4_class(),
-                 slow_path->entry_label(),
-                 Assembler::kFarJump,
-                 out_reg,
-                 kNoRegister);
-  __ Bind(slow_path->exit_label());
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->float32x4_class(), out_reg, kNoRegister);
   __ movups(FieldAddress(out_reg, Float32x4::value_offset()), value);
 }
 
 
 LocationSummary* UnboxFloat32x4Instr::MakeLocationSummary(Isolate* isolate,
                                                           bool opt) const {
   const intptr_t value_cid = value()->Type()->ToCid();
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = value_cid == kFloat32x4Cid ? 0 : 1;
   LocationSummary* summary = new(isolate) LocationSummary(
@@ skipping 33 matching lines @@
       isolate, kNumInputs,
                           kNumTemps,
                           LocationSummary::kCallOnSlowPath);
   summary->set_in(0, Location::RequiresFpuRegister());
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
 void BoxFloat64x2Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  BoxFloat64x2SlowPath* slow_path = new BoxFloat64x2SlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
-
   Register out_reg = locs()->out(0).reg();
   XmmRegister value = locs()->in(0).fpu_reg();
 
-  __ TryAllocate(compiler->float64x2_class(),
-                 slow_path->entry_label(),
-                 Assembler::kFarJump,
-                 out_reg,
-                 kNoRegister);
-  __ Bind(slow_path->exit_label());
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->float64x2_class(), out_reg, kNoRegister);
   __ movups(FieldAddress(out_reg, Float64x2::value_offset()), value);
 }
 
 
 LocationSummary* UnboxFloat64x2Instr::MakeLocationSummary(Isolate* isolate,
                                                           bool opt) const {
   const intptr_t value_cid = value()->Type()->ToCid();
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = value_cid == kFloat64x2Cid ? 0 : 1;
   LocationSummary* summary = new(isolate) LocationSummary(
@@ skipping 32 matching lines @@
   LocationSummary* summary = new(isolate) LocationSummary(
       isolate, kNumInputs,
                           kNumTemps,
                           LocationSummary::kCallOnSlowPath);
   summary->set_in(0, Location::RequiresFpuRegister());
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
-class BoxInt32x4SlowPath : public SlowPathCode {
- public:
-  explicit BoxInt32x4SlowPath(BoxInt32x4Instr* instruction)
-      : instruction_(instruction) { }
-
-  virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("BoxInt32x4SlowPath");
-    __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
-    StubCode* stub_code = isolate->stub_code();
-    const Class& int32x4_class = compiler->int32x4_class();
-    const Code& stub =
-        Code::Handle(isolate,
-                     stub_code->GetAllocationStubForClass(int32x4_class));
-    const ExternalLabel label(stub.EntryPoint());
-
-    LocationSummary* locs = instruction_->locs();
-    ASSERT(!locs->live_registers()->Contains(locs->out(0)));
-
-    compiler->SaveLiveRegisters(locs);
-    compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
-                           &label,
-                           RawPcDescriptors::kOther,
-                           locs);
-    __ MoveRegister(locs->out(0).reg(), EAX);
-    compiler->RestoreLiveRegisters(locs);
-
-    __ jmp(exit_label());
-  }
-
- private:
-  BoxInt32x4Instr* instruction_;
-};
-
-
 void BoxInt32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  BoxInt32x4SlowPath* slow_path = new BoxInt32x4SlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
-
   Register out_reg = locs()->out(0).reg();
   XmmRegister value = locs()->in(0).fpu_reg();
 
-  __ TryAllocate(compiler->int32x4_class(),
-                 slow_path->entry_label(),
-                 Assembler::kFarJump,
-                 out_reg,
-                 kNoRegister);
-  __ Bind(slow_path->exit_label());
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->int32x4_class(), out_reg, kNoRegister);
   __ movups(FieldAddress(out_reg, Int32x4::value_offset()), value);
 }
 
 
 LocationSummary* UnboxInt32x4Instr::MakeLocationSummary(Isolate* isolate,
                                                         bool opt) const {
   const intptr_t value_cid = value()->Type()->ToCid();
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = value_cid == kInt32x4Cid ? 0 : 1;
   LocationSummary* summary = new(isolate) LocationSummary(
@@ skipping 2057 matching lines @@
   summary->set_in(0, Location::Pair(Location::RequiresRegister(),
                                     Location::RequiresRegister()));
   if (!is_smi()) {
     summary->set_temp(0, Location::RequiresRegister());
   }
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
-class BoxIntegerSlowPath : public SlowPathCode {
- public:
-  explicit BoxIntegerSlowPath(Definition* instruction)
-      : instruction_(instruction) { }
-
-  virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
-    __ Comment("BoxIntegerSlowPath");
-    __ Bind(entry_label());
-    Isolate* isolate = compiler->isolate();
-    StubCode* stub_code = isolate->stub_code();
-    const Class& mint_class =
-        Class::ZoneHandle(isolate, isolate->object_store()->mint_class());
-    const Code& stub =
-        Code::Handle(isolate, stub_code->GetAllocationStubForClass(mint_class));
-    const ExternalLabel label(stub.EntryPoint());
-
-    LocationSummary* locs = instruction_->locs();
-    ASSERT(!locs->live_registers()->Contains(locs->out(0)));
-
-    compiler->SaveLiveRegisters(locs);
-    compiler->GenerateCall(Scanner::kNoSourcePos,  // No token position.
-                           &label,
-                           RawPcDescriptors::kOther,
-                           locs);
-    __ MoveRegister(locs->out(0).reg(), EAX);
-    compiler->RestoreLiveRegisters(locs);
-
-    __ jmp(exit_label());
-  }
-
- private:
-  Definition* instruction_;
-};
-
-
 void BoxIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (is_smi()) {
     PairLocation* value_pair = locs()->in(0).AsPairLocation();
     Register value_lo = value_pair->At(0).reg();
     Register out_reg = locs()->out(0).reg();
     __ movl(out_reg, value_lo);
     __ SmiTag(out_reg);
     return;
   }
 
-  BoxIntegerSlowPath* slow_path = new BoxIntegerSlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
   PairLocation* value_pair = locs()->in(0).AsPairLocation();
   Register value_lo = value_pair->At(0).reg();
   Register value_hi = value_pair->At(1).reg();
   Register out_reg = locs()->out(0).reg();
 
   // Copy value_hi into out_reg as a temporary.
   // We modify value_lo but restore it before using it.
   __ movl(out_reg, value_hi);
 
   // Unboxed operations produce smis or mint-sized values.
   // Check if value fits into a smi.
   Label not_smi, done;
 
   // 1. Compute (x + -kMinSmi) which has to be in the range
   //    0 .. -kMinSmi+kMaxSmi for x to fit into a smi.
   __ addl(value_lo, Immediate(0x40000000));
   __ adcl(out_reg, Immediate(0));
   // 2. Unsigned compare to -kMinSmi+kMaxSmi.
   __ cmpl(value_lo, Immediate(0x80000000));
   __ sbbl(out_reg, Immediate(0));
   __ j(ABOVE_EQUAL, &not_smi);
   // 3. Restore lower half if result is a smi.
   __ subl(value_lo, Immediate(0x40000000));
   __ movl(out_reg, value_lo);
   __ SmiTag(out_reg);
   __ jmp(&done);
   __ Bind(&not_smi);
-  __ TryAllocate(
-      Class::ZoneHandle(Isolate::Current()->object_store()->mint_class()),
-      slow_path->entry_label(),
-      Assembler::kFarJump,
-      out_reg,
-      kNoRegister);
-  __ Bind(slow_path->exit_label());
   // 3. Restore lower half of input before using it.
   __ subl(value_lo, Immediate(0x40000000));
+
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->mint_class(), out_reg, kNoRegister);
   __ movl(FieldAddress(out_reg, Mint::value_offset()), value_lo);
   __ movl(FieldAddress(out_reg, Mint::value_offset() + kWordSize), value_hi);
   __ Bind(&done);
 }
 
 
 LocationSummary* BinaryMintOpInstr::MakeLocationSummary(Isolate* isolate,
                                                         bool opt) const {
   const intptr_t kNumInputs = 2;
   switch (op_kind()) {
@@ skipping 532 matching lines @@
   const intptr_t kNumTemps = 0;
   LocationSummary* summary = new(isolate) LocationSummary(
       isolate, kNumInputs, kNumTemps, LocationSummary::kCallOnSlowPath);
   summary->set_in(0, Location::RequiresRegister());
   summary->set_out(0, Location::RequiresRegister());
   return summary;
 }
 
 
 void BoxUint32Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  BoxIntegerSlowPath* slow_path = new BoxIntegerSlowPath(this);
-  compiler->AddSlowPathCode(slow_path);
   Register value = locs()->in(0).reg();
   Register out = locs()->out(0).reg();
   ASSERT(value != out);
 
   Label not_smi, done;
 
   // TODO(johnmccutchan): Use range information to fast path smi / mint boxing.
   // Test if this value is <= kSmiMax.
   __ cmpl(value, Immediate(kSmiMax));
   __ j(ABOVE, &not_smi);
   // Smi.
   __ movl(out, value);
   __ SmiTag(out);
   __ jmp(&done);
   __ Bind(&not_smi);
   // Allocate a mint.
-  __ TryAllocate(
-      Class::ZoneHandle(Isolate::Current()->object_store()->mint_class()),
-      slow_path->entry_label(),
-      Assembler::kFarJump,
-      out,
-      kNoRegister);
-  __ Bind(slow_path->exit_label());
+  BoxAllocationSlowPath::Allocate(
+      compiler, this, compiler->mint_class(), out, kNoRegister);
   // Copy low word into mint.
   __ movl(FieldAddress(out, Mint::value_offset()), value);
   // Zero high word.
   __ movl(FieldAddress(out, Mint::value_offset() + kWordSize), Immediate(0));
   __ Bind(&done);
 }
 
 
 LocationSummary* UnboxUint32Instr::MakeLocationSummary(Isolate* isolate,
                                                        bool opt) const {
@@ skipping 433 matching lines @@
   __ movl(EDX, Immediate(kInvalidObjectPointer));
   __ movl(EDX, Immediate(kInvalidObjectPointer));
 #endif
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32