diff --git a/ChocolArm64/AOpCodeTable.cs b/ChocolArm64/AOpCodeTable.cs index e4ecb0cdb1..ea16ec0084 100644 --- a/ChocolArm64/AOpCodeTable.cs +++ b/ChocolArm64/AOpCodeTable.cs @@ -208,9 +208,15 @@ namespace ChocolArm64 Set("000111110x1xxxxx1xxxxxxxxxxxxxxx", AInstEmit.Fnmsub_S, typeof(AOpCodeSimdReg)); Set("000111100x1xxxxx100010xxxxxxxxxx", AInstEmit.Fnmul_S, typeof(AOpCodeSimdReg)); Set("000111100x100110010000xxxxxxxxxx", AInstEmit.Frinta_S, typeof(AOpCodeSimd)); + Set("0>1011100<100001100010xxxxxxxxxx", AInstEmit.Frinta_V, typeof(AOpCodeSimd)); + Set("000111100x100111110000xxxxxxxxxx", AInstEmit.Frinti_S, typeof(AOpCodeSimd)); + Set("0>1011101<100001100110xxxxxxxxxx", AInstEmit.Frinti_V, typeof(AOpCodeSimd)); Set("000111100x100101010000xxxxxxxxxx", AInstEmit.Frintm_S, typeof(AOpCodeSimd)); Set("0>0011100<100001100110xxxxxxxxxx", AInstEmit.Frintm_V, typeof(AOpCodeSimd)); + Set("000111100x100100010000xxxxxxxxxx", AInstEmit.Frintn_S, typeof(AOpCodeSimd)); + Set("0>0011100<100001100010xxxxxxxxxx", AInstEmit.Frintn_V, typeof(AOpCodeSimd)); Set("000111100x100100110000xxxxxxxxxx", AInstEmit.Frintp_S, typeof(AOpCodeSimd)); + Set("0>0011101<100001100010xxxxxxxxxx", AInstEmit.Frintp_V, typeof(AOpCodeSimd)); Set("000111100x100111010000xxxxxxxxxx", AInstEmit.Frintx_S, typeof(AOpCodeSimd)); Set("0>1011100<100001100110xxxxxxxxxx", AInstEmit.Frintx_V, typeof(AOpCodeSimd)); Set("000111100x100001110000xxxxxxxxxx", AInstEmit.Fsqrt_S, typeof(AOpCodeSimd)); diff --git a/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs b/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs index 3d9633eca1..3035e35d26 100644 --- a/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs +++ b/ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs @@ -248,6 +248,55 @@ namespace ChocolArm64.Instruction EmitScalarSetF(Context, Op.Rd, SizeF); } + public static void Frinti_S(AILEmitterCtx Context) + { + AOpCodeSimd Op = (AOpCodeSimd)Context.CurrOp; + + EmitScalarUnaryOpF(Context, () => + { + Context.EmitLdarg(ATranslatedSub.StateArgIdx); + + Context.EmitCallPropGet(typeof(AThreadState), nameof(AThreadState.Fpcr)); + + if (Op.Size == 0) + { + ASoftFallback.EmitCall(Context, nameof(ASoftFallback.RoundF)); + } + else if (Op.Size == 1) + { + ASoftFallback.EmitCall(Context, nameof(ASoftFallback.Round)); + } + else + { + throw new InvalidOperationException(); + } + }); + } + + public static void Frinti_V(AILEmitterCtx Context) + { + AOpCodeSimd Op = (AOpCodeSimd)Context.CurrOp; + EmitVectorUnaryOpF(Context, () => + { + Context.EmitLdarg(ATranslatedSub.StateArgIdx); + + Context.EmitCallPropGet(typeof(AThreadState), nameof(AThreadState.Fpcr)); + + if (Op.Size == 2) + { + ASoftFallback.EmitCall(Context, nameof(ASoftFallback.RoundF)); + } + else if (Op.Size == 3) + { + ASoftFallback.EmitCall(Context, nameof(ASoftFallback.Round)); + } + else + { + throw new InvalidOperationException(); + } + }); + } + public static void Frinta_S(AILEmitterCtx Context) { AOpCodeSimd Op = (AOpCodeSimd)Context.CurrOp; @@ -259,6 +308,14 @@ namespace ChocolArm64.Instruction EmitScalarSetF(Context, Op.Rd, Op.Size); } + public static void Frinta_V(AILEmitterCtx Context) + { + EmitVectorUnaryOpF(Context, () => + { + EmitRoundMathCall(Context, MidpointRounding.AwayFromZero); + }); + } + public static void Frintm_S(AILEmitterCtx Context) { EmitScalarUnaryOpF(Context, () => @@ -275,6 +332,25 @@ namespace ChocolArm64.Instruction }); } + public static void Frintn_S(AILEmitterCtx Context) + { + AOpCodeSimd Op = (AOpCodeSimd)Context.CurrOp; + + EmitVectorExtractF(Context, Op.Rn, 0, Op.Size); + + EmitRoundMathCall(Context, MidpointRounding.ToEven); + + EmitScalarSetF(Context, Op.Rd, Op.Size); + } + + public static void Frintn_V(AILEmitterCtx Context) + { + EmitVectorUnaryOpF(Context, () => + { + EmitRoundMathCall(Context, MidpointRounding.ToEven); + }); + } + public static void Frintp_S(AILEmitterCtx Context) { EmitScalarUnaryOpF(Context, () => @@ -283,6 +359,14 @@ namespace ChocolArm64.Instruction }); } + public static void Frintp_V(AILEmitterCtx Context) + { + EmitVectorUnaryOpF(Context, () => + { + EmitUnaryMathCall(Context, nameof(Math.Ceiling)); + }); + } + public static void Frintx_S(AILEmitterCtx Context) { AOpCodeSimd Op = (AOpCodeSimd)Context.CurrOp; diff --git a/Ryujinx.Tests/Cpu/CpuTestSimdArithmetic.cs b/Ryujinx.Tests/Cpu/CpuTestSimdArithmetic.cs index 522e01fd7f..ed7082bd68 100644 --- a/Ryujinx.Tests/Cpu/CpuTestSimdArithmetic.cs +++ b/Ryujinx.Tests/Cpu/CpuTestSimdArithmetic.cs @@ -58,8 +58,504 @@ namespace Ryujinx.Tests.Cpu Assert.AreEqual(Result1, ThreadState.V0.X1); }); } + + [TestCase(0x3FE66666u, false, 0x40000000u)] + [TestCase(0x3F99999Au, false, 0x3F800000u)] + [TestCase(0x404CCCCDu, false, 0x40400000u)] + [TestCase(0x40733333u, false, 0x40800000u)] + [TestCase(0x3fc00000u, false, 0x40000000u)] + [TestCase(0x40200000u, false, 0x40400000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + /*[TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)]*/ + public void Frinta_S(uint A, bool DefaultNaN, uint Result) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A }; + AThreadState ThreadState = SingleOpcode(0x1E264020, V1: V1, Fpcr: FpcrTemp); + Assert.AreEqual(Result, ThreadState.V0.X0); + } - /*[TestCase(0x3FE66666u, 'N', false, 0x40000000u)] + //2D + [TestCase(0x6E618820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x6E618820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x6E618820u, 0x3FF8000000000000ul, 0x3FF8000000000000ul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + + //4S + [TestCase(0x6E219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f80000040000000ul, 0x3f80000040000000ul)] + [TestCase(0x6E219820u, 0x3fc000003fc00000ul, 0x3fc000003fc00000ul, false, 0x4000000040000000ul, 0x4000000040000000ul)] + + //2S + [TestCase(0x2E219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f80000040000000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x3fc000003fc00000ul, 0x3fc000003fc00000ul, false, 0x4000000040000000ul, 0x0000000000000000ul)] + + //2S +/-0 + [TestCase(0x2E218820u, 0x0000000080000000ul, 0x0000000000000000ul, false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0x2E218820u, 0x7F800000FF800000ul, 0x0000000000000000ul, false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0x2E218820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2E218820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + public void Frinta_V(uint Opcode, ulong A, ulong B, bool DefaultNaN, ulong Result0, ulong Result1) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A, X1 = B }; + AThreadState ThreadState = SingleOpcode(Opcode, V1: V1, Fpcr: FpcrTemp); + Assert.Multiple(() => + { + Assert.AreEqual(Result0, ThreadState.V0.X0); + Assert.AreEqual(Result1, ThreadState.V0.X1); + }); + } + + [TestCase(0x3FE66666u, 'N', false, 0x40000000u)] + [TestCase(0x3F99999Au, 'N', false, 0x3F800000u)] + [TestCase(0x404CCCCDu, 'P', false, 0x40800000u)] + [TestCase(0x40733333u, 'P', false, 0x40800000u)] + [TestCase(0x404CCCCDu, 'M', false, 0x40400000u)] + [TestCase(0x40733333u, 'M', false, 0x40400000u)] + [TestCase(0x3F99999Au, 'Z', false, 0x3F800000u)] + [TestCase(0x3FE66666u, 'Z', false, 0x3F800000u)] + [TestCase(0x00000000u, 'N', false, 0x00000000u)] + [TestCase(0x00000000u, 'P', false, 0x00000000u)] + [TestCase(0x00000000u, 'M', false, 0x00000000u)] + [TestCase(0x00000000u, 'Z', false, 0x00000000u)] + [TestCase(0x80000000u, 'N', false, 0x80000000u)] + [TestCase(0x80000000u, 'P', false, 0x80000000u)] + [TestCase(0x80000000u, 'M', false, 0x80000000u)] + [TestCase(0x80000000u, 'Z', false, 0x80000000u)] + [TestCase(0x7F800000u, 'N', false, 0x7F800000u)] + [TestCase(0x7F800000u, 'P', false, 0x7F800000u)] + [TestCase(0x7F800000u, 'M', false, 0x7F800000u)] + [TestCase(0x7F800000u, 'Z', false, 0x7F800000u)] + [TestCase(0xFF800000u, 'N', false, 0xFF800000u)] + [TestCase(0xFF800000u, 'P', false, 0xFF800000u)] + [TestCase(0xFF800000u, 'M', false, 0xFF800000u)] + [TestCase(0xFF800000u, 'Z', false, 0xFF800000u)] + /*[TestCase(0xFF800001u, 'N', false, 0xFFC00001u)] + [TestCase(0xFF800001u, 'P', false, 0xFFC00001u)] + [TestCase(0xFF800001u, 'M', false, 0xFFC00001u)] + [TestCase(0xFF800001u, 'Z', false, 0xFFC00001u)] + [TestCase(0xFF800001u, 'N', true, 0x7FC00000u)] + [TestCase(0xFF800001u, 'P', true, 0x7FC00000u)] + [TestCase(0xFF800001u, 'M', true, 0x7FC00000u)] + [TestCase(0xFF800001u, 'Z', true, 0x7FC00000u)] + [TestCase(0x7FC00002u, 'N', false, 0x7FC00002u)] + [TestCase(0x7FC00002u, 'P', false, 0x7FC00002u)] + [TestCase(0x7FC00002u, 'M', false, 0x7FC00002u)] + [TestCase(0x7FC00002u, 'Z', false, 0x7FC00002u)] + [TestCase(0x7FC00002u, 'N', true, 0x7FC00000u)] + [TestCase(0x7FC00002u, 'P', true, 0x7FC00000u)] + [TestCase(0x7FC00002u, 'M', true, 0x7FC00000u)] + [TestCase(0x7FC00002u, 'Z', true, 0x7FC00000u)]*/ + public void Frinti_S(uint A, char RoundType, bool DefaultNaN, uint Result) + { + int FpcrTemp = 0x0; + switch(RoundType) + { + case 'N': + FpcrTemp = 0x0; + break; + + case 'P': + FpcrTemp = 0x400000; + break; + + case 'M': + FpcrTemp = 0x800000; + break; + + case 'Z': + FpcrTemp = 0xC00000; + break; + } + if(DefaultNaN) + { + FpcrTemp |= 1 << 25; + } + AVec V1 = new AVec { X0 = A }; + AThreadState ThreadState = SingleOpcode(0x1E27C020, V1: V1, Fpcr: FpcrTemp); + Assert.AreEqual(Result, ThreadState.V0.X0); + } + + //2D + [TestCase(0x6EE19820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, 'N', false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x6EE19820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, 'N', false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x6EE19820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, 'P', false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x6EE19820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, 'P', false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x6EE19820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, 'M', false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x6EE19820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, 'M', false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x6EE19820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, 'Z', false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x6EE19820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, 'Z', false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + + //4S + [TestCase(0x6EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'N', false, 0x3f80000040000000ul, 0x3f80000040000000ul)] + [TestCase(0x6EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'P', false, 0x4000000040000000ul, 0x4000000040000000ul)] + [TestCase(0x6EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'M', false, 0x3f8000003f800000ul, 0x3f8000003f800000ul)] + [TestCase(0x6EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'Z', false, 0x3f8000003f800000ul, 0x3f8000003f800000ul)] + + //2S + [TestCase(0x2EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'N', false, 0x3f80000040000000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'P', false, 0x4000000040000000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'M', false, 0x3f8000003f800000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'Z', false, 0x3f8000003f800000ul, 0x0000000000000000ul)] + + //2S +/-0 + [TestCase(0x2EA19820u, 0x0000000080000000ul, 0x0000000000000000ul, 'N', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x0000000080000000ul, 0x0000000000000000ul, 'P', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x0000000080000000ul, 0x0000000000000000ul, 'M', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x0000000080000000ul, 0x0000000000000000ul, 'Z', false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0x2EA19820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'N', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'P', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'M', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'Z', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'N', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'P', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'M', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'Z', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'N', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'P', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'M', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2EA19820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'Z', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + + + public void Frinti_V(uint Opcode, ulong A, ulong B, char RoundType, bool DefaultNaN, ulong Result0, ulong Result1) + { + int FpcrTemp = 0x0; + switch(RoundType) + { + case 'N': + FpcrTemp = 0x0; + break; + + case 'P': + FpcrTemp = 0x400000; + break; + + case 'M': + FpcrTemp = 0x800000; + break; + + case 'Z': + FpcrTemp = 0xC00000; + break; + } + if(DefaultNaN) + { + FpcrTemp |= 1 << 25; + } + AVec V1 = new AVec { X0 = A, X1 = B }; + AThreadState ThreadState = SingleOpcode(Opcode, V1: V1, Fpcr: FpcrTemp); + Assert.Multiple(() => + { + Assert.AreEqual(Result0, ThreadState.V0.X0); + Assert.AreEqual(Result1, ThreadState.V0.X1); + }); + } + + [TestCase(0x3FE66666u, false, 0x3F800000u)] + [TestCase(0x3F99999Au, false, 0x3F800000u)] + [TestCase(0x404CCCCDu, false, 0x40400000u)] + [TestCase(0x40733333u, false, 0x40400000u)] + [TestCase(0x3fc00000u, false, 0x3F800000u)] + [TestCase(0x40200000u, false, 0x40000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + /*[TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)]*/ + public void Frintm_S(uint A, bool DefaultNaN, uint Result) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A }; + AThreadState ThreadState = SingleOpcode(0x1E254020, V1: V1, Fpcr: FpcrTemp); + Assert.AreEqual(Result, ThreadState.V0.X0); + } + + //2D + [TestCase(0x4E619820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x4E619820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + + //4S + [TestCase(0x4E219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f8000003f800000ul, 0x3f8000003f800000ul)] + + //2S + [TestCase(0xE219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f8000003f800000ul, 0x0000000000000000ul)] + + //2S +/-0 + [TestCase(0xE219820u, 0x0000000080000000ul, 0x0000000000000000ul, false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0xE219820u, 0x7F800000FF800000ul, 0x0000000000000000ul, false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0xE219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0xE219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + public void Frintm_V(uint Opcode, ulong A, ulong B, bool DefaultNaN, ulong Result0, ulong Result1) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A, X1 = B }; + AThreadState ThreadState = SingleOpcode(Opcode, V1: V1, Fpcr: FpcrTemp); + Assert.Multiple(() => + { + Assert.AreEqual(Result0, ThreadState.V0.X0); + Assert.AreEqual(Result1, ThreadState.V0.X1); + }); + } + + [TestCase(0x3FE66666u, false, 0x40000000u)] + [TestCase(0x3F99999Au, false, 0x3F800000u)] + [TestCase(0x404CCCCDu, false, 0x40400000u)] + [TestCase(0x40733333u, false, 0x40800000u)] + [TestCase(0x3fc00000u, false, 0x40000000u)] + [TestCase(0x40200000u, false, 0x40400000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + /*[TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)]*/ + public void Frintn_S(uint A, bool DefaultNaN, uint Result) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A }; + AThreadState ThreadState = SingleOpcode(0x1E264020, V1: V1, Fpcr: FpcrTemp); + Assert.AreEqual(Result, ThreadState.V0.X0); + } + + //2D + [TestCase(0x4E618820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, false, 0x3FF0000000000000ul, 0x3FF0000000000000ul)] + [TestCase(0x4E618820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x4E618820u, 0x3FF8000000000000ul, 0x3FF8000000000000ul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + + //4S + [TestCase(0x4E218820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f80000040000000ul, 0x3f80000040000000ul)] + [TestCase(0x4E218820u, 0x3fc000003fc00000ul, 0x3fc000003fc00000ul, false, 0x4000000040000000ul, 0x4000000040000000ul)] + + //2S + [TestCase(0xE218820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x3f80000040000000ul, 0x0000000000000000ul)] + [TestCase(0xE218820u, 0x3fc000003fc00000ul, 0x3fc000003fc00000ul, false, 0x4000000040000000ul, 0x0000000000000000ul)] + + //2S +/-0 + [TestCase(0xE218820u, 0x0000000080000000ul, 0x0000000000000000ul, false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0xE218820u, 0x7F800000FF800000ul, 0x0000000000000000ul, false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0xE218820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0xE218820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + public void Frintn_V(uint Opcode, ulong A, ulong B, bool DefaultNaN, ulong Result0, ulong Result1) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A, X1 = B }; + AThreadState ThreadState = SingleOpcode(Opcode, V1: V1, Fpcr: FpcrTemp); + Assert.Multiple(() => + { + Assert.AreEqual(Result0, ThreadState.V0.X0); + Assert.AreEqual(Result1, ThreadState.V0.X1); + }); + } + + [TestCase(0x3FE66666u, false, 0x40000000u)] + [TestCase(0x3F99999Au, false, 0x40000000u)] + [TestCase(0x404CCCCDu, false, 0x40800000u)] + [TestCase(0x40733333u, false, 0x40800000u)] + [TestCase(0x3fc00000u, false, 0x40000000u)] + [TestCase(0x40200000u, false, 0x40400000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x00000000u, false, 0x00000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x80000000u, false, 0x80000000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0x7F800000u, false, 0x7F800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + [TestCase(0xFF800000u, false, 0xFF800000u)] + /*[TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, false, 0xFFC00001u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0xFF800001u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, false, 0x7FC00002u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)] + [TestCase(0x7FC00002u, true, 0x7FC00000u)]*/ + public void Frintp_S(uint A, bool DefaultNaN, uint Result) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A }; + AThreadState ThreadState = SingleOpcode(0x1E24C020, V1: V1, Fpcr: FpcrTemp); + Assert.AreEqual(Result, ThreadState.V0.X0); + } + + //2D + [TestCase(0x4EE18820u, 0x3FF3333333333333ul, 0x3FF3333333333333ul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + [TestCase(0x4EE18820u, 0x3FFCCCCCCCCCCCCDul, 0x3FFCCCCCCCCCCCCDul, false, 0x4000000000000000ul, 0x4000000000000000ul)] + + //4S + [TestCase(0x4EA18820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x4000000040000000ul, 0x4000000040000000ul)] + + //2S + [TestCase(0xEA18820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, false, 0x4000000040000000ul, 0x0000000000000000ul)] + + //2S +/-0 + [TestCase(0xEA18820u, 0x0000000080000000ul, 0x0000000000000000ul, false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0xEA18820u, 0x7F800000FF800000ul, 0x0000000000000000ul, false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0xEA18820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0xEA18820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + public void Frintp_V(uint Opcode, ulong A, ulong B, bool DefaultNaN, ulong Result0, ulong Result1) + { + int FpcrTemp = 0x0; + if(DefaultNaN) + { + FpcrTemp = 0x2000000; + } + AVec V1 = new AVec { X0 = A, X1 = B }; + AThreadState ThreadState = SingleOpcode(Opcode, V1: V1, Fpcr: FpcrTemp); + Assert.Multiple(() => + { + Assert.AreEqual(Result0, ThreadState.V0.X0); + Assert.AreEqual(Result1, ThreadState.V0.X1); + }); + } + + [TestCase(0x3FE66666u, 'N', false, 0x40000000u)] [TestCase(0x3F99999Au, 'N', false, 0x3F800000u)] [TestCase(0x404CCCCDu, 'P', false, 0x40800000u)] [TestCase(0x40733333u, 'P', false, 0x40800000u)] @@ -83,7 +579,7 @@ namespace Ryujinx.Tests.Cpu [TestCase(0xFF800000u, 'P', false, 0xFF800000u)] [TestCase(0xFF800000u, 'M', false, 0xFF800000u)] [TestCase(0xFF800000u, 'Z', false, 0xFF800000u)] - [TestCase(0xFF800001u, 'N', false, 0xFFC00001u)] + /*[TestCase(0xFF800001u, 'N', false, 0xFFC00001u)] [TestCase(0xFF800001u, 'P', false, 0xFFC00001u)] [TestCase(0xFF800001u, 'M', false, 0xFFC00001u)] [TestCase(0xFF800001u, 'Z', false, 0xFFC00001u)] @@ -98,7 +594,7 @@ namespace Ryujinx.Tests.Cpu [TestCase(0x7FC00002u, 'N', true, 0x7FC00000u)] [TestCase(0x7FC00002u, 'P', true, 0x7FC00000u)] [TestCase(0x7FC00002u, 'M', true, 0x7FC00000u)] - [TestCase(0x7FC00002u, 'Z', true, 0x7FC00000u)] + [TestCase(0x7FC00002u, 'Z', true, 0x7FC00000u)]*/ public void Frintx_S(uint A, char RoundType, bool DefaultNaN, uint Result) { int FpcrTemp = 0x0; @@ -127,7 +623,7 @@ namespace Ryujinx.Tests.Cpu AVec V1 = new AVec { X0 = A }; AThreadState ThreadState = SingleOpcode(0x1E274020, V1: V1, Fpcr: FpcrTemp); Assert.AreEqual(Result, ThreadState.V0.X0); - }*/ + } //2D @@ -152,6 +648,30 @@ namespace Ryujinx.Tests.Cpu [TestCase(0x2E219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'M', false, 0x3f8000003f800000ul, 0x0000000000000000ul)] [TestCase(0x2E219820u, 0x3f99999a3fe66666ul, 0x3f99999a3fe66666ul, 'Z', false, 0x3f8000003f800000ul, 0x0000000000000000ul)] + //2S +/-0 + [TestCase(0x2E219820u, 0x0000000080000000ul, 0x0000000000000000ul, 'N', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x0000000080000000ul, 0x0000000000000000ul, 'P', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x0000000080000000ul, 0x0000000000000000ul, 'M', false, 0x0000000080000000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x0000000080000000ul, 0x0000000000000000ul, 'Z', false, 0x0000000080000000ul, 0x0000000000000000ul)] + + //2S +/-Inf + [TestCase(0x2E219820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'N', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'P', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'M', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0x7F800000FF800000ul, 0x0000000000000000ul, 'Z', false, 0x7F800000FF800000ul, 0x0000000000000000ul)] + + //2S Q/SNaN + /*[TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'N', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'P', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'M', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'Z', false, 0xFFC000017FC00002ul, 0x0000000000000000ul)] + + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'N', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'P', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'M', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)] + [TestCase(0x2E219820u, 0xFF8000017FC00002ul, 0x0000000000000000ul, 'Z', true, 0x7FC000007FC00000ul, 0x0000000000000000ul)]*/ + + public void Frintx_V(uint Opcode, ulong A, ulong B, char RoundType, bool DefaultNaN, ulong Result0, ulong Result1) { int FpcrTemp = 0x0;