sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm: Move arm_vectoraddrexcptn into arm_vectors.S

Browse Source 
and remove arm_vectoraddrexcptn.S like other exception handler

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-12-26 03:38:16 +08:00 committed by archer
parent b9bd88d9d3
commit 770d579630
14 changed files with 70 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/src/arm/Make.defs
View File

@ -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)

67
arch/arm/src/arm/arm_vectoraddrexcptn.S
View File

@ -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 <nuttx/config.h>
#include <nuttx/irq.h>
.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

16
arch/arm/src/arm/arm_vectors.S
View File

@ -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
****************************************************************************/

3
arch/arm/src/armv7-a/CMakeLists.txt
View File

@ -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

3
arch/arm/src/armv7-a/Make.defs
View File

@ -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

67
arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
View File

@ -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 <nuttx/config.h>
#include <nuttx/irq.h>
.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

16
arch/arm/src/armv7-a/arm_vectors.S
View File

@ -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
****************************************************************************/

3
arch/arm/src/armv7-r/CMakeLists.txt
View File

@ -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

3
arch/arm/src/armv7-r/Make.defs
View File

@ -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

67
arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
View File

@ -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 <nuttx/config.h>
#include <nuttx/irq.h>
.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

16
arch/arm/src/armv7-r/arm_vectors.S
View File

@ -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
****************************************************************************/

3
arch/arm/src/armv8-r/Make.defs
View File

@ -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

67
arch/arm/src/armv8-r/arm_vectoraddrexcptn.S
View File

@ -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 <nuttx/config.h>
#include <nuttx/irq.h>
.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

16
arch/arm/src/armv8-r/arm_vectors.S
View File

@ -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
****************************************************************************/