mirror of
https://github.com/MoleskiCoder/EightBitNet.git
synced 2024-06-12 06:29:30 +00:00
Choose a different mechanism for ignoring (at the moment) bus test events.
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
parent
ac56257558
commit
3c87907471
|
@ -41,9 +41,10 @@ namespace Fuse
|
||||||
|
|
||||||
foreach (var e in result.Events.Container)
|
foreach (var e in result.Events.Container)
|
||||||
{
|
{
|
||||||
|
// Ignore contention events
|
||||||
if (!e.Specifier.EndsWith("C"))
|
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()
|
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();
|
base.OnReadByte();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnWrittenByte()
|
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();
|
base.OnWrittenByte();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -400,7 +401,7 @@ namespace Fuse
|
||||||
var equalAddress = expectation.Address == actual.Address;
|
var equalAddress = expectation.Address == actual.Address;
|
||||||
var equalValue = expectation.Value == actual.Value;
|
var equalValue = expectation.Value == actual.Value;
|
||||||
|
|
||||||
var equal = equalCycles && equalSpecifier && equalAddress && equalValue;
|
var equal = /* equalCycles && */equalSpecifier && equalAddress && equalValue;
|
||||||
eventFailure = !equal;
|
eventFailure = !equal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user