summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorGravatar bunnei2019-03-06 15:55:56 -0500
committerGravatar GitHub2019-03-06 15:55:56 -0500
commit75b417489ad3e23f62060933b0fe0f29646bbd04 (patch)
tree1b5944f3d09d3383a9c94c3fdaf2cb14c9a9a8cf /src/tests
parentMerge pull request #2201 from lioncash/audio-retval (diff)
parentkernel/address_arbiter: Pass in system instance to constructor (diff)
downloadyuzu-75b417489ad3e23f62060933b0fe0f29646bbd04.tar.gz
yuzu-75b417489ad3e23f62060933b0fe0f29646bbd04.tar.xz
yuzu-75b417489ad3e23f62060933b0fe0f29646bbd04.zip
Merge pull request #2199 from lioncash/arbiter
kernel/address_arbiter: Convert the address arbiter into a class
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/core/arm/arm_test_common.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp
index 9b8a44fa1..ea27ef90d 100644
--- a/src/tests/core/arm/arm_test_common.cpp
+++ b/src/tests/core/arm/arm_test_common.cpp
@@ -13,11 +13,11 @@
13namespace ArmTests { 13namespace ArmTests {
14 14
15TestEnvironment::TestEnvironment(bool mutable_memory_) 15TestEnvironment::TestEnvironment(bool mutable_memory_)
16 : mutable_memory(mutable_memory_), test_memory(std::make_shared<TestMemory>(this)) { 16 : mutable_memory(mutable_memory_),
17 17 test_memory(std::make_shared<TestMemory>(this)), kernel{Core::System::GetInstance()} {
18 auto process = Kernel::Process::Create(kernel, ""); 18 auto process = Kernel::Process::Create(kernel, "");
19 kernel.MakeCurrentProcess(process.get()); 19 kernel.MakeCurrentProcess(process.get());
20 page_table = &Core::CurrentProcess()->VMManager().page_table; 20 page_table = &process->VMManager().page_table;
21 21
22 std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr); 22 std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr);
23 page_table->special_regions.clear(); 23 page_table->special_regions.clear();