summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-02-15 04:24:06 +0100
committerbunnei <bunneidev@gmail.com>2018-02-15 04:24:06 +0100
commitdf008a159b7c1fb790f83e29d71b98588ed45559 (patch)
tree840f1b480af1250ee50aaca5d30baa7a05f9313c /src/core
parentpl_u: Implement basic shared font loading from RAM dump. (diff)
downloadyuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar.gz
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar.bz2
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar.lz
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar.xz
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.tar.zst
yuzu-df008a159b7c1fb790f83e29d71b98588ed45559.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/shared_memory.cpp13
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.