From 00579927e43bf55ee06ae02933c1e755fb4120eb Mon Sep 17 00:00:00 2001 From: gdkchan Date: Wed, 28 Nov 2018 20:18:09 -0200 Subject: 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 --- ChocolArm64/Memory/MemoryHelper.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'ChocolArm64/Memory/MemoryHelper.cs') diff --git a/ChocolArm64/Memory/MemoryHelper.cs b/ChocolArm64/Memory/MemoryHelper.cs index 2e721afa..1c436dd8 100644 --- a/ChocolArm64/Memory/MemoryHelper.cs +++ b/ChocolArm64/Memory/MemoryHelper.cs @@ -26,22 +26,26 @@ namespace ChocolArm64.Memory { long size = Marshal.SizeOf(); - memory.EnsureRangeIsValid(position, size); + byte[] data = memory.ReadBytes(position, size); - IntPtr ptr = (IntPtr)memory.Translate(position); - - return Marshal.PtrToStructure(ptr); + fixed (byte* ptr = data) + { + return Marshal.PtrToStructure((IntPtr)ptr); + } } public unsafe static void Write(MemoryManager memory, long position, T value) where T : struct { long size = Marshal.SizeOf(); - memory.EnsureRangeIsValid(position, size); + byte[] data = new byte[size]; - IntPtr ptr = (IntPtr)memory.TranslateWrite(position); + fixed (byte* ptr = data) + { + Marshal.StructureToPtr(value, (IntPtr)ptr, false); + } - Marshal.StructureToPtr(value, ptr, false); + memory.WriteBytes(position, data); } public static string ReadAsciiString(MemoryManager memory, long position, long maxSize = -1) -- cgit v1.2.3