diff options
149 files changed, 2526 insertions, 2526 deletions
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h index 64529bad9e6..fe6b95259b0 100644 --- a/src/devices/cpu/8x300/8x300.h +++ b/src/devices/cpu/8x300/8x300.h @@ -45,17 +45,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -66,12 +66,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_io_config; diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h index 4b84d6e1b2a..816255eea4a 100644 --- a/src/devices/cpu/adsp2100/adsp2100.h +++ b/src/devices/cpu/adsp2100/adsp2100.h @@ -226,23 +226,23 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // helpers void create_tables(); @@ -487,14 +487,14 @@ public: protected: // device_execute_interface overrides - virtual UINT32 execute_input_lines() const; + virtual UINT32 execute_input_lines() const override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // interrupts - virtual bool generate_irq(int which, int indx); - virtual void check_irqs(); + virtual bool generate_irq(int which, int indx) override; + virtual void check_irqs() override; }; @@ -510,14 +510,14 @@ protected: adsp2101_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 chiptype, const char *shortname, const char *source); // device_execute_interface overrides - virtual UINT32 execute_input_lines() const; + virtual UINT32 execute_input_lines() const override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // interrupts - virtual bool generate_irq(int which, int indx); - virtual void check_irqs(); + virtual bool generate_irq(int which, int indx) override; + virtual void check_irqs() override; }; @@ -531,14 +531,14 @@ public: protected: // device_execute_interface overrides - virtual UINT32 execute_input_lines() const; + virtual UINT32 execute_input_lines() const override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // interrupts - virtual bool generate_irq(int which, int indx); - virtual void check_irqs(); + virtual bool generate_irq(int which, int indx) override; + virtual void check_irqs() override; // address spaces const address_space_config m_io_config; diff --git a/src/devices/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h index 904279026c9..740bd1b1042 100644 --- a/src/devices/cpu/alph8201/alph8201.h +++ b/src/devices/cpu/alph8201/alph8201.h @@ -59,28 +59,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; UINT8 M_RDMEM(UINT16 A) { return m_program->read_byte(A); } void M_WRMEM(UINT16 A,UINT8 V) { m_program->write_byte(A, V); } diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h index 0fc58112075..daa66d81658 100644 --- a/src/devices/cpu/alto2/alto2cpu.h +++ b/src/devices/cpu/alto2/alto2cpu.h @@ -193,32 +193,32 @@ public: protected: //! device-level override for start - virtual void device_start(); + virtual void device_start() override; //! device-level override for reset - virtual void device_reset(); + virtual void device_reset() override; //! device-level override for post reset - void interface_post_reset(); + void interface_post_reset() override; //! device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; //! device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; //! device (P)ROMs - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; //! device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; //! device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: diff --git a/src/devices/cpu/am29000/am29000.h b/src/devices/cpu/am29000/am29000.h index 091e7e32b04..221e7309cea 100644 --- a/src/devices/cpu/am29000/am29000.h +++ b/src/devices/cpu/am29000/am29000.h @@ -439,18 +439,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -462,12 +462,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; void signal_exception(UINT32 type); void external_irq_check(); diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h index 47841e439dd..e30522d7719 100644 --- a/src/devices/cpu/amis2000/amis2000.h +++ b/src/devices/cpu/amis2000/amis2000.h @@ -71,25 +71,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } // " - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } // " + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 1; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 1; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; address_space_config m_program_config; address_space_config m_data_config; @@ -219,8 +219,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // digital-to-frequency converter UINT8 m_d2f_latch; @@ -231,7 +231,7 @@ protected: TIMER_CALLBACK_MEMBER(d2f_timer_cb); // opcode handlers - virtual void op_szk(); + virtual void op_szk() override; }; diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index 56b98c89de7..99b64812702 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -29,27 +29,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 75; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 75; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; inline UINT32 apexc_readmem(UINT32 address) { return m_program->read_dword((address)<<2); } inline void apexc_writemem(UINT32 address, UINT32 data) { m_program->write_dword((address)<<2, (data)); } diff --git a/src/devices/cpu/arc/arc.h b/src/devices/cpu/arc/arc.h index dcc3ead6688..5b9302cc99f 100644 --- a/src/devices/cpu/arc/arc.h +++ b/src/devices/cpu/arc/arc.h @@ -20,27 +20,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 5; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 5; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/arcompact/arcompact.h b/src/devices/cpu/arcompact/arcompact.h index 2a537b736aa..a6d10528040 100644 --- a/src/devices/cpu/arcompact/arcompact.h +++ b/src/devices/cpu/arcompact/arcompact.h @@ -75,27 +75,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 5; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 5; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index 2b33429f715..f0639f384c1 100644 --- a/src/devices/cpu/arm/arm.h +++ b/src/devices/cpu/arm/arm.h @@ -47,26 +47,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 3; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 3; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; @@ -113,7 +113,7 @@ public: arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; diff --git a/src/devices/cpu/asap/asap.h b/src/devices/cpu/asap/asap.h index 6cac9ee4c36..287f2056af2 100644 --- a/src/devices/cpu/asap/asap.h +++ b/src/devices/cpu/asap/asap.h @@ -32,28 +32,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // helpers inline UINT32 readop(offs_t pc); diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h index fb9433ff824..715b12a0432 100644 --- a/src/devices/cpu/avr8/avr8.h +++ b/src/devices/cpu/avr8/avr8.h @@ -115,26 +115,26 @@ protected: avr8_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, UINT32 address_mask, address_map_constructor internal_map, UINT8 cpu_type, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // address spaces const address_space_config m_program_config; @@ -285,7 +285,7 @@ public: // construction/destruction atmega644_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void update_interrupt(int source); + virtual void update_interrupt(int source) override; }; // ======================> atmega1280_device @@ -296,7 +296,7 @@ public: // construction/destruction atmega1280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void update_interrupt(int source); + virtual void update_interrupt(int source) override; }; // ======================> atmega2560_device @@ -307,7 +307,7 @@ public: // construction/destruction atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void update_interrupt(int source); + virtual void update_interrupt(int source) override; }; /*************************************************************************** diff --git a/src/devices/cpu/ccpu/ccpu.h b/src/devices/cpu/ccpu/ccpu.h index 150be19ba5e..349b9e9ffc4 100644 --- a/src/devices/cpu/ccpu/ccpu.h +++ b/src/devices/cpu/ccpu/ccpu.h @@ -60,17 +60,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -82,12 +82,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_data_config; diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index 7c911d4e0d5..3b2cbf349bc 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -130,7 +130,7 @@ public: // construction/destruction cop400_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, UINT8 program_addr_bits, UINT8 data_addr_bits, UINT8 featuremask, UINT8 g_mask, UINT8 d_mask, UINT8 in_mask, bool has_counter, bool has_inil, address_map_constructor internal_map_program, address_map_constructor internal_map_data); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // static configuration helpers template<class _Object> static devcb_base &set_read_l_callback(device_t &device, _Object object) { return downcast<cop400_cpu_device &>(device).m_read_l.set_callback(object); } @@ -150,32 +150,32 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + m_cki - 1) / m_cki; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * m_cki); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + m_cki - 1) / m_cki; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * m_cki); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_data_config; diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index c80a8e9ab6c..02cd87f0668 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/src/devices/cpu/cosmac/cosmac.h @@ -216,27 +216,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; // helpers inline UINT8 read_opcode(offs_t pc); @@ -452,9 +452,9 @@ public: protected: // device_disasm_interface overrides - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual cosmac_device::ophandler get_ophandler(UINT8 opcode); + virtual cosmac_device::ophandler get_ophandler(UINT8 opcode) override; static const ophandler s_opcodetable[256]; }; @@ -470,9 +470,9 @@ public: protected: // device_disasm_interface overrides - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual cosmac_device::ophandler get_ophandler(UINT8 opcode); + virtual cosmac_device::ophandler get_ophandler(UINT8 opcode) override; static const ophandler s_opcodetable[256]; }; diff --git a/src/devices/cpu/cp1610/cp1610.h b/src/devices/cpu/cp1610/cp1610.h index 3517fa8fe07..ec9618eefff 100644 --- a/src/devices/cpu/cp1610/cp1610.h +++ b/src/devices/cpu/cp1610/cp1610.h @@ -42,26 +42,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 7; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 7; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h index 72371a8fb0d..1faa4fc5db7 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.h +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.h @@ -151,22 +151,22 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 8; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; @@ -219,25 +219,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 8; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; @@ -303,25 +303,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 8; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/drcbec.h b/src/devices/cpu/drcbec.h index 720d70f9a87..a205dcf6302 100644 --- a/src/devices/cpu/drcbec.h +++ b/src/devices/cpu/drcbec.h @@ -32,11 +32,11 @@ public: virtual ~drcbe_c(); // required overrides - virtual void reset(); - virtual int execute(uml::code_handle &entry); - virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst); - virtual bool hash_exists(UINT32 mode, UINT32 pc); - virtual void get_info(drcbe_info &info); + virtual void reset() override; + virtual int execute(uml::code_handle &entry) override; + virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst) override; + virtual bool hash_exists(UINT32 mode, UINT32 pc) override; + virtual void get_info(drcbe_info &info) override; private: // helpers diff --git a/src/devices/cpu/drcbex64.h b/src/devices/cpu/drcbex64.h index b78174949a0..f60b8970aa9 100644 --- a/src/devices/cpu/drcbex64.h +++ b/src/devices/cpu/drcbex64.h @@ -36,12 +36,12 @@ public: virtual ~drcbe_x64(); // required overrides - virtual void reset(); - virtual int execute(uml::code_handle &entry); - virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst); - virtual bool hash_exists(UINT32 mode, UINT32 pc); - virtual void get_info(drcbe_info &info); - virtual bool logging() const { return m_log != nullptr; } + virtual void reset() override; + virtual int execute(uml::code_handle &entry) override; + virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst) override; + virtual bool hash_exists(UINT32 mode, UINT32 pc) override; + virtual void get_info(drcbe_info &info) override; + virtual bool logging() const override { return m_log != nullptr; } private: // a be_parameter is similar to a uml::parameter but maps to native registers/memory diff --git a/src/devices/cpu/drcbex86.h b/src/devices/cpu/drcbex86.h index 12731c34e83..33eaa65bacc 100644 --- a/src/devices/cpu/drcbex86.h +++ b/src/devices/cpu/drcbex86.h @@ -36,12 +36,12 @@ public: virtual ~drcbe_x86(); // required overrides - virtual void reset(); - virtual int execute(uml::code_handle &entry); - virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst); - virtual bool hash_exists(UINT32 mode, UINT32 pc); - virtual void get_info(drcbe_info &info); - virtual bool logging() const { return m_log != nullptr; } + virtual void reset() override; + virtual int execute(uml::code_handle &entry) override; + virtual void generate(drcuml_block &block, const uml::instruction *instlist, UINT32 numinst) override; + virtual bool hash_exists(UINT32 mode, UINT32 pc) override; + virtual void get_info(drcbe_info &info) override; + virtual bool logging() const override { return m_log != nullptr; } private: // a be_parameter is similar to a uml::parameter but maps to native registers/memory diff --git a/src/devices/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h index 195cdcb5943..f574aeae03e 100644 --- a/src/devices/cpu/dsp16/dsp16.h +++ b/src/devices/cpu/dsp16/dsp16.h @@ -30,28 +30,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } // internal /2 divider - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } // internal /2 divider - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } // internal /2 divider + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } // internal /2 divider + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // address spaces const address_space_config m_program_config; diff --git a/src/devices/cpu/dsp32/dsp32.h b/src/devices/cpu/dsp32/dsp32.h index 1ef1642f6c2..2b0b9e2b07e 100644 --- a/src/devices/cpu/dsp32/dsp32.h +++ b/src/devices/cpu/dsp32/dsp32.h @@ -107,28 +107,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // memory accessors UINT32 ROPCODE(offs_t pc); diff --git a/src/devices/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h index 4ce06916298..39ed11cc945 100644 --- a/src/devices/cpu/dsp56k/dsp56k.h +++ b/src/devices/cpu/dsp56k/dsp56k.h @@ -216,29 +216,29 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 8; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 8; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/dsp56k/inst.h b/src/devices/cpu/dsp56k/inst.h index c7144451e0b..b0b22e9e911 100644 --- a/src/devices/cpu/dsp56k/inst.h +++ b/src/devices/cpu/dsp56k/inst.h @@ -74,18 +74,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "abs " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ADC : 0001 0101 0000 F01J : A-20 //////////////////////////////////////////// @@ -96,19 +96,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JF_table(BITSn(word0,0x0001), BITSn(word0,0x0008), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "adc " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ADD : .... .... 0000 FJJJ : A-22 //////////////////////////////////////////// @@ -119,19 +119,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "add " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ??? Odd that i should put the 011m mKKK everywhere ??? TODO @@ -145,20 +145,20 @@ public: m_opcode = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), m_opcode, m_source, m_destination); // TODO: m_opcode = "add"; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_opcode + " " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_opcode; @@ -173,19 +173,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "and " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // ANDI : 0001 1EE0 iiii iiii : A-26 /////////////////////////////////////////// @@ -197,22 +197,22 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = BITSn(word0,0x00ff); decode_EE_table(BITSn(word0,0x0600), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x,%s", m_immediate, regIdAsString(m_destination).c_str()); retString = "andi " + std::string(temp); // NEW // sprintf(opcode_str, "and(i)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_immediate; @@ -226,18 +226,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "asl " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ASL4 : 0001 0101 0011 F001 : A-30 /////////////////////////////////////////// @@ -248,18 +248,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "asl4 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ASR : .... .... 0011 F000 : A-32 //////////////////////////////////////////// @@ -270,18 +270,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "asr " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ASR4 : 0001 0101 0011 F000 : A-34 /////////////////////////////////////////// @@ -292,18 +292,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "asr4 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ASR16 : 0001 0101 0111 F000 : A-36 ////////////////////////////////////////// @@ -314,18 +314,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "asr16 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; /* BFCHG : 0001 0100 11Pp pppp BBB1 0010 iiii iiii : A-38 */ @@ -343,7 +343,7 @@ public: m_iVal = 0x0000; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* Decode the common parts */ m_iVal = BITSn(word1,0x00ff); @@ -373,16 +373,16 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x", m_iVal); retString = m_opcode + " " + std::string(temp) + "," + dString; // NEW // sprintf(temp, "#$%04x", iVal); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_iVal; std::string m_opcode; @@ -404,7 +404,7 @@ public: m_iVal = 0x0000; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* Decode the common parts */ m_iVal = BITSn(word1,0x00ff); @@ -434,7 +434,7 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x", m_iVal); @@ -446,9 +446,9 @@ public: retString = m_opcode + " " + source + "," + destination; // NEW // sprintf(temp, "#$%04x", m_iVal); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_r; @@ -470,7 +470,7 @@ public: m_iVal = 0x0000; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* Decode the common parts */ m_iVal = BITSn(word1,0x00ff); @@ -500,7 +500,7 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x", m_iVal); @@ -509,9 +509,9 @@ public: retString = m_opcode + " " + source + "," + regIdAsString(m_destination); // NEW // sprintf(temp, "#$%04x", m_iVal); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_iVal; @@ -528,13 +528,13 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT16)word1; decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "b" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "b.%s", M); @@ -544,9 +544,9 @@ public: // NEW // sprintf(temp, "$%04x (%d)", pc + 2 + (INT16)word1, (INT16)word1); retString = opcode + " " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -563,13 +563,13 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_cccc_table(BITSn(word0,0x3c0), m_mnem); m_immediate = get_6_bit_signed_value(BITSn(word0,0x003f)); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "b" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "b.%s", M); @@ -581,9 +581,9 @@ public: retString = opcode + " " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -599,21 +599,21 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x00c0), m_destination); decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "b" + opMnemonicAsString(m_mnem); retString = opcode + " " + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "b.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -628,21 +628,21 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT16)word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, ">*+$%x", 2 + m_immediate); // NEW // sprintf(temp, "$%04x (%d)", pc + 2 + word1, (INT16)word1); retString = "bra " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT16 m_immediate; @@ -657,12 +657,12 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT8)BITSn(word0,0x00ff); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; if (m_immediate >= 0) sprintf(temp, "<*+$%x", 1 + m_immediate); @@ -670,9 +670,9 @@ public: // NEW // sprintf(temp, "$%04x (%d)", pc + 1 + iVal, iVal); retString = "bra " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_immediate; @@ -686,18 +686,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x0003), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "bra " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // BRKcc : 0000 0001 0001 cccc : A-52 ////////////////////////////////////////// @@ -709,20 +709,20 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "brk" + opMnemonicAsString(m_mnem); retString = opcode; // NEW // sprintf(opcode_str, "brk.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -738,13 +738,13 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT16)word1; decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "bs" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "bs.%s", M); @@ -756,10 +756,10 @@ public: // NEW // sprintf(temp, "$%04x (%d)", pc + 2 + (INT16)word1, (INT16)word1); retString = opcode + " " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: op_mnem m_mnem; @@ -775,22 +775,22 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x00c0), m_destination); decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "bs" + opMnemonicAsString(m_mnem); retString = opcode + " " + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "bs.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: op_mnem m_mnem; @@ -805,12 +805,12 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT16)word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; if (m_immediate >= 0) sprintf(temp, ">*+$%x", 2 + m_immediate); @@ -818,10 +818,10 @@ public: // NEW // sprintf(temp, "$%04x (%d)", pc + 2 + (INT16)word1, (INT16)word1); retString = "bsr " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: INT16 m_immediate; @@ -835,19 +835,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x0003), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "bsr " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } }; // CHKAAU : 0000 0000 0000 0100 : A-58 ///////////////////////////////////////// @@ -858,17 +858,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "chkaau"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // CLR : .... .... 0000 F001 : A-60 //////////////////////////////////////////// @@ -879,18 +879,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "clr " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // CLR24 : .... .... 0101 F001 : A-62 ////////////////////////////////////////// @@ -901,18 +901,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "clr24 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // CMP : .... .... 0101 FJJJ : A-64 //////////////////////////////////////////// @@ -923,7 +923,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* Note: This is a JJJF limited in the docs, but other opcodes sneak in before cmp, so the same decode function can be used. */ @@ -931,13 +931,13 @@ public: m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "cmp " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_NONE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_NONE; } }; // CMPM : .... .... 0111 FJJJ : A-66 /////////////////////////////////////////// @@ -948,7 +948,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* Note: This is a JJJF limited in the docs, but other opcodes sneak in before cmp, so the same decode function can be used. */ @@ -956,13 +956,13 @@ public: m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "cmpm " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_NONE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_NONE; } }; // DEBUG : 0000 0000 0000 0001 : A-68 ////////////////////////////////////////// @@ -973,17 +973,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "debug"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // DEBUGcc : 0000 0000 0101 cccc : A-70 //////////////////////////////////////// @@ -995,20 +995,20 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "debug" + opMnemonicAsString(m_mnem); retString = opcode; // NEW // sprintf(opcode_str, "debug.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -1022,18 +1022,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "dec " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // DEC24 : .... .... 0110 F011 : A-74 ////////////////////////////////////////// @@ -1044,18 +1044,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "dec24 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // DIV : 0001 0101 0--0 F1DD : A-76 //////////////////////////////////////////// @@ -1066,19 +1066,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DDF_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "div " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // DMAC : 0001 0101 10s1 FsQQ : A-80 /////////////////////////////////////////// @@ -1091,7 +1091,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_source2, m_destination); @@ -1100,7 +1100,7 @@ public: if (m_mnem == oINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "dmac" + opMnemonicAsString(m_mnem); @@ -1109,9 +1109,9 @@ public: regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "dmac(%s)", A); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -1127,13 +1127,13 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = word1; decode_RR_table(BITSn(word0,0x0003), m_source); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "*+$%x", 2 + m_immediate); @@ -1145,9 +1145,9 @@ public: retString = "do " + source + "," + destination; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_immediate; @@ -1163,22 +1163,22 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = BITSn(word0,0x00ff); m_displacement = word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#<$%x,*+$%x", m_immediate, 2 + m_displacement); // NEW // sprintf(temp, "#$%02x,$%04x", BITSn(word0,0x00ff), pc + 2 + word1); retString = "do " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_immediate; @@ -1194,7 +1194,7 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; @@ -1203,16 +1203,16 @@ public: if (m_source == iINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "*+$%x", 2 + m_displacement); // NEW // sprintf(temp, "%s,$%04x", S1, pc + 2 + word1); retString = "do " + regIdAsString(m_source) + "," + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_displacement; @@ -1227,12 +1227,12 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "*+$%x", m_displacement + 2); @@ -1240,9 +1240,9 @@ public: // NEW // sprintf(temp, "$%04x", pc + 2 + word1); retString = "do forever, " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_displacement; @@ -1256,17 +1256,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "enddo"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // EOR : .... .... 0011 F1JJ : A-94 //////////////////////////////////////////// @@ -1277,19 +1277,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "eor " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // EXT : 0001 0101 0101 F010 : A-96 //////////////////////////////////////////// @@ -1300,18 +1300,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "ext " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ILLEGAL : 0000 0000 0000 1111 : A-98 //////////////////////////////////////// @@ -1322,17 +1322,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "illegal"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // IMAC : 0001 0101 1010 FQQQ : A-100 ////////////////////////////////////////// @@ -1344,21 +1344,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "imac " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1373,21 +1373,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "impy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1401,18 +1401,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "inc " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // INC24 : .... .... 0010 F011 : A-106 ///////////////////////////////////////// @@ -1423,18 +1423,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "inc24 " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // Jcc : 0000 0110 --11 cccc xxxx xxxx xxxx xxxx : A-108 /////////////////////// @@ -1447,13 +1447,13 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "j" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "j.%s", M); @@ -1463,9 +1463,9 @@ public: // NEW // sprintf(temp, "$%04x", word1); retString = opcode + " " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -1481,21 +1481,21 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x00c0), m_destination); decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "j" + opMnemonicAsString(m_mnem); retString = opcode + " " + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "j.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -1510,19 +1510,19 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, ">$%x", m_displacement); // NEW // sprintf(temp, "$%04x", word1); retString = "jmp " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) + void evaluate(dsp56k_core* cpustate) override { cpustate->ppc = PC; PC = m_displacement; @@ -1530,9 +1530,9 @@ public: /* S L E U N Z V C */ /* - - - - - - - - */ } - size_t size() const { return 2; } - size_t evalSize() const { return 0; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t size() const override { return 2; } + size_t evalSize() const override { return 0; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT16 m_displacement; @@ -1546,16 +1546,16 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x0003), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "jmp " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) + void evaluate(dsp56k_core* cpustate) override { cpustate->ppc = PC; PC = regValue16(cpustate, m_destination); @@ -1563,9 +1563,9 @@ public: /* S L E U N Z V C */ /* - - - - - - - - */ } - size_t size() const { return 1; } - size_t evalSize() const { return 0; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t size() const override { return 1; } + size_t evalSize() const override { return 0; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; //static Jmp_2* JMP2 = new Jmp_2(NULL, 0x0000, 0x0000); @@ -1580,13 +1580,13 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "js" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "js.%s", M); @@ -1596,10 +1596,10 @@ public: // NEW // sprintf(temp, "$%04x", word1); retString = opcode + " " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: op_mnem m_mnem; @@ -1615,22 +1615,22 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x00c0), m_destination); decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "js" + opMnemonicAsString(m_mnem); retString = opcode + " " + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "js.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: op_mnem m_mnem; @@ -1645,22 +1645,22 @@ public: m_displacement = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_displacement = word1; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, ">$%x", m_displacement); // NEW // sprintf(temp, "$%04x", word1); retString = "jsr " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: UINT16 m_displacement; @@ -1675,22 +1675,22 @@ public: m_bAddr = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_bAddr = BITSn(word0,0x00ff); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "<$%x", m_bAddr); // NEW // sprintf(temp, "#$%02x", BITSn(word0,0x00ff)); retString = "jsr " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } private: UINT8 m_bAddr; @@ -1704,19 +1704,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x0003), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "jsr " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OVER; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OVER; } }; // LEA : 0000 0001 11TT MMRR : A-116 /////////////////////////////////////////// @@ -1728,7 +1728,7 @@ public: m_ea = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { if ((word0 & 0x000c) == 0) return false; // NEW TODO // @@ -1739,14 +1739,14 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { // HACK retString = "lea " + m_ea + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_ea; @@ -1760,7 +1760,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { if ((word0 & 0x000c) == 0) return false; // NEW TODO // @@ -1771,14 +1771,14 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { // HACK retString = "lea " + m_ea + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_ea; @@ -1792,18 +1792,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "lsl " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // LSR : .... .... 0011 F010 : A-120 /////////////////////////////////////////// @@ -1814,18 +1814,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "lsr " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // MAC : .... .... 1k10 FQQQ : A-122 /////////////////////////////////////////// @@ -1838,7 +1838,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); @@ -1846,7 +1846,7 @@ public: decode_kSign_table(BITSn(word0,0x40), m_sign); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string ts = m_sign; if (ts.compare("-") != 0) ts = ""; @@ -1855,9 +1855,9 @@ public: regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1873,21 +1873,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "mac " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1902,21 +1902,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "mac " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1932,7 +1932,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); @@ -1940,7 +1940,7 @@ public: decode_kSign_table(BITSn(word0,0x40), m_sign); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string ts = m_sign; if (ts.compare("-") != 0) ts = ""; @@ -1949,9 +1949,9 @@ public: regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_sign; @@ -1967,21 +1967,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "macr " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -1997,7 +1997,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { // Special QQF decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), @@ -2006,7 +2006,7 @@ public: decode_s_table(BITSn(word0,0x0004), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "mac" + opMnemonicAsString(m_mnem); @@ -2015,9 +2015,9 @@ public: regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "mac(%s)", A); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -2033,7 +2033,7 @@ public: m_isNop = false; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { // Equivalent to a NOP (+ parallel move) @@ -2051,16 +2051,16 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { if (m_isNop) retString = "nop"; else retString = "move"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_NONE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_NONE; } private: bool m_isNop; @@ -2074,7 +2074,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { // Amounts to a nop with two parallel moves. // This insures the debugger matches the reference disassembler @@ -2085,13 +2085,13 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "move"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // MOVE : 0000 0101 BBBB BBBB ---- HHHW 0001 0001 : A-128 ////////////////////// @@ -2105,23 +2105,23 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_b = BITSn(word0,0x00ff); m_W = BITSn(word1,0x0100); decode_HHH_table(BITSn(word1,0x0e00), m_SD); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; assemble_reg_from_W_table(m_W, 'X', m_SD, m_b, source, destination); retString = "move " + source + "," + destination; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_b; @@ -2140,7 +2140,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { INT8 rNum = BITSn(word0,0x0003); assemble_ea_from_MM_table(BITSn(word0,0x000c), rNum, m_ea); @@ -2150,7 +2150,7 @@ public: if (m_SD == iINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2158,9 +2158,9 @@ public: retString = "move " + source + "," + destination; // NEW // sprintf(opcode_str, "move(c)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2179,7 +2179,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { INT8 rNum = BITSn(word0,0x0003); assemble_ea_from_q_table(BITSn(word0,0x0008), rNum, m_ea); @@ -2189,7 +2189,7 @@ public: if (m_SD == iINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2197,9 +2197,9 @@ public: retString = "move " + source + "," + destination; // NEW // sprintf(opcode_str, "move(c)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2218,7 +2218,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_Z_table(BITSn(word0,0x0008), m_ea); @@ -2227,7 +2227,7 @@ public: if (m_SD == iINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2235,9 +2235,9 @@ public: retString = "move " + source + "," + destination; // NEW // sprintf(opcode_str, "move(c)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2256,7 +2256,7 @@ public: m_sd = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_value = word1; m_t = BITSn(word0,0x0008); @@ -2271,7 +2271,7 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string ea; assemble_ea_from_t_table(m_t, m_value, ea); @@ -2281,7 +2281,7 @@ public: else retString += regIdAsString(m_sd) + "," + ea; // NEW // sprintf(opcode_str, "move(c)"); } - void evaluate(dsp56k_core* cpustate) + void evaluate(dsp56k_core* cpustate) override { if (m_W) { @@ -2314,8 +2314,8 @@ public: // bit of the source operand. If SR is not specified as a destination operand, L is set if data // limiting occurred. All ? bits are not affected otherwise. } - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_t; @@ -2332,7 +2332,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DDDDD_table(BITSn(word0,0x03e0), m_source); decode_DDDDD_table(BITSn(word0,0x001f), m_destination); @@ -2341,14 +2341,14 @@ public: if (m_source == iSSH && m_destination == iSSH) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "move " + regIdAsString(m_source) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "move(c)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // MOVE(C) : 0000 0101 BBBB BBBB 0011 1WDD DDD0 ---- : A-144 /////////////////// @@ -2363,14 +2363,14 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_b = BITSn(word0,0x00ff); m_W = BITSn(word1,0x0400); decode_DDDDD_table(BITSn(word1,0x03e0), m_SD); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2378,9 +2378,9 @@ public: retString = "move " + source + "," + destination; // NEW // opcode = "move(c)"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_b; @@ -2398,13 +2398,13 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = (INT8)BITSn(word0,0x00ff); decode_DD_table(BITSn(word0,0x0300), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; if (m_immediate >= 0) sprintf(temp, "#<+$%x", m_immediate); @@ -2415,9 +2415,9 @@ public: std::string(temp) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "move(i)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_immediate; @@ -2434,7 +2434,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { INT8 rNum = BITSn(word0,0x00c0); @@ -2443,7 +2443,7 @@ public: m_W = BITSn(word0,0x0100); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2451,9 +2451,9 @@ public: retString = "move " + source + "," + destination; // NEW // sprintf(opcode_str, "move(m)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2472,13 +2472,13 @@ public: m_ea2 = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_W = BITSn(word0,0x0100); assemble_eas_from_mm_table(BITSn(word0,0x000c), BITSn(word0,0x00c0), BITSn(word0,0x0003), m_ea, m_ea2); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2495,9 +2495,9 @@ public: retString = "move " + source + "," + destination; // NEW // sprintf(opcode_str, "move(m)*"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_W; @@ -2516,14 +2516,14 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_b = BITSn(word0,0x00ff); m_W = BITSn(word1,0x0100); decode_HHH_table(BITSn(word1,0x0007), m_SD); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2531,9 +2531,9 @@ public: retString = "move " + source + "," + destination; // NEW // opcode = "move(m)"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 2; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 2; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_b; @@ -2553,7 +2553,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_HH_table(BITSn(word0,0x00c0), m_SD); @@ -2563,7 +2563,7 @@ public: m_W = BITSn(word0,0x0100); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2571,9 +2571,9 @@ public: retString = "movep " + source + "," + destination; // NEW // sprintf(opcode_str, "move(p)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2592,7 +2592,7 @@ public: m_SD = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { INT8 rNum = BITSn(word0,0x00c0); @@ -2606,7 +2606,7 @@ public: // NEW // sprintf(SD, "X:$%s", fullAddy); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2614,9 +2614,9 @@ public: retString = "movep " + source + "," + destination; // NEW // sprintf(opcode_str, "move(p)*"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2635,7 +2635,7 @@ public: m_SD = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_HH_table(BITSn(word0,0x00c0), m_SD); @@ -2646,7 +2646,7 @@ public: m_W = BITSn(word0,0x0100); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source; std::string destination; @@ -2654,9 +2654,9 @@ public: retString = "moves " + source + "," + destination; // NEW // sprintf(opcode_str, "move(s)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -2674,7 +2674,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* There are inconsistencies with the S1 & S2 operand ordering in the docs, but since it's a multiply it doesn't matter */ @@ -2684,7 +2684,7 @@ public: decode_kSign_table(BITSn(word0,0x40), m_sign); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string ts = m_sign; if (ts.compare("-")!=0) ts = ""; @@ -2693,9 +2693,9 @@ public: regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_sign; @@ -2711,21 +2711,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "mpy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -2740,21 +2740,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "mpy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -2770,7 +2770,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* There are inconsistencies with the S1 & S2 operand ordering in the docs, but since it's a multiply it doesn't matter */ @@ -2780,7 +2780,7 @@ public: decode_kSign_table(BITSn(word0,0x40), m_sign); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string ts = m_sign; if (ts.compare("-") != 0) ts = ""; @@ -2789,9 +2789,9 @@ public: regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_sign; @@ -2807,21 +2807,21 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "mpyr " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -2837,7 +2837,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_source2, m_destination); @@ -2845,7 +2845,7 @@ public: decode_s_table(BITSn(word0,0x0004), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "mpy" + opMnemonicAsString(m_mnem); @@ -2854,9 +2854,9 @@ public: regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "mpy(%s)", A); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -2871,18 +2871,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "neg " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // NEGC : 0001 0101 0110 F000 : A-168 ////////////////////////////////////////// @@ -2893,18 +2893,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "negc " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // NOP : 0000 0000 0000 0000 : A-170 /////////////////////////////////////////// @@ -2915,17 +2915,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "nop"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // NORM : 0001 0101 0010 F0RR : A-172 ////////////////////////////////////////// @@ -2936,20 +2936,20 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); decode_RR_table(BITSn(word0,0x0003), m_source); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "norm " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // NOT : .... .... 0110 F001 : A-174 /////////////////////////////////////////// @@ -2960,18 +2960,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "not " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // OR : .... .... 0010 F1JJ : A-176 //////////////////////////////////////////// @@ -2982,19 +2982,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "or " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // ORI : 0001 1EE1 iiii iiii : A-178 /////////////////////////////////////////// @@ -3006,13 +3006,13 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = BITSn(word0,0x00ff); decode_EE_table(BITSn(word0,0x0600), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x", m_immediate); @@ -3020,9 +3020,9 @@ public: retString = "ori " + std::string(temp) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "or(i)"); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_immediate; @@ -3036,20 +3036,20 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_RR_table(BITSn(word0,0x0003), m_source); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "X:(%s)", regIdAsString(m_source).c_str()); retString = "rep " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // REP : 0000 1111 iiii iiii : A-180 /////////////////////////////////////////// @@ -3061,21 +3061,21 @@ public: m_immediate = 0; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { m_immediate = BITSn(word0,0x00ff); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { char temp[32]; sprintf(temp, "#$%x", m_immediate); // NEW // sprintf(temp, "#$%02x (%d)", BITSn(word0,0x00ff), BITSn(word0,0x00ff)); retString = "rep " + std::string(temp); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: UINT8 m_immediate; @@ -3089,19 +3089,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DDDDD_table(BITSn(word0,0x001f), m_source); if (m_source == iINVALID) return false; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "rep " + regIdAsString(m_source); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // REPcc : 0000 0001 0101 cccc : A-184 ///////////////////////////////////////// @@ -3113,20 +3113,20 @@ public: m_mnem = oINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_cccc_table(BITSn(word0,0x000f), m_mnem); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "rep" + opMnemonicAsString(m_mnem); retString = opcode; // NEW // sprintf(opcode_str, "rep.%s", M); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -3140,17 +3140,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "reset"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // RND : .... .... 0010 F000 : A-188 /////////////////////////////////////////// @@ -3161,18 +3161,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "rnd " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ROL : .... .... 0111 F011 : A-190 /////////////////////////////////////////// @@ -3183,18 +3183,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "rol " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // ROR : .... .... 0111 F010 : A-192 /////////////////////////////////////////// @@ -3205,18 +3205,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "ror " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE; } }; // RTI : 0000 0000 0000 0111 : A-194 /////////////////////////////////////////// @@ -3227,18 +3227,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "rti"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OUT; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OUT; } }; // RTS : 0000 0000 0000 0110 : A-196 /////////////////////////////////////////// @@ -3249,18 +3249,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "rts"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - size_t flags() const { return DASMFLAG_STEP_OUT; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } + size_t flags() const override { return DASMFLAG_STEP_OUT; } }; // SBC : .... .... 0101 F01J : A-198 /////////////////////////////////////////// @@ -3271,19 +3271,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JF_table(BITSn(word0,0x01), BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "sbc " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // STOP : 0000 0000 0000 1010 : A-200 ////////////////////////////////////////// @@ -3294,17 +3294,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "stop"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // SUB : .... .... 0100 FJJJ : A-202 /////////////////////////////////////////// @@ -3315,19 +3315,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "sub " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // SUB : 011m mKKK 0rru Fuuu : A-202 /////////////////////////////////////////// @@ -3339,7 +3339,7 @@ public: m_opcode = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), m_opcode, m_source, m_destination); @@ -3347,13 +3347,13 @@ public: // TODO // m_opcode = "sub"; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_opcode + " " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: std::string m_opcode; @@ -3367,7 +3367,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { /* There is only one option for the F table. This is a very strange opcode. */ if (!BITSn(word0,0x0008)) @@ -3382,13 +3382,13 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "subl " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // SWAP : 0001 0101 0111 F001 : A-206 ////////////////////////////////////////// @@ -3399,18 +3399,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "swap " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // SWI : 0000 0000 0000 0101 : A-208 /////////////////////////////////////////// @@ -3421,17 +3421,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "swi"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // Tcc : 0001 00cc ccTT Fh0h : A-210 /////////////////////////////////////////// @@ -3444,7 +3444,7 @@ public: m_destination2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_h0hF_table(BITSn(word0,0x0007),BITSn(word0,0x0008), m_source, m_destination); @@ -3459,7 +3459,7 @@ public: return false; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string opcode = "t" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "t.%s", M); @@ -3471,9 +3471,9 @@ public: if (m_destination2 != iR0) retString += std::string(" R0,") + regIdAsString(m_destination2); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: op_mnem m_mnem; @@ -3488,19 +3488,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "tfr " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // TFR : 011m mKKK 0rr1 F0DD : A-212 /////////////////////////////////////////// @@ -3511,19 +3511,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DDF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "tfr " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // TFR(2) : 0001 0101 0000 F00J : A-214 //////////////////////////////////////// @@ -3534,19 +3534,19 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_JF_table(BITSn(word0,0x0001),BITSn(word0,0x0008), m_destination, m_source); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "tfr2 " + regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // TFR(3) : 0010 01mW RRDD FHHH : A-216 //////////////////////////////////////// @@ -3562,7 +3562,7 @@ public: m_destination2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DDF_table(BITSn(word0,0x0030), BITSn(word0,0x0008), m_destination, m_source); @@ -3577,7 +3577,7 @@ public: m_W = BITSn(word0,0x0100); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { std::string source2; std::string destination2; @@ -3586,9 +3586,9 @@ public: regIdAsString(m_source) + "," + regIdAsString(m_destination) + " " + source2 + "," + destination2; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: INT8 m_W; @@ -3606,18 +3606,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x08), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "tst " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_NONE; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_NONE; } }; // TST(2) : 0001 0101 0001 -1DD : A-220 //////////////////////////////////////// @@ -3628,18 +3628,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_DD_table(BITSn(word0,0x0003), m_source); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "tst2 " + regIdAsString(m_source); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // WAIT : 0000 0000 0000 1011 : A-222 ////////////////////////////////////////// @@ -3650,17 +3650,17 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "wait"; } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // ZERO : 0001 0101 0101 F000 : A-224 ////////////////////////////////////////// @@ -3671,18 +3671,18 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_F_table(BITSn(word0,0x0008), m_destination); return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "zero " + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } }; // SHFL : 0001 0101 1101 FQQQ : !!UNDOCUMENTED!! /////////////////////////////// @@ -3694,7 +3694,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); @@ -3715,15 +3715,15 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "shfl " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; @@ -3738,7 +3738,7 @@ public: m_source2 = iINVALID; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); @@ -3759,15 +3759,15 @@ public: } return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = "shfr " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } - void evaluate(dsp56k_core* cpustate) {} - size_t size() const { return 1; } - size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } + void evaluate(dsp56k_core* cpustate) override {} + size_t size() const override { return 1; } + size_t accumulatorBitsModified() const override { return BM_HIGH | BM_MIDDLE | BM_LOW; } private: reg_id m_source2; diff --git a/src/devices/cpu/dsp56k/pmove.h b/src/devices/cpu/dsp56k/pmove.h index 3cc8ae886d2..f818e4a40b2 100644 --- a/src/devices/cpu/dsp56k/pmove.h +++ b/src/devices/cpu/dsp56k/pmove.h @@ -51,7 +51,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { reg_id r; decode_RR_table(BITSn(word0,0x3000), r); @@ -71,11 +71,11 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_source + "," + m_destination; } - void evaluate() {} + void evaluate() override {} private: std::string m_source; @@ -91,7 +91,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { std::string ea; if (opDestination() == iB) @@ -113,11 +113,11 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_source + "," + m_destination; } - void evaluate() {} + void evaluate() override {} private: std::string m_source; @@ -133,7 +133,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { reg_id r; reg_id D1; @@ -167,11 +167,11 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = parallelMove + " " + parallelMove2; } - void evaluate() {} + void evaluate() override {} private: std::string parallelMove; @@ -187,7 +187,7 @@ public: { m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { decode_IIIIx_table(BITSn(word0,0x0f00), BITSn(word0,0x0008), m_source, m_destination); @@ -214,7 +214,7 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { // (?,?) is a parallel nop if (m_source == iWEIRD && m_destination == iWEIRD) @@ -222,7 +222,7 @@ public: else retString = regIdAsString(m_source) + "," + regIdAsString(m_destination); } - void evaluate() {} + void evaluate() override {} private: reg_id m_source; @@ -240,7 +240,7 @@ public: pms2 = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { reg_id r; reg_id S; @@ -261,11 +261,11 @@ public: pms2 = parallel_move_str2; return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = pms + " " + pms2; } - void evaluate() {} + void evaluate() override {} private: std::string pms; // TODO @@ -282,7 +282,7 @@ public: m_ea = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { reg_id r; decode_RR_table(BITSn(word0,0x0300), r); @@ -290,11 +290,11 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_ea; } - void evaluate() {} + void evaluate() override {} private: std::string m_ea; @@ -311,7 +311,7 @@ public: m_destination = ""; m_valid = decode(word0, word1); } - bool decode(const UINT16 word0, const UINT16 word1) + bool decode(const UINT16 word0, const UINT16 word1) override { INT8 b; reg_id SD; @@ -321,11 +321,11 @@ public: return true; } - void disassemble(std::string& retString) const + void disassemble(std::string& retString) const override { retString = m_source + "," + m_destination; } - void evaluate() {} + void evaluate() override {} private: std::string m_source; diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index 7962ff6c16b..c55aae83505 100644 --- a/src/devices/cpu/e0c6200/e0c6200.h +++ b/src/devices/cpu/e0c6200/e0c6200.h @@ -25,26 +25,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 14; } // longest opcode is 12 cycles, but interrupt service takes up to 14 - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 14; } // longest opcode is 12 cycles, but interrupt service takes up to 14 + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; virtual void execute_one(); virtual bool check_interrupt() { return false; } // nothing to do by default virtual void do_interrupt(); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; address_space_config m_program_config; address_space_config m_data_config; diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h index 0b5f1e8bee3..692f2332cd5 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.h +++ b/src/devices/cpu/e0c6200/e0c6s46.h @@ -93,14 +93,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_input_lines() const { return 8; } - virtual void execute_set_input(int line, int state); - virtual void execute_one(); - virtual bool check_interrupt(); + virtual UINT32 execute_input_lines() const override { return 8; } + virtual void execute_set_input(int line, int state) override; + virtual void execute_one() override; + virtual bool check_interrupt() override; private: required_shared_ptr<UINT8> m_vram1; diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h index c8f43641ff5..ccfd74f1e5e 100644 --- a/src/devices/cpu/e132xs/e132xs.h +++ b/src/devices/cpu/e132xs/e132xs.h @@ -221,29 +221,29 @@ protected: void init(int scale_mask); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; void make_ops(); // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // address spaces const address_space_config m_program_config; @@ -524,7 +524,7 @@ public: e116t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -537,7 +537,7 @@ public: e116xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -550,7 +550,7 @@ public: e116xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -563,7 +563,7 @@ public: e116xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -576,7 +576,7 @@ public: e132n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -589,7 +589,7 @@ public: e132t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -602,7 +602,7 @@ public: e132xn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -615,7 +615,7 @@ public: e132xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -628,7 +628,7 @@ public: e132xs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -641,7 +641,7 @@ public: e132xsr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -654,7 +654,7 @@ public: gms30c2116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -667,7 +667,7 @@ public: gms30c2132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -680,7 +680,7 @@ public: gms30c2216_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; @@ -693,7 +693,7 @@ public: gms30c2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; #endif /* __E132XS_H__ */ diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h index b3e12cba119..7cc2d7fba7e 100644 --- a/src/devices/cpu/es5510/es5510.h +++ b/src/devices/cpu/es5510/es5510.h @@ -123,19 +123,19 @@ public: void write_to_dol(INT32 value); protected: - virtual void device_start(); - virtual void device_reset(); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const; - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const; - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void execute_set_input(int linenum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override; + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override; + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void execute_set_input(int linenum, int state) override; INT32 alu_operation(UINT8 op, INT32 aValue, INT32 bValue, UINT8 &flags); void alu_operation_end(); diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h index ecfba10975d..468139701f6 100644 --- a/src/devices/cpu/esrip/esrip.h +++ b/src/devices/cpu/esrip/esrip.h @@ -130,29 +130,29 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; void make_ops(); // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // address spaces const address_space_config m_program_config; diff --git a/src/devices/cpu/f8/f8.h b/src/devices/cpu/f8/f8.h index 14f36d63675..277383c4fec 100644 --- a/src/devices/cpu/f8/f8.h +++ b/src/devices/cpu/f8/f8.h @@ -37,26 +37,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 7; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 7; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h index 5d3d9bfda43..a344f6392be 100644 --- a/src/devices/cpu/h6280/h6280.h +++ b/src/devices/cpu/h6280/h6280.h @@ -77,28 +77,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // opcode accessors UINT8 program_read8(offs_t addr); diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h index b1880c23b4d..d55d8ea7784 100644 --- a/src/devices/cpu/h8/h8.h +++ b/src/devices/cpu/h8/h8.h @@ -142,27 +142,27 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config program_config, io_config; address_space *program, *io; diff --git a/src/devices/cpu/h8/h83002.h b/src/devices/cpu/h8/h83002.h index c6b9612fc9c..860aee68ccc 100644 --- a/src/devices/cpu/h8/h83002.h +++ b/src/devices/cpu/h8/h83002.h @@ -49,17 +49,17 @@ protected: UINT8 syscr; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; extern const device_type H83002; diff --git a/src/devices/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h index 3dcd1690f93..bb2fe644a47 100644 --- a/src/devices/cpu/h8/h83006.h +++ b/src/devices/cpu/h8/h83006.h @@ -55,17 +55,17 @@ protected: UINT8 syscr; UINT32 ram_start; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; diff --git a/src/devices/cpu/h8/h83008.h b/src/devices/cpu/h8/h83008.h index 8a26d62ed69..f8132f4bc37 100644 --- a/src/devices/cpu/h8/h83008.h +++ b/src/devices/cpu/h8/h83008.h @@ -53,17 +53,17 @@ protected: UINT8 syscr; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; extern const device_type H83008; diff --git a/src/devices/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h index ecb3ed573d5..e29af57fb3e 100644 --- a/src/devices/cpu/h8/h83048.h +++ b/src/devices/cpu/h8/h83048.h @@ -63,17 +63,17 @@ protected: UINT32 ram_start; UINT8 syscr; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h83044_device : public h83048_device { diff --git a/src/devices/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h index b01580733da..9ece1765979 100644 --- a/src/devices/cpu/h8/h83337.h +++ b/src/devices/cpu/h8/h83337.h @@ -65,16 +65,16 @@ protected: UINT8 syscr; UINT32 ram_start; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h83334_device : public h83337_device { diff --git a/src/devices/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h index 5a7a5f67cbb..02e670ba144 100644 --- a/src/devices/cpu/h8/h8_adc.h +++ b/src/devices/cpu/h8/h8_adc.h @@ -94,8 +94,8 @@ protected: bool analog_powered, adtrg; UINT64 next_event; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void sampling(); void start_conversion(); @@ -116,8 +116,8 @@ public: h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; }; class h8_adc_3006_device : public h8_adc_device { @@ -125,8 +125,8 @@ public: h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; }; class h8_adc_2245_device : public h8_adc_device { @@ -134,8 +134,8 @@ public: h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; }; class h8_adc_2320_device : public h8_adc_device { @@ -143,8 +143,8 @@ public: h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; }; class h8_adc_2357_device : public h8_adc_device { @@ -152,8 +152,8 @@ public: h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; }; class h8_adc_2655_device : public h8_adc_device { @@ -161,10 +161,10 @@ public: h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int conversion_time(bool first, bool poweron); - virtual void mode_update(); - virtual void do_buffering(int buffer); - virtual int get_channel_index(int count); + virtual int conversion_time(bool first, bool poweron) override; + virtual void mode_update() override; + virtual void do_buffering(int buffer) override; + virtual int get_channel_index(int count) override; }; extern const device_type H8_ADC_3337; diff --git a/src/devices/cpu/h8/h8_intc.h b/src/devices/cpu/h8/h8_intc.h index b255f80684f..80275d40017 100644 --- a/src/devices/cpu/h8/h8_intc.h +++ b/src/devices/cpu/h8/h8_intc.h @@ -57,8 +57,8 @@ protected: UINT16 iscr; int icr_filter, ipr_filter; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual void get_priority(int vect, int &icr_pri, int &ipr_pri) const; void update_irq_state(); @@ -87,10 +87,10 @@ protected: UINT32 icr; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void get_priority(int vect, int &icr_pri, int &ipr_pri) const; + virtual void get_priority(int vect, int &icr_pri, int &ipr_pri) const override; void update_irq_types(); }; @@ -109,8 +109,8 @@ private: static const int vector_to_slot[]; UINT8 ipr[11]; - virtual void get_priority(int vect, int &icr_pri, int &ipr_pri) const; - virtual void device_reset(); + virtual void get_priority(int vect, int &icr_pri, int &ipr_pri) const override; + virtual void device_reset() override; }; extern const device_type H8_INTC; diff --git a/src/devices/cpu/h8/h8_port.h b/src/devices/cpu/h8/h8_port.h index 2ac35b5b48a..3b1230f9d17 100644 --- a/src/devices/cpu/h8/h8_port.h +++ b/src/devices/cpu/h8/h8_port.h @@ -43,8 +43,8 @@ protected: UINT8 dr; UINT8 last_output; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void update_output(); }; diff --git a/src/devices/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h index 7e93f14dc14..9b88fcc98a0 100644 --- a/src/devices/cpu/h8/h8_sci.h +++ b/src/devices/cpu/h8/h8_sci.h @@ -125,9 +125,9 @@ protected: UINT64 clock_base, divider; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void clock_start(int mode); void clock_stop(int mode); diff --git a/src/devices/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h index e187999625e..c7bedbbcfe8 100644 --- a/src/devices/cpu/h8/h8_timer16.h +++ b/src/devices/cpu/h8/h8_timer16.h @@ -121,8 +121,8 @@ protected: bool counter_incrementing; bool channel_active; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void update_counter(UINT64 cur_time = 0); void recalc_event(UINT64 cur_time = 0); @@ -140,10 +140,10 @@ public: void set_info(int tgr_count, int tbr_count, const char *intc, int irq_base); protected: - virtual void tcr_update(); - virtual void tier_update(); - virtual void isr_update(UINT8 value); - virtual UINT8 isr_to_sr() const; + virtual void tcr_update() override; + virtual void tier_update() override; + virtual void isr_update(UINT8 value) override; + virtual UINT8 isr_to_sr() const override; }; class h8s_timer16_channel_device : public h8_timer16_channel_device { @@ -158,10 +158,10 @@ public: protected: int count_types[8]; - virtual void tcr_update(); - virtual void tier_update(); - virtual void isr_update(UINT8 value); - virtual UINT8 isr_to_sr() const; + virtual void tcr_update() override; + virtual void tier_update() override; + virtual void isr_update(UINT8 value) override; + virtual UINT8 isr_to_sr() const override; }; class h8_timer16_device : public device_t { @@ -195,8 +195,8 @@ protected: UINT8 default_tstr; UINT8 tstr; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; extern const device_type H8_TIMER16; diff --git a/src/devices/cpu/h8/h8_timer8.h b/src/devices/cpu/h8/h8_timer8.h index d58677097e5..0ab4055ea38 100644 --- a/src/devices/cpu/h8/h8_timer8.h +++ b/src/devices/cpu/h8/h8_timer8.h @@ -89,8 +89,8 @@ protected: int clock_type, clock_divider, clear_type, counter_cycle; UINT64 last_clock_update, event_time; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void update_counter(UINT64 cur_time = 0); void recalc_event(UINT64 cur_time = 0); diff --git a/src/devices/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h index 2fb500b77f8..5999ad1030f 100644 --- a/src/devices/cpu/h8/h8h.h +++ b/src/devices/cpu/h8/h8h.h @@ -23,10 +23,10 @@ public: protected: static const disasm_entry disasm_entries[]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual void do_exec_full() override; + virtual void do_exec_partial() override; inline void r32_w(int reg, UINT32 val) { R[reg & 7] = val; R[(reg & 7) | 8] = val >> 16; } inline UINT32 r32_r(int reg) const { return R[reg & 7] | (R[(reg & 7) | 8] << 16); } diff --git a/src/devices/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h index 8b0c7ef1f7f..46712311861 100644 --- a/src/devices/cpu/h8/h8s2000.h +++ b/src/devices/cpu/h8/h8s2000.h @@ -24,10 +24,10 @@ public: protected: static const disasm_entry disasm_entries[]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual void do_exec_full() override; + virtual void do_exec_partial() override; #define O(o) void o ## _full(); void o ## _partial() O(ldc_imm8_exr); O(ldc_r8l_exr); O(ldc_w_abs16_exr); O(ldc_w_abs32_exr); O(ldc_w_r32d16h_exr); O(ldc_w_r32d32hh_exr); O(ldc_w_r32ih_exr); O(ldc_w_r32ph_exr); diff --git a/src/devices/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h index 257c1d0f35a..b4364f68501 100644 --- a/src/devices/cpu/h8/h8s2245.h +++ b/src/devices/cpu/h8/h8s2245.h @@ -65,18 +65,18 @@ protected: UINT32 ram_start; UINT8 syscr; - virtual bool exr_in_stack() const; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual bool exr_in_stack() const override; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h8s2241_device : public h8s2245_device { diff --git a/src/devices/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h index f3ff765daf6..2a5a6f8f225 100644 --- a/src/devices/cpu/h8/h8s2320.h +++ b/src/devices/cpu/h8/h8s2320.h @@ -74,19 +74,19 @@ protected: UINT32 ram_start; UINT8 syscr; - virtual bool exr_in_stack() const; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trace_setup(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual bool exr_in_stack() const override; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trace_setup() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h8s2321_device : public h8s2320_device { diff --git a/src/devices/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h index 042207fc67e..b13c0b9aab3 100644 --- a/src/devices/cpu/h8/h8s2357.h +++ b/src/devices/cpu/h8/h8s2357.h @@ -71,19 +71,19 @@ protected: UINT32 ram_start; unsigned char syscr; - virtual bool exr_in_stack() const; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trace_setup(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual bool exr_in_stack() const override; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trace_setup() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h8s2352_device : public h8s2357_device { diff --git a/src/devices/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h index 5f224361734..1a8e723c142 100644 --- a/src/devices/cpu/h8/h8s2600.h +++ b/src/devices/cpu/h8/h8s2600.h @@ -23,10 +23,10 @@ public: protected: static const disasm_entry disasm_entries[]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual void do_exec_full() override; + virtual void do_exec_partial() override; #define O(o) void o ## _full(); void o ## _partial() O(clrmac); diff --git a/src/devices/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h index 89b76187bd1..8211f457698 100644 --- a/src/devices/cpu/h8/h8s2655.h +++ b/src/devices/cpu/h8/h8s2655.h @@ -62,19 +62,19 @@ protected: UINT8 syscr; - virtual bool exr_in_stack() const; - virtual void update_irq_filter(); - virtual void interrupt_taken(); - virtual int trace_setup(); - virtual int trapa_setup(); - virtual void irq_setup(); - virtual void internal_update(UINT64 current_time); - virtual machine_config_constructor device_mconfig_additions() const; + virtual bool exr_in_stack() const override; + virtual void update_irq_filter() override; + virtual void interrupt_taken() override; + virtual int trace_setup() override; + virtual int trapa_setup() override; + virtual void irq_setup() override; + virtual void internal_update(UINT64 current_time) override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_ADDRESS_MAP(map, 16); - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; }; class h8s2653_device : public h8s2655_device { diff --git a/src/devices/cpu/hcd62121/hcd62121.h b/src/devices/cpu/hcd62121/hcd62121.h index a6f7d8cc31e..dc1c7477409 100644 --- a/src/devices/cpu/hcd62121/hcd62121.h +++ b/src/devices/cpu/hcd62121/hcd62121.h @@ -41,25 +41,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 4; } - virtual UINT32 execute_max_cycles() const { return 48; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 4; } + virtual UINT32 execute_max_cycles() const override { return 48; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 18; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 18; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; UINT8 read_op(); UINT8 datasize( UINT8 op ); diff --git a/src/devices/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h index 671cfa8bcfc..6f99aeca899 100644 --- a/src/devices/cpu/hd61700/hd61700.h +++ b/src/devices/cpu/hd61700/hd61700.h @@ -79,28 +79,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 52; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 52; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 16; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 16; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // interrupts bool check_irqs(void); diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index 27a95f644d5..a06d3848cbc 100644 --- a/src/devices/cpu/hmcs40/hmcs40.h +++ b/src/devices/cpu/hmcs40/hmcs40.h @@ -156,26 +156,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } // " - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 2+1; } // 3rd one is internal - virtual void execute_set_input(int line, int state); - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } // " + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 2+1; } // 3rd one is internal + virtual void execute_set_input(int line, int state) override; + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; address_space_config m_program_config; address_space_config m_data_config; @@ -353,9 +353,9 @@ public: protected: // overrides - virtual UINT8 read_r(int index); - virtual void write_r(int index, UINT8 data); - virtual int read_d(int index); + virtual UINT8 read_r(int index) override; + virtual void write_r(int index, UINT8 data) override; + virtual int read_d(int index) override; }; class hd38750_device : public hmcs43_cpu_device @@ -390,8 +390,8 @@ public: protected: // overrides - virtual UINT8 read_r(int index); - virtual void write_r(int index, UINT8 data); + virtual UINT8 read_r(int index) override; + virtual void write_r(int index, UINT8 data) override; }; class hd38800_device : public hmcs44_cpu_device @@ -426,8 +426,8 @@ public: protected: // overrides - virtual UINT8 read_r(int index); - virtual void write_r(int index, UINT8 data); + virtual UINT8 read_r(int index) override; + virtual void write_r(int index, UINT8 data) override; }; class hd38820_device : public hmcs45_cpu_device diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index dd7aeeb2ae0..49d2910b4a1 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -71,30 +71,30 @@ protected: hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 6; } - virtual UINT32 execute_max_cycles() const { return 25; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0xffff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 6; } + virtual UINT32 execute_max_cycles() const override { return 25; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0xffff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; UINT16 execute_one(UINT16 opcode); UINT16 execute_one_sub(UINT16 opcode); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/i4004/i4004.h b/src/devices/cpu/i4004/i4004.h index 97b360e6d22..3bdc7cddcfd 100644 --- a/src/devices/cpu/i4004/i4004.h +++ b/src/devices/cpu/i4004/i4004.h @@ -34,16 +34,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 8; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 8; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -55,14 +55,14 @@ protected: } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; UINT8 ROP(); UINT8 READ_ROM(); diff --git a/src/devices/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h index c9cbecce7aa..35b9c0b41ad 100644 --- a/src/devices/cpu/i8008/i8008.h +++ b/src/devices/cpu/i8008/i8008.h @@ -33,28 +33,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; virtual void execute_one(int opcode); diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h index f40607bdc7c..66477c4e6c3 100644 --- a/src/devices/cpu/i8089/i8089.h +++ b/src/devices/cpu/i8089/i8089.h @@ -67,31 +67,31 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_config_complete() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual void execute_run(); + virtual void execute_run() override; int m_icount; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; address_space_config m_program_config; address_space_config m_io_config; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 7; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 7; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: bool sysbus_width() { return BIT(m_sysbus, 0); } diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h index 7c1f5a6e445..569112e41e8 100644 --- a/src/devices/cpu/i8089/i8089_channel.h +++ b/src/devices/cpu/i8089/i8089_channel.h @@ -90,8 +90,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: diff --git a/src/devices/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h index fa4a26d3022..62ee771ac0a 100644 --- a/src/devices/cpu/i86/i286.h +++ b/src/devices/cpu/i86/i286.h @@ -67,31 +67,31 @@ public: i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } typedef delegate<UINT32 (bool)> a20_cb; static void static_set_a20_callback(device_t &device, a20_cb object) { downcast<i80286_cpu_device &>(device).m_a20_callback = object; } template<class _Object> static devcb_base &static_set_shutdown_callback(device_t &device, _Object object) { return downcast<i80286_cpu_device &>(device).m_out_shutdown_func.set_callback(object); } protected: - virtual void execute_run(); - virtual void device_reset(); - virtual void device_start(); - virtual void state_string_export(const device_state_entry &entry, std::string &str); - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_set_input(int inputnum, int state); - bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); - - virtual void interrupt(int int_num, int trap = 1) { if(trap) throw TRAP(int_num, (UINT16)-1); else interrupt_descriptor(int_num, 0, 0); } - virtual UINT8 read_port_byte(UINT16 port); - virtual UINT16 read_port_word(UINT16 port); - virtual void write_port_byte(UINT16 port, UINT8 data); - virtual void write_port_word(UINT16 port, UINT16 data); + virtual void execute_run() override; + virtual void device_reset() override; + virtual void device_start() override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_set_input(int inputnum, int state) override; + bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; + + virtual void interrupt(int int_num, int trap = 1) override { if(trap) throw TRAP(int_num, (UINT16)-1); else interrupt_descriptor(int_num, 0, 0); } + virtual UINT8 read_port_byte(UINT16 port) override; + virtual UINT16 read_port_word(UINT16 port) override; + virtual void write_port_byte(UINT16 port, UINT8 data) override; + virtual void write_port_word(UINT16 port, UINT16 data) override; // Executing instructions - virtual UINT8 fetch_op(); - virtual UINT8 fetch(); - virtual UINT32 calc_addr(int seg, UINT16 offset, int size, int op, bool override = true); + virtual UINT8 fetch_op() override; + virtual UINT8 fetch() override; + virtual UINT32 calc_addr(int seg, UINT16 offset, int size, int op, bool override = true) override; private: void check_permission(UINT8 check_seg, UINT32 offset, UINT16 size, int operation); diff --git a/src/devices/cpu/i860/i860.h b/src/devices/cpu/i860/i860.h index 1d59f6fe826..fc9b5b83abf 100644 --- a/src/devices/cpu/i860/i860.h +++ b/src/devices/cpu/i860/i860.h @@ -63,26 +63,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 8; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 8; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_export(const device_state_entry &entry); - void state_import(const device_state_entry &entry); + void state_export(const device_state_entry &entry) override; + void state_import(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/i960/i960.h b/src/devices/cpu/i960/i960.h index f50823b435f..833ae7d741a 100644 --- a/src/devices/cpu/i960/i960.h +++ b/src/devices/cpu/i960/i960.h @@ -80,27 +80,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } /* ???? TODO: Exact timing unknown */ - virtual UINT32 execute_max_cycles() const { return 1; } /* ???? TODO: Exact timing unknown */ - virtual UINT32 execute_input_lines() const { return 4; } - virtual UINT32 execute_default_irq_vector() const { return 0xffffffff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } /* ???? TODO: Exact timing unknown */ + virtual UINT32 execute_max_cycles() const override { return 1; } /* ???? TODO: Exact timing unknown */ + virtual UINT32 execute_input_lines() const override { return 4; } + virtual UINT32 execute_default_irq_vector() const override { return 0xffffffff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h index 8aaaa5a81ab..a68b7acbd15 100644 --- a/src/devices/cpu/ie15/ie15.h +++ b/src/devices/cpu/ie15/ie15.h @@ -34,26 +34,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; virtual void execute_one(int opcode); diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h index bfea55cd935..b46b8727d86 100644 --- a/src/devices/cpu/jaguar/jaguar.h +++ b/src/devices/cpu/jaguar/jaguar.h @@ -114,24 +114,24 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 5; } - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 5; } + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 6; } + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 6; } address_space_config m_program_config; @@ -253,8 +253,8 @@ public: DECLARE_READ32_MEMBER(ctrl_r); protected: - virtual void execute_run(); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void execute_run() override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -268,10 +268,10 @@ public: DECLARE_READ32_MEMBER(ctrl_r); protected: - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h index 2e212fbda51..6d2522dcef4 100644 --- a/src/devices/cpu/lc8670/lc8670.h +++ b/src/devices/cpu/lc8670/lc8670.h @@ -97,28 +97,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 7; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 7; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: // helpers diff --git a/src/devices/cpu/lh5801/lh5801.h b/src/devices/cpu/lh5801/lh5801.h index 6147f334ba4..ff47135b262 100644 --- a/src/devices/cpu/lh5801/lh5801.h +++ b/src/devices/cpu/lh5801/lh5801.h @@ -75,27 +75,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 19; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 19; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 5; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 5; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h index 993fcafd54a..1f085da0c1f 100644 --- a/src/devices/cpu/m37710/m37710.h +++ b/src/devices/cpu/m37710/m37710.h @@ -101,28 +101,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 20; /* rough guess */ } - virtual UINT32 execute_input_lines() const { return M37710_LINE_MAX; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 20; /* rough guess */ } + virtual UINT32 execute_input_lines() const override { return M37710_LINE_MAX; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 6; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 6; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/m6502/deco16.h b/src/devices/cpu/m6502/deco16.h index d82087477f7..134b1e3aae4 100644 --- a/src/devices/cpu/m6502/deco16.h +++ b/src/devices/cpu/m6502/deco16.h @@ -19,16 +19,16 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; protected: address_space *io; address_space_config io_config; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - virtual void device_start(); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; + virtual void device_start() override; #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h index e2864d7ef4f..0ddc69d099d 100644 --- a/src/devices/cpu/m6502/m3745x.h +++ b/src/devices/cpu/m6502/m3745x.h @@ -121,11 +121,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void execute_set_input(int inputnum, int state); - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void execute_set_input(int inputnum, int state) override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } void send_port(address_space &space, UINT8 offset, UINT8 data); UINT8 read_port(UINT8 offset); diff --git a/src/devices/cpu/m6502/m4510.h b/src/devices/cpu/m6502/m4510.h index 492572fddb6..f6a8f904863 100644 --- a/src/devices/cpu/m6502/m4510.h +++ b/src/devices/cpu/m6502/m4510.h @@ -19,9 +19,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; bool get_nomap() const { return nomap; } @@ -36,23 +36,23 @@ protected: mi_4510_normal(m4510_device *base); virtual ~mi_4510_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_4510_nd : public mi_4510_normal { public: mi_4510_nd(m4510_device *base); virtual ~mi_4510_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; - virtual void device_start(); - virtual void device_reset(); - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual void device_start() override; + virtual void device_reset() override; + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; inline UINT32 map(UINT16 adr) { if(map_enable & (1 << (adr >> 13))) { diff --git a/src/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h index 700df4e6fbf..79de50f63fb 100644 --- a/src/devices/cpu/m6502/m5074x.h +++ b/src/devices/cpu/m6502/m5074x.h @@ -97,11 +97,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void execute_set_input(int inputnum, int state); - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void execute_set_input(int inputnum, int state) override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } void send_port(address_space &space, UINT8 offset, UINT8 data); UINT8 read_port(UINT8 offset); diff --git a/src/devices/cpu/m6502/m6507.h b/src/devices/cpu/m6502/m6507.h index a83a02cfa16..b349b9f8bb7 100644 --- a/src/devices/cpu/m6502/m6507.h +++ b/src/devices/cpu/m6502/m6507.h @@ -21,20 +21,20 @@ protected: class mi_6507_normal : public memory_interface { public: virtual ~mi_6507_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_6507_nd : public mi_6507_normal { public: virtual ~mi_6507_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/cpu/m6502/m6509.h b/src/devices/cpu/m6502/m6509.h index 2bfee01981a..803afcff0e9 100644 --- a/src/devices/cpu/m6502/m6509.h +++ b/src/devices/cpu/m6502/m6509.h @@ -19,9 +19,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; protected: class mi_6509_normal : public memory_interface { @@ -30,25 +30,25 @@ protected: mi_6509_normal(m6509_device *base); virtual ~mi_6509_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_9(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); - virtual void write_9(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_9(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; + virtual void write_9(UINT16 adr, UINT8 val) override; }; class mi_6509_nd : public mi_6509_normal { public: mi_6509_nd(m6509_device *base); virtual ~mi_6509_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; - virtual void device_start(); - virtual void device_reset(); - virtual void state_export(const device_state_entry &entry); + virtual void device_start() override; + virtual void device_reset() override; + virtual void state_export(const device_state_entry &entry) override; UINT32 XPC; diff --git a/src/devices/cpu/m6502/m740.h b/src/devices/cpu/m6502/m740.h index 728fea5a074..c08eda19609 100644 --- a/src/devices/cpu/m6502/m740.h +++ b/src/devices/cpu/m6502/m740.h @@ -39,17 +39,17 @@ public: m740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; static const disasm_entry disasm_entries[0x200]; - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); - virtual void execute_set_input(int inputnum, int state); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; + virtual void execute_set_input(int inputnum, int state) override; protected: #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/n2a03.h b/src/devices/cpu/m6502/n2a03.h index 4c94cd52167..266449bea36 100644 --- a/src/devices/cpu/m6502/n2a03.h +++ b/src/devices/cpu/m6502/n2a03.h @@ -22,9 +22,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; READ8_MEMBER(psg1_4014_r); READ8_MEMBER(psg1_4015_r); @@ -35,22 +35,22 @@ protected: class mi_2a03_normal : public memory_interface { public: virtual ~mi_2a03_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_2a03_nd : public memory_interface { public: virtual ~mi_2a03_nd() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; - virtual void device_start(); + virtual void device_start() override; #define O(o) void o ## _full(); void o ## _partial() @@ -63,8 +63,8 @@ protected: #undef O - virtual machine_config_constructor device_mconfig_additions() const; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/m6809/hd6309.h b/src/devices/cpu/m6809/hd6309.h index 15da7a6cc8d..3221261660c 100644 --- a/src/devices/cpu/m6809/hd6309.h +++ b/src/devices/cpu/m6809/hd6309.h @@ -33,18 +33,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_pre_save(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_pre_save() override; + virtual void device_post_load() override; // device_execute_interface overrides - virtual void execute_run(); + virtual void execute_run() override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: typedef m6809_base_device super; diff --git a/src/devices/cpu/m6809/konami.h b/src/devices/cpu/m6809/konami.h index dfc5c741497..957a4c4d3e5 100644 --- a/src/devices/cpu/m6809/konami.h +++ b/src/devices/cpu/m6809/konami.h @@ -40,13 +40,13 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_execute_interface overrides - virtual void execute_run(); + virtual void execute_run() override; // device_disasm_interface overrides - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: typedef m6809_base_device super; diff --git a/src/devices/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h index 0c25d152749..0d1e3843737 100644 --- a/src/devices/cpu/mb86233/mb86233.h +++ b/src/devices/cpu/mb86233/mb86233.h @@ -61,25 +61,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h index a38a7e264ea..4fdda0030be 100644 --- a/src/devices/cpu/mb86235/mb86235.h +++ b/src/devices/cpu/mb86235/mb86235.h @@ -28,26 +28,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 7; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 7; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; //virtual void execute_set_input(int inputnum, int state); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 8; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h index 31dab7e288b..8a9e555d968 100644 --- a/src/devices/cpu/mb88xx/mb88xx.h +++ b/src/devices/cpu/mb88xx/mb88xx.h @@ -74,30 +74,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 6 - 1) / 6; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 6); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 3; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 6 - 1) / 6; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 6); } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ) ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ) ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - void state_import(const device_state_entry &entry); - void state_export(const device_state_entry &entry); + void state_string_export(const device_state_entry &entry, std::string &str) override; + void state_import(const device_state_entry &entry) override; + void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h index 7f03ffd3da1..3f76577b29c 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.h +++ b/src/devices/cpu/mc68hc11/mc68hc11.h @@ -52,30 +52,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 41; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 41; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 5; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 5; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h index 3f700fd6e9d..f71dc2f6b24 100644 --- a/src/devices/cpu/mcs96/i8x9x.h +++ b/src/devices/cpu/mcs96/i8x9x.h @@ -26,20 +26,20 @@ public: void serial_w(UINT8 val); protected: - virtual void device_start(); - virtual void device_reset(); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); - virtual void internal_update(UINT64 current_time); - virtual void io_w8(UINT8 adr, UINT8 data); - virtual void io_w16(UINT8 adr, UINT16 data); - virtual UINT8 io_r8(UINT8 adr); - virtual UINT16 io_r16(UINT8 adr); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; + virtual void internal_update(UINT64 current_time) override; + virtual void io_w8(UINT8 adr, UINT8 data) override; + virtual void io_w16(UINT8 adr, UINT16 data) override; + virtual UINT8 io_r8(UINT8 adr) override; + virtual UINT16 io_r16(UINT8 adr) override; private: enum { diff --git a/src/devices/cpu/mcs96/i8xc196.h b/src/devices/cpu/mcs96/i8xc196.h index 299f6c9128d..746224a39f7 100644 --- a/src/devices/cpu/mcs96/i8xc196.h +++ b/src/devices/cpu/mcs96/i8xc196.h @@ -19,14 +19,14 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); - - virtual void io_w8(UINT8 adr, UINT8 data); - virtual void io_w16(UINT8 adr, UINT16 data); - virtual UINT8 io_r8(UINT8 adr); - virtual UINT16 io_r16(UINT8 adr); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; + + virtual void io_w8(UINT8 adr, UINT8 data) override; + virtual void io_w16(UINT8 adr, UINT16 data) override; + virtual UINT8 io_r8(UINT8 adr) override; + virtual UINT16 io_r16(UINT8 adr) override; #define O(o) void o ## _196_full(); void o ## _196_partial() diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index 31e90d137ca..ed9b64709ec 100644 --- a/src/devices/cpu/mcs96/mcs96.h +++ b/src/devices/cpu/mcs96/mcs96.h @@ -69,27 +69,27 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; virtual offs_t disasm_generic(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options, const disasm_entry *entries); address_space_config program_config; diff --git a/src/devices/cpu/melps4/m58846.h b/src/devices/cpu/melps4/m58846.h index 25d850b455e..9d56cf9e216 100644 --- a/src/devices/cpu/melps4/m58846.h +++ b/src/devices/cpu/melps4/m58846.h @@ -21,18 +21,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual void execute_one(); + virtual void execute_one() override; // device_disasm_interface overrides - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // timers - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void write_v(UINT8 data); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void write_v(UINT8 data) override; emu_timer *m_timer; void reset_timer(); diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h index b6d3c050c91..2d80cfcf8d2 100644 --- a/src/devices/cpu/melps4/melps4.h +++ b/src/devices/cpu/melps4/melps4.h @@ -141,26 +141,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 6 - 1) / 6; } // 6 t-states per machine cycle - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 6); } // " - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1+1; } // max opcode cycles + interrupt duration - virtual UINT32 execute_input_lines() const { return 3; } // up to 3 (some internal) - virtual void execute_set_input(int line, int state); - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 6 - 1) / 6; } // 6 t-states per machine cycle + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 6); } // " + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1+1; } // max opcode cycles + interrupt duration + virtual UINT32 execute_input_lines() const override { return 3; } // up to 3 (some internal) + virtual void execute_set_input(int line, int state) override; + virtual void execute_run() override; virtual void execute_one(); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; address_space_config m_program_config; address_space_config m_data_config; diff --git a/src/devices/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h index 0c39d6e20c2..e530b3cf88a 100644 --- a/src/devices/cpu/minx/minx.h +++ b/src/devices/cpu/minx/minx.h @@ -22,26 +22,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 5; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 5; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index 8e3c2212688..1b76e37fe3f 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -285,30 +285,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 40; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual void execute_burn(INT32 cycles) { m_totalcycles += cycles; } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 40; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual void execute_burn(INT32 cycles) override { m_totalcycles += cycles; } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_state_interface overrides - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: @@ -728,7 +728,7 @@ public: protected: // required overrides - virtual bool describe(opcode_desc &desc, const opcode_desc *prev); + virtual bool describe(opcode_desc &desc, const opcode_desc *prev) override; private: // internal helpers diff --git a/src/devices/cpu/mips/r3000.h b/src/devices/cpu/mips/r3000.h index a29ea5cd163..f9063806cde 100644 --- a/src/devices/cpu/mips/r3000.h +++ b/src/devices/cpu/mips/r3000.h @@ -109,29 +109,29 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // memory accessors struct r3000_data_accessors diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h index 7be4fec9da1..f3dc2dcfee7 100644 --- a/src/devices/cpu/mn10200/mn10200.h +++ b/src/devices/cpu/mn10200/mn10200.h @@ -72,28 +72,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } // internal /2 divider - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } // internal /2 divider - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 13+7; } // max opcode cycles + interrupt duration - virtual UINT32 execute_input_lines() const { return 4; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } // internal /2 divider + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } // internal /2 divider + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 13+7; } // max opcode cycles + interrupt duration + virtual UINT32 execute_input_lines() const override { return 4; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 7; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 7; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index bba375223a9..0e996468942 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -41,32 +41,32 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { notify_clock_changed(); } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { notify_clock_changed(); } // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return clocks / m_PCK; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles * m_PCK; } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 80; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks / m_PCK; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles * m_PCK; } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 80; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + void state_string_export(const device_state_entry &entry, std::string &str) override; + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h index 796f620fd40..6afdd1c4f39 100644 --- a/src/devices/cpu/nec/v53.h +++ b/src/devices/cpu/nec/v53.h @@ -224,7 +224,7 @@ public: const address_space_config m_io_space_config; - const address_space_config *memory_space_config(address_spacenum spacenum) const + const address_space_config *memory_space_config(address_spacenum spacenum) const override { switch (spacenum) { @@ -242,10 +242,10 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; required_device<pit8253_device> m_v53tcu; required_device<upd71071_v53_device> m_v53dmau; diff --git a/src/devices/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h index de771bc0756..9f421716366 100644 --- a/src/devices/cpu/pdp1/pdp1.h +++ b/src/devices/cpu/pdp1/pdp1.h @@ -90,29 +90,29 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 31; } - virtual UINT32 execute_input_lines() const { return 16; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 31; } + virtual UINT32 execute_input_lines() const override { return 16; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h index 6ac17936fbf..73d7d7705f1 100644 --- a/src/devices/cpu/pdp1/tx0.h +++ b/src/devices/cpu/pdp1/tx0.h @@ -57,19 +57,19 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 3; } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } protected: address_space_config m_program_config; @@ -150,8 +150,8 @@ public: tx0_8kw_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); protected: - virtual void execute_run(); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void execute_run() override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: void execute_instruction_8kw(); @@ -165,8 +165,8 @@ public: tx0_64kw_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); protected: - virtual void execute_run(); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void execute_run() override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: void execute_instruction_64kw(); diff --git a/src/devices/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h index 2569edd2d8f..70393e3f0bf 100644 --- a/src/devices/cpu/pdp8/pdp8.h +++ b/src/devices/cpu/pdp8/pdp8.h @@ -25,27 +25,27 @@ public: pdp8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // address spaces const address_space_config m_program_config; @@ -58,7 +58,7 @@ public: WORD_COUNT, CURRENT_ADDR, BREAK - } + }; enum opcode { @@ -70,7 +70,7 @@ public: JMP, IOT, OPR - } + }; private: // CPU registers UINT16 m_pc; diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h index f57c68e7e46..0e34f97178f 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.h +++ b/src/devices/cpu/pic16c5x/pic16c5x.h @@ -89,8 +89,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides /************************************************************************** @@ -100,29 +100,29 @@ protected: * times. (Each instruction cycle passes through 4 machine states). This * is handled by the cpu execution engine. */ - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h index 0e0ecc8f5e6..c373bd64ec2 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.h +++ b/src/devices/cpu/pic16c62x/pic16c62x.h @@ -67,33 +67,33 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/powerpc/ppcfe.h b/src/devices/cpu/powerpc/ppcfe.h index 5ba2f53dbb1..51a4bb86906 100644 --- a/src/devices/cpu/powerpc/ppcfe.h +++ b/src/devices/cpu/powerpc/ppcfe.h @@ -53,7 +53,7 @@ public: protected: // required overrides - virtual bool describe(opcode_desc &desc, const opcode_desc *prev); + virtual bool describe(opcode_desc &desc, const opcode_desc *prev) override; private: // inlines diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h index 233d9e12f95..7993a34743e 100644 --- a/src/devices/cpu/pps4/pps4.h +++ b/src/devices/cpu/pps4/pps4.h @@ -45,29 +45,29 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 3; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h index 3e99583ca60..809bcaf035a 100644 --- a/src/devices/cpu/psx/dma.h +++ b/src/devices/cpu/psx/dma.h @@ -52,10 +52,10 @@ public: size_t m_ramsize; protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void dma_start_timer( int n_channel, UINT32 n_ticks ); diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h index 041aa90f26c..69e95207230 100644 --- a/src/devices/cpu/psx/irq.h +++ b/src/devices/cpu/psx/irq.h @@ -43,9 +43,9 @@ public: DECLARE_WRITE_LINE_MEMBER( intin10 ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; private: void psx_irq_update( void ); diff --git a/src/devices/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h index 097f43c0d5d..e3065bacb95 100644 --- a/src/devices/cpu/psx/mdec.h +++ b/src/devices/cpu/psx/mdec.h @@ -33,9 +33,9 @@ public: void dma_read( UINT32 *ram, UINT32 n_address, INT32 n_size ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; private: void mdec_cos_precalc(); diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index 03d1ea40508..f5ec1423293 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -204,31 +204,31 @@ protected: psxcpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 40; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return ( clocks + 3 ) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles * 4; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 40; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return ( clocks + 3 ) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles * 4; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // CPU registers UINT32 m_pc; @@ -353,10 +353,10 @@ protected: private: // disassembler interface - virtual UINT32 pc() { return m_pc; } - virtual UINT32 delayr() { return m_delayr; } - virtual UINT32 delayv() { return m_delayv; } - virtual UINT32 r(int i) { return m_r[ i ]; } + virtual UINT32 pc() override { return m_pc; } + virtual UINT32 delayr() override { return m_delayr; } + virtual UINT32 delayv() override { return m_delayv; } + virtual UINT32 r(int i) override { return m_r[ i ]; } }; class cxd8530aq_device : public psxcpu_device diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h index 4cdae90276a..b3b610ed8a8 100644 --- a/src/devices/cpu/psx/rcnt.h +++ b/src/devices/cpu/psx/rcnt.h @@ -54,10 +54,10 @@ public: DECLARE_READ32_MEMBER( read ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: psx_root root_counter[ 3 ]; diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index ebae81d5a93..4610f249700 100644 --- a/src/devices/cpu/psx/sio.h +++ b/src/devices/cpu/psx/sio.h @@ -70,9 +70,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_post_load() override; private: void sio_interrupt(); diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h index 3864efcda2c..1f92aac50d9 100644 --- a/src/devices/cpu/rsp/rsp.h +++ b/src/devices/cpu/rsp/rsp.h @@ -167,30 +167,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state) { } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override { } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; void unimplemented_opcode(UINT32 op); diff --git a/src/devices/cpu/rsp/rspcp2d.h b/src/devices/cpu/rsp/rspcp2d.h index 831773d5c66..ef727e37b95 100644 --- a/src/devices/cpu/rsp/rspcp2d.h +++ b/src/devices/cpu/rsp/rspcp2d.h @@ -24,86 +24,86 @@ class rsp_cop2_drc : public rsp_cop2 rsp_cop2_drc(rsp_device &rsp, running_machine &machine) : rsp_cop2(rsp, machine) { } - virtual int generate_cop2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc); - virtual int generate_lwc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc); - virtual int generate_swc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc); + virtual int generate_cop2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) override; + virtual int generate_lwc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) override; + virtual int generate_swc2(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) override; - virtual void state_string_export(const int index, std::string &str); + virtual void state_string_export(const int index, std::string &str) override; - void cfunc_unimplemented_opcode(); + void cfunc_unimplemented_opcode() override; public: - virtual void lbv(); - virtual void lsv(); - virtual void llv(); - virtual void ldv(); - virtual void lqv(); - virtual void lrv(); - virtual void lpv(); - virtual void luv(); - virtual void lhv(); - virtual void lfv(); - virtual void lwv(); - virtual void ltv(); - virtual void sbv(); - virtual void ssv(); - virtual void slv(); - virtual void sdv(); - virtual void sqv(); - virtual void srv(); - virtual void spv(); - virtual void suv(); - virtual void shv(); - virtual void sfv(); - virtual void swv(); - virtual void stv(); - virtual void vmulf(); - virtual void vmulu(); - virtual void vmudl(); - virtual void vmudm(); - virtual void vmudn(); - virtual void vmudh(); - virtual void vmacf(); - virtual void vmacu(); - virtual void vmadl(); - virtual void vmadm(); - virtual void vmadn(); - virtual void vmadh(); - virtual void vadd(); - virtual void vsub(); - virtual void vabs(); - virtual void vaddc(); - virtual void vsubc(); - virtual void vaddb(); - virtual void vsaw(); - virtual void vlt(); - virtual void veq(); - virtual void vne(); - virtual void vge(); - virtual void vcl(); - virtual void vch(); - virtual void vcr(); - virtual void vmrg(); - virtual void vand(); - virtual void vnand(); - virtual void vor(); - virtual void vnor(); - virtual void vxor(); - virtual void vnxor(); - virtual void vrcp(); - virtual void vrcpl(); - virtual void vrcph(); - virtual void vmov(); - virtual void vrsql(); - virtual void vrsqh(); - virtual void vrsq(); - virtual void mfc2(); - virtual void cfc2(); - virtual void mtc2(); - virtual void ctc2(); + virtual void lbv() override; + virtual void lsv() override; + virtual void llv() override; + virtual void ldv() override; + virtual void lqv() override; + virtual void lrv() override; + virtual void lpv() override; + virtual void luv() override; + virtual void lhv() override; + virtual void lfv() override; + virtual void lwv() override; + virtual void ltv() override; + virtual void sbv() override; + virtual void ssv() override; + virtual void slv() override; + virtual void sdv() override; + virtual void sqv() override; + virtual void srv() override; + virtual void spv() override; + virtual void suv() override; + virtual void shv() override; + virtual void sfv() override; + virtual void swv() override; + virtual void stv() override; + virtual void vmulf() override; + virtual void vmulu() override; + virtual void vmudl() override; + virtual void vmudm() override; + virtual void vmudn() override; + virtual void vmudh() override; + virtual void vmacf() override; + virtual void vmacu() override; + virtual void vmadl() override; + virtual void vmadm() override; + virtual void vmadn() override; + virtual void vmadh() override; + virtual void vadd() override; + virtual void vsub() override; + virtual void vabs() override; + virtual void vaddc() override; + virtual void vsubc() override; + virtual void vaddb() override; + virtual void vsaw() override; + virtual void vlt() override; + virtual void veq() override; + virtual void vne() override; + virtual void vge() override; + virtual void vcl() override; + virtual void vch() override; + virtual void vcr() override; + virtual void vmrg() override; + virtual void vand() override; + virtual void vnand() override; + virtual void vor() override; + virtual void vnor() override; + virtual void vxor() override; + virtual void vnxor() override; + virtual void vrcp() override; + virtual void vrcpl() override; + virtual void vrcph() override; + virtual void vmov() override; + virtual void vrsql() override; + virtual void vrsqh() override; + virtual void vrsq() override; + virtual void mfc2() override; + virtual void cfc2() override; + virtual void mtc2() override; + virtual void ctc2() override; private: - virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc); + virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) override; }; #endif /* __RSPCP2D_H__ */ diff --git a/src/devices/cpu/rsp/rspfe.h b/src/devices/cpu/rsp/rspfe.h index bdfd7a83fb7..52f5a64243e 100644 --- a/src/devices/cpu/rsp/rspfe.h +++ b/src/devices/cpu/rsp/rspfe.h @@ -38,7 +38,7 @@ public: protected: // required overrides - virtual bool describe(opcode_desc &desc, const opcode_desc *prev); + virtual bool describe(opcode_desc &desc, const opcode_desc *prev) override; private: // internal helpers diff --git a/src/devices/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h index 7d6bee8dd14..66e2af40cd5 100644 --- a/src/devices/cpu/s2650/s2650.h +++ b/src/devices/cpu/s2650/s2650.h @@ -42,32 +42,32 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 13; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 13; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/saturn/saturn.h b/src/devices/cpu/saturn/saturn.h index 4ea6a6249ed..3281ade5fcd 100644 --- a/src/devices/cpu/saturn/saturn.h +++ b/src/devices/cpu/saturn/saturn.h @@ -90,28 +90,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 21; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 21; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + void state_string_export(const device_state_entry &entry, std::string &str) override; + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 20; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/sc61860/sc61860.h b/src/devices/cpu/sc61860/sc61860.h index e92fa2d4d78..65a42862bb8 100644 --- a/src/devices/cpu/sc61860/sc61860.h +++ b/src/devices/cpu/sc61860/sc61860.h @@ -91,27 +91,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h index c415ff3ad44..e89dc2e9088 100644 --- a/src/devices/cpu/scmp/scmp.h +++ b/src/devices/cpu/scmp/scmp.h @@ -43,25 +43,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 131593; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 131593; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; @@ -108,8 +108,8 @@ public: ins8060_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } }; diff --git a/src/devices/cpu/score/score.h b/src/devices/cpu/score/score.h index e2c6dc15fef..83e724e7785 100644 --- a/src/devices/cpu/score/score.h +++ b/src/devices/cpu/score/score.h @@ -36,26 +36,26 @@ public: score7_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 64; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 64; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: // helpers diff --git a/src/devices/cpu/scudsp/scudsp.h b/src/devices/cpu/scudsp/scudsp.h index 39e002f7473..e8f52f661f1 100644 --- a/src/devices/cpu/scudsp/scudsp.h +++ b/src/devices/cpu/scudsp/scudsp.h @@ -82,26 +82,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 7; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 7; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; devcb_write_line m_out_irq_cb; devcb_read16 m_in_dma_cb; diff --git a/src/devices/cpu/se3208/se3208.h b/src/devices/cpu/se3208/se3208.h index ef6b1f811f1..e548b7f7621 100644 --- a/src/devices/cpu/se3208/se3208.h +++ b/src/devices/cpu/se3208/se3208.h @@ -18,26 +18,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/sh2/sh2.h b/src/devices/cpu/sh2/sh2.h index 9fd39b30422..6a32072ada5 100644 --- a/src/devices/cpu/sh2/sh2.h +++ b/src/devices/cpu/sh2/sh2.h @@ -113,30 +113,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 16; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 16; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space *m_program, *m_decrypted_program; private: @@ -534,7 +534,7 @@ public: sh2_frontend(sh2_device *device, UINT32 window_start, UINT32 window_end, UINT32 max_sequence); protected: - virtual bool describe(opcode_desc &desc, const opcode_desc *prev); + virtual bool describe(opcode_desc &desc, const opcode_desc *prev) override; private: bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode); diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h index c2d493bd6e2..bba3483b9a1 100644 --- a/src/devices/cpu/sh4/sh4.h +++ b/src/devices/cpu/sh4/sh4.h @@ -204,28 +204,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 5; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 5; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; protected: address_space_config m_program_config; @@ -723,7 +723,7 @@ public: DECLARE_READ32_MEMBER( sh3_internal_high_r ); protected: - virtual void device_reset(); + virtual void device_reset() override; }; @@ -740,7 +740,7 @@ public: DECLARE_WRITE64_MEMBER( sh4_tlb_w ); protected: - virtual void device_reset(); + virtual void device_reset() override; }; @@ -757,8 +757,8 @@ public: sh3be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void execute_run(); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void execute_run() override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -775,8 +775,8 @@ public: sh4be_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void execute_run(); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void execute_run() override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h index 9823cccc931..c658b3a9800 100644 --- a/src/devices/cpu/sharc/sharc.h +++ b/src/devices/cpu/sharc/sharc.h @@ -93,25 +93,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 8; } - virtual UINT32 execute_max_cycles() const { return 8; } - virtual UINT32 execute_input_lines() const { return 32; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 8; } + virtual UINT32 execute_max_cycles() const override { return 8; } + virtual UINT32 execute_input_lines() const override { return 32; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } - virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value); - virtual bool memory_readop(offs_t offset, int size, UINT64 &value); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } + virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value) override; + virtual bool memory_readop(offs_t offset, int size, UINT64 &value) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 40; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 40; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index dbedc0a1d8b..58094fc11a4 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -98,25 +98,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } // default 2 cycles per machine cycle - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } // " - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_set_input(int line, int state); - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } // default 2 cycles per machine cycle + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } // " + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_set_input(int line, int state) override; + virtual void execute_run() override; virtual void execute_one() { } // -> child class // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 0x40; } // actually 2, but debugger doesn't like non-linear pc + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 0x40; } // actually 2, but debugger doesn't like non-linear pc address_space_config m_program_config; address_space_config m_data_config; @@ -271,11 +271,11 @@ public: sm510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void execute_one(); - virtual void get_opcode_param(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void execute_one() override; + virtual void get_opcode_param() override; - virtual void update_w_latch() { m_write_s(0, m_w, 0xff); } // W is connected directly to S + virtual void update_w_latch() override { m_write_s(0, m_w, 0xff); } // W is connected directly to S }; @@ -286,9 +286,9 @@ public: sm511_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void execute_one(); - virtual void get_opcode_param(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void execute_one() override; + virtual void get_opcode_param() override; }; class sm512_device : public sm511_device diff --git a/src/devices/cpu/sm8500/sm8500.h b/src/devices/cpu/sm8500/sm8500.h index 50d1d08d9e3..8dd4802efb6 100644 --- a/src/devices/cpu/sm8500/sm8500.h +++ b/src/devices/cpu/sm8500/sm8500.h @@ -57,26 +57,26 @@ protected: static const UINT8 FLAG_I = 0x01; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 11; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 11; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 5; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 5; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; inline void get_sp(); UINT8 mem_readbyte(UINT32 offset); diff --git a/src/devices/cpu/spc700/spc700.h b/src/devices/cpu/spc700/spc700.h index cc99d750cf1..ad5085b38a9 100644 --- a/src/devices/cpu/spc700/spc700.h +++ b/src/devices/cpu/spc700/spc700.h @@ -14,28 +14,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 8; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 8; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/ssem/ssem.h b/src/devices/cpu/ssem/ssem.h index 79bed8616be..e57294fbbf5 100644 --- a/src/devices/cpu/ssem/ssem.h +++ b/src/devices/cpu/ssem/ssem.h @@ -25,27 +25,27 @@ public: ssem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // address spaces const address_space_config m_program_config; diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h index 2641f5d36ec..d2d0896445b 100644 --- a/src/devices/cpu/t11/t11.h +++ b/src/devices/cpu/t11/t11.h @@ -44,27 +44,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 12; } - virtual UINT32 execute_max_cycles() const { return 110; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_min_cycles() const override { return 12; } + virtual UINT32 execute_max_cycles() const override { return 110; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 6; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 6; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; protected: address_space_config m_program_config; @@ -1142,10 +1142,10 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; }; diff --git a/src/devices/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h index 017abfb3485..7921444d7fd 100644 --- a/src/devices/cpu/tlcs90/tlcs90.h +++ b/src/devices/cpu/tlcs90/tlcs90.h @@ -35,28 +35,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 26; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual void execute_burn(INT32 cycles); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 26; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual void execute_burn(INT32 cycles) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 6; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 6; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: enum e_mode { diff --git a/src/devices/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h index 507d559d297..0481d96db21 100644 --- a/src/devices/cpu/tlcs900/tlcs900.h +++ b/src/devices/cpu/tlcs900/tlcs900.h @@ -57,27 +57,27 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } /* FIXME */ - virtual UINT32 execute_max_cycles() const { return 1; } /* FIXME */ - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } /* FIXME */ + virtual UINT32 execute_max_cycles() const override { return 1; } /* FIXME */ + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 7; } /* FIXME */ - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 7; } /* FIXME */ + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; protected: int m_am8_16; @@ -660,15 +660,15 @@ public: DECLARE_WRITE8_MEMBER( internal_w ); protected: - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; - virtual void execute_set_input(int inputnum, int state); - virtual void tlcs900_check_hdma(); - virtual void tlcs900_check_irqs(); - virtual void tlcs900_handle_ad(); - virtual void tlcs900_handle_timers(); + virtual void execute_set_input(int inputnum, int state) override; + virtual void tlcs900_check_hdma() override; + virtual void tlcs900_check_irqs() override; + virtual void tlcs900_handle_ad() override; + virtual void tlcs900_handle_timers() override; void tlcs900_change_tff( int which, int change ); int tlcs900_process_hdma( int channel ); @@ -779,15 +779,15 @@ public: template<class _Object> static devcb_base &set_porte_write(device_t &device, _Object object) { return downcast<tmp95c063_device &>(device).m_porte_write.set_callback(object); } protected: - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); - - virtual void execute_set_input(int inputnum, int state); - virtual void tlcs900_check_hdma(); - virtual void tlcs900_check_irqs(); - virtual void tlcs900_handle_ad(); - virtual void tlcs900_handle_timers(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; + + virtual void execute_set_input(int inputnum, int state) override; + virtual void tlcs900_check_hdma() override; + virtual void tlcs900_check_irqs() override; + virtual void tlcs900_handle_ad() override; + virtual void tlcs900_handle_timers() override; private: // Port 1: 8 bit I/O. Shared with d8-d15 diff --git a/src/devices/cpu/tms0980/tms0980.h b/src/devices/cpu/tms0980/tms0980.h index cf21e0564fd..fb8255be68e 100644 --- a/src/devices/cpu/tms0980/tms0980.h +++ b/src/devices/cpu/tms0980/tms0980.h @@ -121,23 +121,23 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 6; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 6; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 1; } + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 1; } - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; void next_pc(); @@ -254,11 +254,11 @@ public: protected: // overrides - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; class tms1070_cpu_device : public tms1000_cpu_device @@ -289,12 +289,12 @@ public: protected: // overrides - virtual void device_reset(); + virtual void device_reset() override; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual void op_setr(); - virtual void op_rstr(); + virtual void op_setr() override; + virtual void op_rstr() override; }; class tms1170_cpu_device : public tms1100_cpu_device @@ -324,15 +324,15 @@ public: protected: // overrides - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void op_br(); - virtual void op_call(); - virtual void op_retn(); + virtual void op_br() override; + virtual void op_call() override; + virtual void op_retn() override; - virtual void op_setr() { tms1xxx_cpu_device::op_setr(); } // no anomaly with MSB of X register - virtual void op_rstr() { tms1xxx_cpu_device::op_rstr(); } // " + virtual void op_setr() override { tms1xxx_cpu_device::op_setr(); } // no anomaly with MSB of X register + virtual void op_rstr() override { tms1xxx_cpu_device::op_rstr(); } // " }; class tms1470_cpu_device : public tms1400_cpu_device @@ -364,13 +364,13 @@ public: protected: // overrides - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void write_o_output(UINT8 index); + virtual void write_o_output(UINT8 index) override; - virtual void op_setr(); - virtual void op_tdo(); + virtual void op_setr() override; + virtual void op_tdo() override; }; class tms1990_cpu_device : public tms0970_cpu_device @@ -388,19 +388,19 @@ public: protected: // overrides - virtual void device_reset(); + virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT8 read_k_input(); - virtual void set_cki_bus(); - virtual void read_opcode(); + virtual UINT8 read_k_input() override; + virtual void set_cki_bus() override; + virtual void read_opcode() override; - virtual void op_comx(); + virtual void op_comx() override; UINT32 decode_micro(UINT8 sel); }; @@ -412,13 +412,13 @@ public: protected: // overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void write_o_output(UINT8 index) { tms1xxx_cpu_device::write_o_output(index); } - virtual UINT8 read_k_input() { return tms1xxx_cpu_device::read_k_input(); } + virtual void write_o_output(UINT8 index) override { tms1xxx_cpu_device::write_o_output(index); } + virtual UINT8 read_k_input() override { return tms1xxx_cpu_device::read_k_input(); } - virtual void op_setr() { tms1xxx_cpu_device::op_setr(); } - virtual void op_tdo(); + virtual void op_setr() override { tms1xxx_cpu_device::op_setr(); } + virtual void op_tdo() override; }; @@ -434,18 +434,18 @@ public: protected: // overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void write_o_output(UINT8 index) { tms1xxx_cpu_device::write_o_output(index); } - virtual UINT8 read_k_input(); - virtual void dynamic_output(); + virtual void write_o_output(UINT8 index) override { tms1xxx_cpu_device::write_o_output(index); } + virtual UINT8 read_k_input() override; + virtual void dynamic_output() override; - virtual void op_setr(); - virtual void op_rstr(); - virtual void op_tdo(); + virtual void op_setr() override; + virtual void op_rstr() override; + virtual void op_tdo() override; private: // state specific to interface with TMS5100 diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h index 05743ddc9f1..773ddb576f8 100644 --- a/src/devices/cpu/tms32025/tms32025.h +++ b/src/devices/cpu/tms32025/tms32025.h @@ -78,31 +78,31 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 4; } - virtual UINT32 execute_max_cycles() const { return 20; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 4; } + virtual UINT32 execute_max_cycles() const override { return 20; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } - virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value); - virtual bool memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value); - virtual bool memory_readop(offs_t offset, int size, UINT64 &value); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } + virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value) override; + virtual bool memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value) override; + virtual bool memory_readop(offs_t offset, int size, UINT64 &value) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; @@ -357,7 +357,7 @@ public: tms32026_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_reset(); + virtual void device_reset() override; }; diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h index e55fcc2d3b4..0dbc85fdf96 100644 --- a/src/devices/cpu/tms32031/tms32031.h +++ b/src/devices/cpu/tms32031/tms32031.h @@ -161,30 +161,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // memory helpers DECLARE_DIRECT_UPDATE_MEMBER(direct_handler); diff --git a/src/devices/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h index 1b81ae4eef5..5de70293025 100644 --- a/src/devices/cpu/tms32051/tms32051.h +++ b/src/devices/cpu/tms32051/tms32051.h @@ -64,24 +64,24 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 5; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 5; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } - virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); } + virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/tms32082/tms32082.h b/src/devices/cpu/tms32082/tms32082.h index 019a2d0bf2c..6d3e932375c 100644 --- a/src/devices/cpu/tms32082/tms32082.h +++ b/src/devices/cpu/tms32082/tms32082.h @@ -74,18 +74,18 @@ public: protected: // device level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -95,12 +95,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 4; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 4; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; @@ -168,17 +168,17 @@ public: protected: // device level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -188,12 +188,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 8; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h index 1e28b8102db..79475d2552e 100644 --- a/src/devices/cpu/tms34010/tms34010.h +++ b/src/devices/cpu/tms34010/tms34010.h @@ -268,25 +268,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 10000; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 10000; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 10; } + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; } typedef void (tms340x0_device::*pixel_write_func)(offs_t offset, UINT32 data); typedef UINT32 (tms340x0_device::*pixel_read_func)(offs_t offset); @@ -1031,9 +1031,9 @@ public: virtual DECLARE_READ16_MEMBER( io_register_r ); protected: - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 8 - 1) / 8; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 8); } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 8 - 1) / 8; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 8); } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; extern const device_type TMS34010; @@ -1048,9 +1048,9 @@ public: virtual DECLARE_READ16_MEMBER( io_register_r ); protected: - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; extern const device_type TMS34020; diff --git a/src/devices/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h index cd450ab578b..5e871591158 100644 --- a/src/devices/cpu/tms57002/tms57002.h +++ b/src/devices/cpu/tms57002/tms57002.h @@ -27,17 +27,17 @@ public: DECLARE_WRITE_LINE_MEMBER(sync_w); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void device_start() override; + virtual void device_reset() override; + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: enum { diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index 54c1acfb0a3..53d940232d2 100644 --- a/src/devices/cpu/tms7000/tms7000.h +++ b/src/devices/cpu/tms7000/tms7000.h @@ -64,28 +64,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } // internal /2 divider - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } // internal /2 divider - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 49; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); - virtual void execute_set_input(int extline, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } // internal /2 divider + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } // internal /2 divider + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 49; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; + virtual void execute_set_input(int extline, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; virtual void execute_one(UINT8 op); @@ -260,7 +260,7 @@ public: tms7020_exl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void execute_one(UINT8 op); + virtual void execute_one(UINT8 op) override; private: void lvdp(); @@ -314,8 +314,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 m_control; diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h index f1d4e20ce3a..4fa8da2b43f 100644 --- a/src/devices/cpu/tms9900/ti990_10.h +++ b/src/devices/cpu/tms9900/ti990_10.h @@ -20,23 +20,23 @@ public: protected: // device-level overrides - void device_start(); - void device_stop(); - void device_reset(); + void device_start() override; + void device_stop() override; + void device_reset() override; // device_execute_interface overrides - UINT32 execute_min_cycles() const; - UINT32 execute_max_cycles() const; - UINT32 execute_input_lines() const; - void execute_set_input(int irqline, int state); - void execute_run(); + UINT32 execute_min_cycles() const override; + UINT32 execute_max_cycles() const override; + UINT32 execute_input_lines() const override; + void execute_set_input(int irqline, int state) override; + void execute_run() override; // device_disasm_interface overrides - UINT32 disasm_min_opcode_bytes() const; - UINT32 disasm_max_opcode_bytes() const; - offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + UINT32 disasm_min_opcode_bytes() const override; + UINT32 disasm_max_opcode_bytes() const override; + offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - const address_space_config* memory_space_config(address_spacenum spacenum) const; + const address_space_config* memory_space_config(address_spacenum spacenum) const override; const address_space_config m_program_config; const address_space_config m_io_config; diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h index 8e7f19042c6..be2c8a4ba3b 100644 --- a/src/devices/cpu/tms9900/tms9900.h +++ b/src/devices/cpu/tms9900/tms9900.h @@ -67,25 +67,25 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; virtual void resolve_lines(); // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_set_input(int irqline, int state); - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_set_input(int irqline, int state) override; + virtual void execute_run() override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - const address_space_config* memory_space_config(address_spacenum spacenum) const; + const address_space_config* memory_space_config(address_spacenum spacenum) const override; // Let these methods be overloaded by the TMS9980. virtual void mem_read(void); @@ -224,9 +224,9 @@ private: // State / debug management UINT16 m_state_any; static const char* s_statename[]; - void state_import(const device_state_entry &entry); - void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + void state_import(const device_state_entry &entry) override; + void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // Interrupt handling void service_interrupt(); diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h index 82492d6073a..d32c79dc9ca 100644 --- a/src/devices/cpu/tms9900/tms9980a.h +++ b/src/devices/cpu/tms9900/tms9980a.h @@ -29,23 +29,23 @@ public: tms9980a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - void mem_read(void); - void mem_write(void); - void acquire_instruction(void); + void mem_read(void) override; + void mem_write(void) override; + void acquire_instruction(void) override; - void resolve_lines(); + void resolve_lines() override; - UINT16 read_workspace_register_debug(int reg); - void write_workspace_register_debug(int reg, UINT16 data); + UINT16 read_workspace_register_debug(int reg) override; + void write_workspace_register_debug(int reg, UINT16 data) override; - UINT32 execute_min_cycles() const; - UINT32 execute_max_cycles() const; - UINT32 execute_input_lines() const; - void execute_set_input(int irqline, int state); + UINT32 execute_min_cycles() const override; + UINT32 execute_max_cycles() const override; + UINT32 execute_input_lines() const override; + void execute_set_input(int irqline, int state) override; - UINT32 disasm_min_opcode_bytes() const; - UINT32 disasm_max_opcode_bytes() const; - offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + UINT32 disasm_min_opcode_bytes() const override; + UINT32 disasm_max_opcode_bytes() const override; + offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config80; address_space_config m_io_config80; }; diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h index 2df6d529274..a01ccaa37a7 100644 --- a/src/devices/cpu/ucom4/ucom4.h +++ b/src/devices/cpu/ucom4/ucom4.h @@ -137,27 +137,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } // " - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 2; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_set_input(int line, int state); - virtual void execute_run(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } // 4 cycles per machine cycle + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } // " + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 2; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_set_input(int line, int state) override; + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return(spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_DATA) ? &m_data_config : nullptr); } // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; address_space_config m_program_config; address_space_config m_data_config; @@ -325,8 +325,8 @@ public: upd557l_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT8 input_r(int index); - virtual void output_w(int index, UINT8 data); + virtual UINT8 input_r(int index) override; + virtual void output_w(int index, UINT8 data) override; }; diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h index 61e6f05e685..6424016cf3b 100644 --- a/src/devices/cpu/unsp/unsp.h +++ b/src/devices/cpu/unsp/unsp.h @@ -57,27 +57,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 5; } - virtual UINT32 execute_max_cycles() const { return 5; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 5; } + virtual UINT32 execute_max_cycles() const override { return 5; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index 94e19801192..7696cda2f0d 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -30,26 +30,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 80; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 80; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 7; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 7; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; void interrupt(int int_num); diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h index 80aca421fb8..4ef35d130b0 100644 --- a/src/devices/cpu/v60/v60.h +++ b/src/devices/cpu/v60/v60.h @@ -91,27 +91,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 22; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 22; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: typedef UINT32 (v60_device::*am_func)(); @@ -783,7 +783,7 @@ public: v70_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; diff --git a/src/devices/cpu/v810/v810.h b/src/devices/cpu/v810/v810.h index ebccfccc23f..dbe9cf10b55 100644 --- a/src/devices/cpu/v810/v810.h +++ b/src/devices/cpu/v810/v810.h @@ -87,26 +87,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 3; } - virtual UINT32 execute_max_cycles() const { return 6; } - virtual UINT32 execute_input_lines() const { return 16; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 3; } + virtual UINT32 execute_max_cycles() const override { return 6; } + virtual UINT32 execute_input_lines() const override { return 16; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: typedef UINT32 (v810_device::*opcode_func)(UINT32 op); diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h index a0eb2972870..9f36266fc94 100644 --- a/src/devices/cpu/z180/z180.h +++ b/src/devices/cpu/z180/z180.h @@ -133,31 +133,31 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 3; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_burn(INT32 cycles); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 3; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_burn(INT32 cycles) override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h index 68c1b9534c7..11758a771d7 100644 --- a/src/devices/cpu/z8/z8.h +++ b/src/devices/cpu/z8/z8.h @@ -31,20 +31,20 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 6; } - virtual UINT32 execute_max_cycles() const { return 20; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 6; } + virtual UINT32 execute_max_cycles() const override { return 20; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch ( spacenum ) { @@ -57,14 +57,14 @@ protected: } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: diff --git a/src/devices/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h index 83a34fbee22..7ad3e16ca85 100644 --- a/src/devices/cpu/z80/kl5c80a12.h +++ b/src/devices/cpu/z80/kl5c80a12.h @@ -41,9 +41,9 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h index 1a5bdd83a85..ffb5cdbd96f 100644 --- a/src/devices/cpu/z80/tmpz84c011.h +++ b/src/devices/cpu/z80/tmpz84c011.h @@ -130,13 +130,13 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; const address_space_config m_io_space_config; - const address_space_config *memory_space_config(address_spacenum spacenum) const + const address_space_config *memory_space_config(address_spacenum spacenum) const override { switch (spacenum) { diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h index 66a5e4f797f..aaea89f7600 100644 --- a/src/devices/cpu/z8000/z8000.h +++ b/src/devices/cpu/z8000/z8000.h @@ -44,19 +44,19 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 2; } - virtual UINT32 execute_max_cycles() const { return 744; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 2; } + virtual UINT32 execute_max_cycles() const override { return 744; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -67,12 +67,12 @@ protected: } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 6; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 6; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_io_config; @@ -632,11 +632,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -648,21 +648,21 @@ protected: } // device_disasm_interface overrides - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } address_space_config m_data_config; - virtual int segmented_mode(); - virtual UINT32 adjust_addr_for_nonseg_mode(UINT32 addr); - virtual UINT16 RDPORT_W(int mode, UINT16 addr); - virtual void WRPORT_W(int mode, UINT16 addr, UINT16 value); - virtual void PUSH_PC(); - virtual void CHANGE_FCW(UINT16 fcw); - virtual UINT32 GET_PC(UINT32 VEC); - virtual UINT16 GET_FCW(UINT32 VEC); - virtual UINT32 F_SEG_Z8001(); - virtual UINT32 PSA_ADDR(); - virtual UINT32 read_irq_vector(); + virtual int segmented_mode() override; + virtual UINT32 adjust_addr_for_nonseg_mode(UINT32 addr) override; + virtual UINT16 RDPORT_W(int mode, UINT16 addr) override; + virtual void WRPORT_W(int mode, UINT16 addr, UINT16 value) override; + virtual void PUSH_PC() override; + virtual void CHANGE_FCW(UINT16 fcw) override; + virtual UINT32 GET_PC(UINT32 VEC) override; + virtual UINT16 GET_FCW(UINT32 VEC) override; + virtual UINT32 F_SEG_Z8001() override; + virtual UINT32 PSA_ADDR() override; + virtual UINT32 read_irq_vector() override; }; diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h index 11e0ffe091c..6cc5530e534 100644 --- a/src/devices/imagedev/diablo.h +++ b/src/devices/imagedev/diablo.h @@ -30,21 +30,21 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<diablo_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int create_format, option_resolution *create_args); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } - - virtual iodevice_t image_type() const { return IO_HARDDISK; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return "chd,dsk"; } - virtual const option_guide *create_option_guide() const; + virtual bool call_load() override; + virtual bool call_create(int create_format, option_resolution *create_args) override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + + virtual iodevice_t image_type() const override { return IO_HARDDISK; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return "chd,dsk"; } + virtual const option_guide *create_option_guide() const override; // specific implementation hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; } @@ -52,9 +52,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; int internal_load_dsk(); diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h index 835cc2c281d..19b1b5c776b 100644 --- a/src/devices/machine/diablo_hd.h +++ b/src/devices/machine/diablo_hd.h @@ -68,10 +68,10 @@ public: int rd_clock(int index); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; private: #if DIABLO_DEBUG diff --git a/src/devices/sound/spu.h b/src/devices/sound/spu.h index 8a6727e4833..4c0a090bd71 100644 --- a/src/devices/sound/spu.h +++ b/src/devices/sound/spu.h @@ -46,12 +46,12 @@ class spu_device : public device_t, public device_sound_interface protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_stop() override; - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; // internal state devcb_write_line m_irq_handler; |