6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Fixed interrupt enable register. This makes a lot more sense!

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

14
Components/6522/6522.hpp
View File

@ -35,6 +35,7 @@ template <class T> class MOS6522 {
void set_register(int address, uint8_t value) void set_register(int address, uint8_t value)
{ {
address &= 0xf; address &= 0xf;
// printf("6522 %p: %d <- %02x\n", this, address, value);
switch(address) switch(address)
{ {
case 0x00: case 0x00:
@ -88,8 +89,10 @@ template <class T> class MOS6522 {
reevaluate_interrupts(); reevaluate_interrupts();
break; break;
case 0xe: case 0xe:
if(value&0x80) value = ~value; if(value&0x80)
_registers.interrupt_enable = value; _registers.interrupt_enable |= value;
else
_registers.interrupt_enable &= ~value;
reevaluate_interrupts(); reevaluate_interrupts();
break; break;
} }
@ -98,6 +101,7 @@ template <class T> class MOS6522 {
uint8_t get_register(int address) uint8_t get_register(int address)
{ {
address &= 0xf; address &= 0xf;
// printf("6522 %p: %d\n", this, address);
switch(address) switch(address)
{ {
case 0x00: return _registers.input[1]; case 0x00: return _registers.input[1];
@ -128,7 +132,7 @@ template <class T> class MOS6522 {
case 0x0c: return _registers.peripheral_control; case 0x0c: return _registers.peripheral_control;
case 0x0d: return _registers.interrupt_flags | (get_interrupt_line() ? 0x80 : 0x00); case 0x0d: return _registers.interrupt_flags | (get_interrupt_line() ? 0x80 : 0x00);
case 0x0e: return ~_registers.interrupt_enable; case 0x0e: return _registers.interrupt_enable | 0x80;
} }
return 0xff; return 0xff;
@ -199,7 +203,9 @@ template <class T> class MOS6522 {
uint8_t auxiliary_control, peripheral_control; uint8_t auxiliary_control, peripheral_control;
uint8_t interrupt_flags, interrupt_enable; uint8_t interrupt_flags, interrupt_enable;
Registers() : data_direction{0, 0} {} Registers() :
data_direction{0, 0},
interrupt_enable(0) {}
} _registers; } _registers;
bool _timer_is_running[2]; bool _timer_is_running[2];