djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pystack_size as multiple of sizeof size_t, no more stackless via settings.toml

This commit is contained in:
Bill Sideris 2023-02-15 17:54:52 +02:00
parent 0d5b400b33
commit 2077bb9da9
No known key found for this signature in database
GPG Key ID: 1BEF1BCEBA58EA33
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -122,7 +122,7 @@
uint8_t value_out = 0; uint8_t value_out = 0;
#endif #endif
#if MICROPY_ENABLE_PYSTACK #if MICROPY_ENABLE_PYSTACK && CIRCUITPY_OS_GETENV
#include "shared-module/os/__init__.h" #include "shared-module/os/__init__.h"
#endif #endif
@ -160,9 +160,7 @@ STATIC void start_mp(supervisor_allocation *heap, supervisor_allocation *pystack
readline_init0(); readline_init0();
#if MICROPY_ENABLE_PYSTACK #if MICROPY_ENABLE_PYSTACK
if (pystack_size > 0) { mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
mp_pystack_init(pystack->ptr, pystack->ptr + (pystack_size / sizeof(size_t)));
}
#endif #endif
#if MICROPY_ENABLE_GC #if MICROPY_ENABLE_GC
@ -995,9 +993,11 @@ int __attribute__((used)) main(void) {
// Leaves size to build default on any failure // Leaves size to build default on any failure
(void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size); (void)common_hal_os_getenv_int("CIRCUITPY_PYSTACK_SIZE", &pystack_size);
free_memory(heap); free_memory(heap);
// Convert frame count to allocation size, 384 is the default for 1536 bytes
pystack_size = pystack_size * sizeof(size_t);
// Check if value is valid multiple of size_t else revert // Check if value is valid
if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size > 0) && (pystack_size % sizeof(size_t) != 0)) { if ((CIRCUITPY_PYSTACK_SIZE != pystack_size) && (pystack_size < 1)) {
pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset to build default
// TODO: Find a way to inform the user about it. // TODO: Find a way to inform the user about it.
// Perhaps safemode? // Perhaps safemode?
@ -1005,9 +1005,7 @@ int __attribute__((used)) main(void) {
if (CIRCUITPY_PYSTACK_SIZE != pystack_size) { if (CIRCUITPY_PYSTACK_SIZE != pystack_size) {
free_memory(pystack); // Free the temporary free_memory(pystack); // Free the temporary
if (pystack_size > 0) { // Allocate new if needed pystack = allocate_memory(pystack_size, false, false); // Allocate new pystack
pystack = allocate_memory(pystack_size, false, false);
}
} }
#endif #endif
#endif #endif