diff --git a/InstructionSets/M68k/Executor.hpp b/InstructionSets/M68k/Executor.hpp index 29a40cc8a..04eefe2e5 100644 --- a/InstructionSets/M68k/Executor.hpp +++ b/InstructionSets/M68k/Executor.hpp @@ -48,11 +48,11 @@ template <Model model, typename BusHandler> class Executor { // Flow control. void consume_cycles(int) {} - void set_pc(uint32_t); void raise_exception(int, bool use_current_instruction_pc = true); void did_update_status(); + void jmp(uint32_t); template <typename IntT> void complete_bcc(bool matched_condition, IntT offset); void complete_dbcc(bool matched_condition, bool overflowed, int16_t offset); void stop(); diff --git a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp index 096b3b8c2..6676c1beb 100644 --- a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp +++ b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp @@ -361,7 +361,7 @@ template <Model model, typename BusHandler> void Executor<model, BusHandler>::stop() {} template <Model model, typename BusHandler> -void Executor<model, BusHandler>::set_pc(uint32_t address) { +void Executor<model, BusHandler>::jmp(uint32_t address) { program_counter_.l = address; } diff --git a/InstructionSets/M68k/Implementation/PerformImplementation.hpp b/InstructionSets/M68k/Implementation/PerformImplementation.hpp index 2fa913521..352887772 100644 --- a/InstructionSets/M68k/Implementation/PerformImplementation.hpp +++ b/InstructionSets/M68k/Implementation/PerformImplementation.hpp @@ -373,7 +373,7 @@ template < // JMP: copies EA(0) to the program counter. case Operation::JMP: - flow_controller.set_pc(src.l); + flow_controller.jmp(src.l); break; // JSR: jump to EA(0), pushing the current PC to the stack.