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

Unified Diff: runtime/vm/intermediate_language_mips.cc

Issue 226543007: Implement new stacktrace and deoptimization stress testing flags: (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 3rd times a charm Created 6 years, 8 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_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_mips.cc
diff --git a/runtime/vm/intermediate_language_mips.cc b/runtime/vm/intermediate_language_mips.cc
index 31f528a4de14ef4070bcffb6e9ea25c035576937..04dc55d8c5c9b5c294f6b2e5188e9452e3c28b90 100644
--- a/runtime/vm/intermediate_language_mips.cc
+++ b/runtime/vm/intermediate_language_mips.cc
@@ -2312,6 +2312,16 @@ class CheckStackOverflowSlowPath : public SlowPathCode {
: instruction_(instruction) { }
virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
+ if (FLAG_use_osr) {
+ uword flags_address = Isolate::Current()->stack_overflow_flags_address();
+ Register value = instruction_->locs()->temp(0).reg();
+ __ TraceSimMsg("CheckStackOverflowSlowPathOsr");
+ __ Comment("CheckStackOverflowSlowPathOsr");
+ __ Bind(osr_entry_label());
+ __ LoadImmediate(TMP, flags_address);
+ __ LoadImmediate(value, Isolate::kOsrRequest);
+ __ sw(value, Address(TMP));
+ }
__ TraceSimMsg("CheckStackOverflowSlowPath");
__ Comment("CheckStackOverflowSlowPath");
__ Bind(entry_label());
@@ -2338,8 +2348,14 @@ class CheckStackOverflowSlowPath : public SlowPathCode {
__ b(exit_label());
}
+ Label* osr_entry_label() {
+ ASSERT(FLAG_use_osr);
+ return &osr_entry_label_;
+ }
+
private:
CheckStackOverflowInstr* instruction_;
+ Label osr_entry_label_;
};
@@ -2349,7 +2365,6 @@ void CheckStackOverflowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
compiler->AddSlowPathCode(slow_path);
__ LoadImmediate(TMP, Isolate::Current()->stack_limit_address());
-
__ lw(CMPRES1, Address(TMP));
__ BranchUnsignedLessEqual(SP, CMPRES1, slow_path->entry_label());
if (compiler->CanOSRFunction() && in_loop()) {
@@ -2361,7 +2376,10 @@ void CheckStackOverflowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
intptr_t threshold =
FLAG_optimization_counter_threshold * (loop_depth() + 1);
__ lw(temp, FieldAddress(temp, Function::usage_counter_offset()));
- __ BranchSignedGreaterEqual(temp, threshold, slow_path->entry_label());
+ __ BranchSignedGreaterEqual(temp, threshold, slow_path->osr_entry_label());
+ }
+ if (compiler->ForceSlowPathForStackOverflow()) {
+ __ b(slow_path->entry_label());
}
__ Bind(slow_path->exit_label());
}
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698