aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFicture Seven <FICTURE7@gmail.com>2020-07-13 13:10:33 +0400
committerGitHub <noreply@github.com>2020-07-13 19:10:33 +1000
commitb5127131c558ac6613e4e61df3da96031a8fa155 (patch)
tree51f5521971ad239e6558b92ef09ba8ff7f8721cf
parent2cde252eea39be1e3fc61560790ba93854da09f3 (diff)
Fix folding of ConvertI64ToI32 imm64 (#1383)
* Fix folding of ConvertI64ToI32 imm64 * Increment PTC internal version * Clean up
-rw-r--r--ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs2
-rw-r--r--ARMeilleure/Translation/PTC/Ptc.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs b/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs
index 19cc009c..73828140 100644
--- a/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs
+++ b/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs
@@ -81,7 +81,7 @@ namespace ARMeilleure.CodeGen.Optimizations
case Instruction.ConvertI64ToI32:
if (type == OperandType.I32)
{
- EvaluateUnaryI64(operation, (x) => (int)x);
+ EvaluateUnaryI32(operation, (x) => x);
}
break;
diff --git a/ARMeilleure/Translation/PTC/Ptc.cs b/ARMeilleure/Translation/PTC/Ptc.cs
index 30a405e4..b538e948 100644
--- a/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/ARMeilleure/Translation/PTC/Ptc.cs
@@ -20,7 +20,7 @@ namespace ARMeilleure.Translation.PTC
{
private const string HeaderMagic = "PTChd";
- private const int InternalVersion = 6; //! To be incremented manually for each change to the ARMeilleure project.
+ private const int InternalVersion = 7; //! To be incremented manually for each change to the ARMeilleure project.
private const string BaseDir = "Ryujinx";