Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

POH approach, but the sequel

Browse source
This commit is contained in:
FICTURE7 2021-04-17 15:49:57 +04:00
parent bcab67f823
commit 5f5abaa247
2 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ARMeilleure/Common/EntryTable.cs
View file

@ -10,13 +10,13 @@ namespace ARMeilleure.Common
/// address through out the table's lifetime. /// address through out the table's lifetime.
/// </summary> /// </summary>
/// <typeparam name="TEntry">Type of the entry in the table</typeparam> /// <typeparam name="TEntry">Type of the entry in the table</typeparam>
class EntryTable<TEntry> : IDisposable where TEntry : unmanaged class EntryTable<TEntry> where TEntry : unmanaged
{ {
private bool _disposed; private bool _disposed;
private int _freeHint; private int _freeHint;
private readonly int _pageCapacity; // Number of entries per page. private readonly int _pageCapacity; // Number of entries per page.
private readonly int _pageLogCapacity; private readonly int _pageLogCapacity;
private readonly Dictionary<int, IntPtr> _pages; private readonly Dictionary<int, TEntry[]> _pages;
private readonly BitMap _allocated; private readonly BitMap _allocated;
/// <summary> /// <summary>
@ -41,7 +41,7 @@ namespace ARMeilleure.Common
} }
_allocated = new BitMap(); _allocated = new BitMap();
_pages = new Dictionary<int, IntPtr>(); _pages = new Dictionary<int, TEntry[]>();
_pageLogCapacity = BitOperations.Log2((uint)(pageSize / sizeof(TEntry))); _pageLogCapacity = BitOperations.Log2((uint)(pageSize / sizeof(TEntry)));
_pageCapacity = 1 << _pageLogCapacity; _pageCapacity = 1 << _pageLogCapacity;
} }
@ -149,49 +149,14 @@ namespace ARMeilleure.Common
{ {
var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity); var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
if (!_pages.TryGetValue(pageIndex, out IntPtr page)) if (!_pages.TryGetValue(pageIndex, out TEntry[] page))
{ {
page = Marshal.AllocHGlobal(sizeof(TEntry) * _pageCapacity); page = GC.AllocateUninitializedArray<TEntry>(_pageCapacity, pinned: true);
_pages.Add(pageIndex, page); _pages.Add(pageIndex, page);
} }
return new Span<TEntry>((void*)page, _pageCapacity); return page;
}
/// <summary>
/// Releases all resources used by the <see cref="EntryTable{TEntry}"/> instance.
/// </summary>
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
/// <summary>
/// Releases all unmanaged and optionally managed resources used by the <see cref="EntryTable{TEntry}{T}"/>
/// instance.
/// </summary>
/// <param name="disposing"><see langword="true"/> to dispose managed resources also; otherwise just unmanaged resouces</param>
protected virtual void Dispose(bool disposing)
{
if (!_disposed)
{
foreach (var page in _pages.Values)
{
Marshal.FreeHGlobal(page);
}
_disposed = true;
}
}
/// <summary>
/// Frees resources used by the <see cref="EntryTable{TEntry}"/> instance.
/// </summary>
~EntryTable()
{
Dispose(false);
} }
} }
} }

2
ARMeilleure/Translation/Translator.cs
View file

@ -174,8 +174,6 @@ namespace ARMeilleure.Translation
_jumpTable.Dispose(); _jumpTable.Dispose();
_jumpTable = null; _jumpTable = null;
CountTable.Dispose();
GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce; GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
} }
} }