From 91a5770fd2472208e7cea17d7506a9b67c685ebc Mon Sep 17 00:00:00 2001 From: Renz Bagaporo Date: Fri, 22 Jan 2021 10:55:50 +0800 Subject: [PATCH] arch: move shared stack implementation to esp_system --- .../port/arch/riscv/expression_with_stack.c} | 0 .../port/arch/riscv/expression_with_stack_asm.S} | 0 .../port/arch/xtensa/expression_with_stack.c} | 2 -- .../port/arch/xtensa/expression_with_stack_asm.S} | 0 components/esp_system/port/soc/esp32/CMakeLists.txt | 2 ++ components/esp_system/port/soc/esp32c3/CMakeLists.txt | 2 ++ components/esp_system/port/soc/esp32s2/CMakeLists.txt | 2 ++ components/esp_system/port/soc/esp32s3/CMakeLists.txt | 2 ++ components/riscv/CMakeLists.txt | 2 -- components/xtensa/CMakeLists.txt | 2 -- 10 files changed, 8 insertions(+), 6 deletions(-) rename components/{riscv/expression_with_stack_riscv.c => esp_system/port/arch/riscv/expression_with_stack.c} (100%) rename components/{riscv/expression_with_stack_riscv_asm.S => esp_system/port/arch/riscv/expression_with_stack_asm.S} (100%) rename components/{xtensa/expression_with_stack_xtensa.c => esp_system/port/arch/xtensa/expression_with_stack.c} (97%) rename components/{xtensa/expression_with_stack_xtensa_asm.S => esp_system/port/arch/xtensa/expression_with_stack_asm.S} (100%) diff --git a/components/riscv/expression_with_stack_riscv.c b/components/esp_system/port/arch/riscv/expression_with_stack.c similarity index 100% rename from components/riscv/expression_with_stack_riscv.c rename to components/esp_system/port/arch/riscv/expression_with_stack.c diff --git a/components/riscv/expression_with_stack_riscv_asm.S b/components/esp_system/port/arch/riscv/expression_with_stack_asm.S similarity index 100% rename from components/riscv/expression_with_stack_riscv_asm.S rename to components/esp_system/port/arch/riscv/expression_with_stack_asm.S diff --git a/components/xtensa/expression_with_stack_xtensa.c b/components/esp_system/port/arch/xtensa/expression_with_stack.c similarity index 97% rename from components/xtensa/expression_with_stack_xtensa.c rename to components/esp_system/port/arch/xtensa/expression_with_stack.c index 6002c86821..22ba16268b 100644 --- a/components/xtensa/expression_with_stack_xtensa.c +++ b/components/esp_system/port/arch/xtensa/expression_with_stack.c @@ -13,8 +13,6 @@ // limitations under the License. #include -#include -#include #include #include #include "freertos/FreeRTOS.h" diff --git a/components/xtensa/expression_with_stack_xtensa_asm.S b/components/esp_system/port/arch/xtensa/expression_with_stack_asm.S similarity index 100% rename from components/xtensa/expression_with_stack_xtensa_asm.S rename to components/esp_system/port/arch/xtensa/expression_with_stack_asm.S diff --git a/components/esp_system/port/soc/esp32/CMakeLists.txt b/components/esp_system/port/soc/esp32/CMakeLists.txt index 388edd5a6e..f2823aea1e 100644 --- a/components/esp_system/port/soc/esp32/CMakeLists.txt +++ b/components/esp_system/port/soc/esp32/CMakeLists.txt @@ -3,6 +3,8 @@ set(srcs "dport_panic_highint_hdl.S" "reset_reason.c" "../../arch/xtensa/panic_arch.c" "../../arch/xtensa/panic_handler_asm.S" + "../../arch/xtensa/expression_with_stack.c" + "../../arch/xtensa/expression_with_stack_asm.S" ) add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" ${srcs}) diff --git a/components/esp_system/port/soc/esp32c3/CMakeLists.txt b/components/esp_system/port/soc/esp32c3/CMakeLists.txt index 7a0a56c9ee..a5792ab4cd 100644 --- a/components/esp_system/port/soc/esp32c3/CMakeLists.txt +++ b/components/esp_system/port/soc/esp32c3/CMakeLists.txt @@ -2,6 +2,8 @@ set(srcs "clk.c" "reset_reason.c" "../../async_memcpy_impl_gdma.c" "apb_backup_dma.c" + "../../arch/riscv/expression_with_stack.c" + "../../arch/riscv/expression_with_stack_asm.S" "../../arch/riscv/panic_arch.c") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" ${srcs}) diff --git a/components/esp_system/port/soc/esp32s2/CMakeLists.txt b/components/esp_system/port/soc/esp32s2/CMakeLists.txt index 443c34c8c0..e955d23499 100644 --- a/components/esp_system/port/soc/esp32s2/CMakeLists.txt +++ b/components/esp_system/port/soc/esp32s2/CMakeLists.txt @@ -4,6 +4,8 @@ set(srcs "async_memcpy_impl_cp_dma.c" "reset_reason.c" "../../arch/xtensa/panic_arch.c" "../../arch/xtensa/panic_handler_asm.S" + "../../arch/xtensa/expression_with_stack.c" + "../../arch/xtensa/expression_with_stack_asm.S" ) add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" ${srcs}) diff --git a/components/esp_system/port/soc/esp32s3/CMakeLists.txt b/components/esp_system/port/soc/esp32s3/CMakeLists.txt index d35152b1d3..28bc5712b3 100644 --- a/components/esp_system/port/soc/esp32s3/CMakeLists.txt +++ b/components/esp_system/port/soc/esp32s3/CMakeLists.txt @@ -4,6 +4,8 @@ set(srcs "dport_panic_highint_hdl.S" "../../async_memcpy_impl_gdma.c" "../../arch/xtensa/panic_arch.c" "../../arch/xtensa/panic_handler_asm.S" + "../../arch/xtensa/expression_with_stack.c" + "../../arch/xtensa/expression_with_stack_asm.S" ) add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" ${srcs}) diff --git a/components/riscv/CMakeLists.txt b/components/riscv/CMakeLists.txt index 0290ca9937..978d4ebdd4 100644 --- a/components/riscv/CMakeLists.txt +++ b/components/riscv/CMakeLists.txt @@ -7,8 +7,6 @@ if(BOOTLOADER_BUILD) else() set(priv_requires soc freertos) set(srcs - "expression_with_stack_riscv.c" - "expression_with_stack_riscv_asm.S" "instruction_decode.c" "interrupt.c" "stdatomic.c" diff --git a/components/xtensa/CMakeLists.txt b/components/xtensa/CMakeLists.txt index 3fa959a936..d996ce6f0f 100644 --- a/components/xtensa/CMakeLists.txt +++ b/components/xtensa/CMakeLists.txt @@ -9,8 +9,6 @@ else() set(priv_requires soc freertos) set(srcs "debug_helpers.c" "debug_helpers_asm.S" - "expression_with_stack_xtensa.c" - "expression_with_stack_xtensa_asm.S" "eri.c" "trax.c" "xtensa_intr.c"