Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dynamically allocate e820

Browse Source
This commit is contained in:
mintsuki 2020-04-30 23:59:14 +02:00
parent 96f8c65f01
commit 2ec27cbeee
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
qloader2.bin
View File

Binary file not shown.

22
src/lib/e820.c
View File

@ -2,7 +2,7 @@
#include <lib/real.h> #include <lib/real.h>
#include <lib/blib.h> #include <lib/blib.h>
struct e820_entry_t e820_map[E820_MAX_ENTRIES]; struct e820_entry_t *e820_map;
static const char *e820_type(uint32_t type) { static const char *e820_type(uint32_t type) {
switch (type) { switch (type) {
@ -25,28 +25,32 @@ int init_e820(void) {
struct rm_regs r = {0}; struct rm_regs r = {0};
int entry_count; int entry_count;
for (int i = 0; i < E820_MAX_ENTRIES; i++) {
e820_map = balloc(sizeof(struct e820_entry_t));
for (int i = 0; ; i++) {
struct e820_entry_t entry;
r.eax = 0xe820; r.eax = 0xe820;
r.ecx = 24; r.ecx = 24;
r.edx = 0x534d4150; r.edx = 0x534d4150;
r.edi = (uint32_t)&e820_map[i]; r.edi = (uint32_t)&entry;
rm_int(0x15, &r, &r); rm_int(0x15, &r, &r);
e820_map[i] = entry;
if (r.eflags & EFLAGS_CF) { if (r.eflags & EFLAGS_CF) {
entry_count = i; entry_count = i;
goto done; break;
} }
if (!r.ebx) { if (!r.ebx) {
entry_count = ++i; entry_count = ++i;
goto done; break;
} }
balloc(sizeof(struct e820_entry_t));
} }
print("e820: Too many entries!\n");
for (;;);
done:
for (int i = 0; i < entry_count; i++) { for (int i = 0; i < entry_count; i++) {
print("e820: [%X -> %X] : %X <%s>\n", print("e820: [%X -> %X] : %X <%s>\n",
e820_map[i].base, e820_map[i].base,

2
src/lib/e820.h
View File

@ -12,7 +12,7 @@ struct e820_entry_t {
uint32_t unused; uint32_t unused;
} __attribute__((packed)); } __attribute__((packed));
extern struct e820_entry_t e820_map[E820_MAX_ENTRIES]; extern struct e820_entry_t *e820_map;
int init_e820(void); int init_e820(void);