diff options
| author | FICTURE7 <FICTURE7@gmail.com> | 2021-05-30 01:06:28 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-29 18:06:28 -0300 |
| commit | 9d7627af6484e090ebbc3209bc7301f0bdf47d24 (patch) | |
| tree | 057637c1b6d9de6fd80ea271cb93667cfb43abf3 /ARMeilleure/IntermediateRepresentation | |
| parent | f3b0b4831c323a20393aa0388f947317354372b7 (diff) | |
Add multi-level function table (#2228)
* Add AddressTable<T>
* Use AddressTable<T> for dispatch
* Remove JumpTable & co.
* Add fallback for out of range addresses
* Add PPTC support
* Add documentation to `AddressTable<T>`
* Make AddressTable<T> configurable
* Fix table walk
* Fix IsMapped check
* Remove CountTableCapacity
* Add PPTC support for fast path
* Rename IsMapped to IsValid
* Remove stale comment
* Change format of address in exception message
* Add TranslatorStubs
* Split DispatchStub
Avoids recompilation of stubs during tests.
* Add hint for 64bit or 32bit
* Add documentation to `Symbol`
* Add documentation to `TranslatorStubs`
Make `TranslatorStubs` disposable as well.
* Add documentation to `SymbolType`
* Add `AddressTableEventSource` to monitor function table size
Add an EventSource which measures the amount of unmanaged bytes
allocated by AddressTable<T> instances.
dotnet-counters monitor -n Ryujinx --counters ARMeilleure
* Add `AllowLcqInFunctionTable` optimization toggle
This is to reduce the impact this change has on the test duration.
Before everytime a test was ran, the FunctionTable would be initialized
and populated so that the newly compiled test would get registered to
it.
* Implement unmanaged dispatcher
Uses the DispatchStub to dispatch into the next translation, which
allows execution to stay in unmanaged for longer and skips a
ConcurrentDictionary look up when the target translation has been
registered to the FunctionTable.
* Remove redundant null check
* Tune levels of FunctionTable
Uses 5 levels instead of 4 and change unit of AddressTableEventSource
from KB to MB.
* Use 64-bit function table
Improves codegen for direct branches:
mov qword [rax+0x408],0x10603560
- mov rcx,sub_10603560_OFFSET
- mov ecx,[rcx]
- mov ecx,ecx
- mov rdx,JIT_CACHE_BASE
- add rdx,rcx
+ mov rcx,sub_10603560
+ mov rdx,[rcx]
mov rcx,rax
Improves codegen for dispatch stub:
and rax,byte +0x1f
- mov eax,[rcx+rax*4]
- mov eax,eax
- mov rcx,JIT_CACHE_BASE
- lea rax,[rcx+rax]
+ mov rax,[rcx+rax*8]
mov rcx,rbx
* Remove `JitCacheSymbol` & `JitCache.Offset`
* Turn `Translator.Translate` into an instance method
We do not have to add more parameter to this method and related ones as
new structures are added & needed for translation.
* Add symbol only when PTC is enabled
Address LDj3SNuD's feedback
* Change `NativeContext.Running` to a 32-bit integer
* Fix PageTable symbol for host mapped
Diffstat (limited to 'ARMeilleure/IntermediateRepresentation')
| -rw-r--r-- | ARMeilleure/IntermediateRepresentation/Operand.cs | 22 | ||||
| -rw-r--r-- | ARMeilleure/IntermediateRepresentation/OperandHelper.cs | 14 |
2 files changed, 23 insertions, 13 deletions
diff --git a/ARMeilleure/IntermediateRepresentation/Operand.cs b/ARMeilleure/IntermediateRepresentation/Operand.cs index ec023939..64df416f 100644 --- a/ARMeilleure/IntermediateRepresentation/Operand.cs +++ b/ARMeilleure/IntermediateRepresentation/Operand.cs @@ -1,3 +1,4 @@ +using ARMeilleure.Translation.PTC; using System; using System.Collections.Generic; using System.Diagnostics; @@ -12,12 +13,12 @@ namespace ARMeilleure.IntermediateRepresentation public ulong Value { get; private set; } - public bool Relocatable { get; private set; } - public int? PtcIndex { get; private set; } - public List<Node> Assignments { get; } public List<Node> Uses { get; } + public Symbol Symbol { get; private set; } + public bool Relocatable => Symbol.Type != SymbolType.None; + public Operand() { Assignments = new List<Node>(); @@ -34,16 +35,14 @@ namespace ARMeilleure.IntermediateRepresentation OperandKind kind, OperandType type = OperandType.None, ulong value = 0, - bool relocatable = false, - int? index = null) + Symbol symbol = default) { Kind = kind; Type = type; Value = value; - Relocatable = relocatable; - PtcIndex = index; + Symbol = symbol; Assignments.Clear(); Uses.Clear(); @@ -61,9 +60,14 @@ namespace ARMeilleure.IntermediateRepresentation return With(OperandKind.Constant, OperandType.I32, value); } - public Operand With(long value, bool relocatable = false, int? index = null) + public Operand With(long value) + { + return With(OperandKind.Constant, OperandType.I64, (ulong)value); + } + + public Operand With(long value, Symbol symbol) { - return With(OperandKind.Constant, OperandType.I64, (ulong)value, relocatable, index); + return With(OperandKind.Constant, OperandType.I64, (ulong)value, symbol); } public Operand With(ulong value) diff --git a/ARMeilleure/IntermediateRepresentation/OperandHelper.cs b/ARMeilleure/IntermediateRepresentation/OperandHelper.cs index 1b748f6a..420555a7 100644 --- a/ARMeilleure/IntermediateRepresentation/OperandHelper.cs +++ b/ARMeilleure/IntermediateRepresentation/OperandHelper.cs @@ -1,4 +1,5 @@ using ARMeilleure.Common; +using ARMeilleure.Translation.PTC; using System.Runtime.CompilerServices; namespace ARMeilleure.IntermediateRepresentation @@ -25,9 +26,14 @@ namespace ARMeilleure.IntermediateRepresentation return Operand().With(value); } - public static Operand Const(long value, bool relocatable = false, int? index = null) + public static Operand Const(long value) { - return Operand().With(value, relocatable, index); + return Operand().With(value); + } + + public static Operand Const(long value, Symbol symbol) + { + return Operand().With(value, symbol); } public static Operand Const(ulong value) @@ -35,9 +41,9 @@ namespace ARMeilleure.IntermediateRepresentation return Operand().With(value); } - public static unsafe Operand Const<T>(ref T reference, int? index = null) + public static unsafe Operand Const<T>(ref T reference, Symbol symbol = default) { - return Operand().With((long)Unsafe.AsPointer(ref reference), index != null, index); + return Operand().With((long)Unsafe.AsPointer(ref reference), symbol); } public static Operand ConstF(float value) |
