From 8e7340860e7fb2a15d8992036ac7e3383c8b2e77 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 9 May 2022 16:35:17 -0400 Subject: [PATCH] Minor thematic rearrangement. --- InstructionSets/M68k/Executor.hpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/InstructionSets/M68k/Executor.hpp b/InstructionSets/M68k/Executor.hpp index 04eefe2e5..25f83a0c8 100644 --- a/InstructionSets/M68k/Executor.hpp +++ b/InstructionSets/M68k/Executor.hpp @@ -52,22 +52,25 @@ template class Executor { void raise_exception(int, bool use_current_instruction_pc = true); void did_update_status(); - void jmp(uint32_t); template void complete_bcc(bool matched_condition, IntT offset); void complete_dbcc(bool matched_condition, bool overflowed, int16_t offset); - void stop(); void bsr(uint32_t offset); + void jmp(uint32_t); void jsr(uint32_t offset); - void link(Preinstruction instruction, uint32_t offset); - void unlink(uint32_t &address); - template void movep(Preinstruction instruction, uint32_t source, uint32_t dest); - template void movem_toM(Preinstruction instruction, uint32_t source, uint32_t dest); - template void movem_toR(Preinstruction instruction, uint32_t source, uint32_t dest); - void pea(uint32_t address); - void tas(Preinstruction instruction, uint32_t address); void rtr(); void rts(); void rte(); + void stop(); + + void link(Preinstruction instruction, uint32_t offset); + void unlink(uint32_t &address); + void pea(uint32_t address); + + template void movep(Preinstruction instruction, uint32_t source, uint32_t dest); + template void movem_toM(Preinstruction instruction, uint32_t source, uint32_t dest); + template void movem_toR(Preinstruction instruction, uint32_t source, uint32_t dest); + + void tas(Preinstruction instruction, uint32_t address); // TODO: ownership of this shouldn't be here. struct Registers {