summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-04-07 17:50:31 -0400
committerGitHub <noreply@github.com>2019-04-07 17:50:31 -0400
commit3c1ce290d0a337997cb2abf611f7679379593da6 (patch)
tree50cb112d2f00991aa817f9d4789e0f41c741d8cf /src/tests
parent6b18a1592f5e5ceacf6d801b2a3fe4432f3f194e (diff)
parentabae7577d20d2bf963112547d222dd3a7f8230c7 (diff)
Merge pull request #2361 from lioncash/pagetable
core/memory: Minor simplifications to page table management
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/core/arm/arm_test_common.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp
index 3e1a735c3..58af41f6e 100644
--- a/src/tests/core/arm/arm_test_common.cpp
+++ b/src/tests/core/arm/arm_test_common.cpp
@@ -17,7 +17,6 @@ TestEnvironment::TestEnvironment(bool mutable_memory_)
: mutable_memory(mutable_memory_),
test_memory(std::make_shared<TestMemory>(this)), kernel{Core::System::GetInstance()} {
auto process = Kernel::Process::Create(Core::System::GetInstance(), "");
- kernel.MakeCurrentProcess(process.get());
page_table = &process->VMManager().page_table;
std::fill(page_table->pointers.begin(), page_table->pointers.end(), nullptr);
@@ -28,7 +27,7 @@ TestEnvironment::TestEnvironment(bool mutable_memory_)
Memory::MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory);
Memory::MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory);
- Memory::SetCurrentPageTable(page_table);
+ kernel.MakeCurrentProcess(process.get());
}
TestEnvironment::~TestEnvironment() {