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

Corrects decoding of CMPA.

Browse Source
This commit is contained in:
Thomas Harte 2019-04-20 21:21:33 -04:00
parent 0be9a0cb88
commit c66728dce2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -61,7 +61,7 @@ template <class T, bool dtack_is_implicit> void Processor<T, dtack_is_implicit>:
// } // }
static bool should_log = false; static bool should_log = false;
should_log |= program_counter_.full >= 0x4F54; should_log |= program_counter_.full >= 0x4F54 && program_counter_.full <= 0x4F84;
if(should_log) { if(should_log) {
std::cout << "d0:" << std::setw(8) << std::setfill('0') << data_[0].full << " "; std::cout << "d0:" << std::setw(8) << std::setfill('0') << data_[0].full << " ";
std::cout << "d1:" << std::setw(8) << std::setfill('0') << data_[1].full << " "; std::cout << "d1:" << std::setw(8) << std::setfill('0') << data_[1].full << " ";
@ -83,8 +83,8 @@ template <class T, bool dtack_is_implicit> void Processor<T, dtack_is_implicit>:
std::cerr << "68000 Abilities exhausted; can't manage instruction " << std::hex << decoded_instruction_ << " from " << (program_counter_.full - 4) << std::endl; std::cerr << "68000 Abilities exhausted; can't manage instruction " << std::hex << decoded_instruction_ << " from " << (program_counter_.full - 4) << std::endl;
return; return;
} else { } else {
if(0x4f7a == program_counter_.full - 4) return; // if(0x4f7a == program_counter_.full - 4)return;
if(should_log) std::cout << std::hex << (program_counter_.full - 4) << ": " << std::setw(4) << decoded_instruction_ << '\t'; std::cout << std::hex << (program_counter_.full - 4) << ": " << std::setw(4) << decoded_instruction_ << '\t';
} }
active_program_ = &instructions[decoded_instruction_]; active_program_ = &instructions[decoded_instruction_];

5
Processors/68000/Implementation/68000Storage.cpp
View File

@ -1778,6 +1778,11 @@ struct ProcessorStorageConstructor {
} break; } break;
case Decoder::CMPA: { case Decoder::CMPA: {
// Only operation modes 011 and 111 are accepted, and long words are selected
// by the top bit.
if(((op_mode)&3) != 3) continue;
is_long_word_access = op_mode == 7;
const int destination_register = (instruction >> 9) & 7; const int destination_register = (instruction >> 9) & 7;
storage_.instructions[instruction].set_source(storage_, ea_mode, ea_register); storage_.instructions[instruction].set_source(storage_, ea_mode, ea_register);