6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix ADD/SUBX carry.

Browse Source
This commit is contained in:
Thomas Harte 2022-10-19 22:17:51 -04:00
parent df7f94f362
commit ec728ad573
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
InstructionSets/M68k/Implementation/PerformImplementation.hpp
View File

@ -55,10 +55,23 @@ template <bool is_add, bool is_extend, typename IntT>
static void add_sub(IntT source, IntT &destination, Status &status) { static void add_sub(IntT source, IntT &destination, Status &status) {
static_assert(!std::numeric_limits<IntT>::is_signed); static_assert(!std::numeric_limits<IntT>::is_signed);
const IntT extend = (is_extend && status.extend_flag) ? 1 : 0; IntT result = is_add ?
const IntT result = is_add ? destination + source :
(destination + source + extend) : destination - source;
(destination - source - extend); status.carry_flag = is_add ? result < destination : result > destination;
// If this is an extend operation, there's a second opportunity to create carry,
// which requires a second test.
if(is_extend && status.extend_flag) {
if constexpr (is_add) {
++result;
status.carry_flag |= result == 0;
} else {
status.carry_flag |= result == 0;
--result;
}
}
status.extend_flag = status.carry_flag;
// Extend operations can reset the zero flag only; non-extend operations // Extend operations can reset the zero flag only; non-extend operations
// can either set it or reset it. Which in the reverse-logic world of // can either set it or reset it. Which in the reverse-logic world of
@ -68,8 +81,6 @@ static void add_sub(IntT source, IntT &destination, Status &status) {
} else { } else {
status.zero_result = Status::FlagT(result); status.zero_result = Status::FlagT(result);
} }
status.extend_flag =
status.carry_flag = is_add ? result < destination : result > destination;
status.set_negative(result); status.set_negative(result);
status.overflow_flag = overflow<is_add>(source, destination, result); status.overflow_flag = overflow<is_add>(source, destination, result);
destination = result; destination = result;