aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2018-11-28 20:18:09 -0200
committerGitHub <noreply@github.com>2018-11-28 20:18:09 -0200
commit00579927e43bf55ee06ae02933c1e755fb4120eb (patch)
tree0fd06db7b28e0accf87b465ec6f4dc74691febab /Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
parente7fe7d724778535f8eff390abef54274a343c0b7 (diff)
Better process implementation (#491)
* Initial implementation of KProcess * Some improvements to the memory manager, implement back guest stack trace printing * Better GetInfo implementation, improve checking in some places with information from process capabilities * Allow the cpu to read/write from the correct memory locations for accesses crossing a page boundary * Change long -> ulong for address/size on memory related methods to avoid unnecessary casts * Attempt at implementing ldr:ro with new KProcess * Allow BSS with size 0 on ldr:ro * Add checking for memory block slab heap usage, return errors if full, exit gracefully * Use KMemoryBlockSize const from KMemoryManager * Allow all methods to read from non-contiguous locations * Fix for TransactParcelAuto * Address PR feedback, additionally fix some small issues related to the KIP loader and implement SVCs GetProcessId, GetProcessList, GetSystemInfo, CreatePort and ManageNamedPort * Fix wrong check for source pages count from page list on MapPhysicalMemory * Fix some issues with UnloadNro on ldr:ro
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs')
-rw-r--r--Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs64
1 files changed, 59 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
index cdd31667..a440438b 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
@@ -1,14 +1,68 @@
+using Ryujinx.Common;
+
namespace Ryujinx.HLE.HOS.Kernel
{
class KSharedMemory
{
- public long PA { get; private set; }
- public long Size { get; private set; }
+ private KPageList PageList;
+
+ private long OwnerPid;
+
+ private MemoryPermission OwnerPermission;
+ private MemoryPermission UserPermission;
+
+ public KSharedMemory(
+ KPageList PageList,
+ long OwnerPid,
+ MemoryPermission OwnerPermission,
+ MemoryPermission UserPermission)
+ {
+ this.PageList = PageList;
+ this.OwnerPid = OwnerPid;
+ this.OwnerPermission = OwnerPermission;
+ this.UserPermission = UserPermission;
+ }
- public KSharedMemory(long PA, long Size)
+ public KernelResult MapIntoProcess(
+ KMemoryManager MemoryManager,
+ ulong Address,
+ ulong Size,
+ KProcess Process,
+ MemoryPermission Permission)
{
- this.PA = PA;
- this.Size = Size;
+ ulong PagesCountRounded = BitUtils.DivRoundUp(Size, KMemoryManager.PageSize);
+
+ if (PageList.GetPagesCount() != PagesCountRounded)
+ {
+ return KernelResult.InvalidSize;
+ }
+
+ MemoryPermission ExpectedPermission = Process.Pid == OwnerPid
+ ? OwnerPermission
+ : UserPermission;
+
+ if (Permission != ExpectedPermission)
+ {
+ return KernelResult.InvalidPermission;
+ }
+
+ return MemoryManager.MapPages(Address, PageList, MemoryState.SharedMemory, Permission);
+ }
+
+ public KernelResult UnmapFromProcess(
+ KMemoryManager MemoryManager,
+ ulong Address,
+ ulong Size,
+ KProcess Process)
+ {
+ ulong PagesCountRounded = BitUtils.DivRoundUp(Size, KMemoryManager.PageSize);
+
+ if (PageList.GetPagesCount() != PagesCountRounded)
+ {
+ return KernelResult.InvalidSize;
+ }
+
+ return MemoryManager.UnmapPages(Address, PageList, MemoryState.SharedMemory);
}
}
} \ No newline at end of file