aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Memory
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Memory')
-rw-r--r--Ryujinx.Memory/MemoryBlock.cs20
-rw-r--r--Ryujinx.Memory/NativeMemoryManager.cs42
2 files changed, 59 insertions, 3 deletions
diff --git a/Ryujinx.Memory/MemoryBlock.cs b/Ryujinx.Memory/MemoryBlock.cs
index 850fb115..37439a8a 100644
--- a/Ryujinx.Memory/MemoryBlock.cs
+++ b/Ryujinx.Memory/MemoryBlock.cs
@@ -135,13 +135,13 @@ namespace Ryujinx.Memory
public void Copy(ulong srcOffset, ulong dstOffset, ulong size)
{
const int MaxChunkSize = 1 << 30;
-
+
for (ulong offset = 0; offset < size; offset += MaxChunkSize)
{
int copySize = (int)Math.Min(MaxChunkSize, size - offset);
Write(dstOffset + offset, GetSpan(srcOffset + offset, copySize));
- }
+ }
}
/// <summary>
@@ -225,7 +225,7 @@ namespace Ryujinx.Memory
}
/// <summary>
- /// Gets the span of a given memory block region.
+ /// Gets the <see cref="System.Span{T}"/> of a given memory block region.
/// </summary>
/// <param name="offset">Start offset of the memory region</param>
/// <param name="size">Size in bytes of the region</param>
@@ -239,6 +239,20 @@ namespace Ryujinx.Memory
}
/// <summary>
+ /// Gets the <see cref="System.Memory{T}"/> of a given memory block region.
+ /// </summary>
+ /// <param name="offset">Start offset of the memory region</param>
+ /// <param name="size">Size in bytes of the region</param>
+ /// <returns>Memory of the memory region</returns>
+ /// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
+ /// <exception cref="ArgumentOutOfRangeException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public unsafe Memory<byte> GetMemory(ulong offset, int size)
+ {
+ return new NativeMemoryManager<byte>((byte*)GetPointer(offset, size), size).Memory;
+ }
+
+ /// <summary>
/// Adds a 64-bits offset to a native pointer.
/// </summary>
/// <param name="pointer">Native pointer</param>
diff --git a/Ryujinx.Memory/NativeMemoryManager.cs b/Ryujinx.Memory/NativeMemoryManager.cs
new file mode 100644
index 00000000..ef599dd4
--- /dev/null
+++ b/Ryujinx.Memory/NativeMemoryManager.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Buffers;
+
+namespace Ryujinx.Memory
+{
+ unsafe class NativeMemoryManager<T> : MemoryManager<T> where T : unmanaged
+ {
+ private readonly T* _pointer;
+ private readonly int _length;
+
+ public NativeMemoryManager(T* pointer, int length)
+ {
+ _pointer = pointer;
+ _length = length;
+ }
+
+ public override Span<T> GetSpan()
+ {
+ return new Span<T>((void*)_pointer, _length);
+ }
+
+ public override MemoryHandle Pin(int elementIndex = 0)
+ {
+ if ((uint)elementIndex >= _length)
+ {
+ throw new ArgumentOutOfRangeException(nameof(elementIndex));
+ }
+
+ return new MemoryHandle((void*)(_pointer + elementIndex));
+ }
+
+ public override void Unpin()
+ {
+ // No need to do anything as pointer already points no native memory, not GC tracked.
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ // Nothing to dispose, MemoryBlock still owns the memory.
+ }
+ }
+}