mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-15 16:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

''

Browse Source
This commit is contained in:
Antonio
2024-09-02 01:10:37 -04:00
parent 60f0ad8299
commit cbc98e9ebf
9 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals/ffmpeg-core vendored

Submodule externals/ffmpeg-core updated: e30b7d7fe2...63b5fa6a52

2
externals/glslang vendored

Submodule externals/glslang updated: 4422273e84...12cbda959b

2
externals/robin-map vendored

Submodule externals/robin-map updated: 1115dad3ff...2c48a1a502

2
externals/sirit vendored

Submodule externals/sirit updated: 8db09231c4...37090c74cc

2
externals/toml11 vendored

Submodule externals/toml11 updated: 26d403e461...4b74012723

2
externals/vma vendored

Submodule externals/vma updated: e1bdbca9ba...de8e65796a

2
externals/vulkan-headers vendored

Submodule externals/vulkan-headers updated: d205aff40b...c6391a7b8c

2
externals/xbyak vendored

Submodule externals/xbyak updated: a78d6bac84...ccdf68421b

21
src/core/libraries/kernel/memory_management.cpp
View File

@@ -272,7 +272,6 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
int* numEntriesOut, int flags) { int* numEntriesOut, int flags) {
int result = ORBIS_OK; int result = ORBIS_OK;
int processed = 0; int processed = 0;
int result = 0;
for (int i = 0; i < numEntries; i++) { for (int i = 0; i < numEntries; i++) {
if (entries == nullptr || entries[i].length == 0 || entries[i].operation > 4) { if (entries == nullptr || entries[i].length == 0 || entries[i].operation > 4) {
result = ORBIS_KERNEL_ERROR_EINVAL; result = ORBIS_KERNEL_ERROR_EINVAL;
@@ -298,7 +297,8 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
if (result == 0) if (result == 0)
processed++; processed++;
} else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_PROTECT) { }
case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_PROTECT: {
result = sceKernelMProtect(entries[i].start, entries[i].length, entries[i].protection); result = sceKernelMProtect(entries[i].start, entries[i].length, entries[i].protection);
LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}", LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}",
i, entries[i].operation, entries[i].length, result); i, entries[i].operation, entries[i].length, result);
@@ -309,7 +309,9 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
if (result == 0) { if (result == 0) {
processed++; processed++;
} }
} else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_TYPE_PROTECT) { }
case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_TYPE_PROTECT: {
result = sceKernelMTypeProtect(entries[i].start, entries[i].length, entries[i].type, result = sceKernelMTypeProtect(entries[i].start, entries[i].length, entries[i].type,
entries[i].protection); entries[i].protection);
LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}", LOG_INFO(Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, result = {}",
@@ -321,7 +323,9 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
if (result == 0) { if (result == 0) {
processed++; processed++;
} }
} else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE) { }
case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE: {
result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length, result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length,
entries[i].protection, flags, ""); entries[i].protection, flags, "");
LOG_INFO(Kernel_Vmm, LOG_INFO(Kernel_Vmm,
@@ -330,14 +334,7 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
i, entries[i].operation, entries[i].length, (u8)entries[i].type, result); i, entries[i].operation, entries[i].length, (u8)entries[i].type, result);
break; break;
} }
case MemoryOpTypes::ORBIS_KERNEL_MAP_OP_TYPE_PROTECT: {
// By now, ignore protection and log it instead
LOG_WARNING(Kernel_Vmm,
"entry = {}, operation = {}, len = {:#x}, type = {} "
"is UNSUPPORTED and skipped",
i, entries[i].operation, entries[i].length, (u8)entries[i].type);
break;
}
default: { default: {
UNREACHABLE(); UNREACHABLE();
} }