diff options
Diffstat (limited to 'src/devices/cpu/mcs48/mcs48.h')
-rw-r--r-- | src/devices/cpu/mcs48/mcs48.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index a8184bcbd34..ed994d1030e 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -130,34 +130,34 @@ 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 + 15 - 1) / 15; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 15); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return MCS48_INPUT_IRQ; } - 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 + 15 - 1) / 15; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 15); } + 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 2; } + virtual UINT32 execute_default_irq_vector() const override { return MCS48_INPUT_IRQ; } + 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 : ( (spacenum == AS_DATA) ? &m_data_config : NULL ) ); + 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 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; protected: address_space_config m_program_config; @@ -487,8 +487,8 @@ public: protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 30 - 1) / 30; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 30); } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 30 - 1) / 30; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 30); } }; class i8022_device : public mcs48_cpu_device @@ -499,8 +499,8 @@ public: protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 30 - 1) / 30; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 30); } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 30 - 1) / 30; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 30); } }; class i8035_device : public mcs48_cpu_device @@ -599,7 +599,7 @@ public: DECLARE_WRITE8_MEMBER(upi41_master_w); 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; TIMER_CALLBACK_MEMBER( master_callback ); }; |