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

Fix indirection bug with marked offset pointer mapping

Browse Source
This commit is contained in:
Justin C. Miller
2018-04-26 17:27:55 -07:00
parent 9754994e0c
commit d9619e65a2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/kernel/memory_pages.cpp
View File

@@ -196,15 +196,15 @@ page_manager::init(
// Fix up the offset-marked pointers
for (unsigned i = 0; i < m_marked_pointer_count; ++i) {
addr_t p = reinterpret_cast<addr_t>(m_marked_pointers[i]);
addr_t v = p + page_offset;
addr_t *p = reinterpret_cast<addr_t *>(m_marked_pointers[i]);
addr_t v = *p + page_offset;
addr_t c = (m_marked_pointer_lengths[i] / page_size) + 1;
// TODO: cleanly search/split this as a block out of used/free if possible
page_block *block = get_block();
// TODO: page-align
block->physical_address = p;
block->physical_address = *p;
block->virtual_address = v;
block->count = c;
block->flags =
@@ -212,8 +212,11 @@ page_manager::init(
page_block_flags::mapped |
page_block_flags::mmio;
console::get()->printf("Fixing up pointer %lx [%3d] -> %lx\n", *p, c, v);
m_used = page_block::insert(m_used, block);
page_in(pml4, p, v, c);
page_in(pml4, *p, v, c);
*p = v;
}
consolidate_blocks();