Changes in kernel/generic/src/debug/stacktrace.c [40eab9f:bab75df6] in mainline

File:

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

kernel/generic/src/debug/stacktrace.c

@@ -39 +39 @@
 #include <stdio.h>
 
-#include <debug/line.h>
-
 #define STACK_FRAMES_MAX  20
 
@@ -46 +44 @@
 {
         int cnt = 0;
-
+        const char *symbol;
+        uintptr_t offset;
         uintptr_t fp;
         uintptr_t pc;
@@ -52 +51 @@
         while ((cnt++ < STACK_FRAMES_MAX) &&
             (ops->stack_trace_context_validate(ctx))) {
-
-                const char *symbol = NULL;
-                uintptr_t symbol_addr = 0;
-                const char *file_name = NULL;
-                const char *dir_name = NULL;
-                int line = 0;
-                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(pc, 0, &symbol, &symbol_addr, &file_name, &dir_name, &line, &column)) {
-
-                        if (symbol == NULL)
-                                symbol = "<unknown>";
-
-                        if (file_name == NULL && line == 0) {
-                                printf("%p: %24s()+%zu\n", (void *) ctx->fp, symbol, ctx->pc - symbol_addr);
-                        } else {
-                                if (file_name == NULL)
-                                        file_name = "<unknown>";
-                                if (dir_name == NULL)
-                                        dir_name = "<unknown>";
-
-                                printf("%p: %20s()+%zu\t %s/%s:%d:%d\n",
-                                    (void *) ctx->fp, symbol, ctx->pc - symbol_addr,
-                                    dir_name, file_name, line, column);
-                        }
+                    ops->symbol_resolve(ctx->pc, &symbol, &offset)) {
+                        if (offset)
+                                printf("%p: %s()+%p\n", (void *) ctx->fp,
+                                    symbol, (void *) offset);
+                        else
+                                printf("%p: %s()\n", (void *) ctx->fp, symbol);
                 } else
                         printf("%p: %p()\n", (void *) ctx->fp, (void *) ctx->pc);
@@ -130 +104 @@
 
 static bool
-resolve_kernel_address(uintptr_t addr, int op_index,
-    const char **symbol, uintptr_t *symbol_addr,
-    const char **filename, const char **dirname,
-    int *line, int *column)
+kernel_symbol_resolve(uintptr_t addr, const char **sp, uintptr_t *op)
 {
-        *symbol_addr = 0;
-        *symbol = symtab_name_lookup(addr, symbol_addr, &kernel_sections);
-
-        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;
+        return (symtab_name_lookup(addr, sp, op) == 0);
 }
 
@@ -162 +113 @@
         .frame_pointer_prev = kernel_frame_pointer_prev,
         .return_address_get = kernel_return_address_get,
-        .symbol_resolve = resolve_kernel_address,
+        .symbol_resolve = kernel_symbol_resolve
 };
 
@@ -169 +120 @@
         .frame_pointer_prev = uspace_frame_pointer_prev,
         .return_address_get = uspace_return_address_get,
-        .symbol_resolve = resolve_uspace_address,
+        .symbol_resolve = NULL
 };