From 335d13d06d2742d769ee96d79b852375884d0749 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 30 Mar 2024 21:49:21 -0400
Subject: [PATCH] Mildly improve logging, define a few more ROMs.

---
 Machines/Acorn/Archimedes/Archimedes.cpp       | 15 ++++++++++-----
 .../Acorn/Archimedes/InputOutputController.hpp |  1 +
 Machines/Acorn/Archimedes/MemoryController.hpp | 18 ++++++++++++++----
 Machines/Utility/ROMCatalogue.cpp              |  6 ++++++
 Machines/Utility/ROMCatalogue.hpp              |  2 ++
 Outputs/Log.hpp                                |  1 +
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp
index fb403d082..416921da5 100644
--- a/Machines/Acorn/Archimedes/Archimedes.cpp
+++ b/Machines/Acorn/Archimedes/Archimedes.cpp
@@ -108,7 +108,7 @@ class ConcreteMachine:
 		) : executor_(*this, *this) {
 			set_clock_rate(ClockRate);
 
-			constexpr ROM::Name risc_os = ROM::Name::AcornRISCOS311;
+			constexpr ROM::Name risc_os = ROM::Name::AcornRISCOS319;
 			ROM::Request request(risc_os);
 			auto roms = rom_fetcher(request);
 			if(!request.validate(roms)) {
@@ -278,6 +278,9 @@ class ConcreteMachine:
 						break;
 						case 0x0d:
 							swis.back().swi_name = "OS_Find";
+							if(executor_.registers()[0] >= 0x40) {
+								pointer = executor_.registers()[1];
+							}
 						break;
 						case 0x1d:
 							swis.back().swi_name = "OS_Heap";
@@ -309,6 +312,7 @@ class ConcreteMachine:
 						break;
 						case 0x27:
 							swis.back().swi_name = "OS_GSTrans";
+							pointer = executor_.registers()[0];
 						break;
 						case 0x29:
 							swis.back().swi_name = "OS_FSControl";
@@ -342,7 +346,7 @@ class ConcreteMachine:
 							executor_.bus.template read<uint8_t>(pointer, next, InstructionSet::ARM::Mode::Supervisor, false);
 							++pointer;
 
-							if(next == '\0') break;
+							if(next < 32) break;
 							swis.back().value_name.push_back(static_cast<char>(next));
 						}
 					}
@@ -366,13 +370,14 @@ class ConcreteMachine:
 						info.append("%s", back.swi_name.c_str());
 					}
 
+					if(!back.value_name.empty()) {
+						info.append(" %s", back.value_name.c_str());
+					}
+
 					info.append(" @ %08x ", back.address);
 					for(uint32_t c = 0; c < 10; c++) {
 						info.append("r%d:%08x ", c, back.regs[c]);
 					}
-					if(!back.value_name.empty()) {
-						info.append("for %s", back.value_name.c_str());
-					}
 				}
 
 				swis.pop_back();
diff --git a/Machines/Acorn/Archimedes/InputOutputController.hpp b/Machines/Acorn/Archimedes/InputOutputController.hpp
index fa1c1f677..e19422095 100644
--- a/Machines/Acorn/Archimedes/InputOutputController.hpp
+++ b/Machines/Acorn/Archimedes/InputOutputController.hpp
@@ -161,6 +161,7 @@ struct InputOutputController {
 		switch(target.bank) {
 			default:
 				logger.error().append("Unrecognised IOC read from %08x i.e. bank %d / type %d", address, target.bank, target.type);
+				destination = IntT(~0);
 			break;
 
 			// Bank 0: internal registers.
diff --git a/Machines/Acorn/Archimedes/MemoryController.hpp b/Machines/Acorn/Archimedes/MemoryController.hpp
index bcaa65e3e..101923ae1 100644
--- a/Machines/Acorn/Archimedes/MemoryController.hpp
+++ b/Machines/Acorn/Archimedes/MemoryController.hpp
@@ -45,10 +45,20 @@ struct MemoryController {
 	}
 
 	void set_rom(const std::vector<uint8_t> &rom) {
-		std::copy(
-			rom.begin(),
-			rom.begin() + static_cast<ptrdiff_t>(std::min(rom.size(), rom_.size())),
-			rom_.begin());
+		if(rom_.size() % rom.size() || rom.size() > rom_.size()) {
+			// TODO: throw.
+			return;
+		}
+
+		// Copy in as many times as it'll fit.
+		std::size_t base = 0;
+		while(base < rom_.size()) {
+			std::copy(
+				rom.begin(),
+				rom.end(),
+				rom_.begin() + base);
+			base += rom.size();
+		}
 	}
 
 	template <typename IntT>
diff --git a/Machines/Utility/ROMCatalogue.cpp b/Machines/Utility/ROMCatalogue.cpp
index dfc9f9827..9e02cbf1c 100644
--- a/Machines/Utility/ROMCatalogue.cpp
+++ b/Machines/Utility/ROMCatalogue.cpp
@@ -540,6 +540,12 @@ Description::Description(Name name) {
 			*this = Description(name, "Electron", "the Electron MOS ROM v1.00", "os.rom", 16*1024, 0xbf63fb1fu);
 		break;
 
+		case Name::AcornArthur030:
+			*this = Description(name, "Archimedes", "Arthur v0.30", "ROM030", 512*1024, 0x5df8ed42u);
+		break;
+		case Name::AcornRISCOS200:
+			*this = Description(name, "Archimedes", "RISC OS v2.00", "ROM200", 512*1024, 0x89c4ad36u);
+		break;
 		case Name::AcornRISCOS311:
 			*this = Description(name, "Archimedes", "RISC OS v3.11", "ROM311", 2*1024*1024, 0x54c0c963u);
 		break;
diff --git a/Machines/Utility/ROMCatalogue.hpp b/Machines/Utility/ROMCatalogue.hpp
index 51f3d8b72..44d9022bc 100644
--- a/Machines/Utility/ROMCatalogue.hpp
+++ b/Machines/Utility/ROMCatalogue.hpp
@@ -32,6 +32,8 @@ enum Name {
 	Acorn1770DFS,
 
 	// Acorn Archimedes.
+	AcornArthur030,
+	AcornRISCOS200,
 	AcornRISCOS311,
 	AcornRISCOS319,
 
diff --git a/Outputs/Log.hpp b/Outputs/Log.hpp
index d0bba9ccc..5832b696f 100644
--- a/Outputs/Log.hpp
+++ b/Outputs/Log.hpp
@@ -80,6 +80,7 @@ constexpr bool is_enabled(Source source) {
 		case Source::SCC:
 		case Source::SCSI:
 		case Source::I2C:
+		case Source::Keyboard:
 			return false;
 	}
 }