:: commit 24950977709b745e28c9d684fbed3d07f6fc6cd9
misc: struct e820_entry_t -> struct memmap_entry
diff --git a/common/menu.c b/common/menu.c
index 105c00d0..3d9b76e8 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -582,7 +582,7 @@ noreturn void menu(__attribute__((unused)) bool timeout_enabled) {
#endif
}
-static struct e820_entry_t *rewound_memmap = NULL;
+static struct memmap_entry *rewound_memmap = NULL;
static size_t rewound_memmap_entries = 0;
static uint8_t *rewound_data;
#if bios == 1
@@ -608,15 +608,15 @@ static noreturn void _menu(bool timeout_enabled) {
#if bios == 1
memcpy(s2_data_begin, rewound_s2_data, s2_data_size);
#endif
- memcpy(memmap, rewound_memmap, rewound_memmap_entries * sizeof(struct e820_entry_t));
+ memcpy(memmap, rewound_memmap, rewound_memmap_entries * sizeof(struct memmap_entry));
memmap_entries = rewound_memmap_entries;
} else {
rewound_data = ext_mem_alloc(data_size);
#if bios == 1
rewound_s2_data = ext_mem_alloc(s2_data_size);
#endif
- rewound_memmap = ext_mem_alloc(256 * sizeof(struct e820_entry_t));
- memcpy(rewound_memmap, memmap, memmap_entries * sizeof(struct e820_entry_t));
+ rewound_memmap = ext_mem_alloc(256 * sizeof(struct memmap_entry));
+ memcpy(rewound_memmap, memmap, memmap_entries * sizeof(struct memmap_entry));
rewound_memmap_entries = memmap_entries;
memcpy(rewound_data, data_begin, data_size);
#if bios == 1
diff --git a/common/mm/pmm.h b/common/mm/pmm.h
index d99d8fa9..f5d693ef 100644
--- a/common/mm/pmm.h
+++ b/common/mm/pmm.h
@@ -4,7 +4,13 @@
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
-#include <sys/e820.h>
+
+struct memmap_entry {
+ uint64_t base;
+ uint64_t length;
+ uint32_t type;
+ uint32_t unused;
+};
#define MEMMAP_USABLE 1
#define MEMMAP_RESERVED 2
@@ -21,25 +27,25 @@ struct meminfo {
size_t lowermem;
};
-struct meminfo mmap_get_info(size_t mmap_count, struct e820_entry_t *mmap);
+struct meminfo mmap_get_info(size_t mmap_count, struct memmap_entry *mmap);
#if bios == 1
-extern struct e820_entry_t memmap[];
+extern struct memmap_entry memmap[];
extern size_t memmap_entries;
#endif
#if uefi == 1
-extern struct e820_entry_t *memmap;
+extern struct memmap_entry *memmap;
extern size_t memmap_entries;
#endif
extern bool allocations_disallowed;
void init_memmap(void);
-struct e820_entry_t *get_memmap(size_t *entries);
-struct e820_entry_t *get_raw_memmap(size_t *entry_count);
-void print_memmap(struct e820_entry_t *mm, size_t size);
-bool memmap_alloc_range_in(struct e820_entry_t *m, size_t *_count,
+struct memmap_entry *get_memmap(size_t *entries);
+struct memmap_entry *get_raw_memmap(size_t *entry_count);
+void print_memmap(struct memmap_entry *mm, size_t size);
+bool memmap_alloc_range_in(struct memmap_entry *m, size_t *_count,
uint64_t base, uint64_t length, uint32_t type, uint32_t overlay_type, bool do_panic, bool simulation, bool new_entry);
bool memmap_alloc_range(uint64_t base, uint64_t length, uint32_t type, uint32_t overlay_type, bool panic, bool simulation, bool new_entry);
void pmm_randomise_memory(void);
diff --git a/common/mm/pmm.s2.c b/common/mm/pmm.s2.c
index 4f04fd98..e37340f4 100644
--- a/common/mm/pmm.s2.c
+++ b/common/mm/pmm.s2.c
@@ -18,7 +18,7 @@ extern symbol bss_end;
#endif
bool allocations_disallowed = true;
-static void sanitise_entries(struct e820_entry_t *, size_t *, bool);
+static void sanitise_entries(struct memmap_entry *, size_t *, bool);
void *conv_mem_alloc(size_t count) {
static uint64_t base = 4096;
@@ -50,17 +50,17 @@ void *conv_mem_alloc(size_t count) {
#if bios == 1
#define memmap_max_entries ((size_t)512)
-struct e820_entry_t memmap[memmap_max_entries];
+struct memmap_entry memmap[memmap_max_entries];
size_t memmap_entries = 0;
#endif
#if uefi == 1
static size_t memmap_max_entries;
-struct e820_entry_t *memmap;
+struct memmap_entry *memmap;
size_t memmap_entries = 0;
-static struct e820_entry_t *untouched_memmap;
+static struct memmap_entry *untouched_memmap;
static size_t untouched_memmap_entries = 0;
#endif
@@ -89,7 +89,7 @@ static const char *memmap_type(uint32_t type) {
}
}
-void print_memmap(struct e820_entry_t *mm, size_t size) {
+void print_memmap(struct memmap_entry *mm, size_t size) {
for (size_t i = 0; i < size; i++) {
printv("[%X -> %X] : %X <%s (%x)>\n",
mm[i].base,
@@ -116,7 +116,7 @@ static bool align_entry(uint64_t *base, uint64_t *length) {
return true;
}
-static void sanitise_entries(struct e820_entry_t *m, size_t *_count, bool align_entries) {
+static void sanitise_entries(struct memmap_entry *m, size_t *_count, bool align_entries) {
size_t count = *_count;
for (size_t i = 0; i < count; i++) {
@@ -194,7 +194,7 @@ del_mm1:
min_index = i;
}
}
- struct e820_entry_t min_e = m[min_index];
+ struct memmap_entry min_e = m[min_index];
m[min_index] = m[p];
m[p] = min_e;
}
@@ -222,10 +222,10 @@ del_mm1:
}
#if uefi == 1
-static void pmm_reclaim_uefi_mem(struct e820_entry_t *m, size_t *_count);
+static void pmm_reclaim_uefi_mem(struct memmap_entry *m, size_t *_count);
#endif
-struct e820_entry_t *get_memmap(size_t *entries) {
+struct memmap_entry *get_memmap(size_t *entries) {
#if uefi == 1
pmm_reclaim_uefi_mem(memmap, &memmap_entries);
#endif
@@ -303,12 +303,12 @@ void init_memmap(void) {
goto fail;
}
- status = gBS->AllocatePool(EfiLoaderData, memmap_max_entries * sizeof(struct e820_entry_t), (void **)&memmap);
+ status = gBS->AllocatePool(EfiLoaderData, memmap_max_entries * sizeof(struct memmap_entry), (void **)&memmap);
if (status) {
goto fail;
}
- status = gBS->AllocatePool(EfiLoaderData, memmap_max_entries * sizeof(struct e820_entry_t), (void **)&untouched_memmap);
+ status = gBS->AllocatePool(EfiLoaderData, memmap_max_entries * sizeof(struct memmap_entry), (void **)&untouched_memmap);
if (status) {
goto fail;
}
@@ -401,7 +401,7 @@ void init_memmap(void) {
}
}
- memcpy(untouched_memmap, memmap, memmap_entries * sizeof(struct e820_entry_t));
+ memcpy(untouched_memmap, memmap, memmap_entries * sizeof(struct memmap_entry));
untouched_memmap_entries = memmap_entries;
size_t bootloader_size = ALIGN_UP((uintptr_t)__image_end - (uintptr_t)__image_base, 4096);
@@ -418,7 +418,7 @@ fail:
panic(false, "pmm: Failure initialising memory map");
}
-static void pmm_reclaim_uefi_mem(struct e820_entry_t *m, size_t *_count) {
+static void pmm_reclaim_uefi_mem(struct memmap_entry *m, size_t *_count) {
size_t count = *_count;
size_t recl_i = 0;
@@ -429,7 +429,7 @@ static void pmm_reclaim_uefi_mem(struct e820_entry_t *m, size_t *_count) {
}
}
- struct e820_entry_t *recl = ext_mem_alloc(recl_i * sizeof(struct e820_entry_t));
+ struct memmap_entry *recl = ext_mem_alloc(recl_i * sizeof(struct memmap_entry));
for (size_t i = 0, j = 0; i < count; i++) {
if (m[i].type == MEMMAP_EFI_RECLAIMABLE) {
@@ -438,7 +438,7 @@ static void pmm_reclaim_uefi_mem(struct e820_entry_t *m, size_t *_count) {
}
for (size_t ri = 0; ri < recl_i; ri++) {
- struct e820_entry_t *r = &recl[ri];
+ struct memmap_entry *r = &recl[ri];
// Punch holes in our EFI reclaimable entry for every EFI area which is
// boot services or conventional that fits within
@@ -518,14 +518,14 @@ void pmm_release_uefi_mem(void) {
#endif
#if bios == 1
-struct e820_entry_t *get_raw_memmap(size_t *entry_count) {
+struct memmap_entry *get_raw_memmap(size_t *entry_count) {
*entry_count = e820_entries;
return e820_map;
}
#endif
#if uefi == 1
-struct e820_entry_t *get_raw_memmap(size_t *entry_count) {
+struct memmap_entry *get_raw_memmap(size_t *entry_count) {
pmm_reclaim_uefi_mem(untouched_memmap, &untouched_memmap_entries);
*entry_count = untouched_memmap_entries;
return untouched_memmap;
@@ -593,7 +593,7 @@ void *ext_mem_alloc_type_aligned(size_t count, uint32_t type, size_t alignment)
/// Compute and returns the amount of upper and lower memory till
/// the first hole.
-struct meminfo mmap_get_info(size_t mmap_count, struct e820_entry_t *mmap) {
+struct meminfo mmap_get_info(size_t mmap_count, struct memmap_entry *mmap) {
struct meminfo info = {0};
for (size_t i = 0; i < mmap_count; i++) {
@@ -619,7 +619,7 @@ struct meminfo mmap_get_info(size_t mmap_count, struct e820_entry_t *mmap) {
return info;
}
-static bool pmm_new_entry(struct e820_entry_t *m, size_t *_count,
+static bool pmm_new_entry(struct memmap_entry *m, size_t *_count,
uint64_t base, uint64_t length, uint32_t type) {
size_t count = *_count;
@@ -663,7 +663,7 @@ static bool pmm_new_entry(struct e820_entry_t *m, size_t *_count,
if (count >= memmap_max_entries)
panic(false, "Memory map exhausted.");
- struct e820_entry_t *new_entry = &m[count++];
+ struct memmap_entry *new_entry = &m[count++];
new_entry->type = m[i].type;
new_entry->base = top;
@@ -676,7 +676,7 @@ static bool pmm_new_entry(struct e820_entry_t *m, size_t *_count,
if (count >= memmap_max_entries)
panic(false, "Memory map exhausted.");
- struct e820_entry_t *target = &m[count++];
+ struct memmap_entry *target = &m[count++];
target->type = type;
target->base = base;
@@ -686,7 +686,7 @@ static bool pmm_new_entry(struct e820_entry_t *m, size_t *_count,
return true;
}
-bool memmap_alloc_range_in(struct e820_entry_t *m, size_t *_count,
+bool memmap_alloc_range_in(struct memmap_entry *m, size_t *_count,
uint64_t base, uint64_t length, uint32_t type, uint32_t overlay_type, bool do_panic, bool simulation, bool new_entry) {
size_t count = *_count;
diff --git a/common/protos/limine.c b/common/protos/limine.c
index 6d21443b..92a6c842 100644
--- a/common/protos/limine.c
+++ b/common/protos/limine.c
@@ -677,7 +677,7 @@ FEAT_START
}
size_t mmap_entries;
- struct e820_entry_t *mmap = get_memmap(&mmap_entries);
+ struct memmap_entry *mmap = get_memmap(&mmap_entries);
if (memmap_request == NULL) {
break; // next feature
diff --git a/common/protos/linux.c b/common/protos/linux.c
index 8d27ae93..1d31586f 100644
--- a/common/protos/linux.c
+++ b/common/protos/linux.c
@@ -607,7 +607,7 @@ set_textmode:;
struct boot_e820_entry *e820_table = boot_params->e820_table;
size_t mmap_entries;
- struct e820_entry_t *mmap = get_raw_memmap(&mmap_entries);
+ struct memmap_entry *mmap = get_raw_memmap(&mmap_entries);
for (size_t i = 0, j = 0; i < mmap_entries; i++) {
if (mmap[i].type >= 0x1000) {
diff --git a/common/protos/multiboot1.c b/common/protos/multiboot1.c
index 907ef565..a8b73530 100644
--- a/common/protos/multiboot1.c
+++ b/common/protos/multiboot1.c
@@ -390,7 +390,7 @@ noreturn void multiboot1_load(char *config, char *cmdline) {
#endif
size_t mb_mmap_count;
- struct e820_entry_t *raw_memmap = get_raw_memmap(&mb_mmap_count);
+ struct memmap_entry *raw_memmap = get_raw_memmap(&mb_mmap_count);
size_t mb_mmap_len = mb_mmap_count * sizeof(struct multiboot1_mmap_entry);
struct multiboot1_mmap_entry *mmap = mb1_info_alloc(&mb1_info_raw, mb_mmap_len);
diff --git a/common/protos/multiboot2.c b/common/protos/multiboot2.c
index 3c9faff2..28985fd7 100644
--- a/common/protos/multiboot2.c
+++ b/common/protos/multiboot2.c
@@ -680,7 +680,7 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
#endif
size_t mb_mmap_count;
- struct e820_entry_t *raw_memmap = get_raw_memmap(&mb_mmap_count);
+ struct memmap_entry *raw_memmap = get_raw_memmap(&mb_mmap_count);
//////////////////////////////////////////////
// Create memory map tag
diff --git a/common/protos/stivale.c b/common/protos/stivale.c
index 7dfcf0e2..feb5a42e 100644
--- a/common/protos/stivale.c
+++ b/common/protos/stivale.c
@@ -366,16 +366,16 @@ noreturn void stivale_load(char *config, char *cmdline) {
}
}
- struct e820_entry_t *mmap_copy = ext_mem_alloc(256 * sizeof(struct e820_entry_t));
+ struct memmap_entry *mmap_copy = ext_mem_alloc(256 * sizeof(struct memmap_entry));
size_t mmap_entries;
- struct e820_entry_t *mmap = get_memmap(&mmap_entries);
+ struct memmap_entry *mmap = get_memmap(&mmap_entries);
if (mmap_entries > 256) {
panic(false, "stivale: Too many memory map entries!");
}
- memcpy(mmap_copy, mmap, mmap_entries * sizeof(struct e820_entry_t));
+ memcpy(mmap_copy, mmap, mmap_entries * sizeof(struct memmap_entry));
stivale_struct->memory_map_entries = (uint64_t)mmap_entries;
stivale_struct->memory_map_addr = REPORTED_ADDR((uint64_t)(size_t)mmap_copy);
@@ -450,8 +450,8 @@ pagemap_t stivale_build_pagemap(bool level5pg, bool unmap_null, struct elf_range
}
size_t _memmap_entries = memmap_entries;
- struct e820_entry_t *_memmap =
- ext_mem_alloc(_memmap_entries * sizeof(struct e820_entry_t));
+ struct memmap_entry *_memmap =
+ ext_mem_alloc(_memmap_entries * sizeof(struct memmap_entry));
for (size_t i = 0; i < _memmap_entries; i++)
_memmap[i] = memmap[i];
diff --git a/common/protos/stivale2.c b/common/protos/stivale2.c
index 2aef1996..919fcceb 100644
--- a/common/protos/stivale2.c
+++ b/common/protos/stivale2.c
@@ -806,7 +806,7 @@ have_tm_tag:;
{
struct stivale2_struct_tag_memmap *tag =
ext_mem_alloc(sizeof(struct stivale2_struct_tag_memmap) +
- sizeof(struct e820_entry_t) * 256);
+ sizeof(struct memmap_entry) * 256);
// Reserve 32K at 0x70000, if possible
if (!memmap_alloc_range(0x70000, 0x8000, MEMMAP_USABLE, true, false, false, false)) {
@@ -816,7 +816,7 @@ have_tm_tag:;
}
size_t mmap_entries;
- struct e820_entry_t *mmap = get_memmap(&mmap_entries);
+ struct memmap_entry *mmap = get_memmap(&mmap_entries);
if (mmap_entries > 256) {
panic(false, "stivale2: Too many memory map entries!");
@@ -826,7 +826,7 @@ have_tm_tag:;
tag->entries = (uint64_t)mmap_entries;
memcpy((void*)tag + sizeof(struct stivale2_struct_tag_memmap),
- mmap, sizeof(struct e820_entry_t) * mmap_entries);
+ mmap, sizeof(struct memmap_entry) * mmap_entries);
append_tag(stivale2_struct, (struct stivale2_tag *)tag);
}
diff --git a/common/sys/e820.h b/common/sys/e820.h
index 38c9071f..38573aa3 100644
--- a/common/sys/e820.h
+++ b/common/sys/e820.h
@@ -3,15 +3,9 @@
#include <stdint.h>
#include <stddef.h>
+#include <mm/pmm.h>
-struct e820_entry_t {
- uint64_t base;
- uint64_t length;
- uint32_t type;
- uint32_t unused;
-};
-
-extern struct e820_entry_t e820_map[];
+extern struct memmap_entry e820_map[];
extern size_t e820_entries;
void init_e820(void);
diff --git a/common/sys/e820.s2.c b/common/sys/e820.s2.c
index b285db1c..1658f1b7 100644
--- a/common/sys/e820.s2.c
+++ b/common/sys/e820.s2.c
@@ -10,14 +10,14 @@
#define MAX_E820_ENTRIES 256
-struct e820_entry_t e820_map[MAX_E820_ENTRIES];
+struct memmap_entry e820_map[MAX_E820_ENTRIES];
size_t e820_entries = 0;
void init_e820(void) {
struct rm_regs r = {0};
for (size_t i = 0; i < MAX_E820_ENTRIES; i++) {
- struct e820_entry_t entry;
+ struct memmap_entry entry;
r.eax = 0xe820;
r.ecx = 24;
