aboutsummaryrefslogtreecommitdiff
path: root/kernel/bootinfo/multiboot.dats
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/bootinfo/multiboot.dats')
-rw-r--r--kernel/bootinfo/multiboot.dats67
1 files changed, 53 insertions, 14 deletions
diff --git a/kernel/bootinfo/multiboot.dats b/kernel/bootinfo/multiboot.dats
index 1128352..3213237 100644
--- a/kernel/bootinfo/multiboot.dats
+++ b/kernel/bootinfo/multiboot.dats
@@ -24,7 +24,11 @@ implement boot_info_init (p : Ptr1) = let
case+ type of
| 6u => (
boot_p->memory_map := $UN.ptr0_get<memory_map_t>(p);
- boot_p->memory_map.entries := ptr_add<uint>(p,4)
+ boot_p->memory_map.entries := ptr_add<uint32>(p,4)
+ )
+ | 9u => (
+ boot_p->elf_tag := $UN.ptr0_get<elf_tag_t>(p);
+ boot_p->elf_tag.headers := ptr_add<uint32>(p,5);
)
| _ => ();
@@ -43,6 +47,8 @@ end
extern castfn ui2sz (n : uint) : [n : nat] size_t n
+//------------Memory------------------------
+
implement get_memory_mappings_n(p) = let
val size = p.2->memory_map.tag.size
val n_entries = (if(size >= 16u) then (size - 16u) / p.2->memory_map.entry_size else 0u) : uint
@@ -52,13 +58,10 @@ end
// TODO: here use optional datatype (fix runtime alloc)
-implement get_memory_mapping(p,n) = let
- val size = p.2->memory_map.tag.size
- val n_entries = ui2sz (if(size >= 16u) then (size - 16u) / p.2->memory_map.entry_size else 0u)
-in
- assertloc(n < n_entries);
- $UN.ptr0_get<memory_entry_t>(ptr_add<memory_map_t>(p.2->memory_map.entries,n))
-end
+implement get_memory_mapping(p,n) = (
+ assertloc(n < get_memory_mappings_n(p));
+ $UN.ptr0_get<memory_entry_t>(ptr_add<memory_entry_t>(p.2->memory_map.entries,n))
+)
implement print_memory_mappings(p) = let
val length = get_memory_mappings_n(p)
@@ -66,18 +69,54 @@ implement print_memory_mappings(p) = let
val entry = get_memory_mapping(p,i)
in
if (entry.type = 1) then (
- print("Start Address: ");
+ print(" Start Address: ");
print_hex(entry.base_addr);
- print(" Length: ");
+ print(", Length: ");
println_hex(entry.length);
);
- if (i < n-1) then (
+ if (i < n-1) then
loop (p,succ(i),n)
- )
end
in
- if (length > 0) then
- loop(p,i2sz(0),length)
+ if (length > 0) then (
+ println!("Memory areas:");
+ loop(p,i2sz(0),length))
else
println!("No memory mappings")
end
+
+//----------------------------------------------
+
+//---------------------ELF----------------------
+
+implement get_elf_headers_n(p) = ui2sz p.2->elf_tag.num
+
+implement get_elf_header (p,n) = (
+ assertloc(n < get_elf_headers_n(p));
+ $UN.ptr0_get<elf64_shdr_t>(ptr_add<elf64_shdr_t>(p.2->elf_tag.headers,n))
+)
+
+implement print_elf_headers(p) = let
+ val length = get_elf_headers_n(p)
+ fun loop {n,i : nat | i < n} .<n-i>. (p : !bootptr, i : size_t i, n : size_t n) : void = let
+ val header = get_elf_header(p,i)
+ in
+ print(" addr: ");
+ print_hex(header.addr);
+ print(", size: ");
+ print_hex(header.size);
+ print(", flags: ");
+ println_hex(header.flags);
+ if (i < n - 1) then
+ loop(p,succ(i),n)
+ end
+in
+ if (length > 0) then (
+ println!("Elf section headers: ");
+ loop(p,i2sz(0),length))
+ else
+ println!("No elf section headers")
+end
+
+//----------------------------------------------
+