Merge JumpToErrorHandler and JumpToExceptionHandler stubs on all architectures.

runtime/vm/stub_code_arm.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"
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 1455 matching lines @@
 }
 
 
 // Return the current stack pointer address, used to stack alignment
 // checks.
 void StubCode::GenerateGetStackPointerStub(Assembler* assembler) {
   __ Unimplemented("GetStackPointer Stub");
 }
 
 
-// Jump to the exception handler.
+// Jump to the exception or error handler.
 // LR: return address.
 // R0: program_counter.
 // R1: stack_pointer.
 // R2: frame_pointer.
 // R3: error object.
 // SP: address of stacktrace object.
 // Does not return.
 void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) {
   ASSERT(kExceptionObjectReg == R0);
   ASSERT(kStackTraceObjectReg == R1);
   __ mov(IP, ShifterOperand(R1));  // Stack pointer.
   __ mov(LR, ShifterOperand(R0));  // Program counter.
   __ mov(R0, ShifterOperand(R3));  // Exception object.
   __ ldr(R1, Address(SP, 0));  // StackTrace object.
   __ mov(FP, ShifterOperand(R2));  // Frame_pointer.
   __ mov(SP, ShifterOperand(IP));  // Stack pointer.
   __ bx(LR);  // Jump to the exception handler code.
 }
 
 
-// Jump to the error handler.
-// LR: return address.
-// R0: program_counter.
-// R1: stack_pointer.
-// R2: frame_pointer.
-// R3: error object.
-// Does not return.
-void StubCode::GenerateJumpToErrorHandlerStub(Assembler* assembler) {
-  ASSERT(kExceptionObjectReg == R0);
-  __ mov(LR, ShifterOperand(R0));  // Program counter.
-  __ mov(R0, ShifterOperand(R3));  // Error object.
-  __ mov(FP, ShifterOperand(R2));  // Frame_pointer.
-  __ mov(SP, ShifterOperand(R1));  // Stack pointer.
-  __ bx(LR);  // Jump to the exception handler code.
-}
-
-
 void StubCode::GenerateEqualityWithNullArgStub(Assembler* assembler) {
   __ Unimplemented("EqualityWithNullArg Stub");
 }
 
 
 // Calls to the runtime to optimize the given function.
 // R6: function to be reoptimized.
 // R4: argument descriptor (preserved).
 void StubCode::GenerateOptimizeFunctionStub(Assembler* assembler) {
   __ EnterStubFrame();
@@ skipping 94 matching lines @@
   __ Bind(&reference_compare);
   __ cmp(left, ShifterOperand(right));
   __ Bind(&done);
   __ PopList((1 << R0) | (1 << R1) | (1 << R2));
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM