From 3c87907471ea7f92038e46da6966a239750cc2b0 Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Sat, 16 Nov 2019 21:00:26 +0000 Subject: [PATCH] Choose a different mechanism for ignoring (at the moment) bus test events. Signed-off-by: Adrian Conlon --- Z80/Z80.FuseTest/TestRunner.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Z80/Z80.FuseTest/TestRunner.cs b/Z80/Z80.FuseTest/TestRunner.cs index 8afc4ce..a79900d 100644 --- a/Z80/Z80.FuseTest/TestRunner.cs +++ b/Z80/Z80.FuseTest/TestRunner.cs @@ -41,9 +41,10 @@ namespace Fuse foreach (var e in result.Events.Container) { + // Ignore contention events if (!e.Specifier.EndsWith("C")) { - this.expectedEvents.Add(new TestEvent(0, e.Specifier, e.Address, e.Value)); + this.expectedEvents.Add(e); } } } @@ -96,13 +97,13 @@ namespace Fuse protected override void OnReadByte() { - this.actualEvents.Add(new TestEvent(0, "MR", this.Address.Word, this.Data)); + this.actualEvents.Add(new TestEvent(this.cpu.Cycles, "MR", this.Address.Word, this.Data)); base.OnReadByte(); } protected override void OnWrittenByte() { - this.actualEvents.Add(new TestEvent(0, "MW", this.Address.Word, this.Data)); + this.actualEvents.Add(new TestEvent(this.cpu.Cycles, "MW", this.Address.Word, this.Data)); base.OnWrittenByte(); } @@ -400,7 +401,7 @@ namespace Fuse var equalAddress = expectation.Address == actual.Address; var equalValue = expectation.Value == actual.Value; - var equal = equalCycles && equalSpecifier && equalAddress && equalValue; + var equal = /* equalCycles && */equalSpecifier && equalAddress && equalValue; eventFailure = !equal; }