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

Merge pull request #3160 from tannewt/enable_pystack

Browse Source 
Enable PYSTACK to keep function state out of the heap
This commit is contained in:
Scott Shawcroft 2020-07-21 13:38:52 -07:00 committed by GitHub
commit cb7df2e1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -97,6 +97,10 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
} }
} }
#if MICROPY_ENABLE_PYSTACK
static size_t PLACE_IN_DTCM_BSS(_pystack[CIRCUITPY_PYSTACK_SIZE / sizeof(size_t)]);
#endif
void start_mp(supervisor_allocation* heap) { void start_mp(supervisor_allocation* heap) {
reset_status_led(); reset_status_led();
autoreload_stop(); autoreload_stop();
@ -125,6 +129,10 @@ void start_mp(supervisor_allocation* heap) {
// Clear the readline history. It references the heap we're about to destroy. // Clear the readline history. It references the heap we're about to destroy.
readline_init0(); readline_init0();
#if MICROPY_ENABLE_PYSTACK
mp_pystack_init(_pystack, _pystack + (sizeof(_pystack) / sizeof(size_t)));
#endif
#if MICROPY_ENABLE_GC #if MICROPY_ENABLE_GC
gc_init(heap->ptr, heap->ptr + heap->length / 4); gc_init(heap->ptr, heap->ptr + heap->length / 4);
#endif #endif

8
ports/atmel-samd/boards/uchip/mpconfigboard.mk
View File

@ -10,9 +10,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE LONGINT_IMPL = NONE
CIRCUITPY_FULL_BUILD = 0 CIRCUITPY_FULL_BUILD = 0
# Tweak inlining depending on language. # Always use aggressive inlining
ifeq ($(TRANSLATION), zh_Latn_pinyin)
CFLAGS_INLINE_LIMIT = 45 CFLAGS_INLINE_LIMIT = 45
else
CFLAGS_INLINE_LIMIT = 70 SUPEROPT_GC = 0
endif

5
py/circuitpy_mpconfig.h
View File

@ -119,6 +119,7 @@
#define MICROPY_QSTR_BYTES_IN_HASH (1) #define MICROPY_QSTR_BYTES_IN_HASH (1)
#define MICROPY_REPL_AUTO_INDENT (1) #define MICROPY_REPL_AUTO_INDENT (1)
#define MICROPY_REPL_EVENT_DRIVEN (0) #define MICROPY_REPL_EVENT_DRIVEN (0)
#define MICROPY_ENABLE_PYSTACK (1)
#define MICROPY_STACK_CHECK (1) #define MICROPY_STACK_CHECK (1)
#define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_STREAMS_NON_BLOCK (1)
#ifndef MICROPY_USE_INTERNAL_PRINTF #ifndef MICROPY_USE_INTERNAL_PRINTF
@ -785,6 +786,10 @@ void supervisor_run_background_tasks_if_tick(void);
#define CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS 1000 #define CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS 1000
#endif #endif
#ifndef CIRCUITPY_PYSTACK_SIZE
#define CIRCUITPY_PYSTACK_SIZE 1024
#endif
#define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt" #define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt"
#define CIRCUITPY_VERBOSE_BLE 0 #define CIRCUITPY_VERBOSE_BLE 0