Skip to content

Fix eboot crash with exception 28. ets_printf() should take pointer argument. #7666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 21, 2020
Merged

Fix eboot crash with exception 28. ets_printf() should take pointer argument. #7666

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
668f9ca
Fix eboot crash with exception 28. ets_printf takes pointer argument,…
dirkenstein Oct 21, 2020
609c7f5
add missing eboot.elf for 32b load fix
dirkenstein Oct 21, 2020
59ae6f3
Corrected pointer use for uint32_t arrays.
dirkenstein Oct 21, 2020
0cb69bd
removed accidental change from uitn32_t to int32_t
dirkenstein Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bootloaders/eboot/eboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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.
Expand All @@ -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;
Expand Down
Binary file modified bootloaders/eboot/eboot.elf
View file
Open in desktop
Binary file not shown.