catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the nits

This commit is contained in:
Antonio 2024-08-20 16:04:43 -04:00
parent d768714a4a
commit 258e5f0ad9
3 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/address_space.cpp
View File

@ -218,24 +218,36 @@ struct AddressSpace::Impl {
void Protect(VAddr virtual_addr, size_t size, bool read, bool write, bool execute) { void Protect(VAddr virtual_addr, size_t size, bool read, bool write, bool execute) {
DWORD new_flags{}; DWORD new_flags{};
if (read && write && execute) { if (read && write && execute) {
new_flags = PAGE_EXECUTE_READWRITE; new_flags = PAGE_EXECUTE_READWRITE;
} else if (read && write) { } else if (read && write) {
new_flags = PAGE_READWRITE; new_flags = PAGE_READWRITE;
} else if (read && !write) { } else if (read && !write) {
new_flags = PAGE_READONLY; new_flags = PAGE_READONLY;
} else if (execute && !read && !write) { } else if (execute && !read && not write) {
new_flags = PAGE_EXECUTE; new_flags = PAGE_EXECUTE;
} else if (!read && !write && !execute) { } else if (!read && !write && !execute) {
new_flags = PAGE_NOACCESS; new_flags = PAGE_NOACCESS;
} else { } else {
LOG_CRITICAL(Common_Memory, "Unsupported protection flag combination"); LOG_CRITICAL(Common_Memory,
"Unsupported protection flag combination for address {:#x}, size {}",
virtual_addr, size);
return;
} }
DWORD old_flags{}; DWORD old_flags{};
if (!VirtualProtect(reinterpret_cast<void*>(virtual_addr), size, new_flags, &old_flags)) { bool success =
LOG_CRITICAL(Common_Memory, "Failed to change virtual memory protection"); VirtualProtect(reinterpret_cast<void*>(virtual_addr), size, new_flags, &old_flags);
if (!success) {
LOG_ERROR(Common_Memory,
"Failed to change virtual memory protection for address {:#x}, size {}",
virtual_addr, size);
} }
// Use assert to ensure success in debug builds
assert(success && "Failed to change virtual memory protection");
} }
HANDLE process{}; HANDLE process{};
@ -477,10 +489,11 @@ 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) { void AddressSpace::Protect(VAddr virtual_addr, size_t size, MemoryPermission perms) {
bool read = static_cast<int>(perms & MemoryPermission::Read) != 0; const bool read = True(perms & MemoryPermission::Read);
bool write = static_cast<int>(perms & MemoryPermission::Write) != 0;
bool execute = static_cast<int>(perms & MemoryPermission::Execute) != const bool write = True(perms & MemoryPermission::Write);
0; // Assuming you have an Execute permission
const bool execute = True(perms & MemoryPermission::Execute);
return impl->Protect(virtual_addr, size, read, write, execute); return impl->Protect(virtual_addr, size, read, write, execute);
} }

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

