diff --git a/src/core/address_space.cpp b/src/core/address_space.cpp index 9dddf1d86..0dd7a76f2 100644 --- a/src/core/address_space.cpp +++ b/src/core/address_space.cpp @@ -261,7 +261,7 @@ struct AddressSpace::Impl { } // Use assert to ensure success in debug builds - assert(success && "Failed to change virtual memory protection"); + DEBUG_ASSERT(success && "Failed to change virtual memory protection"); } HANDLE process{}; @@ -504,11 +504,8 @@ void AddressSpace::Unmap(VAddr virtual_addr, size_t size, VAddr start_in_vma, VA void AddressSpace::Protect(VAddr virtual_addr, size_t size, MemoryPermission perms) { const bool read = True(perms & MemoryPermission::Read); - const bool write = True(perms & MemoryPermission::Write); - const bool execute = True(perms & MemoryPermission::Execute); - return impl->Protect(virtual_addr, size, read, write, execute); } diff --git a/src/core/libraries/kernel/memory_management.cpp b/src/core/libraries/kernel/memory_management.cpp index aff23e461..08cd106d8 100644 --- a/src/core/libraries/kernel/memory_management.cpp +++ b/src/core/libraries/kernel/memory_management.cpp @@ -297,7 +297,7 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn if (result == 0) processed++; - } + } case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_PROTECT: { result = sceKernelMProtect(entries[i].start, entries[i].length, entries[i].protection); LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}", @@ -310,8 +310,8 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn processed++; } break; - } - + } + case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_TYPE_PROTECT: { result = sceKernelMTypeProtect(entries[i].start, entries[i].length, entries[i].type, entries[i].protection); @@ -325,8 +325,8 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn processed++; } break; - } - + } + case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE: { result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length, entries[i].protection, flags, "");