Move continuation stack from .bss onto sys stack

igrr · igrr · commit af09cb589870 · 2018-04-07T14:46:02.000+08:00
diff --git a/cores/esp8266/cont_util.c b/cores/esp8266/cont_util.c
@@ -26,6 +26,8 @@
 #define CONT_STACKGUARD 0xfeefeffe
 
 void cont_init(cont_t* cont) {
+    memset(cont, 0, sizeof(cont_t));
+    
     cont->stack_guard1 = CONT_STACKGUARD;
     cont->stack_guard2 = CONT_STACKGUARD;
     cont->stack_end = cont->stack + (sizeof(cont->stack) / 4);
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -40,6 +40,9 @@ extern "C" {
 
 #define OPTIMISTIC_YIELD_TIME_US 16000
 
+
+extern "C" void call_user_start();
+
 struct rst_info resetInfo;
 
 extern "C" {
@@ -76,14 +79,14 @@ void preloop_update_frequency() {
 extern void (*__init_array_start)(void);
 extern void (*__init_array_end)(void);
 
-cont_t g_cont __attribute__ ((aligned (16)));
+cont_t* g_pcont __attribute__((section(".noinit")));
 static os_event_t g_loop_queue[LOOP_QUEUE_SIZE];
 
 static uint32_t g_micros_at_task_start;
 
 extern "C" void esp_yield() {
-    if (cont_can_yield(&g_cont)) {
-        cont_yield(&g_cont);
+    if (cont_can_yield(g_pcont)) {
+        cont_yield(g_pcont);
     }
 }
 
@@ -92,7 +95,7 @@ extern "C" void esp_schedule() {
 }
 
 extern "C" void __yield() {
-    if (cont_can_yield(&g_cont)) {
+    if (cont_can_yield(g_pcont)) {
         esp_schedule();
         esp_yield();
     }
@@ -104,7 +107,7 @@ extern "C" void __yield() {
 extern "C" void yield(void) __attribute__ ((weak, alias("__yield")));
 
 extern "C" void optimistic_yield(uint32_t interval_us) {
-    if (cont_can_yield(&g_cont) &&
+    if (cont_can_yield(g_pcont) &&
         (system_get_time() - g_micros_at_task_start) > interval_us)
     {
         yield();
@@ -126,8 +129,8 @@ static void loop_wrapper() {
 static void loop_task(os_event_t *events) {
     (void) events;
     g_micros_at_task_start = system_get_time();
-    cont_run(&g_cont, &loop_wrapper);
-    if (cont_check(&g_cont) != 0) {
+    cont_run(g_pcont, &loop_wrapper);
+    if (cont_check(g_pcont) != 0) {
         panic();
     }
 }
@@ -146,6 +149,12 @@ void init_done() {
 }
 
 
+extern "C" void ICACHE_RAM_ATTR app_entry(void) {
+    cont_t s_cont __attribute__((aligned(16)));
+    g_pcont = &s_cont;
+    call_user_start();
+}
+
 extern "C" void user_init(void) {
     struct rst_info *rtc_info_ptr = system_get_rst_info();
     memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
@@ -156,7 +165,7 @@ extern "C" void user_init(void) {
 
     initVariant();
 
-    cont_init(&g_cont);
+    cont_init(g_pcont);
 
     ets_task(loop_task,
         LOOP_TASK_PRIORITY, g_loop_queue,
diff --git a/cores/esp8266/core_esp8266_postmortem.c b/cores/esp8266/core_esp8266_postmortem.c
@@ -32,7 +32,7 @@
 
 extern void __real_system_restart_local();
 
-extern cont_t g_cont;
+extern cont_t* g_pcont;
 
 // These will be pointers to PROGMEM const strings
 static const char* s_panic_file = 0;
@@ -131,8 +131,8 @@ void __wrap_system_restart_local() {
         ets_printf_P("\nSoft WDT reset\n");
     }
 
-    uint32_t cont_stack_start = (uint32_t) &(g_cont.stack);
-    uint32_t cont_stack_end = (uint32_t) g_cont.stack_end;
+    uint32_t cont_stack_start = (uint32_t) &(g_pcont->stack);
+    uint32_t cont_stack_end = (uint32_t) g_pcont->stack_end;
     uint32_t stack_end;
 
     // amount of stack taken by interrupt or exception handler
diff --git a/platform.txt b/platform.txt
@@ -37,7 +37,7 @@ compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implici
 compiler.S.cmd=xtensa-lx106-elf-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
 
-compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
+compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u app_entry {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
 
 compiler.c.elf.cmd=xtensa-lx106-elf-gcc
 compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 -lstdc++ -lm -lc -lgcc
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -9,7 +9,7 @@ PHDRS
   irom0_0_phdr PT_LOAD;
 }
 /*  Default entry point:  */
-ENTRY(call_user_start)
+ENTRY(app_entry)
 EXTERN(_DebugExceptionVector)
 EXTERN(_DoubleExceptionVector)
 EXTERN(_KernelExceptionVector)
@@ -75,6 +75,10 @@ SECTIONS
     _Pri_3_HandlerAddress = ABSOLUTE(.);
     _data_end = ABSOLUTE(.);
   } >dram0_0_seg :dram0_0_phdr
+  .noinit : ALIGN(4)
+  {
+    *(.noinit)
+  } >dram0_0_seg :dram0_0_phdr
   .irom0.text : ALIGN(4)
   {
     _irom0_text_start = ABSOLUTE(.);
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h
@@ -12,7 +12,7 @@ PHDRS
 
 
 /*  Default entry point:  */
-ENTRY(call_user_start)
+ENTRY(app_entry)
 EXTERN(_DebugExceptionVector)
 EXTERN(_DoubleExceptionVector)
 EXTERN(_KernelExceptionVector)
@@ -83,6 +83,11 @@ SECTIONS
     _Pri_3_HandlerAddress = ABSOLUTE(.);
     _data_end = ABSOLUTE(.);
   } >dram0_0_seg :dram0_0_phdr
+
+  .noinit : ALIGN(4)
+  {
+    *(.noinit)
+  } >dram0_0_seg :dram0_0_phdr
   
 #ifdef VTABLES_IN_DRAM
 #include "eagle.app.v6.common.ld.vtables.h"
