Changeset 40eab9f in mainline for kernel/generic/src/debug/stacktrace.c

Timestamp:

2023-11-03T18:47:41Z (15 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

b1397ab

Parents:

dcd8214

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-11-03 18:46:22)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-11-03 18:47:41)

Message:

Print symbol names and line numbers in stacktraces for init tasks

Only useful in select few situations, but useful nonetheless.

File:

• kernel/generic/src/debug/stacktrace.c (modified) (3 diffs)

kernel/generic/src/debug/stacktrace.c

@@ -60 +60 @@
                 int column = 0;
 
+                /*
+                 * If this isn't the first frame, move pc back by one byte to read the
+                 * position of the call instruction, not the return address.
+                 */
+                pc = cnt == 1 ? ctx->pc : ctx->pc - 1;
+
                 if (ops->symbol_resolve &&
-                    ops->symbol_resolve(ctx->pc, 0, &symbol, &symbol_addr, &file_name, &dir_name, &line, &column)) {
+                    ops->symbol_resolve(pc, 0, &symbol, &symbol_addr, &file_name, &dir_name, &line, &column)) {
 
                         if (symbol == NULL)
@@ -130 +136 @@
 {
         *symbol_addr = 0;
-        *symbol = symtab_name_lookup(addr, symbol_addr);
+        *symbol = symtab_name_lookup(addr, symbol_addr, &kernel_sections);
 
-        return debug_line_get_address_info(addr, op_index, filename, dirname, line, column) || *symbol_addr != 0;
+        return debug_line_get_address_info(&kernel_sections, addr, op_index, filename, dirname, line, column) || *symbol_addr != 0;
+}
+
+static bool
+resolve_uspace_address(uintptr_t addr, int op_index,
+    const char **symbol, uintptr_t *symbol_addr,
+    const char **filename, const char **dirname,
+    int *line, int *column)
+{
+        if (TASK->debug_sections == NULL)
+                return false;
+
+        debug_sections_t *scs = TASK->debug_sections;
+
+        *symbol_addr = 0;
+        *symbol = symtab_name_lookup(addr, symbol_addr, scs);
+
+        return debug_line_get_address_info(scs, addr, op_index, filename, dirname, line, column) || *symbol_addr != 0;
 }
 
@@ -146 +169 @@
         .frame_pointer_prev = uspace_frame_pointer_prev,
         .return_address_get = uspace_return_address_get,
-        .symbol_resolve = NULL
+        .symbol_resolve = resolve_uspace_address,
 };