:: commit 450770435cdda55cc9fafa78e97ac3ef79583f03

mintsuki <mintsuki@protonmail.com> — 2022-07-13 06:34

parents: b5ab7d57b3

protos: Move 'loading kernel' prints where they belong

diff --git a/common/protos/limine.c b/common/protos/limine.c
index 74261a03..6d21443b 100644
--- a/common/protos/limine.c
+++ b/common/protos/limine.c
@@ -129,6 +129,8 @@ noreturn void limine_load(char *config, char *cmdline) {
     if (kernel_path == NULL)
         panic(true, "limine: KERNEL_PATH not specified");
 
+    print("limine: Loading kernel `%s`...\n", kernel_path);
+
     struct file_handle *kernel_file;
     if ((kernel_file = uri_open(kernel_path)) == NULL)
         panic(true, "limine: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
@@ -206,8 +208,6 @@ noreturn void limine_load(char *config, char *cmdline) {
         panic(true, "limine: This CPU does not support 64-bit mode.");
     }
 
-    print("limine: Loading kernel `%s`...\n", kernel_path);
-
     printv("limine: Physical base:   %X\n", physical_base);
     printv("limine: Virtual base:    %X\n", virtual_base);
     printv("limine: Slide:           %X\n", slide);
diff --git a/common/protos/linux.c b/common/protos/linux.c
index 204edf6d..8d27ae93 100644
--- a/common/protos/linux.c
+++ b/common/protos/linux.c
@@ -355,6 +355,8 @@ noreturn void linux_load(char *config, char *cmdline) {
     if (kernel_path == NULL)
         panic(true, "linux: KERNEL_PATH not specified");
 
+    print("linux: Loading kernel `%s`...\n", kernel_path);
+
     if ((kernel_file = uri_open(kernel_path)) == NULL)
         panic(true, "linux: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
 
@@ -419,7 +421,6 @@ noreturn void linux_load(char *config, char *cmdline) {
 
     // load kernel
     uintptr_t kernel_load_addr = 0x100000;
-    print("linux: Loading kernel `%s`...\n", kernel_path);
     for (;;) {
         if (memmap_alloc_range(kernel_load_addr,
                 ALIGN_UP(kernel_file->size - real_mode_code_size, 4096),
diff --git a/common/protos/multiboot1.c b/common/protos/multiboot1.c
index 528021da..907ef565 100644
--- a/common/protos/multiboot1.c
+++ b/common/protos/multiboot1.c
@@ -51,6 +51,8 @@ noreturn void multiboot1_load(char *config, char *cmdline) {
     if (kernel_path == NULL)
         panic(true, "multiboot1: KERNEL_PATH not specified");
 
+    print("multiboot1: Loading kernel `%s`...\n", kernel_path);
+
     if ((kernel_file = uri_open(kernel_path)) == NULL)
         panic(true, "multiboot1: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
 
@@ -76,8 +78,6 @@ noreturn void multiboot1_load(char *config, char *cmdline) {
         panic(true, "multiboot1: Invalid magic");
     }
 
-    print("multiboot1: Loading kernel `%s`...\n", kernel_path);
-
     if (header.magic + header.flags + header.checksum)
         panic(true, "multiboot1: Header checksum is invalid");
 
diff --git a/common/protos/multiboot2.c b/common/protos/multiboot2.c
index 7b89a117..3c9faff2 100644
--- a/common/protos/multiboot2.c
+++ b/common/protos/multiboot2.c
@@ -66,6 +66,8 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
     if (kernel_path == NULL)
         panic(true, "multiboot2: KERNEL_PATH not specified");
 
+    print("multiboot2: Loading kernel `%s`...\n", kernel_path);
+
     if ((kernel_file = uri_open(kernel_path)) == NULL)
         panic(true, "multiboot2: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
 
@@ -89,8 +91,6 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
         panic(true, "multiboot2: Invalid magic");
     }
 
-    print("multiboot2: Loading kernel `%s`...\n", kernel_path);
-
     if (header->magic + header->architecture + header->checksum + header->header_length) {
         panic(true, "multiboot2: Header checksum is invalid");
     }
tab: 248 wrap: offon