Merge pull request esp8266#7085 from mhightower83/pr-bear-stack-dump

earlephilhower · web-flow · commit 321d256c8b28 · 2020-02-16T09:17:39.000-08:00
Corrected stack start and end in stack_thunk_dump_stack().
diff --git a/cores/esp8266/StackThunk.cpp b/cores/esp8266/StackThunk.cpp
@@ -111,14 +111,14 @@ uint32_t stack_thunk_get_max_usage()
 /* Print the stack from the first used 16-byte chunk to the top, decodable by the exception decoder */
 void stack_thunk_dump_stack()
 {
-  uint32_t *pos = stack_thunk_top;
-  while (pos < stack_thunk_ptr) {
+  uint32_t *pos = stack_thunk_ptr;
+  while (pos < stack_thunk_top) {
     if ((pos[0] != _stackPaint) || (pos[1] != _stackPaint) || (pos[2] != _stackPaint) || (pos[3] != _stackPaint))
       break;
     pos += 4;
   }
   ets_printf(">>>stack>>>\n");
-  while (pos < stack_thunk_ptr) {
+  while (pos < stack_thunk_top) {
     ets_printf("%08x:  %08x %08x %08x %08x\n", (int32_t)pos, pos[0], pos[1], pos[2], pos[3]);
     pos += 4;
   }

Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,14 @@ uint32_t stack_thunk_get_max_usage()`
`111`	`111`	`/* Print the stack from the first used 16-byte chunk to the top, decodable by the exception decoder */`
`112`	`112`	`void stack_thunk_dump_stack()`
`113`	`113`	`{`
`114`		`- uint32_t *pos = stack_thunk_top;`
`115`		`- while (pos < stack_thunk_ptr) {`
	`114`	`+ uint32_t *pos = stack_thunk_ptr;`
	`115`	`+ while (pos < stack_thunk_top) {`
`116`	`116`	`if ((pos[0] != _stackPaint) \|\| (pos[1] != _stackPaint) \|\| (pos[2] != _stackPaint) \|\| (pos[3] != _stackPaint))`
`117`	`117`	`break;`
`118`	`118`	`pos += 4;`
`119`	`119`	`}`
`120`	`120`	`ets_printf(">>>stack>>>\n");`
`121`		`- while (pos < stack_thunk_ptr) {`
	`121`	`+ while (pos < stack_thunk_top) {`
`122`	`122`	`ets_printf("%08x: %08x %08x %08x %08x\n", (int32_t)pos, pos[0], pos[1], pos[2], pos[3]);`
`123`	`123`	`pos += 4;`
`124`	`124`	`}`