diff options
| author | Angus Gratton <angus@redyak.com.au> | 2024-08-06 15:51:22 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-08-14 12:55:45 +1000 |
| commit | 86f2c285eb222f30c24df187ac66d3e0c80caf61 (patch) | |
| tree | 98649096d2baa4a7058a761730d738f41c0f5e72 /py/objgenerator.c | |
| parent | 6c870dc5ecc048309f7fcb21324b1aed165afdb0 (diff) | |
| download | micropython-86f2c285eb222f30c24df187ac66d3e0c80caf61.tar.gz micropython-86f2c285eb222f30c24df187ac66d3e0c80caf61.zip | |
py: Add new cstack API for stack checking, with limit margin macro.
Currently the stack limit margin is hard-coded in each port's call to
`mp_stack_set_limit()`, but on threaded ports it's fiddlier and can lead to
bugs (such as incorrect thread stack margin on esp32).
This commit provides a new API to initialise the C Stack in one function
call, with a config macro to set the margin. Where possible the new call
is inlined to reduce code size in thread-free ports.
Intended replacement for `MP_TASK_STACK_LIMIT_MARGIN` on esp32.
The previous `stackctrl.h` API is still present and unmodified apart from a
deprecation comment. However it's not available when the
`MICROPY_PREVIEW_VERSION_2` macro is set.
This work was funded through GitHub Sponsors.
Signed-off-by: Angus Gratton <angus@redyak.com.au>
Diffstat (limited to 'py/objgenerator.c')
| -rw-r--r-- | py/objgenerator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c index 431cbad5a7..df9701094b 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -33,7 +33,7 @@ #include "py/objstr.h" #include "py/objgenerator.h" #include "py/objfun.h" -#include "py/stackctrl.h" +#include "py/cstack.h" // Instance of GeneratorExit exception - needed by generator.close() const mp_obj_exception_t mp_const_GeneratorExit_obj = {{&mp_type_GeneratorExit}, 0, 0, NULL, (mp_obj_tuple_t *)&mp_const_empty_tuple_obj}; @@ -151,7 +151,7 @@ static void gen_instance_print(const mp_print_t *print, mp_obj_t self_in, mp_pri } mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) { - MP_STACK_CHECK(); + mp_cstack_check(); mp_check_self(mp_obj_is_type(self_in, &mp_type_gen_instance)); mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in); if (self->code_state.ip == 0) { |