justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Move page size and higher half offset to constants

Browse Source
This commit is contained in:
Justin C. Miller
2018-04-21 20:58:58 -07:00
parent 5dedd2e0e0
commit 07fd3abe2c
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/kernel/memory_bootstrap.cpp
View File

@@ -119,7 +119,7 @@ count_table_pages_needed(page_block *used)
continue;
page_table_indices start{cur->virtual_address};
page_table_indices end{cur->virtual_address + (cur->count * 0x1000)};
page_table_indices end{cur->virtual_address + (cur->count * page_manager::page_size)};
counts[1] +=
((start[0] == last_idx[0]) ? 0 : 1) +
@@ -178,12 +178,12 @@ gather_block_lists(
case efi_memory_type::available:
if (scratch >= block->physical_address && scratch < block->physical_end()) {
// This is the scratch memory block, split off what we're not using
block->virtual_address = block->physical_address + 0xffff800000000000;
block->virtual_address = block->physical_address + page_manager::high_offset;
block->flags = page_block_flags::used | page_block_flags::mapped;
if (block->count > 1024) {
page_block *rest = &block_list[i++];
rest->physical_address = desc->physical_start + (1024*0x1000);
rest->physical_address = desc->physical_start + (1024*page_manager::page_size);
rest->virtual_address = 0;
rest->flags = page_block_flags::free;
rest->count = desc->pages - 1024;
@@ -262,7 +262,7 @@ unsigned page_in(page_table *pml4, uint64_t phys_addr, uint64_t virt_addr, uint6
for (; idx[3] < 512; idx[3] += 1) {
tables[3]->entries[idx[3]] = phys_addr | 0xb;
phys_addr += 0x1000;
phys_addr += page_manager::page_size;
if (--count == 0) return pages_consumed;
}
}
@@ -316,7 +316,7 @@ memory_initialize_managers(const void *memory_map, size_t map_length, size_t des
// Offset-map this region into the higher half.
uint64_t free_region_start = desc->physical_start;
uint64_t free_region = page_table_align(free_region_start);
uint64_t next_free = free_region + 0xffff800000000000;
uint64_t next_free = free_region + page_manager::high_offset;
cons->puts("Skipping ");
cons->put_dec(free_region - free_region_start);
cons->puts(" bytes to get page-table-aligned.\n");
@@ -378,11 +378,11 @@ memory_initialize_managers(const void *memory_map, size_t map_length, size_t des
consumed_pages += page_in(pml4, cur->physical_address, cur->virtual_address,
cur->count, pages + consumed_pages);
}
next_free += (consumed_pages * 0x1000);
next_free += (consumed_pages * page_manager::page_size);
// We now have all used memory mapped ourselves. Let the page_manager take
// over from here.
page_manager::init(
g_page_manager.init(
free_head, used_head, cache_head,
free_region_start, 1024 * 0x1000, next_free);
free_region_start, 1024, next_free);
}

16
src/kernel/memory_pages.h
View File

@@ -16,18 +16,21 @@ class page_manager
public:
page_manager();
static const uint64_t page_size = 0x1000;
static const uint64_t high_offset = 0xffff800000000000;
page_manager(const page_manager &) = delete;
private:
friend void memory_initialize_managers(const void *, size_t, size_t);
/// Set up the memory manager from bootstraped memory
static void init(
void init(
page_block *free,
page_block *used,
page_block *block_cache,
uint64_t scratch_start,
uint64_t scratch_length,
uint64_t scratch_pages,
uint64_t scratch_cur);
/// Initialize the virtual memory manager based on this object's state
@@ -73,8 +76,8 @@ struct page_block
page_block *next;
bool has_flag(page_block_flags f) const { return bitfield_contains(flags, f); }
uint64_t physical_end() const { return physical_address + (count * 0x1000); }
uint64_t virtual_end() const { return virtual_address + (count * 0x1000); }
uint64_t physical_end() const { return physical_address + (count * page_manager::page_size); }
uint64_t virtual_end() const { return virtual_address + (count * page_manager::page_size); }
/// Traverse the list, joining adjacent blocks where possible.
/// \returns A linked list of freed page_block structures.
@@ -106,7 +109,10 @@ struct page_table_indices
/// Calculate a page-aligned address.
/// \arg p The address to align.
/// \returns The next page-aligned address _after_ `p`.
template <typename T> inline T page_align(T p) { return ((p - 1) & ~0xfffull) + 0x1000; }
template <typename T> inline T page_align(T p)
{
return ((p - 1) & ~(page_manager::page_size - 1)) + page_manager::page_size;
}
/// Calculate a page-table-aligned address. That is, an address that is
/// page-aligned to the first page in a page table.