From 770d579630aaf488f84d4092c31c631106b4b392 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 26 Dec 2023 03:38:16 +0800 Subject: [PATCH] arch/arm: Move arm_vectoraddrexcptn into arm_vectors.S and remove arm_vectoraddrexcptn.S like other exception handler Signed-off-by: Xiang Xiao --- arch/arm/src/arm/Make.defs | 3 +- arch/arm/src/arm/arm_vectoraddrexcptn.S | 67 --------------------- arch/arm/src/arm/arm_vectors.S | 16 +++++ arch/arm/src/armv7-a/CMakeLists.txt | 3 +- arch/arm/src/armv7-a/Make.defs | 3 +- arch/arm/src/armv7-a/arm_vectoraddrexcptn.S | 67 --------------------- arch/arm/src/armv7-a/arm_vectors.S | 16 +++++ arch/arm/src/armv7-r/CMakeLists.txt | 3 +- arch/arm/src/armv7-r/Make.defs | 3 +- arch/arm/src/armv7-r/arm_vectoraddrexcptn.S | 67 --------------------- arch/arm/src/armv7-r/arm_vectors.S | 16 +++++ arch/arm/src/armv8-r/Make.defs | 3 +- arch/arm/src/armv8-r/arm_vectoraddrexcptn.S | 67 --------------------- arch/arm/src/armv8-r/arm_vectors.S | 16 +++++ 14 files changed, 70 insertions(+), 280 deletions(-) delete mode 100644 arch/arm/src/arm/arm_vectoraddrexcptn.S delete mode 100644 arch/arm/src/armv7-a/arm_vectoraddrexcptn.S delete mode 100644 arch/arm/src/armv7-r/arm_vectoraddrexcptn.S delete mode 100644 arch/arm/src/armv8-r/arm_vectoraddrexcptn.S diff --git a/arch/arm/src/arm/Make.defs b/arch/arm/src/arm/Make.defs index cbe3fa4a8b..60a8d576da 100644 --- a/arch/arm/src/arm/Make.defs +++ b/arch/arm/src/arm/Make.defs @@ -29,8 +29,7 @@ CMN_CSRCS += arm_prefetchabort.c arm_schedulesigaction.c CMN_CSRCS += arm_sigdeliver.c arm_syscall.c arm_tcbinfo.c CMN_CSRCS += arm_undefinedinsn.c -CMN_ASRCS += arm_cache.S arm_vectoraddrexcptn.S -CMN_ASRCS += arm_vectors.S arm_vectortab.S +CMN_ASRCS += arm_cache.S arm_vectors.S arm_vectortab.S CMN_ASRCS += arm_saveusercontext.S ifeq ($(CONFIG_PAGING),y) diff --git a/arch/arm/src/arm/arm_vectoraddrexcptn.S b/arch/arm/src/arm/arm_vectoraddrexcptn.S deleted file mode 100644 index 5d32fd0341..0000000000 --- a/arch/arm/src/arm/arm_vectoraddrexcptn.S +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * arch/arm/src/arm/arm_vectoraddrexceptn.S - * - * 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 -#include - - .file "arm_vectoraddrexcptn.S" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Symbols - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - -/**************************************************************************** - * Assembly Macros - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - - .text - .syntax unified - .arm - -/**************************************************************************** - * Name: arm_vectoraddrexcptn - * - * Description: - * Shouldn't happen. This exception handler is in a separate file from - * other vector handlers because some processors do not support the - * Address Exception vector. - * - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - .type arm_vectoraddrexcptn, %function -arm_vectoraddrexcptn: - b arm_vectoraddrexcptn - .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn - .end diff --git a/arch/arm/src/arm/arm_vectors.S b/arch/arm/src/arm/arm_vectors.S index c1d234ceef..940ce1177f 100644 --- a/arch/arm/src/arm/arm_vectors.S +++ b/arch/arm/src/arm/arm_vectors.S @@ -636,6 +636,22 @@ arm_vectorfiq: subs pc, lr, #4 .size arm_vectorfiq, . - arm_vectorfiq +/**************************************************************************** + * Name: arm_vectoraddrexcptn + * + * Description: + * Shouldn't happen. This exception handler is in a separate file from + * other vector handlers because some processors do not support the + * Address Exception vector. + * + ****************************************************************************/ + + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn + .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn + /**************************************************************************** * Name: g_intstackalloc/g_intstacktop ****************************************************************************/ diff --git a/arch/arm/src/armv7-a/CMakeLists.txt b/arch/arm/src/armv7-a/CMakeLists.txt index 543cc6e235..9a34d4cc1b 100644 --- a/arch/arm/src/armv7-a/CMakeLists.txt +++ b/arch/arm/src/armv7-a/CMakeLists.txt @@ -25,8 +25,7 @@ set(SRCS arm_vectortab.S) # Common assembly language files -list(APPEND SRCS arm_cpuhead.S arm_vectoraddrexcptn.S arm_vectors.S - arm_saveusercontext.S) +list(APPEND SRCS arm_cpuhead.S arm_vectors.S arm_saveusercontext.S) # Common C source files diff --git a/arch/arm/src/armv7-a/Make.defs b/arch/arm/src/armv7-a/Make.defs index 6ea56bba38..05e31abd19 100644 --- a/arch/arm/src/armv7-a/Make.defs +++ b/arch/arm/src/armv7-a/Make.defs @@ -36,8 +36,7 @@ endif # Common assembly language files -CMN_ASRCS += arm_cpuhead.S arm_vectoraddrexcptn.S arm_vectors.S -CMN_ASRCS += arm_saveusercontext.S +CMN_ASRCS += arm_cpuhead.S arm_vectors.S arm_saveusercontext.S # Common C source files diff --git a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S deleted file mode 100644 index af407a4f58..0000000000 --- a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * arch/arm/src/armv7-a/arm_vectoraddrexceptn.S - * - * 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 -#include - - .file "arm_vectoraddrexcptn.S" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Symbols - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - -/**************************************************************************** - * Assembly Macros - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - - .text - .syntax unified - .arm - -/**************************************************************************** - * Name: arm_vectoraddrexcptn - * - * Description: - * Shouldn't happen. This exception handler is in a separate file from - * other vector handlers because some processors do not support the - * Address Exception vector. - * - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - .type arm_vectoraddrexcptn, %function -arm_vectoraddrexcptn: - b arm_vectoraddrexcptn - .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn - .end diff --git a/arch/arm/src/armv7-a/arm_vectors.S b/arch/arm/src/armv7-a/arm_vectors.S index 12952621b4..c61e0d2554 100644 --- a/arch/arm/src/armv7-a/arm_vectors.S +++ b/arch/arm/src/armv7-a/arm_vectors.S @@ -732,6 +732,22 @@ arm_vectorfiq: #endif .size arm_vectorfiq, . - arm_vectorfiq +/**************************************************************************** + * Name: arm_vectoraddrexcptn + * + * Description: + * Shouldn't happen. This exception handler is in a separate file from + * other vector handlers because some processors do not support the + * Address Exception vector. + * + ****************************************************************************/ + + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn + .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn + /**************************************************************************** * Name: g_intstackalloc/g_intstacktop ****************************************************************************/ diff --git a/arch/arm/src/armv7-r/CMakeLists.txt b/arch/arm/src/armv7-r/CMakeLists.txt index ebc7d2ad19..e2b2cce85a 100644 --- a/arch/arm/src/armv7-r/CMakeLists.txt +++ b/arch/arm/src/armv7-r/CMakeLists.txt @@ -24,8 +24,7 @@ set(SRCS arm_vectortab.S) # Common assembly language files -list(APPEND SRCS arm_head.S arm_vectoraddrexcptn.S arm_vectors.S - arm_saveusercontext.S) +list(APPEND SRCS arm_head.S arm_vectors.S arm_saveusercontext.S) # Common C source files diff --git a/arch/arm/src/armv7-r/Make.defs b/arch/arm/src/armv7-r/Make.defs index 22261e2f79..be004c67fe 100644 --- a/arch/arm/src/armv7-r/Make.defs +++ b/arch/arm/src/armv7-r/Make.defs @@ -38,8 +38,7 @@ CMN_CSRCS += arm_perf.c cp15_cacheops.c # Common C source files -CMN_ASRCS += arm_head.S arm_vectoraddrexcptn.S arm_vectors.S -CMN_ASRCS += arm_saveusercontext.S +CMN_ASRCS += arm_head.S arm_vectors.S arm_saveusercontext.S ifeq ($(CONFIG_ARMV7R_HAVE_PTM), y) CMN_CSRCS += arm_timer.c diff --git a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S deleted file mode 100644 index cefe180ac0..0000000000 --- a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * arch/arm/src/armv7-r/arm_vectoraddrexceptn.S - * - * 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 -#include - - .file "arm_vectoraddrexcptn.S" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Symbols - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - -/**************************************************************************** - * Assembly Macros - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - - .text - .syntax unified - .arm - -/**************************************************************************** - * Name: arm_vectoraddrexcptn - * - * Description: - * Shouldn't happen. This exception handler is in a separate file from - * other vector handlers because some processors do not support the - * Address Exception vector. - * - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - .type arm_vectoraddrexcptn, %function -arm_vectoraddrexcptn: - b arm_vectoraddrexcptn - .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn - .end diff --git a/arch/arm/src/armv7-r/arm_vectors.S b/arch/arm/src/armv7-r/arm_vectors.S index 0f8e2224b9..b783430d0f 100644 --- a/arch/arm/src/armv7-r/arm_vectors.S +++ b/arch/arm/src/armv7-r/arm_vectors.S @@ -716,6 +716,22 @@ arm_vectorfiq: #endif .size arm_vectorfiq, . - arm_vectorfiq +/**************************************************************************** + * Name: arm_vectoraddrexcptn + * + * Description: + * Shouldn't happen. This exception handler is in a separate file from + * other vector handlers because some processors do not support the + * Address Exception vector. + * + ****************************************************************************/ + + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn + .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn + /**************************************************************************** * Name: g_intstackalloc/g_intstacktop ****************************************************************************/ diff --git a/arch/arm/src/armv8-r/Make.defs b/arch/arm/src/armv8-r/Make.defs index 7937478593..e906ef0333 100644 --- a/arch/arm/src/armv8-r/Make.defs +++ b/arch/arm/src/armv8-r/Make.defs @@ -38,8 +38,7 @@ CMN_CSRCS += arm_perf.c cp15_cacheops.c # Common C source files -CMN_ASRCS += arm_head.S arm_vectoraddrexcptn.S arm_vectors.S -CMN_ASRCS += arm_saveusercontext.S +CMN_ASRCS += arm_head.S arm_vectors.S arm_saveusercontext.S # ifeq ($(CONFIG_BUILD_PROTECTED),y) # CMN_CSRCS += arm_mpu.c diff --git a/arch/arm/src/armv8-r/arm_vectoraddrexcptn.S b/arch/arm/src/armv8-r/arm_vectoraddrexcptn.S deleted file mode 100644 index 88a5ce9cf8..0000000000 --- a/arch/arm/src/armv8-r/arm_vectoraddrexcptn.S +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * arch/arm/src/armv8-r/arm_vectoraddrexceptn.S - * - * 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 -#include - - .file "arm_vectoraddrexcptn.S" - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Symbols - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - -/**************************************************************************** - * Assembly Macros - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - - .text - .syntax unified - .arm - -/**************************************************************************** - * Name: arm_vectoraddrexcptn - * - * Description: - * Shouldn't happen. This exception handler is in a separate file from - * other vector handlers because some processors do not support the - * Address Exception vector. - * - ****************************************************************************/ - - .globl arm_vectoraddrexcptn - .type arm_vectoraddrexcptn, %function -arm_vectoraddrexcptn: - b arm_vectoraddrexcptn - .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn - .end diff --git a/arch/arm/src/armv8-r/arm_vectors.S b/arch/arm/src/armv8-r/arm_vectors.S index cd62baf4f6..78b32446a7 100644 --- a/arch/arm/src/armv8-r/arm_vectors.S +++ b/arch/arm/src/armv8-r/arm_vectors.S @@ -716,6 +716,22 @@ arm_vectorfiq: #endif .size arm_vectorfiq, . - arm_vectorfiq +/**************************************************************************** + * Name: arm_vectoraddrexcptn + * + * Description: + * Shouldn't happen. This exception handler is in a separate file from + * other vector handlers because some processors do not support the + * Address Exception vector. + * + ****************************************************************************/ + + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn + .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn + /**************************************************************************** * Name: g_intstackalloc/g_intstacktop ****************************************************************************/