6502/EightBitNet
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBitNet.git synced 2024-09-25 17:54:48 +00:00
Code Issues Projects Releases Wiki Activity

Sort out hex formatting in Harte test

Browse Source
This commit is contained in:
Adrian Conlon 2024-05-21 21:38:10 +01:00
parent 1e15b090f6
commit bd1f7c285b
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
M6502/M6502.HarteTest/Checker.cs
View File

@ -77,11 +77,31 @@
} }
} }
private bool Check<T>(string what, T expected, T actual) private bool Check(string what, ushort expected, ushort actual)
{
var success = actual == expected;
if (!success)
{
this.Raise(what, expected, actual);
}
return success;
}
private bool Check(string what, byte expected, byte actual)
{
var success = actual == expected;
if (!success)
{
this.Raise(what, expected, actual);
}
return success;
}
private bool Check(string what, string? expected, string? actual)
{ {
ArgumentNullException.ThrowIfNull(expected); ArgumentNullException.ThrowIfNull(expected);
ArgumentNullException.ThrowIfNull(actual); ArgumentNullException.ThrowIfNull(actual);
var success = actual.Equals(expected); var success = actual == expected;
if (!success) if (!success)
{ {
this.Raise(what, expected, actual); this.Raise(what, expected, actual);
@ -162,9 +182,7 @@
var ram_problem = false; var ram_problem = false;
foreach (var entry in final.RAM) foreach (var entry in final.RAM)
{ {
if (entry.Length != 2)
var count = entry.Length;
if (count != 2)
{ {
throw new InvalidOperationException("RAM entry length must be 2"); throw new InvalidOperationException("RAM entry length must be 2");
} }
@ -185,7 +203,11 @@
&& !ram_problem; && !ram_problem;
} }
private void Raise<T>(string what, T expected, T actual) => this.Messages.Add($"{what}: expected: {expected}, actual: {actual}"); private void Raise(string what, ushort expected, ushort actual) => this.Messages.Add($"{what}: expected: {expected:X4}, actual: {actual:X4}");
private void Raise(string what, byte expected, byte actual) => this.Messages.Add($"{what}: expected: {expected:X2}, actual: {actual:X2}");
private void Raise(string what, string expected, string actual) => this.Messages.Add($"{what}: expected: {expected}, actual: {actual}");
public void Initialise() public void Initialise()
{ {
@ -194,19 +216,24 @@
} }
private void InitialiseState(Test test) private void InitialiseState(Test test)
{
var initial = test.Initial ?? throw new InvalidOperationException("Test cannot have an invalid initial state");
this.InitialiseState(initial);
}
private void InitialiseState(State state)
{ {
var cpu = this.Runner.CPU; var cpu = this.Runner.CPU;
var ram = this.Runner.RAM; var ram = this.Runner.RAM;
var initial = test.Initial ?? throw new InvalidOperationException("Test cannot have an invalid initial state"); cpu.PC.Word = state.PC;
cpu.PC.Word = initial.PC; cpu.S = state.S;
cpu.S = initial.S; cpu.A = state.A;
cpu.A = initial.A; cpu.X = state.X;
cpu.X = initial.X; cpu.Y = state.Y;
cpu.Y = initial.Y; cpu.P = state.P;
cpu.P = initial.P;
var initialRAM = initial.RAM ?? throw new InvalidOperationException("Initial test state cannot have invalid RAM"); var initialRAM = state.RAM ?? throw new InvalidOperationException("Initial test state cannot have invalid RAM");
foreach (var entry in initialRAM) foreach (var entry in initialRAM)
{ {
var count = entry.Length; var count = entry.Length;
@ -236,7 +263,7 @@
private void DumpCycle(ushort address, byte value, string? action) private void DumpCycle(ushort address, byte value, string? action)
{ {
ArgumentNullException.ThrowIfNull(action); ArgumentNullException.ThrowIfNull(action);
this.Messages.Add($"Address: {address}, value: {value}, action: {action}"); this.Messages.Add($"Address: {address:X4}, value: {value:X2}, action: {action}");
} }
private void DumpCycle(Cycle cycle) => this.DumpCycle(cycle.Address, cycle.Value, cycle.Type); private void DumpCycle(Cycle cycle) => this.DumpCycle(cycle.Address, cycle.Value, cycle.Type);