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

Unified Diff: runtime/vm/stub_code_x64.cc

Issue 12179020: Fix for issues 6080 - pass in the Isolate's top context into the stub for invoking dart code from n… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 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/stub_code_ia32.cc ('k') | runtime/vm/symbols.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_x64.cc
===================================================================
--- runtime/vm/stub_code_x64.cc (revision 18232)
+++ runtime/vm/stub_code_x64.cc (working copy)
@@ -735,18 +735,20 @@
__ movq(R8, FieldAddress(CTX, Context::isolate_offset()));
// Save the top exit frame info. Use RAX as a temporary register.
+ // StackFrameIterator reads the top exit frame info saved in this frame.
+ // The constant kExitLinkOffsetInEntryFrame must be kept in sync with the
+ // code below: kExitLinkOffsetInEntryFrame = -8 * kWordSize.
__ movq(RAX, Address(R8, Isolate::top_exit_frame_info_offset()));
__ pushq(RAX);
__ movq(Address(R8, Isolate::top_exit_frame_info_offset()), Immediate(0));
- // StackFrameIterator reads the top exit frame info saved in this frame.
- // The constant kExitLinkOffsetInEntryFrame must be kept in sync with the
- // code above: kExitLinkOffsetInEntryFrame = -8 * kWordSize.
-
// Save the old Context pointer. Use RAX as a temporary register.
// Note that VisitObjectPointers will find this saved Context pointer during
// GC marking, since it traverses any information between SP and
// FP - kExitLinkOffsetInEntryFrame.
+ // EntryFrame::SavedContext reads the context saved in this frame.
+ // The constant kSavedContextOffsetInEntryFrame must be kept in sync with
+ // the code below: kSavedContextOffsetInEntryFrame = -9 * kWordSize.
__ movq(RAX, Address(R8, Isolate::top_context_offset()));
__ pushq(RAX);
@@ -1258,7 +1260,7 @@
__ movq(R10, FieldAddress(CTX, Context::isolate_offset()));
__ movq(Address(RBX, Context::isolate_offset()), R10);
- // Set the parent field to null.
+ // Set the parent to null.
__ movq(Address(RBX, Context::parent_offset()), raw_null);
// Initialize the context variable to the receiver.
« no previous file with comments | « runtime/vm/stub_code_ia32.cc ('k') | runtime/vm/symbols.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698