Update WASM port, enable some more flags for memory debugging

lvgl · Aug 23, 2023 · f77644e · f77644e
1 parent 418b5d0
commit f77644e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
@@ -31,7 +31,7 @@ CFLAGS += -std=gnu99 -Wall -Wno-error -Wdouble-promotion -Wfloat-conversion
 CFLAGS += -DNDEBUG
 ifneq ($(EM_DEBUG),)
 CFLAGS += -g3 -O0
-LDFLAGS += -g3 -O0
+LDFLAGS += -g3 -O0 -sSAFE_HEAP=1 -sASSERTIONS=2
 else
 CFLAGS += -Os
 endif
@@ -94,6 +94,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 JSFLAGS += -s ASYNCIFY
+JSFLAGS += -s ASYNCIFY_STACK_SIZE=81920
 JSFLAGS += -s 'ASYNCIFY_IMPORTS=["mp_js_sleep_with_intr"]' -s WASM=1 -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1
 JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt', '_mp_handle_pending']"
 JSFLAGS += -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']"

diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
@@ -163,16 +163,6 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-#if MICROPY_PY_LVGL
-#ifndef MICROPY_INCLUDED_PY_MPSTATE_H
-#define MICROPY_INCLUDED_PY_MPSTATE_H
-#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h"
-#undef MICROPY_INCLUDED_PY_MPSTATE_H
-#else
-#include "lib/lv_bindings/lvgl/src/misc/lv_gc.h"
-#endif
-#endif
-
 // #define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
 #if MICROPY_PY_THREAD
 #define MICROPY_EVENT_POLL_HOOK \