Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "arch: adjust idle stack offset to reserve space of stack info"

Browse Source 
This reverts commit 91dbb26153.
This commit is contained in:
chao.an
2021-06-09 23:01:06 +08:00
committed by anchao
parent 28363bf9a8
commit 0d960286a6
25 changed files with 50 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/arm/arm_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "arm.h"
#include "arm_internal.h"
@@ -63,9 +62,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/arm/src/armv6-m/arm_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "arm_internal.h"
#include "arm_arch.h"
@@ -65,9 +64,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/arm/src/armv7-a/arm_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "arm.h"
#include "arm_internal.h"
@@ -63,9 +62,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/arm/src/armv7-m/arm_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/armv7-m/nvicpri.h>
#include "arm_internal.h"
@@ -66,9 +65,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/arm/src/armv7-r/arm_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "arm.h"
#include "arm_internal.h"
@@ -63,9 +62,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/arm/src/armv8-m/arm_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/armv8-m/nvicpri.h>
#include "arm_internal.h"
@@ -66,9 +65,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/avr/src/avr/up_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include <avr/io.h>
@@ -64,9 +63,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure. Zeroing
arch/avr/src/avr32/up_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "up_internal.h"
#include "up_arch.h"
@@ -61,9 +60,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure. Zeroing
arch/hc/src/m9s12/m9s12_initialstate.c
+2 -4
View File
@@ -27,7 +27,6 @@
#include <string.h>
#include <nuttx/sched.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include "up_internal.h"
@@ -61,9 +60,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/mips/src/mips32/mips_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include <arch/mips32/cp0.h>
@@ -65,9 +64,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/misoc/src/lm32/lm32_initialstate.c
+2 -4
View File
@@ -45,7 +45,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include "lm32.h"
@@ -78,9 +77,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/misoc/src/minerva/minerva_initialstate.c
+2 -4
View File
@@ -45,7 +45,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include <arch/minerva/csrdefs.h>
#include <arch/minerva/irq.h>
@@ -82,9 +81,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/or1k/src/common/up_initialstate.c
+2 -4
View File
@@ -44,7 +44,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "up_internal.h"
#include "up_arch.h"
@@ -80,9 +79,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/renesas/src/m16c/m16c_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/board/board.h>
#include "up_internal.h"
@@ -63,9 +62,8 @@ void up_initial_state(FAR struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/renesas/src/rx65n/rx65n_initialstate.c
+2 -4
View File
@@ -27,7 +27,6 @@
#include <stdint.h>
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "chip/chip.h"
#include "up_internal.h"
@@ -68,9 +67,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/renesas/src/sh1/sh1_initialstate.c
+2 -4
View File
@@ -26,7 +26,6 @@
#include <stdint.h>
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "up_internal.h"
#include "up_arch.h"
@@ -80,9 +79,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/risc-v/src/rv32im/riscv_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include "riscv_internal.h"
@@ -64,9 +63,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/risc-v/src/rv64gc/riscv_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include "riscv_internal.h"
@@ -64,9 +63,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/sim/src/sim/up_initialstate.c
+2 -4
View File
@@ -31,7 +31,6 @@
#endif
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "up_internal.h"
@@ -59,9 +58,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(sim_getsp() -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
memset(&tcb->xcp, 0, sizeof(struct xcptcontext));
arch/x86/src/i486/up_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/arch.h>
#include "up_internal.h"
@@ -61,9 +60,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/x86_64/src/intel64/up_initialstate.c
+2 -4
View File
@@ -28,7 +28,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/arch.h>
#include "up_internal.h"
@@ -62,9 +61,8 @@ void up_initial_state(struct tcb_s *tcb)
{
tcb->stack_alloc_ptr = (void *)(g_idle_topstack -
CONFIG_IDLETHREAD_STACKSIZE);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/xtensa/src/common/xtensa_initialstate.c
+2 -4
View File
@@ -29,7 +29,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include <arch/irq.h>
#include <arch/xtensa/core.h>
#include <arch/chip/core-isa.h>
@@ -64,9 +63,8 @@ void up_initial_state(struct tcb_s *tcb)
if (tcb->pid == 0)
{
tcb->stack_alloc_ptr = g_idlestack;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/xtensa/src/esp32/esp32_cpuidlestack.c
+2 -4
View File
@@ -24,7 +24,6 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "xtensa.h"
#include "esp32_smp.h"
@@ -98,9 +97,8 @@ int up_cpu_idlestack(int cpu, FAR struct tcb_s *tcb, size_t stack_size)
/* Save information about pre-allocated IDLE thread stack */
tcb->stack_alloc_ptr = g_cpu1_idlestack;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CPU1_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->adj_stack_size = CPU1_IDLETHREAD_STACKSIZE;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
#if XCHAL_CP_NUM > 0
/* REVISIT: Does it make since to have co-processors enabled on the IDLE
arch/z80/src/z180/z180_initialstate.c
+2 -4
View File
@@ -26,7 +26,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "chip.h"
#include "z80_internal.h"
@@ -59,9 +58,8 @@ void up_initial_state(struct tcb_s *tcb)
if (tcb->pid == 0)
{
tcb->stack_alloc_ptr = (void *)CONFIG_STACK_BASE;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */
arch/z80/src/z80/z80_initialstate.c
+2 -4
View File
@@ -26,7 +26,6 @@
#include <string.h>
#include <nuttx/arch.h>
#include <nuttx/tls.h>
#include "chip.h"
#include "z80_internal.h"
@@ -59,9 +58,8 @@ void up_initial_state(struct tcb_s *tcb)
if (tcb->pid == 0)
{
tcb->stack_alloc_ptr = (void *)CONFIG_STACK_BASE;
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE -
sizeof(struct task_info_s);
tcb->stack_base_ptr = tcb->stack_alloc_ptr;
tcb->adj_stack_size = CONFIG_IDLETHREAD_STACKSIZE;
}
/* Initialize the initial exception register context structure */