justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 08:24:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Give kernel image a header.

Browse Source 
Kernel image now has a header with version, magic number, and a
pointer to its actual entrypoint. Entry point is now _start in
boot.s, and we now generate versions.s in the build tree for the
version macros.
This commit is contained in:
Justin C. Miller
2018-03-24 18:34:44 -07:00
parent d438392ed5
commit e19c7cee50
11 changed files with 246 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/console.c
View File

@@ -62,16 +62,16 @@ con_initialize (const CHAR16 *version)
CHECK_EFI_STATUS_OR_RETURN(status, "ClearScreen");
ST->ConOut->SetAttribute(ST->ConOut, EFI_LIGHTCYAN);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L"Popcorn OS ");
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L"Popcorn loader ");
ST->ConOut->SetAttribute(ST->ConOut, EFI_LIGHTMAGENTA);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)version);
ST->ConOut->SetAttribute(ST->ConOut, EFI_LIGHTGRAY);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L" booting...\r\n");
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L" booting...\r\n\n");
con_status_begin(L"Setting console display mode: ");
Print(L"%ux%u (%ux%u chars)",
Print(L"\n %ux%u (%ux%u chars)",
gfx_out_proto->Mode->Info->HorizontalResolution,
gfx_out_proto->Mode->Info->VerticalResolution,
ROWS, COLS);
@@ -91,14 +91,14 @@ void
con_status_ok ()
{
UINTN row = ST->ConOut->Mode->CursorRow;
ST->ConOut->SetCursorPosition(ST->ConOut, COLS-8, row);
ST->ConOut->SetCursorPosition(ST->ConOut, 4, ++row);
ST->ConOut->SetAttribute(ST->ConOut, EFI_LIGHTGRAY);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L"[");
ST->ConOut->SetAttribute(ST->ConOut, EFI_GREEN);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L" ok ");
ST->ConOut->SetAttribute(ST->ConOut, EFI_LIGHTGRAY);
ST->ConOut->OutputString(ST->ConOut, (CHAR16*)L"]\r");
ST->ConOut->SetCursorPosition(ST->ConOut, 0, row+1);
ST->ConOut->SetCursorPosition(ST->ConOut, 0, ++row+1);
}
void

43
src/boot/main.c
View File

@@ -10,6 +10,19 @@
#define GIT_VERSION L"no version"
#endif
#define KERNEL_MAGIC 0x600db007
#pragma pack(push, 1)
struct kernel_version {
uint32_t magic;
uint8_t major;
uint8_t minor;
uint16_t patch;
uint32_t gitsha;
void *entrypoint;
};
#pragma pack(pop)
EFI_STATUS
efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
{
@@ -26,19 +39,39 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
// because the console is now set up
// Get info about the image
/*
con_status_begin(L"Gathering image information...");
EFI_LOADED_IMAGE *info = 0;
EFI_GUID image_proto = EFI_LOADED_IMAGE_PROTOCOL_GUID;
status = ST->BootServices->HandleProtocol(ImageHandle, &image_proto, (void **)&info);
CHECK_EFI_STATUS_OR_FAIL(status);
con_status_ok();
*/
con_status_begin(L"Loading kernel into memory...");
void *kernel_image = NULL;
uint64_t kernel_length = 0;
status = loader_load_kernel(&kernel_image, &kernel_length);
CHECK_EFI_STATUS_OR_FAIL(status);
Print(L" %u bytes at 0x%x", kernel_length, kernel_image);
Print(L"\n %u bytes at 0x%x", kernel_length, kernel_image);
struct kernel_version *version = (struct kernel_version*)kernel_image;
if (version->magic != KERNEL_MAGIC) {
Print(L"\n bad magic %x", version->magic);
CHECK_EFI_STATUS_OR_FAIL(EFI_CRC_ERROR);
}
Print(L"\n Kernel version %d.%d.%d %x%s",
version->major,
version->minor,
version->patch,
version->gitsha & 0x0fffffff,
version->gitsha & 0xf0000000 ? "*" : ""
);
Print(L"\n Entrypoint %d", version->entrypoint);
void (*kernel_main)() = version->entrypoint;
con_status_ok();
//memory_dump_map();
@@ -55,6 +88,9 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
status = memory_mark_address_for_update((void**)&kernel_image);
CHECK_EFI_STATUS_OR_FAIL(status);
status = memory_mark_address_for_update((void**)&kernel_main);
CHECK_EFI_STATUS_OR_FAIL(status);
status = memory_get_map(&memory_map,
&memmap_size, &memmap_key,
&desc_size, &desc_version);
@@ -70,10 +106,7 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
CHECK_EFI_STATUS_OR_FAIL(status);
void (*kernel_main)() = kernel_image;
kernel_main();
while (1) __asm__("hlt");
return status;
return EFI_LOAD_ERROR;
}