@ -209,32 +209,16 @@ int PS4_SYSV_ABI sceKernelQueryMemoryProtection(void* addr, void** start, void**
} }
int PS4_SYSV_ABI sceKernelMProtect(const void* addr, size_t size, int prot) { int PS4_SYSV_ABI sceKernelMProtect(const void* addr, size_t size, int prot) {
Core::MemoryManager* memory_manager = Core::Memory::Instance(); Core::MemoryManager* memory_manager = Core::Memory::Instance();
// Cast the 'prot' integer to 'MemoryProt' enum type
Core::MemoryProt protection_flags = static_cast<Core::MemoryProt>(prot); Core::MemoryProt protection_flags = static_cast<Core::MemoryProt>(prot);
return memory_manager->Protect(std::bit_cast<VAddr>(addr), size, protection_flags);
int result = memory_manager->Protect(std::bit_cast<VAddr>(addr), size, protection_flags);
if (result != ORBIS_OK) {
LOG_ERROR(Kernel_Vmm, "MProtect failed with result {}", result);
}
return result;
} }
int PS4_SYSV_ABI sceKernelMTypeProtect(const void* addr, size_t size, int mtype, int prot) { int PS4_SYSV_ABI sceKernelMTypeProtect(const void* addr, size_t size, int mtype, int prot) {
Core::MemoryManager* memory_manager = Core::Memory::Instance(); Core::MemoryManager* memory_manager = Core::Memory::Instance();
// Cast the 'prot' integer to 'MemoryProt' enum type
Core::MemoryProt protection_flags = static_cast<Core::MemoryProt>(prot); Core::MemoryProt protection_flags = static_cast<Core::MemoryProt>(prot);
return memory_manager->MTypeProtect(std::bit_cast<VAddr>(addr), size,
int result = memory_manager->MTypeProtect(std::bit_cast<VAddr>(addr), size, static_cast<Core::VMAType>(mtype), protection_flags);
static_cast<Core::VMAType>(mtype), protection_flags);
if (result != ORBIS_OK) {
LOG_ERROR(Kernel_Vmm, "MTypeProtect failed with result {}", result);
}
return result;
} }
int PS4_SYSV_ABI sceKernelDirectMemoryQuery(u64 offset, int flags, OrbisQueryInfo* query_info, int PS4_SYSV_ABI sceKernelDirectMemoryQuery(u64 offset, int flags, OrbisQueryInfo* query_info,

44
src/core/memory.cpp
View File

@ -286,12 +286,14 @@ int MemoryManager::Protect(VAddr addr, size_t size, MemoryProt prot) {
} }
// Validate protection flags // Validate protection flags
MemoryProt valid_flags = MemoryProt::NoAccess | MemoryProt::CpuRead | MemoryProt::CpuReadWrite | constexpr static MemoryProt valid_flags = MemoryProt::NoAccess | MemoryProt::CpuRead |
MemoryProt::GpuRead | MemoryProt::GpuWrite | MemoryProt::GpuReadWrite; MemoryProt::CpuReadWrite | MemoryProt::GpuRead |
MemoryProt::GpuWrite | MemoryProt::GpuReadWrite;
if ((prot & ~valid_flags) != MemoryProt::NoAccess) { MemoryProt invalid_flags = prot & ~valid_flags;
LOG_ERROR(Core, "Invalid protection flags, prot: {:#x}, GpuWrite: {:#x}", if (u32(invalid_flags) != 0 && u32(invalid_flags) != u32(MemoryProt::NoAccess)) {
static_cast<uint32_t>(prot), static_cast<uint32_t>(MemoryProt::GpuWrite)); LOG_ERROR(Core, "Invalid protection flags: prot = {:#x}, invalid flags = {:#x}", u32(prot),
invalid_flags);
return ORBIS_KERNEL_ERROR_EINVAL; return ORBIS_KERNEL_ERROR_EINVAL;
} }
@ -301,19 +303,19 @@ int MemoryManager::Protect(VAddr addr, size_t size, MemoryProt prot) {
// Set permissions // Set permissions
Core::MemoryPermission perms{}; Core::MemoryPermission perms{};
if ((prot & MemoryProt::CpuRead) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::CpuRead)) {
perms |= Core::MemoryPermission::Read; perms |= Core::MemoryPermission::Read;
} }
if ((prot & MemoryProt::CpuReadWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::CpuReadWrite)) {
perms |= Core::MemoryPermission::ReadWrite; perms |= Core::MemoryPermission::ReadWrite;
} }
if ((prot & MemoryProt::GpuRead) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuRead)) {
perms |= Core::MemoryPermission::Read; perms |= Core::MemoryPermission::Read;
} }
if ((prot & MemoryProt::GpuWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuWrite)) {
perms |= Core::MemoryPermission::Write; perms |= Core::MemoryPermission::Write;
} }
if ((prot & MemoryProt::GpuReadWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuReadWrite)) {
perms |= Core::MemoryPermission::ReadWrite; perms |= Core::MemoryPermission::ReadWrite;
} }
@ -340,12 +342,14 @@ int MemoryManager::MTypeProtect(VAddr addr, size_t size, VMAType mtype, MemoryPr
} }
// Validate protection flags // Validate protection flags
MemoryProt valid_flags = MemoryProt::NoAccess | MemoryProt::CpuRead | MemoryProt::CpuReadWrite | constexpr static MemoryProt valid_flags = MemoryProt::NoAccess | MemoryProt::CpuRead |
MemoryProt::GpuRead | MemoryProt::GpuWrite | MemoryProt::GpuReadWrite; MemoryProt::CpuReadWrite | MemoryProt::GpuRead |
MemoryProt::GpuWrite | MemoryProt::GpuReadWrite;
if ((prot & ~valid_flags) != MemoryProt::NoAccess) { MemoryProt invalid_flags = prot & ~valid_flags;
LOG_ERROR(Core, "Invalid protection flags, prot: {:#x}, GpuWrite: {:#x}", if (u32(invalid_flags) != 0 && u32(invalid_flags) != u32(MemoryProt::NoAccess)) {
static_cast<uint32_t>(prot), static_cast<uint32_t>(MemoryProt::GpuWrite)); LOG_ERROR(Core, "Invalid protection flags: prot = {:#x}, invalid flags = {:#x}", u32(prot),
invalid_flags);
return ORBIS_KERNEL_ERROR_EINVAL; return ORBIS_KERNEL_ERROR_EINVAL;
} }
@ -356,19 +360,19 @@ int MemoryManager::MTypeProtect(VAddr addr, size_t size, VMAType mtype, MemoryPr
// Set permissions // Set permissions
Core::MemoryPermission perms{}; Core::MemoryPermission perms{};
if ((prot & MemoryProt::CpuRead) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::CpuRead)) {
perms |= Core::MemoryPermission::Read; perms |= Core::MemoryPermission::Read;
} }
if ((prot & MemoryProt::CpuReadWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::CpuReadWrite)) {
perms |= Core::MemoryPermission::ReadWrite; perms |= Core::MemoryPermission::ReadWrite;
} }
if ((prot & MemoryProt::GpuRead) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuRead)) {
perms |= Core::MemoryPermission::Read; perms |= Core::MemoryPermission::Read;
} }
if ((prot & MemoryProt::GpuWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuWrite)) {
perms |= Core::MemoryPermission::Write; perms |= Core::MemoryPermission::Write;
} }
if ((prot & MemoryProt::GpuReadWrite) != MemoryProt::NoAccess) { if (True(prot & MemoryProt::GpuReadWrite)) {
perms |= Core::MemoryPermission::ReadWrite; perms |= Core::MemoryPermission::ReadWrite;
} }