mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update CpuTest.cs

Browse source
This commit is contained in:
LDj3SNuD 2018-09-12 01:40:32 +02:00 • committed by GitHub
commit 0d1b309843
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Ryujinx.Tests/Cpu/CpuTest.cs
View file

@ -93,6 +93,7 @@ namespace Ryujinx.Tests.Cpu
Vector128<float> V0 = default(Vector128<float>), Vector128<float> V0 = default(Vector128<float>),
Vector128<float> V1 = default(Vector128<float>), Vector128<float> V1 = default(Vector128<float>),
Vector128<float> V2 = default(Vector128<float>), Vector128<float> V2 = default(Vector128<float>),
Vector128<float> V3 = default(Vector128<float>),
bool Overflow = false, bool Carry = false, bool Zero = false, bool Negative = false, bool Overflow = false, bool Carry = false, bool Zero = false, bool Negative = false,
int Fpcr = 0x0, int Fpsr = 0x0) int Fpcr = 0x0, int Fpsr = 0x0)
{ {
@ -106,6 +107,7 @@ namespace Ryujinx.Tests.Cpu
Thread.ThreadState.V0 = V0; Thread.ThreadState.V0 = V0;
Thread.ThreadState.V1 = V1; Thread.ThreadState.V1 = V1;
Thread.ThreadState.V2 = V2; Thread.ThreadState.V2 = V2;
Thread.ThreadState.V3 = V3;
Thread.ThreadState.Overflow = Overflow; Thread.ThreadState.Overflow = Overflow;
Thread.ThreadState.Carry = Carry; Thread.ThreadState.Carry = Carry;
@ -127,6 +129,7 @@ namespace Ryujinx.Tests.Cpu
UnicornEmu.Q[0] = V0; UnicornEmu.Q[0] = V0;
UnicornEmu.Q[1] = V1; UnicornEmu.Q[1] = V1;
UnicornEmu.Q[2] = V2; UnicornEmu.Q[2] = V2;
UnicornEmu.Q[3] = V3;
UnicornEmu.OverflowFlag = Overflow; UnicornEmu.OverflowFlag = Overflow;
UnicornEmu.CarryFlag = Carry; UnicornEmu.CarryFlag = Carry;
@ -162,13 +165,14 @@ namespace Ryujinx.Tests.Cpu
Vector128<float> V0 = default(Vector128<float>), Vector128<float> V0 = default(Vector128<float>),
Vector128<float> V1 = default(Vector128<float>), Vector128<float> V1 = default(Vector128<float>),
Vector128<float> V2 = default(Vector128<float>), Vector128<float> V2 = default(Vector128<float>),
Vector128<float> V3 = default(Vector128<float>),
bool Overflow = false, bool Carry = false, bool Zero = false, bool Negative = false, bool Overflow = false, bool Carry = false, bool Zero = false, bool Negative = false,
int Fpcr = 0x0, int Fpsr = 0x0) int Fpcr = 0x0, int Fpsr = 0x0)
{ {
this.Opcode(Opcode); this.Opcode(Opcode);
this.Opcode(0xD4200000); // BRK #0 this.Opcode(0xD4200000); // BRK #0
this.Opcode(0xD65F03C0); // RET this.Opcode(0xD65F03C0); // RET
SetThreadState(X0, X1, X2, X3, X31, V0, V1, V2, Overflow, Carry, Zero, Negative, Fpcr, Fpsr); SetThreadState(X0, X1, X2, X3, X31, V0, V1, V2, V3, Overflow, Carry, Zero, Negative, Fpcr, Fpsr);
ExecuteOpcodes(); ExecuteOpcodes();
return GetThreadState(); return GetThreadState();
@ -195,13 +199,25 @@ namespace Ryujinx.Tests.Cpu
QC = 1 << 27 QC = 1 << 27
} }
protected void CompareAgainstUnicorn(FPSR FpsrMask = FPSR.None) protected enum FpSkips { None, IfNaN_S, IfNaN_D };
protected void CompareAgainstUnicorn(FPSR FpsrMask = FPSR.None, FpSkips FpSkips = FpSkips.None)
{ {
if (!UnicornAvailable) if (!UnicornAvailable)
{ {
return; return;
} }
if (FpSkips == FpSkips.IfNaN_S && float.IsNaN(VectorExtractSingle(UnicornEmu.Q[0], (byte)0)))
{
Assert.Ignore("NaN test.");
}
if (FpSkips == FpSkips.IfNaN_D && double.IsNaN(VectorExtractDouble(UnicornEmu.Q[0], (byte)0)))
{
Assert.Ignore("NaN test.");
}
Assert.That(Thread.ThreadState.X0, Is.EqualTo(UnicornEmu.X[0])); Assert.That(Thread.ThreadState.X0, Is.EqualTo(UnicornEmu.X[0]));
Assert.That(Thread.ThreadState.X1, Is.EqualTo(UnicornEmu.X[1])); Assert.That(Thread.ThreadState.X1, Is.EqualTo(UnicornEmu.X[1]));
Assert.That(Thread.ThreadState.X2, Is.EqualTo(UnicornEmu.X[2])); Assert.That(Thread.ThreadState.X2, Is.EqualTo(UnicornEmu.X[2]));
@ -310,6 +326,18 @@ namespace Ryujinx.Tests.Cpu
return Sse.StaticCast<long, float>(Sse2.SetVector128(BitConverter.DoubleToInt64Bits(E1), 0)); return Sse.StaticCast<long, float>(Sse2.SetVector128(BitConverter.DoubleToInt64Bits(E1), 0));
} }
protected static float VectorExtractSingle(Vector128<float> Vector, byte Index)
{
if (!Sse41.IsSupported)
{
throw new PlatformNotSupportedException();
}
int Value = Sse41.Extract(Sse.StaticCast<float, int>(Vector), Index);
return BitConverter.Int32BitsToSingle(Value);
}
protected static double VectorExtractDouble(Vector128<float> Vector, byte Index) protected static double VectorExtractDouble(Vector128<float> Vector, byte Index)
{ {
if (!Sse41.IsSupported) if (!Sse41.IsSupported)