* Added more debug information

Author: Arun007coder

.github/workflows/makefile.yml

@@ -34,11 +34,11 @@ jobs:
     - name: Create hdfile
       run: make sorhd
 
-    - name: Upload compiled toolchain
-      uses: actions/upload-artifact@v2
-      with: 
-        name: sectoros_toolchain
-        path: ~/toolchain.tar.xz
+    # - name: Upload compiled toolchain
+    #   uses: actions/upload-artifact@v2
+    #   with: 
+    #     name: sectoros_toolchain
+    #     path: ~/toolchain.tar.xz
 
     - name: Upload kernel
       uses: actions/upload-artifact@v2

Makefile

@@ -194,6 +194,9 @@ $(IMAGEFILE): sorfs_compile create_test_program
 run: $(ISOFILE)
 	$(QEMU) $(QEMUFLAGS) -enable-kvm -cpu host -serial stdio | tee k.log
 
+runnkvm: $(ISOFILE)
+	$(QEMU) $(QEMUFLAGS) -serial stdio | tee k.log
+
 rund: $(ISOFILE)
 	$(QEMU) $(QEMUFLAGS) $(QEMUDFLAGS)
 

src/common/libs/debug.c

@@ -128,6 +128,9 @@ void load_kernel_symbols(multiboot_info_t* info)
 
     char* strtab = NULL;
 
+    elf_section_header_t* sym_shdr = NULL;
+    elf_section_header_t* str_shdr = NULL;
+
     for(uint32_t i = 0; i < num; i++)
     {
         if(shdr[i].sh_type == SHT_SYMTAB)
@@ -137,20 +140,16 @@ void load_kernel_symbols(multiboot_info_t* info)
             sym_num = (shdr[i].sh_size / sizeof(elf_sym_t));
             strtab = shdr[shdr[i].sh_link].sh_addr;
             alloc_region(kernel_page_dir, strtab, strtab + shdr[shdr[i].sh_link].sh_size, 1, 1, 1);
+            sym_shdr = &shdr[i];
+            str_shdr = &(shdr[shdr[i].sh_link]);
+
         }
     }
 
     // ASSERT(symtab == NULL && "Kernel symbols not loaded");
 
-    uint32_t func_num = 0;
-
-    for(uint32_t i = 0; i < sym_num; i++)
-    {
-        if(symtab[i].st_info & STT_FUNC)
-        {
-            func_num++;
-        }
-    }
+    uint32_t func_num = (sym_shdr->sh_size/sym_shdr->sh_entsize);
+    ldprintf("KERNEL", LOG_INFO, "Found %d symbols", func_num);
 
     kernel_symbols = zalloc(sizeof(symbol_t) * func_num);
 
@@ -162,8 +161,8 @@ void load_kernel_symbols(multiboot_info_t* info)
         {
             kernel_symbols[j].addr = symtab[i].st_value;
             kernel_symbols[j].size = symtab[i].st_size;
-            kernel_symbols[j].name = strdup(&strtab[symtab[i].st_name]);
-            //serialprintf("%s: 0x%x %dB\n", kernel_symbols[j].name, kernel_symbols[j].addr, kernel_symbols[j].size);
+            kernel_symbols[j].name = strdup(&(strtab[symtab[i].st_name]));
+            serialprintf("%s: 0x%x %dB\n", kernel_symbols[j].name, kernel_symbols[j].addr, kernel_symbols[j].size);
             j++;
         }
         // else if(symtab[i].st_info & STT_OBJECT)

src/drivers/storage/logdisk.c

@@ -138,7 +138,7 @@ void logdisk_printType(char* issuer, char* msg, int type)
         serialprintf("[ %s ] %s: %s\n", logdisk_type_to_str(type), issuer, msg);
         break;
     case LOG_DEBUG:
-        printf(TERM_DEBUG_COLOR"[ %s ] %s: %s\n"TERM_RESET_COLOR, logdisk_type_to_str(type), issuer, msg);
+        //printf(TERM_DEBUG_COLOR"[ %s ] %s: %s\n"TERM_RESET_COLOR, logdisk_type_to_str(type), issuer, msg);
         serialprintf("[ %s ] %s: %s\n", logdisk_type_to_str(type), issuer, msg);
         break;
     default:

src/kernel/kernel.c

@@ -303,7 +303,7 @@ void kernelmain(const multiboot_info_t* info, uint32_t multiboot_magic)
 
     printtime();
 
-    compositor_load_wallpaper("/wallpaper.bmp", 2);
+    //compositor_load_wallpaper("/wallpaper.bmp", 2);
     init_vbox();
     init_shell();
 
@@ -375,6 +375,12 @@ void kernelmain(const multiboot_info_t* info, uint32_t multiboot_magic)
         serialprintf("%s: 0x%x, %dB\n", s->name, s->addr, s->size);
     }
 
+    s = get_kernel_symbol_by_name("serialprintf");
+    if(s != NULL)
+    {
+        serialprintf("%s: 0x%x, %dB\n", s->name, s->addr, s->size);
+    }
+
     printf("\nSectorOS shell v2.0.0\nRun help to get the list of commands.\n#/> ");
 
     if((list_contain_str(mboot_cmd, "--load_modules")) != -1)

src/kernel/modules.c

@@ -102,6 +102,11 @@ int load_module(char** argv)
         modules = list_create();
 
     FILE* f = file_open(argv[0], OPEN_RDONLY);
