diff options
author | bunnei <bunneidev@gmail.com> | 2018-02-15 23:22:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-15 23:22:59 +0100 |
commit | 98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0 (patch) | |
tree | 840f1b480af1250ee50aaca5d30baa7a05f9313c /src/core/hle/kernel | |
parent | Merge pull request #188 from bunnei/refactor-buffer-descriptor (diff) | |
parent | shared_memory: Remove some checks. (diff) | |
download | yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar.gz yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar.bz2 yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar.lz yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar.xz yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.tar.zst yuzu-98ffad4303b39dcef7cbd0e7a2b2c3b61fc123a0.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 835fc710b..d4505061e 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -111,13 +111,6 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi return ERR_INVALID_COMBINATION; } - // Heap-backed memory blocks can not be mapped with other_permissions = DontCare - if (base_address != 0 && other_permissions == MemoryPermission::DontCare) { - LOG_ERROR(Kernel, "cannot map id=%u, address=0x%llx name=%s, permissions don't match", - GetObjectId(), address, name.c_str()); - return ERR_INVALID_COMBINATION; - } - // Error out if the provided permissions are not compatible with what the creator process needs. if (other_permissions != MemoryPermission::DontCare && static_cast<u32>(this->permissions) & ~static_cast<u32>(other_permissions)) { @@ -126,12 +119,6 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi return ERR_WRONG_PERMISSION; } - // TODO(Subv): Check for the Shared Device Mem flag in the creator process. - /*if (was_created_with_shared_device_mem && address != 0) { - return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::OS, - ErrorSummary::InvalidArgument, ErrorLevel::Usage); - }*/ - // TODO(Subv): The same process that created a SharedMemory object // can not map it in its own address space unless it was created with addr=0, result 0xD900182C. |