mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-23 03:25:46 +00:00
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
This commit is contained in:
parent
747081d2c7
commit
b97ff4da5e
3 changed files with 59 additions and 2 deletions
|
@ -197,7 +197,7 @@ namespace ARMeilleure.Instructions
|
||||||
// ARM32.
|
// ARM32.
|
||||||
case IOpCode32AluImm op:
|
case IOpCode32AluImm op:
|
||||||
{
|
{
|
||||||
if (ShouldSetFlags(context) && op.IsRotated)
|
if (ShouldSetFlags(context) && op.IsRotated && setCarry)
|
||||||
{
|
{
|
||||||
SetFlag(context, PState.CFlag, Const((uint)op.Immediate >> 31));
|
SetFlag(context, PState.CFlag, Const((uint)op.Immediate >> 31));
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ namespace ARMeilleure.Translation.PTC
|
||||||
private const string OuterHeaderMagicString = "PTCohd\0\0";
|
private const string OuterHeaderMagicString = "PTCohd\0\0";
|
||||||
private const string InnerHeaderMagicString = "PTCihd\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 ActualDir = "0";
|
||||||
private const string BackupDir = "1";
|
private const string BackupDir = "1";
|
||||||
|
|
57
Ryujinx.Tests/Cpu/CpuTestAluImm32.cs
Normal file
57
Ryujinx.Tests/Cpu/CpuTestAluImm32.cs
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
#define AluRs32
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.Tests.Cpu
|
||||||
|
{
|
||||||
|
[Category("AluImm32")]
|
||||||
|
public sealed class CpuTestAluImm32 : CpuTest32
|
||||||
|
{
|
||||||
|
#if AluRs32
|
||||||
|
|
||||||
|
#region "ValueSource (Opcodes)"
|
||||||
|
private static uint[] _opcodes()
|
||||||
|
{
|
||||||
|
return new uint[]
|
||||||
|
{
|
||||||
|
0xe2a00000u, // ADC R0, R0, #0
|
||||||
|
0xe2b00000u, // ADCS R0, R0, #0
|
||||||
|
0xe2800000u, // ADD R0, R0, #0
|
||||||
|
0xe2900000u, // ADDS R0, R0, #0
|
||||||
|
0xe3c00000u, // BIC R0, R0, #0
|
||||||
|
0xe3d00000u, // BICS R0, R0, #0
|
||||||
|
0xe2600000u, // RSB R0, R0, #0
|
||||||
|
0xe2700000u, // RSBS R0, R0, #0
|
||||||
|
0xe2e00000u, // RSC R0, R0, #0
|
||||||
|
0xe2f00000u, // RSCS R0, R0, #0
|
||||||
|
0xe2c00000u, // SBC R0, R0, #0
|
||||||
|
0xe2d00000u, // SBCS R0, R0, #0
|
||||||
|
0xe2400000u, // SUB R0, R0, #0
|
||||||
|
0xe2500000u, // SUBS R0, R0, #0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private const int RndCnt = 2;
|
||||||
|
private const int RndCntAmount = 2;
|
||||||
|
|
||||||
|
[Test, Pairwise]
|
||||||
|
public void TestCpuTestAluImm32([ValueSource("_opcodes")] uint opcode,
|
||||||
|
[Values(0u, 13u)] uint rd,
|
||||||
|
[Values(1u, 13u)] uint rn,
|
||||||
|
[Random(RndCnt)] uint imm,
|
||||||
|
[Random(RndCnt)] uint wn,
|
||||||
|
[Values(true, false)] bool carryIn)
|
||||||
|
{
|
||||||
|
opcode |= ((imm & 0xfff) << 0) | ((rn & 15) << 16) | ((rd & 15) << 12);
|
||||||
|
|
||||||
|
uint sp = TestContext.CurrentContext.Random.NextUInt();
|
||||||
|
|
||||||
|
SingleOpcode(opcode, r1: wn, sp: sp, carry: carryIn);
|
||||||
|
|
||||||
|
CompareAgainstUnicorn();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue