You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/05/10 23:17:31 UTC
[incubator-nuttx] branch master updated (a17bfec43d -> 12453bb623)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from a17bfec43d libc/string: simplify strrchr
new 1cf2fa75c4 arch/xtensa: Fix some typos and comments.
new 3f632bf12b xtensa_sigtramp.S: Fix call0 instruction.
new 12453bb623 xtensa_sigtramp.S: Remove the ENTRY instruction.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/xtensa/src/common/xtensa_schedsigaction.c | 4 ++--
arch/xtensa/src/common/xtensa_sigdeliver.c | 2 +-
arch/xtensa/src/common/xtensa_sigtramp.S | 6 +-----
3 files changed, 4 insertions(+), 8 deletions(-)
[incubator-nuttx] 03/03: xtensa_sigtramp.S: Remove the ENTRY instruction.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 12453bb6234d89702e3a0989fab19142beb04b00
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon May 9 20:28:06 2022 +0200
xtensa_sigtramp.S: Remove the ENTRY instruction.
_xtensa_sig_trampoline is returned to after a context switch and not called
by the usual Window call instructions (call4, call8 and call12),
thus does not need the entry instruction. Furthermore, the ENTRY instruction
in this case is messing up the backtrace as it creates an extra frame.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/src/common/xtensa_sigtramp.S | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/xtensa/src/common/xtensa_sigtramp.S b/arch/xtensa/src/common/xtensa_sigtramp.S
index ba105db089..0c4f1aab38 100644
--- a/arch/xtensa/src/common/xtensa_sigtramp.S
+++ b/arch/xtensa/src/common/xtensa_sigtramp.S
@@ -26,8 +26,6 @@
#include <nuttx/config.h>
-#include <arch/xtensa/xtensa_abi.h>
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -53,8 +51,6 @@
.align 4
_xtensa_sig_trampoline:
- ENTRY(16) /* REVISIT: This should not be here */
-
#ifdef __XTENSA_CALL0_ABI__
call0 xtensa_sig_deliver /* Call xtensa_sig_deliver */
#else
[incubator-nuttx] 02/03: xtensa_sigtramp.S: Fix call0 instruction.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 3f632bf12b890426f8a9aaa0d112a026801c635b
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon May 9 13:29:21 2022 +0200
xtensa_sigtramp.S: Fix call0 instruction.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/src/common/xtensa_sigtramp.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/xtensa/src/common/xtensa_sigtramp.S b/arch/xtensa/src/common/xtensa_sigtramp.S
index 6a1d3306f2..ba105db089 100644
--- a/arch/xtensa/src/common/xtensa_sigtramp.S
+++ b/arch/xtensa/src/common/xtensa_sigtramp.S
@@ -56,7 +56,7 @@ _xtensa_sig_trampoline:
ENTRY(16) /* REVISIT: This should not be here */
#ifdef __XTENSA_CALL0_ABI__
- cali0 xtensa_sig_deliver /* Call xtensa_sig_deliver */
+ call0 xtensa_sig_deliver /* Call xtensa_sig_deliver */
#else
call4 xtensa_sig_deliver /* Call xtensa_sig_deliver */
#endif
[incubator-nuttx] 01/03: arch/xtensa: Fix some typos and comments.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 1cf2fa75c41fd3dbc0a5f81b89f1a22361f7ad89
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon May 2 11:56:20 2022 +0200
arch/xtensa: Fix some typos and comments.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/src/common/xtensa_schedsigaction.c | 4 ++--
arch/xtensa/src/common/xtensa_sigdeliver.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/xtensa/src/common/xtensa_schedsigaction.c b/arch/xtensa/src/common/xtensa_schedsigaction.c
index 7b376e3c44..485c2f4952 100644
--- a/arch/xtensa/src/common/xtensa_schedsigaction.c
+++ b/arch/xtensa/src/common/xtensa_schedsigaction.c
@@ -87,12 +87,12 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
if (!tcb->xcp.sigdeliver)
{
+ sinfo("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+
/* First, handle some special cases when the signal is being delivered
* to the currently executing task.
*/
- sinfo("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
-
if (tcb == this_task())
{
/* CASE 1: We are not in an interrupt handler and a task is
diff --git a/arch/xtensa/src/common/xtensa_sigdeliver.c b/arch/xtensa/src/common/xtensa_sigdeliver.c
index 9bc8013c30..e0c81c29b5 100644
--- a/arch/xtensa/src/common/xtensa_sigdeliver.c
+++ b/arch/xtensa/src/common/xtensa_sigdeliver.c
@@ -46,7 +46,7 @@
*
* Description:
* This is the a signal handling trampoline. When a signal action was
- * posted. The task context was mucked with and forced to branch to this
+ * posted, the task context was mucked with and forced to branch to this
* location with interrupts disabled.
*
****************************************************************************/