6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-08-23 02:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Resolve wrong-headed mapping of LEA to MOVEAl.

Browse Source
This commit is contained in:
Thomas Harte 2022-04-19 19:36:21 -04:00
parent 2707887a65
commit 343a8e0192
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InstructionSets/68k/Decoder.cpp
View File

@ -80,8 +80,6 @@ constexpr Operation Predecoder<model>::operation(OpT op) {
case BCLRI: return Operation::BCLR; case BCLRI: return Operation::BCLR;
case BSETI: return Operation::BSET; case BSETI: return Operation::BSET;
case LEA: return Operation::MOVEAl;
#define ImmediateGroup(x) \ #define ImmediateGroup(x) \
case x##Ib: return Operation::x##b; \ case x##Ib: return Operation::x##b; \
case x##Iw: return Operation::x##w; \ case x##Iw: return Operation::x##w; \
@ -400,7 +398,7 @@ template <uint8_t op, bool validate> Preinstruction Predecoder<model>::decode(ui
// b9–b11: destination address register; // b9–b11: destination address register;
// b0–b2 and b3–b5: source effective address. // b0–b2 and b3–b5: source effective address.
// //
case LEA: case OpT(Operation::LEA):
return validated<op, validate>( return validated<op, validate>(
Preinstruction(operation, Preinstruction(operation,
combined_mode(ea_mode, ea_register), ea_register, combined_mode(ea_mode, ea_register), ea_register,
@ -822,7 +820,7 @@ Preinstruction Predecoder<model>::decode4(uint16_t instruction) {
} }
switch(instruction & 0x1c0) { switch(instruction & 0x1c0) {
case 0x1c0: Decode(LEA); // 4-110 (p214) case 0x1c0: Decode(Op::LEA); // 4-110 (p214)
case 0x180: Decode(Op::CHK); // 4-69 (p173) case 0x180: Decode(Op::CHK); // 4-69 (p173)
default: break; default: break;
} }

2
InstructionSets/68k/Decoder.hpp
View File

@ -75,8 +75,6 @@ template <Model model> class Predecoder {
BTSTI, BCHGI, BCLRI, BSETI, BTSTI, BCHGI, BCLRI, BSETI,
LEA,
MOVEq, MOVEq,
}; };

2
InstructionSets/68k/Instruction.hpp
View File

@ -33,7 +33,7 @@ enum class Operation: uint8_t {
MOVEb, MOVEw, MOVEl, MOVEb, MOVEw, MOVEl,
MOVEAw, MOVEAl, MOVEAw, MOVEAl,
MOVEq, MOVEq,
PEA, LEA, PEA,
MOVEtoSR, MOVEfromSR, MOVEtoSR, MOVEfromSR,
MOVEtoCCR, MOVEtoCCR,