Commit e38d1cb28c666f154c6f61b323ad0931724c2eb8

Authored by Alexey Brodkin
Committed by Tom Rini
1 parent 73c2575306

initcall: add explicit hint if initcall was relocated

Commit "initcall: Improve debugging support" makes sense and indeed
simplifies process of matching initcalls executed with static
disassembly.

Until you are debugging relocation functionality.

Existign output may make you think that at some point execution somehow
returned back to non-relocated area. And there're many reasons/problems
that may provoke this behavior.

In order to make things clear let's add explicit mention in case initall
was actually relocated like this:
--->---
initcall: 810015f8
Relocation Offset is: 0efcf000
Relocating to 8ffcf000, new gd at 8fdced3c, sp at 8fdced20
initcall: 810015b8
initcall: 8ffd093c
initcall: 8ffd0a14
initcall: 81001940 (relocated to 8ffd0940)
initcall: 81001958 (relocated to 8ffd0958)
--->---

Note "unexpected" jump from 0x8f... area to 0x81... area.
Without explanation this raises many questions: execution jumped in
relocated area right as expected and then for some reason returned back?

But I hope comment in brackets will save some time for those curious
developers who are careful enough to catch "unexpected jump to pre-reloc
area" or those unlucky ones who'll have to deal with relocation
debugging.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Minkyu Kang <mk7.kang@samsung.com>

Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff

... ... @@ -19,7 +19,11 @@
19 19  
20 20 if (gd->flags & GD_FLG_RELOC)
21 21 reloc_ofs = gd->reloc_off;
22   - debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
  22 + debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs);
  23 + if (gd->flags & GD_FLG_RELOC)
  24 + debug(" (relocated to %p)\n", (char *)*init_fnc_ptr);
  25 + else
  26 + debug("\n");
23 27 ret = (*init_fnc_ptr)();
24 28 if (ret) {
25 29 printf("initcall sequence %p failed at call %p (err=%d)\n",