summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2020-04-08 22:19:42 -0400
committerGravatar bunnei2020-04-17 00:59:33 -0400
commitd95ceaa8ec7a5f3a16ffe3c16cb522a2fad5c746 (patch)
tree3665912dfafdceb9cf0e28a27bc5621e0dbafd25 /src
parentkernel: process: Updates for new VMM. (diff)
downloadyuzu-d95ceaa8ec7a5f3a16ffe3c16cb522a2fad5c746.tar.gz
yuzu-d95ceaa8ec7a5f3a16ffe3c16cb522a2fad5c746.tar.xz
yuzu-d95ceaa8ec7a5f3a16ffe3c16cb522a2fad5c746.zip
arm_test_common: Updates for new VMM.
Diffstat (limited to 'src')
-rw-r--r--src/tests/core/arm/arm_test_common.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp
index 17043346b..e54674d11 100644
--- a/src/tests/core/arm/arm_test_common.cpp
+++ b/src/tests/core/arm/arm_test_common.cpp
@@ -6,6 +6,7 @@
6 6
7#include "common/page_table.h" 7#include "common/page_table.h"
8#include "core/core.h" 8#include "core/core.h"
9#include "core/hle/kernel/memory/page_table.h"
9#include "core/hle/kernel/process.h" 10#include "core/hle/kernel/process.h"
10#include "core/memory.h" 11#include "core/memory.h"
11#include "tests/core/arm/arm_test_common.h" 12#include "tests/core/arm/arm_test_common.h"
@@ -18,12 +19,7 @@ TestEnvironment::TestEnvironment(bool mutable_memory_)
18 auto& system = Core::System::GetInstance(); 19 auto& system = Core::System::GetInstance();
19 20
20 auto process = Kernel::Process::Create(system, "", Kernel::Process::ProcessType::Userland); 21 auto process = Kernel::Process::Create(system, "", Kernel::Process::ProcessType::Userland);
21 page_table = &process->VMManager().page_table; 22 page_table = &process->PageTable().PageTableImpl();
22
23 std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr);
24 page_table->special_regions.clear();
25 std::fill(page_table->attributes.begin(), page_table->attributes.end(),
26 Common::PageType::Unmapped);
27 23
28 system.Memory().MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory); 24 system.Memory().MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory);
29 system.Memory().MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory); 25 system.Memory().MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory);