summaryrefslogtreecommitdiffstatshomepage
path: root/py/cstack.c
diff options
context:
space:
mode:
authorAngus Gratton <angus@redyak.com.au>2024-08-06 15:51:22 +1000
committerDamien George <damien@micropython.org>2024-08-14 12:55:45 +1000
commit86f2c285eb222f30c24df187ac66d3e0c80caf61 (patch)
tree98649096d2baa4a7058a761730d738f41c0f5e72 /py/cstack.c
parent6c870dc5ecc048309f7fcb21324b1aed165afdb0 (diff)
downloadmicropython-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/cstack.c')
-rw-r--r--py/cstack.c57
1 files changed, 57 insertions, 0 deletions
diff --git a/py/cstack.c b/py/cstack.c
new file mode 100644
index 0000000000..fe4b16d652
--- /dev/null
+++ b/py/cstack.c
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copryight (c) 2024 Angus Gratton
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/cstack.h"
+
+void mp_cstack_init_with_sp_here(size_t stack_size) {
+ #if __GNUC__ >= 13
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdangling-pointer"
+ #endif
+ volatile int stack_dummy;
+ mp_cstack_init_with_top((void *)&stack_dummy, stack_size);
+ #if __GNUC__ >= 13
+ #pragma GCC diagnostic pop
+ #endif
+}
+
+mp_uint_t mp_cstack_usage(void) {
+ // Assumes descending stack
+ volatile int stack_dummy;
+ return MP_STATE_THREAD(stack_top) - (char *)&stack_dummy;
+}
+
+#if MICROPY_STACK_CHECK
+
+void mp_cstack_check(void) {
+ if (mp_cstack_usage() >= MP_STATE_THREAD(stack_limit)) {
+ mp_raise_recursion_depth();
+ }
+}
+
+#endif // MICROPY_STACK_CHECK