mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
19eab31660
* Patched longjmp to be context-switch safe longjmp modifies the windowbase and windowstart registers, which isn't safe if a context switch occurs during the modification. After a context switch, windowstart and windowbase will be different, leading to a wrongly set windowstart bit due to longjmp writing it based on the windowbase before the context switch. This corrupts the registers at the next window overflow reaching that wrongly set bit. The solution is to disable interrupts during this code. It is only 6 instructions long, the impact shouldn't be significant. The fix is implemented as a wrapper which replaces the original first instructions of longjmp which are buggy. Then, it jumps back to execute the rest of the original longjmp function. Added a comparably reliable test to the test apps.
41 lines
1.3 KiB
CMake
41 lines
1.3 KiB
CMake
if(BOOTLOADER_BUILD)
|
|
# For bootloader, all we need is headers
|
|
idf_component_register(INCLUDE_DIRS include)
|
|
set(scripts
|
|
"esp32/ld/esp32.rom.ld"
|
|
"esp32/ld/esp32.rom.newlib-funcs.ld"
|
|
"esp32/ld/esp32.rom.libgcc.ld"
|
|
)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "${scripts}")
|
|
else()
|
|
# Regular app build
|
|
idf_component_register(SRCS "esp_rom.c" "patches/esp_rom_longjmp.S"
|
|
INCLUDE_DIRS include)
|
|
|
|
set(scripts
|
|
"esp32/ld/esp32.rom.ld"
|
|
"esp32/ld/esp32.rom.libgcc.ld"
|
|
"esp32/ld/esp32.rom.syscalls.ld"
|
|
"esp32/ld/esp32.rom.newlib-data.ld"
|
|
)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "${scripts}")
|
|
|
|
if(NOT CONFIG_SPIRAM_CACHE_WORKAROUND)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.newlib-funcs.ld")
|
|
endif()
|
|
|
|
if(CONFIG_NEWLIB_NANO_FORMAT)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.newlib-nano.ld")
|
|
endif()
|
|
|
|
if(NOT GCC_NOT_5_2_0)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.newlib-locale.ld")
|
|
endif()
|
|
|
|
if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH)
|
|
target_linker_script(${COMPONENT_LIB} INTERFACE "esp32/ld/esp32.rom.spiflash.ld")
|
|
endif()
|
|
|
|
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=longjmp")
|
|
endif()
|