jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

esp32/mpconfigport: Enable the RV32 emitter for ESP32C3 targets.

Browse source 
The RV32 code emitter assumed that the arch-specific NLR was used
instead of the setjmp/longjmp based NLR code.  If the latter NLR
provider was chosen, the emitter would allocate space on the stack
for the NLR buffer but would not fill it in.

This change turns off setjmp()-based NLR and GCREGS for the ESP32C3
target, in favour of more platform-tailored alternatives.  As setjmp()
NLR is now disabled by default, the RV32 emitter can be safely enabled
by default as well for the target in question.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
This commit is contained in:
Alessandro Gatti 2024-07-02 22:49:47 +02:00 committed by Damien George
parent 4a134d212e
commit 6007f3e206
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ports/esp32/mpconfigport.h
View file

@ -18,9 +18,8 @@
// object representation and NLR handling // object representation and NLR handling
#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A) #define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
#if !CONFIG_IDF_TARGET_ESP32C3
#define MICROPY_NLR_SETJMP (1) #define MICROPY_NLR_SETJMP (1)
#if CONFIG_IDF_TARGET_ESP32C3
#define MICROPY_GCREGS_SETJMP (1)
#endif #endif
// memory allocation policies // memory allocation policies
@ -44,6 +43,8 @@
#define MICROPY_PERSISTENT_CODE_LOAD (1) #define MICROPY_PERSISTENT_CODE_LOAD (1)
#if !CONFIG_IDF_TARGET_ESP32C3 #if !CONFIG_IDF_TARGET_ESP32C3
#define MICROPY_EMIT_XTENSAWIN (1) #define MICROPY_EMIT_XTENSAWIN (1)
#else
#define MICROPY_EMIT_RV32 (1)
#endif #endif
// workaround for xtensa-esp32-elf-gcc esp-2020r3, which can generate wrong code for loops // workaround for xtensa-esp32-elf-gcc esp-2020r3, which can generate wrong code for loops