diff options
| author | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-20 12:35:39 +0000 |
|---|---|---|
| committer | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-20 12:35:39 +0000 |
| commit | dd5dab7fd34c6745a16ac572ecd099e4bc26c1fb (patch) | |
| tree | 576b33c1030c4af1a14e0e51b463247e445b62be /arch/x86_64/include | |
| parent | 8e9a924f9fba18de9a5e37b1baf1d97e9b008251 (diff) | |
| download | teachos-dd5dab7fd34c6745a16ac572ecd099e4bc26c1fb.tar.xz teachos-dd5dab7fd34c6745a16ac572ecd099e4bc26c1fb.zip | |
Fix set_entry flags usage
Diffstat (limited to 'arch/x86_64/include')
| -rw-r--r-- | arch/x86_64/include/arch/memory/paging/page_entry.hpp | 6 | ||||
| -rw-r--r-- | arch/x86_64/include/arch/memory/paging/page_mapper.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/include/arch/memory/paging/page_entry.hpp b/arch/x86_64/include/arch/memory/paging/page_entry.hpp index 2d97d77..158af2e 100644 --- a/arch/x86_64/include/arch/memory/paging/page_entry.hpp +++ b/arch/x86_64/include/arch/memory/paging/page_entry.hpp @@ -55,11 +55,11 @@ namespace teachos::arch::memory::paging auto calculate_pointed_to_frame() const -> std::optional<allocator::physical_frame>; /** - * @brief Copies the address from the given physical frame into the underlying std::bitset so future calls to - * calculate_physical_address() will return the new address instead of the old one. + * @brief Copies the address and flags from the given physical frame into the underlying std::bitset so future calls + * to calculate_physical_address() will return the new address and flags instead of the old one. * * @param frame Physical frame that contains the address we want to copy into our underlying std::bitset. - * @param flags Entry flags which will be set on the entry + * @param flags Entry flags which will be copied into our underlying std::bitset. */ auto set_entry(allocator::physical_frame frame, std::bitset<64U> flags) -> void; diff --git a/arch/x86_64/include/arch/memory/paging/page_mapper.hpp b/arch/x86_64/include/arch/memory/paging/page_mapper.hpp index 699d517..635a848 100644 --- a/arch/x86_64/include/arch/memory/paging/page_mapper.hpp +++ b/arch/x86_64/include/arch/memory/paging/page_mapper.hpp @@ -43,7 +43,7 @@ namespace teachos::arch::memory::paging * @param flags A bitset of flags that configure the page table entry for this mapping. */ auto map_page_to_frame(allocator::area_frame_allocator & allocator, virtual_page page, - allocator::physical_frame frame, entry::bitset flags) -> void; + allocator::physical_frame frame, std::bitset<64U> flags) -> void; } // namespace teachos::arch::memory::paging #endif // TEACHOS_ARCH_X86_64_MEMORY_PAGING_PAGE_MAPPER_HPP |
