6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-20 14:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Corrects effect of pc_is_outside_bios.

Browse Source
This commit is contained in:
Thomas Harte 2018-02-11 20:32:45 -05:00
parent dcf313a833
commit f02989649c
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/MSX/Cartridges/ASCII16kb.hpp
View File

@ -26,11 +26,15 @@ class ASCII16kbROMSlotHandler: public ROMSlotHandler {
confidence_counter_.add_miss(); confidence_counter_.add_miss();
break; break;
case 0xc: case 0xc:
if(pc_is_outside_bios && address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x4000, 0x4000, 0x4000); map_.map(slot_, value * 0x4000, 0x4000, 0x4000);
break; break;
case 0xe: case 0xe:
if(pc_is_outside_bios && (address == 0x7000 || address == 0x77ff)) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x7000 || address == 0x77ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x4000, 0x8000, 0x4000); map_.map(slot_, value * 0x4000, 0x8000, 0x4000);
break; break;
} }

16
Machines/MSX/Cartridges/ASCII8kb.hpp
View File

@ -26,19 +26,27 @@ class ASCII8kbROMSlotHandler: public ROMSlotHandler {
confidence_counter_.add_miss(); confidence_counter_.add_miss();
break; break;
case 0xc: case 0xc:
if(pc_is_outside_bios && (address == 0x6000 || address == 0x60ff)) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x6000 || address == 0x60ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x4000, 0x2000); map_.map(slot_, value * 0x2000, 0x4000, 0x2000);
break; break;
case 0xd: case 0xd:
if(pc_is_outside_bios && (address == 0x6800 || address == 0x68ff)) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x6800 || address == 0x68ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x6000, 0x2000); map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break; break;
case 0xe: case 0xe:
if(pc_is_outside_bios && (address == 0x7000 || address == 0x70ff)) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x7000 || address == 0x70ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x8000, 0x2000); map_.map(slot_, value * 0x2000, 0x8000, 0x2000);
break; break;
case 0xf: case 0xf:
if(pc_is_outside_bios && (address == 0x7800 || address == 0x78ff)) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x7800 || address == 0x78ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0xa000, 0x2000); map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break; break;
} }

14
Machines/MSX/Cartridges/Konami.hpp
View File

@ -20,21 +20,27 @@ class KonamiROMSlotHandler: public ROMSlotHandler {
map_(map), slot_(slot) {} map_(map), slot_(slot) {}
void write(uint16_t address, uint8_t value, bool pc_is_outside_bios) override { void write(uint16_t address, uint8_t value, bool pc_is_outside_bios) override {
// printf("K %04x[%c] ", address, pc_is_outside_bios ? '.' : '+'); // printf("K %04x[%c]\n", address, pc_is_outside_bios ? '.' : '+');
switch(address >> 13) { switch(address >> 13) {
default: default:
if(pc_is_outside_bios) confidence_counter_.add_miss(); if(pc_is_outside_bios) confidence_counter_.add_miss();
break; break;
case 3: case 3:
if(pc_is_outside_bios && address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x6000, 0x2000); map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break; break;
case 4: case 4:
if(pc_is_outside_bios && address == 0x8000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x8000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x8000, 0x2000); map_.map(slot_, value * 0x2000, 0x8000, 0x2000);
break; break;
case 5: case 5:
if(pc_is_outside_bios && address == 0xa000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0xa000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0xa000, 0x2000); map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break; break;
} }

16
Machines/MSX/Cartridges/KonamiWithSCC.hpp
View File

@ -27,15 +27,21 @@ class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
if(pc_is_outside_bios) confidence_counter_.add_miss(); if(pc_is_outside_bios) confidence_counter_.add_miss();
break; break;
case 0x0a: case 0x0a:
if(pc_is_outside_bios && address == 0x5000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x5000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x4000, 0x2000); map_.map(slot_, value * 0x2000, 0x4000, 0x2000);
break; break;
case 0x0e: case 0x0e:
if(pc_is_outside_bios && address == 0x7000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x7000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0x6000, 0x2000); map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break; break;
case 0x12: case 0x12:
if(pc_is_outside_bios && address == 0x9000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0x9000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
if((value&0x3f) == 0x3f) { if((value&0x3f) == 0x3f) {
scc_is_visible_ = true; scc_is_visible_ = true;
map_.unmap(slot_, 0x8000, 0x2000); map_.unmap(slot_, 0x8000, 0x2000);
@ -53,7 +59,9 @@ class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
} }
break; break;
case 0x16: case 0x16:
if(pc_is_outside_bios && address == 0xb000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal(); if(pc_is_outside_bios) {
if(address == 0xb000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
}
map_.map(slot_, value * 0x2000, 0xa000, 0x2000); map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break; break;
} }