6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Add RISC OS 3.11 to catalogue, while bug hunting.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-11 22:19:14 -04:00
parent 1ccfae885c
commit a5ebac1b29
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Machines/Acorn/Archimedes/Archimedes.cpp
View File

@ -750,13 +750,13 @@ class ConcreteMachine:
all.insert(instruction); all.insert(instruction);
// if(executor_.pc() == 0x03801404) { if(executor_.pc() == 0x03801a0c) {
// printf(""); printf("");
// } }
// log |= (executor_.pc() > 0 && executor_.pc() < 0x03800000); // log |= (executor_.pc() > 0x02000000 && executor_.pc() < 0x02000078);
// log |= executor_.pc() == 0x02000078; log |= executor_.pc() == 0x03801980;
// log |= (executor_.pc() > 0x03801000); // log |= (executor_.pc() > 0x03801000);
// log &= (executor_.pc() != 0x038019f8); log &= executor_.pc() != 0x03801a0c;
if(executor_.pc() == 0x02000078) { if(executor_.pc() == 0x02000078) {
if(!all.empty()) { if(!all.empty()) {
@ -783,6 +783,8 @@ class ConcreteMachine:
// if( // if(
// executor_.pc() > 0x038021d0 && // executor_.pc() > 0x038021d0 &&
// last_r1 != executor_.registers()[1]
// ||
// ( // (
// last_link != executor_.registers()[14] || // last_link != executor_.registers()[14] ||
// last_r0 != executor_.registers()[0] || // last_r0 != executor_.registers()[0] ||
@ -797,6 +799,10 @@ class ConcreteMachine:
// executor_.registers()[10], // executor_.registers()[10],
// executor_.registers()[1] // executor_.registers()[1]
// ); // );
// logger.info().append("%08x modified R1 to %08x",
// last_pc,
// executor_.registers()[1]
// );
// last_link = executor_.registers()[14]; // last_link = executor_.registers()[14];
// last_r0 = executor_.registers()[0]; // last_r0 = executor_.registers()[0];
// last_r10 = executor_.registers()[10]; // last_r10 = executor_.registers()[10];

3
Machines/Utility/ROMCatalogue.cpp
View File

@ -540,6 +540,9 @@ Description::Description(Name name) {
*this = Description(name, "Electron", "the Electron MOS ROM v1.00", "os.rom", 16*1024, 0xbf63fb1fu); *this = Description(name, "Electron", "the Electron MOS ROM v1.00", "os.rom", 16*1024, 0xbf63fb1fu);
break; break;
case Name::AcornRISCOS311:
*this = Description(name, "Archimedes", "RISC OS v3.11", "ROM311", 2*1024*1024, 0x54c0c963u);
break;
case Name::AcornRISCOS319: case Name::AcornRISCOS319:
*this = Description(name, "Archimedes", "RISC OS v3.19", "ROM319", 2*1024*1024, 0x00c7a3d3u); *this = Description(name, "Archimedes", "RISC OS v3.19", "ROM319", 2*1024*1024, 0x00c7a3d3u);
break; break;

1
Machines/Utility/ROMCatalogue.hpp
View File

@ -32,6 +32,7 @@ enum Name {
Acorn1770DFS, Acorn1770DFS,
// Acorn Archimedes. // Acorn Archimedes.
AcornRISCOS311,
AcornRISCOS319, AcornRISCOS319,
// Amiga. // Amiga.