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

Whether the BIOS is available in hardware is now decided entirely based on whether it is on disk.

Browse Source
This commit is contained in:
Thomas Harte 2020-05-12 00:11:46 -04:00
parent 3f2fb1fa58
commit 8596a9826f
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Machines/MasterSystem/MasterSystem.cpp
View File

@ -133,30 +133,31 @@ class ConcreteMachine:
paging_registers_[2] = 0; paging_registers_[2] = 0;
} }
// Load the BIOS if relevant. // Load the BIOS if available.
if(has_bios()) { //
// TODO: there's probably a million other versions of the Master System BIOS; try to build a // TODO: there's probably a million other versions of the Master System BIOS; try to build a
// CRC32 catalogue of those. So far: // CRC32 catalogue of those. So far:
// //
// 0072ed54 = US/European BIOS 1.3 // 0072ed54 = US/European BIOS 1.3
// 48d44a13 = Japanese BIOS 2.1 // 48d44a13 = Japanese BIOS 2.1
const bool is_japanese = target.region == Target::Region::Japan; const bool is_japanese = target.region == Target::Region::Japan;
const auto roms = rom_fetcher( const auto roms = rom_fetcher(
{ {"MasterSystem", { {"MasterSystem",
is_japanese ? "the Japanese Master System BIOS" : "the European/US Master System BIOS", is_japanese ? "the Japanese Master System BIOS" : "the European/US Master System BIOS",
is_japanese ? "japanese-bios.sms" : "bios.sms", is_japanese ? "japanese-bios.sms" : "bios.sms",
8*1024, 8*1024,
{ is_japanese ? 0x48d44a13u : 0x0072ed54u } { is_japanese ? 0x48d44a13u : 0x0072ed54u }
} } } }
); );
if(!roms[0]) { if(!roms[0]) {
// No BIOS found; attempt to boot as though it has already disabled itself. // No BIOS found; attempt to boot as though it has already disabled itself.
memory_control_ |= 0x08; has_bios_ = false;
std::cerr << "No BIOS found; attempting to start cartridge directly" << std::endl; memory_control_ |= 0x08;
} else { std::cerr << "No BIOS found; attempting to start cartridge directly" << std::endl;
roms[0]->resize(8*1024); } else {
memcpy(&bios_, roms[0]->data(), roms[0]->size()); has_bios_ = true;
} roms[0]->resize(8*1024);
memcpy(&bios_, roms[0]->data(), roms[0]->size());
} }
page_cartridge(); page_cartridge();
@ -486,9 +487,9 @@ class ConcreteMachine:
} }
using Target = Analyser::Static::Sega::Target; using Target = Analyser::Static::Sega::Target;
Target::Model model_; const Target::Model model_;
Target::Region region_; const Target::Region region_;
Target::PagingScheme paging_scheme_; const Target::PagingScheme paging_scheme_;
CPU::Z80::Processor<ConcreteMachine, false, false> z80_; CPU::Z80::Processor<ConcreteMachine, false, false> z80_;
JustInTimeActor<TI::TMS::TMS9918> vdp_; JustInTimeActor<TI::TMS::TMS9918> vdp_;
@ -550,13 +551,11 @@ class ConcreteMachine:
} }
// Throw the BIOS on top if this machine has one and it isn't disabled. // Throw the BIOS on top if this machine has one and it isn't disabled.
if(has_bios() && !(memory_control_ & 0x08)) { if(has_bios_ && !(memory_control_ & 0x08)) {
map(read_pointers_, bios_, 8*1024, 0); map(read_pointers_, bios_, 8*1024, 0);
} }
} }
bool has_bios() { bool has_bios_ = true;
return is_master_system(model_) && region_ != Target::Region::Japan;
}
}; };
} }