From 7b3cf6e7476012f0df84475a5e7048e0a32c62bb Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 3 Jun 2022 11:15:39 -0400 Subject: [PATCH 1/2] Add missing instruction: RESET. --- OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json b/OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json index dce3b8341..bbc7197be 100644 --- a/OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json +++ b/OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json @@ -45454,7 +45454,7 @@ "4e73": "RTE", "4e72": "STOP #", "4e71": "NOP", - "4e70": "None", + "4e70": "RESET", "4e6f": "MOVEfromUSP A7", "4e6e": "MOVEfromUSP A6", "4e6d": "MOVEfromUSP A5", @@ -65535,4 +65535,4 @@ "0002": "OR.b #, D2", "0001": "OR.b #, D1", "0000": "OR.b #, D0" -} \ No newline at end of file +} From 71e38a67817e1e4ac4921c8022ff41b0f8828e42 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 3 Jun 2022 11:15:50 -0400 Subject: [PATCH 2/2] Fix decoding of RESET. --- InstructionSets/M68k/Decoder.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InstructionSets/M68k/Decoder.cpp b/InstructionSets/M68k/Decoder.cpp index ce2359c19..e63f29f6a 100644 --- a/InstructionSets/M68k/Decoder.cpp +++ b/InstructionSets/M68k/Decoder.cpp @@ -71,7 +71,7 @@ uint32_t operand_mask(AddressingMode mode1, AddressingMode mode2) { /// immediate operand. template constexpr Operation Predecoder::operation(OpT op) { - if(op < OpT(Operation::Max)) { + if(op <= OpT(Operation::Max)) { return Operation(op); } @@ -445,6 +445,7 @@ template uint32_t Predecoder::invalid_operands() { case OpT(Operation::RTS): case OpT(Operation::TRAPV): case OpT(Operation::RTR): + case OpT(Operation::RESET): return ~NoOperandMask::value; case OpT(Operation::UNLINK):