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

qemu-arm: Use gchelper code to get registers for GC scanning.

Browse Source
This commit is contained in:
Damien George 2019-02-12 14:48:29 +11:00
parent c9ece68d06
commit d53dc04903
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/qemu-arm/Makefile
View File

@ -13,6 +13,7 @@ ifeq ($(BOARD),netduino2)
CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_STM32 CFLAGS += -DQEMU_SOC_STM32
LDSCRIPT = stm32.ld LDSCRIPT = stm32.ld
SRC_BOARD_O = lib/utils/gchelper_m3.o
endif endif
ifeq ($(BOARD),microbit) ifeq ($(BOARD),microbit)
@ -20,12 +21,14 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_NRF51 CFLAGS += -DQEMU_SOC_NRF51
LDSCRIPT = nrf51.ld LDSCRIPT = nrf51.ld
QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144 QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
SRC_BOARD_O = lib/utils/gchelper_m0.o
endif endif
ifeq ($(BOARD),mps2-an385) ifeq ($(BOARD),mps2-an385)
CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_MPS2 CFLAGS += -DQEMU_SOC_MPS2
LDSCRIPT = mps2.ld LDSCRIPT = mps2.ld
SRC_BOARD_O = lib/utils/gchelper_m3.o
endif endif
CROSS_COMPILE = arm-none-eabi- CROSS_COMPILE = arm-none-eabi-
@ -95,6 +98,7 @@ LIB_SRC_C += $(addprefix lib/,\
OBJ_COMMON = OBJ_COMMON =
OBJ_COMMON += $(PY_O) OBJ_COMMON += $(PY_O)
OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o)) OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o))
OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_BOARD_O))
OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
OBJ_RUN = OBJ_RUN =

6
ports/qemu-arm/test_main.c
View File

@ -11,6 +11,7 @@
#include "py/stackctrl.h" #include "py/stackctrl.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "lib/utils/gchelper.h"
#include "tinytest.h" #include "tinytest.h"
#include "tinytest_macros.h" #include "tinytest_macros.h"
@ -33,9 +34,8 @@ void gc_collect(void) {
gc_collect_start(); gc_collect_start();
// get the registers and the sp // get the registers and the sp
// TODO get registers uintptr_t regs[10];
volatile mp_uint_t dummy; uintptr_t sp = gc_helper_get_regs_and_sp(regs);
void *sp = (void*)&dummy;
// trace the stack, including the registers (since they live on the stack in this function) // trace the stack, including the registers (since they live on the stack in this function)
gc_collect_root((void**)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - (uint32_t)sp) / sizeof(uint32_t)); gc_collect_root((void**)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - (uint32_t)sp) / sizeof(uint32_t));