6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Decided to keep the internal copy of the interrupt enable the other way around. Reduced delegate noise.

Browse Source
This commit is contained in:
Thomas Harte 2016-06-11 07:49:07 -04:00
parent a71259dec3
commit 82a3c4964b
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Components/6522/6522.hpp
View File

@ -32,15 +32,6 @@ template <class T> class MOS6522 {
};
public:
void set_delegate(MOS6522Delegate *delegate)
{
_delegate = delegate;
}
MOS6522() :
_timer_is_running{false, false}
{}
void set_register(int address, uint8_t value)
{
address &= 0xf;
@ -97,7 +88,7 @@ template <class T> class MOS6522 {
reevaluate_interrupts();
break;
case 0xe:
if(!(value&0x80)) value = ~value;
if(value&0x80) value = ~value;
_registers.interrupt_enable = value;
reevaluate_interrupts();
break;
@ -136,8 +127,8 @@ template <class T> class MOS6522 {
case 0x0b: return _registers.auxiliary_control;
case 0x0c: return _registers.peripheral_control;
case 0x0d: return _registers.interrupt_flags;
case 0x0e: return _registers.interrupt_enable;
case 0x0d: return _registers.interrupt_flags | (get_interrupt_line() ? 0x80 : 0x00);
case 0x0e: return ~_registers.interrupt_enable;
}
return 0xff;
@ -173,14 +164,30 @@ template <class T> class MOS6522 {
bool get_interrupt_line()
{
uint8_t interrupt_status = _registers.interrupt_flags & (~_registers.interrupt_enable) & 0x7f;
uint8_t interrupt_status = _registers.interrupt_flags & _registers.interrupt_enable & 0x7f;
return !!interrupt_status;
}
void set_delegate(MOS6522Delegate *delegate)
{
_delegate = delegate;
}
MOS6522() :
_timer_is_running{false, false},
_last_posted_interrupt_status(false)
{}
private:
bool _last_posted_interrupt_status;
inline void reevaluate_interrupts()
{
if(_delegate) _delegate->mos6522_did_change_interrupt_status(this);
bool new_interrupt_status = get_interrupt_line();
if(new_interrupt_status != _last_posted_interrupt_status)
{
_last_posted_interrupt_status = new_interrupt_status;
if(_delegate) _delegate->mos6522_did_change_interrupt_status(this);
}
}
MOS6522Delegate *_delegate;