diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2019-01-18 20:26:39 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 20:26:39 -0200 |
| commit | 22bacc618815170c0d186a82e1ea4558e36b7063 (patch) | |
| tree | 79b97959481fea1ac301da6d4e9dea9b991ece6f /Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs | |
| parent | 3731d0ce8412c3c48286c242842bcb4940b4ca6d (diff) | |
Improve kernel IPC implementation (#550)
* Implement some IPC related kernel SVCs properly
* Fix BLZ decompression when the segment also has a uncompressed chunck
* Set default cpu core on process start from ProgramLoader, remove debug message
* Load process capabilities properly on KIPs
* Fix a copy/paste error in UnmapPhysicalMemory64
* Implement smarter switching between old and new IPC system to support the old HLE services implementation without the manual switch
* Implement RegisterService on sm and AcceptSession (partial)
* Misc fixes and improvements on new IPC methods
* Move IPC related SVCs into a separate file, and logging on RegisterService (sm)
* Some small fixes related to receive list buffers and error cases
* Load NSOs using the correct pool partition
* Fix corner case on GetMaskFromMinMax where range is 64, doesn't happen in pratice however
* Fix send static buffer copy
* Session release, implement closing requests on client disconnect
* Implement ConnectToPort SVC
* KLightSession init
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs | 89 |
1 files changed, 82 insertions, 7 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs b/Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs index 413edf94..88c2e690 100644 --- a/Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs +++ b/Ryujinx.HLE/HOS/Kernel/Process/KHandleTable.cs @@ -6,8 +6,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process { class KHandleTable { - private const int SelfThreadHandle = (0x1ffff << 15) | 0; - private const int SelfProcessHandle = (0x1ffff << 15) | 1; + public const int SelfThreadHandle = (0x1ffff << 15) | 0; + public const int SelfProcessHandle = (0x1ffff << 15) | 1; private Horizon _system; @@ -65,7 +65,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process return KernelResult.Success; } - public KernelResult GenerateHandle(object obj, out int handle) + public KernelResult GenerateHandle(KAutoObject obj, out int handle) { handle = 0; @@ -85,7 +85,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Process _activeSlotsCount++; - handle = (int)((_idCounter << 15) & 0xffff8000) | entry.Index; + handle = (_idCounter << 15) | entry.Index; + + obj.IncrementReferenceCount(); if ((short)(_idCounter + 1) >= 0) { @@ -100,6 +102,72 @@ namespace Ryujinx.HLE.HOS.Kernel.Process return KernelResult.Success; } + public KernelResult ReserveHandle(out int handle) + { + handle = 0; + + lock (_table) + { + if (_activeSlotsCount >= _size) + { + return KernelResult.HandleTableFull; + } + + KHandleEntry entry = _nextFreeEntry; + + _nextFreeEntry = entry.Next; + + _activeSlotsCount++; + + handle = (_idCounter << 15) | entry.Index; + + if ((short)(_idCounter + 1) >= 0) + { + _idCounter++; + } + else + { + _idCounter = 1; + } + } + + return KernelResult.Success; + } + + public void CancelHandleReservation(int handle) + { + int index = (handle >> 0) & 0x7fff; + int handleId = (handle >> 15); + + lock (_table) + { + KHandleEntry entry = _table[index]; + + entry.Obj = null; + entry.Next = _nextFreeEntry; + + _nextFreeEntry = entry; + + _activeSlotsCount--; + } + } + + public void SetReservedHandleObj(int handle, KAutoObject obj) + { + int index = (handle >> 0) & 0x7fff; + int handleId = (handle >> 15); + + lock (_table) + { + KHandleEntry entry = _table[index]; + + entry.Obj = obj; + entry.HandleId = (ushort)(handle >> 15); + + obj.IncrementReferenceCount(); + } + } + public bool CloseHandle(int handle) { if ((handle >> 30) != 0 || @@ -112,6 +180,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process int index = (handle >> 0) & 0x7fff; int handleId = (handle >> 15); + KAutoObject obj = null; + bool result = false; lock (_table) @@ -120,7 +190,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process { KHandleEntry entry = _table[index]; - if (entry.Obj != null && entry.HandleId == handleId) + if ((obj = entry.Obj) != null && entry.HandleId == handleId) { entry.Obj = null; entry.Next = _nextFreeEntry; @@ -134,17 +204,22 @@ namespace Ryujinx.HLE.HOS.Kernel.Process } } + if (result) + { + obj.DecrementReferenceCount(); + } + return result; } - public T GetObject<T>(int handle) + public T GetObject<T>(int handle) where T : KAutoObject { int index = (handle >> 0) & 0x7fff; int handleId = (handle >> 15); lock (_table) { - if ((handle >> 30) == 0 && handleId != 0) + if ((handle >> 30) == 0 && handleId != 0 && index < _size) { KHandleEntry entry = _table[index]; |
