From b5127131c558ac6613e4e61df3da96031a8fa155 Mon Sep 17 00:00:00 2001 From: Ficture Seven Date: Mon, 13 Jul 2020 13:10:33 +0400 Subject: [PATCH] Fix folding of ConvertI64ToI32 imm64 (#1383) * Fix folding of ConvertI64ToI32 imm64 * Increment PTC internal version * Clean up --- ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs | 2 +- ARMeilleure/Translation/PTC/Ptc.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs b/ARMeilleure/CodeGen/Optimizations/ConstantFolding.cs index 19cc009c7c..73828140eb 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 30a405e474..b538e9480a 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";