aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Settings
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-05-03 19:54:50 -0300
committerGitHub <noreply@github.com>2020-05-04 08:54:50 +1000
commitf77694e4f774c9391aad5344e70a7c8721cfedc6 (patch)
tree36bccaeb153bd5d921c751966b8a734a7b4b6ae1 /Ryujinx.HLE/HOS/Services/Settings
parent1758424208335d1f4ff7c27c554e517c81bf72f6 (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/Settings')
-rw-r--r--Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs28
2 files changed, 20 insertions, 10 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
index a8b10297..efd659f0 100644
--- a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
@@ -114,7 +114,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
for (int index = 0; index < count; index++)
{
- context.Memory.WriteInt64(position, SystemStateMgr.GetLanguageCode(index));
+ context.Memory.Write((ulong)position, SystemStateMgr.GetLanguageCode(index));
position += 8;
}
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
index 108cb56f..f3113e65 100644
--- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
if (firmwareData != null)
{
- context.Memory.WriteBytes(replyPos, firmwareData);
+ context.Memory.Write((ulong)replyPos, firmwareData);
return ResultCode.Success;
}
@@ -78,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
writer.Write(Encoding.ASCII.GetBytes(build));
- context.Memory.WriteBytes(replyPos, ms.ToArray());
+ context.Memory.Write((ulong)replyPos, ms.ToArray());
}
return ResultCode.Success;
@@ -114,10 +114,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
long namePos = context.Request.PtrBuff[1].Position;
long nameSize = context.Request.PtrBuff[1].Size;
- byte[] Class = context.Memory.ReadBytes(classPos, classSize);
- byte[] name = context.Memory.ReadBytes(namePos, nameSize);
+ byte[] classBuffer = new byte[classSize];
- string askedSetting = Encoding.ASCII.GetString(Class).Trim('\0') + "!" + Encoding.ASCII.GetString(name).Trim('\0');
+ context.Memory.Read((ulong)classPos, classBuffer);
+
+ byte[] nameBuffer = new byte[nameSize];
+
+ context.Memory.Read((ulong)namePos, nameBuffer);
+
+ string askedSetting = Encoding.ASCII.GetString(classBuffer).Trim('\0') + "!" + Encoding.ASCII.GetString(nameBuffer).Trim('\0');
NxSettings.Settings.TryGetValue(askedSetting, out object nxSetting);
@@ -161,10 +166,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
long replyPos = context.Request.ReceiveBuff[0].Position;
long replySize = context.Request.ReceiveBuff[0].Size;
- byte[] Class = context.Memory.ReadBytes(classPos, classSize);
- byte[] name = context.Memory.ReadBytes(namePos, nameSize);
+ byte[] classBuffer = new byte[classSize];
+
+ context.Memory.Read((ulong)classPos, classBuffer);
+
+ byte[] nameBuffer = new byte[nameSize];
+
+ context.Memory.Read((ulong)namePos, nameBuffer);
- string askedSetting = Encoding.ASCII.GetString(Class).Trim('\0') + "!" + Encoding.ASCII.GetString(name).Trim('\0');
+ string askedSetting = Encoding.ASCII.GetString(classBuffer).Trim('\0') + "!" + Encoding.ASCII.GetString(nameBuffer).Trim('\0');
NxSettings.Settings.TryGetValue(askedSetting, out object nxSetting);
@@ -197,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
throw new NotImplementedException(nxSetting.GetType().Name);
}
- context.Memory.WriteBytes(replyPos, settingBuffer);
+ context.Memory.Write((ulong)replyPos, settingBuffer);
Logger.PrintDebug(LogClass.ServiceSet, $"{askedSetting} set value: {nxSetting} as {nxSetting.GetType()}");
}