You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/02/20 06:21:24 UTC
[incubator-nuttx] branch master updated: Update the comments (the
location of trampoline code)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new b363bd0 Update the comments (the location of trampoline code)
b363bd0 is described below
commit b363bd0841849e520e3de10f1e1e20433bd65229
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Feb 20 11:53:33 2020 +0900
Update the comments (the location of trampoline code)
Also, fix typos and copy-and-paste errors.
---
arch/arm/src/armv6-m/up_signal_dispatch.c | 4 ++--
arch/arm/src/armv6-m/up_svcall.c | 2 +-
arch/arm/src/armv7-a/arm_signal_dispatch.c | 4 ++--
arch/arm/src/armv7-a/arm_syscall.c | 2 +-
arch/arm/src/armv7-m/up_signal_dispatch.c | 4 ++--
arch/arm/src/armv7-m/up_svcall.c | 2 +-
arch/arm/src/armv7-r/arm_syscall.c | 2 +-
arch/risc-v/src/rv64gc/up_signal_dispatch.c | 4 ++--
arch/risc-v/src/rv64gc/up_swint.c | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/src/armv6-m/up_signal_dispatch.c b/arch/arm/src/armv6-m/up_signal_dispatch.c
index e010875..3b40ace 100644
--- a/arch/arm/src/armv6-m/up_signal_dispatch.c
+++ b/arch/arm/src/armv6-m/up_signal_dispatch.c
@@ -60,9 +60,9 @@
* This kernel-mode stub will then be called transfer control to the user
* mode signal handler by calling this function.
*
- * Normally the a user-mode signalling handling stub will also execute
+ * Normally the user-mode signalling handling stub will also execute
* before the ultimate signal handler is called. See
- * arch/arm/src/armv[6\7]/up_signal_handler. This function is the
+ * arch/arm/src/armv6-m/up_signal_handler.S. This function is the
* user-space, signal handler trampoline function. It is called from
* up_signal_dispatch() in user-mode.
*
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index 79bda19..300d123 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -369,7 +369,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
DEBUGASSERT(rtcb->xcp.sigreturn == 0);
rtcb->xcp.sigreturn = regs[REG_PC];
- /* Set up to return to the user-space pthread start-up function in
+ /* Set up to return to the user-space trampoline function in
* unprivileged mode.
*/
diff --git a/arch/arm/src/armv7-a/arm_signal_dispatch.c b/arch/arm/src/armv7-a/arm_signal_dispatch.c
index deff3c4..3ed15dd 100644
--- a/arch/arm/src/armv7-a/arm_signal_dispatch.c
+++ b/arch/arm/src/armv7-a/arm_signal_dispatch.c
@@ -61,9 +61,9 @@
* This kernel-mode stub will then be called transfer control to the user
* mode signal handler by calling this function.
*
- * Normally the a user-mode signalling handling stub will also execute
+ * Normally the user-mode signalling handling stub will also execute
* before the ultimate signal handler is called. See
- * arch/arm/src/armv[6\7]/up_signal_handler. This function is the
+ * arch/arm/src/armv7-a/crt0.c. This function is the
* user-space, signal handler trampoline function. It is called from
* up_signal_dispatch() in user-mode.
*
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 493f4a2..10ca503 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -343,7 +343,7 @@ uint32_t *arm_syscall(uint32_t *regs)
DEBUGASSERT(rtcb->xcp.sigreturn == 0);
rtcb->xcp.sigreturn = regs[REG_PC];
- /* Set up to return to the user-space pthread start-up function in
+ /* Set up to return to the user-space trampoline function in
* unprivileged mode.
*/
diff --git a/arch/arm/src/armv7-m/up_signal_dispatch.c b/arch/arm/src/armv7-m/up_signal_dispatch.c
index 77f3303..a80a133 100644
--- a/arch/arm/src/armv7-m/up_signal_dispatch.c
+++ b/arch/arm/src/armv7-m/up_signal_dispatch.c
@@ -60,9 +60,9 @@
* This kernel-mode stub will then be called transfer control to the user
* mode signal handler by calling this function.
*
- * Normally the a user-mode signaling handling stub will also execute
+ * Normally the user-mode signaling handling stub will also execute
* before the ultimate signal handler is called. See
- * arch/arm/src/armv[6\7]/up_signal_handler. This function is the
+ * arch/arm/src/armv7-m/gnu/up_signal_handler.S. This function is the
* user-space, signal handler trampoline function. It is called from
* up_signal_dispatch() in user-mode.
*
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index a2e9947..0f7eddc 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -369,7 +369,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
DEBUGASSERT(rtcb->xcp.sigreturn == 0);
rtcb->xcp.sigreturn = regs[REG_PC];
- /* Set up to return to the user-space pthread start-up function in
+ /* Set up to return to the user-space trampoline function in
* unprivileged mode.
*/
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 80c4e91..7573a79 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -341,7 +341,7 @@ uint32_t *arm_syscall(uint32_t *regs)
DEBUGASSERT(rtcb->xcp.sigreturn == 0);
rtcb->xcp.sigreturn = regs[REG_PC];
- /* Set up to return to the user-space pthread start-up function in
+ /* Set up to return to the user-space trampoline function in
* unprivileged mode.
*/
diff --git a/arch/risc-v/src/rv64gc/up_signal_dispatch.c b/arch/risc-v/src/rv64gc/up_signal_dispatch.c
index a1daaca..ac83c96 100644
--- a/arch/risc-v/src/rv64gc/up_signal_dispatch.c
+++ b/arch/risc-v/src/rv64gc/up_signal_dispatch.c
@@ -45,9 +45,9 @@
* This kernel-mode stub will then be called transfer control to the user
* mode signal handler by calling this function.
*
- * Normally the a user-mode signaling handling stub will also execute
+ * Normally the user-mode signaling handling stub will also execute
* before the ultimate signal handler is called. See
- * arch/arm/src/armv[6\7]/up_signal_handler. This function is the
+ * arch/risc-v/src/rv64gc/up_signal_handler.S. This function is the
* user-space, signal handler trampoline function. It is called from
* up_signal_dispatch() in user-mode.
*
diff --git a/arch/risc-v/src/rv64gc/up_swint.c b/arch/risc-v/src/rv64gc/up_swint.c
index c45c7bc..0accebf 100644
--- a/arch/risc-v/src/rv64gc/up_swint.c
+++ b/arch/risc-v/src/rv64gc/up_swint.c
@@ -349,7 +349,7 @@ int up_swint(int irq, FAR void *context, FAR void *arg)
DEBUGASSERT(rtcb->xcp.sigreturn == 0);
rtcb->xcp.sigreturn = regs[REG_EPC];
- /* Set up to return to the user-space pthread start-up function in
+ /* Set up to return to the user-space trampoline function in
* unprivileged mode.
*/