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

Unified Diff: runtime/vm/stack_frame_x64.h

Issue 63093003: Fix for issue 14790 - Crash when using dartium devtools (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 1 month 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/stack_frame_mips.h ('k') | runtime/vm/stub_code_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stack_frame_x64.h
===================================================================
--- runtime/vm/stack_frame_x64.h (revision 30084)
+++ runtime/vm/stack_frame_x64.h (working copy)
@@ -16,20 +16,24 @@
| saved RBP | (RBP of current frame)
| saved PC | (PC of current frame)
+--------------------+
-Current frame | ... | <- RSP of current frame
- | first local |
- | caller's PP |
+Current frame | ... T| <- RSP of current frame
+ | first local T|
+ | caller's PP T|
| PC marker | (current frame's code entry + offset)
| caller's RBP | <- RBP of current frame
| caller's ret addr | (PC of caller frame)
+--------------------+
Caller frame | last parameter | <- RSP of caller frame
| ... |
+
+ T against a slot indicates it needs to be traversed during GC.
*/
static const int kDartFrameFixedSize = 4; // PC marker, RBP, PP, PC.
static const int kSavedPcSlotFromSp = -1;
+static const int kFirstObjectSlotFromFp = -2; // Used by GC to traverse stack.
+
static const int kFirstLocalSlotFromFp = -3;
static const int kSavedCallerPpSlotFromFp = -2;
static const int kPcMarkerSlotFromFp = -1;
@@ -41,10 +45,9 @@
static const int kSavedAboveReturnAddress = 3; // Saved above return address.
// Entry and exit frame layout.
-static const int kSavedContextSlotFromEntryFp = -10;
-static const int kExitLinkSlotFromEntryFp = -9;
+static const int kSavedContextSlotFromEntryFp = -9;
+static const int kExitLinkSlotFromEntryFp = -8;
} // namespace dart
#endif // VM_STACK_FRAME_X64_H_
-
« no previous file with comments | « runtime/vm/stack_frame_mips.h ('k') | runtime/vm/stub_code_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698