This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch revert-179-osx-sim in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 67caeabc7f76c9f3ff0ec4da53af645e682ae08d Author: Alin Jerpelea <[email protected]> AuthorDate: Wed Jan 29 09:26:02 2020 +0100 Revert "sim: Fix stack alignment" This reverts commit 298c2e5e4fb46f5ffa7de7bbc5a32a9da0663768. --- arch/sim/src/sim/up_initialstate.c | 2 +- arch/sim/src/sim/up_stackframe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sim/src/sim/up_initialstate.c b/arch/sim/src/sim/up_initialstate.c index 129d3be..3ddb112 100644 --- a/arch/sim/src/sim/up_initialstate.c +++ b/arch/sim/src/sim/up_initialstate.c @@ -67,6 +67,6 @@ void up_initial_state(struct tcb_s *tcb) { memset(&tcb->xcp, 0, sizeof(struct xcptcontext)); - tcb->xcp.regs[JB_SP] = (xcpt_reg_t)tcb->adj_stack_ptr - sizeof(xcpt_reg_t); + tcb->xcp.regs[JB_SP] = (xcpt_reg_t)tcb->adj_stack_ptr; tcb->xcp.regs[JB_PC] = (xcpt_reg_t)tcb->start; } diff --git a/arch/sim/src/sim/up_stackframe.c b/arch/sim/src/sim/up_stackframe.c index 887de5c..eecb366 100644 --- a/arch/sim/src/sim/up_stackframe.c +++ b/arch/sim/src/sim/up_stackframe.c @@ -124,7 +124,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Reset the initial state */ - tcb->xcp.regs[JB_SP] = (xcpt_reg_t)tcb->adj_stack_ptr - sizeof(xcpt_reg_t); + tcb->xcp.regs[JB_SP] = (xcpt_reg_t)tcb->adj_stack_ptr; /* And return a pointer to the allocated memory */
