This is an automated email from the ASF dual-hosted git repository.
xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new a0339facde5 arm_m: add directory and move arm_tcbinfo into arm_m
a0339facde5 is described below
commit a0339facde55766e856a6c0a2241d4693d43faba
Author: buxiasen <[email protected]>
AuthorDate: Fri Nov 7 15:07:42 2025 +0800
arm_m: add directory and move arm_tcbinfo into arm_m
add directory and move arm_tcbinfo into arm_m
Signed-off-by: buxiasen <[email protected]>
---
arch/arm/src/CMakeLists.txt | 1 +
arch/arm/src/Makefile | 3 +
arch/arm/src/{ => arm_m}/CMakeLists.txt | 22 +----
arch/arm/src/{armv6-m => arm_m}/Make.defs | 35 +-------
arch/arm/src/{armv6-m => arm_m}/arm_tcbinfo.c | 2 +-
arch/arm/src/armv6-m/CMakeLists.txt | 1 -
arch/arm/src/armv6-m/Make.defs | 7 +-
arch/arm/src/armv7-m/CMakeLists.txt | 1 -
arch/arm/src/armv7-m/Make.defs | 5 +-
arch/arm/src/armv7-m/arm_tcbinfo.c | 124 --------------------------
arch/arm/src/armv8-m/CMakeLists.txt | 1 -
arch/arm/src/armv8-m/Make.defs | 5 +-
arch/arm/src/armv8-m/arm_tcbinfo.c | 124 --------------------------
arch/arm/src/cmake/Toolchain.cmake | 3 +
14 files changed, 26 insertions(+), 308 deletions(-)
diff --git a/arch/arm/src/CMakeLists.txt b/arch/arm/src/CMakeLists.txt
index 3ffe34a5a72..4e964ee7f0b 100644
--- a/arch/arm/src/CMakeLists.txt
+++ b/arch/arm/src/CMakeLists.txt
@@ -20,6 +20,7 @@
#
#
##############################################################################
+# ARCH_SUBDIR_ARM contains shared sources for the ARM A/R and ARM M families.
add_subdirectory(${ARCH_SUBDIR})
add_subdirectory(${NUTTX_CHIP_ABS_DIR} exclude_chip EXCLUDE_FROM_ALL)
add_subdirectory(common)
diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index f5f4597e579..99fd0ab2e76 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -43,10 +43,13 @@ ARCH_SUBDIR = armv8-r
ARCH_SUBDIR_ARM = arm_a_r
else ifeq ($(CONFIG_ARCH_ARMV7M),y) # ARMv7-M
ARCH_SUBDIR = armv7-m
+ARCH_SUBDIR_ARM = arm_m
else ifeq ($(CONFIG_ARCH_ARMV8M),y) # ARMv8-M
ARCH_SUBDIR = armv8-m
+ARCH_SUBDIR_ARM = arm_m
else ifeq ($(CONFIG_ARCH_ARMV6M),y) # ARMv6-M
ARCH_SUBDIR = armv6-m
+ARCH_SUBDIR_ARM = arm_m
else # ARM9, ARM7TDMI, etc.
ARCH_SUBDIR = arm
ARCH_SUBDIR_ARM = arm_a_r
diff --git a/arch/arm/src/CMakeLists.txt b/arch/arm/src/arm_m/CMakeLists.txt
similarity index 56%
copy from arch/arm/src/CMakeLists.txt
copy to arch/arm/src/arm_m/CMakeLists.txt
index 3ffe34a5a72..62b41467a85 100644
--- a/arch/arm/src/CMakeLists.txt
+++ b/arch/arm/src/arm_m/CMakeLists.txt
@@ -1,7 +1,5 @@
#
##############################################################################
-# arch/arm/src/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
+# arch/arm/src/arm_m/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
# license agreements. See the NOTICE file distributed with this work for
@@ -20,20 +18,6 @@
#
#
##############################################################################
-add_subdirectory(${ARCH_SUBDIR})
-add_subdirectory(${NUTTX_CHIP_ABS_DIR} exclude_chip EXCLUDE_FROM_ALL)
-add_subdirectory(common)
-if(NOT ${ARCH_SUBDIR_ARM})
- add_subdirectory(${ARCH_SUBDIR_ARM})
-endif()
-
-# Include directories (before system ones) as PUBLIC so that it can be exposed
-# to libboard
-target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common
- ${ARCH_SUBDIR}
${ARCH_SUBDIR_ARM})
+list(APPEND CSRCS arm_tcbinfo.c)
-if(CONFIG_BUILD_PROTECTED)
- target_include_directories(
- arch_interface BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common ${ARCH_SUBDIR}
- ${ARCH_SUBDIR_ARM})
-endif()
+target_sources(arch PRIVATE ${CSRCS})
diff --git a/arch/arm/src/armv6-m/Make.defs b/arch/arm/src/arm_m/Make.defs
similarity index 53%
copy from arch/arm/src/armv6-m/Make.defs
copy to arch/arm/src/arm_m/Make.defs
index 666f2f5f307..7baa18f1abc 100644
--- a/arch/arm/src/armv6-m/Make.defs
+++ b/arch/arm/src/arm_m/Make.defs
@@ -1,7 +1,5 @@
############################################################################
-# arch/arm/src/armv6-m/Make.defs
-#
-# SPDX-License-Identifier: Apache-2.0
+# arch/arm/src/arm_m/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -20,33 +18,6 @@
#
############################################################################
-# Common ARM files
-
-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_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
-
-ifneq ($(filter y,$(CONFIG_DEBUG_FEATURES)$(CONFIG_ARM_COREDUMP_REGION)),)
- CMN_CSRCS += arm_dumpnvic.c
-endif
-
-ifeq ($(CONFIG_ARCH_RAMVECTORS),y)
- CMN_CSRCS += arm_ramvec_initialize.c arm_ramvec_attach.c
-endif
+# Common ARM_M files
-ifeq ($(CONFIG_LIB_SYSCALL),y)
- CMN_ASRCS += arm_dispatch_syscall.S
-endif
+CMN_CSRCS += arm_tcbinfo.c
diff --git a/arch/arm/src/armv6-m/arm_tcbinfo.c
b/arch/arm/src/arm_m/arm_tcbinfo.c
similarity index 98%
rename from arch/arm/src/armv6-m/arm_tcbinfo.c
rename to arch/arm/src/arm_m/arm_tcbinfo.c
index 04e8646b3c9..a682c75d7a8 100644
--- a/arch/arm/src/armv6-m/arm_tcbinfo.c
+++ b/arch/arm/src/arm_m/arm_tcbinfo.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/arm/src/armv6-m/arm_tcbinfo.c
+ * arch/arm/src/arm_m/arm_tcbinfo.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/arm/src/armv6-m/CMakeLists.txt
b/arch/arm/src/armv6-m/CMakeLists.txt
index d5d289a6369..3defd55cf3e 100644
--- a/arch/arm/src/armv6-m/CMakeLists.txt
+++ b/arch/arm/src/armv6-m/CMakeLists.txt
@@ -29,7 +29,6 @@ set(SRCS
arm_initialstate.c
arm_svcall.c
arm_systemreset.c
- arm_tcbinfo.c
arm_trigger_irq.c)
if(CONFIG_ENABLE_ALL_SIGNALS)
diff --git a/arch/arm/src/armv6-m/Make.defs b/arch/arm/src/armv6-m/Make.defs
index 666f2f5f307..372f9290ae5 100644
--- a/arch/arm/src/armv6-m/Make.defs
+++ b/arch/arm/src/armv6-m/Make.defs
@@ -23,13 +23,12 @@
# Common ARM files
include common/Make.defs
+include arm_m/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_svcall.c
-CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c
-CMN_CSRCS += arm_trigger_irq.c
+CMN_CSRCS += arm_svcall.c arm_systemreset.c arm_trigger_irq.c
ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
@@ -50,3 +49,5 @@ endif
ifeq ($(CONFIG_LIB_SYSCALL),y)
CMN_ASRCS += arm_dispatch_syscall.S
endif
+
+VPATH += arm_m
diff --git a/arch/arm/src/armv7-m/CMakeLists.txt
b/arch/arm/src/armv7-m/CMakeLists.txt
index c00fb760c2d..34a120292a5 100644
--- a/arch/arm/src/armv7-m/CMakeLists.txt
+++ b/arch/arm/src/armv7-m/CMakeLists.txt
@@ -36,7 +36,6 @@ set(SRCS
arm_perf.c
arm_svcall.c
arm_systemreset.c
- arm_tcbinfo.c
arm_trigger_irq.c
arm_usagefault.c
arm_dbgmonitor.c)
diff --git a/arch/arm/src/armv7-m/Make.defs b/arch/arm/src/armv7-m/Make.defs
index 21a2067e7ce..ea6e01e6575 100644
--- a/arch/arm/src/armv7-m/Make.defs
+++ b/arch/arm/src/armv7-m/Make.defs
@@ -23,13 +23,14 @@
# Common ARM files
include common/Make.defs
+include arm_m/Make.defs
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_svcall.c arm_systemreset.c arm_tcbinfo.c
+CMN_CSRCS += arm_svcall.c arm_systemreset.c
CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_dbgmonitor.c
ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
@@ -72,3 +73,5 @@ endif
ifeq ($(CONFIG_LIB_SYSCALL),y)
CMN_ASRCS += arm_dispatch_syscall.S
endif
+
+VPATH += arm_m
diff --git a/arch/arm/src/armv7-m/arm_tcbinfo.c
b/arch/arm/src/armv7-m/arm_tcbinfo.c
deleted file mode 100644
index 663c519ffdf..00000000000
--- a/arch/arm/src/armv7-m/arm_tcbinfo.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7-m/arm_tcbinfo.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <nuttx/sched.h>
-#include <arch/irq.h>
-#include <sys/param.h>
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static const uint16_t g_reg_offs[] =
-{
- TCB_REG_OFF(REG_R0),
- TCB_REG_OFF(REG_R1),
- TCB_REG_OFF(REG_R2),
- TCB_REG_OFF(REG_R3),
- TCB_REG_OFF(REG_R4),
- TCB_REG_OFF(REG_R5),
- TCB_REG_OFF(REG_R6),
- TCB_REG_OFF(REG_R7),
- TCB_REG_OFF(REG_R8),
- TCB_REG_OFF(REG_R9),
- TCB_REG_OFF(REG_R10),
- TCB_REG_OFF(REG_R11),
- TCB_REG_OFF(REG_R12),
- TCB_REG_OFF(REG_R13),
- TCB_REG_OFF(REG_R14),
- TCB_REG_OFF(REG_R15),
- TCB_REG_OFF(REG_XPSR),
-
-#if 0
- UINT16_MAX, /* msp */
- TCB_REG_OFF(REG_R13),
- UINT16_MAX, /* primask */
- TCB_REG_OFF(REG_BASEPRI),
- UINT16_MAX, /* faultmask */
- UINT16_MAX, /* control */
-
-# ifdef CONFIG_ARCH_FPU
- TCB_REG_OFF(REG_S0),
- TCB_REG_OFF(REG_S1),
- TCB_REG_OFF(REG_S2),
- TCB_REG_OFF(REG_S3),
- TCB_REG_OFF(REG_S4),
- TCB_REG_OFF(REG_S5),
- TCB_REG_OFF(REG_S6),
- TCB_REG_OFF(REG_S7),
- TCB_REG_OFF(REG_S8),
- TCB_REG_OFF(REG_S9),
- TCB_REG_OFF(REG_S10),
- TCB_REG_OFF(REG_S11),
- TCB_REG_OFF(REG_S12),
- TCB_REG_OFF(REG_S13),
- TCB_REG_OFF(REG_S14),
- TCB_REG_OFF(REG_S15),
- TCB_REG_OFF(REG_S16),
- TCB_REG_OFF(REG_S17),
- TCB_REG_OFF(REG_S18),
- TCB_REG_OFF(REG_S19),
- TCB_REG_OFF(REG_S20),
- TCB_REG_OFF(REG_S21),
- TCB_REG_OFF(REG_S22),
- TCB_REG_OFF(REG_S23),
- TCB_REG_OFF(REG_S24),
- TCB_REG_OFF(REG_S25),
- TCB_REG_OFF(REG_S26),
- TCB_REG_OFF(REG_S27),
- TCB_REG_OFF(REG_S28),
- TCB_REG_OFF(REG_S29),
- TCB_REG_OFF(REG_S30),
- TCB_REG_OFF(REG_S31),
- TCB_REG_OFF(REG_FPSCR),
-# endif
-#endif
-};
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-const struct tcbinfo_s g_tcbinfo used_data =
-{
- .pid_off = TCB_PID_OFF,
- .state_off = TCB_STATE_OFF,
- .pri_off = TCB_PRI_OFF,
- .name_off = TCB_NAME_OFF,
- .stack_off = TCB_STACK_OFF,
- .stack_size_off = TCB_STACK_SIZE_OFF,
- .regs_off = TCB_REGS_OFF,
- .regs_num = nitems(g_reg_offs),
- {
- .p = g_reg_offs,
- },
-};
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
diff --git a/arch/arm/src/armv8-m/CMakeLists.txt
b/arch/arm/src/armv8-m/CMakeLists.txt
index e20d73802eb..ded07ffa3e8 100644
--- a/arch/arm/src/armv8-m/CMakeLists.txt
+++ b/arch/arm/src/armv8-m/CMakeLists.txt
@@ -38,7 +38,6 @@ set(SRCS
arm_secure_irq.c
arm_svcall.c
arm_systemreset.c
- arm_tcbinfo.c
arm_trigger_irq.c
arm_usagefault.c)
diff --git a/arch/arm/src/armv8-m/Make.defs b/arch/arm/src/armv8-m/Make.defs
index df3d9877593..7c5b94e7a8f 100644
--- a/arch/arm/src/armv8-m/Make.defs
+++ b/arch/arm/src/armv8-m/Make.defs
@@ -23,6 +23,7 @@
# Common ARM files
include common/Make.defs
+include arm_m/Make.defs
CMN_ASRCS += arm_exception.S arm_saveusercontext.S
@@ -31,7 +32,7 @@ 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_securefault.c arm_secure_irq.c
CMN_CSRCS += arm_svcall.c
-CMN_CSRCS += arm_systemreset.c arm_tcbinfo.c
+CMN_CSRCS += arm_systemreset.c
CMN_CSRCS += arm_trigger_irq.c arm_usagefault.c arm_dbgmonitor.c
ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
@@ -82,3 +83,5 @@ endif
ifeq ($(CONFIG_LIB_SYSCALL),y)
CMN_ASRCS += arm_dispatch_syscall.S
endif
+
+VPATH += arm_m
diff --git a/arch/arm/src/armv8-m/arm_tcbinfo.c
b/arch/arm/src/armv8-m/arm_tcbinfo.c
deleted file mode 100644
index f24a160977e..00000000000
--- a/arch/arm/src/armv8-m/arm_tcbinfo.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv8-m/arm_tcbinfo.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <nuttx/sched.h>
-#include <arch/irq.h>
-#include <sys/param.h>
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static const uint16_t g_reg_offs[] =
-{
- TCB_REG_OFF(REG_R0),
- TCB_REG_OFF(REG_R1),
- TCB_REG_OFF(REG_R2),
- TCB_REG_OFF(REG_R3),
- TCB_REG_OFF(REG_R4),
- TCB_REG_OFF(REG_R5),
- TCB_REG_OFF(REG_R6),
- TCB_REG_OFF(REG_R7),
- TCB_REG_OFF(REG_R8),
- TCB_REG_OFF(REG_R9),
- TCB_REG_OFF(REG_R10),
- TCB_REG_OFF(REG_R11),
- TCB_REG_OFF(REG_R12),
- TCB_REG_OFF(REG_R13),
- TCB_REG_OFF(REG_R14),
- TCB_REG_OFF(REG_R15),
- TCB_REG_OFF(REG_XPSR),
-
-#if 0
- UINT16_MAX, /* msp */
- TCB_REG_OFF(REG_R13),
- UINT16_MAX, /* primask */
- TCB_REG_OFF(REG_BASEPRI),
- UINT16_MAX, /* faultmask */
- UINT16_MAX, /* control */
-
-# ifdef CONFIG_ARCH_FPU
- TCB_REG_OFF(REG_S0),
- TCB_REG_OFF(REG_S1),
- TCB_REG_OFF(REG_S2),
- TCB_REG_OFF(REG_S3),
- TCB_REG_OFF(REG_S4),
- TCB_REG_OFF(REG_S5),
- TCB_REG_OFF(REG_S6),
- TCB_REG_OFF(REG_S7),
- TCB_REG_OFF(REG_S8),
- TCB_REG_OFF(REG_S9),
- TCB_REG_OFF(REG_S10),
- TCB_REG_OFF(REG_S11),
- TCB_REG_OFF(REG_S12),
- TCB_REG_OFF(REG_S13),
- TCB_REG_OFF(REG_S14),
- TCB_REG_OFF(REG_S15),
- TCB_REG_OFF(REG_S16),
- TCB_REG_OFF(REG_S17),
- TCB_REG_OFF(REG_S18),
- TCB_REG_OFF(REG_S19),
- TCB_REG_OFF(REG_S20),
- TCB_REG_OFF(REG_S21),
- TCB_REG_OFF(REG_S22),
- TCB_REG_OFF(REG_S23),
- TCB_REG_OFF(REG_S24),
- TCB_REG_OFF(REG_S25),
- TCB_REG_OFF(REG_S26),
- TCB_REG_OFF(REG_S27),
- TCB_REG_OFF(REG_S28),
- TCB_REG_OFF(REG_S29),
- TCB_REG_OFF(REG_S30),
- TCB_REG_OFF(REG_S31),
- TCB_REG_OFF(REG_FPSCR),
-# endif
-#endif
-};
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-const struct tcbinfo_s g_tcbinfo used_data =
-{
- .pid_off = TCB_PID_OFF,
- .state_off = TCB_STATE_OFF,
- .pri_off = TCB_PRI_OFF,
- .name_off = TCB_NAME_OFF,
- .stack_off = TCB_STACK_OFF,
- .stack_size_off = TCB_STACK_SIZE_OFF,
- .regs_off = TCB_REGS_OFF,
- .regs_num = nitems(g_reg_offs),
- {
- .p = g_reg_offs,
- },
-};
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
diff --git a/arch/arm/src/cmake/Toolchain.cmake
b/arch/arm/src/cmake/Toolchain.cmake
index 82e85542bb3..10d573a106b 100644
--- a/arch/arm/src/cmake/Toolchain.cmake
+++ b/arch/arm/src/cmake/Toolchain.cmake
@@ -39,10 +39,13 @@ elseif(CONFIG_ARCH_ARMV8R) # ARMv8-R
set(ARCH_SUBDIR_ARM arm_a_r)
elseif(CONFIG_ARCH_ARMV7M) # ARMv7-M
set(ARCH_SUBDIR armv7-m)
+ set(ARCH_SUBDIR_ARM arm_m)
elseif(CONFIG_ARCH_ARMV8M) # ARMv8-M
set(ARCH_SUBDIR armv8-m)
+ set(ARCH_SUBDIR_ARM arm_m)
elseif(CONFIG_ARCH_ARMV6M) # ARMv6-M
set(ARCH_SUBDIR armv6-m)
+ set(ARCH_SUBDIR_ARM arm_m)
else() # ARM9, ARM7TDMI, etc.
set(ARCH_SUBDIR arm)
set(ARCH_SUBDIR_ARM arm_a_r)