From 9b42d35d565d00e7949cb7e2e5a558309af24cf1 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 28 Feb 2024 11:42:33 -0500
Subject: [PATCH] Update interface.

---
 InstructionSets/ARM/OperationMapper.hpp             | 8 ++++----
 OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/InstructionSets/ARM/OperationMapper.hpp b/InstructionSets/ARM/OperationMapper.hpp
index d8b1f34ca..2cf3e9fe6 100644
--- a/InstructionSets/ARM/OperationMapper.hpp
+++ b/InstructionSets/ARM/OperationMapper.hpp
@@ -443,7 +443,7 @@ struct OperationMapper {
 
 		// Software interreupt; cf. p.35.
 		if constexpr (((partial >> 24) & 0b1111) == 0b1111) {
-			scheduler.software_interrupt(condition);
+			scheduler.software_interrupt();
 			return;
 		}
 
@@ -502,16 +502,16 @@ struct SampleScheduler {
 	//	(2)	An operation-specific encapsulation of the operation code for decoding of fields that didn't
 	//		fit into the template parameters.
 	template <Flags> void perform(DataProcessing);
-	template <Operation, Flags> void perform(Condition, Multiply);
+	template <Flags> void perform(Multiply);
 	template <Operation, Flags> void perform(Condition, SingleDataTransfer);
 	template <Operation, Flags> void perform(Condition, BlockDataTransfer);
-	template <Operation> void perform(Condition, Branch);
+	template <Flags> void perform(Branch);
 	template <Operation, Flags> void perform(Condition, CoprocessorRegisterTransfer);
 	template <Flags> void perform(Condition, CoprocessorDataOperation);
 	template<Operation, Flags> void perform(Condition, CoprocessorDataTransfer);
 
 	// Irregular operations.
-	void software_interrupt(Condition);
+	void software_interrupt();
 	void unknown(uint32_t opcode);
 };
 
diff --git a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm
index 59684b901..31ab14194 100644
--- a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm	
@@ -317,7 +317,7 @@ struct Scheduler {
 	template <Flags> void perform(Condition, CoprocessorDataOperation) {}
 	template<Operation, Flags> void perform(Condition, CoprocessorDataTransfer) {}
 
-	void software_interrupt(Condition) {}
+	void software_interrupt() {}
 	void unknown(uint32_t) {}
 
 private: