6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-21 02:37:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1492 from TomHarte/ATBIOS

Browse Source 
Support real IBM BIOS, either in odd/even or complete form.
This commit is contained in:
Thomas Harte 2025-03-15 22:12:54 -04:00 committed by GitHub
commit 14a8f4511c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Machines/PCCompatible/PCCompatible.cpp
View File

@ -592,19 +592,26 @@ public:
// Fetch the BIOS.
const auto font = Video::FontROM;
constexpr auto biosXT = ROM::Name::PCCompatibleGLaBIOS;
constexpr auto tickXT = ROM::Name::PCCompatibleGLaTICK;
constexpr auto bios_XT = ROM::Name::PCCompatibleGLaBIOS;
constexpr auto tick_XT = ROM::Name::PCCompatibleGLaTICK;
constexpr auto biosAT = ROM::Name::PCCompatiblePhoenix80286BIOS;
constexpr auto bios_AT = ROM::Name::PCCompatibleIBMATBIOS;
constexpr auto bios_AT_even = ROM::Name::PCCompatibleIBMATBIOSNov85U27;
constexpr auto bios_AT_odd = ROM::Name::PCCompatibleIBMATBIOSNov85U47;
constexpr auto bios_AT_Phoenix = ROM::Name::PCCompatiblePhoenix80286BIOS;
ROM::Request request = ROM::Request(font);
switch(pc_model) {
default:
request = request && ROM::Request(biosXT) && ROM::Request(tickXT);
break;
case Analyser::Static::PCCompatible::Model::AT:
request = request && ROM::Request(biosAT);
request = request && ROM::Request(bios_XT) && ROM::Request(tick_XT);
break;
case Analyser::Static::PCCompatible::Model::AT: {
auto at_even_odd = ROM::Request(bios_AT_odd) && ROM::Request(bios_AT_even);
auto at_full = ROM::Request(bios_AT);
auto phoenix_full = ROM::Request(bios_AT_Phoenix);
const auto at_any = at_even_odd || at_full || phoenix_full;
request = request && at_any;
} break;
}
auto roms = rom_fetcher(request);
@ -614,20 +621,50 @@ public:
switch(pc_model) {
default: {
const auto &bios_contents = roms.find(biosXT)->second;
const auto &bios_contents = roms.find(bios_XT)->second;
context_.memory.install(0x10'0000 - bios_contents.size(), bios_contents.data(), bios_contents.size());
// If found, install GlaTICK at 0xd'0000.
auto tick_contents = roms.find(tickXT);
auto tick_contents = roms.find(tick_XT);
if(tick_contents != roms.end()) {
context_.memory.install(0xd'0000, tick_contents->second.data(), tick_contents->second.size());
}
} break;
case Analyser::Static::PCCompatible::Model::AT:
const auto &bios_contents = roms.find(biosAT)->second;
context_.memory.install(0x10'0000 - bios_contents.size(), bios_contents.data(), bios_contents.size());
break;
case Analyser::Static::PCCompatible::Model::AT: {
const auto install_at = [&] {
const auto bios_even = roms.find(bios_AT_even);
const auto bios_odd = roms.find(bios_AT_odd);
if(bios_even != roms.end() && bios_odd != roms.end()) {
std::vector<uint8_t> bios(65536);
for(size_t c = 0; c < bios.size(); c++) {
bios[c] = (c & 1) ? bios_odd->second[c >> 1] : bios_even->second[c >> 1];
}
context_.memory.install(
0x10'0000 - bios.size(),
bios.data(),
bios.size()
);
return;
}
for(const auto name: {bios_AT, bios_AT_Phoenix}) {
const auto bios_contents = roms.find(name);
if(bios_contents != roms.end()) {
context_.memory.install(
0x10'0000 - bios_contents->second.size(),
bios_contents->second.data(),
bios_contents->second.size()
);
return;
}
}
};
install_at();
} break;
}
// Give the video card something to read from.

9
Machines/Utility/ROMCatalogue.cpp
View File

@ -588,6 +588,15 @@ Description::Description(Name name) {
case Name::PCCompatiblePhoenix80286BIOS:
*this = Description(name, "PCCompatible", "Phoenix 80286 BIOS 3.05", "Phoenix 80286 ROM BIOS Version 3.05.bin", 32 * 1024, 0x8d0d318au);
break;
case Name::PCCompatibleIBMATBIOS:
*this = Description(name, "PCCompatible", "IBM PC AT BIOS v3", "at-bios.bin", 64 * 1024, 0x674426beu);
break;
case Name::PCCompatibleIBMATBIOSNov85U27:
*this = Description(name, "PCCompatible", "IBM PC AT BIOS; 15th Nov 1985; U27", "BIOS_5170_15NOV85_U27_61X9266_27256.BIN", 32 * 1024, 0x4995be7au);
break;
case Name::PCCompatibleIBMATBIOSNov85U47:
*this = Description(name, "PCCompatible", "IBM PC AT BIOS; 15th Nov 1985; U47", "BIOS_5170_15NOV85_U47_61X9265_27256.BIN", 32 * 1024, 0xc32713e4u);
break;
case Name::PCCompatibleCGAFont:
*this = Description(name, "PCCompatible", "IBM's CGA font", "CGA.F08", 8 * 256, 0xa362ffe6u);
break;

6
Machines/Utility/ROMCatalogue.hpp
View File

@ -141,6 +141,10 @@ enum Name {
PCCompatibleGLaTICK,
PCCompatiblePhoenix80286BIOS,
PCCompatibleIBMATBIOS,
PCCompatibleIBMATBIOSNov85U27,
PCCompatibleIBMATBIOSNov85U47,
PCCompatibleMDAFont,
PCCompatibleCGAFont,
PCCompatibleEGABIOS,
@ -236,6 +240,8 @@ struct Request {
Request(Name name, bool optional = false);
Request() = default;
// TODO: the following is definitely not const correct.
/// Forms the request that would be satisfied by @c this plus the right-hand side.
Request operator &&(const Request &);