Revert "Revert "JumpToFrame refactor"" + Fix

runtime/vm/simulator_arm.h

 // 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.
 
 // Declares a Simulator for ARM instructions if we are not generating a native
 // ARM binary. This Simulator allows us to run and debug ARM code generation on
 // regular desktop machines.
 // Dart calls into generated code by "calling" the InvokeDartCode stub,
 // which will start execution in the Simulator or forwards to the real entry
 // on a ARM HW platform.
@@ skipping 109 matching lines @@
     kLeafFloatRuntimeCall,
     kBootstrapNativeCall,
     kNativeCall
   };
   static uword RedirectExternalReference(uword function,
                                          CallKind call_kind,
                                          int argument_count);
 
   static uword FunctionForRedirect(uword redirect);
 
-  void Longjmp(uword pc,
-               uword sp,
-               uword fp,
-               RawObject* raw_exception,
-               RawObject* raw_stacktrace,
-               Thread* thread);
+  void JumpToFrame(uword pc, uword sp, uword fp, Thread* thread);
 
  private:
   // Known bad pc value to ensure that the simulator does not execute
   // without being properly setup.
   static const uword kBadLR = -1;
   // A pc value used to signal the simulator to stop execution.  Generally
   // the lr is set to this value on transition from native C code to
   // simulated execution, so that the simulator can "return" to the native
   // C code.
   static const uword kEndSimulatingPC = -2;
@@ skipping 129 matching lines @@
   }
 
   friend class SimulatorDebugger;
   friend class SimulatorSetjmpBuffer;
   DISALLOW_COPY_AND_ASSIGN(Simulator);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_SIMULATOR_ARM_H_