diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-05-03 19:54:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 08:54:50 +1000 |
| commit | f77694e4f774c9391aad5344e70a7c8721cfedc6 (patch) | |
| tree | 36bccaeb153bd5d921c751966b8a734a7b4b6ae1 /Ryujinx.HLE/HOS/Services/Account | |
| parent | 1758424208335d1f4ff7c27c554e517c81bf72f6 (diff) | |
Implement a new physical memory manager and replace DeviceMemory (#856)
* Implement a new physical memory manager and replace DeviceMemory
* Proper generic constraints
* Fix debug build
* Add memory tests
* New CPU memory manager and general code cleanup
* Remove host memory management from CPU project, use Ryujinx.Memory instead
* Fix tests
* Document exceptions on MemoryBlock
* Fix leak on unix memory allocation
* Proper disposal of some objects on tests
* Fix JitCache not being set as initialized
* GetRef without checks for 8-bits and 16-bits CAS
* Add MemoryBlock destructor
* Throw in separate method to improve codegen
* Address PR feedback
* QueryModified improvements
* Fix memory write tracking not marking all pages as modified in some cases
* Simplify MarkRegionAsModified
* Remove XML doc for ghost param
* Add back optimization to avoid useless buffer updates
* Add Ryujinx.Cpu project, move MemoryManager there and remove MemoryBlockWrapper
* Some nits
* Do not perform address translation when size is 0
* Address PR feedback and format NativeInterface class
* Remove ghost parameter description
* Update Ryujinx.Cpu to .NET Core 3.1
* Address PR feedback
* Fix build
* Return a well defined value for GetPhysicalAddress with invalid VA, and do not return unmapped ranges as modified
* Typo
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Account')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs | 10 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Account/Acc/IProfile.cs | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs index a1c2c836..3709db3a 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs @@ -1,6 +1,6 @@ -using ARMeilleure.Memory; using Ryujinx.Common; using Ryujinx.Common.Logging; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Services.Arp; using System.Collections.Generic; @@ -75,8 +75,8 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc break; } - context.Memory.WriteInt64(outputPosition + (long)offset, userProfile.UserId.High); - context.Memory.WriteInt64(outputPosition + (long)offset + 8, userProfile.UserId.Low); + context.Memory.Write((ulong)outputPosition + offset, userProfile.UserId.High); + context.Memory.Write((ulong)outputPosition + offset + 8, userProfile.UserId.Low); offset += 0x10; } @@ -240,7 +240,9 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.InvalidInputBufferSize; } - byte[] thumbnailBuffer = context.Memory.ReadBytes(inputPosition, inputSize); + byte[] thumbnailBuffer = new byte[inputSize]; + + context.Memory.Read((ulong)inputPosition, thumbnailBuffer); // TODO: Store thumbnailBuffer somewhere, in save data 0x8000000000000010 ? diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IProfile.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IProfile.cs index 0470832b..24a76e50 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IProfile.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IProfile.cs @@ -1,5 +1,5 @@ -using ARMeilleure.Memory; using Ryujinx.Common.Logging; +using Ryujinx.Cpu; using Ryujinx.HLE.Utilities; using System.IO; using System.Reflection; @@ -28,9 +28,9 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc MemoryHelper.FillWithZeros(context.Memory, position, 0x80); - context.Memory.WriteInt32(position, 0); - context.Memory.WriteInt32(position + 4, 1); - context.Memory.WriteInt64(position + 8, 1); + context.Memory.Write((ulong)position, 0); + context.Memory.Write((ulong)position + 4, 1); + context.Memory.Write((ulong)position + 8, 1L); return GetBase(context); } @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc _profilePictureStream.Read(profilePictureData, 0, profilePictureData.Length); - context.Memory.WriteBytes(bufferPosition, profilePictureData); + context.Memory.Write((ulong)bufferPosition, profilePictureData); context.ResponseData.Write(_profilePictureStream.Length); |
