From f79bdfd4a338e4bf73820c520ee93664da889392 Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Fri, 5 Jun 2026 22:25:30 +0100 Subject: [PATCH] Fix broken unit tests --- MC6809/inc/mc6809.h | 12 ++++++------ MC6809/src/mc6809.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MC6809/inc/mc6809.h b/MC6809/inc/mc6809.h index 5db1ce3..e3d34c1 100644 --- a/MC6809/inc/mc6809.h +++ b/MC6809/inc/mc6809.h @@ -284,12 +284,12 @@ namespace EightBit { return adjustSubtraction(before.joined, data.joined, after); } - [[nodiscard]] constexpr auto LS() const { return carry() || zero(); } // (C OR Z) - [[nodiscard]] constexpr auto HI() const { return !LS(); } // !(C OR Z) - [[nodiscard]] constexpr auto LT() const { return (negative() >> 3) ^ (overflow() >> 1); } // (N XOR V) - [[nodiscard]] constexpr auto GE() const { return !LT(); } // !(N XOR V) - [[nodiscard]] constexpr auto LE() const { return zero() || LT(); } // (Z OR (N XOR V)) - [[nodiscard]] constexpr auto GT() const { return !LE(); } // !(Z OR (N XOR V)) + [[nodiscard]] constexpr auto LS() const { return carry() || zero(); } // (C OR Z) + [[nodiscard]] constexpr auto HI() const { return !LS(); } // !(C OR Z) + [[nodiscard]] constexpr auto LT() const { return (negativeFlag() >> 3) ^ (overflowFlag() >> 1); } // (N XOR V) + [[nodiscard]] constexpr auto GE() const { return !LT(); } // !(N XOR V) + [[nodiscard]] constexpr auto LE() const { return zero() || LT(); } // (Z OR (N XOR V)) + [[nodiscard]] constexpr auto GT() const { return !LE(); } // !(Z OR (N XOR V)) #pragma region Load / store 8 or 16 - bit data diff --git a/MC6809/src/mc6809.cpp b/MC6809/src/mc6809.cpp index 61d5fed..5a5491b 100644 --- a/MC6809/src/mc6809.cpp +++ b/MC6809/src/mc6809.cpp @@ -1144,11 +1144,11 @@ void EightBit::mc6809::compare(register16_t operand, register16_t data) { compar void EightBit::mc6809::compare(uint8_t operand, uint8_t data) { auto _ = subtract(operand, data); } -void EightBit::mc6809::CMPU() { compare(U(), BUS().DATA()); } -void EightBit::mc6809::CMPS() { compare(S(), BUS().DATA()); } -void EightBit::mc6809::CMPD() { compare(D(), BUS().DATA()); } -void EightBit::mc6809::CMPX() { compare(X(), BUS().DATA()); } -void EightBit::mc6809::CMPY() { compare(Y(), BUS().DATA()); } +void EightBit::mc6809::CMPU() { compare(U()); } +void EightBit::mc6809::CMPS() { compare(S()); } +void EightBit::mc6809::CMPD() { compare(D()); } +void EightBit::mc6809::CMPX() { compare(X()); } +void EightBit::mc6809::CMPY() { compare(Y()); } void EightBit::mc6809::compare(register16_t operand) { auto _ = subtract(operand, intermediate()); }