diff --git a/Processors/68000/Implementation/68000Implementation.hpp b/Processors/68000/Implementation/68000Implementation.hpp index f3ff3227e..4c647cf0e 100644 --- a/Processors/68000/Implementation/68000Implementation.hpp +++ b/Processors/68000/Implementation/68000Implementation.hpp @@ -52,7 +52,7 @@ template void Processor: // no instruction was ongoing. Either way, do a standard instruction operation. // TODO: unless an interrupt is pending, or the trap flag is set. -// if(program_counter_.full >= 0x25c && program_counter_.full < 0x286) { +// if(program_counter_.full >= 0x250 && program_counter_.full <= 0x25e) { // std::cout << std::setfill('0'); // std::cout << (extend_flag_ ? 'x' : '-') << (negative_flag_ ? 'n' : '-') << (zero_result_ ? '-' : 'z'); // std::cout << (overflow_flag_ ? 'v' : '-') << (carry_flag_ ? 'c' : '-') << '\t'; @@ -73,9 +73,6 @@ template void Processor: active_program_ = &instructions[decoded_instruction_]; active_micro_op_ = active_program_->micro_operations; - if(decoded_instruction_ == 0xd1ae) { - printf(""); - } } auto bus_program = active_micro_op_->bus_program; diff --git a/Processors/68000/Implementation/68000Storage.cpp b/Processors/68000/Implementation/68000Storage.cpp index 173e0efab..f0b034d6c 100644 --- a/Processors/68000/Implementation/68000Storage.cpp +++ b/Processors/68000/Implementation/68000Storage.cpp @@ -639,7 +639,8 @@ struct ProcessorStorageConstructor { break; case Imm: - op(int(Action::AssembleWordDataFromPrefetch) | MicroOp::SourceMask, seq("np np np")); + // DEVIATION FROM YACHT.TXT. It has an additional np, which I need to figure out. + op(int(Action::AssembleWordDataFromPrefetch) | MicroOp::SourceMask, seq("np np")); op(Action::PerformOperation, seq("r")); break; }