Fix display of registers (from alternate set) when viewing z80 problems

This commit is contained in:
Adrian Conlon
2025-05-03 19:18:03 +01:00
parent 26457b4a77
commit a0d45eace1
+7 -5
View File
@@ -2,7 +2,6 @@
{ {
using EightBit; using EightBit;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics; using System.Diagnostics;
internal sealed class Checker internal sealed class Checker
@@ -246,6 +245,9 @@
var de_a_good = this.Check("'DE", final.DE_, cpu.DE); var de_a_good = this.Check("'DE", final.DE_, cpu.DE);
var hl_a_good = this.Check("'HL", final.HL_, cpu.HL); var hl_a_good = this.Check("'HL", final.HL_, cpu.HL);
cpu.ExxAF();
cpu.Exx();
var i_good = this.Check("I", final.I, cpu.IV); var i_good = this.Check("I", final.I, cpu.IV);
var r_good = this.Check("R", final.R, cpu.REFRESH); var r_good = this.Check("R", final.R, cpu.REFRESH);
@@ -415,7 +417,7 @@
private void AddActualCycle(ushort address, byte value, string action) => this.ActualCycles.Add(new Cycle(address, value, action)); private void AddActualCycle(ushort address, byte value, string action) => this.ActualCycles.Add(new Cycle(address, value, action));
private string ExpandCycle(string prefix, ushort address, byte? value, string? action) private static string ExpandCycle(string prefix, ushort address, byte? value, string? action)
{ {
ArgumentNullException.ThrowIfNull(action); ArgumentNullException.ThrowIfNull(action);
return value is null return value is null
@@ -423,7 +425,7 @@
: $"{prefix}: Address: {address:X4}, value: {value:X2}, action: {action}"; : $"{prefix}: Address: {address:X4}, value: {value:X2}, action: {action}";
} }
private string ExpandCycle(string prefix, Cycle cycle) => this.ExpandCycle(prefix, cycle.Address, cycle.Value, cycle.Type); private static string ExpandCycle(string prefix, Cycle cycle) => ExpandCycle(prefix, cycle.Address, cycle.Value, cycle.Type);
private void DumpCycles(IEnumerable<Cycle> expected, IEnumerable<Cycle> actual) private void DumpCycles(IEnumerable<Cycle> expected, IEnumerable<Cycle> actual)
{ {
@@ -438,7 +440,7 @@
var message = ""; var message = "";
if (expectedCycle is not null) if (expectedCycle is not null)
{ {
message += this.ExpandCycle("Expected", expectedCycle); message += ExpandCycle("Expected", expectedCycle);
message += " "; message += " ";
} }
if (actualCycle is not null) if (actualCycle is not null)
@@ -447,7 +449,7 @@
{ {
actualCycle.Value = null; actualCycle.Value = null;
} }
var actualMessage = this.ExpandCycle("Actual ", actualCycle); var actualMessage = ExpandCycle("Actual ", actualCycle);
var messagePrefix = expectedCycle is null ? new string(' ', actualMessage.Length + 4) : string.Empty; var messagePrefix = expectedCycle is null ? new string(' ', actualMessage.Length + 4) : string.Empty;
message += messagePrefix + actualMessage; message += messagePrefix + actualMessage;
} }