Skip to content

Commit a4e06bd

Browse files
committed
main: Explicitly set the stack top based on _estack
.. setting it based on the ad-hoc stack pointer calculation of mp_stack_ctrl_init() meant that the stack used above main() counts against the 1KiB safety factor that the mp_stack_set_limit call tries to establish. It turns out, at least on M4, that over half of the safety factor is used up by stack-above-main()! In the case of the basics/gen_stack_overflow.py test, which blows the stack on purpose, it turns out that gc would be called while handling the "maximum recursion depth exceeded" error, and this needed more stack than was left. Closes: #900
1 parent 74ced17 commit a4e06bd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ int __attribute__((used)) main(void) {
241241

242242
// Stack limit should be less than real stack size, so we have a chance
243243
// to recover from limit hit. (Limit is measured in bytes.)
244-
mp_stack_ctrl_init();
244+
mp_stack_set_top((char*)&_estack);
245245
mp_stack_set_limit((char*)&_estack - (char*)&_ebss - 1024);
246246

247247
#if MICROPY_MAX_STACK_USAGE

0 commit comments

Comments
 (0)