Kernel/Bootloader: banan-os can now be booted with my bootloader :D

This commit is contained in:
2023-11-17 20:33:02 +02:00
parent d1444761a3
commit cb5a5d3ed1
5 changed files with 75 additions and 2 deletions

View File

@@ -0,0 +1,24 @@
#pragma once
#include <stdint.h>
#define BANAN_BOOTLOADER_MAGIC 0xD3C60CFF
struct BananBootloaderMemoryMapEntry
{
uint64_t address;
uint64_t length;
uint32_t type;
} __attribute__((packed));
struct BananBootloaderMemoryMapInfo
{
uint32_t entry_count;
BananBootloaderMemoryMapEntry entries[];
} __attribute__((packed));
struct BananBootloaderInfo
{
uint32_t command_line_addr;
uint32_t memory_map_addr;
} __attribute__((packed));

View File

@@ -1,5 +1,5 @@
#include <kernel/BootInfo.h>
#include <kernel/BananBootloader.h>
#include <kernel/multiboot2.h>
namespace Kernel
@@ -64,10 +64,36 @@ namespace Kernel
return {};
}
void parse_boot_info_banan_bootloader(uint32_t info)
{
const auto& banan_bootloader_info = *reinterpret_cast<const BananBootloaderInfo*>(info);
const char* command_line = reinterpret_cast<const char*>(banan_bootloader_info.command_line_addr);
MUST(g_boot_info.command_line.append(command_line));
const auto& memory_map = *reinterpret_cast<BananBootloaderMemoryMapInfo*>(banan_bootloader_info.memory_map_addr);
MUST(g_boot_info.memory_map_entries.resize(memory_map.entry_count));
for (size_t i = 0; i < memory_map.entry_count; i++)
{
const auto& mmap_entry = memory_map.entries[i];
g_boot_info.memory_map_entries[i].address = mmap_entry.address;
g_boot_info.memory_map_entries[i].length = mmap_entry.length;
g_boot_info.memory_map_entries[i].type = mmap_entry.type;
}
}
BAN::StringView get_early_boot_command_line_banan_bootloader(uint32_t info)
{
const auto& banan_bootloader_info = *reinterpret_cast<const BananBootloaderInfo*>(info);
return reinterpret_cast<const char*>(banan_bootloader_info.command_line_addr);
}
bool validate_boot_magic(uint32_t magic)
{
if (magic == MULTIBOOT2_MAGIC)
return true;
if (magic == BANAN_BOOTLOADER_MAGIC)
return true;
return false;
}
@@ -77,6 +103,8 @@ namespace Kernel
{
case MULTIBOOT2_MAGIC:
return parse_boot_info_multiboot2(info);
case BANAN_BOOTLOADER_MAGIC:
return parse_boot_info_banan_bootloader(info);
}
ASSERT_NOT_REACHED();
}
@@ -87,6 +115,8 @@ namespace Kernel
{
case MULTIBOOT2_MAGIC:
return get_early_boot_command_line_multiboot2(info);
case BANAN_BOOTLOADER_MAGIC:
return get_early_boot_command_line_banan_bootloader(info);
}
ASSERT_NOT_REACHED();
}