From 210a913c660645c52a450eeb499925228f91f59e Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Fri, 18 Sep 2026 07:51:36 +0100 Subject: [PATCH] Fix 6809 tests --- MC6809/MC6809.UnitTest/AbxTests.cs | 1 - MC6809/MC6809.UnitTest/AdcTests.cs | 1 - MC6809/MC6809.UnitTest/AddTests.cs | 1 - MC6809/MC6809.UnitTest/AndTests.cs | 1 - MC6809/MC6809.UnitTest/AslTests.cs | 1 - MC6809/MC6809.UnitTest/AsrTests.cs | 1 - MC6809/MC6809.UnitTest/BgtTests.cs | 1 - MC6809/MC6809.UnitTest/BhiTests.cs | 1 - MC6809/MC6809.UnitTest/BitTests.cs | 1 - MC6809/MC6809.UnitTest/BleTests.cs | 1 - MC6809/MC6809.UnitTest/Board.cs | 10 ++++++++++ MC6809/MC6809.UnitTest/ClrTests.cs | 1 - MC6809/MC6809.UnitTest/CmpTests.cs | 1 - MC6809/MC6809.UnitTest/ComTests.cs | 1 - MC6809/MC6809.UnitTest/DaaTests.cs | 1 - MC6809/MC6809.UnitTest/DecTests.cs | 1 - MC6809/MC6809.UnitTest/EorTests.cs | 1 - MC6809/MC6809.UnitTest/ExgTests.cs | 1 - MC6809/MC6809.UnitTest/IncTests.cs | 1 - MC6809/MC6809.UnitTest/JsrTests.cs | 1 - MC6809/MC6809.UnitTest/LdTests.cs | 1 - MC6809/MC6809.UnitTest/LeaTests.cs | 1 - MC6809/MC6809.UnitTest/LsrTests.cs | 1 - MC6809/MC6809.UnitTest/MulTests.cs | 1 - MC6809/MC6809.UnitTest/NegTests.cs | 1 - MC6809/MC6809.UnitTest/OrTests.cs | 1 - MC6809/MC6809.UnitTest/PshTests.cs | 1 - MC6809/MC6809.UnitTest/PulTests.cs | 1 - MC6809/MC6809.UnitTest/RolTests.cs | 1 - MC6809/MC6809.UnitTest/RorTests.cs | 1 - MC6809/MC6809.UnitTest/RtsTests.cs | 1 - MC6809/MC6809.UnitTest/SbcTests.cs | 1 - MC6809/MC6809.UnitTest/SchwotzerArithmeticTests.cs | 5 ++++- MC6809/MC6809.UnitTest/SchwotzerCompareLoadTests.cs | 5 ++++- MC6809/MC6809.UnitTest/SchwotzerShiftTests.cs | 5 ++++- MC6809/MC6809.UnitTest/SchwotzerUnaryTests.cs | 5 ++++- MC6809/MC6809.UnitTest/SexTests.cs | 1 - MC6809/MC6809.UnitTest/SubTests.cs | 1 - MC6809/MC6809.UnitTest/TfrTests.cs | 1 - MC6809/MC6809.UnitTest/TstTests.cs | 1 - 40 files changed, 26 insertions(+), 39 deletions(-) diff --git a/MC6809/MC6809.UnitTest/AbxTests.cs b/MC6809/MC6809.UnitTest/AbxTests.cs index dd4a137..23b31ef 100644 --- a/MC6809/MC6809.UnitTest/AbxTests.cs +++ b/MC6809/MC6809.UnitTest/AbxTests.cs @@ -21,7 +21,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/AdcTests.cs b/MC6809/MC6809.UnitTest/AdcTests.cs index b614b24..726998f 100644 --- a/MC6809/MC6809.UnitTest/AdcTests.cs +++ b/MC6809/MC6809.UnitTest/AdcTests.cs @@ -18,7 +18,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/AddTests.cs b/MC6809/MC6809.UnitTest/AddTests.cs index 692eb83..6489749 100644 --- a/MC6809/MC6809.UnitTest/AddTests.cs +++ b/MC6809/MC6809.UnitTest/AddTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/AndTests.cs b/MC6809/MC6809.UnitTest/AndTests.cs index 6c60738..ce1345f 100644 --- a/MC6809/MC6809.UnitTest/AndTests.cs +++ b/MC6809/MC6809.UnitTest/AndTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/AslTests.cs b/MC6809/MC6809.UnitTest/AslTests.cs index 0a7c312..0156479 100644 --- a/MC6809/MC6809.UnitTest/AslTests.cs +++ b/MC6809/MC6809.UnitTest/AslTests.cs @@ -22,7 +22,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/AsrTests.cs b/MC6809/MC6809.UnitTest/AsrTests.cs index 51627ac..7654faa 100644 --- a/MC6809/MC6809.UnitTest/AsrTests.cs +++ b/MC6809/MC6809.UnitTest/AsrTests.cs @@ -22,7 +22,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/BgtTests.cs b/MC6809/MC6809.UnitTest/BgtTests.cs index 46d4b3a..571c376 100644 --- a/MC6809/MC6809.UnitTest/BgtTests.cs +++ b/MC6809/MC6809.UnitTest/BgtTests.cs @@ -29,7 +29,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/BhiTests.cs b/MC6809/MC6809.UnitTest/BhiTests.cs index 8aaed5e..3bcc23e 100644 --- a/MC6809/MC6809.UnitTest/BhiTests.cs +++ b/MC6809/MC6809.UnitTest/BhiTests.cs @@ -29,7 +29,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/BitTests.cs b/MC6809/MC6809.UnitTest/BitTests.cs index e4285c9..15337cf 100644 --- a/MC6809/MC6809.UnitTest/BitTests.cs +++ b/MC6809/MC6809.UnitTest/BitTests.cs @@ -23,7 +23,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/BleTests.cs b/MC6809/MC6809.UnitTest/BleTests.cs index 860eef5..aaa9945 100644 --- a/MC6809/MC6809.UnitTest/BleTests.cs +++ b/MC6809/MC6809.UnitTest/BleTests.cs @@ -29,7 +29,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/Board.cs b/MC6809/MC6809.UnitTest/Board.cs index 5bd87b5..d6a60c3 100644 --- a/MC6809/MC6809.UnitTest/Board.cs +++ b/MC6809/MC6809.UnitTest/Board.cs @@ -36,6 +36,16 @@ namespace MC6809.UnitTest this.CPU.RaiseNMI(); this.CPU.RaiseFIRQ(); this.CPU.RaiseHALT(); + + this.RunPowerOnReset(); + } + + private void RunPowerOnReset() + { + this.CPU.RaiseRESET(); + this.CPU.LowerRESET(); + this.CPU.Step(); + this.CPU.RaiseRESET(); } public override void LowerPOWER() diff --git a/MC6809/MC6809.UnitTest/ClrTests.cs b/MC6809/MC6809.UnitTest/ClrTests.cs index 43b8263..79973e0 100644 --- a/MC6809/MC6809.UnitTest/ClrTests.cs +++ b/MC6809/MC6809.UnitTest/ClrTests.cs @@ -22,7 +22,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/CmpTests.cs b/MC6809/MC6809.UnitTest/CmpTests.cs index 6bd85f1..75e5ca0 100644 --- a/MC6809/MC6809.UnitTest/CmpTests.cs +++ b/MC6809/MC6809.UnitTest/CmpTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/ComTests.cs b/MC6809/MC6809.UnitTest/ComTests.cs index 696cba2..634f093 100644 --- a/MC6809/MC6809.UnitTest/ComTests.cs +++ b/MC6809/MC6809.UnitTest/ComTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/DaaTests.cs b/MC6809/MC6809.UnitTest/DaaTests.cs index fc15dec..86cde3d 100644 --- a/MC6809/MC6809.UnitTest/DaaTests.cs +++ b/MC6809/MC6809.UnitTest/DaaTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/DecTests.cs b/MC6809/MC6809.UnitTest/DecTests.cs index 0ff5aae..a05b425 100644 --- a/MC6809/MC6809.UnitTest/DecTests.cs +++ b/MC6809/MC6809.UnitTest/DecTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/EorTests.cs b/MC6809/MC6809.UnitTest/EorTests.cs index de86985..c282dc5 100644 --- a/MC6809/MC6809.UnitTest/EorTests.cs +++ b/MC6809/MC6809.UnitTest/EorTests.cs @@ -22,7 +22,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/ExgTests.cs b/MC6809/MC6809.UnitTest/ExgTests.cs index 3e30562..f99b94b 100644 --- a/MC6809/MC6809.UnitTest/ExgTests.cs +++ b/MC6809/MC6809.UnitTest/ExgTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/IncTests.cs b/MC6809/MC6809.UnitTest/IncTests.cs index d323444..945bf11 100644 --- a/MC6809/MC6809.UnitTest/IncTests.cs +++ b/MC6809/MC6809.UnitTest/IncTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/JsrTests.cs b/MC6809/MC6809.UnitTest/JsrTests.cs index 73a32e6..d19da4c 100644 --- a/MC6809/MC6809.UnitTest/JsrTests.cs +++ b/MC6809/MC6809.UnitTest/JsrTests.cs @@ -23,7 +23,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/LdTests.cs b/MC6809/MC6809.UnitTest/LdTests.cs index 07d9a81..246219f 100644 --- a/MC6809/MC6809.UnitTest/LdTests.cs +++ b/MC6809/MC6809.UnitTest/LdTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/LeaTests.cs b/MC6809/MC6809.UnitTest/LeaTests.cs index 93c0451..30dee9e 100644 --- a/MC6809/MC6809.UnitTest/LeaTests.cs +++ b/MC6809/MC6809.UnitTest/LeaTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/LsrTests.cs b/MC6809/MC6809.UnitTest/LsrTests.cs index 55718b3..82e1074 100644 --- a/MC6809/MC6809.UnitTest/LsrTests.cs +++ b/MC6809/MC6809.UnitTest/LsrTests.cs @@ -18,7 +18,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/MulTests.cs b/MC6809/MC6809.UnitTest/MulTests.cs index de09a84..ed4f15f 100644 --- a/MC6809/MC6809.UnitTest/MulTests.cs +++ b/MC6809/MC6809.UnitTest/MulTests.cs @@ -18,7 +18,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/NegTests.cs b/MC6809/MC6809.UnitTest/NegTests.cs index 4ff1f9c..1e280f6 100644 --- a/MC6809/MC6809.UnitTest/NegTests.cs +++ b/MC6809/MC6809.UnitTest/NegTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/OrTests.cs b/MC6809/MC6809.UnitTest/OrTests.cs index 3772718..327cc1c 100644 --- a/MC6809/MC6809.UnitTest/OrTests.cs +++ b/MC6809/MC6809.UnitTest/OrTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/PshTests.cs b/MC6809/MC6809.UnitTest/PshTests.cs index ab276f1..47f22a1 100644 --- a/MC6809/MC6809.UnitTest/PshTests.cs +++ b/MC6809/MC6809.UnitTest/PshTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/PulTests.cs b/MC6809/MC6809.UnitTest/PulTests.cs index 49a8caa..6817fe9 100644 --- a/MC6809/MC6809.UnitTest/PulTests.cs +++ b/MC6809/MC6809.UnitTest/PulTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/RolTests.cs b/MC6809/MC6809.UnitTest/RolTests.cs index 4267836..299c70e 100644 --- a/MC6809/MC6809.UnitTest/RolTests.cs +++ b/MC6809/MC6809.UnitTest/RolTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/RorTests.cs b/MC6809/MC6809.UnitTest/RorTests.cs index 5cd4af8..a130a36 100644 --- a/MC6809/MC6809.UnitTest/RorTests.cs +++ b/MC6809/MC6809.UnitTest/RorTests.cs @@ -18,7 +18,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/RtsTests.cs b/MC6809/MC6809.UnitTest/RtsTests.cs index a7b70a7..4a02d78 100644 --- a/MC6809/MC6809.UnitTest/RtsTests.cs +++ b/MC6809/MC6809.UnitTest/RtsTests.cs @@ -23,7 +23,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/SbcTests.cs b/MC6809/MC6809.UnitTest/SbcTests.cs index 83edaa2..527388b 100644 --- a/MC6809/MC6809.UnitTest/SbcTests.cs +++ b/MC6809/MC6809.UnitTest/SbcTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/SchwotzerArithmeticTests.cs b/MC6809/MC6809.UnitTest/SchwotzerArithmeticTests.cs index d14e7a0..9a23dad 100644 --- a/MC6809/MC6809.UnitTest/SchwotzerArithmeticTests.cs +++ b/MC6809/MC6809.UnitTest/SchwotzerArithmeticTests.cs @@ -16,7 +16,10 @@ namespace MC6809.UnitTest public SchwotzerArithmeticTests() => this.cpu = this.board.CPU; [TestInitialize] - public void Initialise() { this.board.RaisePOWER(); this.cpu.Step(); } + public void Initialise() + { + this.board.RaisePOWER(); + } [TestCleanup] public void Cleanup() => this.board.LowerPOWER(); diff --git a/MC6809/MC6809.UnitTest/SchwotzerCompareLoadTests.cs b/MC6809/MC6809.UnitTest/SchwotzerCompareLoadTests.cs index e318b84..6ebb376 100644 --- a/MC6809/MC6809.UnitTest/SchwotzerCompareLoadTests.cs +++ b/MC6809/MC6809.UnitTest/SchwotzerCompareLoadTests.cs @@ -16,7 +16,10 @@ namespace MC6809.UnitTest public SchwotzerCompareLoadTests() => this.cpu = this.board.CPU; [TestInitialize] - public void Initialise() { this.board.RaisePOWER(); this.cpu.Step(); } + public void Initialise() + { + this.board.RaisePOWER(); + } [TestCleanup] public void Cleanup() => this.board.LowerPOWER(); diff --git a/MC6809/MC6809.UnitTest/SchwotzerShiftTests.cs b/MC6809/MC6809.UnitTest/SchwotzerShiftTests.cs index d15b612..bda255f 100644 --- a/MC6809/MC6809.UnitTest/SchwotzerShiftTests.cs +++ b/MC6809/MC6809.UnitTest/SchwotzerShiftTests.cs @@ -21,7 +21,10 @@ namespace MC6809.UnitTest public SchwotzerShiftTests() => this.cpu = this.board.CPU; [TestInitialize] - public void Initialise() { this.board.RaisePOWER(); this.cpu.Step(); } + public void Initialise() + { + this.board.RaisePOWER(); + } [TestCleanup] public void Cleanup() => this.board.LowerPOWER(); diff --git a/MC6809/MC6809.UnitTest/SchwotzerUnaryTests.cs b/MC6809/MC6809.UnitTest/SchwotzerUnaryTests.cs index c3d5a1e..6c79bc7 100644 --- a/MC6809/MC6809.UnitTest/SchwotzerUnaryTests.cs +++ b/MC6809/MC6809.UnitTest/SchwotzerUnaryTests.cs @@ -16,7 +16,10 @@ namespace MC6809.UnitTest public SchwotzerUnaryTests() => this.cpu = this.board.CPU; [TestInitialize] - public void Initialise() { this.board.RaisePOWER(); this.cpu.Step(); } + public void Initialise() + { + this.board.RaisePOWER(); + } [TestCleanup] public void Cleanup() => this.board.LowerPOWER(); diff --git a/MC6809/MC6809.UnitTest/SexTests.cs b/MC6809/MC6809.UnitTest/SexTests.cs index 1c22d87..4ff9ac6 100644 --- a/MC6809/MC6809.UnitTest/SexTests.cs +++ b/MC6809/MC6809.UnitTest/SexTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/SubTests.cs b/MC6809/MC6809.UnitTest/SubTests.cs index 48b3566..d30b687 100644 --- a/MC6809/MC6809.UnitTest/SubTests.cs +++ b/MC6809/MC6809.UnitTest/SubTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/TfrTests.cs b/MC6809/MC6809.UnitTest/TfrTests.cs index 3d55d36..9215f13 100644 --- a/MC6809/MC6809.UnitTest/TfrTests.cs +++ b/MC6809/MC6809.UnitTest/TfrTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup] diff --git a/MC6809/MC6809.UnitTest/TstTests.cs b/MC6809/MC6809.UnitTest/TstTests.cs index 04d83a2..9c8b08a 100644 --- a/MC6809/MC6809.UnitTest/TstTests.cs +++ b/MC6809/MC6809.UnitTest/TstTests.cs @@ -17,7 +17,6 @@ namespace MC6809.UnitTest public void Initialise() { this.board.RaisePOWER(); - this.cpu.Step(); // Step over the reset } [TestCleanup]