Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1095)

Unified Diff: runtime/vm/longjump.cc

Issue 13502002: Support FrameLookup vm test on ARM, requiring among other things: (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/simulator_arm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/longjump.cc
===================================================================
--- runtime/vm/longjump.cc (revision 20887)
+++ runtime/vm/longjump.cc (working copy)
@@ -11,6 +11,7 @@
#include "vm/object.h"
#include "vm/object_store.h"
#include "vm/os.h"
+#include "vm/simulator.h"
namespace dart {
@@ -25,8 +26,12 @@
// assumes the stack grows from high to low.
Isolate* isolate = Isolate::Current();
uword jumpbuf_addr = reinterpret_cast<uword>(this);
- return (isolate->top_exit_frame_info() == 0 ||
- jumpbuf_addr < isolate->top_exit_frame_info());
+#if defined(USING_SIMULATOR)
+ uword top_exit_frame_info = isolate->simulator()->top_exit_frame_info();
+#else
+ uword top_exit_frame_info = isolate->top_exit_frame_info();
+#endif
+ return ((top_exit_frame_info == 0) || (jumpbuf_addr < top_exit_frame_info));
}
« no previous file with comments | « runtime/vm/intermediate_language_x64.cc ('k') | runtime/vm/simulator_arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698