6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-13 22:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1040 from TomHarte/68000RESET

Browse Source 
Fix decoding of 68000 RESET.
This commit is contained in:
Thomas Harte 2022-06-03 11:20:27 -04:00 committed by GitHub
commit 9848fa9a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InstructionSets/M68k/Decoder.cpp
View File

@ -71,7 +71,7 @@ uint32_t operand_mask(AddressingMode mode1, AddressingMode mode2) {
/// immediate operand. /// immediate operand.
template <Model model> template <Model model>
constexpr Operation Predecoder<model>::operation(OpT op) { constexpr Operation Predecoder<model>::operation(OpT op) {
if(op < OpT(Operation::Max)) { if(op <= OpT(Operation::Max)) {
return Operation(op); return Operation(op);
} }
@ -445,6 +445,7 @@ template <uint8_t op> uint32_t Predecoder<model>::invalid_operands() {
case OpT(Operation::RTS): case OpT(Operation::RTS):
case OpT(Operation::TRAPV): case OpT(Operation::TRAPV):
case OpT(Operation::RTR): case OpT(Operation::RTR):
case OpT(Operation::RESET):
return ~NoOperandMask::value; return ~NoOperandMask::value;
case OpT(Operation::UNLINK): case OpT(Operation::UNLINK):

4
OSBindings/Mac/Clock SignalTests/68000 Decoding/68000ops.json
View File

@ -45454,7 +45454,7 @@
"4e73": "RTE", "4e73": "RTE",
"4e72": "STOP #", "4e72": "STOP #",
"4e71": "NOP", "4e71": "NOP",
"4e70": "None", "4e70": "RESET",
"4e6f": "MOVEfromUSP A7", "4e6f": "MOVEfromUSP A7",
"4e6e": "MOVEfromUSP A6", "4e6e": "MOVEfromUSP A6",
"4e6d": "MOVEfromUSP A5", "4e6d": "MOVEfromUSP A5",
@ -65535,4 +65535,4 @@
"0002": "OR.b #, D2", "0002": "OR.b #, D2",
"0001": "OR.b #, D1", "0001": "OR.b #, D1",
"0000": "OR.b #, D0" "0000": "OR.b #, D0"
} }