From b97ff4da5eb67b68400fa1c187524f53407dbb71 Mon Sep 17 00:00:00 2001 From: merry Date: Sat, 5 Mar 2022 18:23:10 +0000 Subject: A32: Fix ALU immediate instructions (#3179) * Tests: Add A32 tests for immediate ADC/ADCS/RSC/RSCS/SBC/SBCS * A32: Fix bug in ADC/ADCS/RSC/RSCS/SBC/SBCS * CpuTestAluImm32: Add more opcodes * Increment PTC version --- ARMeilleure/Instructions/InstEmitAluHelper.cs | 2 +- ARMeilleure/Translation/PTC/Ptc.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ARMeilleure') diff --git a/ARMeilleure/Instructions/InstEmitAluHelper.cs b/ARMeilleure/Instructions/InstEmitAluHelper.cs index 67d9e915..a487895b 100644 --- a/ARMeilleure/Instructions/InstEmitAluHelper.cs +++ b/ARMeilleure/Instructions/InstEmitAluHelper.cs @@ -197,7 +197,7 @@ namespace ARMeilleure.Instructions // ARM32. case IOpCode32AluImm op: { - if (ShouldSetFlags(context) && op.IsRotated) + if (ShouldSetFlags(context) && op.IsRotated && setCarry) { SetFlag(context, PState.CFlag, Const((uint)op.Immediate >> 31)); } diff --git a/ARMeilleure/Translation/PTC/Ptc.cs b/ARMeilleure/Translation/PTC/Ptc.cs index e46722b9..0431bea4 100644 --- a/ARMeilleure/Translation/PTC/Ptc.cs +++ b/ARMeilleure/Translation/PTC/Ptc.cs @@ -27,7 +27,7 @@ namespace ARMeilleure.Translation.PTC private const string OuterHeaderMagicString = "PTCohd\0\0"; private const string InnerHeaderMagicString = "PTCihd\0\0"; - private const uint InternalVersion = 3138; //! To be incremented manually for each change to the ARMeilleure project. + private const uint InternalVersion = 3179; //! To be incremented manually for each change to the ARMeilleure project. private const string ActualDir = "0"; private const string BackupDir = "1"; -- cgit v1.2.3