This is an automated email from the ASF dual-hosted git repository. GUIDINGLI pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7f91de2ef63afa9af025c9b50cf4c79531e7a40f Author: hujun5 <[email protected]> AuthorDate: Thu Nov 6 08:00:33 2025 +0800 arch/arm: move arm_tcbinfo.c to arm_a_r Place the shared ARMv7-A, ARMv7-R, and ARMv8-R TCB register offset implementation in arm_a_r and update both Make and CMake source lists. Signed-off-by: hujun5 <[email protected]> --- arch/arm/src/arm/CMakeLists.txt | 1 - arch/arm/src/arm/Make.defs | 2 +- arch/arm/src/arm/arm_tcbinfo.c | 79 --------------- arch/arm/src/arm_a_r/CMakeLists.txt | 2 + arch/arm/src/arm_a_r/Make.defs | 2 + arch/arm/src/{armv7-a => arm_a_r}/arm_tcbinfo.c | 2 +- arch/arm/src/armv7-a/CMakeLists.txt | 1 - arch/arm/src/armv7-a/Make.defs | 2 +- arch/arm/src/armv7-r/CMakeLists.txt | 1 - arch/arm/src/armv7-r/Make.defs | 2 +- arch/arm/src/armv7-r/arm_tcbinfo.c | 123 ------------------------ arch/arm/src/armv8-r/CMakeLists.txt | 1 - arch/arm/src/armv8-r/Make.defs | 2 +- arch/arm/src/armv8-r/arm_tcbinfo.c | 121 ----------------------- 14 files changed, 9 insertions(+), 332 deletions(-) diff --git a/arch/arm/src/arm/CMakeLists.txt b/arch/arm/src/arm/CMakeLists.txt index 13a91e8f7ef..2bc9ab74fcf 100644 --- a/arch/arm/src/arm/CMakeLists.txt +++ b/arch/arm/src/arm/CMakeLists.txt @@ -30,7 +30,6 @@ list( arm_initialstate.c arm_prefetchabort.c arm_syscall.c - arm_tcbinfo.c arm_undefinedinsn.c arm_cache.S arm_vectors.S diff --git a/arch/arm/src/arm/Make.defs b/arch/arm/src/arm/Make.defs index 71d716ab379..176c59d30d5 100644 --- a/arch/arm/src/arm/Make.defs +++ b/arch/arm/src/arm/Make.defs @@ -29,7 +29,7 @@ HEAD_ASRC = arm_head.S CMN_CSRCS += arm_dataabort.c arm_doirq.c arm_initialstate.c CMN_CSRCS += arm_prefetchabort.c -CMN_CSRCS += arm_syscall.c arm_tcbinfo.c +CMN_CSRCS += arm_syscall.c CMN_CSRCS += arm_undefinedinsn.c CMN_ASRCS += arm_cache.S arm_vectors.S arm_vectortab.S diff --git a/arch/arm/src/arm/arm_tcbinfo.c b/arch/arm/src/arm/arm_tcbinfo.c deleted file mode 100644 index 916168eeb69..00000000000 --- a/arch/arm/src/arm/arm_tcbinfo.c +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** - * arch/arm/src/arm/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_CPSR), -}; - -/**************************************************************************** - * 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/arm_a_r/CMakeLists.txt b/arch/arm/src/arm_a_r/CMakeLists.txt index 4242ae59d60..49edb8f44a0 100644 --- a/arch/arm/src/arm_a_r/CMakeLists.txt +++ b/arch/arm/src/arm_a_r/CMakeLists.txt @@ -24,4 +24,6 @@ if(CONFIG_ENABLE_ALL_SIGNALS) set(CSRCS arm_schedulesigaction.c arm_sigdeliver.c) endif() +list(APPEND CSRCS arm_tcbinfo.c) + target_sources(arch PRIVATE ${CSRCS}) diff --git a/arch/arm/src/arm_a_r/Make.defs b/arch/arm/src/arm_a_r/Make.defs index 97c2cf54525..4f67f472605 100644 --- a/arch/arm/src/arm_a_r/Make.defs +++ b/arch/arm/src/arm_a_r/Make.defs @@ -22,6 +22,8 @@ # Common ARM_A_R files +CMN_CSRCS += arm_tcbinfo.c + ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y) CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c endif diff --git a/arch/arm/src/armv7-a/arm_tcbinfo.c b/arch/arm/src/arm_a_r/arm_tcbinfo.c similarity index 99% rename from arch/arm/src/armv7-a/arm_tcbinfo.c rename to arch/arm/src/arm_a_r/arm_tcbinfo.c index bdaaffc1ddd..e0e9ecb804d 100644 --- a/arch/arm/src/armv7-a/arm_tcbinfo.c +++ b/arch/arm/src/arm_a_r/arm_tcbinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/armv7-a/arm_tcbinfo.c + * arch/arm/src/arm_a_r/arm_tcbinfo.c * * SPDX-License-Identifier: Apache-2.0 * diff --git a/arch/arm/src/armv7-a/CMakeLists.txt b/arch/arm/src/armv7-a/CMakeLists.txt index 95ccdde9e33..5ac9a61299a 100644 --- a/arch/arm/src/armv7-a/CMakeLists.txt +++ b/arch/arm/src/armv7-a/CMakeLists.txt @@ -44,7 +44,6 @@ list( arm_mmu.c arm_prefetchabort.c arm_syscall.c - arm_tcbinfo.c arm_undefinedinsn.c arm_userfault.c arm_perf.c diff --git a/arch/arm/src/armv7-a/Make.defs b/arch/arm/src/armv7-a/Make.defs index 33a684fd1e0..cecb9461a9d 100644 --- a/arch/arm/src/armv7-a/Make.defs +++ b/arch/arm/src/armv7-a/Make.defs @@ -39,7 +39,7 @@ 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_syscall.c arm_tcbinfo.c arm_undefinedinsn.c +CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c CMN_CSRCS += arm_perf.c arm_userfault.c cp15_cacheops.c ifeq ($(CONFIG_ARMV7A_GICv2M),y) diff --git a/arch/arm/src/armv7-r/CMakeLists.txt b/arch/arm/src/armv7-r/CMakeLists.txt index 2d836f219ae..7d68cc0fdef 100644 --- a/arch/arm/src/armv7-r/CMakeLists.txt +++ b/arch/arm/src/armv7-r/CMakeLists.txt @@ -40,7 +40,6 @@ list( arm_initialstate.c arm_prefetchabort.c arm_syscall.c - arm_tcbinfo.c arm_undefinedinsn.c arm_perf.c cp15_cacheops.c) diff --git a/arch/arm/src/armv7-r/Make.defs b/arch/arm/src/armv7-r/Make.defs index e936237cb36..93c5cfef6ef 100644 --- a/arch/arm/src/armv7-r/Make.defs +++ b/arch/arm/src/armv7-r/Make.defs @@ -35,7 +35,7 @@ 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_syscall.c arm_tcbinfo.c arm_undefinedinsn.c +CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c CMN_CSRCS += arm_perf.c cp15_cacheops.c # Common C source files diff --git a/arch/arm/src/armv7-r/arm_tcbinfo.c b/arch/arm/src/armv7-r/arm_tcbinfo.c deleted file mode 100644 index 03793dab683..00000000000 --- a/arch/arm/src/armv7-r/arm_tcbinfo.c +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** - * arch/arm/src/armv7-r/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_CPSR), - -#if 0 -# ifdef CONFIG_ARCH_FPU - TCB_REG_OFF(REG_D0), - TCB_REG_OFF(REG_D1), - TCB_REG_OFF(REG_D2), - TCB_REG_OFF(REG_D3), - TCB_REG_OFF(REG_D4), - TCB_REG_OFF(REG_D5), - TCB_REG_OFF(REG_D6), - TCB_REG_OFF(REG_D7), - TCB_REG_OFF(REG_D8), - TCB_REG_OFF(REG_D9), - TCB_REG_OFF(REG_D10), - TCB_REG_OFF(REG_D11), - TCB_REG_OFF(REG_D12), - TCB_REG_OFF(REG_D13), - TCB_REG_OFF(REG_D14), - TCB_REG_OFF(REG_D15), -# endif - -# ifdef CONFIG_ARM_DPFPU32 - TCB_REG_OFF(REG_D16), - TCB_REG_OFF(REG_D17), - TCB_REG_OFF(REG_D18), - TCB_REG_OFF(REG_D19), - TCB_REG_OFF(REG_D20), - TCB_REG_OFF(REG_D21), - TCB_REG_OFF(REG_D22), - TCB_REG_OFF(REG_D23), - TCB_REG_OFF(REG_D24), - TCB_REG_OFF(REG_D25), - TCB_REG_OFF(REG_D26), - TCB_REG_OFF(REG_D27), - TCB_REG_OFF(REG_D28), - TCB_REG_OFF(REG_D29), - TCB_REG_OFF(REG_D30), - TCB_REG_OFF(REG_D31), -# endif - -# ifdef CONFIG_ARCH_FPU - 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-r/CMakeLists.txt b/arch/arm/src/armv8-r/CMakeLists.txt index b6108a7e45d..73a14e38b74 100644 --- a/arch/arm/src/armv8-r/CMakeLists.txt +++ b/arch/arm/src/armv8-r/CMakeLists.txt @@ -42,7 +42,6 @@ list( arm_initialstate.c arm_prefetchabort.c arm_syscall.c - arm_tcbinfo.c arm_undefinedinsn.c arm_perf.c cp15_cacheops.c) diff --git a/arch/arm/src/armv8-r/Make.defs b/arch/arm/src/armv8-r/Make.defs index 4bd86a80be4..b000f186640 100644 --- a/arch/arm/src/armv8-r/Make.defs +++ b/arch/arm/src/armv8-r/Make.defs @@ -35,7 +35,7 @@ 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_syscall.c arm_tcbinfo.c arm_undefinedinsn.c +CMN_CSRCS += arm_syscall.c arm_undefinedinsn.c CMN_CSRCS += arm_perf.c cp15_cacheops.c # Common C source files diff --git a/arch/arm/src/armv8-r/arm_tcbinfo.c b/arch/arm/src/armv8-r/arm_tcbinfo.c deleted file mode 100644 index 8d83db3c3d0..00000000000 --- a/arch/arm/src/armv8-r/arm_tcbinfo.c +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************** - * arch/arm/src/armv8-r/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_CPSR), - -#if 0 -# ifdef CONFIG_ARCH_FPU - TCB_REG_OFF(REG_D0), - TCB_REG_OFF(REG_D1), - TCB_REG_OFF(REG_D2), - TCB_REG_OFF(REG_D3), - TCB_REG_OFF(REG_D4), - TCB_REG_OFF(REG_D5), - TCB_REG_OFF(REG_D6), - TCB_REG_OFF(REG_D7), - TCB_REG_OFF(REG_D8), - TCB_REG_OFF(REG_D9), - TCB_REG_OFF(REG_D10), - TCB_REG_OFF(REG_D11), - TCB_REG_OFF(REG_D12), - TCB_REG_OFF(REG_D13), - TCB_REG_OFF(REG_D14), - TCB_REG_OFF(REG_D15), -# endif - -# ifdef CONFIG_ARM_DPFPU32 - TCB_REG_OFF(REG_D16), - TCB_REG_OFF(REG_D17), - TCB_REG_OFF(REG_D18), - TCB_REG_OFF(REG_D19), - TCB_REG_OFF(REG_D20), - TCB_REG_OFF(REG_D21), - TCB_REG_OFF(REG_D22), - TCB_REG_OFF(REG_D23), - TCB_REG_OFF(REG_D24), - TCB_REG_OFF(REG_D25), - TCB_REG_OFF(REG_D26), - TCB_REG_OFF(REG_D27), - TCB_REG_OFF(REG_D28), - TCB_REG_OFF(REG_D29), - TCB_REG_OFF(REG_D30), - TCB_REG_OFF(REG_D31), -# endif - -# ifdef CONFIG_ARCH_FPU - TCB_REG_OFF(REG_FPSCR), -# endif -#endif -}; - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -const struct tcbinfo_s g_tcbinfo = -{ - .pid_off = TCB_PID_OFF, - .state_off = TCB_STATE_OFF, - .pri_off = TCB_PRI_OFF, - .name_off = TCB_NAME_OFF, - .regs_off = TCB_REGS_OFF, - .regs_num = nitems(g_reg_offs), - { - .p = g_reg_offs, - }, -}; - -/**************************************************************************** - * Public Functions - ****************************************************************************/
