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 void perform(DataProcessing); - template void perform(Condition, Multiply); + template void perform(Multiply); template void perform(Condition, SingleDataTransfer); template void perform(Condition, BlockDataTransfer); - template void perform(Condition, Branch); + template void perform(Branch); template void perform(Condition, CoprocessorRegisterTransfer); template void perform(Condition, CoprocessorDataOperation); template 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 void perform(Condition, CoprocessorDataOperation) {} template void perform(Condition, CoprocessorDataTransfer) {} - void software_interrupt(Condition) {} + void software_interrupt() {} void unknown(uint32_t) {} private: