diff --git a/include/zephyr/debug/symtab.h b/include/zephyr/debug/symtab.h index a8685cf4ddd..7556222cff8 100644 --- a/include/zephyr/debug/symtab.h +++ b/include/zephyr/debug/symtab.h @@ -24,7 +24,7 @@ struct z_symtab_entry { struct symtab_info { /* Absolute address of the first symbol */ - const uintptr_t start_addr; + const uintptr_t first_addr; /* Number of symbol entries */ const uint32_t length; /* Symbol entries */ diff --git a/scripts/build/gen_symtab.py b/scripts/build/gen_symtab.py index b5abf8e4ea9..1d933443384 100644 --- a/scripts/build/gen_symtab.py +++ b/scripts/build/gen_symtab.py @@ -65,7 +65,7 @@ class symtab_entry: return self.addr == other.addr -start_addr = 0 +first_addr = 0 symtab_list = [] @@ -109,11 +109,11 @@ def main(): symtab_list.sort(key=lambda x: x.addr, reverse=False) # Get the address of the first symbol - start_addr = symtab_list[0].addr + first_addr = symtab_list[0].addr for i, entry in enumerate(symtab_list): # Offset is calculated here - entry.offset = entry.addr - start_addr + entry.offset = entry.addr - first_addr # Debug print log.debug('%6d: %s %s %.25s' % ( @@ -146,7 +146,7 @@ def main(): print(f"}};\n", file=wf) print(f"const struct symtab_info z_symtab = {{", file=wf) - print(f"\t.start_addr = {hex(start_addr)},", file=wf) + print(f"\t.first_addr = {hex(first_addr)},", file=wf) print(f"\t.length = {len(symtab_list)},", file=wf) print(f"\t.entries = z_symtab_entries,", file=wf) print(f"}};\n", file=wf) diff --git a/subsys/debug/symtab/symtab.c b/subsys/debug/symtab/symtab.c index f8379826230..98fb04bf945 100644 --- a/subsys/debug/symtab/symtab.c +++ b/subsys/debug/symtab/symtab.c @@ -19,7 +19,7 @@ const struct symtab_info *const symtab_get(void) const char *const symtab_find_symbol_name(uintptr_t addr, uint32_t *offset) { const struct symtab_info *const symtab = symtab_get(); - const uint32_t symbol_offset = addr - symtab->start_addr; + const uint32_t symbol_offset = addr - symtab->first_addr; uint32_t left = 0, right = symtab->length; uint32_t ret_offset = 0; const char *ret_name = "?";