6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-20 10:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Make decimal flag private.

Browse Source
This commit is contained in:
Thomas Harte
2025-10-28 17:34:31 -04:00
parent 5332bcd6b4
commit 332fb2f384
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Processors/6502Mk2/Implementation/6502.hpp
+1 -1
View File
@@ -108,7 +108,7 @@ void Processor<model, Traits>::run_for(const Cycles cycles) {
(
Storage::decoded_.operation == Operation::ADC ||
Storage::decoded_.operation == Operation::SBC
) && registers.flags.decimal;
) && registers.flags.template get<Flag::Decimal>();
};
const auto set_interrupt_flag = [&] {
registers.flags.template set_per<Flag::InverseInterrupt>(0);
Processors/6502Mk2/Perform.hpp
+5 -5
View File
@@ -36,7 +36,7 @@ void adc(RegistersT &registers, const uint8_t operand) {
uint8_t result = registers.a + operand + registers.flags.carry;
registers.flags.carry = result < registers.a + registers.flags.carry;
if(!has_decimal_mode(model) || !registers.flags.decimal) {
if(!has_decimal_mode(model) || !registers.flags.template get<Flag::Decimal>()) {
registers.flags.set_overflow(result, registers.a, operand);
registers.flags.template set_per<Flag::NegativeZero>(registers.a = result);
return;
@@ -86,7 +86,7 @@ void adc(RegistersT &registers, const uint8_t operand) {
template <Model model, typename RegistersT>
void sbc(RegistersT &registers, const uint8_t operand) {
if(!has_decimal_mode(model) || !registers.flags.decimal) {
if(!has_decimal_mode(model) || !registers.flags.template get<Flag::Decimal>()) {
adc<Model::NES6502>(registers, ~operand); // Lie about the model to carry forward the fact of not-decimal.
return;
}
@@ -140,7 +140,7 @@ void arr(RegistersT &registers, const uint8_t operand) {
registers.flags.template set_per<Flag::NegativeZero>(registers.a);
registers.flags.overflow = (registers.a^(registers.a << 1))&Flag::Overflow;
if(registers.flags.decimal && has_decimal_mode(model)) {
if(registers.flags.template get<Flag::Decimal>() && has_decimal_mode(model)) {
if((unshifted_a&0xf) + (unshifted_a&0x1) > 5) registers.a = ((registers.a + 6)&0xf) | (registers.a & 0xf0);
registers.flags.carry = ((unshifted_a&0xf0) + (unshifted_a&0x10) > 0x50) ? 1 : 0;
if(registers.flags.carry) registers.a += 0x60;
@@ -368,10 +368,10 @@ void perform(
case Operation::CLC: registers.flags.carry = 0; break;
case Operation::CLI: registers.flags.template set_per<Flag::Interrupt>(0); break;
case Operation::CLV: registers.flags.overflow = 0; break;
case Operation::CLD: registers.flags.decimal = 0; break;
case Operation::CLD: registers.flags.template set_per<Flag::Decimal>(0); break;
case Operation::SEC: registers.flags.carry = Flag::Carry; break;
case Operation::SEI: registers.flags.template set_per<Flag::Interrupt>(Flag::Interrupt); break;
case Operation::SED: registers.flags.decimal = Flag::Decimal; break;
case Operation::SED: registers.flags.template set_per<Flag::Decimal>(Flag::Decimal); break;
case Operation::ANE: Operations::ane(registers, operand); break;
case Operation::ANC: Operations::anc(registers, operand); break;
Processors/6502Mk2/Registers.hpp
+1 -1
View File
@@ -168,9 +168,9 @@ struct Flags {
uint8_t negative_result = 0; /// Bit 7 = the negative flag.
uint8_t zero_result = 0; /// Non-zero if the zero flag is clear, zero if it is set.
uint8_t carry = 0; /// Contains Flag::Carry.
uint8_t decimal = 0; /// Contains Flag::Decimal.
uint8_t overflow = 0; /// Contains Flag::Overflow.
private:
uint8_t decimal = 0; /// Contains Flag::Decimal.
uint8_t inverse_interrupt = 0; /// Contains Flag::Interrupt, complemented.
};