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

multiboot1: add support for 64-bit ELFs

This commit is contained in:
Kacper Słomiński 2021-06-29 15:51:20 +02:00
parent 9115bc7b50
commit 6bb204bbd9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
stage23/protos/multiboot1.c
View File

@ -53,13 +53,26 @@ void multiboot1_load(char *config, char *cmdline) {
if (header.flags & (1 << 16))
panic("multiboot1: Aout kludge not supported");
if (elf_bits(kernel) != 32)
panic("multiboot1: Kernel binary must be 32-bit");
int bits = elf_bits(kernel);
uint32_t entry_point = 0;
if (elf32_load(kernel, (uint32_t *)&entry_point, MEMMAP_USABLE))
panic("multiboot1: ELF32 load failure");
switch (bits) {
case 32:
if (elf32_load(kernel, &entry_point, MEMMAP_USABLE))
panic("multiboot1: ELF32 load failure");
break;
case 64: {
uint64_t e;
if (elf64_load(kernel, &e, NULL, MEMMAP_USABLE, false, true))
panic("multiboot1: ELF64 load failure");
entry_point = e;
break;
}
default:
panic("multiboot1: Invalid ELF file bitness");
}
uint32_t n_modules;