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

Unified Diff: runtime/vm/stub_code_ia32.cc

Issue 944783002: Save top StackResource in entry frame. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 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_arm64.cc ('k') | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc (revision 43896)
+++ runtime/vm/stub_code_ia32.cc (working copy)
@@ -713,11 +713,14 @@
__ movl(Address(ESI, Isolate::vm_tag_offset()),
Immediate(VMTag::kDartTagId));
- // Save the top exit frame info. Use EDX as a temporary register.
+ // Save top resource and top exit frame info. Use EDX as a temporary register.
// StackFrameIterator reads the top exit frame info saved in this frame.
+ __ movl(EDX, Address(ESI, Isolate::top_resource_offset()));
+ __ pushl(EDX);
+ __ movl(Address(ESI, Isolate::top_resource_offset()), Immediate(0));
// The constant kExitLinkSlotFromEntryFp must be kept in sync with the
// code below.
- ASSERT(kExitLinkSlotFromEntryFp == -5);
+ ASSERT(kExitLinkSlotFromEntryFp == -6);
__ movl(EDX, Address(ESI, Isolate::top_exit_frame_info_offset()));
__ pushl(EDX);
__ movl(Address(ESI, Isolate::top_exit_frame_info_offset()), Immediate(0));
@@ -761,9 +764,11 @@
// Get rid of arguments pushed on the stack.
__ leal(ESP, Address(ESP, EDX, TIMES_2, 0)); // EDX is a Smi.
- // Restore the saved top exit frame info back into the Isolate structure.
+ // Restore the saved top exit frame info and top resource back into the
+ // Isolate structure.
__ LoadIsolate(ESI);
__ popl(Address(ESI, Isolate::top_exit_frame_info_offset()));
+ __ popl(Address(ESI, Isolate::top_resource_offset()));
// Restore the current VMTag from the stack.
__ popl(Address(ESI, Isolate::vm_tag_offset()));
« no previous file with comments | « runtime/vm/stub_code_arm64.cc ('k') | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698