From d1988d384c9942b8c8b3cb1754c228a97cc83387 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Mon, 9 Nov 2020 17:14:37 +0300 Subject: [PATCH] vm: remove unnecessary memset() on stop --- rpcs3/Emu/Memory/vm.cpp | 1 - rpcs3/util/vm_native.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index e2252284c8..d1ef7dee9c 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -928,7 +928,6 @@ namespace vm if (!shm) { utils::memory_protect(g_base_addr + addr, size, utils::protection::no); - std::memset(g_sudo_addr + addr, 0, size); } else { diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index 278c37899c..2493142ab7 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -262,7 +262,7 @@ namespace utils } else { - const u64 res64 = reinterpret_cast(::mmap(reinterpret_cast(ptr64), m_size + 0xe000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0)); + const u64 res64 = reinterpret_cast(::mmap(reinterpret_cast(ptr64), m_size + 0xf000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0)); const u64 aligned = ::align(res64, 0x10000); const auto result = ::mmap(reinterpret_cast(aligned), m_size, +prot, MAP_SHARED | MAP_FIXED, m_file, 0); @@ -273,9 +273,9 @@ namespace utils verify(HERE), ::munmap(reinterpret_cast(res64), aligned - res64) == 0; } - if (aligned < res64 + 0xe000) + if (aligned < res64 + 0xf000) { - verify(HERE), ::munmap(reinterpret_cast(aligned + m_size), (res64 + 0xe000) - (aligned)) == 0; + verify(HERE), ::munmap(reinterpret_cast(aligned + m_size), (res64 + 0xf000) - (aligned)) == 0; } return reinterpret_cast(result);