From 0a0db611552fe33754ddd39eb70d8d6d95b05ac8 Mon Sep 17 00:00:00 2001
From: Dong Heng <dongheng@espressif.com>
Date: Mon, 9 Jul 2018 11:24:16 +0800
Subject: [PATCH] feat(freertos): Change task stack unit from "unsigned long"
 to "unsigned char"

---
 .../port/esp8266/include/freertos/portmacro.h      |  2 +-
 components/freertos/port/esp8266/panic.c           |  7 ++++---
 components/freertos/port/esp8266/port.c            | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/components/freertos/port/esp8266/include/freertos/portmacro.h b/components/freertos/port/esp8266/include/freertos/portmacro.h
index cedef9cd..6e830a18 100644
--- a/components/freertos/port/esp8266/include/freertos/portmacro.h
+++ b/components/freertos/port/esp8266/include/freertos/portmacro.h
@@ -105,7 +105,7 @@ extern "C" {
 #define portDOUBLE      double
 #define portLONG        long
 #define portSHORT       short
-#define portSTACK_TYPE  unsigned portLONG
+#define portSTACK_TYPE  unsigned char
 #define portBASE_TYPE   long
 
 #define BaseType_t      portBASE_TYPE
diff --git a/components/freertos/port/esp8266/panic.c b/components/freertos/port/esp8266/panic.c
index c35b1843..67b16fd4 100644
--- a/components/freertos/port/esp8266/panic.c
+++ b/components/freertos/port/esp8266/panic.c
@@ -54,8 +54,9 @@ typedef struct task_info
     StackType_t		*pxEndOfStack;
 } task_info_t;
 
-static void IRAM_ATTR panic_stack(StackType_t *start, StackType_t *end)
+static void IRAM_ATTR panic_stack(StackType_t *start_stk, StackType_t *end_stk)
 {
+    uint32_t *start = (uint32_t *)start_stk, *end = (uint32_t *)end_stk;
     size_t i, j;
     size_t size = end - start + 1;
 
@@ -118,10 +119,10 @@ void IRAM_ATTR panicHandler(void *frame)
         if (task) {
             
             StackType_t *pdata = task->pxStack;
-            StackType_t *end = task->pxEndOfStack + 1;
+            StackType_t *end = task->pxEndOfStack + 4;
 
             ets_printf("\nTask stack [%s] stack from [%p] to [%p], total [%d] size\n\n",
-                        task->pcTaskName, pdata, end, end - pdata + 1);
+                        task->pcTaskName, pdata, end, end - pdata + 4);
 
             panic_stack(pdata, end);
 
diff --git a/components/freertos/port/esp8266/port.c b/components/freertos/port/esp8266/port.c
index c09c0164..dde9888c 100644
--- a/components/freertos/port/esp8266/port.c
+++ b/components/freertos/port/esp8266/port.c
@@ -107,16 +107,16 @@ void _xt_timer_int1(void);
 /*
  * See header file for description.
  */
-portSTACK_TYPE* pxPortInitialiseStack(portSTACK_TYPE* pxTopOfStack, pdTASK_CODE pxCode, void* pvParameters)
+StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters)
 {
-#define SET_STKREG(r,v) sp[(r) >> 2] = (portSTACK_TYPE)(v)
-    portSTACK_TYPE* sp, *tp;
+#define SET_STKREG(r,v) sp[(r) >> 2] = (unsigned long)(v)
+    unsigned long *sp, *tp, *stk = (unsigned long *)pxTopOfStack;
 
     /* Create interrupt stack frame aligned to 16 byte boundary */
-    sp = (portSTACK_TYPE*)(((INT32U)(pxTopOfStack + 1) - XT_CP_SIZE - XT_STK_FRMSZ) & ~0xf);
+    sp = (unsigned long *)(((INT32U)(stk + 1) - XT_CP_SIZE - XT_STK_FRMSZ) & ~0xf);
 
     /* Clear the entire frame (do not use memset() because we don't depend on C library) */
-    for (tp = sp; tp <= pxTopOfStack; ++tp) {
+    for (tp = sp; tp <= stk; ++tp) {
         *tp = 0;
     }
 
@@ -135,7 +135,7 @@ portSTACK_TYPE* pxPortInitialiseStack(portSTACK_TYPE* pxTopOfStack, pdTASK_CODE
     SET_STKREG(XT_STK_PS,      PS_UM | PS_EXCM | PS_WOE | PS_CALLINC(1));
 #endif
 
-    return sp;
+    return (StackType_t *)sp;
 }
 
 void IRAM_ATTR PendSV(char req)
@@ -361,7 +361,7 @@ signed portBASE_TYPE xTaskGenericCreate(TaskFunction_t pxTaskCode,
                                         void *pvParameters,
                                         unsigned portBASE_TYPE uxPriority,
                                         TaskHandle_t *pxCreatedTask,
-                                        portSTACK_TYPE *puxStackBuffer,
+                                        StackType_t *puxStackBuffer,
                                         const MemoryRegion_t * const xRegions)
 {
     (void)puxStackBuffer;