:: commit b73890cce57b65ae6eb4c94189db393335eb53b8

mintsuki <mintsuki@protonmail.com> — 2021-05-11 04:12

parents: 0687bd2760

Revert "stivale: Reduce verbosity"

This reverts commit 8b38bc55cb4315bdd55e110d7d4baaeabed27cd2.
diff --git a/stage23/protos/stivale.c b/stage23/protos/stivale.c
index 951dcd40..01134665 100644
--- a/stage23/protos/stivale.c
+++ b/stage23/protos/stivale.c
@@ -73,6 +73,7 @@ void stivale_load(char *config, char *cmdline) {
             }
             // Check if 5-level paging is available
             if (cpuid(0x00000007, 0, &eax, &ebx, &ecx, &edx) && (ecx & (1 << 16))) {
+                print("stivale: CPU has 5-level paging support\n");
                 level5pg = true;
             }
 
@@ -95,6 +96,8 @@ void stivale_load(char *config, char *cmdline) {
             panic("stivale: Not 32 nor 64 bit x86 ELF file.");
     }
 
+    print("stivale: %u-bit ELF file detected\n", bits);
+
     switch (ret) {
         case 1:
             panic("stivale: File is not a valid ELF.");
@@ -115,6 +118,11 @@ void stivale_load(char *config, char *cmdline) {
     if (stivale_hdr.entry_point != 0)
         entry_point = stivale_hdr.entry_point;
 
+    print("stivale: Kernel slide: %X\n", slide);
+
+    print("stivale: Entry point at: %X\n", entry_point);
+    print("stivale: Requested stack at: %X\n", stivale_hdr.stack);
+
     stivale_struct.module_count = 0;
     uint64_t *prev_mod_ptr = &stivale_struct.modules;
     for (int i = 0; ; i++) {
@@ -149,6 +157,12 @@ void stivale_load(char *config, char *cmdline) {
 
         *prev_mod_ptr = REPORTED_ADDR((uint64_t)(size_t)m);
         prev_mod_ptr  = &m->next;
+
+        print("stivale: Requested module %u:\n", i);
+        print("         Path:   %s\n", module_path);
+        print("         String: %s\n", m->string);
+        print("         Begin:  %X\n", m->begin);
+        print("         End:    %X\n", m->end);
     }
 
     uint64_t rsdp = (uint64_t)(size_t)acpi_get_rsdp();
@@ -167,6 +181,7 @@ void stivale_load(char *config, char *cmdline) {
     stivale_struct.cmdline = REPORTED_ADDR((uint64_t)(size_t)cmdline);
 
     stivale_struct.epoch = time();
+    print("stivale: Current epoch: %U\n", stivale_struct.epoch);
 
     term_deinit();
 
tab: 248 wrap: offon