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

Corrects RAM read decoding when the ROM overlay is enabled.

Browse Source
This commit is contained in:
Thomas Harte 2019-05-05 22:48:40 -04:00
parent e6ed50383c
commit cefc3af08b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Machines/Apple/Macintosh/Macintosh.cpp
View File

@ -126,7 +126,7 @@ class ConcreteMachine:
if( if(
!(cycle.operation & Microcycle::Read) || !(cycle.operation & Microcycle::Read) ||
( (
(ROM_is_overlay_ && word_address >= 0x600000) || (ROM_is_overlay_ && word_address >= 0x300000) ||
(!ROM_is_overlay_ && !(word_address & 0x200000)) (!ROM_is_overlay_ && !(word_address & 0x200000))
) )
) { ) {
@ -142,18 +142,21 @@ class ConcreteMachine:
case Microcycle::SelectWord | Microcycle::Read: case Microcycle::SelectWord | Microcycle::Read:
cycle.value->full = memory_base[word_address]; cycle.value->full = memory_base[word_address];
// printf("[%06x] -> %04x\n", word_address << 1, cycle.value->full);
break; break;
case Microcycle::SelectByte | Microcycle::Read: case Microcycle::SelectByte | Microcycle::Read:
cycle.value->halves.low = uint8_t(memory_base[word_address] >> cycle.byte_shift()); cycle.value->halves.low = uint8_t(memory_base[word_address] >> cycle.byte_shift());
// printf("[%06x] -> %02x\n", (*cycle.address) & 0xffffff, cycle.value->halves.low);
break; break;
case Microcycle::SelectWord: case Microcycle::SelectWord:
// printf("%04x -> [%06x]\n", cycle.value->full, word_address << 1);
memory_base[word_address] = cycle.value->full; memory_base[word_address] = cycle.value->full;
printf("%04x -> %06x\n", cycle.value->full, word_address << 1);
break; break;
case Microcycle::SelectByte: case Microcycle::SelectByte:
// printf("%02x -> [%06x]\n", cycle.value->halves.low, (*cycle.address) & 0xffffff);
memory_base[word_address] = uint16_t( memory_base[word_address] = uint16_t(
(cycle.value->halves.low << cycle.byte_shift()) | (cycle.value->halves.low << cycle.byte_shift()) |
(memory_base[word_address] & (0xffff ^ cycle.byte_mask())) (memory_base[word_address] & cycle.untouched_byte_mask())
); );
break; break;
} }