diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-03-13 21:33:47 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2020-03-14 14:43:57 +0100 |
commit | 27cbb75e7c2818c073bd65a000d7ff7f28d391d4 (patch) | |
tree | 1f8ff16d5202fde0e15f8a8f7c5d50045efb9341 /src | |
parent | Merge pull request #3491 from ReinUsesLisp/polygon-modes (diff) | |
download | yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar.gz yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar.bz2 yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar.lz yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar.xz yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.tar.zst yuzu-27cbb75e7c2818c073bd65a000d7ff7f28d391d4.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/common/page_table.cpp | 12 | ||||
-rw-r--r-- | src/common/page_table.h | 15 | ||||
-rw-r--r-- | src/video_core/memory_manager.h | 2 |
3 files changed, 25 insertions, 4 deletions
diff --git a/src/common/page_table.cpp b/src/common/page_table.cpp index 69b7abc54..566b57b62 100644 --- a/src/common/page_table.cpp +++ b/src/common/page_table.cpp @@ -16,7 +16,6 @@ void PageTable::Resize(std::size_t address_space_width_in_bits) { pointers.resize(num_page_table_entries); attributes.resize(num_page_table_entries); - backing_addr.resize(num_page_table_entries); // The default is a 39-bit address space, which causes an initial 1GB allocation size. If the // vector size is subsequently decreased (via resize), the vector might not automatically @@ -25,6 +24,17 @@ void PageTable::Resize(std::size_t address_space_width_in_bits) { pointers.shrink_to_fit(); attributes.shrink_to_fit(); +} + +BackingPageTable::BackingPageTable(std::size_t page_size_in_bits) : PageTable{page_size_in_bits} {} + +BackingPageTable::~BackingPageTable() = default; + +void BackingPageTable::Resize(std::size_t address_space_width_in_bits) { + PageTable::Resize(address_space_width_in_bits); + const std::size_t num_page_table_entries = 1ULL + << (address_space_width_in_bits - page_size_in_bits); + backing_addr.resize(num_page_table_entries); backing_addr.shrink_to_fit(); } diff --git a/src/common/page_table.h b/src/common/page_table.h index 8b8ff0bb8..dbc272ab7 100644 --- a/src/common/page_table.h +++ b/src/common/page_table.h @@ -76,9 +76,20 @@ struct PageTable { */ std::vector<PageType> attributes; - std::vector<u64> backing_addr; - const std::size_t page_size_in_bits{}; }; +/** + * A more advanced Page Table with the ability to save a backing address when using it + * depends on another MMU. + */ +struct BackingPageTable : PageTable { + explicit BackingPageTable(std::size_t page_size_in_bits); + ~BackingPageTable(); + + void Resize(std::size_t address_space_width_in_bits); + + std::vector<u64> backing_addr; +}; + } // namespace Common diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index aea010087..073bdb491 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -174,7 +174,7 @@ private: /// End of address space, based on address space in bits. static constexpr GPUVAddr address_space_end{1ULL << address_space_width}; - Common::PageTable page_table{page_bits}; + Common::BackingPageTable page_table{page_bits}; VMAMap vma_map; VideoCore::RasterizerInterface& rasterizer; |