Index: src/arm/simulator-arm.cc |
diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc |
index 7fc8adbb02fab4389d8af6652f17077289d76316..5da6204050b926f056d06b8dd576a3ff9514eec3 100644 |
--- a/src/arm/simulator-arm.cc |
+++ b/src/arm/simulator-arm.cc |
@@ -1227,9 +1227,15 @@ void Simulator::WriteDW(int32_t addr, int32_t value1, int32_t value2) { |
// Returns the limit of the stack area to enable checking for stack overflows. |
-uintptr_t Simulator::StackLimit() const { |
- // Leave a safety margin of 1024 bytes to prevent overrunning the stack when |
- // pushing values. |
+uintptr_t Simulator::StackLimit(uintptr_t c_limit) const { |
+ // The simulator uses a separate JS stack. If we have exhausted the C stack, |
+ // we also drop down the JS limit to reflect the exhaustion on the JS stack. |
+ if (GetCurrentStackPosition() < c_limit) { |
+ return reinterpret_cast<uintptr_t>(get_sp()); |
+ } |
+ |
+ // Otherwise the limit is the JS stack. Leave a safety margin of 1024 bytes |
+ // to prevent overrunning the stack when pushing values. |
return reinterpret_cast<uintptr_t>(stack_) + 1024; |
} |
@@ -4009,6 +4015,9 @@ void Simulator::Execute() { |
void Simulator::CallInternal(byte* entry) { |
+ // Adjust JS-based stack limit to C-based stack limit. |
+ isolate_->stack_guard()->AdjustStackLimitForSimulator(); |
+ |
// Prepare to execute the code at entry |
set_register(pc, reinterpret_cast<int32_t>(entry)); |
// Put down marker for end of simulation. The simulator will stop simulation |