From a64f370d7c0c57b1c539101afc5c7f1b4aba8e2a Mon Sep 17 00:00:00 2001 From: Adrian Conlon <98398945+AdrianConlon@users.noreply.github.com> Date: Wed, 29 May 2024 10:56:16 +0100 Subject: [PATCH] Compilation fixes --- Intel8080/Intel8080.cs | 4 +--- LR35902/LR35902.cs | 3 +-- M6502/PageCrossingBehavior.cs | 12 ------------ MC6809/MC6809.cs | 4 +--- Z80/Z80.cs | 4 +--- 5 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 M6502/PageCrossingBehavior.cs diff --git a/Intel8080/Intel8080.cs b/Intel8080/Intel8080.cs index 21156b3..e242018 100644 --- a/Intel8080/Intel8080.cs +++ b/Intel8080/Intel8080.cs @@ -36,7 +36,7 @@ namespace EightBit public override Register16 HL { get; } = new Register16((int)Mask.Sixteen); - public override int Execute() + public override void Execute() { var decoded = this.GetDecodedOpCode(this.OpCode); @@ -48,8 +48,6 @@ namespace EightBit var q = decoded.Q; this.Execute(x, y, z, p, q); - - return this.Cycles; } public override int Step() diff --git a/LR35902/LR35902.cs b/LR35902/LR35902.cs index f1c60b2..d7ecaeb 100644 --- a/LR35902/LR35902.cs +++ b/LR35902/LR35902.cs @@ -40,7 +40,7 @@ namespace EightBit.GameBoy private bool Stopped { get; set; } = false; - public override int Execute() + public override void Execute() { var decoded = this.GetDecodedOpCode(this.OpCode); @@ -61,7 +61,6 @@ namespace EightBit.GameBoy } System.Diagnostics.Debug.Assert(this.Cycles > 0, $"No timing associated with instruction (CB prefixed? {this.prefixCB}) 0x{this.OpCode:X2}"); - return this.ClockCycles; } public override int Step() diff --git a/M6502/PageCrossingBehavior.cs b/M6502/PageCrossingBehavior.cs deleted file mode 100644 index 505d4b4..0000000 --- a/M6502/PageCrossingBehavior.cs +++ /dev/null @@ -1,12 +0,0 @@ -// -// Copyright (c) Adrian Conlon. All rights reserved. -// - -namespace EightBit -{ - public enum PageCrossingBehavior - { - AlwaysReadTwice, - MaybeReadTwice, - } -} \ No newline at end of file diff --git a/MC6809/MC6809.cs b/MC6809/MC6809.cs index cb727b5..e052e33 100644 --- a/MC6809/MC6809.cs +++ b/MC6809/MC6809.cs @@ -211,7 +211,7 @@ namespace EightBit return this.Cycles; } - public override int Execute() + public override void Execute() { this.LowerBA(); this.LowerBS(); @@ -232,8 +232,6 @@ namespace EightBit this.Execute11(); } } - - return this.Cycles; } public void RaiseNMI() diff --git a/Z80/Z80.cs b/Z80/Z80.cs index 7cc7366..4538166 100644 --- a/Z80/Z80.cs +++ b/Z80/Z80.cs @@ -316,7 +316,7 @@ namespace EightBit } } - public override int Execute() + public override void Execute() { var decoded = this.GetDecodedOpCode(this.OpCode); @@ -339,8 +339,6 @@ namespace EightBit { this.ExecuteOther(x, y, z, p, q); } - - return this.Cycles; } public override int Step()