Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "stivale2: Reduce verbosity"

Browse Source 
This reverts commit 2526b92ab3.
This commit is contained in:
mintsuki 2021-05-11 06:12:47 +02:00
parent b73890cce5
commit 0eb5af44aa
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
stage23/protos/stivale2.c
View File

@ -95,6 +95,7 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
}
// Check if 5-level paging is available
if (cpuid(0x00000007, 0, &eax, &ebx, &ecx, &edx) && (ecx & (1 << 16))) {
print("stivale2: CPU has 5-level paging support\n");
level5pg = true;
}
@ -117,6 +118,8 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
panic("stivale2: Not 32 nor 64 bit x86 ELF file.");
}
print("stivale2: %u-bit ELF file detected\n", bits);
switch (ret) {
case 1:
panic("stivale2: File is not a valid ELF.");
@ -137,6 +140,11 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
if (stivale2_hdr.entry_point != 0)
entry_point = stivale2_hdr.entry_point;
print("stivale2: Kernel slide: %X\n", slide);
print("stivale2: Entry point at: %X\n", entry_point);
print("stivale2: Requested stack at: %X\n", stivale2_hdr.stack);
strcpy(stivale2_struct.bootloader_brand, "Limine");
strcpy(stivale2_struct.bootloader_version, LIMINE_VERSION);
@ -220,6 +228,12 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
m->begin = REPORTED_ADDR((uint64_t)(size_t)freadall(&f, STIVALE2_MMAP_KERNEL_AND_MODULES));
m->end = m->begin + f.size;
print("stivale2: 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);
}
append_tag(&stivale2_struct, (struct stivale2_tag *)tag);
@ -277,6 +291,7 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
tag->tag.identifier = STIVALE2_STRUCT_TAG_EPOCH_ID;
tag->epoch = time();
print("stivale2: Current epoch: %U\n", tag->epoch);
append_tag(&stivale2_struct, (struct stivale2_tag *)tag);
}
@ -477,6 +492,19 @@ skip_modeset:;
append_tag(&stivale2_struct, (struct stivale2_tag *)tag);
}
//////////////////////////////////////////////
// List tags
//////////////////////////////////////////////
print("stivale2: Generated tags:\n");
struct stivale2_tag *taglist = (void*)(size_t)stivale2_struct.tags;
for (size_t i = 0; ; i++) {
print(" Tag #%u ID: %X\n", i, taglist->identifier);
if (taglist->next)
taglist = (void*)(size_t)taglist->next;
else
break;
}
// Clear terminal for kernels that will use the stivale2 terminal
term_write("\e[2J\e[H", 7);