From a566d4218830c69449b234c3b45768652410f3ba Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Wed, 13 Apr 2022 12:36:51 +0200 Subject: [PATCH] Thing --- bootloader/bios/memory.asm | 32 +++++++++++++++++++++----------- bootloader/bootloader.asm | 2 +- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/bootloader/bios/memory.asm b/bootloader/bios/memory.asm index 0d96434..d55e4ca 100644 --- a/bootloader/bios/memory.asm +++ b/bootloader/bios/memory.asm @@ -21,31 +21,41 @@ e820: mov eax, 0xe820 ; function reg mov edx, 'SMAP' ; function sig - ; TODO: update es:di to e820_dt mov [es:di + 20], dword 1 ; fill mov ecx, 24 ; ask for 24 bytes int 0x15 ; Do the interupt ; carry flag = (un)supported function - jc e820_fail ; Try probing instead + jc e820_fail ; TODO: Try probing instead cmp eax, edx ; eax should be = 'SMAP' - jne e820_fail ; if not then fail + jne e820_fail ; if not then fail test ebx, ebx ; no entries je e820_fail - +e820_parse: + mov eax, 0xe820 + mov [es:di + 20], dword 1 + mov ecx, 24 + int 0x15 + jc e820_write ; carry => finished -> save entry count + +mmap_ent equ 0x9000 +e820_write: + mov [mmap_ent], bp ; save entry count at mmap_ent + clc + ret e820_fail: stc ret -e820_dt_start: - e820_low: dd 0 - e820_high: dd 0 - e820_len_low: dd 0 - e820_len_high: dd 0 - e820_type: dd 0 -e820_dt_end: +; e820_dt_start: +; e820_low: dd 0 +; e820_high: dd 0 +; e820_len_low: dd 0 +; e820_len_high: dd 0 +; e820_type: dd 0 +; e820_dt_end: diff --git a/bootloader/bootloader.asm b/bootloader/bootloader.asm index 35a05c3..c3db3b0 100644 --- a/bootloader/bootloader.asm +++ b/bootloader/bootloader.asm @@ -5,7 +5,7 @@ mov [BOOT_DRIVE], dl ; Move the stack pointer somewhere safe - mov bp, 0x9000 ; move it to 0x9000 + mov bp, 0xe000 mov sp, bp ; Load kernel into memory