Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions include/kernel/memmgt.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ typedef struct {
uint64_t dirty : 1;
uint64_t pat : 1;
uint64_t global : 1;
uint64_t allocated : 1;
uint64_t available1 : 2;
uint64_t available1 : 3;
uint64_t frame_base_address : 40;
uint64_t available2 : 11;
uint64_t nex : 1;
Expand All @@ -77,24 +76,28 @@ typedef struct {
} memmap_bitmap;

typedef struct {
uint8_t pml4_index;
uint8_t pdpt_index;
uint8_t pd_index;
uint8_t pt_index;
uint16_t pml4_index;
uint16_t pdpt_index;
uint16_t pd_index;
uint16_t pt_index;
uint16_t offset;
} vaddr_t;

typedef uint64_t* paddr_t;

vaddr_t get_vaddr_t_from_ptr (void* ptr);
void* get_vaddr_hhdm (uint64_t phys_address);
void* vaddr_t_to_ptr (vaddr_t* virtual_addr);

void* alloc_vpages (size_t req_count);
void* alloc_vpage (void);
void free_vpages (void* ptr, size_t count);
void free_vpage (void* ptr);

void init_memmgt (uint64_t, struct limine_memmap_response*);
void __init_memmgt__ (uint64_t, struct limine_memmap_response*);
void walk_pagetable (void);
void* get_paddr (void* vaddr);

uint64_t allocate_physical_pageframes (size_t);

// LIBALLOC FUNCTION IMPLEMENTATIONS

void* try_assign_pt (pt_entry_t*, size_t);
Expand Down
3 changes: 2 additions & 1 deletion src/kernel/entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void _start (void) {
hcf ();
}

init_memmgt (hhdm_base, memmap_req.response);
__init_memmgt__ (hhdm_base, memmap_req.response);

set_color (0x44eeaa);

Expand Down Expand Up @@ -104,5 +104,6 @@ void _start (void) {
printf ("CR3: %lx", cr3);

// We're done, just hang...
printf ("\n\nAll execution completed.");
hcf ();
}
Loading
Loading