vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory tracking performance regression (#2026)

Browse Source 
* Fix memory tracking performance regression

* Set PTC version
This commit is contained in:
gdkchan 2021-02-16 19:16:20 -03:00 committed by GitHub
parent 715b605e95
commit 9d82d27df2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ARMeilleure/Instructions/InstEmitMemoryHelper.cs
View File

@ -334,14 +334,14 @@ namespace ARMeilleure.Instructions
{ {
if (write) if (write)
{ {
pte = context.ShiftLeft(pte, Const(1));
context.BranchIf(lblSlowPath, pte, Const(0L), Comparison.LessOrEqual); context.BranchIf(lblSlowPath, pte, Const(0L), Comparison.LessOrEqual);
pte = context.ShiftRightUI(pte, Const(1)); pte = context.BitwiseAnd(pte, Const(0xffffffffffffUL)); // Ignore any software protection bits. (they are still used by C# memory access)
} }
else else
{ {
pte = context.ShiftLeft(pte, Const(1));
context.BranchIf(lblSlowPath, pte, Const(0L), Comparison.LessOrEqual); context.BranchIf(lblSlowPath, pte, Const(0L), Comparison.LessOrEqual);
pte = context.BitwiseAnd(pte, Const(0xffffffffffffUL)); // Ignore any software protection bits. (they are still used by C# memory access) pte = context.ShiftRightUI(pte, Const(1));
} }
} }
else else

2
ARMeilleure/Translation/PTC/Ptc.cs
View File

@ -22,7 +22,7 @@ namespace ARMeilleure.Translation.PTC
{ {
private const string HeaderMagic = "PTChd"; private const string HeaderMagic = "PTChd";
private const int InternalVersion = 1987; //! To be incremented manually for each change to the ARMeilleure project. private const int InternalVersion = 2026; //! To be incremented manually for each change to the ARMeilleure project.
private const string ActualDir = "0"; private const string ActualDir = "0";
private const string BackupDir = "1"; private const string BackupDir = "1";

4
Ryujinx.Cpu/MemoryManager.cs
View File

@ -561,7 +561,7 @@ namespace Ryujinx.Cpu
long tag = protection switch long tag = protection switch
{ {
MemoryPermission.None => 0L, MemoryPermission.None => 0L,
MemoryPermission.Read => 2L << PointerTagBit, MemoryPermission.Write => 2L << PointerTagBit,
_ => 3L << PointerTagBit _ => 3L << PointerTagBit
}; };
@ -631,7 +631,7 @@ namespace Ryujinx.Cpu
// tracking using host guard pages in future, but also supporting platforms where this is not possible. // tracking using host guard pages in future, but also supporting platforms where this is not possible.
// Write tag includes read protection, since we don't have any read actions that aren't performed before write too. // Write tag includes read protection, since we don't have any read actions that aren't performed before write too.
long tag = (write ? 3L : 2L) << PointerTagBit; long tag = (write ? 3L : 1L) << PointerTagBit;
ulong endVa = (va + size + PageMask) & ~(ulong)PageMask; ulong endVa = (va + size + PageMask) & ~(ulong)PageMask;