[incubator-nuttx] branch master updated: xtensa_user_handler: Save PS correctly

[xi...@apache.org]

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 3b528c6  xtensa_user_handler: Save PS correctly
     new 9a996b1  Merge pull request #576 from yamt/xtensa-user-handler-save-ps
3b528c6 is described below

commit 3b528c6010036193ec9fc52a67105bda8d417218
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Mon Mar 16 18:38:57 2020 +0900

    xtensa_user_handler: Save PS correctly
    
    "EPS" is not a real register. It's just a base value of EPS_{2..7}.
---
 arch/xtensa/src/common/xtensa_user_handler.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/xtensa/src/common/xtensa_user_handler.S b/arch/xtensa/src/common/xtensa_user_handler.S
index bc7c0cc..47658ee 100644
--- a/arch/xtensa/src/common/xtensa_user_handler.S
+++ b/arch/xtensa/src/common/xtensa_user_handler.S
@@ -196,7 +196,7 @@ _xtensa_user_handler:
 	mov		a0, sp							/* sp == a1 */
 	addi	sp, sp, -(4 * XCPTCONTEXT_SIZE)	/* Allocate interrupt stack frame */
 	s32i	a0, sp, (4 * REG_A1)			/* Save pre-interrupt SP */
-	rsr		a0, EPS							/* Save interruptee's PS */
+	rsr		a0, PS							/* Save interruptee's PS */
 	s32i	a0, sp, (4 * REG_PS)
 	rsr		a0, EPC_1						/* Save interruptee's PC */
 	s32i	a0, sp, (4 * REG_PC)