6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-27 06:35:04 +00:00
Code Issues Projects Releases Wiki Activity

Disallow programmatic setting of blitter status.

Browse Source
This commit is contained in:
Thomas Harte 2021-10-29 06:19:57 -07:00
parent 07facc0636
commit b952d73e83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Machines/Amiga/Chipset.cpp
View File

@ -582,12 +582,12 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
#define Read(address) address | (Microcycle::Read << 12) #define Read(address) address | (Microcycle::Read << 12)
#define Write(address) address #define Write(address) address
#define ApplySetClear(target) { \ #define ApplySetClear(target, mask) { \
const uint16_t value = cycle.value16(); \ const uint16_t value = cycle.value16(); \
if(value & 0x8000) { \ if(value & 0x8000) { \
target |= (value & 0x7fff); \ target |= (value & mask); \
} else { \ } else { \
target &= ~(value & 0x7fff); \ target &= ~(value & mask); \
} \ } \
} }
@ -642,7 +642,7 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
case Write(0x09e): case Write(0x09e):
LOG("Write disk control"); LOG("Write disk control");
ApplySetClear(paula_disk_control_); ApplySetClear(paula_disk_control_, 0x7fff);
disk_controller_.set_control(paula_disk_control_); disk_controller_.set_control(paula_disk_control_);
// TODO: should also post to Paula. // TODO: should also post to Paula.
@ -684,12 +684,12 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
cycle.set_value16(dma_control_ | blitter_.get_status()); cycle.set_value16(dma_control_ | blitter_.get_status());
break; break;
case Write(0x096): case Write(0x096):
ApplySetClear(dma_control_); ApplySetClear(dma_control_, 0x1fff);
break; break;
// Interrupts. // Interrupts.
case Write(0x09a): case Write(0x09a):
ApplySetClear(interrupt_enable_); ApplySetClear(interrupt_enable_, 0x7fff);
update_interrupts(); update_interrupts();
break; break;
case Read(0x01c): case Read(0x01c):
@ -697,7 +697,7 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
break; break;
case Write(0x09c): case Write(0x09c):
ApplySetClear(interrupt_requests_); ApplySetClear(interrupt_requests_, 0x7fff);
update_interrupts(); update_interrupts();
break; break;
case Read(0x01e): case Read(0x01e):