From 668f9ca48cf66e4c0d6c9839508eb50483778571 Mon Sep 17 00:00:00 2001 From: Dirk Niggemann Date: Wed, 21 Oct 2020 20:05:39 +0100 Subject: [PATCH 1/4] Fix eboot crash with exception 28. ets_printf takes pointer argument, not 32bit literal. --- bootloaders/eboot/eboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c index 1ca64a16aa..eccd149d5b 100644 --- a/bootloaders/eboot/eboot.c +++ b/bootloaders/eboot/eboot.c @@ -35,7 +35,7 @@ int print_version(const uint32_t flash_addr) uint32_t fmt[2]; fmt[0] = S('v', '%', '0', '8'); fmt[1] = S('x', '\n', 0, 0); - ets_printf((const char*) fmt, ver); + ets_printf((const char*) &fmt, ver); return 0; } @@ -235,14 +235,14 @@ int main() if (cmd.action == ACTION_COPY_RAW) { uint32_t cp = S('c', 'p', ':', 0); - ets_printf((const char *)cp); + ets_printf((const char *)&cp); ets_wdt_disable(); res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], false); ets_wdt_enable(); cp = S('0' + res, '\n', 0, 0 ); - ets_printf((const char *)cp); + ets_printf((const char *)&cp); #if 0 //devyte: this verify step below (cmp:) only works when the end of copy operation above does not overwrite the //beginning of the image in the empty area, see #7458. Disabling for now. @@ -251,7 +251,7 @@ int main() uint32_t v[2]; v[0] = S('c', 'm', 'p', ':'); v[1] = 0; - ets_printf(const char *)v); + ets_printf(const char *)&v); if (res == 0) { ets_wdt_disable(); res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], true); @@ -259,7 +259,7 @@ int main() } cp = S('0' + res, '\n', 0, 0 ); - ets_printf((const char *)cp); + ets_printf((const char *)&cp); #endif if (res == 0) { cmd.action = ACTION_LOAD_APP; @@ -278,7 +278,7 @@ int main() uint32_t e[2]; e[0] = S('e', ':', '0' + res, '\n' ); e[1] = 0; - ets_printf((const char*)e); + ets_printf((const char*)&e); } if (res) { From 609c7f53769ee5c9c865030f1104995b4cd4c477 Mon Sep 17 00:00:00 2001 From: Dirk Niggemann Date: Wed, 21 Oct 2020 20:20:51 +0100 Subject: [PATCH 2/4] add missing eboot.elf for 32b load fix --- bootloaders/eboot/eboot.elf | Bin 44892 -> 44860 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bootloaders/eboot/eboot.elf b/bootloaders/eboot/eboot.elf index e7e1fc543975fb3e53c36801db8004e63a9ef4aa..5843b8fed46267eb1df2be2e043373c25fcef2c5 100755 GIT binary patch delta 12157 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 J)f;;g{u^R&onHU| delta 12197 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 From 59ae6f32a4904d9fbd5494e1f4b0b76ed3012183 Mon Sep 17 00:00:00 2001 From: Dirk Niggemann Date: Wed, 21 Oct 2020 21:06:33 +0100 Subject: [PATCH 3/4] Corrected pointer use for uint32_t arrays. --- bootloaders/eboot/eboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c index eccd149d5b..afa0faab3c 100644 --- a/bootloaders/eboot/eboot.c +++ b/bootloaders/eboot/eboot.c @@ -22,7 +22,7 @@ extern void ets_wdt_enable(void); extern void ets_wdt_disable(void); // Converts bit of a string into a uint32 -#define S(a,b,c,d) ( (((uint32_t)a) & 0xff) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | (((uint32_t)d)<<24) ) +#define S(a,b,c,d) ( (((int32_t)a) & 0xff) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | (((uint32_t)d)<<24) ) int print_version(const uint32_t flash_addr) { @@ -35,7 +35,7 @@ int print_version(const uint32_t flash_addr) uint32_t fmt[2]; fmt[0] = S('v', '%', '0', '8'); fmt[1] = S('x', '\n', 0, 0); - ets_printf((const char*) &fmt, ver); + ets_printf((const char*) fmt, ver); return 0; } @@ -251,7 +251,7 @@ int main() uint32_t v[2]; v[0] = S('c', 'm', 'p', ':'); v[1] = 0; - ets_printf(const char *)&v); + ets_printf(const char *)v); if (res == 0) { ets_wdt_disable(); res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], true); @@ -278,7 +278,7 @@ int main() uint32_t e[2]; e[0] = S('e', ':', '0' + res, '\n' ); e[1] = 0; - ets_printf((const char*)&e); + ets_printf((const char*)e); } if (res) { From 0cb69bd3a6379e200e0263dd41a0dedba7d6eebf Mon Sep 17 00:00:00 2001 From: Dirk Niggemann Date: Wed, 21 Oct 2020 22:32:47 +0100 Subject: [PATCH 4/4] removed accidental change from uitn32_t to int32_t --- bootloaders/eboot/eboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c index afa0faab3c..cb65557270 100644 --- a/bootloaders/eboot/eboot.c +++ b/bootloaders/eboot/eboot.c @@ -22,7 +22,7 @@ extern void ets_wdt_enable(void); extern void ets_wdt_disable(void); // Converts bit of a string into a uint32 -#define S(a,b,c,d) ( (((int32_t)a) & 0xff) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | (((uint32_t)d)<<24) ) +#define S(a,b,c,d) ( (((uint32_t)a) & 0xff) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | (((uint32_t)d)<<24) ) int print_version(const uint32_t flash_addr) {