From 64d305faeb8440bf0006039d423aff82c5822918 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Fri, 26 Jul 2024 08:08:47 +0300 Subject: [PATCH] cleanup memory_management --- src/core/libraries/kernel/memory_management.cpp | 4 ++-- src/core/libraries/kernel/memory_management.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/libraries/kernel/memory_management.cpp b/src/core/libraries/kernel/memory_management.cpp index 7ba85de2..988b69d0 100644 --- a/src/core/libraries/kernel/memory_management.cpp +++ b/src/core/libraries/kernel/memory_management.cpp @@ -244,7 +244,7 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn break; // break and assign a value to numEntriesOut. } - if (entries[i].operation == MemoryOpTypes::SCE_KERNEL_MAP_OP_MAP_DIRECT) { + if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_DIRECT) { result = sceKernelMapNamedDirectMemory(&entries[i].start, entries[i].length, entries[i].protection, flags, static_cast(entries[i].offset), 0, ""); @@ -257,7 +257,7 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn if (result == 0) processed++; - } else if (entries[i].operation == 1) { + } else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_UNMAP) { result = sceKernelMunmap(entries[i].start, entries[i].length); LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}", i, entries[i].operation, entries[i].length, result); diff --git a/src/core/libraries/kernel/memory_management.h b/src/core/libraries/kernel/memory_management.h index df94e677..cc89dfa7 100644 --- a/src/core/libraries/kernel/memory_management.h +++ b/src/core/libraries/kernel/memory_management.h @@ -32,11 +32,11 @@ enum MemoryProtection : u32 { }; enum MemoryOpTypes : u32 { - SCE_KERNEL_MAP_OP_MAP_DIRECT = 0, - SCE_KERNEL_MAP_OP_UNMAP = 1, - SCE_KERNEL_MAP_OP_PROTECT = 2, - SCE_KERNEL_MAP_OP_MAP_FLEXIBLE = 3, - SCE_KERNEL_MAP_OP_TYPE_PROTECT = 4 + ORBIS_KERNEL_MAP_OP_MAP_DIRECT = 0, + ORBIS_KERNEL_MAP_OP_UNMAP = 1, + ORBIS_KERNEL_MAP_OP_PROTECT = 2, + ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE = 3, + ORBIS_KERNEL_MAP_OP_TYPE_PROTECT = 4 }; struct OrbisQueryInfo {