:: commit 21ff1c452fd197cc377fb9f0c32257ac582b83f8

mintsuki <mintsuki@protonmail.com> — 2020-10-16 14:04

parents: 6b75c3bd8b

Remove eccessive memmap dumps and add stivale and stivale2 module loading feedback messages

diff --git a/limine.bin b/limine.bin
index c12c9867..2d442840 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2/mm/pmm.c b/stage2/mm/pmm.c
index 0a9a47d1..89bc7757 100644
--- a/stage2/mm/pmm.c
+++ b/stage2/mm/pmm.c
@@ -141,7 +141,6 @@ static void sanitise_entries(void) {
 
         if (memmap[i+1].type == MEMMAP_BOOTLOADER_RECLAIMABLE
          && memmap[i+1].base == memmap[i].base + memmap[i].length) {
-            print("%u: Merging %X %X to %X %X\n", i, memmap[i].base, memmap[i].length, memmap[i+1].base, memmap[i].length + memmap[i+1].length);
             memmap[i].length += memmap[i+1].length;
 
             // Eradicate from memmap
@@ -159,9 +158,6 @@ struct e820_entry_t *get_memmap(size_t *entries) {
 
     *entries = memmap_entries;
 
-    print("Memory map requested. Current layout:\n");
-    print_memmap(memmap, memmap_entries);
-
     return memmap;
 }
 
diff --git a/stage2/protos/stivale.c b/stage2/protos/stivale.c
index 35e756d1..2ed45dd9 100644
--- a/stage2/protos/stivale.c
+++ b/stage2/protos/stivale.c
@@ -139,6 +139,8 @@ void stivale_load(char *cmdline, int boot_drive) {
             ((uint32_t)top_used_addr & ~((uint32_t)0xfff)) + 0x1000 :
             (uint32_t)top_used_addr);
 
+        print("stivale: Loading module `%s`...\n", module_file);
+
         memmap_alloc_range((size_t)module_addr, f.size, 10);
         fread(&f, module_addr, 0, f.size);
 
diff --git a/stage2/protos/stivale2.c b/stage2/protos/stivale2.c
index bd9dc654..7856b646 100644
--- a/stage2/protos/stivale2.c
+++ b/stage2/protos/stivale2.c
@@ -184,6 +184,8 @@ void stivale2_load(char *cmdline, int boot_drive) {
             ((uint32_t)top_used_addr & ~((uint32_t)0xfff)) + 0x1000 :
             (uint32_t)top_used_addr);
 
+        print("stivale2: Loading module `%s`...\n", module_file);
+
         memmap_alloc_range((size_t)module_addr, f.size, 0x1001);
         fread(&f, module_addr, 0, f.size);
 
diff --git a/stage2/sys/e820.c b/stage2/sys/e820.c
index 5507149c..71533b28 100644
--- a/stage2/sys/e820.c
+++ b/stage2/sys/e820.c
@@ -36,7 +36,4 @@ void init_e820(void) {
 
         conv_mem_alloc(sizeof(struct e820_entry_t));
     }
-
-    print("E820 memory map:\n");
-    print_memmap(e820_map, e820_entries);
 }
tab: 248 wrap: offon