diff options
| author | 2018-09-29 10:54:39 -0400 | |
|---|---|---|
| committer | 2018-09-29 10:54:39 -0400 | |
| commit | f7b69d61f2a871e8afcd9819b014e873f6e0b80d (patch) | |
| tree | ab6fa797e0a0edd41cc84138ac56aaba0c5238fe /src/tests | |
| parent | Merge pull request #1360 from FearlessTobi/port-3979 (diff) | |
| parent | memory: Dehardcode the use of fixed memory range constants (diff) | |
| download | yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.tar.gz yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.tar.xz yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.zip | |
Merge pull request #1395 from lioncash/vm
process/vm_manager: Initial modifications to load NPDM metadata
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp index 7c69fc26e..c17a122cd 100644 --- a/src/tests/core/arm/arm_test_common.cpp +++ b/src/tests/core/arm/arm_test_common.cpp | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 6 | |||
| 5 | #include "core/core.h" | 7 | #include "core/core.h" |
| 6 | #include "core/hle/kernel/process.h" | 8 | #include "core/hle/kernel/process.h" |
| 7 | #include "core/memory.h" | 9 | #include "core/memory.h" |
| @@ -16,9 +18,10 @@ TestEnvironment::TestEnvironment(bool mutable_memory_) | |||
| 16 | Core::CurrentProcess() = Kernel::Process::Create(kernel, ""); | 18 | Core::CurrentProcess() = Kernel::Process::Create(kernel, ""); |
| 17 | page_table = &Core::CurrentProcess()->vm_manager.page_table; | 19 | page_table = &Core::CurrentProcess()->vm_manager.page_table; |
| 18 | 20 | ||
| 19 | page_table->pointers.fill(nullptr); | 21 | std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr); |
| 20 | page_table->special_regions.clear(); | 22 | page_table->special_regions.clear(); |
| 21 | page_table->attributes.fill(Memory::PageType::Unmapped); | 23 | std::fill(page_table->attributes.begin(), page_table->attributes.end(), |
| 24 | Memory::PageType::Unmapped); | ||
| 22 | 25 | ||
| 23 | Memory::MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory); | 26 | Memory::MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory); |
| 24 | Memory::MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory); | 27 | Memory::MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory); |