mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-08-04 16:32:39 +00:00
Clang
This commit is contained in:
parent
e35aab16ea
commit
b5aa1d3ef1
@ -471,7 +471,7 @@ s64 MemoryManager::ProtectBytes(VAddr addr, VirtualMemoryArea vma_base, size_t s
|
|||||||
const auto start_in_vma = addr - vma_base.base;
|
const auto start_in_vma = addr - vma_base.base;
|
||||||
const auto adjusted_size =
|
const auto adjusted_size =
|
||||||
vma_base.size - start_in_vma < size ? vma_base.size - start_in_vma : size;
|
vma_base.size - start_in_vma < size ? vma_base.size - start_in_vma : size;
|
||||||
|
|
||||||
if (vma_base.type == VMAType::Free) {
|
if (vma_base.type == VMAType::Free) {
|
||||||
LOG_ERROR(Kernel_Vmm, "Cannot change protection on free memory region");
|
LOG_ERROR(Kernel_Vmm, "Cannot change protection on free memory region");
|
||||||
return ORBIS_KERNEL_ERROR_EINVAL;
|
return ORBIS_KERNEL_ERROR_EINVAL;
|
||||||
@ -484,8 +484,8 @@ s64 MemoryManager::ProtectBytes(VAddr addr, VirtualMemoryArea vma_base, size_t s
|
|||||||
|
|
||||||
MemoryProt invalid_flags = prot & ~valid_flags;
|
MemoryProt invalid_flags = prot & ~valid_flags;
|
||||||
if (u32(invalid_flags) != 0 && u32(invalid_flags) != u32(MemoryProt::NoAccess)) {
|
if (u32(invalid_flags) != 0 && u32(invalid_flags) != u32(MemoryProt::NoAccess)) {
|
||||||
LOG_ERROR(Kernel_Vmm, "Invalid protection flags: prot = {:#x}, invalid flags = {:#x}", u32(prot),
|
LOG_ERROR(Kernel_Vmm, "Invalid protection flags: prot = {:#x}, invalid flags = {:#x}",
|
||||||
u32(invalid_flags));
|
u32(prot), u32(invalid_flags));
|
||||||
return ORBIS_KERNEL_ERROR_EINVAL;
|
return ORBIS_KERNEL_ERROR_EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user