+
+    if(f == NULL)
+        kernel_panic("Given module does not exist!");
+
+
     uint32_t mod_sz = vfs_getFileSize(f);
 
     uint8_t* buf = zalloc(mod_sz);
@@ -147,7 +152,7 @@ int load_module(char** argv)
         else
         {
             shdr->sh_addr = (buf + shdr->sh_offset);
-            serialprintf("SHDR %d: 0x%x\n", i, shdr->sh_addr);
+            ldprintf("Module loader", LOG_DEBUG, "SHDR %d: 0x%x", i, shdr->sh_addr);
         }
     }
 
@@ -179,21 +184,28 @@ int load_module(char** argv)
             {
                 elf_section_header_t* sym_shdr = (buf + (head->e_shoff + (head->e_shentsize * symtab[s].st_shndx)));
                 symtab[s].st_value = symtab[s].st_value + sym_shdr->sh_addr;
-                serialprintf("SYM: %s : 0x%x\n", &(strtab[symtab[s].st_name]), symtab[s].st_value);
+                ldprintf("Module loader", LOG_DEBUG, "LOCAL %s: 0x%x %dB", &(strtab[symtab[s].st_name]), symtab[s].st_value, symtab[s].st_size);
             }
             else if(symtab[s].st_shndx == SHN_UNDEF) // Kernel symbol
             {
-                serialprintf("STRTAB: 0x%x\n", strtab);
-                serialprintf("SYMTAB: 0x%x\n", symtab);
-                serialprintf("SYM: %s\n", &(strtab[symtab[s].st_name]));
-                symtab[s].st_value = (uintptr_t)get_kernel_symbol_by_name(&(strtab[symtab[s].st_name]));
+                if(strcmp(&(strtab[symtab[s].st_name]), "") == 0)
+                    continue;
+
+                symbol_t* sym = get_kernel_symbol_by_name(&(strtab[symtab[s].st_name]));
+                if(sym == NULL)
+                {
+                    ldprintf("Module loader", LOG_ERR, "Cannot resolve symbol named %s from the list of kernel symbols", &(strtab[symtab[s].st_name]));
+                    kernel_panic("Cannot resolve kernel symbols present in module");
+                }
+                symtab[s].st_value = (uintptr_t)sym->addr;
+                symtab[s].st_size = sym->size;
+                ldprintf("Module loader", LOG_DEBUG, "%s: 0x%x %dB", &(strtab[symtab[s].st_name]), symtab[s].st_value, symtab[s].st_size);
             }
             add_sym_to_modentry(strdup(&(strtab[symtab[s].st_name])), symtab[s].st_value, symtab[s].st_size, mod_entry);
             if(symtab[s].st_name && (strcmp(&(strtab[symtab[s].st_name]), "metadata") == 0))
             {
                 mod_info = (void*)symtab[s].st_value;
                 mod_entry->info = mod_info;
-                serialprintf("MOD_INFO: 0x%x\n", mod_info);
             }
             sym_num++;
         }
@@ -238,7 +250,7 @@ int load_module(char** argv)
                 ptr = (rel_table->r_offset + r_section->sh_addr);
                 A = *ptr;
                 P = (uintptr_t)ptr;
-                ldprintf("Module loader", LOG_INFO, "Using symbol %s", name);
+                ldprintf("Module loader", LOG_DEBUG, "Using symbol %s", name);
                 if(!get_module_symbol_by_name(name, symtab, strtab, sym_num))
                 {
                     if(get_kernel_symbol_by_name(name))
@@ -260,11 +272,12 @@ int load_module(char** argv)
             {
             case R_386_32:
                 *ptr = A + S;
-                serialprintf("0x%x = 0x%x + 0x%x\n", *ptr, A, S);
+                ldprintf("Module loader", LOG_DEBUG, "'R_386_32' 0x%x = 0x%x + 0x%x", *ptr, A, S);
                 break;
             case R_386_PC32:
                 *ptr = A + S - P;
                 serialprintf("0x%x = 0x%x + 0x%x - 0x%x\n", *ptr, A, S, P);
+                ldprintf("Module loader", LOG_DEBUG, "'R_386_PC32' 0x%x = 0x%x + 0x%x - 0x%x", *ptr, A, S, P);
                 break;
             default:
                 ldprintf("Module loader", LOG_ERR, "Unsupported reallocation %d found", ELF32_R_TYPE(rel_table[rel].r_info));
@@ -281,19 +294,14 @@ int load_module(char** argv)
     int argc = 0;
 	for (char ** aa = argv; *aa; ++aa) ++argc;
 
-    serialprintf("Got symbols:\n");
     module_init* init = NULL;
     foreach(g, mod_entry->symbols)
     {
         symbol_t* s = g->val;
-        serialprintf("\t-%s: 0x%x 0x%x\n", s->name, s->addr, s->size);
-        if (strcmp(s->name, "init") == 0)
-        {
-            init = 0xc1893310;
-        }
+        ldprintf("Module loader", LOG_DEBUG, "%s: 0x%x 0x%x", s->name, s->addr, s->size);
     }
 
     xxd(mod_info, sizeof(module_info_t));
     ldprintf("Module loader", LOG_INFO, "Initializing module: %s", mod_info->name);
-    return (*((module_init*)0x8312663d))(argc, argv);
+    return mod_info->init(argc, argv);
 }