emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Do not emit StoreToContext before Return (#1537)

Browse source 
* Do not emit StoreToContext before Return

* Set PPTC version
This commit is contained in:
FICTURE7 2020-09-07 06:52:17 +04:00 committed by GitHub
parent 6aef271661
commit 4c7bebf3e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ARMeilleure/Instructions/InstEmitAluHelper.cs
View file

@ -118,9 +118,13 @@ namespace ARMeilleure.Instructions
if (IsThumb(context.CurrOp)) if (IsThumb(context.CurrOp))
{ {
context.StoreToContext();
bool isReturn = IsA32Return(context); bool isReturn = IsA32Return(context);
if (!isReturn)
{
context.StoreToContext();
}
Operand addr = context.BitwiseOr(value, Const(1)); Operand addr = context.BitwiseOr(value, Const(1));
InstEmitFlowHelper.EmitVirtualJump(context, addr, isReturn); InstEmitFlowHelper.EmitVirtualJump(context, addr, isReturn);

3
ARMeilleure/Instructions/InstEmitHelper.cs
View file

@ -55,8 +55,11 @@ namespace ARMeilleure.Instructions
public static void SetIntA32(ArmEmitterContext context, int regIndex, Operand value) public static void SetIntA32(ArmEmitterContext context, int regIndex, Operand value)
{ {
if (regIndex == RegisterAlias.Aarch32Pc) if (regIndex == RegisterAlias.Aarch32Pc)
{
if (!IsA32Return(context))
{ {
context.StoreToContext(); context.StoreToContext();
}
EmitBxWritePc(context, value); EmitBxWritePc(context, value);
} }

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

@ -21,7 +21,7 @@ namespace ARMeilleure.Translation.PTC
{ {
private const string HeaderMagic = "PTChd"; private const string HeaderMagic = "PTChd";
private const int InternalVersion = 1522; //! To be incremented manually for each change to the ARMeilleure project. private const int InternalVersion = 1537; //! 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";