diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2018-06-09 13:05:41 -0300 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-06-09 13:05:41 -0300 |
| commit | 7f5a8effbb0bbf7e972dbbfb6792cdea48455739 (patch) | |
| tree | 1e498d073ccbf7692ad57aeee191d2280d8656fb /Ryujinx.Core/OsHle/Services/Vi | |
| parent | 91420a402c9e786ddef2811bb671003dd0a40565 (diff) | |
Move WriteBytes to AMemory, implement it with a Marshal copy like ReadBytes, fix regression on address range checking
Diffstat (limited to 'Ryujinx.Core/OsHle/Services/Vi')
| -rw-r--r-- | Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs | 5 | ||||
| -rw-r--r-- | Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs b/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs index 84c869d5..84f7b086 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs @@ -1,4 +1,3 @@ -using ChocolArm64.Memory; using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.IO; @@ -104,7 +103,7 @@ namespace Ryujinx.Core.OsHle.Services.Vi byte[] Parcel = MakeIGraphicsBufferProducer(ParcelPtr); - AMemoryHelper.WriteBytes(Context.Memory, ParcelPtr, Parcel); + Context.Memory.WriteBytes(ParcelPtr, Parcel); Context.ResponseData.Write((long)Parcel.Length); @@ -129,7 +128,7 @@ namespace Ryujinx.Core.OsHle.Services.Vi byte[] Parcel = MakeIGraphicsBufferProducer(ParcelPtr); - AMemoryHelper.WriteBytes(Context.Memory, ParcelPtr, Parcel); + Context.Memory.WriteBytes(ParcelPtr, Parcel); Context.ResponseData.Write(0L); Context.ResponseData.Write((long)Parcel.Length); diff --git a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs b/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs index db2f7fa2..b02350e0 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs @@ -1,4 +1,3 @@ -using ChocolArm64.Memory; using Ryujinx.Core.Gpu; using Ryujinx.Core.Logging; using Ryujinx.Core.OsHle.Handles; @@ -9,6 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Threading; + using static Ryujinx.Core.OsHle.Services.Android.Parcel; namespace Ryujinx.Core.OsHle.Services.Android @@ -272,7 +272,7 @@ namespace Ryujinx.Core.OsHle.Services.Android byte[] Reply = MakeParcel(Data, new byte[0]); - AMemoryHelper.WriteBytes(Context.Memory, ReplyPos, Reply); + Context.Memory.WriteBytes(ReplyPos, Reply); return 0; } |