mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2024-11-23 09:02:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mintsuki 2020-10-16 16:04:30 +02:00
parent de0f0da1c6
commit 0c5ccf14b4
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine.bin
View File

Binary file not shown.

4
stage2/mm/pmm.c
View File

@ -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;
}

2
stage2/protos/stivale.c
View File

@ -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);

2
stage2/protos/stivale2.c
View File

@ -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);

3
stage2/sys/e820.c
View File

@ -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);
}