added support for modules to stack trace

Author: Glowman554

mckrnl/core/include/module.h

@@ -21,10 +21,18 @@ typedef struct module {
     elf_object_context_t ctx;
 } module_t;
 
+#define MAX_MODULES 32
+
+
+extern module_t* loaded_modules[MAX_MODULES];
+extern int loaded_module_count;
+
 #define define_module(name, init, stage_driver, stage_mount) module_t __module__ = { name, init, stage_driver, stage_mount };
 
 module_t* load_object_file(void* image);
 void* resolve_symbol_address(elf_object_context_t* ctx, const char* symbol_name);
+char* resolve_symbol_name(elf_object_context_t* ctx, void* address);
+
 void initrd_load_modules(void* saf_image, char* path);
 
 void stage_driver();

mckrnl/core/module.c

@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-module_t* loaded_modules[32] = { 0 };
+module_t* loaded_modules[MAX_MODULES] = { 0 };
 int loaded_module_count = 0;
 
 void* resolve_symbol_address(elf_object_context_t* ctx, const char* symbol_name) {
@@ -29,6 +29,27 @@ void* resolve_symbol_address(elf_object_context_t* ctx, const char* symbol_name)
     return NULL;
 }
 
+char* resolve_symbol_name(elf_object_context_t* ctx, void* address) {
+    for (uint32_t i = 0; i < ctx->header->sh_entry_count; i++) {
+        if (ctx->section_headers[i].type != SHT_SYMTAB) {
+            continue;
+        }
+
+        struct elf_symbol* symbol_table = (struct elf_symbol*)((uint8_t*)ctx->image + ctx->section_headers[i].offset);
+        uint32_t symbol_count = ctx->section_headers[i].size / sizeof(struct elf_symbol);
+        char* string_table = (char*)ctx->image + ctx->section_headers[ctx->section_headers[i].link].offset;
+
+        for (uint32_t j = 0; j < symbol_count; j++) {
+            void* sym_addr = (uint8_t*)ctx->load_base + ctx->section_addresses[symbol_table[j].shndx] + symbol_table[j].value;
+    		if(address >= sym_addr &&  address < sym_addr + symbol_table[j].size) {
+                return string_table + symbol_table[j].name;
+            }
+        }
+    }
+
+    return NULL;
+}
+
 module_t* load_object_file(void* image) {
     struct elf_header* header = image;
     if (header->magic != ELF_MAGIC || header->sh_entry_count == 0) {

mckrnl/core/utils/stdio.c

@@ -15,6 +15,8 @@
 #include <utils/trace.h>
 #include <gdb/gdb.h>
 
+#include <module.h>
+
 char_output_driver_t* debugf_driver = NULL;
 char_output_driver_t* printf_driver = NULL;
 
@@ -86,6 +88,16 @@ void stacktrace_print(int frame_num, uint32_t eip) {
 		uint32_t symbol_start = resolve_symbol_from_name(symbol);
 		printf("[ 0x%x ] <%s + %d>\n", eip, symbol, eip - symbol_start);
 	} else {
+		for (int i = 0; i < loaded_module_count; i++) {
+			module_t* module = loaded_modules[i];
+			char* mod_symbol = resolve_symbol_name(&module->ctx, (void*)eip);
+			if (mod_symbol) {
+				uint32_t symbol_start = (uint32_t) resolve_symbol_address(&module->ctx, mod_symbol);
+				printf("[ 0x%x (%s) ] <%s + %d>\n", eip, module->name, mod_symbol, eip - symbol_start);
+				return;
+			}
+		}
+
 		printf("[ 0x%x ] <unknown>\n", eip);
 	}
 }