Apple-2-Tools
/
twoapple-reboot
mirror of https://github.com/edmccard/twoapple-reboot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix system to use new opindex memory access

This commit is contained in:
edmccard 2012-04-28 20:07:00 -04:00
parent aa55b972e0
commit 22b32fc348
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/memory.d
View File

@ -253,14 +253,15 @@ class AddressDecoder
writePages[0xC0] = &switches.write;
}
ubyte read(ushort addr)
ubyte opIndex(ushort addr)
{
return readPages[addr >> 8](addr);
}
void write(ushort addr, ubyte val)
ubyte opIndexAssign(ubyte val, ushort addr)
{
writePages[addr >> 8](addr, val);
return val;
}
// XXX address read only/write only code

4
src/video/scanner.d
View File

@ -256,8 +256,8 @@ class Scanner_II : Scanner
{
uint clock = vidCycle.val();
if (((clock % 65) < 25) && (mode != Mode.HIRES))
return decoder.read(
cast(ushort)(0x1400 + (page * 0x400) + scanOffset(clock, mode)));
return decoder[
cast(ushort)(0x1400 + (page * 0x400) + scanOffset(clock, mode))];
else
return displayMem[mode][page].data[scanOffset(clock, mode)];
}