Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions arch/arm/include/arm/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,13 @@
#ifndef __ASSEMBLY__
struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/

uint32_t *saved_regs;
#endif

/* Register save area with XCPTCONTEXT_SIZE, only valid when:
* 1.The task isn't running or
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv6-m/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -171,6 +172,7 @@ struct xcptcontext

uint32_t sigreturn;
#endif
#endif

#ifdef CONFIG_LIB_SYSCALL
/* The following array holds the return address and the exc_return value
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv7-a/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -273,6 +274,7 @@ struct xcptcontext
uint32_t sigreturn;

#endif
#endif /* CONFIG_ENABLE_ALL_SIGNALS */

/* Register save area with XCPTCONTEXT_SIZE, only valid when:
* 1.The task isn't running or
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv7-m/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -228,6 +229,7 @@ struct xcptcontext
uint32_t sigreturn;

#endif
#endif /* CONFIG_ENABLE_ALL_SIGNALS */

#ifdef CONFIG_LIB_SYSCALL
/* The following array holds the return address and the exc_return value
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv7-r/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -272,6 +273,7 @@ struct xcptcontext

uint32_t sigreturn;
#endif
#endif /* CONFIG_ENABLE_ALL_SIGNALS */

/* Register save area with XCPTCONTEXT_SIZE, only valid when:
* 1.The task isn't running or
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv8-m/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -239,6 +240,7 @@ struct xcptcontext
uint32_t sigreturn;

#endif
#endif /* CONFIG_ENABLE_ALL_SIGNALS */

#ifdef CONFIG_LIB_SYSCALL
/* The following array holds the return address and the exc_return value
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/include/armv8-r/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ struct xcpt_syscall_s

struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved copies of the context used during
* signal processing.
*/
Expand All @@ -272,6 +273,7 @@ struct xcptcontext

uint32_t sigreturn;
#endif
#endif /* CONFIG_ENABLE_ALL_SIGNALS */

/* Register save area with XCPTCONTEXT_SIZE, only valid when:
* 1.The task isn't running or
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/include/tlsr82/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,13 @@
#ifndef __ASSEMBLY__
struct xcptcontext
{
#ifdef CONFIG_ENABLE_ALL_SIGNALS
/* These are saved register array pointer used during
* signal processing.
*/

uint32_t *saved_regs;

#endif /* CONFIG_ENABLE_ALL_SIGNALS */
/* Register save area */

uint32_t *regs;
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/src/arm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ list(
arm_vectortab.S
arm_saveusercontext.S)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(CONFIG_PAGING)
list(APPEND SRCS arm_pginitialize.c arm_checkmapping.c arm_allocpage.c
arm_va2pte.c)
Expand Down
8 changes: 6 additions & 2 deletions arch/arm/src/arm/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ include common/Make.defs
HEAD_ASRC = arm_head.S

CMN_CSRCS += arm_dataabort.c arm_doirq.c arm_initialstate.c
CMN_CSRCS += arm_prefetchabort.c arm_schedulesigaction.c
CMN_CSRCS += arm_sigdeliver.c arm_syscall.c arm_tcbinfo.c
CMN_CSRCS += arm_prefetchabort.c
CMN_CSRCS += arm_syscall.c arm_tcbinfo.c
CMN_CSRCS += arm_undefinedinsn.c

CMN_ASRCS += arm_cache.S arm_vectors.S arm_vectortab.S
CMN_ASRCS += arm_saveusercontext.S

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifeq ($(CONFIG_LEGACY_PAGING),y)
CMN_CSRCS += arm_pginitialize.c arm_checkmapping.c arm_allocpage.c arm_va2pte.c
endif
6 changes: 4 additions & 2 deletions arch/arm/src/armv6-m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ set(SRCS
arm_doirq.c
arm_hardfault.c
arm_initialstate.c
arm_schedulesigaction.c
arm_sigdeliver.c
arm_svcall.c
arm_systemreset.c
arm_tcbinfo.c
arm_trigger_irq.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS)
list(APPEND SRCS arm_vectors.c)
endif()
Expand Down
6 changes: 5 additions & 1 deletion arch/arm/src/armv6-m/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ include common/Make.defs
CMN_ASRCS += arm_exception.S arm_saveusercontext.S

