You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/04/02 11:08:50 UTC

[incubator-nuttx] 04/06: arch/riscv: Rename riscv_exception_macros.S to riscv_macros.S

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit be2fee7d6effb76de20098097f304ffa3fa346bc
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Apr 2 05:16:48 2022 +0800

    arch/riscv: Rename riscv_exception_macros.S to riscv_macros.S
    
    since macro defined in this file is also used in the normal context
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/risc-v/src/common/riscv_exception_common.S                     | 2 +-
 arch/risc-v/src/common/{riscv_exception_macros.S => riscv_macros.S} | 4 ++--
 arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/risc-v/src/common/riscv_exception_common.S b/arch/risc-v/src/common/riscv_exception_common.S
index f0603f9..bc2cb9b 100644
--- a/arch/risc-v/src/common/riscv_exception_common.S
+++ b/arch/risc-v/src/common/riscv_exception_common.S
@@ -28,7 +28,7 @@
 #include <arch/irq.h>
 #include <arch/mode.h>
 
-#include "riscv_exception_macros.S"
+#include "riscv_macros.S"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/common/riscv_exception_macros.S b/arch/risc-v/src/common/riscv_macros.S
similarity index 98%
rename from arch/risc-v/src/common/riscv_exception_macros.S
rename to arch/risc-v/src/common/riscv_macros.S
index d2f3291..2243698 100644
--- a/arch/risc-v/src/common/riscv_exception_macros.S
+++ b/arch/risc-v/src/common/riscv_macros.S
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/risc-v/src/common/supervisor/riscv_exception_macros.S
+ * arch/risc-v/src/common/riscv_macros.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
  *
  ****************************************************************************/
 
-.file "riscv_exception_macros.S"
+.file "riscv_macros.S"
 
 /****************************************************************************
  * Included Files
diff --git a/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S b/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
index ed8a635..791048e 100644
--- a/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
+++ b/arch/risc-v/src/common/supervisor/riscv_syscall_dispatch.S
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 #include <arch/mode.h>
 
-#include "riscv_exception_macros.S"
+#include "riscv_macros.S"
 
 /****************************************************************************
  * Pre-processor Definitions