Merge JumpToErrorHandler and JumpToExceptionHandler stubs on all architectures.

runtime/vm/stub_code_x64.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_X64)
 
 #include "vm/assembler.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 1829 matching lines @@
 // Return the current stack pointer address, used to stack alignment
 // checks.
 // TOS + 0: return address
 // Result in RAX.
 void StubCode::GenerateGetStackPointerStub(Assembler* assembler) {
   __ leaq(RAX, Address(RSP, kWordSize));
   __ ret();
 }
 
 
-// Jump to the exception handler.
+// Jump to the exception or error handler.
 // TOS + 0: return address
 // RDI: program counter
 // RSI: stack pointer
 // RDX: frame_pointer
 // RCX: exception object
 // R8: stacktrace object
 // No Result.
 void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) {
   ASSERT(kExceptionObjectReg == RAX);
   ASSERT(kStackTraceObjectReg == RDX);
   __ movq(RBP, RDX);  // target frame pointer.
   __ movq(kStackTraceObjectReg, R8);  // stacktrace object.
   __ movq(kExceptionObjectReg, RCX);  // exception object.
   __ movq(RSP, RSI);   // target stack_pointer.
   __ jmp(RDI);  // Jump to the exception handler code.
 }
 
 
-// Jump to the error handler.
-// TOS + 0: return address
-// RDI: program_counter
-// RSI: stack_pointer
-// RDX: frame_pointer
-// RCX: error object
-// No Result.
-void StubCode::GenerateJumpToErrorHandlerStub(Assembler* assembler) {
-  ASSERT(kExceptionObjectReg == RAX);
-  __ movq(RAX, RCX);  // error object.
-  __ movq(RBP, RDX);  // target frame_pointer.
-  __ movq(RSP, RSI);  // target stack_pointer.
-  __ jmp(RDI);  // Jump to the exception handler code.
-}
-
-
 // Implements equality operator when one of the arguments is null
 // (identity check) and updates ICData if necessary.
 // TOS + 0: return address
 // TOS + 1: right argument
 // TOS + 2: left argument
 // RBX: ICData.
 // RAX: result.
 // TODO(srdjan): Move to VM stubs once Boolean objects become VM objects.
 void StubCode::GenerateEqualityWithNullArgStub(Assembler* assembler) {
   static const intptr_t kNumArgsTested = 2;
@@ skipping 178 matching lines @@
   __ cmpq(left, right);
   __ Bind(&done);
   __ popq(right);
   __ popq(left);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64