From 15ba17e0b76890fd177f0dbaf8d8ed6fcdec558e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 5 Feb 2022 21:02:12 -0700
Subject: [PATCH] Use asm memory map code for now
---
{old => x86}/memory_map.asm | 0
x86/stage2.asm | 7 ++++++-
2 files changed, 6 insertions(+), 1 deletion(-)
rename {old => x86}/memory_map.asm (100%)
diff --git a/old/memory_map.asm b/x86/memory_map.asm
similarity index 100%
rename from old/memory_map.asm
rename to x86/memory_map.asm
diff --git a/x86/stage2.asm b/x86/stage2.asm
index 17eb0c6..769d358 100644
--- a/x86/stage2.asm
+++ b/x86/stage2.asm
@@ -7,6 +7,10 @@ stage2.entry:
or al, 2
out 0x92, al
+ ; load memory map
+ ;TODO: rewrite this in Rust
+ call memory_map
+
mov edi, [args.stage3_base]
mov ecx, (stage3.end - stage3)
mov [args.stage3_size], ecx
@@ -106,8 +110,9 @@ load_extent:
%include "descriptor_flags.inc"
%include "gdt_entry.inc"
-%include "unreal.asm"
+%include "memory_map.asm"
%include "thunk.asm"
+%include "unreal.asm"
USE32
protected_mode:
--
GitLab