diff options
| author |  bunnei | 2022-02-21 12:36:34 -0800 |
|---|---|---|
| committer | bunnei | 2022-02-21 13:07:19 -0800 |
| commit | c0e45a3c787df9c4c7c99b79a34d31a394bf7b49 (patch) | |
| tree | 20c12370bcb7417b8fc17d4fb5768b700edca7be /src/core/memory.cpp | |
| parent | settings: Add a new "use_extended_memory_layout" setting. (diff) | |
| download | yuzu-c0e45a3c787df9c4c7c99b79a34d31a394bf7b49.tar.gz yuzu-c0e45a3c787df9c4c7c99b79a34d31a394bf7b49.tar.xz yuzu-c0e45a3c787df9c4c7c99b79a34d31a394bf7b49.zip | |
core: device_memory: Use memory size reported by KSystemControl.
- That way, we can consolidate the memory layout to one place.
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 88d6ec908..28d30eee2 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -39,8 +39,7 @@ struct Memory::Impl { | |||
| 39 | void MapMemoryRegion(Common::PageTable& page_table, VAddr base, u64 size, PAddr target) { | 39 | void MapMemoryRegion(Common::PageTable& page_table, VAddr base, u64 size, PAddr target) { |
| 40 | ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:016X}", size); | 40 | ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:016X}", size); |
| 41 | ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:016X}", base); | 41 | ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:016X}", base); |
| 42 | ASSERT_MSG(target >= DramMemoryMap::Base && target < DramMemoryMap::End, | 42 | ASSERT_MSG(target >= DramMemoryMap::Base, "Out of bounds target: {:016X}", target); |
| 43 | "Out of bounds target: {:016X}", target); | ||
| 44 | MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, target, Common::PageType::Memory); | 43 | MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, target, Common::PageType::Memory); |
| 45 | 44 | ||
| 46 | if (Settings::IsFastmemEnabled()) { | 45 | if (Settings::IsFastmemEnabled()) { |