mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-16 03:45:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

core: Fix mmap being unable to map GPU memory

Browse source
This commit is contained in:
Daniel R. 2024-10-12 16:35:12 +02:00
parent b412cb4cca
commit 7c00ac637a
No known key found for this signature in database
GPG key ID: B8ADC8F57BA18DBA
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/address_space.cpp
View file

@ -30,14 +30,13 @@ static constexpr size_t BackingSize = SCE_KERNEL_MAIN_DMEM_SIZE_PRO;
#ifdef _WIN32 #ifdef _WIN32
[[nodiscard]] constexpr u64 ToWindowsProt(Core::MemoryProt prot) { [[nodiscard]] constexpr u64 ToWindowsProt(Core::MemoryProt prot) {
switch (prot) { if (True(prot & Core::MemoryProt::CpuReadWrite) ||
case Core::MemoryProt::NoAccess: True(prot & Core::MemoryProt::GpuReadWrite)) {
default:
return PAGE_NOACCESS;
case Core::MemoryProt::CpuRead:
return PAGE_READONLY;
case Core::MemoryProt::CpuReadWrite:
return PAGE_READWRITE; return PAGE_READWRITE;
} else if (True(prot & Core::MemoryProt::CpuRead) || True(prot & Core::MemoryProt::GpuRead)) {
return PAGE_READONLY;
} else {
return PAGE_NOACCESS;
} }
} }
@ -290,14 +289,13 @@ enum PosixPageProtection {
}; };
[[nodiscard]] constexpr PosixPageProtection ToPosixProt(Core::MemoryProt prot) { [[nodiscard]] constexpr PosixPageProtection ToPosixProt(Core::MemoryProt prot) {
switch (prot) { if (True(prot & Core::MemoryProt::CpuReadWrite) ||
case Core::MemoryProt::NoAccess: True(prot & Core::MemoryProt::GpuReadWrite)) {
default:
return PAGE_NOACCESS;
case Core::MemoryProt::CpuRead:
return PAGE_READONLY;
case Core::MemoryProt::CpuReadWrite:
return PAGE_READWRITE; return PAGE_READWRITE;
} else if (True(prot & Core::MemoryProt::CpuRead) || True(prot & Core::MemoryProt::GpuRead)) {
return PAGE_READONLY;
} else {
return PAGE_NOACCESS;
} }
} }

10
src/core/libraries/kernel/file_system.cpp
View file

@ -321,25 +321,25 @@ int PS4_SYSV_ABI sceKernelRmdir(const char* path) {
const std::filesystem::path dir_name = mnt->GetHostPath(path, &ro); const std::filesystem::path dir_name = mnt->GetHostPath(path, &ro);
if (dir_name.empty()) { if (dir_name.empty()) {
LOG_INFO(Kernel_Fs, "Failed to remove directory: {}, permission denied", LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, permission denied",
fmt::UTF(dir_name.u8string())); fmt::UTF(dir_name.u8string()));
return SCE_KERNEL_ERROR_EACCES; return SCE_KERNEL_ERROR_EACCES;
} }
if (ro) { if (ro) {
LOG_INFO(Kernel_Fs, "Failed to remove directory: {}, directory is read only", LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, directory is read only",
fmt::UTF(dir_name.u8string())); fmt::UTF(dir_name.u8string()));
return SCE_KERNEL_ERROR_EROFS; return SCE_KERNEL_ERROR_EROFS;
} }
if (!std::filesystem::is_directory(dir_name)) { if (!std::filesystem::is_directory(dir_name)) {
LOG_INFO(Kernel_Fs, "Failed to remove directory: {}, path is not a directory", LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, path is not a directory",
fmt::UTF(dir_name.u8string())); fmt::UTF(dir_name.u8string()));
return ORBIS_KERNEL_ERROR_ENOTDIR; return ORBIS_KERNEL_ERROR_ENOTDIR;
} }
if (!std::filesystem::exists(dir_name)) { if (!std::filesystem::exists(dir_name)) {
LOG_INFO(Kernel_Fs, "Failed to remove directory: {}, no such file or directory", LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, no such file or directory",
fmt::UTF(dir_name.u8string())); fmt::UTF(dir_name.u8string()));
return ORBIS_KERNEL_ERROR_ENOENT; return ORBIS_KERNEL_ERROR_ENOENT;
} }
@ -348,7 +348,7 @@ int PS4_SYSV_ABI sceKernelRmdir(const char* path) {
int result = std::filesystem::remove_all(dir_name, ec); int result = std::filesystem::remove_all(dir_name, ec);
if (!ec) { if (!ec) {
LOG_DEBUG(Kernel_Fs, "Removed directory: {}", fmt::UTF(dir_name.u8string())); LOG_INFO(Kernel_Fs, "Removed directory: {}", fmt::UTF(dir_name.u8string()));
return ORBIS_OK; return ORBIS_OK;
} }
LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, error_code={}", LOG_ERROR(Kernel_Fs, "Failed to remove directory: {}, error_code={}",

1
src/core/libraries/kernel/libkernel.cpp
View file

@ -157,6 +157,7 @@ void SetPosixErrno(int e) {
g_posix_errno = e; g_posix_errno = e;
} }
} }
int PS4_SYSV_ABI sceKernelMmap(void* addr, u64 len, int prot, int flags, int fd, size_t offset, int PS4_SYSV_ABI sceKernelMmap(void* addr, u64 len, int prot, int flags, int fd, size_t offset,
void** res) { void** res) {
LOG_INFO(Kernel_Vmm, "called addr = {}, len = {}, prot = {}, flags = {}, fd = {}, offset = {}", LOG_INFO(Kernel_Vmm, "called addr = {}, len = {}, prot = {}, flags = {}, fd = {}, offset = {}",

2
src/core/memory.h
View file

@ -28,7 +28,7 @@ enum class MemoryProt : u32 {
CpuReadWrite = 2, CpuReadWrite = 2,
GpuRead = 16, GpuRead = 16,
GpuWrite = 32, GpuWrite = 32,
GpuReadWrite = 38, GpuReadWrite = 48,
}; };
DECLARE_ENUM_FLAG_OPERATORS(MemoryProt) DECLARE_ENUM_FLAG_OPERATORS(MemoryProt)