6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Express the BSR/Bcc.l test properly.

Browse Source
This commit is contained in:
Thomas Harte 2022-04-18 14:42:31 -04:00
parent 7aa250eaf7
commit e4c6251ef5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
InstructionSets/68k/Decoder.cpp
View File

@ -728,7 +728,7 @@ Preinstruction Predecoder<model>::decode6(uint16_t instruction) {
switch(instruction & 0xff) { switch(instruction & 0xff) {
case 0x00: Decode(Op::BSRw); case 0x00: Decode(Op::BSRw);
case 0xff: case 0xff:
if constexpr (model != Model::M68000) { if constexpr (model >= Model::M68020) {
Decode(Op::BSRl); Decode(Op::BSRl);
} }
[[fallthrough]]; [[fallthrough]];
@ -741,7 +741,7 @@ Preinstruction Predecoder<model>::decode6(uint16_t instruction) {
switch(instruction & 0xff) { switch(instruction & 0xff) {
case 0x00: Decode(Op::Bccw); case 0x00: Decode(Op::Bccw);
case 0xff: case 0xff:
if constexpr (model != Model::M68000) { if constexpr (model >= Model::M68020) {
Decode(Op::Bccl); Decode(Op::Bccl);
} }
[[fallthrough]]; [[fallthrough]];
@ -1016,3 +1016,7 @@ Preinstruction Predecoder<model>::decode(uint16_t instruction) {
} }
template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68000>; template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68000>;
template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68010>;
template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68020>;
template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68030>;
template class InstructionSet::M68k::Predecoder<InstructionSet::M68k::Model::M68040>;

4
InstructionSets/68k/Model.hpp
View File

@ -14,6 +14,10 @@ namespace M68k {
enum class Model { enum class Model {
M68000, M68000,
M68010,
M68020,
M68030,
M68040,
}; };
} }