diff options
| author | bunnei <bunneidev@gmail.com> | 2018-03-13 22:49:59 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-03-14 23:42:19 +0100 |
| commit | 7d6653268f68dea8bc39288e3a27bc499b7b8154 (patch) | |
| tree | 6330442e1dacc0d850ce09c35dcee7ddd3a2bc9d /src/tests | |
| parent | Merge pull request #213 from Hexagon12/dynarmic-default (diff) | |
| download | yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.gz yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.bz2 yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.lz yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.xz yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.zst yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.zip | |
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.cpp | 4 | ||||
| -rw-r--r-- | src/tests/core/memory/memory.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp index 9296e1e94..7f9f27e19 100644 --- a/src/tests/core/arm/arm_test_common.cpp +++ b/src/tests/core/arm/arm_test_common.cpp @@ -15,8 +15,8 @@ static Memory::PageTable* page_table = nullptr; TestEnvironment::TestEnvironment(bool mutable_memory_) : mutable_memory(mutable_memory_), test_memory(std::make_shared<TestMemory>(this)) { - Kernel::g_current_process = Kernel::Process::Create("", 0); - page_table = &Kernel::g_current_process->vm_manager.page_table; + Core::CurrentProcess() = Kernel::Process::Create(""); + page_table = &Core::CurrentProcess()->vm_manager.page_table; page_table->pointers.fill(nullptr); page_table->special_regions.clear(); diff --git a/src/tests/core/memory/memory.cpp b/src/tests/core/memory/memory.cpp index 0e0a43dcb..165496a54 100644 --- a/src/tests/core/memory/memory.cpp +++ b/src/tests/core/memory/memory.cpp @@ -9,7 +9,7 @@ TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory][!hide]") { SECTION("these regions should not be mapped on an empty process") { - auto process = Kernel::Process::Create("", 0); + auto process = Kernel::Process::Create(""); CHECK(Memory::IsValidVirtualAddress(*process, Memory::PROCESS_IMAGE_VADDR) == false); CHECK(Memory::IsValidVirtualAddress(*process, Memory::HEAP_VADDR) == false); CHECK(Memory::IsValidVirtualAddress(*process, Memory::LINEAR_HEAP_VADDR) == false); @@ -20,14 +20,14 @@ TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory][!hide]") { } SECTION("CONFIG_MEMORY_VADDR and SHARED_PAGE_VADDR should be valid after mapping them") { - auto process = Kernel::Process::Create("", 0); + auto process = Kernel::Process::Create(""); Kernel::MapSharedPages(process->vm_manager); CHECK(Memory::IsValidVirtualAddress(*process, Memory::CONFIG_MEMORY_VADDR) == true); CHECK(Memory::IsValidVirtualAddress(*process, Memory::SHARED_PAGE_VADDR) == true); } SECTION("special regions should be valid after mapping them") { - auto process = Kernel::Process::Create("", 0); + auto process = Kernel::Process::Create(""); SECTION("VRAM") { Kernel::HandleSpecialMapping(process->vm_manager, {Memory::VRAM_VADDR, Memory::VRAM_SIZE, false, false}); @@ -48,7 +48,7 @@ TEST_CASE("Memory::IsValidVirtualAddress", "[core][memory][!hide]") { } SECTION("Unmapping a VAddr should make it invalid") { - auto process = Kernel::Process::Create("", 0); + auto process = Kernel::Process::Create(""); Kernel::MapSharedPages(process->vm_manager); process->vm_manager.UnmapRange(Memory::CONFIG_MEMORY_VADDR, Memory::CONFIG_MEMORY_SIZE); CHECK(Memory::IsValidVirtualAddress(*process, Memory::CONFIG_MEMORY_VADDR) == false); |