Skip to content

Commit 04eca6a

Browse files
committed
Tests code fix
1 parent 79189d9 commit 04eca6a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

SnesEmulator/MainWindow.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public MainWindow()
7070
});
7171
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 24);
7272
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 26);
73-
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.AND, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0);
73+
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0);
7474
snes.Encoder.WriteCallbackInvoke(romBin, ref writeOffset, (i) =>
7575
{
7676
Debug.Assert(snes.CPU.ACC == 24 + 26);

SnesEmulator/SnesEmulator.Tests/CPUInstructionsTests.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void BasicTestInterpreter()
4040
});
4141
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 24);
4242
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 26);
43-
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.AND, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0);
43+
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0);
4444
snes.Encoder.WriteCallbackInvoke(romBin, ref writeOffset, (i) =>
4545
{
4646
Assert.AreEqual(24 + 26, snes.CPU.ACC);
@@ -72,6 +72,10 @@ public void TestADCDecimal()
7272
InitTestContext(out snes, out romBin, out writeOffset);
7373

7474
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.SED);
75+
snes.Encoder.WriteCallbackInvoke(romBin, ref writeOffset, (i) =>
76+
{
77+
Assert.AreEqual(true, snes.CPU.DecimalFlag);
78+
});
7579
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.LDA, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0);
7680
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.CLC);
7781
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.ADC, AddressingModes.ImmediateMemoryFlag, ArgumentType.I1, 0x02);
@@ -85,6 +89,10 @@ public void TestADCDecimal()
8589
Assert.AreEqual(15, snes.CPU.ACC);
8690
});
8791
snes.Encoder.Write(romBin, ref writeOffset, OpCodes.CLD);
92+
snes.Encoder.WriteCallbackInvoke(romBin, ref writeOffset, (i) =>
93+
{
94+
Assert.AreEqual(false, snes.CPU.DecimalFlag);
95+
});
8896

8997
snes.Interpreter.Interpret(romBin, 0, false);
9098
}

0 commit comments

Comments
 (0)