CMN_CSRCS += arm_cpuinfo.c arm_doirq.c arm_hardfault.c arm_initialstate.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_svcall.c
CMN_CSRCS += arm_svcall.c
CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c
CMN_CSRCS += arm_trigger_irq.c

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifneq ($(CONFIG_ARCH_HAVE_CUSTOM_VECTORS),y)
CMN_CSRCS += arm_vectors.c
endif
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/src/armv7-a/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,16 @@ list(
arm_initialstate.c
arm_mmu.c
arm_prefetchabort.c
arm_schedulesigaction.c
arm_sigdeliver.c
arm_syscall.c
arm_tcbinfo.c
arm_undefinedinsn.c
arm_perf.c
cp15_cacheops.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(CONFIG_ARMV7A_GICv2M)
list(APPEND SRCS arm_gicv2m.c)
endif()
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/src/armv7-a/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ CMN_ASRCS += arm_cpuhead.S arm_vectors.S arm_saveusercontext.S
CMN_CSRCS += arm_cache.c arm_cpuinfo.c arm_dataabort.c
CMN_CSRCS += arm_doirq.c arm_gicv2.c arm_gicv2_dump.c
CMN_CSRCS += arm_initialstate.c arm_mmu.c arm_prefetchabort.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
CMN_CSRCS += arm_syscall.c arm_tcbinfo.c arm_undefinedinsn.c
CMN_CSRCS += arm_perf.c cp15_cacheops.c

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifeq ($(CONFIG_ARMV7A_GICv2M),y)
CMN_CSRCS += arm_gicv2m.c
endif
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/src/armv7-m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ set(SRCS
arm_itm.c
arm_memfault.c
arm_perf.c
arm_schedulesigaction.c
arm_sigdeliver.c
arm_svcall.c
arm_systemreset.c
arm_tcbinfo.c
arm_trigger_irq.c
arm_usagefault.c
arm_dbgmonitor.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS)
list(APPEND SRCS arm_vectors.c)
endif()
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/src/armv7-m/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ CMN_ASRCS += arm_exception.S arm_saveusercontext.S
CMN_CSRCS += arm_busfault.c arm_cache.c arm_cpuinfo.c arm_doirq.c
CMN_CSRCS += arm_hardfault.c arm_initialstate.c arm_itm.c
CMN_CSRCS += arm_memfault.c arm_perf.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_tcbinfo.c
CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_dbgmonitor.c

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifneq ($(CONFIG_ARCH_HAVE_CUSTOM_VECTORS),y)
CMN_CSRCS += arm_vectors.c
endif
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/src/armv7-r/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,16 @@ list(
arm_doirq.c
arm_initialstate.c
arm_prefetchabort.c
arm_schedulesigaction.c
arm_sigdeliver.c
arm_syscall.c
arm_tcbinfo.c
arm_undefinedinsn.c
arm_perf.c
cp15_cacheops.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(NOT CONFIG_ARCH_CHIP STREQUAL tms570)
list(APPEND SRCS arm_gicv2.c arm_gicv2_dump.c)
endif()
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/src/armv7-r/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,17 @@ HEAD_ASRC += arm_vectortab.S
CMN_CSRCS += arm_cache.c arm_cpuinfo.c arm_dataabort.c
CMN_CSRCS += arm_doirq.c arm_gicv2.c arm_gicv2_dump.c
CMN_CSRCS += arm_initialstate.c arm_prefetchabort.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
CMN_CSRCS += arm_syscall.c arm_tcbinfo.c arm_undefinedinsn.c
CMN_CSRCS += arm_perf.c cp15_cacheops.c

# Common C source files

CMN_ASRCS += arm_head.S arm_vectors.S arm_saveusercontext.S

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifeq ($(CONFIG_ARMV7R_HAVE_PTM), y)
CMN_CSRCS += arm_timer.c
endif
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/src/armv8-m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@ set(SRCS
arm_memfault.c
arm_perf.c
arm_sau.c
arm_schedulesigaction.c
arm_securefault.c
arm_secure_irq.c
arm_sigdeliver.c
arm_svcall.c
arm_systemreset.c
arm_tcbinfo.c
arm_trigger_irq.c
arm_usagefault.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS)
list(APPEND SRCS arm_vectors.c)
endif()
Expand Down
8 changes: 6 additions & 2 deletions arch/arm/src/armv8-m/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@ CMN_ASRCS += arm_exception.S arm_saveusercontext.S
CMN_CSRCS += arm_busfault.c arm_cache.c arm_cpuinfo.c arm_doirq.c
CMN_CSRCS += arm_hardfault.c arm_initialstate.c arm_itm.c
CMN_CSRCS += arm_memfault.c arm_perf.c arm_sau.c
CMN_CSRCS += arm_schedulesigaction.c arm_securefault.c arm_secure_irq.c
CMN_CSRCS += arm_sigdeliver.c arm_svcall.c
CMN_CSRCS += arm_securefault.c arm_secure_irq.c
CMN_CSRCS += arm_svcall.c
CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c
CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_dbgmonitor.c

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

ifneq ($(CONFIG_ARCH_HAVE_CUSTOM_VECTORS),y)
CMN_CSRCS += arm_vectors.c
endif
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/src/armv8-r/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@ list(
arm_gicv3.c
arm_initialstate.c
arm_prefetchabort.c
arm_schedulesigaction.c
arm_sigdeliver.c
arm_syscall.c
arm_tcbinfo.c
arm_undefinedinsn.c
arm_perf.c
cp15_cacheops.c)

if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_schedulesigaction.c arm_sigdeliver.c)
endif()

if(CONFIG_ARCH_FPU)
list(APPEND SRCS arm_fpucmp.c arm_fpuconfig.S)
endif()
Expand Down
5 changes: 4 additions & 1 deletion arch/arm/src/armv8-r/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ HEAD_ASRC += arm_vectortab.S
CMN_CSRCS += arm_timer.c arm_cache.c arm_cpuinfo.c arm_dataabort.c
CMN_CSRCS += arm_doirq.c arm_gicv3.c
CMN_CSRCS += arm_initialstate.c arm_prefetchabort.c
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
CMN_CSRCS += arm_syscall.c arm_tcbinfo.c arm_undefinedinsn.c
CMN_CSRCS += arm_perf.c cp15_cacheops.c

ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
endif

# Common C source files

CMN_ASRCS += arm_head.S arm_vectors.S arm_saveusercontext.S
Expand Down
11 changes: 7 additions & 4 deletions arch/arm/src/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,14 @@ if(NOT CONFIG_ARCH_IDLE_CUSTOM)
endif()

if(CONFIG_BUILD_PROTECTED OR CONFIG_BUILD_KERNEL)
list(APPEND SRCS arm_task_start.c arm_pthread_start.c arm_signal_dispatch.c)
list(APPEND SRCS arm_task_start.c arm_pthread_start.c)

if(CONFIG_BUILD_PROTECTED)
target_sources(arch_interface
PRIVATE ${ARCH_TOOLCHAIN_PATH}/arm_signal_handler.S)
if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS arm_signal_dispatch.c)
if(CONFIG_BUILD_PROTECTED)
target_sources(arch_interface
PRIVATE ${ARCH_TOOLCHAIN_PATH}/arm_signal_handler.S)
endif()
endif()
endif()

Expand Down
Loading
Loading