diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2024-02-01 12:42:11 +0100 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2024-02-01 13:00:36 +0100 |
| commit | f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1 (patch) | |
| tree | 9338fba6a364f7f0eafcfb949183df85b4e0cdad /src/video_core/memory_manager.cpp | |
| parent | Merge pull request #12870 from liamwhite/mac-ci (diff) | |
| download | yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar.gz yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar.bz2 yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar.lz yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar.xz yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.tar.zst yuzu-f740d8b9be1b42dae9ac6d7311a55b0c34b5a8e1.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/memory_manager.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index a52f8e486..ffafc48ef 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -22,11 +22,12 @@ using Tegra::Memory::GuestMemoryFlags; std::atomic<size_t> MemoryManager::unique_identifier_generator{}; MemoryManager::MemoryManager(Core::System& system_, MaxwellDeviceMemoryManager& memory_, - u64 address_space_bits_, u64 big_page_bits_, u64 page_bits_) + u64 address_space_bits_, GPUVAddr split_address_, u64 big_page_bits_, + u64 page_bits_) : system{system_}, memory{memory_}, address_space_bits{address_space_bits_}, - page_bits{page_bits_}, big_page_bits{big_page_bits_}, entries{}, big_entries{}, - page_table{address_space_bits, address_space_bits + page_bits - 38, - page_bits != big_page_bits ? page_bits : 0}, + split_address{split_address_}, page_bits{page_bits_}, big_page_bits{big_page_bits_}, + entries{}, big_entries{}, page_table{address_space_bits, address_space_bits + page_bits - 38, + page_bits != big_page_bits ? page_bits : 0}, kind_map{PTEKind::INVALID}, unique_identifier{unique_identifier_generator.fetch_add( 1, std::memory_order_acq_rel)}, accumulator{std::make_unique<VideoCommon::InvalidationAccumulator>()} { @@ -48,10 +49,10 @@ MemoryManager::MemoryManager(Core::System& system_, MaxwellDeviceMemoryManager& entries.resize(page_table_size / 32, 0); } -MemoryManager::MemoryManager(Core::System& system_, u64 address_space_bits_, u64 big_page_bits_, - u64 page_bits_) - : MemoryManager(system_, system_.Host1x().MemoryManager(), address_space_bits_, big_page_bits_, - page_bits_) {} +MemoryManager::MemoryManager(Core::System& system_, u64 address_space_bits_, + GPUVAddr split_address_, u64 big_page_bits_, u64 page_bits_) + : MemoryManager(system_, system_.Host1x().MemoryManager(), address_space_bits_, split_address_, + big_page_bits_, page_bits_) {} MemoryManager::~MemoryManager() = default; |